[SCM] GeoGebra: Dynamic mathematics software for education branch, master, updated. upstream/4.0.19.0+dfsg1-172-gcb0585b
Giovanni Mascellani
mascellani at poisson.phc.unipi.it
Fri May 11 22:32:07 UTC 2012
The following commit has been merged in the master branch:
commit 474a4379cd529f0c06d7325062e33389c84f4887
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Sat May 12 00:14:27 2012 +0200
Imported Upstream version 4.0.30.0+dfsg1
diff --git a/.project b/.project
index b4c7547..e4d2d8a 100644
--- a/.project
+++ b/.project
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>geogebra</name>
- <comment>JavaCC Nature</comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>sf.eclipse.javacc.javaccbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>sf.eclipse.javacc.javaccnature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>ggb40</name>
+ <comment>JavaCC Nature</comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>sf.eclipse.javacc.javaccbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>sf.eclipse.javacc.javaccnature</nature>
+ </natures>
+</projectDescription>
diff --git a/build.pro b/build.pro
index 205ee68..5f4f056 100644
--- a/build.pro
+++ b/build.pro
@@ -32,7 +32,7 @@
# see http://proguard.sourceforge.net/manual/troubleshooting.html
-dontskipnonpubliclibraryclasses
-#-printmapping geogebra.map
+-printmapping geogebra.map
#-applymapping geogebra3-2-0-0.map
# Keep GeoGebra application
diff --git a/geogebra/GeoGebra.java b/geogebra/GeoGebra.java
index c503fc7..bd03821 100644
--- a/geogebra/GeoGebra.java
+++ b/geogebra/GeoGebra.java
@@ -19,8 +19,8 @@ import java.net.URL;
public class GeoGebra extends Object {
// GeoGebra version
- public static final String BUILD_DATE = "10 January 2012";
- public static final String VERSION_STRING = "4.0.19.0";
+ public static final String BUILD_DATE = "20 April 2012";
+ public static final String VERSION_STRING = "4.0.30.0";
public static final String SPLASH_STRING = "splash40.png";
public static final String PREFERENCES_ROOT = "/geogebra40";
public static final String SHORT_VERSION_STRING = "4.0"; // used for online
@@ -32,10 +32,6 @@ public class GeoGebra extends Object {
public static final String XML_FILE_FORMAT = "4.0";
public static final String GGB_XSD_FILENAME = "ggb.xsd"; // for ggb files
public static final String GGT_XSD_FILENAME = "ggt.xsd"; // for macro files
- public static final String I2G_FILE_FORMAT = "0.1.20080731";
-
- // pre-releases and I2G
- public static final boolean DISABLE_I2G = !IS_PRE_RELEASE;
// URLs
public final static String GEOGEBRA_ONLINE_ARCHIVE_BASE = "http://www.geogebra.org/webstart/"
@@ -51,11 +47,13 @@ public class GeoGebra extends Object {
// max possible heap space for applets in MB
public final static int MAX_HEAP_SPACE = 512;
+ /** URL of GeoGebraWeb main js file*/
+ public static final String GEOGEBRA_HTML5_BASE = "http://www.geogebra.org/web/4.2/web/web.nocache.js";
public static Frame splashFrame = null;
- public static void main(String[] cmdArgs) {
- CommandLineArguments args = new CommandLineArguments(cmdArgs);
+ public static void main(final String[] cmdArgs) {
+ final CommandLineArguments args = new CommandLineArguments(cmdArgs);
boolean showSplash = true;
if (!args.getBooleanValue("showSplash", true)) {
@@ -72,9 +70,11 @@ public class GeoGebra extends Object {
if (showSplash) {
// Show splash screen
- URL imageURL = GeoGebra.class.getResource("/geogebra/" + SPLASH_STRING);
+ final URL imageURL = GeoGebra.class.getResource("/geogebra/"
+ + SPLASH_STRING);
if (imageURL != null) {
- splashFrame = SplashWindow.splash(Toolkit.getDefaultToolkit().createImage(imageURL));
+ splashFrame = SplashWindow.splash(Toolkit.getDefaultToolkit()
+ .createImage(imageURL));
} else {
System.err.println("Splash image not found");
}
@@ -83,7 +83,7 @@ public class GeoGebra extends Object {
// Start GeoGebra
try {
startGeoGebra(args);
- } catch (Throwable e) {
+ } catch (final Throwable e) {
e.printStackTrace();
System.err.flush();
System.exit(10);
@@ -95,7 +95,7 @@ public class GeoGebra extends Object {
}
}
- private static void startGeoGebra(CommandLineArguments args) {
+ private static void startGeoGebra(final CommandLineArguments args) {
// create and open first GeoGebra window
geogebra.gui.app.GeoGebraFrame.main(args);
}
diff --git a/geogebra/euclidian/DrawConic.java b/geogebra/euclidian/DrawConic.java
index 29ec854..d34ed7e 100644
--- a/geogebra/euclidian/DrawConic.java
+++ b/geogebra/euclidian/DrawConic.java
@@ -23,6 +23,7 @@ import geogebra.euclidian.clipping.ClipShape;
import geogebra.kernel.AlgoCirclePointRadius;
import geogebra.kernel.AlgoCircleThreePoints;
import geogebra.kernel.AlgoCircleTwoPoints;
+import geogebra.kernel.AlgoConicFivePoints;
import geogebra.kernel.AlgoEllipseFociPoint;
import geogebra.kernel.AlgoHyperbolaFociPoint;
import geogebra.kernel.Construction;
@@ -168,8 +169,21 @@ final public class DrawConic extends Drawable implements Previewable {
previewMode = mode;
Construction cons = view.getKernel().getConstruction();
- neededPrevPoints = mode == EuclidianView.MODE_CIRCLE_TWO_POINTS ?
- 1 : 2;
+
+ switch (mode) {
+ case EuclidianConstants.MODE_CIRCLE_TWO_POINTS:
+ neededPrevPoints = 1;
+ break;
+ case EuclidianConstants.MODE_CIRCLE_THREE_POINTS:
+ case EuclidianConstants.MODE_ELLIPSE_THREE_POINTS:
+ case EuclidianConstants.MODE_HYPERBOLA_THREE_POINTS:
+ neededPrevPoints = 2;
+ break;
+ case EuclidianConstants.MODE_CONIC_FIVE_POINTS:
+ neededPrevPoints = 4;
+ break;
+
+ }
previewTempPoints = new GeoPoint[neededPrevPoints+1];
for (int i=0; i < previewTempPoints.length; i++) {
previewTempPoints[i] = new GeoPoint(cons);
@@ -1176,6 +1190,13 @@ final public class DrawConic extends Drawable implements Previewable {
initConic(algo.getCircle());
break;
+ case EuclidianConstants.MODE_CONIC_FIVE_POINTS:
+ GeoPoint[] pts = {previewTempPoints[0], previewTempPoints[1], previewTempPoints[2], previewTempPoints[3], previewTempPoints[4]};
+ AlgoConicFivePoints algo0 = new AlgoConicFivePoints(cons, pts);
+ cons.removeFromConstructionList(algo0);
+ initConic(algo0.getConic());
+ break;
+
case EuclidianView.MODE_CIRCLE_THREE_POINTS:
AlgoCircleThreePoints algo2 = new AlgoCircleThreePoints(cons,
previewTempPoints[0],
diff --git a/geogebra/euclidian/DrawInequality.java b/geogebra/euclidian/DrawInequality.java
index ac1ec53..c81c411 100644
--- a/geogebra/euclidian/DrawInequality.java
+++ b/geogebra/euclidian/DrawInequality.java
@@ -226,13 +226,18 @@ public class DrawInequality extends Drawable {
return;
if (operation == ExpressionNode.NO_OPERATION) {
if (drawable != null) {
+ drawable.updateStrokesJustLineThickness(geo);
drawable.draw(g2);
}
} else {
- if (left != null)
+ if (left != null) {
+ left.updateStrokesJustLineThickness(geo);
left.draw(g2);
- if (right != null)
+ }
+ if (right != null) {
+ right.updateStrokesJustLineThickness(geo);
right.draw(g2);
+ }
}
if (!isForceNoFill()) {
if (gpAxis != null) {
@@ -249,8 +254,13 @@ public class DrawInequality extends Drawable {
g2.draw(gpAxis[i]);
}
- } else
+ } else {
+ if (geo.getFillType()==GeoElement.FILL_HATCH) {
+ // make sure line thickness set for hatching
+ updateStrokes(geo);
+ }
fill(g2, getShape(), true);
+ }
}
if (labelVisible) {
diff --git a/geogebra/euclidian/DrawSlider.java b/geogebra/euclidian/DrawSlider.java
index 2fe21ab..fc5788e 100644
--- a/geogebra/euclidian/DrawSlider.java
+++ b/geogebra/euclidian/DrawSlider.java
@@ -53,7 +53,8 @@ public class DrawSlider extends Drawable {
geo = number;
// create point for slider
- geoPoint = new GeoPoint(view.getKernel().getConstruction());
+ geoPoint = new GeoPoint(view.getKernel().getConstruction());
+ geoPoint.setPointStyle(EuclidianView.POINT_STYLE_DOT);
drawPoint = new DrawPoint(view, geoPoint);
drawPoint.setGeoElement(number);
diff --git a/geogebra/euclidian/DrawTextField.java b/geogebra/euclidian/DrawTextField.java
index 32871a7..fdc5fff 100644
--- a/geogebra/euclidian/DrawTextField.java
+++ b/geogebra/euclidian/DrawTextField.java
@@ -12,6 +12,7 @@
package geogebra.euclidian;
+import geogebra.kernel.GeoAngle;
import geogebra.kernel.GeoButton;
import geogebra.kernel.GeoElement;
import geogebra.kernel.GeoPoint;
@@ -69,14 +70,14 @@ public final class DrawTextField extends Drawable {
// action listener for checkBox
bl = new ButtonListener();
- textField = geoButton.getTextField();// new JTextField(20);
+ textField = geoButton.getTextField(view.getViewID());// new JTextField(20);
label = new JLabel("Label");
label.setLabelFor(textField);
textField.setVisible(true);
label.setVisible(true);
textField.addFocusListener(bl);
label.addMouseListener(bl);
- //label.addMouseMotionListener(bl);
+ label.addMouseMotionListener(bl);
textField.addKeyListener(bl);
box.add(label);
box.add(textField);
@@ -236,6 +237,25 @@ public final class DrawTextField extends Drawable {
// this should be enough to trigger script event
// ie in focusLost
view.requestFocus();
+ } else if (e.getKeyCode() != KeyEvent.VK_DELETE && e.getKeyCode() != KeyEvent.VK_BACK_SPACE){
+ GeoElement linkedGeo = ((GeoTextField) geo).getLinkedGeo();
+
+ if (linkedGeo instanceof GeoAngle) {
+
+ String text = textField.getText();
+
+ // return if text already contains degree symbol or variable
+ for (int i = 0 ; i < text.length() ; i++) {
+ if (!Character.isDigit(text.charAt(i))) return;
+ }
+
+ int caretPos = textField.getCaretPosition();
+
+ // add degree symbol to end if it's (a) a GeoText and (b) just digits
+ textField.setText(text+Unicode.degree);
+
+ textField.setCaretPosition(caretPos);
+ }
}
}
@@ -297,9 +317,7 @@ public final class DrawTextField extends Drawable {
oldCaption = caption;
labelDesc = GeoElement.indicesToHTML(caption, true);
}
- box.setVisible(false); // avoid redraw error
label.setText(labelDesc);
- box.setVisible(true);
} else {
label.setText("");
}
@@ -322,10 +340,8 @@ public final class DrawTextField extends Drawable {
textField.setFocusable(true);
textField.setEditable(true);
updateText();
- // set checkbox state
- // jButton.removeItemListener(bl);
- // jButton.setSelected(geo.getBoolean());
- // jButton.addItemListener(bl);
+
+ box.validate();
xLabel = geo.labelOffsetX;
yLabel = geo.labelOffsetY;
diff --git a/geogebra/euclidian/Drawable.java b/geogebra/euclidian/Drawable.java
index 9dd8b95..7e90bb7 100644
--- a/geogebra/euclidian/Drawable.java
+++ b/geogebra/euclidian/Drawable.java
@@ -847,6 +847,24 @@ public abstract class Drawable extends DrawableND {
}
}
+ final void updateStrokesJustLineThickness(GeoElement geo) {
+ strokedShape = null;
+ strokedShape2 = null;
+
+ if (lineThickness != geo.lineThickness) {
+ lineThickness = geo.lineThickness;
+
+ float width = lineThickness / 2.0f;
+ objStroke = new BasicStroke(width, objStroke.getEndCap(), objStroke.getLineJoin(), objStroke.getMiterLimit(),
+ objStroke.getDashArray(), 0.0f);
+ decoStroke = new BasicStroke(width, objStroke.getEndCap(), objStroke.getLineJoin(), objStroke.getMiterLimit(),
+ decoStroke.getDashArray(), 0.0f);
+ selStroke = new BasicStroke(width + EuclidianView.SELECTION_ADD, objStroke.getEndCap(), objStroke.getLineJoin(), objStroke.getMiterLimit(),
+ selStroke.getDashArray(), 0.0f);
+
+ }
+ }
+
final public static void drawWithValueStrokePure(Shape shape, Graphics2D g2) {
Object oldHint = g2.getRenderingHint(RenderingHints.KEY_STROKE_CONTROL);
g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE);
diff --git a/geogebra/euclidian/EuclidianController.java b/geogebra/euclidian/EuclidianController.java
index 1942356..b316176 100644
--- a/geogebra/euclidian/EuclidianController.java
+++ b/geogebra/euclidian/EuclidianController.java
@@ -682,6 +682,12 @@ public class EuclidianController implements MouseListener, MouseMotionListener,
case EuclidianView.MODE_LINE_BISECTOR:
previewDrawable = view.createPreviewPerpendicularBisector(selectedPoints);
break;
+
+ case EuclidianConstants.MODE_CONIC_FIVE_POINTS:
+ previewDrawable = view
+ .createPreviewConic(mode, selectedPoints);
+ break;
+
case EuclidianView.MODE_JOIN: // line through two points
useLineEndPoint = false;
@@ -3116,7 +3122,12 @@ public class EuclidianController implements MouseListener, MouseMotionListener,
hits = hits.getTopHits();
+ if(sliderValue!=null) {
+ repaintNeeded = true;
+ }
+
sliderValue = null;
+
if (hits.size() == 1) {
GeoElement hit = hits.get(0);
int labelMode = hit.getLabelMode();
@@ -3129,9 +3140,16 @@ public class EuclidianController implements MouseListener, MouseMotionListener,
startPoint.setLocation(((GeoNumeric) hit).getSliderX(), ((GeoNumeric) hit).getSliderY());
- // preview just for fixed sliders
- if (((GeoNumeric) hit).isSliderFixed()) {
- sliderValue = kernel.format(getSliderValue((GeoNumeric) hit));
+ boolean valueShowing = hit.isLabelVisible()
+ && (hit.getLabelMode() == GeoElement.LABEL_NAME_VALUE || hit.getLabelMode() == GeoElement.LABEL_VALUE);
+
+ // preview just for fixed sliders (with value showing)
+ if (((GeoNumeric) hit).isSliderFixed() && valueShowing) {
+ if (hit.isGeoAngle()) {
+ sliderValue = kernel.formatAngle(getSliderValue((GeoNumeric) hit)).toString();
+ } else {
+ sliderValue = kernel.format(getSliderValue((GeoNumeric) hit));
+ }
}
}
}
@@ -5822,7 +5840,7 @@ public class EuclidianController implements MouseListener, MouseMotionListener,
// create dynamic text
checkZooming();
- GeoText text = kernel.getAlgebraProcessor().evaluateToText(strText, true);
+ GeoText text = kernel.getAlgebraProcessor().evaluateToText(strText, true, true);
if (useLabels) {
text.setLabel(removeUnderscores(app.getPlain("Text") + geoA.getLabel() + geoB.getLabel()));
text.setLaTeX(useLabels, true);
@@ -5847,7 +5865,7 @@ public class EuclidianController implements MouseListener, MouseMotionListener,
String dynText = "\"" + descText + " = \" + " + value.getLabel();
checkZooming();
- GeoText text = kernel.getAlgebraProcessor().evaluateToText(dynText, true);
+ GeoText text = kernel.getAlgebraProcessor().evaluateToText(dynText, true, true);
text.setAbsoluteScreenLocActive(true);
text.setAbsoluteScreenLoc(loc.x, loc.y);
text.updateRepaint();
@@ -7145,6 +7163,9 @@ public class EuclidianController implements MouseListener, MouseMotionListener,
// fetch the selected point
GeoPoint[] points = getSelectedPoints();
loc = points[0];
+ } else if (!selectionPreview) {
+ loc = new GeoPoint(kernel.getConstruction());
+ loc.setCoords(xRW, yRW, 1.0);
}
}
@@ -8092,12 +8113,12 @@ public class EuclidianController implements MouseListener, MouseMotionListener,
py = view.getHeight() / 2;
}
- double factor = event.getKeyCode() == KeyEvent.VK_MINUS ? 1d / EuclidianView.MOUSE_WHEEL_ZOOM_FACTOR
+ double factor = (event.getKeyCode() == KeyEvent.VK_MINUS || event.getKeyCode() == KeyEvent.VK_SUBTRACT) ? 1d / EuclidianView.MOUSE_WHEEL_ZOOM_FACTOR
: EuclidianView.MOUSE_WHEEL_ZOOM_FACTOR;
// accelerated zoom
if (event.isAltDown()) {
- factor *= event.getKeyCode() == KeyEvent.VK_MINUS ? 2d / 3d : 1.5;
+ factor *= (event.getKeyCode() == KeyEvent.VK_MINUS || event.getKeyCode() == KeyEvent.VK_SUBTRACT) ? 2d / 3d : 1.5;
}
// make zooming a little bit smoother by having some steps
diff --git a/geogebra/euclidian/EuclidianStyleBar.java b/geogebra/euclidian/EuclidianStyleBar.java
index a419546..5ce82e0 100644
--- a/geogebra/euclidian/EuclidianStyleBar.java
+++ b/geogebra/euclidian/EuclidianStyleBar.java
@@ -30,211 +30,220 @@ import java.util.HashMap;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JToolBar;
+
/**
* Stylebar for the Euclidian Views
*
- * @author G. Sturr
- *
+ * @author G. Sturr
+ *
*/
public class EuclidianStyleBar extends JToolBar implements ActionListener {
-
+
/***/
private static final long serialVersionUID = 1L;
// ggb
- private EuclidianController ec;
+ private final EuclidianController ec;
protected EuclidianViewInterface ev;
protected Application app;
- private Construction cons;
-
-
+ private final Construction cons;
+
// buttons and lists of buttons
- private ColorPopupMenuButton btnColor,btnBgColor, btnTextColor;
-
- private PopupMenuButton btnLineStyle, btnPointStyle, btnTextSize, btnMode,
- btnTableTextJustify, btnTableTextBracket, btnLabelStyle, btnPointCapture;
-
- private MyToggleButton btnCopyVisualStyle, btnPen, btnShowGrid, btnShowAxes,
- btnBold, btnItalic, btnDelete, btnLabel, btnPenEraser, btnHideShowLabel,
- btnTableTextLinesV, btnTableTextLinesH;
-
+ private ColorPopupMenuButton btnColor, btnBgColor, btnTextColor;
+
+ private PopupMenuButton btnLineStyle, btnPointStyle, btnTextSize, btnMode,
+ btnTableTextJustify, btnTableTextBracket, btnLabelStyle,
+ btnPointCapture;
+
+ private MyToggleButton btnCopyVisualStyle, btnPen, btnShowGrid,
+ btnShowAxes, btnBold, btnItalic, btnDelete, btnLabel, btnPenEraser,
+ btnHideShowLabel, btnTableTextLinesV, btnTableTextLinesH;
+
private PopupMenuButton[] popupBtnList;
private MyToggleButton[] toggleBtnList;
private JButton btnPenDelete, btnDeleteGeo;
-
-
- // fields for setting/unsetting default geos
- private HashMap<Integer,Integer> defaultGeoMap;
+
+ // fields for setting/unsetting default geos
+ private HashMap<Integer, Integer> defaultGeoMap;
private ArrayList<GeoElement> defaultGeos;
private GeoElement oldDefaultGeo;
-
+
// flags and constants
protected int iconHeight = 18;
- private Dimension iconDimension = new Dimension(16, iconHeight);
+ private final Dimension iconDimension = new Dimension(16, iconHeight);
public int mode = -1;
private boolean isIniting;
private boolean needUndo = false;
private Integer oldDefaultMode;
private boolean modeChanged = true;
-
-
- // button-specific fields
+
+ // button-specific fields
// TODO: create button classes so these become internal
private AlgoTableText tableText;
- private Integer[] lineStyleArray, pointStyleArray;
- private HashMap<Integer, Integer> lineStyleMap, pointStyleMap;
- private final String[] bracketArray = { "\u00D8" , "{ }" , "( )", "[ ]", "| |", "|| ||"};
- private final String[] bracketArray2 = { "\u00D8" , "{ }" , "( )", "[ ]", "||", "||||"};
-
-
-
-
+ private final Integer[] lineStyleArray, pointStyleArray;
+ private final HashMap<Integer, Integer> lineStyleMap, pointStyleMap;
+ private final String[] bracketArray = { "\u00D8", "{ }", "( )", "[ ]",
+ "| |", "|| ||" };
+ private final String[] bracketArray2 = { "\u00D8", "{ }", "( )", "[ ]",
+ "||", "||||" };
+
/*************************************************
* Constructs a styleBar
- * @param ev view
+ *
+ * @param ev
+ * view
*/
- public EuclidianStyleBar(EuclidianViewInterface ev) {
-
+ public EuclidianStyleBar(final EuclidianViewInterface ev) {
+
isIniting = true;
-
+
this.ev = ev;
- ec = ev.getEuclidianController();
+ ec = ev.getEuclidianController();
app = ev.getApplication();
cons = app.getKernel().getConstruction();
-
+
// init handling of default geos
createDefaultMap();
- defaultGeos = new ArrayList<GeoElement>();
-
- // toolbar display settings
+ defaultGeos = new ArrayList<GeoElement>();
+
+ // toolbar display settings
setFloatable(false);
- Dimension d = getPreferredSize();
- d.height = iconHeight+8;
+ final Dimension d = getPreferredSize();
+ d.height = iconHeight + 8;
setPreferredSize(d);
// init button-specific fields
// TODO: put these in button classes
pointStyleArray = EuclidianView.getPointStyles();
- pointStyleMap = new HashMap<Integer,Integer>();
- for(int i = 0; i < pointStyleArray.length; i++)
+ pointStyleMap = new HashMap<Integer, Integer>();
+ for (int i = 0; i < pointStyleArray.length; i++) {
pointStyleMap.put(pointStyleArray[i], i);
+ }
lineStyleArray = EuclidianView.getLineTypes();
- lineStyleMap = new HashMap<Integer,Integer>();
- for(int i = 0; i < lineStyleArray.length; i++)
+ lineStyleMap = new HashMap<Integer, Integer>();
+ for (int i = 0; i < lineStyleArray.length; i++) {
lineStyleMap.put(lineStyleArray[i], i);
-
-
+ }
+
initGUI();
isIniting = false;
-
- setMode(ev.getMode()); //this will also update the stylebar
+
+ setMode(ev.getMode()); // this will also update the stylebar
}
-
-
+
public int getMode() {
return mode;
}
/**
* Handles ggb mode changes.
- * @param mode new mode
+ *
+ * @param mode
+ * new mode
*/
- public void setMode(int mode) {
-
- if(this.mode == mode){
+ public void setMode(final int mode) {
+
+ if (this.mode == mode) {
modeChanged = false;
return;
- }else{
+ } else {
modeChanged = true;
this.mode = mode;
}
-
- // MODE_TEXT temporarily switches to MODE_SELECTION_LISTENER
+
+ // MODE_TEXT temporarily switches to MODE_SELECTION_LISTENER
// so we need to ignore this.
- if(mode == EuclidianConstants.MODE_SELECTION_LISTENER){
+ if (mode == EuclidianConstants.MODE_SELECTION_LISTENER) {
modeChanged = false;
return;
}
-
+
updateStyleBar();
-
+
}
-
-
- protected boolean isVisibleInThisView(GeoElement geo){
- return geo.isVisibleInView(ev.getViewID()) ;
+
+ protected boolean isVisibleInThisView(final GeoElement geo) {
+ return geo.isVisibleInView(ev.getViewID());
}
-
-
- public void restoreDefaultGeo(){
- if(oldDefaultGeo != null)
- oldDefaultGeo = cons.getConstructionDefaults().getDefaultGeo(oldDefaultMode);
+
+ public void restoreDefaultGeo() {
+ if (oldDefaultGeo != null) {
+ oldDefaultGeo = cons.getConstructionDefaults().getDefaultGeo(
+ oldDefaultMode);
+ }
}
-
-
+
/**
* Updates the state of the stylebar buttons and the defaultGeo field.
*/
- public void updateStyleBar(){
+ public void updateStyleBar() {
- if(mode == EuclidianConstants.MODE_VISUAL_STYLE) return;
+ if (mode == EuclidianConstants.MODE_VISUAL_STYLE) {
+ return;
+ }
- //-----------------------------------------------------
+ // -----------------------------------------------------
// Create activeGeoList, a list of geos the stylebar can adjust.
- // These are either the selected geos or the current default geo.
+ // These are either the selected geos or the current default geo.
// Each button uses this list to update its gui and set visibility
- //-----------------------------------------------------
+ // -----------------------------------------------------
ArrayList<GeoElement> activeGeoList = new ArrayList<GeoElement>();
-
- //-----------------------------------------------------
+ // -----------------------------------------------------
// MODE_MOVE case: load activeGeoList with all selected geos
- //-----------------------------------------------------
- if(mode == EuclidianConstants.MODE_MOVE){
+ // -----------------------------------------------------
+ if (mode == EuclidianConstants.MODE_MOVE) {
boolean hasGeosInThisView = false;
- for(GeoElement geo: ev.getApplication().getSelectedGeos()){
- if(isVisibleInThisView(geo) && geo.isEuclidianVisible() ){
+ for (final GeoElement geo : ev.getApplication().getSelectedGeos()) {
+ if (isVisibleInThisView(geo) && geo.isEuclidianVisible()) {
hasGeosInThisView = true;
break;
}
}
- for(GeoElement geo: ec.getJustCreatedGeos()) {
- if(isVisibleInThisView(geo) && geo.isEuclidianVisible() ){
+ for (final GeoElement geo : ec.getJustCreatedGeos()) {
+ if (isVisibleInThisView(geo) && geo.isEuclidianVisible()) {
hasGeosInThisView = true;
break;
}
}
- if(hasGeosInThisView) {
+ if (hasGeosInThisView) {
activeGeoList = ev.getApplication().getSelectedGeos();
-
+
// we also update stylebars according to just created geos
activeGeoList.addAll(ec.getJustCreatedGeos());
}
}
- //-----------------------------------------------------
- // All other modes: load activeGeoList with current default geo
- //-----------------------------------------------------
- else if (defaultGeoMap.containsKey(mode)){
+ // -----------------------------------------------------
+ // All other modes: load activeGeoList with current default geo
+ // -----------------------------------------------------
+ else if (defaultGeoMap.containsKey(mode)) {
- // Save the current default geo state in oldDefaultGeo.
- // Stylebar buttons can temporarily change a default geo, but this default
+ // Save the current default geo state in oldDefaultGeo.
+ // Stylebar buttons can temporarily change a default geo, but this
+ // default
// geo is always restored to its previous state after a mode change.
- if(oldDefaultGeo != null && modeChanged){
- // add oldDefaultGeo to the default map so that the old default is restored
- cons.getConstructionDefaults().addDefaultGeo(oldDefaultMode, oldDefaultGeo);
+ if ((oldDefaultGeo != null) && modeChanged) {
+ // add oldDefaultGeo to the default map so that the old default
+ // is restored
+ cons.getConstructionDefaults().addDefaultGeo(oldDefaultMode,
+ oldDefaultGeo);
oldDefaultGeo = null;
oldDefaultMode = null;
}
// get the current default geo
- GeoElement geo = cons.getConstructionDefaults().getDefaultGeo(defaultGeoMap.get(mode));
- if (geo != null) activeGeoList.add(geo);
+ final GeoElement geo = cons.getConstructionDefaults()
+ .getDefaultGeo(defaultGeoMap.get(mode));
+ if (geo != null) {
+ activeGeoList.add(geo);
+ }
- // update the defaultGeos field (needed elsewhere for adjusting default geo state)
+ // update the defaultGeos field (needed elsewhere for adjusting
+ // default geo state)
defaultGeos = activeGeoList;
// update oldDefaultGeo
@@ -243,25 +252,24 @@ public class EuclidianStyleBar extends JToolBar implements ActionListener {
oldDefaultGeo = null;
oldDefaultMode = -1;
} else {
- oldDefaultGeo = defaultGeos.get(0);
+ oldDefaultGeo = defaultGeos.get(0);
oldDefaultMode = defaultGeoMap.get(mode);
}
}
-
+
// we also update stylebars according to just created geos
activeGeoList.addAll(ec.getJustCreatedGeos());
}
-
- //-----------------------------------------------------
+ // -----------------------------------------------------
// update the buttons
// note: this must always be done, even when activeGeoList is empty
- //-----------------------------------------------------
+ // -----------------------------------------------------
updateTableText(activeGeoList.toArray());
- for(int i = 0; i < popupBtnList.length; i++){
+ for (int i = 0; i < popupBtnList.length; i++) {
popupBtnList[i].update(activeGeoList.toArray());
}
- for(int i = 0; i < toggleBtnList.length; i++){
+ for (int i = 0; i < toggleBtnList.length; i++) {
toggleBtnList[i].update(activeGeoList.toArray());
}
@@ -271,120 +279,174 @@ public class EuclidianStyleBar extends JToolBar implements ActionListener {
}
-
-
- private void updateTableText(Object[] geos){
+ private void updateTableText(final Object[] geos) {
tableText = null;
- if (geos == null || geos.length == 0 || mode == EuclidianConstants.MODE_PEN) return;
+ if ((geos == null) || (geos.length == 0)
+ || (mode == EuclidianConstants.MODE_PEN)) {
+ return;
+ }
boolean geosOK = true;
AlgoElement algo;
for (int i = 0; i < geos.length; i++) {
- algo = ((GeoElement)geos[i]).getParentAlgorithm();
- if(algo == null || !(algo instanceof AlgoTableText)){
+ algo = ((GeoElement) geos[i]).getParentAlgorithm();
+ if ((algo == null) || !(algo instanceof AlgoTableText)) {
geosOK = false;
- }
+ }
}
- if(geosOK && geos[0] != null){
- algo = ((GeoElement)geos[0]).getParentAlgorithm();
+ if (geosOK && (geos[0] != null)) {
+ algo = ((GeoElement) geos[0]).getParentAlgorithm();
tableText = (AlgoTableText) algo;
}
}
+ private void createDefaultMap() {
+ defaultGeoMap = new HashMap<Integer, Integer>();
+ defaultGeoMap.put(EuclidianConstants.MODE_POINT,
+ ConstructionDefaults.DEFAULT_POINT_FREE);
+ defaultGeoMap.put(EuclidianConstants.MODE_COMPLEX_NUMBER,
+ ConstructionDefaults.DEFAULT_POINT_FREE);
+ defaultGeoMap.put(EuclidianConstants.MODE_POINT_ON_OBJECT,
+ ConstructionDefaults.DEFAULT_POINT_DEPENDENT);
+ defaultGeoMap.put(EuclidianConstants.MODE_INTERSECT,
+ ConstructionDefaults.DEFAULT_POINT_DEPENDENT);
+ defaultGeoMap.put(EuclidianConstants.MODE_MIDPOINT,
+ ConstructionDefaults.DEFAULT_POINT_DEPENDENT);
+
+ defaultGeoMap.put(EuclidianConstants.MODE_JOIN,
+ ConstructionDefaults.DEFAULT_LINE);
+ defaultGeoMap.put(EuclidianConstants.MODE_SEGMENT,
+ ConstructionDefaults.DEFAULT_SEGMENT);
+ defaultGeoMap.put(EuclidianConstants.MODE_SEGMENT_FIXED,
+ ConstructionDefaults.DEFAULT_SEGMENT);
+ defaultGeoMap.put(EuclidianConstants.MODE_RAY,
+ ConstructionDefaults.DEFAULT_LINE);
+ defaultGeoMap.put(EuclidianConstants.MODE_VECTOR,
+ ConstructionDefaults.DEFAULT_VECTOR);
+ defaultGeoMap.put(EuclidianConstants.MODE_VECTOR_FROM_POINT,
+ ConstructionDefaults.DEFAULT_VECTOR);
+
+ defaultGeoMap.put(EuclidianConstants.MODE_ORTHOGONAL,
+ ConstructionDefaults.DEFAULT_LINE);
+ defaultGeoMap.put(EuclidianConstants.MODE_PARALLEL,
+ ConstructionDefaults.DEFAULT_LINE);
+ defaultGeoMap.put(EuclidianConstants.MODE_LINE_BISECTOR,
+ ConstructionDefaults.DEFAULT_LINE);
+ defaultGeoMap.put(EuclidianConstants.MODE_ANGULAR_BISECTOR,
+ ConstructionDefaults.DEFAULT_LINE);
+ defaultGeoMap.put(EuclidianConstants.MODE_TANGENTS,
+ ConstructionDefaults.DEFAULT_LINE);
+ defaultGeoMap.put(EuclidianConstants.MODE_POLAR_DIAMETER,
+ ConstructionDefaults.DEFAULT_LINE);
+ defaultGeoMap.put(EuclidianConstants.MODE_FITLINE,
+ ConstructionDefaults.DEFAULT_LINE);
+ defaultGeoMap.put(EuclidianConstants.MODE_CREATE_LIST,
+ ConstructionDefaults.DEFAULT_LIST);
+ defaultGeoMap.put(EuclidianConstants.MODE_LOCUS,
+ ConstructionDefaults.DEFAULT_LOCUS);
+
+ defaultGeoMap.put(EuclidianConstants.MODE_POLYGON,
+ ConstructionDefaults.DEFAULT_POLYGON);
+ defaultGeoMap.put(EuclidianConstants.MODE_REGULAR_POLYGON,
+ ConstructionDefaults.DEFAULT_POLYGON);
+ defaultGeoMap.put(EuclidianConstants.MODE_RIGID_POLYGON,
+ ConstructionDefaults.DEFAULT_POLYGON);
+ defaultGeoMap.put(EuclidianConstants.MODE_VECTOR_POLYGON,
+ ConstructionDefaults.DEFAULT_POLYGON);
+ defaultGeoMap.put(EuclidianConstants.MODE_POLYLINE,
+ ConstructionDefaults.DEFAULT_POLYGON);
+
+ defaultGeoMap.put(EuclidianConstants.MODE_CIRCLE_TWO_POINTS,
+ ConstructionDefaults.DEFAULT_CONIC);
+ defaultGeoMap.put(EuclidianConstants.MODE_CIRCLE_POINT_RADIUS,
+ ConstructionDefaults.DEFAULT_CONIC);
+ defaultGeoMap.put(EuclidianConstants.MODE_COMPASSES,
+ ConstructionDefaults.DEFAULT_CONIC);
+ defaultGeoMap.put(EuclidianConstants.MODE_CIRCLE_THREE_POINTS,
+ ConstructionDefaults.DEFAULT_CONIC);
+ defaultGeoMap.put(EuclidianConstants.MODE_SEMICIRCLE,
+ ConstructionDefaults.DEFAULT_CONIC);
+ defaultGeoMap.put(EuclidianConstants.MODE_CIRCLE_ARC_THREE_POINTS,
+ ConstructionDefaults.DEFAULT_CONIC);
+ defaultGeoMap.put(
+ EuclidianConstants.MODE_CIRCUMCIRCLE_ARC_THREE_POINTS,
+ ConstructionDefaults.DEFAULT_CONIC);
+ defaultGeoMap.put(EuclidianConstants.MODE_CIRCLE_SECTOR_THREE_POINTS,
+ ConstructionDefaults.DEFAULT_CONIC_SECTOR);
+ defaultGeoMap.put(
+ EuclidianConstants.MODE_CIRCUMCIRCLE_SECTOR_THREE_POINTS,
+ ConstructionDefaults.DEFAULT_CONIC_SECTOR);
+
+ defaultGeoMap.put(EuclidianConstants.MODE_ELLIPSE_THREE_POINTS,
+ ConstructionDefaults.DEFAULT_CONIC);
+ defaultGeoMap.put(EuclidianConstants.MODE_HYPERBOLA_THREE_POINTS,
+ ConstructionDefaults.DEFAULT_CONIC);
+ defaultGeoMap.put(EuclidianConstants.MODE_PARABOLA,
+ ConstructionDefaults.DEFAULT_CONIC);
+ defaultGeoMap.put(EuclidianConstants.MODE_CONIC_FIVE_POINTS,
+ ConstructionDefaults.DEFAULT_CONIC);
+
+ defaultGeoMap.put(EuclidianConstants.MODE_ANGLE,
+ ConstructionDefaults.DEFAULT_ANGLE);
+ defaultGeoMap.put(EuclidianConstants.MODE_ANGLE_FIXED,
+ ConstructionDefaults.DEFAULT_ANGLE);
+
+ defaultGeoMap.put(EuclidianConstants.MODE_DISTANCE,
+ ConstructionDefaults.DEFAULT_TEXT);
+ defaultGeoMap.put(EuclidianConstants.MODE_AREA,
+ ConstructionDefaults.DEFAULT_TEXT);
+ defaultGeoMap.put(EuclidianConstants.MODE_SLOPE,
+ ConstructionDefaults.DEFAULT_POLYGON);
+
+ defaultGeoMap.put(EuclidianConstants.MODE_MIRROR_AT_LINE,
+ ConstructionDefaults.DEFAULT_NONE);
+ defaultGeoMap.put(EuclidianConstants.MODE_MIRROR_AT_POINT,
+ ConstructionDefaults.DEFAULT_NONE);
+ defaultGeoMap.put(EuclidianConstants.MODE_MIRROR_AT_CIRCLE,
+ ConstructionDefaults.DEFAULT_NONE);
+ defaultGeoMap.put(EuclidianConstants.MODE_ROTATE_BY_ANGLE,
+ ConstructionDefaults.DEFAULT_NONE);
+ defaultGeoMap.put(EuclidianConstants.MODE_TRANSLATE_BY_VECTOR,
+ ConstructionDefaults.DEFAULT_NONE);
+ defaultGeoMap.put(EuclidianConstants.MODE_DILATE_FROM_POINT,
+ ConstructionDefaults.DEFAULT_NONE);
+
+ defaultGeoMap.put(EuclidianConstants.MODE_TEXT,
+ ConstructionDefaults.DEFAULT_TEXT);
+ defaultGeoMap.put(EuclidianConstants.MODE_SLIDER,
+ ConstructionDefaults.DEFAULT_NUMBER);
+ defaultGeoMap.put(EuclidianConstants.MODE_IMAGE,
+ ConstructionDefaults.DEFAULT_IMAGE);
+
+ defaultGeoMap.put(EuclidianConstants.MODE_SHOW_HIDE_CHECKBOX,
+ ConstructionDefaults.DEFAULT_BOOLEAN);
+ defaultGeoMap.put(EuclidianConstants.MODE_BUTTON_ACTION,
+ ConstructionDefaults.DEFAULT_NONE);
+ defaultGeoMap.put(EuclidianConstants.MODE_TEXTFIELD_ACTION,
+ ConstructionDefaults.DEFAULT_NONE);
+ }
+ // =====================================================
+ // Init GUI
+ // =====================================================
- private void createDefaultMap(){
- defaultGeoMap = new HashMap<Integer,Integer>();
- defaultGeoMap.put(EuclidianConstants.MODE_POINT, ConstructionDefaults.DEFAULT_POINT_FREE);
- defaultGeoMap.put(EuclidianConstants.MODE_COMPLEX_NUMBER, ConstructionDefaults.DEFAULT_POINT_FREE);
- defaultGeoMap.put(EuclidianConstants.MODE_POINT_ON_OBJECT, ConstructionDefaults.DEFAULT_POINT_DEPENDENT);
- defaultGeoMap.put(EuclidianConstants.MODE_INTERSECT, ConstructionDefaults.DEFAULT_POINT_DEPENDENT);
- defaultGeoMap.put(EuclidianConstants.MODE_MIDPOINT, ConstructionDefaults.DEFAULT_POINT_DEPENDENT);
-
- defaultGeoMap.put(EuclidianConstants.MODE_JOIN, ConstructionDefaults.DEFAULT_LINE);
- defaultGeoMap.put(EuclidianConstants.MODE_SEGMENT, ConstructionDefaults.DEFAULT_SEGMENT);
- defaultGeoMap.put(EuclidianConstants.MODE_SEGMENT_FIXED, ConstructionDefaults.DEFAULT_SEGMENT);
- defaultGeoMap.put(EuclidianConstants.MODE_RAY, ConstructionDefaults.DEFAULT_LINE);
- defaultGeoMap.put(EuclidianConstants.MODE_VECTOR, ConstructionDefaults.DEFAULT_VECTOR);
- defaultGeoMap.put(EuclidianConstants.MODE_VECTOR_FROM_POINT, ConstructionDefaults.DEFAULT_VECTOR);
-
- defaultGeoMap.put(EuclidianConstants.MODE_ORTHOGONAL, ConstructionDefaults.DEFAULT_LINE);
- defaultGeoMap.put(EuclidianConstants.MODE_PARALLEL, ConstructionDefaults.DEFAULT_LINE);
- defaultGeoMap.put(EuclidianConstants.MODE_LINE_BISECTOR, ConstructionDefaults.DEFAULT_LINE);
- defaultGeoMap.put(EuclidianConstants.MODE_ANGULAR_BISECTOR, ConstructionDefaults.DEFAULT_LINE);
- defaultGeoMap.put(EuclidianConstants.MODE_TANGENTS, ConstructionDefaults.DEFAULT_LINE);
- defaultGeoMap.put(EuclidianConstants.MODE_POLAR_DIAMETER, ConstructionDefaults.DEFAULT_LINE);
- defaultGeoMap.put(EuclidianConstants.MODE_FITLINE, ConstructionDefaults.DEFAULT_LINE);
- defaultGeoMap.put(EuclidianConstants.MODE_CREATE_LIST, ConstructionDefaults.DEFAULT_LIST);
- defaultGeoMap.put(EuclidianConstants.MODE_LOCUS, ConstructionDefaults.DEFAULT_LOCUS);
-
- defaultGeoMap.put(EuclidianConstants.MODE_POLYGON, ConstructionDefaults.DEFAULT_POLYGON);
- defaultGeoMap.put(EuclidianConstants.MODE_REGULAR_POLYGON, ConstructionDefaults.DEFAULT_POLYGON);
- defaultGeoMap.put(EuclidianConstants.MODE_RIGID_POLYGON, ConstructionDefaults.DEFAULT_POLYGON);
- defaultGeoMap.put(EuclidianConstants.MODE_VECTOR_POLYGON, ConstructionDefaults.DEFAULT_POLYGON);
- defaultGeoMap.put(EuclidianConstants.MODE_POLYLINE, ConstructionDefaults.DEFAULT_POLYGON);
-
- defaultGeoMap.put(EuclidianConstants.MODE_CIRCLE_TWO_POINTS, ConstructionDefaults.DEFAULT_CONIC) ;
- defaultGeoMap.put(EuclidianConstants.MODE_CIRCLE_POINT_RADIUS, ConstructionDefaults.DEFAULT_CONIC) ;
- defaultGeoMap.put(EuclidianConstants.MODE_COMPASSES, ConstructionDefaults.DEFAULT_CONIC) ;
- defaultGeoMap.put(EuclidianConstants.MODE_CIRCLE_THREE_POINTS, ConstructionDefaults.DEFAULT_CONIC) ;
- defaultGeoMap.put(EuclidianConstants.MODE_SEMICIRCLE, ConstructionDefaults.DEFAULT_CONIC) ;
- defaultGeoMap.put(EuclidianConstants.MODE_CIRCLE_ARC_THREE_POINTS, ConstructionDefaults.DEFAULT_CONIC) ;
- defaultGeoMap.put(EuclidianConstants.MODE_CIRCUMCIRCLE_ARC_THREE_POINTS, ConstructionDefaults.DEFAULT_CONIC) ;
- defaultGeoMap.put(EuclidianConstants.MODE_CIRCLE_SECTOR_THREE_POINTS, ConstructionDefaults.DEFAULT_CONIC_SECTOR) ;
- defaultGeoMap.put(EuclidianConstants.MODE_CIRCUMCIRCLE_SECTOR_THREE_POINTS, ConstructionDefaults.DEFAULT_CONIC_SECTOR) ;
-
- defaultGeoMap.put(EuclidianConstants.MODE_ELLIPSE_THREE_POINTS, ConstructionDefaults.DEFAULT_CONIC) ;
- defaultGeoMap.put(EuclidianConstants.MODE_HYPERBOLA_THREE_POINTS, ConstructionDefaults.DEFAULT_CONIC) ;
- defaultGeoMap.put(EuclidianConstants.MODE_PARABOLA, ConstructionDefaults.DEFAULT_CONIC) ;
- defaultGeoMap.put(EuclidianConstants.MODE_CONIC_FIVE_POINTS, ConstructionDefaults.DEFAULT_CONIC) ;
-
- defaultGeoMap.put(EuclidianConstants.MODE_ANGLE, ConstructionDefaults.DEFAULT_ANGLE) ;
- defaultGeoMap.put(EuclidianConstants.MODE_ANGLE_FIXED, ConstructionDefaults.DEFAULT_ANGLE) ;
-
- defaultGeoMap.put(EuclidianConstants.MODE_DISTANCE, ConstructionDefaults.DEFAULT_TEXT) ;
- defaultGeoMap.put(EuclidianConstants.MODE_AREA, ConstructionDefaults.DEFAULT_TEXT) ;
- defaultGeoMap.put(EuclidianConstants.MODE_SLOPE, ConstructionDefaults.DEFAULT_POLYGON) ;
-
- defaultGeoMap.put(EuclidianConstants.MODE_MIRROR_AT_LINE, ConstructionDefaults.DEFAULT_NONE) ;
- defaultGeoMap.put(EuclidianConstants.MODE_MIRROR_AT_POINT, ConstructionDefaults.DEFAULT_NONE) ;
- defaultGeoMap.put(EuclidianConstants.MODE_MIRROR_AT_CIRCLE, ConstructionDefaults.DEFAULT_NONE) ;
- defaultGeoMap.put(EuclidianConstants.MODE_ROTATE_BY_ANGLE, ConstructionDefaults.DEFAULT_NONE) ;
- defaultGeoMap.put(EuclidianConstants.MODE_TRANSLATE_BY_VECTOR, ConstructionDefaults.DEFAULT_NONE) ;
- defaultGeoMap.put(EuclidianConstants.MODE_DILATE_FROM_POINT, ConstructionDefaults.DEFAULT_NONE) ;
-
- defaultGeoMap.put(EuclidianConstants.MODE_TEXT, ConstructionDefaults.DEFAULT_TEXT) ;
- defaultGeoMap.put(EuclidianConstants.MODE_SLIDER, ConstructionDefaults.DEFAULT_NUMBER) ;
- defaultGeoMap.put(EuclidianConstants.MODE_IMAGE, ConstructionDefaults.DEFAULT_IMAGE) ;
-
- defaultGeoMap.put(EuclidianConstants.MODE_SHOW_HIDE_CHECKBOX, ConstructionDefaults.DEFAULT_BOOLEAN) ;
- defaultGeoMap.put(EuclidianConstants.MODE_BUTTON_ACTION, ConstructionDefaults.DEFAULT_NONE) ;
- defaultGeoMap.put(EuclidianConstants.MODE_TEXTFIELD_ACTION, ConstructionDefaults.DEFAULT_NONE) ;
- }
-
-
-
- //=====================================================
- // Init GUI
- //=====================================================
-
private void initGUI() {
-
+
removeAll();
-
+
createButtons();
createColorButton();
createBgColorButton();
createTextButtons();
-
+
// add the buttons --- order matters here
add(btnShowAxes);
add(btnShowGrid);
addBtnPointCapture();
-
+
add(btnColor);
add(btnBgColor);
add(btnTextColor);
@@ -393,492 +455,495 @@ public class EuclidianStyleBar extends JToolBar implements ActionListener {
add(btnBold);
add(btnItalic);
add(btnTextSize);
-
+
createTableTextButtons();
add(btnTableTextJustify);
add(btnTableTextLinesV);
add(btnTableTextLinesH);
add(btnTableTextBracket);
-
- // add(btnPenEraser);
- //add(btnHideShowLabel);
+
+ // add(btnPenEraser);
+ // add(btnHideShowLabel);
add(btnLabelStyle);
- //add(btnPointCapture);
+ // add(btnPointCapture);
addBtnRotateView();
- // add(btnPenDelete);
-
+ // add(btnPenDelete);
+
popupBtnList = newPopupBtnList();
toggleBtnList = newToggleBtnList();
-
- for(int i=0; i< popupBtnList.length; i++){
- //popupBtnList[i].setStandardButton(true);
+
+ for (int i = 0; i < popupBtnList.length; i++) {
+ // popupBtnList[i].setStandardButton(true);
}
-
-
+
}
-
- protected PopupMenuButton[] newPopupBtnList(){
- return new PopupMenuButton[]{
- btnColor, btnBgColor, btnTextColor, btnLineStyle, btnPointStyle, btnTextSize,
- btnTableTextJustify, btnTableTextBracket, btnLabelStyle, btnPointCapture};
+
+ protected PopupMenuButton[] newPopupBtnList() {
+ return new PopupMenuButton[] { btnColor, btnBgColor, btnTextColor,
+ btnLineStyle, btnPointStyle, btnTextSize, btnTableTextJustify,
+ btnTableTextBracket, btnLabelStyle, btnPointCapture };
}
-
- protected MyToggleButton[] newToggleBtnList(){
- return new MyToggleButton[]{
- btnCopyVisualStyle, btnPen, btnShowGrid, btnShowAxes,
- btnBold, btnItalic, btnDelete, btnLabel, btnPenEraser, btnHideShowLabel, btnTableTextLinesV, btnTableTextLinesH};
+
+ protected MyToggleButton[] newToggleBtnList() {
+ return new MyToggleButton[] { btnCopyVisualStyle, btnPen, btnShowGrid,
+ btnShowAxes, btnBold, btnItalic, btnDelete, btnLabel,
+ btnPenEraser, btnHideShowLabel, btnTableTextLinesV,
+ btnTableTextLinesH };
}
-
-
- protected void addBtnPointCapture(){
+
+ protected void addBtnPointCapture() {
add(btnPointCapture);
}
-
- protected void addBtnRotateView(){
+
+ protected void addBtnRotateView() {
}
-
- //=====================================================
- // Create Buttons
- //=====================================================
-
+
+ // =====================================================
+ // Create Buttons
+ // =====================================================
+
protected void createButtons() {
-
- //========================================
+
+ // ========================================
// mode button
-
- ImageIcon[] modeArray = new ImageIcon[]{
+
+ final ImageIcon[] modeArray = new ImageIcon[] {
app.getImageIcon("cursor_arrow.png"),
app.getImageIcon("applications-graphics.png"),
app.getImageIcon("delete_small.gif"),
app.getImageIcon("mode_point_16.gif"),
- app.getImageIcon("mode_copyvisualstyle_16.png")
- };
- btnMode = new PopupMenuButton(ev.getApplication(), modeArray, -1,1,
- new Dimension(20,iconHeight), SelectionTable.MODE_ICON);
+ app.getImageIcon("mode_copyvisualstyle_16.png") };
+ btnMode = new PopupMenuButton(ev.getApplication(), modeArray, -1, 1,
+ new Dimension(20, iconHeight), SelectionTable.MODE_ICON);
btnMode.addActionListener(this);
btnMode.setKeepVisible(false);
- //add(btnMode);
-
-
- //========================================
+ // add(btnMode);
+
+ // ========================================
// pen button
- btnPen = new MyToggleButton(ev.getApplication().getImageIcon("applications-graphics.png")){
- @Override
- public void update(Object[] geos) {
- this.setVisible((geos.length == 0 && mode == EuclidianConstants.MODE_MOVE) || mode == EuclidianConstants.MODE_PEN);
- }
- };
+ btnPen = new MyToggleButton(ev.getApplication().getImageIcon(
+ "applications-graphics.png")) {
+ @Override
+ public void update(final Object[] geos) {
+ setVisible(((geos.length == 0) && (mode == EuclidianConstants.MODE_MOVE))
+ || (mode == EuclidianConstants.MODE_PEN));
+ }
+ };
btnPen.addActionListener(this);
- //add(btnPen);
+ // add(btnPen);
-
- //========================================
+ // ========================================
// delete button
- btnDelete = new MyToggleButton(ev.getApplication().getImageIcon("delete_small.gif")){
- @Override
- public void update(Object[] geos) {
- this.setVisible((geos.length == 0 && mode == EuclidianConstants.MODE_MOVE) || mode == EuclidianConstants.MODE_DELETE);
- }
- };
+ btnDelete = new MyToggleButton(ev.getApplication().getImageIcon(
+ "delete_small.gif")) {
+ @Override
+ public void update(final Object[] geos) {
+ setVisible(((geos.length == 0) && (mode == EuclidianConstants.MODE_MOVE))
+ || (mode == EuclidianConstants.MODE_DELETE));
+ }
+ };
btnDelete.addActionListener(this);
- //add(btnDelete);
-
-
-
- //========================================
+ // add(btnDelete);
+
+ // ========================================
// hide/show labels button
- btnLabel = new MyToggleButton(ev.getApplication().getImageIcon("mode_copyvisualstyle_16.png")){
- @Override
- public void update(Object[] geos) {
- this.setVisible((geos.length == 0 && mode == EuclidianConstants.MODE_MOVE) || mode == EuclidianConstants.MODE_SHOW_HIDE_LABEL);
- }
- };
+ btnLabel = new MyToggleButton(ev.getApplication().getImageIcon(
+ "mode_copyvisualstyle_16.png")) {
+ @Override
+ public void update(final Object[] geos) {
+ setVisible(((geos.length == 0) && (mode == EuclidianConstants.MODE_MOVE))
+ || (mode == EuclidianConstants.MODE_SHOW_HIDE_LABEL));
+ }
+ };
btnLabel.addActionListener(this);
- //add(btnLabel);
-
-
- //========================================
+ // add(btnLabel);
+
+ // ========================================
// visual style button
-
- btnCopyVisualStyle = new MyToggleButton(ev.getApplication().getImageIcon("mode_copyvisualstyle_16.png")){
- @Override
- public void update(Object[] geos) {
- this.setVisible( (geos.length > 0 && mode == EuclidianConstants.MODE_MOVE) || mode == EuclidianConstants.MODE_VISUAL_STYLE);
- }
+
+ btnCopyVisualStyle = new MyToggleButton(ev.getApplication()
+ .getImageIcon("mode_copyvisualstyle_16.png")) {
+ @Override
+ public void update(final Object[] geos) {
+ setVisible(((geos.length > 0) && (mode == EuclidianConstants.MODE_MOVE))
+ || (mode == EuclidianConstants.MODE_VISUAL_STYLE));
+ }
};
btnCopyVisualStyle.addActionListener(this);
- //add(this.btnCopyVisualStyle);
-
-
- //========================================
- // show axes button
- btnShowAxes = new MyToggleButton(app.getImageIcon("axes.gif")){
- @Override
- public void update(Object[] geos) {
- // always show this button unless in pen mode
- this.setVisible(mode != EuclidianConstants.MODE_PEN);
- }
+ // add(this.btnCopyVisualStyle);
+
+ // ========================================
+ // show axes button
+ btnShowAxes = new MyToggleButton(app.getImageIcon("axes.gif")) {
+ @Override
+ public void update(final Object[] geos) {
+ // always show this button unless in pen mode
+ setVisible(mode != EuclidianConstants.MODE_PEN);
+ }
};
-
- //btnShowAxes.setPreferredSize(new Dimension(16,16));
+
+ // btnShowAxes.setPreferredSize(new Dimension(16,16));
btnShowAxes.addActionListener(this);
-
-
-
- //========================================
+
+ // ========================================
// show grid button
- btnShowGrid = new MyToggleButton(app.getImageIcon("grid.gif")){
- @Override
- public void update(Object[] geos) {
- // always show this button unless in pen mode
- this.setVisible(mode != EuclidianConstants.MODE_PEN);
- }
- };
- //btnShowGrid.setPreferredSize(new Dimension(16,16));
+ btnShowGrid = new MyToggleButton(app.getImageIcon("grid.gif")) {
+ @Override
+ public void update(final Object[] geos) {
+ // always show this button unless in pen mode
+ setVisible(mode != EuclidianConstants.MODE_PEN);
+ }
+ };
+ // btnShowGrid.setPreferredSize(new Dimension(16,16));
btnShowGrid.addActionListener(this);
-
-
-
-
- //========================================
+
+ // ========================================
// line style button
-
+
// create line style icon array
- final Dimension lineStyleIconSize = new Dimension(80,iconHeight);
- ImageIcon[] lineStyleIcons = new ImageIcon[lineStyleArray.length];
- for(int i=0; i < lineStyleArray.length; i++)
- lineStyleIcons[i] = GeoGebraIcon.createLineStyleIcon( lineStyleArray[i], 2, lineStyleIconSize, Color.BLACK, null);
-
+ final Dimension lineStyleIconSize = new Dimension(80, iconHeight);
+ final ImageIcon[] lineStyleIcons = new ImageIcon[lineStyleArray.length];
+ for (int i = 0; i < lineStyleArray.length; i++) {
+ lineStyleIcons[i] = GeoGebraIcon.createLineStyleIcon(
+ lineStyleArray[i], 2, lineStyleIconSize, Color.BLACK, null);
+ }
+
// create button
- btnLineStyle = new PopupMenuButton(app, lineStyleIcons, -1,1,
- lineStyleIconSize, SelectionTable.MODE_ICON){
+ btnLineStyle = new PopupMenuButton(app, lineStyleIcons, -1, 1,
+ lineStyleIconSize, SelectionTable.MODE_ICON) {
@Override
- public void update(Object[] geos) {
+ public void update(final Object[] geos) {
- if( mode == EuclidianConstants.MODE_PEN){
- this.setVisible(true);
+ if (mode == EuclidianConstants.MODE_PEN) {
+ setVisible(true);
setFgColor(ec.getPen().getPenColor());
setSliderValue(ec.getPen().getPenSize());
- setSelectedIndex(lineStyleMap.get(ec.getPen().getPenLineStyle()));
- }else{
- boolean geosOK = (geos.length > 0 );
+ setSelectedIndex(lineStyleMap.get(ec.getPen()
+ .getPenLineStyle()));
+ } else {
+ boolean geosOK = (geos.length > 0);
for (int i = 0; i < geos.length; i++) {
- GeoElement geo = ((GeoElement) geos[i]).getGeoElementForPropertiesDialog();
+ final GeoElement geo = ((GeoElement) geos[i])
+ .getGeoElementForPropertiesDialog();
if (!(geo.isPath()
- || (geo.isGeoList() ? ((GeoList)geo).showLineProperties() : false )
- || (geo.isGeoNumeric() ? ( ((GeoNumeric) geo).isDrawable() || ((GeoNumeric) geo).isSliderFixed() ) : false)
- || geo.isGeoAngle())) {
+ || (geo.isGeoList() ? ((GeoList) geo)
+ .showLineProperties() : false)
+ || (geo.isGeoNumeric() ? (((GeoNumeric) geo)
+ .isDrawable() || ((GeoNumeric) geo)
+ .isSliderFixed()) : false) || geo
+ .isGeoAngle())) {
geosOK = false;
break;
}
}
- this.setVisible(geosOK);
+ setVisible(geosOK);
- if(geosOK){
- //setFgColor(((GeoElement)geos[0]).getObjectColor());
+ if (geosOK) {
+ // setFgColor(((GeoElement)geos[0]).getObjectColor());
setFgColor(Color.black);
- setSliderValue( ((GeoElement)geos[0]).getLineThickness());
+ setSliderValue(((GeoElement) geos[0])
+ .getLineThickness());
- setSelectedIndex(lineStyleMap.get(((GeoElement)geos[0]).getLineType()));
+ setSelectedIndex(lineStyleMap
+ .get(((GeoElement) geos[0]).getLineType()));
- this.setKeepVisible(mode == EuclidianConstants.MODE_MOVE);
- }
+ setKeepVisible(mode == EuclidianConstants.MODE_MOVE);
+ }
}
}
- public ImageIcon getButtonIcon(){
- if(getSelectedIndex() > -1)
- return GeoGebraIcon.createLineStyleIcon( lineStyleArray[this.getSelectedIndex()],
- this.getSliderValue(), lineStyleIconSize, Color.BLACK, null);
- else
- return GeoGebraIcon.createEmptyIcon(lineStyleIconSize.width, lineStyleIconSize.height);
+ @Override
+ public ImageIcon getButtonIcon() {
+ if (getSelectedIndex() > -1) {
+ return GeoGebraIcon.createLineStyleIcon(
+ lineStyleArray[getSelectedIndex()],
+ getSliderValue(), lineStyleIconSize, Color.BLACK,
+ null);
+ } else {
+ return GeoGebraIcon.createEmptyIcon(
+ lineStyleIconSize.width, lineStyleIconSize.height);
+ }
}
-
+
};
-
+
btnLineStyle.getMySlider().setMinimum(1);
btnLineStyle.getMySlider().setMaximum(13);
btnLineStyle.getMySlider().setMajorTickSpacing(2);
btnLineStyle.getMySlider().setMinorTickSpacing(1);
- btnLineStyle.getMySlider().setPaintTicks(true);
+ btnLineStyle.getMySlider().setPaintTicks(true);
btnLineStyle.addActionListener(this);
-
-
- //========================================
+
+ // ========================================
// point style button
// create line style icon array
- final Dimension pointStyleIconSize = new Dimension(20,iconHeight);
- ImageIcon[] pointStyleIcons = new ImageIcon[pointStyleArray.length];
- for(int i=0; i < pointStyleArray.length; i++)
- pointStyleIcons[i] = GeoGebraIcon.createPointStyleIcon( pointStyleArray[i], 4, pointStyleIconSize, Color.BLACK, null);
-
+ final Dimension pointStyleIconSize = new Dimension(20, iconHeight);
+ final ImageIcon[] pointStyleIcons = new ImageIcon[pointStyleArray.length];
+ for (int i = 0; i < pointStyleArray.length; i++) {
+ pointStyleIcons[i] = GeoGebraIcon.createPointStyleIcon(
+ pointStyleArray[i], 4, pointStyleIconSize, Color.BLACK,
+ null);
+ }
+
// create button
- btnPointStyle = new PopupMenuButton(app, pointStyleIcons, 2, -1,
- pointStyleIconSize, SelectionTable.MODE_ICON){
+ btnPointStyle = new PopupMenuButton(app, pointStyleIcons, 2, -1,
+ pointStyleIconSize, SelectionTable.MODE_ICON) {
@Override
- public void update(Object[] geos) {
+ public void update(final Object[] geos) {
GeoElement geo;
- boolean geosOK = (geos.length > 0 );
+ boolean geosOK = (geos.length > 0);
for (int i = 0; i < geos.length; i++) {
- geo = (GeoElement)geos[i];
+ geo = (GeoElement) geos[i];
if (!(geo.getGeoElementForPropertiesDialog().isGeoPoint())
- && (!(geo.isGeoList() && ((GeoList)geo).showPointProperties()))) {
+ && (!(geo.isGeoList() && ((GeoList) geo)
+ .showPointProperties()))) {
geosOK = false;
break;
}
}
- this.setVisible(geosOK);
+ setVisible(geosOK);
- if(geosOK){
- //setFgColor(((GeoElement)geos[0]).getObjectColor());
+ if (geosOK) {
+ // setFgColor(((GeoElement)geos[0]).getObjectColor());
setFgColor(Color.black);
-
+
// if geo is a matrix, this will return a GeoNumeric...
- geo = ((GeoElement)geos[0]).getGeoElementForPropertiesDialog();
-
+ geo = ((GeoElement) geos[0])
+ .getGeoElementForPropertiesDialog();
+
// ... so need to check
if (geo instanceof PointProperties) {
- setSliderValue( ((PointProperties)geo).getPointSize());
- int pointStyle = ((PointProperties)geo).getPointStyle();
- if(pointStyle == -1) // global default point style
- pointStyle = ev.getPointStyle();
+ setSliderValue(((PointProperties) geo).getPointSize());
+ int pointStyle = ((PointProperties) geo)
+ .getPointStyle();
+ if (pointStyle == -1) {
+ pointStyle = ev.getPointStyle();
+ }
setSelectedIndex(pointStyleMap.get(pointStyle));
- this.setKeepVisible(mode == EuclidianConstants.MODE_MOVE);
+ setKeepVisible(mode == EuclidianConstants.MODE_MOVE);
}
}
}
-
- public ImageIcon getButtonIcon(){
- if(getSelectedIndex() > -1)
- return GeoGebraIcon.createPointStyleIcon( pointStyleArray[this.getSelectedIndex()],
- this.getSliderValue(), pointStyleIconSize, Color.BLACK, null);
- else
- return GeoGebraIcon.createEmptyIcon(pointStyleIconSize.width, pointStyleIconSize.height);
+
+ @Override
+ public ImageIcon getButtonIcon() {
+ if (getSelectedIndex() > -1) {
+ return GeoGebraIcon.createPointStyleIcon(
+ pointStyleArray[getSelectedIndex()],
+ getSliderValue(), pointStyleIconSize, Color.BLACK,
+ null);
+ } else {
+ return GeoGebraIcon
+ .createEmptyIcon(pointStyleIconSize.width,
+ pointStyleIconSize.height);
+ }
}
-
-
-
+
};
btnPointStyle.getMySlider().setMinimum(1);
btnPointStyle.getMySlider().setMaximum(9);
btnPointStyle.getMySlider().setMajorTickSpacing(2);
btnPointStyle.getMySlider().setMinorTickSpacing(1);
- btnPointStyle.getMySlider().setPaintTicks(true);
+ btnPointStyle.getMySlider().setPaintTicks(true);
btnPointStyle.addActionListener(this);
-
-
- //========================================
+
+ // ========================================
// eraser button
- btnPenEraser = new MyToggleButton(app.getImageIcon("delete_small.gif")){
+ btnPenEraser = new MyToggleButton(app.getImageIcon("delete_small.gif")) {
@Override
- public void update(Object[] geos) {
- this.setVisible(mode == EuclidianConstants.MODE_PEN);
- }
+ public void update(final Object[] geos) {
+ setVisible(mode == EuclidianConstants.MODE_PEN);
+ }
};
btnPenEraser.addActionListener(this);
-
-
- //========================================
+
+ // ========================================
// delete geo button
btnDeleteGeo = new JButton(app.getImageIcon("delete_small.gif"));
btnDeleteGeo.addActionListener(this);
- //add(btnDeleteGeo);
-
-
-
- //========================================
+ // add(btnDeleteGeo);
+
+ // ========================================
// hide/show label button
- btnHideShowLabel = new MyToggleButton(app.getImageIcon("mode_showhidelabel_16.gif")){
+ btnHideShowLabel = new MyToggleButton(
+ app.getImageIcon("mode_showhidelabel_16.gif")) {
@Override
- public void update(Object[] geos) {
- // only show this button when handling selection, do not use it for defaults
- if(mode != EuclidianConstants.MODE_MOVE){
- this.setVisible(false);
+ public void update(final Object[] geos) {
+ // only show this button when handling selection, do not use it
+ // for defaults
+ if (mode != EuclidianConstants.MODE_MOVE) {
+ setVisible(false);
return;
}
boolean geosOK = (geos.length > 0);
for (int i = 0; i < geos.length; i++) {
- if ((((GeoElement)geos[i]).getGeoElementForPropertiesDialog().isGeoText())) {
+ if ((((GeoElement) geos[i])
+ .getGeoElementForPropertiesDialog().isGeoText())) {
geosOK = false;
break;
}
}
- this.setVisible(geosOK);
- if(geosOK){
- btnHideShowLabel.setSelected(((GeoElement)geos[0]).isLabelVisible());
+ setVisible(geosOK);
+ if (geosOK) {
+ btnHideShowLabel.setSelected(((GeoElement) geos[0])
+ .isLabelVisible());
}
- }
-
+ }
+
};
btnHideShowLabel.addActionListener(this);
-
-
-
-
- //========================================
+
+ // ========================================
// caption style button
- String[] captionArray = new String[] {
+ final String[] captionArray = new String[] {
app.getPlain("stylebar.Hidden"), // index 4
app.getPlain("Name"), // index 0
app.getPlain("NameAndValue"), // index 1
app.getPlain("Value"), // index 2
app.getPlain("Caption") // index 3
-
- };
+ };
- btnLabelStyle = new PopupMenuButton(app, captionArray, -1, 1,
- new Dimension(0, iconHeight), SelectionTable.MODE_TEXT){
+ btnLabelStyle = new PopupMenuButton(app, captionArray, -1, 1,
+ new Dimension(0, iconHeight), SelectionTable.MODE_TEXT) {
@Override
- public void update(Object[] geos) {
+ public void update(final Object[] geos) {
boolean geosOK = false;
GeoElement geo = null;
if (mode == EuclidianConstants.MODE_MOVE) {
for (int i = 0; i < geos.length; i++) {
- if (((GeoElement)geos[i]).isLabelShowable() ||
- ((GeoElement)geos[i]).isGeoAngle() ||
- (((GeoElement)geos[i]).isGeoNumeric() ? ((GeoNumeric)geos[i]).isSliderFixed() : false)) {
- geo = (GeoElement)geos[i];
+ if (((GeoElement) geos[i]).isLabelShowable()
+ || ((GeoElement) geos[i]).isGeoAngle()
+ || (((GeoElement) geos[i]).isGeoNumeric() ? ((GeoNumeric) geos[i])
+ .isSliderFixed() : false)) {
+ geo = (GeoElement) geos[i];
geosOK = true;
break;
}
}
} else if (app.getLabelingStyle() == ConstructionDefaults.LABEL_VISIBLE_ALWAYS_OFF) {
- this.setVisible(false);
+ setVisible(false);
return;
} else if (app.getLabelingStyle() == ConstructionDefaults.LABEL_VISIBLE_POINTS_ONLY) {
for (int i = 0; i < geos.length; i++) {
- if (((GeoElement)geos[i]).isLabelShowable() &&
- ((GeoElement)geos[i]).isGeoPoint()) {
- geo = (GeoElement)geos[i];
+ if (((GeoElement) geos[i]).isLabelShowable()
+ && ((GeoElement) geos[i]).isGeoPoint()) {
+ geo = (GeoElement) geos[i];
geosOK = true;
break;
}
}
} else {
for (int i = 0; i < geos.length; i++) {
- if (((GeoElement)geos[i]).isLabelShowable() ||
- ((GeoElement)geos[i]).isGeoAngle() ||
- (((GeoElement)geos[i]).isGeoNumeric() ? ((GeoNumeric)geos[i]).isSliderFixed() : false)) {
- geo = (GeoElement)geos[i];
+ if (((GeoElement) geos[i]).isLabelShowable()
+ || ((GeoElement) geos[i]).isGeoAngle()
+ || (((GeoElement) geos[i]).isGeoNumeric() ? ((GeoNumeric) geos[i])
+ .isSliderFixed() : false)) {
+ geo = (GeoElement) geos[i];
geosOK = true;
break;
}
}
}
- this.setVisible(geosOK);
-
- if(geosOK){
- if(!geo.isLabelVisible())
+ setVisible(geosOK);
+
+ if (geosOK) {
+ if (!geo.isLabelVisible()) {
setSelectedIndex(0);
- else
- setSelectedIndex(geo.getLabelMode()+1);
-
+ } else {
+ setSelectedIndex(geo.getLabelMode() + 1);
+ }
+
}
- }
-
- public ImageIcon getButtonIcon(){
- return (ImageIcon) this.getIcon();
}
-
- };
- ImageIcon ic = app.getImageIcon("mode_showhidelabel_16.gif");
- btnLabelStyle.setIconSize(new Dimension(ic.getIconWidth(),iconHeight));
+ @Override
+ public ImageIcon getButtonIcon() {
+ return (ImageIcon) getIcon();
+ }
+
+ };
+ final ImageIcon ic = app.getImageIcon("mode_showhidelabel_16.gif");
+ btnLabelStyle.setIconSize(new Dimension(ic.getIconWidth(), iconHeight));
btnLabelStyle.setIcon(ic);
btnLabelStyle.addActionListener(this);
btnLabelStyle.setKeepVisible(false);
-
-
-
- //========================================
+ // ========================================
// point capture button
-
- String[] strPointCapturing = {
- app.getMenu("Labeling.automatic"),
- app.getMenu("SnapToGrid"),
- app.getMenu("FixedToGrid"),
+
+ final String[] strPointCapturing = { app.getMenu("Labeling.automatic"),
+ app.getMenu("SnapToGrid"), app.getMenu("FixedToGrid"),
app.getMenu("off") };
- btnPointCapture = new PopupMenuButton(app, strPointCapturing, -1, 1,
- new Dimension(0, iconHeight), SelectionTable.MODE_TEXT){
-
+ btnPointCapture = new PopupMenuButton(app, strPointCapturing, -1, 1,
+ new Dimension(0, iconHeight), SelectionTable.MODE_TEXT) {
+
@Override
- public void update(Object[] geos) {
+ public void update(final Object[] geos) {
// always show this button unless in pen mode
- this.setVisible(mode != EuclidianConstants.MODE_PEN);
-
- }
-
- public ImageIcon getButtonIcon(){
- return (ImageIcon) this.getIcon();
+ setVisible(mode != EuclidianConstants.MODE_PEN);
+
+ }
+
+ @Override
+ public ImageIcon getButtonIcon() {
+ return (ImageIcon) getIcon();
}
- };
- ImageIcon ptCaptureIcon = app.getImageIcon("magnet.gif");
- btnPointCapture.setIconSize(new Dimension(ptCaptureIcon.getIconWidth(),iconHeight));
+ };
+ final ImageIcon ptCaptureIcon = app.getImageIcon("magnet.gif");
+ btnPointCapture.setIconSize(new Dimension(ptCaptureIcon.getIconWidth(),
+ iconHeight));
btnPointCapture.setIcon(ptCaptureIcon);
btnPointCapture.addActionListener(this);
btnPointCapture.setKeepVisible(false);
-
-
-
-
-
-
-
-
-
-
- //========================================
+
+ // ========================================
// pen delete button
btnPenDelete = new JButton("\u2718");
- Dimension d = new Dimension(iconHeight,iconHeight);
+ final Dimension d = new Dimension(iconHeight, iconHeight);
btnPenDelete.setPreferredSize(d);
btnPenDelete.setMaximumSize(d);
btnPenDelete.addActionListener(this);
}
-
-
-
-
-
-
- //========================================
- // object color button (color for everything except text)
+ // ========================================
+ // object color button (color for everything except text)
- private void createColorButton(){
-
- final Dimension colorIconSize = new Dimension(20,iconHeight);
- btnColor = new ColorPopupMenuButton(app, colorIconSize, ColorPopupMenuButton.COLORSET_DEFAULT, true) {
+ private void createColorButton() {
+
+ final Dimension colorIconSize = new Dimension(20, iconHeight);
+ btnColor = new ColorPopupMenuButton(app, colorIconSize,
+ ColorPopupMenuButton.COLORSET_DEFAULT, true) {
@Override
- public void update(Object[] geos) {
+ public void update(final Object[] geos) {
+
+ if (mode == EuclidianConstants.MODE_PEN) {
+ setVisible(true);
- if( mode == EuclidianConstants.MODE_PEN){
- this.setVisible(true);
-
setSelectedIndex(getColorIndex(ec.getPen().getPenColor()));
-
+
setSliderValue(100);
getMySlider().setVisible(false);
- }else{
- boolean geosOK = (geos.length > 0 || mode == EuclidianConstants.MODE_PEN);
+ } else {
+ boolean geosOK = ((geos.length > 0) || (mode == EuclidianConstants.MODE_PEN));
for (int i = 0; i < geos.length; i++) {
- GeoElement geo = ((GeoElement)geos[i]).getGeoElementForPropertiesDialog();
- if (geo instanceof GeoImage || geo instanceof GeoText){
+ final GeoElement geo = ((GeoElement) geos[i])
+ .getGeoElementForPropertiesDialog();
+ if ((geo instanceof GeoImage)
+ || (geo instanceof GeoText)) {
geosOK = false;
break;
}
@@ -886,13 +951,14 @@ public class EuclidianStyleBar extends JToolBar implements ActionListener {
setVisible(geosOK);
- if(geosOK){
+ if (geosOK) {
// get color from first geo
Color geoColor;
geoColor = ((GeoElement) geos[0]).getObjectColor();
-
+
// check if selection contains a fillable geo
- // if true, then set slider to first fillable's alpha value
+ // if true, then set slider to first fillable's alpha
+ // value
float alpha = 1.0f;
boolean hasFillable = false;
for (int i = 0; i < geos.length; i++) {
@@ -902,48 +968,49 @@ public class EuclidianStyleBar extends JToolBar implements ActionListener {
break;
}
}
-
- if(hasFillable)
- setToolTipText(app.getPlain("stylebar.ColorTransparency"));
- else
+
+ if (hasFillable) {
+ setToolTipText(app
+ .getPlain("stylebar.ColorTransparency"));
+ } else {
setToolTipText(app.getPlain("stylebar.Color"));
-
- getMySlider().setVisible(hasFillable);
+ }
+
+ getMySlider().setVisible(hasFillable);
setSliderValue(Math.round(alpha * 100));
updateColorTable();
-
- // find the geoColor in the table and select it
- int index = this.getColorIndex(geoColor);
+
+ // find the geoColor in the table and select it
+ final int index = getColorIndex(geoColor);
setSelectedIndex(index);
setDefaultColor(alpha, geoColor);
- this.setKeepVisible(mode == EuclidianConstants.MODE_MOVE);
+ setKeepVisible(mode == EuclidianConstants.MODE_MOVE);
}
}
}
-
+
};
btnColor.addActionListener(this);
}
+ private void createBgColorButton() {
+ final Dimension bgColorIconSize = new Dimension(20, iconHeight);
+ btnBgColor = new ColorPopupMenuButton(app, bgColorIconSize,
+ ColorPopupMenuButton.COLORSET_BGCOLOR, false) {
- private void createBgColorButton(){
-
- final Dimension bgColorIconSize = new Dimension(20,iconHeight);
-
- btnBgColor = new ColorPopupMenuButton(app, bgColorIconSize, ColorPopupMenuButton.COLORSET_BGCOLOR, false) {
-
@Override
- public void update(Object[] geos) {
+ public void update(final Object[] geos) {
boolean geosOK = (geos.length > 0);
for (int i = 0; i < geos.length; i++) {
- GeoElement geo = ((GeoElement)geos[i]).getGeoElementForPropertiesDialog();
- if (!(geo instanceof GeoText)){
+ final GeoElement geo = ((GeoElement) geos[i])
+ .getGeoElementForPropertiesDialog();
+ if (!(geo instanceof GeoText)) {
geosOK = false;
break;
}
@@ -951,40 +1018,35 @@ public class EuclidianStyleBar extends JToolBar implements ActionListener {
setVisible(geosOK);
- if(geosOK){
+ if (geosOK) {
// get color from first geo
Color geoColor;
geoColor = ((GeoElement) geos[0]).getBackgroundColor();
-
+
/*
- // check if selection contains a fillable geo
- // if true, then set slider to first fillable's alpha value
- float alpha = 1.0f;
- boolean hasFillable = false;
- for (int i = 0; i < geos.length; i++) {
- if (((GeoElement) geos[i]).isFillable()) {
- hasFillable = true;
- alpha = ((GeoElement) geos[i]).getAlphaValue();
- break;
- }
- }
- getMySlider().setVisible(hasFillable);
- setSliderValue(Math.round(alpha * 100));
-
- */
- float alpha = 1.0f;
+ * // check if selection contains a fillable geo // if true,
+ * then set slider to first fillable's alpha value float
+ * alpha = 1.0f; boolean hasFillable = false; for (int i =
+ * 0; i < geos.length; i++) { if (((GeoElement)
+ * geos[i]).isFillable()) { hasFillable = true; alpha =
+ * ((GeoElement) geos[i]).getAlphaValue(); break; } }
+ * getMySlider().setVisible(hasFillable);
+ * setSliderValue(Math.round(alpha * 100));
+ */
+ final float alpha = 1.0f;
updateColorTable();
-
-
- // find the geoColor in the table and select it
- int index = getColorIndex(geoColor);
+
+ // find the geoColor in the table and select it
+ final int index = getColorIndex(geoColor);
setSelectedIndex(index);
setDefaultColor(alpha, geoColor);
-
- // if nothing was selected, set the icon to show the non-standard color
- if(index == -1){
- this.setIcon(GeoGebraIcon.createColorSwatchIcon( alpha, bgColorIconSize, geoColor, null));
- }
+
+ // if nothing was selected, set the icon to show the
+ // non-standard color
+ if (index == -1) {
+ setIcon(GeoGebraIcon.createColorSwatchIcon(alpha,
+ bgColorIconSize, geoColor, null));
+ }
}
}
};
@@ -992,279 +1054,268 @@ public class EuclidianStyleBar extends JToolBar implements ActionListener {
btnBgColor.addActionListener(this);
}
+ // =====================================================
+ // Text Format Buttons
+ // =====================================================
-
-
- //=====================================================
- // Text Format Buttons
- //=====================================================
-
- private boolean checkGeoText(Object[] geos){
+ private boolean checkGeoText(final Object[] geos) {
boolean geosOK = (geos.length > 0);
for (int i = 0; i < geos.length; i++) {
- if (!(((GeoElement)geos[i]).getGeoElementForPropertiesDialog() instanceof TextProperties)
- ) {
+ if (!(((GeoElement) geos[i]).getGeoElementForPropertiesDialog() instanceof TextProperties)) {
geosOK = false;
break;
}
}
return geosOK;
}
-
-
-
- private void createTextButtons() {
-
- //========================
- // text color button
- final Dimension textColorIconSize = new Dimension(20,iconHeight);
+ private void createTextButtons() {
+
+ // ========================
+ // text color button
+ final Dimension textColorIconSize = new Dimension(20, iconHeight);
- btnTextColor = new ColorPopupMenuButton(app, textColorIconSize, ColorPopupMenuButton.COLORSET_DEFAULT, false) {
+ btnTextColor = new ColorPopupMenuButton(app, textColorIconSize,
+ ColorPopupMenuButton.COLORSET_DEFAULT, false) {
private Color geoColor;
@Override
- public void update(Object[] geos) {
+ public void update(final Object[] geos) {
- boolean geosOK = checkGeoText(geos);
+ final boolean geosOK = checkGeoText(geos);
setVisible(geosOK);
- if(geosOK){
- GeoElement geo = ((GeoElement)geos[0]).getGeoElementForPropertiesDialog();
+ if (geosOK) {
+ final GeoElement geo = ((GeoElement) geos[0])
+ .getGeoElementForPropertiesDialog();
geoColor = geo.getObjectColor();
updateColorTable();
-
- // find the geoColor in the table and select it
- int index = this.getColorIndex(geoColor);
+
+ // find the geoColor in the table and select it
+ final int index = getColorIndex(geoColor);
setSelectedIndex(index);
- // if nothing was selected, set the icon to show the non-standard color
- if(index == -1){
- this.setIcon(getButtonIcon());
+ // if nothing was selected, set the icon to show the
+ // non-standard color
+ if (index == -1) {
+ setIcon(getButtonIcon());
}
-
setFgColor(geoColor);
- setFontStyle(((TextProperties)geo).getFontStyle());
+ setFontStyle(((TextProperties) geo).getFontStyle());
}
}
-
- public ImageIcon getButtonIcon(){
- return GeoGebraIcon.createTextSymbolIcon("A", app.getPlainFont(), textColorIconSize, getSelectedColor(), null);
+ @Override
+ public ImageIcon getButtonIcon() {
+ return GeoGebraIcon.createTextSymbolIcon("A",
+ app.getPlainFont(), textColorIconSize,
+ getSelectedColor(), null);
}
};
btnTextColor.addActionListener(this);
-
- //========================================
+ // ========================================
// bold text button
- ImageIcon boldIcon = GeoGebraIcon.createStringIcon(app.getPlain("Bold").substring(0,1),
- app.getPlainFont(), true, false, true, iconDimension, Color.black, null);
- btnBold = new MyToggleButton(boldIcon){
+ final ImageIcon boldIcon = GeoGebraIcon.createStringIcon(
+ app.getPlain("Bold").substring(0, 1), app.getPlainFont(), true,
+ false, true, iconDimension, Color.black, null);
+ btnBold = new MyToggleButton(boldIcon) {
@Override
- public void update(Object[] geos) {
+ public void update(final Object[] geos) {
- boolean geosOK = checkGeoText(geos);
+ final boolean geosOK = checkGeoText(geos);
setVisible(geosOK);
- if(geosOK){
- GeoElement geo = ((GeoElement)geos[0]).getGeoElementForPropertiesDialog();
- int style = ((TextProperties)geo).getFontStyle();
- btnBold.setSelected(style == Font.BOLD || style == (Font.BOLD + Font.ITALIC));
+ if (geosOK) {
+ final GeoElement geo = ((GeoElement) geos[0])
+ .getGeoElementForPropertiesDialog();
+ final int style = ((TextProperties) geo).getFontStyle();
+ btnBold.setSelected((style == Font.BOLD)
+ || (style == (Font.BOLD + Font.ITALIC)));
}
- }
+ }
};
btnBold.addActionListener(this);
-
-
- //========================================
+ // ========================================
// italic text button
- ImageIcon italicIcon = GeoGebraIcon.createStringIcon(app.getPlain("Italic").substring(0,1),
- app.getPlainFont(), false, true, true, iconDimension, Color.black, null);
- btnItalic = new MyToggleButton(italicIcon){
+ final ImageIcon italicIcon = GeoGebraIcon.createStringIcon(app
+ .getPlain("Italic").substring(0, 1), app.getPlainFont(), false,
+ true, true, iconDimension, Color.black, null);
+ btnItalic = new MyToggleButton(italicIcon) {
@Override
- public void update(Object[] geos) {
+ public void update(final Object[] geos) {
- boolean geosOK = checkGeoText(geos);
+ final boolean geosOK = checkGeoText(geos);
+ setVisible(geosOK);
setVisible(geosOK);
- this.setVisible(geosOK);
- if(geosOK){
- GeoElement geo = ((GeoElement)geos[0]).getGeoElementForPropertiesDialog();
- int style = ((TextProperties)geo).getFontStyle();
- btnItalic.setSelected(style == Font.ITALIC || style == (Font.BOLD + Font.ITALIC));
+ if (geosOK) {
+ final GeoElement geo = ((GeoElement) geos[0])
+ .getGeoElementForPropertiesDialog();
+ final int style = ((TextProperties) geo).getFontStyle();
+ btnItalic.setSelected((style == Font.ITALIC)
+ || (style == (Font.BOLD + Font.ITALIC)));
}
- }
+ }
};
btnItalic.addActionListener(this);
-
- //========================================
+ // ========================================
// text size button
- String[] textSizeArray = app.getFontSizeStrings();
-
- btnTextSize = new PopupMenuButton(app, textSizeArray, -1, 1,
- new Dimension(-1, iconHeight), SelectionTable.MODE_TEXT){
+ final String[] textSizeArray = app.getFontSizeStrings();
+
+ btnTextSize = new PopupMenuButton(app, textSizeArray, -1, 1,
+ new Dimension(-1, iconHeight), SelectionTable.MODE_TEXT) {
@Override
- public void update(Object[] geos) {
+ public void update(final Object[] geos) {
- boolean geosOK = checkGeoText(geos);
+ final boolean geosOK = checkGeoText(geos);
setVisible(geosOK);
- if(geosOK){
- GeoElement geo = ((GeoElement)geos[0]).getGeoElementForPropertiesDialog();
- setSelectedIndex(GeoText.getFontSizeIndex(((TextProperties)geo).getFontSize())); // font size ranges from -4 to 4, transform this to 0,1,..,4
+ if (geosOK) {
+ final GeoElement geo = ((GeoElement) geos[0])
+ .getGeoElementForPropertiesDialog();
+ setSelectedIndex(GeoText
+ .getFontSizeIndex(((TextProperties) geo)
+ .getFontSize())); // font size ranges from
+ // -4 to 4, transform
+ // this to 0,1,..,4
}
- }
- };
+ }
+ };
btnTextSize.addActionListener(this);
btnTextSize.setKeepVisible(false);
-
-
}
-
-
-
- //================================================
- // Create TableText buttons
- //================================================
-
-
- private void createTableTextButtons(){
- Dimension iconDimension = new Dimension(16, iconHeight);
-
- //==============================
+ // ================================================
+ // Create TableText buttons
+ // ================================================
+
+ private void createTableTextButtons() {
+ final Dimension iconDimension = new Dimension(16, iconHeight);
+
+ // ==============================
// justification popup
- ImageIcon[] justifyIcons = new ImageIcon[]{
+ final ImageIcon[] justifyIcons = new ImageIcon[] {
app.getImageIcon("format-justify-left.png"),
app.getImageIcon("format-justify-center.png"),
- app.getImageIcon("format-justify-right.png")
- };
- btnTableTextJustify = new PopupMenuButton(ev.getApplication(), justifyIcons, 1,-1,
- new Dimension(20,iconHeight), SelectionTable.MODE_ICON){
+ app.getImageIcon("format-justify-right.png") };
+ btnTableTextJustify = new PopupMenuButton(ev.getApplication(),
+ justifyIcons, 1, -1, new Dimension(20, iconHeight),
+ SelectionTable.MODE_ICON) {
@Override
- public void update(Object[] geos) {
- if(tableText != null){
- this.setVisible(true);
- String justification = tableText.getJustification();
- if(justification.equals("c")) btnTableTextJustify.setSelectedIndex(1);
- else if (justification.equals("r")) btnTableTextJustify.setSelectedIndex(2);
- else btnTableTextJustify.setSelectedIndex(0); //left align
-
- }else{
- this.setVisible(false);
+ public void update(final Object[] geos) {
+ if (tableText != null) {
+ setVisible(true);
+ final String justification = tableText.getJustification();
+ if (justification.equals("c")) {
+ btnTableTextJustify.setSelectedIndex(1);
+ } else if (justification.equals("r")) {
+ btnTableTextJustify.setSelectedIndex(2);
+ } else {
+ btnTableTextJustify.setSelectedIndex(0); // left align
+ }
+
+ } else {
+ setVisible(false);
}
}
- public String getJustification() {
- String s = "l";
- if(this.getSelectedIndex() == 1) s = "c";
- if(this.getSelectedIndex() == 2) s = "r";
- return s;
- }
};
-
+
btnTableTextJustify.addActionListener(this);
- btnTableTextJustify.setKeepVisible(false);
-
-
- //==============================
+ btnTableTextJustify.setKeepVisible(false);
+
+ // ==============================
// bracket style popup
-
-
- ImageIcon[] bracketIcons = new ImageIcon[bracketArray.length];
- for(int i = 0; i<bracketIcons.length; i++){
- bracketIcons[i] = GeoGebraIcon.createStringIcon(bracketArray[i], app.getPlainFont(), true, false, true, new Dimension(30,iconHeight) , Color.BLACK, null);
+ final ImageIcon[] bracketIcons = new ImageIcon[bracketArray.length];
+ for (int i = 0; i < bracketIcons.length; i++) {
+ bracketIcons[i] = GeoGebraIcon.createStringIcon(bracketArray[i],
+ app.getPlainFont(), true, false, true, new Dimension(30,
+ iconHeight), Color.BLACK, null);
}
-
- btnTableTextBracket = new PopupMenuButton(ev.getApplication(), bracketIcons, 2,-1,
- new Dimension(30,iconHeight), SelectionTable.MODE_ICON){
+
+ btnTableTextBracket = new PopupMenuButton(ev.getApplication(),
+ bracketIcons, 2, -1, new Dimension(30, iconHeight),
+ SelectionTable.MODE_ICON) {
@Override
- public void update(Object[] geos) {
- if(tableText != null){
- this.setVisible(true);
- String s = tableText.getOpenSymbol() + " " + tableText.getCloseSymbol();
+ public void update(final Object[] geos) {
+ if (tableText != null) {
+ setVisible(true);
+ final String s = tableText.getOpenSymbol() + " "
+ + tableText.getCloseSymbol();
int index = 0;
- for(int i = 0; i < bracketArray.length; i++){
- if(s.equals(bracketArray[i])) {
+ for (int i = 0; i < bracketArray.length; i++) {
+ if (s.equals(bracketArray[i])) {
index = i;
break;
}
}
- //System.out.println("index" + index);
- btnTableTextBracket.setSelectedIndex(index);
-
- }else{
- this.setVisible(false);
+ // System.out.println("index" + index);
+ btnTableTextBracket.setSelectedIndex(index);
+
+ } else {
+ setVisible(false);
}
}
};
-
+
btnTableTextBracket.addActionListener(this);
- btnTableTextBracket.setKeepVisible(false);
-
-
-
-
- //====================================
+ btnTableTextBracket.setKeepVisible(false);
+
+ // ====================================
// vertical grid lines toggle button
- btnTableTextLinesV = new MyToggleButton(GeoGebraIcon.createVGridIcon(iconDimension)){
+ btnTableTextLinesV = new MyToggleButton(
+ GeoGebraIcon.createVGridIcon(iconDimension)) {
@Override
- public void update(Object[] geos) {
- if(tableText != null){
+ public void update(final Object[] geos) {
+ if (tableText != null) {
setVisible(true);
setSelected(tableText.isVerticalLines());
- }else{
+ } else {
setVisible(false);
}
- }
+ }
};
btnTableTextLinesV.addActionListener(this);
-
- //====================================
+
+ // ====================================
// horizontal grid lines toggle button
- btnTableTextLinesH = new MyToggleButton(GeoGebraIcon.createHGridIcon(iconDimension)){
+ btnTableTextLinesH = new MyToggleButton(
+ GeoGebraIcon.createHGridIcon(iconDimension)) {
@Override
- public void update(Object[] geos) {
- if(tableText != null){
+ public void update(final Object[] geos) {
+ if (tableText != null) {
setVisible(true);
setSelected(tableText.isHorizontalLines());
- }else{
+ } else {
setVisible(false);
}
}
};
btnTableTextLinesH.addActionListener(this);
-
-
-
-
-
-
+
}
-
-
-
- //=====================================================
- // Event Handlers
- //=====================================================
-
-
- protected void updateGUI(){
+ // =====================================================
+ // Event Handlers
+ // =====================================================
- if(isIniting) return;
+ protected void updateGUI() {
+
+ if (isIniting) {
+ return;
+ }
btnMode.removeActionListener(this);
- switch (mode){
+ switch (mode) {
case EuclidianConstants.MODE_MOVE:
btnMode.setSelectedIndex(0);
break;
@@ -1281,20 +1332,20 @@ public class EuclidianStyleBar extends JToolBar implements ActionListener {
btnMode.setSelectedIndex(4);
break;
}
- btnMode.addActionListener(this);
-
+ btnMode.addActionListener(this);
+
btnPen.removeActionListener(this);
btnPen.setSelected(mode == EuclidianConstants.MODE_PEN);
btnPen.addActionListener(this);
-
+
btnDelete.removeActionListener(this);
btnDelete.setSelected(mode == EuclidianConstants.MODE_DELETE);
btnDelete.addActionListener(this);
-
+
btnLabel.removeActionListener(this);
btnLabel.setSelected(mode == EuclidianConstants.MODE_SHOW_HIDE_LABEL);
btnLabel.addActionListener(this);
-
+
btnShowAxes.removeActionListener(this);
btnShowAxes.setSelected(ev.getShowXaxis());
btnShowAxes.addActionListener(this);
@@ -1305,231 +1356,202 @@ public class EuclidianStyleBar extends JToolBar implements ActionListener {
}
-
-
-
+ public void actionPerformed(final ActionEvent e) {
+ final Object source = e.getSource();
- public void actionPerformed(ActionEvent e) {
- Object source = e.getSource();
-
// mode changing buttons, removed for now?
- /*
- if (source.equals(btnMode)) {
- switch (btnMode.getSelectedIndex()){
- case 0:
- ev.getApplication().setMoveMode();
- break;
- case 1:
- ev.getApplication().setMode(EuclidianConstants.MODE_PEN);
- break;
- case 2:
- ev.getApplication().setMode(EuclidianConstants.MODE_DELETE);
- break;
- case 3:
- ev.getApplication().setMode(EuclidianConstants.MODE_SHOW_HIDE_LABEL);
- break;
- case 4:
- ev.getApplication().setMode(EuclidianConstants.MODE_VISUAL_STYLE);
- }
- }
+ /*
+ * if (source.equals(btnMode)) { switch (btnMode.getSelectedIndex()){
+ * case 0: ev.getApplication().setMoveMode(); break; case 1:
+ * ev.getApplication().setMode(EuclidianConstants.MODE_PEN); break; case
+ * 2: ev.getApplication().setMode(EuclidianConstants.MODE_DELETE);
+ * break; case 3:
+ * ev.getApplication().setMode(EuclidianConstants.MODE_SHOW_HIDE_LABEL);
+ * break; case 4:
+ * ev.getApplication().setMode(EuclidianConstants.MODE_VISUAL_STYLE); }
+ * }
+ *
+ * if (source.equals(btnCopyVisualStyle)) {
+ * if(btnCopyVisualStyle.isSelected())
+ * ev.getApplication().setMode(EuclidianConstants.MODE_VISUAL_STYLE);
+ * else ev.getApplication().setMoveMode(); }
+ *
+ *
+ * if (source.equals(btnPen)) { if(btnPen.isSelected())
+ * ev.getApplication().setMode(EuclidianConstants.MODE_PEN); else
+ * ev.getApplication().setMoveMode(); }
+ *
+ * if (source.equals(btnDelete)) { if(btnDelete.isSelected())
+ * ev.getApplication().setMode(EuclidianConstants.MODE_DELETE); else
+ * ev.getApplication().setMoveMode(); }
+ *
+ * if (source.equals(btnLabel)) { if(btnLabel.isSelected())
+ * ev.getApplication().setMode(EuclidianConstants.MODE_SHOW_HIDE_LABEL);
+ * else ev.getApplication().setMoveMode(); }
+ */
- if (source.equals(btnCopyVisualStyle)) {
- if(btnCopyVisualStyle.isSelected())
- ev.getApplication().setMode(EuclidianConstants.MODE_VISUAL_STYLE);
- else
- ev.getApplication().setMoveMode();
- }
-
-
- if (source.equals(btnPen)) {
- if(btnPen.isSelected())
- ev.getApplication().setMode(EuclidianConstants.MODE_PEN);
- else
- ev.getApplication().setMoveMode();
- }
-
- if (source.equals(btnDelete)) {
- if(btnDelete.isSelected())
- ev.getApplication().setMode(EuclidianConstants.MODE_DELETE);
- else
- ev.getApplication().setMoveMode();
- }
-
- if (source.equals(btnLabel)) {
- if(btnLabel.isSelected())
- ev.getApplication().setMode(EuclidianConstants.MODE_SHOW_HIDE_LABEL);
- else
- ev.getApplication().setMoveMode();
- }
-
- */
-
needUndo = false;
-
- ArrayList<GeoElement> targetGeos = new ArrayList<GeoElement>();
+ final ArrayList<GeoElement> targetGeos = new ArrayList<GeoElement>();
targetGeos.addAll(ec.getJustCreatedGeos());
- if(mode != EuclidianConstants.MODE_MOVE)
+ if (mode != EuclidianConstants.MODE_MOVE) {
targetGeos.addAll(defaultGeos);
- else
+ } else {
targetGeos.addAll(app.getSelectedGeos());
+ }
-
-
- processSource(source,targetGeos);
-
-
+ processSource(source, targetGeos);
- if(needUndo){
+ if (needUndo) {
app.storeUndoInfo();
needUndo = false;
}
-
+
updateGUI();
-
+
}
/**
* process the action performed
+ *
* @param source
* @param targetGeos
*/
- protected void processSource(Object source, ArrayList<GeoElement> targetGeos){
+ protected void processSource(final Object source,
+ final ArrayList<GeoElement> targetGeos) {
-
if (source.equals(btnShowAxes)) {
- if (app.getEuclidianView() == ev)
- app.getSettings().getEuclidian(1).setShowAxes(!ev.getShowXaxis(), !ev.getShowXaxis());
- else if (!app.hasEuclidianView2EitherShowingOrNot())
+ if (app.getEuclidianView() == ev) {
+ app.getSettings().getEuclidian(1)
+ .setShowAxes(!ev.getShowXaxis(), !ev.getShowXaxis());
+ } else if (!app.hasEuclidianView2EitherShowingOrNot()) {
ev.setShowAxes(!ev.getShowXaxis(), true);
- else if (app.getEuclidianView2() == ev)
- app.getSettings().getEuclidian(2).setShowAxes(!ev.getShowXaxis(), !ev.getShowXaxis());
- else
+ } else if (app.getEuclidianView2() == ev) {
+ app.getSettings().getEuclidian(2)
+ .setShowAxes(!ev.getShowXaxis(), !ev.getShowXaxis());
+ } else {
ev.setShowAxes(!ev.getShowXaxis(), true);
+ }
ev.repaint();
}
else if (source.equals(btnShowGrid)) {
- if (app.getEuclidianView() == ev)
+ if (app.getEuclidianView() == ev) {
app.getSettings().getEuclidian(1).showGrid(!ev.getShowGrid());
- else if (!app.hasEuclidianView2EitherShowingOrNot())
+ } else if (!app.hasEuclidianView2EitherShowingOrNot()) {
ev.showGrid(!ev.getShowGrid());
- else if (app.getEuclidianView2() == ev)
+ } else if (app.getEuclidianView2() == ev) {
app.getSettings().getEuclidian(2).showGrid(!ev.getShowGrid());
- else
+ } else {
ev.showGrid(!ev.getShowGrid());
+ }
ev.repaint();
}
-
+
else if (source == btnPointCapture) {
int mode = btnPointCapture.getSelectedIndex();
- if (mode == 3 || mode ==0) mode = 3 - mode; // swap 0 and 3
- ev.setPointCapturing(mode);
+ if ((mode == 3) || (mode == 0)) {
+ mode = 3 - mode; // swap 0 and 3
+ }
+ ev.setPointCapturing(mode);
+
+ // update other EV stylebars since this is a global property
+ app.updateStyleBars();
+
}
-
+
else if (source == btnColor) {
- if(mode == EuclidianConstants.MODE_PEN){
- ec.getPen().setPenColor((Color) btnColor.getSelectedColor());
- //btnLineStyle.setFgColor((Color)btnColor.getSelectedValue());
+ if (mode == EuclidianConstants.MODE_PEN) {
+ ec.getPen().setPenColor(btnColor.getSelectedColor());
+ // btnLineStyle.setFgColor((Color)btnColor.getSelectedValue());
} else {
applyColor(targetGeos);
- //btnLineStyle.setFgColor((Color)btnColor.getSelectedValue());
- //btnPointStyle.setFgColor((Color)btnColor.getSelectedValue());
+ // btnLineStyle.setFgColor((Color)btnColor.getSelectedValue());
+ // btnPointStyle.setFgColor((Color)btnColor.getSelectedValue());
}
}
-
+
else if (source == btnBgColor) {
- if(btnBgColor.getSelectedIndex() >=0){
+ if (btnBgColor.getSelectedIndex() >= 0) {
applyBgColor(targetGeos);
}
}
-
+
else if (source == btnTextColor) {
- if(btnTextColor.getSelectedIndex() >=0){
+ if (btnTextColor.getSelectedIndex() >= 0) {
applyTextColor(targetGeos);
- //btnTextColor.setFgColor((Color)btnTextColor.getSelectedValue());
- //btnItalic.setForeground((Color)btnTextColor.getSelectedValue());
- //btnBold.setForeground((Color)btnTextColor.getSelectedValue());
+ // btnTextColor.setFgColor((Color)btnTextColor.getSelectedValue());
+ // btnItalic.setForeground((Color)btnTextColor.getSelectedValue());
+ // btnBold.setForeground((Color)btnTextColor.getSelectedValue());
}
- }
- else if (source == btnLineStyle) {
- if(btnLineStyle.getSelectedValue() != null){
- if(mode == EuclidianConstants.MODE_PEN){
- ec.getPen().setPenLineStyle(lineStyleArray[btnLineStyle.getSelectedIndex()]);
+ } else if (source == btnLineStyle) {
+ if (btnLineStyle.getSelectedValue() != null) {
+ if (mode == EuclidianConstants.MODE_PEN) {
+ ec.getPen().setPenLineStyle(
+ lineStyleArray[btnLineStyle.getSelectedIndex()]);
ec.getPen().setPenSize(btnLineStyle.getSliderValue());
} else {
applyLineStyle(targetGeos);
}
}
- }
- else if (source == btnPointStyle) {
- if(btnPointStyle.getSelectedValue() != null){
- applyPointStyle(targetGeos);
+ } else if (source == btnPointStyle) {
+ if (btnPointStyle.getSelectedValue() != null) {
+ applyPointStyle(targetGeos);
}
- }
- else if (source == btnBold) {
+ } else if (source == btnBold) {
btnBold.toggle();
- applyFontStyle(targetGeos);
- }
- else if (source == btnItalic) {
+ applyFontStyle(targetGeos);
+ } else if (source == btnItalic) {
btnItalic.toggle();
- applyFontStyle(targetGeos);
- }
- else if (source == btnTextSize) {
- applyTextSize(targetGeos);
- }
- else if (source == btnHideShowLabel) {
+ applyFontStyle(targetGeos);
+ } else if (source == btnTextSize) {
+ applyTextSize(targetGeos);
+ } else if (source == btnHideShowLabel) {
btnHideShowLabel.toggle();
-
- applyHideShowLabel(targetGeos);
+
+ applyHideShowLabel(targetGeos);
updateStyleBar();
+ } else if (source == btnLabelStyle) {
+ applyCaptionStyle(targetGeos);
}
- else if (source == btnLabelStyle) {
- applyCaptionStyle(targetGeos);
- }
-
- else if (source == btnTableTextJustify ) {
- applyTableTextFormat(targetGeos);
- }
- else if (source == btnTableTextLinesH ) {
+
+ else if (source == btnTableTextJustify) {
+ applyTableTextFormat(targetGeos);
+ } else if (source == btnTableTextLinesH) {
btnTableTextLinesH.toggle();
- applyTableTextFormat(targetGeos);
- }
- else if (source == btnTableTextLinesV) {
+ applyTableTextFormat(targetGeos);
+ } else if (source == btnTableTextLinesV) {
btnTableTextLinesV.toggle();
- applyTableTextFormat(targetGeos);
- }
- else if (source == btnTableTextBracket ) {
- applyTableTextFormat(targetGeos);
+ applyTableTextFormat(targetGeos);
+ } else if (source == btnTableTextBracket) {
+ applyTableTextFormat(targetGeos);
}
-
+
else if (source == btnPenDelete) {
-
- //add code here to delete pen image
-
- }
- else if (source == btnPenEraser) {
+
+ // add code here to delete pen image
+
+ } else if (source == btnPenEraser) {
btnPenEraser.toggle();
-
- // add code here to toggle between pen and eraser mode;
-
- }
- }
+ // add code here to toggle between pen and eraser mode;
+ }
+ }
- //==============================================
- // Apply Styles
- //==============================================
+ // ==============================================
+ // Apply Styles
+ // ==============================================
- private void applyLineStyle(ArrayList<GeoElement> geos) {
- int lineStyle = lineStyleArray[btnLineStyle.getSelectedIndex()];
- int lineSize = btnLineStyle.getSliderValue();
+ private void applyLineStyle(final ArrayList<GeoElement> geos) {
+ final int lineStyle = lineStyleArray[btnLineStyle.getSelectedIndex()];
+ final int lineSize = btnLineStyle.getSliderValue();
- for (int i = 0 ; i < geos.size() ; i++) {
- GeoElement geo = geos.get(i);
- if(geo.getLineType() != lineStyle || geo.getLineThickness() != lineSize){
+ for (int i = 0; i < geos.size(); i++) {
+ final GeoElement geo = geos.get(i);
+ if ((geo.getLineType() != lineStyle)
+ || (geo.getLineThickness() != lineSize)) {
geo.setLineType(lineStyle);
geo.setLineThickness(lineSize);
geo.updateRepaint();
@@ -1538,15 +1560,16 @@ public class EuclidianStyleBar extends JToolBar implements ActionListener {
}
}
- private void applyPointStyle(ArrayList<GeoElement> geos) {
- int pointStyle = pointStyleArray[btnPointStyle.getSelectedIndex()];
- int pointSize = btnPointStyle.getSliderValue();
- for (int i = 0 ; i < geos.size() ; i++) {
- GeoElement geo = geos.get(i);
+ private void applyPointStyle(final ArrayList<GeoElement> geos) {
+ final int pointStyle = pointStyleArray[btnPointStyle.getSelectedIndex()];
+ final int pointSize = btnPointStyle.getSliderValue();
+ for (int i = 0; i < geos.size(); i++) {
+ final GeoElement geo = geos.get(i);
if (geo instanceof PointProperties) {
- if(((PointProperties)geo).getPointSize() != pointSize || (((PointProperties)geo).getPointStyle() != pointStyle)){
- ((PointProperties)geo).setPointSize(pointSize);
- ((PointProperties)geo).setPointStyle(pointStyle);
+ if ((((PointProperties) geo).getPointSize() != pointSize)
+ || (((PointProperties) geo).getPointStyle() != pointStyle)) {
+ ((PointProperties) geo).setPointSize(pointSize);
+ ((PointProperties) geo).setPointStyle(pointStyle);
geo.updateRepaint();
needUndo = true;
}
@@ -1554,57 +1577,58 @@ public class EuclidianStyleBar extends JToolBar implements ActionListener {
}
}
+ private void applyColor(final ArrayList<GeoElement> geos) {
- private void applyColor(ArrayList<GeoElement> geos) {
-
- Color color = btnColor.getSelectedColor();
- float alpha = btnColor.getSliderValue() / 100.0f;
+ final Color color = btnColor.getSelectedColor();
+ final float alpha = btnColor.getSliderValue() / 100.0f;
- for (int i = 0 ; i < geos.size() ; i++) {
- GeoElement geo = geos.get(i);
+ for (int i = 0; i < geos.size(); i++) {
+ final GeoElement geo = geos.get(i);
// apply object color to all other geos except images or text
- if(!(geo.getGeoElementForPropertiesDialog() instanceof GeoImage || geo.getGeoElementForPropertiesDialog() instanceof GeoText))
- if((geo.getObjectColor() != color || geo.getAlphaValue() != alpha) ){
+ if (!((geo.getGeoElementForPropertiesDialog() instanceof GeoImage) || (geo
+ .getGeoElementForPropertiesDialog() instanceof GeoText))) {
+ if (((geo.getObjectColor() != color) || (geo.getAlphaValue() != alpha))) {
geo.setObjColor(color);
- //if we change alpha for functions, hit won't work properly
- if(geo.isFillable())
+ // if we change alpha for functions, hit won't work properly
+ if (geo.isFillable()) {
geo.setAlphaValue(alpha);
+ }
geo.updateRepaint();
needUndo = true;
+ }
}
}
}
+ private void applyBgColor(final ArrayList<GeoElement> geos) {
- private void applyBgColor(ArrayList<GeoElement> geos) {
-
-
- Color color = btnBgColor.getSelectedColor();
- float alpha = btnBgColor.getSliderValue() / 100.0f;
+ final Color color = btnBgColor.getSelectedColor();
+ final float alpha = btnBgColor.getSliderValue() / 100.0f;
- for (int i = 0 ; i < geos.size() ; i++) {
- GeoElement geo = geos.get(i);
+ for (int i = 0; i < geos.size(); i++) {
+ final GeoElement geo = geos.get(i);
- // if text geo, then apply background color
- if(geo instanceof TextProperties)
- if(geo.getBackgroundColor() != color || geo.getAlphaValue() != alpha ){
+ // if text geo, then apply background color
+ if (geo instanceof TextProperties) {
+ if ((geo.getBackgroundColor() != color)
+ || (geo.getAlphaValue() != alpha)) {
geo.setBackgroundColor(color);
- // TODO apply background alpha
+ // TODO apply background alpha
// --------
geo.updateRepaint();
needUndo = true;
}
+ }
}
}
+ private void applyTextColor(final ArrayList<GeoElement> geos) {
-
- private void applyTextColor(ArrayList<GeoElement> geos) {
-
- Color color = btnTextColor.getSelectedColor();
- for (int i = 0 ; i < geos.size() ; i++) {
- GeoElement geo = geos.get(i);
- if( ((GeoElement)geo.getGeoElementForPropertiesDialog()).isGeoText() && geo.getObjectColor() != color){
+ final Color color = btnTextColor.getSelectedColor();
+ for (int i = 0; i < geos.size(); i++) {
+ final GeoElement geo = geos.get(i);
+ if (geo.getGeoElementForPropertiesDialog().isGeoText()
+ && (geo.getObjectColor() != color)) {
geo.setObjColor(color);
geo.updateRepaint();
needUndo = true;
@@ -1612,93 +1636,112 @@ public class EuclidianStyleBar extends JToolBar implements ActionListener {
}
}
- private void applyFontStyle(ArrayList<GeoElement> geos) {
+ private void applyFontStyle(final ArrayList<GeoElement> geos) {
int fontStyle = 0;
- if (btnBold.isSelected()) fontStyle += 1;
- if (btnItalic.isSelected()) fontStyle += 2;
- for (int i = 0 ; i < geos.size() ; i++) {
- GeoElement geo = geos.get(i);
- if(geo instanceof TextProperties && ((TextProperties)geo).getFontStyle() != fontStyle){
- ((TextProperties)geo).setFontStyle(fontStyle);
+ if (btnBold.isSelected()) {
+ fontStyle += 1;
+ }
+ if (btnItalic.isSelected()) {
+ fontStyle += 2;
+ }
+ for (int i = 0; i < geos.size(); i++) {
+ final GeoElement geo = geos.get(i);
+ if ((geo instanceof TextProperties)
+ && (((TextProperties) geo).getFontStyle() != fontStyle)) {
+ ((TextProperties) geo).setFontStyle(fontStyle);
geo.updateRepaint();
needUndo = true;
}
}
}
-
+ private void applyTextSize(final ArrayList<GeoElement> geos) {
- private void applyTextSize(ArrayList<GeoElement> geos) {
+ final int fontSize = GeoText.getRelativeFontSize(btnTextSize
+ .getSelectedIndex()); // transform indices to the range -4, .. ,
+ // 4
- int fontSize = GeoText.getRelativeFontSize(btnTextSize.getSelectedIndex()); // transform indices to the range -4, .. , 4
-
- for (int i = 0 ; i < geos.size() ; i++) {
- GeoElement geo = geos.get(i);
- if(geo instanceof TextProperties && ((TextProperties)geo).getFontSize() != fontSize){
- ((TextProperties)geo).setFontSize(fontSize);
+ for (int i = 0; i < geos.size(); i++) {
+ final GeoElement geo = geos.get(i);
+ if ((geo instanceof TextProperties)
+ && (((TextProperties) geo).getFontSize() != fontSize)) {
+ ((TextProperties) geo).setFontSize(fontSize);
geo.updateRepaint();
needUndo = true;
- }
+ }
}
}
-
-
- private void applyHideShowLabel(ArrayList<GeoElement> geos) {
- boolean visible = btnHideShowLabel.isSelected();
- for (int i = 0 ; i < geos.size() ; i++) {
- GeoElement geo = geos.get(i);
- if(geo.isLabelVisible() != visible){
+
+ private void applyHideShowLabel(final ArrayList<GeoElement> geos) {
+ final boolean visible = btnHideShowLabel.isSelected();
+ for (int i = 0; i < geos.size(); i++) {
+ final GeoElement geo = geos.get(i);
+ if (geo.isLabelVisible() != visible) {
geo.setLabelVisible(visible);
geo.updateRepaint();
needUndo = true;
}
- }
+ }
}
-
- private void applyCaptionStyle(ArrayList<GeoElement> geos) {
- for (int i = 0 ; i < geos.size() ; i++) {
- GeoElement geo = geos.get(i);
- if ((mode == EuclidianConstants.MODE_MOVE && (geo.isLabelShowable() || geo.isGeoAngle() || (geo.isGeoNumeric() ? ((GeoNumeric)geo).isSliderFixed() : false) )) ||
- (app.getLabelingStyle() == ConstructionDefaults.LABEL_VISIBLE_POINTS_ONLY && geo.isLabelShowable() && geo.isGeoPoint()) ||
- (app.getLabelingStyle() == ConstructionDefaults.LABEL_VISIBLE_ALWAYS_ON && geo.isLabelShowable() || geo.isGeoAngle() || (geo.isGeoNumeric() ? ((GeoNumeric)geo).isSliderFixed() : false)) ||
- (app.getLabelingStyle() == ConstructionDefaults.LABEL_VISIBLE_AUTOMATIC && geo.isLabelShowable() || geo.isGeoAngle() || (geo.isGeoNumeric() ? ((GeoNumeric)geo).isSliderFixed() : false)) ) {
- if(btnLabelStyle.getSelectedIndex() == 0){
- if (mode == EuclidianConstants.MODE_MOVE || app.getLabelingStyle() != ConstructionDefaults.LABEL_VISIBLE_ALWAYS_ON) {
+
+ private void applyCaptionStyle(final ArrayList<GeoElement> geos) {
+ for (int i = 0; i < geos.size(); i++) {
+ final GeoElement geo = geos.get(i);
+ if (((mode == EuclidianConstants.MODE_MOVE) && (geo
+ .isLabelShowable() || geo.isGeoAngle() || (geo
+ .isGeoNumeric() ? ((GeoNumeric) geo).isSliderFixed()
+ : false)))
+ || ((app.getLabelingStyle() == ConstructionDefaults.LABEL_VISIBLE_POINTS_ONLY)
+ && geo.isLabelShowable() && geo.isGeoPoint())
+ || (((app.getLabelingStyle() == ConstructionDefaults.LABEL_VISIBLE_ALWAYS_ON) && geo
+ .isLabelShowable()) || geo.isGeoAngle() || (geo
+ .isGeoNumeric() ? ((GeoNumeric) geo)
+ .isSliderFixed() : false))
+ || (((app.getLabelingStyle() == ConstructionDefaults.LABEL_VISIBLE_AUTOMATIC) && geo
+ .isLabelShowable()) || geo.isGeoAngle() || (geo
+ .isGeoNumeric() ? ((GeoNumeric) geo)
+ .isSliderFixed() : false))) {
+ if (btnLabelStyle.getSelectedIndex() == 0) {
+ if ((mode == EuclidianConstants.MODE_MOVE)
+ || (app.getLabelingStyle() != ConstructionDefaults.LABEL_VISIBLE_ALWAYS_ON)) {
geo.setLabelVisible(false);
}
- }else{
+ } else {
geo.setLabelVisible(true);
- geo.setLabelMode(btnLabelStyle.getSelectedIndex()-1);
+ geo.setLabelMode(btnLabelStyle.getSelectedIndex() - 1);
}
}
geo.updateRepaint();
needUndo = true;
- }
+ }
}
-
-
-
- private void applyTableTextFormat(ArrayList<GeoElement> geos) {
+
+ private void applyTableTextFormat(final ArrayList<GeoElement> geos) {
AlgoElement algo = null;
GeoElement[] input;
GeoElement geo;
String arg = null;
- String[] justifyArray = { "l", "c", "r"};
+ final String[] justifyArray = { "l", "c", "r" };
arg = justifyArray[btnTableTextJustify.getSelectedIndex()];
- if(this.btnTableTextLinesH.isSelected()) arg += "_";
- if(this.btnTableTextLinesV.isSelected()) arg += "|";
- if(btnTableTextBracket.getSelectedIndex() >0)
- arg += this.bracketArray2[btnTableTextBracket.getSelectedIndex()];
- ArrayList<GeoElement> newGeos = new ArrayList<GeoElement>();
-
- StringBuilder cmdText = new StringBuilder();
+ if (btnTableTextLinesH.isSelected()) {
+ arg += "_";
+ }
+ if (btnTableTextLinesV.isSelected()) {
+ arg += "|";
+ }
+ if (btnTableTextBracket.getSelectedIndex() > 0) {
+ arg += bracketArray2[btnTableTextBracket.getSelectedIndex()];
+ }
+ final ArrayList<GeoElement> newGeos = new ArrayList<GeoElement>();
+
+ final StringBuilder cmdText = new StringBuilder();
for (int i = 0; i < geos.size(); i++) {
- // get the TableText algo for this geo and its input
+ // get the TableText algo for this geo and its input
geo = geos.get(i);
algo = geo.getParentAlgorithm();
input = algo.getInput();
@@ -1706,7 +1749,8 @@ public class EuclidianStyleBar extends JToolBar implements ActionListener {
// create a new TableText cmd
cmdText.setLength(0);
cmdText.append("TableText[");
- cmdText.append(((GeoList) input[0]).getFormulaString(ExpressionNode.STRING_TYPE_GEOGEBRA, false));
+ cmdText.append(((GeoList) input[0]).getFormulaString(
+ ExpressionNode.STRING_TYPE_GEOGEBRA, false));
cmdText.append(",\"");
cmdText.append(arg);
cmdText.append("\"]");
@@ -1716,114 +1760,135 @@ public class EuclidianStyleBar extends JToolBar implements ActionListener {
newGeos.add(redefineGeo(geo, cmdText.toString()));
}
- // reset the selection
+ // reset the selection
app.setSelectedGeos(newGeos);
}
-
- public void applyVisualStyle(ArrayList<GeoElement> geos) {
-
- if(geos == null || geos.size() < 1) return;
+ public void applyVisualStyle(final ArrayList<GeoElement> geos) {
+
+ if ((geos == null) || (geos.size() < 1)) {
+ return;
+ }
needUndo = false;
-
- if(btnColor.isVisible()) applyColor(geos);
- if(btnBgColor.isVisible()) applyBgColor(geos);
- if(btnLineStyle.isVisible()) applyLineStyle(geos);
- if(btnPointStyle.isVisible()) applyPointStyle(geos);
- if(btnBold.isVisible()) applyFontStyle(geos);
- if(btnItalic.isVisible()) applyFontStyle(geos);
- if(btnTextColor.isVisible()) applyTextColor(geos);
- if(btnTextSize.isVisible()) applyTextSize(geos);
- if(btnHideShowLabel.isVisible()) applyHideShowLabel(geos);
-
- if(needUndo){
+
+ if (btnColor.isVisible()) {
+ applyColor(geos);
+ }
+ if (btnBgColor.isVisible()) {
+ applyBgColor(geos);
+ }
+ if (btnLineStyle.isVisible()) {
+ applyLineStyle(geos);
+ }
+ if (btnPointStyle.isVisible()) {
+ applyPointStyle(geos);
+ }
+ if (btnBold.isVisible()) {
+ applyFontStyle(geos);
+ }
+ if (btnItalic.isVisible()) {
+ applyFontStyle(geos);
+ }
+ if (btnTextColor.isVisible()) {
+ applyTextColor(geos);
+ }
+ if (btnTextSize.isVisible()) {
+ applyTextSize(geos);
+ }
+ if (btnHideShowLabel.isVisible()) {
+ applyHideShowLabel(geos);
+ }
+
+ if (needUndo) {
app.storeUndoInfo();
needUndo = false;
}
-
-
+
// TODO update prop panel
// see code in PropertiesDialog.applyDefaults
- //propPanel.updateSelection(selectionList.toArray());
-
+ // propPanel.updateSelection(selectionList.toArray());
+
}
-
-
-
-
- public GeoElement redefineGeo(GeoElement geo, String cmdtext) {
+ public GeoElement redefineGeo(final GeoElement geo, final String cmdtext) {
GeoElement newGeo = null;
-
- if (cmdtext == null)
+
+ if (cmdtext == null) {
return newGeo;
-
+ }
+
try {
- newGeo = app.getKernel().getAlgebraProcessor().changeGeoElement(
- geo, cmdtext, true, true);
- app.doAfterRedefine(newGeo);
+ newGeo = app.getKernel().getAlgebraProcessor()
+ .changeGeoElement(geo, cmdtext, true, true);
+ app.doAfterRedefine(newGeo);
newGeo.updateRepaint();
return newGeo;
-
- } catch (Exception e) {
- app.showError("ReplaceFailed");
- } catch (MyError err) {
- app.showError(err);
- }
+
+ } catch (final Exception e) {
+ app.showError("ReplaceFailed");
+ } catch (final MyError err) {
+ app.showError(err);
+ }
return newGeo;
}
-
-
+
public class MyToggleButton extends JButton {
- public MyToggleButton(ImageIcon icon){
+ public MyToggleButton(final ImageIcon icon) {
super(icon);
- Dimension d = new Dimension(icon.getIconWidth(), iconHeight);
+ final Dimension d = new Dimension(icon.getIconWidth(), iconHeight);
setIcon(GeoGebraIcon.ensureIconSize(icon, d));
- this.setRolloverEnabled(true);
+ setRolloverEnabled(true);
}
-
- public void update(Object[] geos) {
+
+ public void update(final Object[] geos) {
}
- public void toggle(){
- this.setSelected(!this.isSelected());
+
+ public void toggle() {
+ setSelected(!isSelected());
}
-
+
}
/**
* Set labels with localized strings.
*/
- public void setLabels(){
+ public void setLabels() {
initGUI();
updateStyleBar();
-
+
btnShowGrid.setToolTipText(app.getPlainTooltip("stylebar.Grid"));
btnShowAxes.setToolTipText(app.getPlainTooltip("stylebar.Axes"));
btnPointCapture.setToolTipText(app.getPlainTooltip("stylebar.Capture"));
-
+
btnLabelStyle.setToolTipText(app.getPlainTooltip("stylebar.Label"));
-
+
btnColor.setToolTipText(app.getPlainTooltip("stylebar.Color"));
btnBgColor.setToolTipText(app.getPlainTooltip("stylebar.BgColor"));
-
+
btnLineStyle.setToolTipText(app.getPlainTooltip("stylebar.LineStyle"));
- btnPointStyle.setToolTipText(app.getPlainTooltip("stylebar.PointStyle"));
-
+ btnPointStyle
+ .setToolTipText(app.getPlainTooltip("stylebar.PointStyle"));
+
btnTextColor.setToolTipText(app.getPlainTooltip("stylebar.TextColor"));
btnTextSize.setToolTipText(app.getPlainTooltip("stylebar.TextSize"));
- btnBold.setToolTipText(app.getPlainTooltip("stylebar.Bold"));
- btnItalic.setToolTipText(app.getPlainTooltip("stylebar.Italic"));
- btnTableTextJustify.setToolTipText(app.getPlainTooltip("stylebar.Align"));
- btnTableTextBracket.setToolTipText(app.getPlainTooltip("stylebar.Bracket"));
- btnTableTextLinesV.setToolTipText(app.getPlainTooltip("stylebar.HorizontalLine"));
- btnTableTextLinesH.setToolTipText(app.getPlainTooltip("stylebar.VerticalLine"));
+ btnBold.setToolTipText(app.getPlainTooltip("stylebar.Bold"));
+ btnItalic.setToolTipText(app.getPlainTooltip("stylebar.Italic"));
+ btnTableTextJustify.setToolTipText(app
+ .getPlainTooltip("stylebar.Align"));
+ btnTableTextBracket.setToolTipText(app
+ .getPlainTooltip("stylebar.Bracket"));
+ btnTableTextLinesV.setToolTipText(app
+ .getPlainTooltip("stylebar.HorizontalLine"));
+ btnTableTextLinesH.setToolTipText(app
+ .getPlainTooltip("stylebar.VerticalLine"));
btnPen.setToolTipText(app.getPlainTooltip("stylebar.Pen"));
btnPenEraser.setToolTipText(app.getPlainTooltip("stylebar.Eraser"));
-
- btnCopyVisualStyle.setToolTipText(app.getPlainTooltip("stylebar.CopyVisualStyle"));
-
- }
+
+ btnCopyVisualStyle.setToolTipText(app
+ .getPlainTooltip("stylebar.CopyVisualStyle"));
+
+ }
}
diff --git a/geogebra/euclidian/EuclidianView.java b/geogebra/euclidian/EuclidianView.java
index 29c2b3b..340b835 100644
--- a/geogebra/euclidian/EuclidianView.java
+++ b/geogebra/euclidian/EuclidianView.java
@@ -1546,7 +1546,16 @@ public class EuclidianView extends JPanel implements View, EuclidianViewInterfac
if (automaticAxesNumberingDistances[axis]) {
// force same unit if scales are same, see #1082
if ((axis == 1) && automaticAxesNumberingDistances[0] && Kernel.isEqual(xscale, yscale)) {
- axesNumberingDistances[1] = axesNumberingDistances[0];
+
+ if (piAxisUnit[0] == piAxisUnit[1]) {
+ axesNumberingDistances[1] = axesNumberingDistances[0];
+ } else if (piAxisUnit[0]) {
+ axesNumberingDistances[1] = axesNumberingDistances[0] / Math.PI;
+ } else if (piAxisUnit[1]) {
+ axesNumberingDistances[1] = axesNumberingDistances[0] * Math.PI;
+ }
+
+
} else if (piAxisUnit[axis]) {
axesNumberingDistances[axis] = Math.PI;
} else {
diff --git a/geogebra/euclidian/EuclidianViewTransferHandler.java b/geogebra/euclidian/EuclidianViewTransferHandler.java
index 1327487..46f9f3f 100644
--- a/geogebra/euclidian/EuclidianViewTransferHandler.java
+++ b/geogebra/euclidian/EuclidianViewTransferHandler.java
@@ -13,11 +13,13 @@ import java.awt.Point;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.Transferable;
import java.awt.datatransfer.UnsupportedFlavorException;
+import java.awt.event.ActionEvent;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.Reader;
import java.util.ArrayList;
+import javax.swing.AbstractAction;
import javax.swing.JComponent;
import javax.swing.TransferHandler;
@@ -30,7 +32,6 @@ public class EuclidianViewTransferHandler extends TransferHandler implements Tra
private EuclidianView ev;
private Application app;
-
static DataFlavor textReaderFlavor;
static {
@@ -139,11 +140,18 @@ public class EuclidianViewTransferHandler extends TransferHandler implements Tra
// first try to get an image
if (t.isDataFlavorSupported(PlotPanelEuclidianView.plotPanelFlavor)){
- if(ev == app.getEuclidianView())
- app.getGuiManager().getProbabilityCalculator().exportGeosToEV(1);
- else if(ev == app.getEuclidianView2())
- app.getGuiManager().getProbabilityCalculator().exportGeosToEV(2);
- return true;
+
+ try {
+ AbstractAction act = (AbstractAction) t.getTransferData(PlotPanelEuclidianView.plotPanelFlavor);
+ act.putValue("euclidianViewID", ev.getViewID());
+ act.actionPerformed(new ActionEvent(act, 0, null));
+ } catch (UnsupportedFlavorException e) {
+ e.printStackTrace();
+ return false;
+ } catch (IOException e) {
+ e.printStackTrace();
+ return false;
+ } return true;
}
// first try to get an image
diff --git a/geogebra/export/GraphicExportDialog.java b/geogebra/export/GraphicExportDialog.java
index 74fa573..90d9ece 100644
--- a/geogebra/export/GraphicExportDialog.java
+++ b/geogebra/export/GraphicExportDialog.java
@@ -16,7 +16,6 @@ import geogebra.GeoGebra;
import geogebra.euclidian.EuclidianView;
import geogebra.export.epsgraphics.ColorMode;
import geogebra.gui.util.FileTransferable;
-import geogebra.gui.util.ImageSelection;
import geogebra.io.MyImageIO;
import geogebra.main.Application;
import geogebra.main.GeoGebraPreferences;
@@ -27,15 +26,19 @@ import geogebra.util.Util;
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.FlowLayout;
-import java.awt.Image;
import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
+import java.io.OutputStream;
import java.text.NumberFormat;
import java.util.Locale;
@@ -82,9 +85,30 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
private final int FORMAT_SVG = 3;
private final int FORMAT_EMF = 4;
- public GraphicExportDialog(Application app) {
+ private final EuclidianView specifiedEuclidianView;
+
+ /**
+ * Creates a dialog for exporting an image of the active EuclidianView
+ *
+ * @param app
+ */
+ public GraphicExportDialog(final Application app) {
+ this(app, null);
+
+ }
+
+ /**
+ * Creates a dialog for exporting an image of the EuclidianView given as a
+ * parameter.
+ *
+ * @param app
+ * @param specifiedEuclidianView
+ */
+ public GraphicExportDialog(final Application app,
+ final EuclidianView specifiedEuclidianView) {
super(app.getFrame(), false);
this.app = app;
+ this.specifiedEuclidianView = specifiedEuclidianView;
sizeLabelFormat = NumberFormat.getInstance(Locale.ENGLISH);
sizeLabelFormat.setGroupingUsed(false);
@@ -93,8 +117,15 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
initGUI();
}
+ private EuclidianView getEuclidianView() {
+ if (specifiedEuclidianView != null) {
+ return specifiedEuclidianView;
+ }
+ return (EuclidianView) app.getActiveEuclidianView();
+ }
+
@Override
- public void setVisible(boolean flag) {
+ public void setVisible(final boolean flag) {
if (flag) {
loadPreferences();
super.setVisible(true);
@@ -108,13 +139,13 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
setResizable(false);
setTitle(app.getPlain("ExportAsPicture"));
- JPanel cp = new JPanel(new BorderLayout(5, 5));
+ final JPanel cp = new JPanel(new BorderLayout(5, 5));
cp.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
getContentPane().add(cp);
// format list
- JPanel formatPanel = new JPanel(new FlowLayout(5));
- String[] formats = {
+ final JPanel formatPanel = new JPanel(new FlowLayout(5));
+ final String[] formats = {
app.getPlain("png") + " (" + Application.FILE_EXT_PNG + ")",
app.getPlain("pdf") + " (" + Application.FILE_EXT_PDF + ")",
app.getPlain("eps") + " (" + Application.FILE_EXT_EPS + ")",
@@ -133,11 +164,11 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
p.setLayout(new BoxLayout(p, BoxLayout.Y_AXIS));
// scale
- EuclidianView ev = (EuclidianView) app.getActiveEuclidianView();
+ final EuclidianView ev = getEuclidianView();
final PrintScalePanel psp = new PrintScalePanel(app, ev);
psp.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
+ public void actionPerformed(final ActionEvent e) {
updateSizeLabel();
}
});
@@ -146,7 +177,7 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
// dpi combo box
final JPanel dpiPanel = new JPanel(new FlowLayout(5));
- String[] dpiStr = { "72", "96", "150", "300", "600" };
+ final String[] dpiStr = { "72", "96", "150", "300", "600" };
cbDPI = new JComboBox(dpiStr);
cbDPI.setSelectedItem("300");
final JLabel resolutionInDPILabel = new JLabel(
@@ -172,34 +203,35 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
p.add(dpiPanel);
cbDPI.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent ae) {
+ public void actionPerformed(final ActionEvent ae) {
updateSizeLabel();
}
});
- // if (cbFormat.getSelectedIndex()==FORMAT_SVG || cbFormat.getSelectedIndex()==FORMAT_PDF)
+ // if (cbFormat.getSelectedIndex()==FORMAT_SVG ||
+ // cbFormat.getSelectedIndex()==FORMAT_PDF)
// dpiPanel.add(textAsShapesCB);
cbTransparent.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent arg0) {
+ public void actionPerformed(final ActionEvent arg0) {
transparent = cbTransparent.isSelected();
}
});
cbEMFPlus.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent arg0) {
+ public void actionPerformed(final ActionEvent arg0) {
EMFPlus = cbEMFPlus.isSelected();
}
});
textAsShapesCB.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent arg0) {
+ public void actionPerformed(final ActionEvent arg0) {
textAsShapes = textAsShapesCB.isSelected();
}
});
cbFormat.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent arg0) {
+ public void actionPerformed(final ActionEvent arg0) {
textAsShapesCB.setEnabled(true);
switch (cbFormat.getSelectedIndex()) {
case FORMAT_SVG:
@@ -242,7 +274,7 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
});
// width and height of picture
- JPanel sizePanel = new JPanel(new FlowLayout(5));
+ final JPanel sizePanel = new JPanel(new FlowLayout(5));
sizePanel.add(new JLabel(app.getPlain("Size") + ":"));
sizeLabel = new JLabel();
sizePanel.add(sizeLabel);
@@ -252,19 +284,19 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
// Cancel and Export Button
cancelButton = new JButton(app.getPlain("Cancel"));
cancelButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
+ public void actionPerformed(final ActionEvent e) {
setVisible(false);
}
});
- JButton exportButton = new JButton(app.getMenu("Save"));
+ final JButton exportButton = new JButton(app.getMenu("Save"));
exportButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- Thread runner = new Thread() {
+ public void actionPerformed(final ActionEvent e) {
+ final Thread runner = new Thread() {
@Override
public void run() {
setVisible(false);
- int index = cbFormat.getSelectedIndex();
+ final int index = cbFormat.getSelectedIndex();
switch (index) {
case FORMAT_PNG: // PNG
exportPNG(false);
@@ -292,15 +324,16 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
runner.start();
}
});
- JButton exportClipboardButton = new JButton(app.getMenu("Clipboard"));
+ final JButton exportClipboardButton = new JButton(
+ app.getMenu("Clipboard"));
exportClipboardButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- Thread runner = new Thread() {
+ public void actionPerformed(final ActionEvent e) {
+ final Thread runner = new Thread() {
@Override
public void run() {
setVisible(false);
- int index = cbFormat.getSelectedIndex();
+ final int index = cbFormat.getSelectedIndex();
switch (index) {
case FORMAT_PNG: // PNG
exportPNG(true);
@@ -329,7 +362,7 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
}
});
- JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
+ final JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
buttonPanel.add(exportButton);
buttonPanel.add(exportClipboardButton);
buttonPanel.add(cancelButton);
@@ -348,7 +381,7 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
/*
* dpi must be one of 72,96,150,300,600
*/
- public void setDPI(String dpi) {
+ public void setDPI(final String dpi) {
cbDPI.setSelectedItem(dpi);
}
@@ -356,7 +389,7 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
try {
// format
int formatID = FORMAT_PNG;
- String format = GeoGebraPreferences.getPref().loadPreference(
+ final String format = GeoGebraPreferences.getPref().loadPreference(
GeoGebraPreferences.EXPORT_PIC_FORMAT, "png");
if (format.equals("eps")) {
formatID = FORMAT_EPS;
@@ -367,10 +400,11 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
// dpi
if (cbDPI.isEnabled()) {
- String strDPI = GeoGebraPreferences.getPref().loadPreference(
- GeoGebraPreferences.EXPORT_PIC_DPI, "300");
+ final String strDPI = GeoGebraPreferences.getPref()
+ .loadPreference(GeoGebraPreferences.EXPORT_PIC_DPI,
+ "300");
for (int i = 0; i < cbDPI.getItemCount(); i++) {
- String dpi = cbDPI.getItemAt(i).toString();
+ final String dpi = cbDPI.getItemAt(i).toString();
if (dpi.equals(strDPI)) {
cbDPI.setSelectedIndex(i);
}
@@ -378,12 +412,14 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
}
/*
- * // scale in cm double scale = Double.parseDouble(GeoGebraPreferences.loadPreference(
- * GeoGebraPreferences.EXPORT_PIC_SCALE, "1")); app.getEuclidianView().setPrintingScale(scale);
+ * // scale in cm double scale =
+ * Double.parseDouble(GeoGebraPreferences.loadPreference(
+ * GeoGebraPreferences.EXPORT_PIC_SCALE, "1"));
+ * app.getEuclidianView().setPrintingScale(scale);
*/
updateSizeLabel();
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
}
}
@@ -410,21 +446,24 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
GeoGebraPreferences.EXPORT_PIC_FORMAT, format);
/*
- * // scale in cm GeoGebraPreferences.savePreference(GeoGebraPreferences.EXPORT_PIC_SCALE,
+ * // scale in cm
+ * GeoGebraPreferences.savePreference(GeoGebraPreferences.
+ * EXPORT_PIC_SCALE,
* Double.toString(app.getEuclidianView().getPrintingScale()));
*/
}
private void updateSizeLabel() {
- EuclidianView ev = (EuclidianView) app.getActiveEuclidianView();
- double printingScale = ev.getPrintingScale();
+ final EuclidianView ev = getEuclidianView();
+ final double printingScale = ev.getPrintingScale();
// takes dpi into account (note: eps has 72dpi)
exportScale = (printingScale * getDPI()) / 2.54 / ev.getXscale();
- StringBuilder sb = new StringBuilder();
+ final StringBuilder sb = new StringBuilder();
// cm size
- double cmWidth = printingScale * (ev.getExportWidth() / ev.getXscale());
- double cmHeight = printingScale
+ final double cmWidth = printingScale
+ * (ev.getExportWidth() / ev.getXscale());
+ final double cmHeight = printingScale
* (ev.getExportHeight() / ev.getYscale());
sb.append(sizeLabelFormat.format(cmWidth));
sb.append(" cm ");
@@ -433,7 +472,7 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
sb.append(sizeLabelFormat.format(cmHeight));
sb.append(" cm");
- int index = cbFormat.getSelectedIndex();
+ final int index = cbFormat.getSelectedIndex();
if (index == FORMAT_PNG) {
// pixel size
pixelWidth = (int) Math.floor(ev.getExportWidth() * exportScale);
@@ -460,10 +499,10 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
/**
* Shows save dialog and exports drawing as eps.
*/
- final private boolean exportEPS(boolean exportToClipboard) {
+ final private boolean exportEPS(final boolean exportToClipboard) {
- EuclidianView ev = (EuclidianView) app.getActiveEuclidianView();
- double printingScale = ev.getPrintingScale();
+ final EuclidianView ev = getEuclidianView();
+ final double printingScale = ev.getPrintingScale();
// set dpi to 72
exportScale = (printingScale * 72) / 2.54 / ev.getXscale();
@@ -471,26 +510,29 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
pixelWidth = (int) Math.floor(ev.getExportWidth() * exportScale);
pixelHeight = (int) Math.floor(ev.getExportHeight() * exportScale);
- // Michael Borcherds 2008-03-02 BEGIN
File file;
- String tempDir = DownloadManager.getTempDir();
+ OutputStream os;
if (exportToClipboard) {
+ final String tempDir = DownloadManager.getTempDir();
+ //os = new ByteArrayOutputStream();
+ // use file to get the correct filetype (so eg pasting into Word works)
+ // NB pasting into WordPad *won't* work with this method
file = new File(tempDir + "geogebra.eps");
} else {
- // Michael Borcherds 2008-03-02 END
file = app.getGuiManager().showSaveDialog(Application.FILE_EXT_EPS,
null, app.getPlain("eps") + " " + app.getMenu("Files"),
true, false);
- }
- if (file == null) {
- return false;
+
+ if (file == null) {
+ return false;
+ }
}
try {
+
- geogebra.export.epsgraphics.EpsGraphics g = new geogebra.export.epsgraphics.EpsGraphics(
+ final geogebra.export.epsgraphics.EpsGraphics g = new geogebra.export.epsgraphics.EpsGraphics(
app.getPlain("ApplicationName") + ", "
- + GeoGebra.GEOGEBRA_WEBSITE, (new FileOutputStream(
- file)), 0, 0, pixelWidth, pixelHeight,
+ + GeoGebra.GEOGEBRA_WEBSITE, new FileOutputStream(file), 0, 0, pixelWidth, pixelHeight,
ColorMode.COLOR_RGB);
// draw to epsGraphics2D
@@ -498,11 +540,11 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
g.close();
if (exportToClipboard) {
- sendToClipboard(file); // Michael Borcherds 2008-03-02 END
+ sendToClipboard(file);
}
return true;
- } catch (Exception ex) {
+ } catch (final Exception ex) {
app.showError("SaveFileFailed");
Application.debug(ex.toString());
return false;
@@ -512,12 +554,12 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
/**
* Exports drawing as emf
*/
- final private boolean exportEMF(boolean exportToClipboard,
- boolean useEMFplus) {
+ final private boolean exportEMF(final boolean exportToClipboard,
+ final boolean useEMFplus) {
// Michael Borcherds 2008-03-02 BEGIN
File file;
- String tempDir = DownloadManager.getTempDir();
+ final String tempDir = DownloadManager.getTempDir();
if (exportToClipboard) {
file = new File(tempDir + "geogebra.emf");
} else {
@@ -544,8 +586,7 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
app.exporting = true;
g.startExport();
- ((EuclidianView) app.getActiveEuclidianView()).exportPaint(g,
- exportScale);
+ getEuclidianView().exportPaint(g, exportScale);
g.endExport();
app.exporting = false;
@@ -555,11 +596,11 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
}
return true;
- } catch (Exception ex) {
+ } catch (final Exception ex) {
app.showError("SaveFileFailed");
Application.debug(ex.toString());
return false;
- } catch (Error ex) {
+ } catch (final Error ex) {
app.showError("SaveFileFailed");
Application.debug(ex.toString());
return false;
@@ -569,10 +610,10 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
/**
* Exports drawing as pdf
*/
- final private boolean exportPDF(boolean exportToClipboard) {
+ final private boolean exportPDF(final boolean exportToClipboard) {
// Michael Borcherds 2008-03-02 BEGIN
File file;
- String tempDir = DownloadManager.getTempDir();
+ final String tempDir = DownloadManager.getTempDir();
if (exportToClipboard) {
file = new File(tempDir + "geogebra.pdf");
} else {
@@ -588,23 +629,24 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
try {
// export text as shapes or plaintext
// shapes: better representation
- // text: smaller file size, but some unicode symbols don't export eg Upsilon
- UserProperties props = (UserProperties) PDFGraphics2D
+ // text: smaller file size, but some unicode symbols don't export eg
+ // Upsilon
+ final UserProperties props = (UserProperties) PDFGraphics2D
.getDefaultProperties();
props.setProperty(PDFGraphics2D.EMBED_FONTS, !textAsShapes);
- // props.setProperty(PDFGraphics2D.EMBED_FONTS_AS, FontConstants.EMBED_FONTS_TYPE1);
+ // props.setProperty(PDFGraphics2D.EMBED_FONTS_AS,
+ // FontConstants.EMBED_FONTS_TYPE1);
props.setProperty(PDFGraphics2D.TEXT_AS_SHAPES, textAsShapes);
PDFGraphics2D.setDefaultProperties(props);
- VectorGraphics g = new PDFGraphics2D(file, new Dimension(
+ final VectorGraphics g = new PDFGraphics2D(file, new Dimension(
pixelWidth, pixelHeight));
// make sure LaTeX exported at hi res
app.exporting = true;
g.startExport();
- ((EuclidianView) app.getActiveEuclidianView()).exportPaint(g,
- exportScale);
+ getEuclidianView().exportPaint(g, exportScale);
g.endExport();
app.exporting = false;
@@ -613,12 +655,12 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
}
return true;
- } catch (Exception ex) {
+ } catch (final Exception ex) {
ex.printStackTrace();
app.showError("SaveFileFailed");
return false;
- } catch (Error ex) {
+ } catch (final Error ex) {
ex.printStackTrace();
app.showError("SaveFileFailed");
@@ -629,10 +671,10 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
/**
* Exports drawing as SVG
*/
- final private boolean exportSVG(boolean exportToClipboard) {
+ final private boolean exportSVG(final boolean exportToClipboard) {
- EuclidianView ev = (EuclidianView) app.getActiveEuclidianView();
- double printingScale = ev.getPrintingScale();
+ final EuclidianView ev = getEuclidianView();
+ final double printingScale = ev.getPrintingScale();
// set dpi to 72
exportScale = (printingScale * 72) / 2.54 / ev.getXscale();
@@ -642,7 +684,7 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
// Michael Borcherds 2008-03-02 BEGIN
File file;
- String tempDir = DownloadManager.getTempDir();
+ final String tempDir = DownloadManager.getTempDir();
if (exportToClipboard) {
file = new File(tempDir + "geogebra.svg");
} else {
@@ -655,13 +697,15 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
if (file == null) {
return false;
}
- ev.setTemporaryCoordSystemForExport(); // allow clipping with Export_1 and 2 Points
+ ev.setTemporaryCoordSystemForExport(); // allow clipping with Export_1
+ // and 2 Points
try {
// export text as shapes or plaintext
// shapes: better representation
- // text: smaller file size, but some unicode symbols don't export eg Upsilon
- UserProperties props = (UserProperties) SVGGraphics2D
+ // text: smaller file size, but some unicode symbols don't export eg
+ // Upsilon
+ final UserProperties props = (UserProperties) SVGGraphics2D
.getDefaultProperties();
props.setProperty(SVGGraphics2D.EMBED_FONTS, !textAsShapes);
props.setProperty(SVGGraphics2D.TEXT_AS_SHAPES, textAsShapes);
@@ -669,9 +713,10 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
// Michael Borcherds 2008-03-01
// added SVGExtensions to support grouped objects in layers
- SVGExtensions g = new SVGExtensions(file, new Dimension(pixelWidth,
- pixelHeight));
- // VectorGraphics g = new SVGGraphics2D(file, new Dimension(pixelWidth, pixelHeight));
+ final SVGExtensions g = new SVGExtensions(file, new Dimension(
+ pixelWidth, pixelHeight));
+ // VectorGraphics g = new SVGGraphics2D(file, new
+ // Dimension(pixelWidth, pixelHeight));
// make sure LaTeX exported at hi res
app.exporting = true;
@@ -683,7 +728,11 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
ev.drawObjectsPre(g);
g.endGroup("misc");
- for (int layer = 0; layer <= ev.getMaxLayerUsed(); layer++) // draw only layers we need
+ for (int layer = 0; layer <= ev.getMaxLayerUsed(); layer++) // draw
+ // only
+ // layers
+ // we
+ // need
{
g.startGroup("layer" + layer);
ev.drawLayers[layer].drawAll(g);
@@ -698,11 +747,11 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
}
return true;
- } catch (Exception ex) {
+ } catch (final Exception ex) {
app.showError("SaveFileFailed");
ex.printStackTrace();
return false;
- } catch (Error ex) {
+ } catch (final Error ex) {
app.showError("SaveFileFailed");
ex.printStackTrace();
return false;
@@ -711,17 +760,18 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
}
}
- final public boolean exportPNG(boolean exportToClipboard) {
+ final public boolean exportPNG(final boolean exportToClipboard) {
return exportPNG(exportToClipboard, true);
}
/**
* Exports drawing as png with given resolution in dpi
*/
- final public boolean exportPNG(boolean exportToClipboard, boolean showError) {
+ final public boolean exportPNG(final boolean exportToClipboard,
+ final boolean showError) {
// Michael Borcherds 2008-03-02 BEGIN
File file;
- String tempDir = DownloadManager.getTempDir();
+ final String tempDir = DownloadManager.getTempDir();
if (exportToClipboard) {
file = new File(tempDir + "geogebra.png");
} else {
@@ -736,8 +786,9 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
try {
// draw graphics view into image
- EuclidianView ev = (EuclidianView) app.getActiveEuclidianView();
- BufferedImage img = ev.getExportImage(exportScale, transparent);
+ final EuclidianView ev = getEuclidianView();
+ final BufferedImage img = ev.getExportImage(exportScale,
+ transparent);
// write image to file
MyImageIO.write(img, "png", getDPI(), file);
@@ -747,13 +798,13 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
}
return true;
- } catch (Exception ex) {
+ } catch (final Exception ex) {
if (showError) {
app.showError("SaveFileFailed");
}
Application.debug(ex.toString());
return false;
- } catch (Error ex) {
+ } catch (final Error ex) {
if (showError) {
app.showError("SaveFileFailed");
}
@@ -765,10 +816,12 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
/**
* Exports drawing as jpg.
*
- * final private boolean exportJPG() { File file = app.showSaveDialog( Application.FILE_EXT_JPG,
- * app.getPlain("jpg") + " " + app.getMenu("Files")); if (file == null) return false; try { BufferedImage
- * img = app.getEuclidianView().getExportImage( sizePanel.getSelectedWidth()); ImageIO.write(img, "jpg",
- * file); return true; } catch (IOException ex) { app.showError("SaveFileFailed");
+ * final private boolean exportJPG() { File file = app.showSaveDialog(
+ * Application.FILE_EXT_JPG, app.getPlain("jpg") + " " +
+ * app.getMenu("Files")); if (file == null) return false; try {
+ * BufferedImage img = app.getEuclidianView().getExportImage(
+ * sizePanel.getSelectedWidth()); ImageIO.write(img, "jpg", file); return
+ * true; } catch (IOException ex) { app.showError("SaveFileFailed");
* Application.debug(ex.toString()); return false; } }
*/
@@ -776,31 +829,24 @@ public class GraphicExportDialog extends JDialog implements KeyListener {
* Keylistener implementation of PropertiesDialog
*/
- public void keyPressed(KeyEvent e) {
- int code = e.getKeyCode();
+ public void keyPressed(final KeyEvent e) {
+ final int code = e.getKeyCode();
if (code == KeyEvent.VK_ESCAPE) {
setVisible(false);
}
}
- public void keyReleased(KeyEvent e) {
+ public void keyReleased(final KeyEvent e) {
}
- public void keyTyped(KeyEvent e) {
+ public void keyTyped(final KeyEvent e) {
}
// Michael Borcherds 2008-03-02 BEGIN
- private void sendToClipboard(File file) {
- FileTransferable ft = new FileTransferable(file);
+ private void sendToClipboard(final File file) {
+ final FileTransferable ft = new FileTransferable(file);
Toolkit.getDefaultToolkit().getSystemClipboard().setContents(ft, null);
}
- private void sendToClipboard(Image img) {
- ImageSelection imgSel = new ImageSelection(img);
- Toolkit.getDefaultToolkit().getSystemClipboard()
- .setContents(imgSel, null);
- }
- // Michael Borcherds 2008-03-02 END
-
}
diff --git a/geogebra/export/WorksheetExportDialog.java b/geogebra/export/WorksheetExportDialog.java
index ba4ba36..9648a8b 100644
--- a/geogebra/export/WorksheetExportDialog.java
+++ b/geogebra/export/WorksheetExportDialog.java
@@ -25,6 +25,7 @@ import geogebra.kernel.GeoElement;
import geogebra.kernel.Kernel;
import geogebra.main.Application;
import geogebra.main.GeoGebraPreferences;
+import geogebra.util.Base64;
import geogebra.util.DownloadManager;
import geogebra.util.Util;
@@ -83,8 +84,6 @@ public class WorksheetExportDialog extends JDialog {
*/
private static final int TAB_HTML = 1;
- private static final int BUTTON_WIDTH = 200;
- private static final int BUTTON_HEIGHT = 40;
private static final int DEFAULT_HTML_PAGE_WIDTH = 600;
public static final int DEFAULT_APPLET_WIDTH = 600;
public static final int DEFAULT_APPLET_HEIGHT = 500;
@@ -98,6 +97,7 @@ public class WorksheetExportDialog extends JDialog {
final private static int TYPE_MEDIAWIKI = 2;
final private static int TYPE_GOOGLEGADGET = 3;
final private static int TYPE_MOODLE = 4;
+ final private static int TYPE_GEOGEBRAWEB = 5;
// final private static int TYPE_JSXGRAPH = 4;
// final private static int TYPE_JAVASCRIPT = 5;
@@ -110,7 +110,7 @@ public class WorksheetExportDialog extends JDialog {
cbAllowRescaling, cbRemoveLinebreaks, cbOfflineJars,
cbIncludeHTML5;
private JComboBox cbFileType, cbAllWorksheets;
- private JButton exportButton, uploadButton, helpButton;
+ private JButton exportButton, helpButton;
private GraphicSizePanel sizePanel;
private boolean kernelChanged = false;
private JTabbedPane tabbedPane;
@@ -141,7 +141,7 @@ public class WorksheetExportDialog extends JDialog {
* upper left corner of the euclidian view.
*/
private void checkEuclidianView() {
- EuclidianView ev = app.getEuclidianView();
+ EuclidianView ev = (EuclidianView) app.getActiveEuclidianView();
// 1) selection rectangle
Rectangle rect = ev.getSelectionRectangle();
@@ -332,7 +332,7 @@ public class WorksheetExportDialog extends JDialog {
Util.registerForDisposeOnEscape(this);
setTitle(app.getPlain("DynamicWorksheetExport"));
- setResizable(false);
+ setResizable(true);
centerOnScreen();
}
@@ -348,13 +348,6 @@ public class WorksheetExportDialog extends JDialog {
cbShowResetIcon.setSelected(Boolean.valueOf(
ggbPref.loadPreference(GeoGebraPreferences.EXPORT_WS_RESET_ICON,
"false")).booleanValue());
- //cbShowFrame.setSelected(Boolean.valueOf(
- // ggbPref.loadPreference(GeoGebraPreferences.EXPORT_WS_FRAME_POSSIBLE,
- // "false")).booleanValue());
- //cbOpenButton.setSelected(Boolean.valueOf(
- // ggbPref.loadPreference(GeoGebraPreferences.EXPORT_WS_BUTTON_TO_OPEN,
- // "false")).booleanValue());
-
cbShowMenuBar.setSelected(Boolean.valueOf(
ggbPref.loadPreference(GeoGebraPreferences.EXPORT_WS_SHOW_MENUBAR,
"false")).booleanValue());
@@ -426,8 +419,6 @@ public class WorksheetExportDialog extends JDialog {
Boolean.toString(cbEnableLabelDrags.isSelected()));
ggbPref.savePreference(GeoGebraPreferences.EXPORT_WS_RESET_ICON,
Boolean.toString(cbShowResetIcon.isSelected()));
- //ggbPref.savePreference(GeoGebraPreferences.EXPORT_WS_FRAME_POSSIBLE,
- // Boolean.toString(cbShowFrame.isSelected()));
ggbPref.savePreference(GeoGebraPreferences.EXPORT_WS_SHOW_MENUBAR,
Boolean.toString(cbShowMenuBar.isSelected()));
ggbPref.savePreference(GeoGebraPreferences.EXPORT_WS_SHOW_TOOLBAR,
@@ -449,8 +440,6 @@ public class WorksheetExportDialog extends JDialog {
Boolean.toString(cbAllowRescaling.isSelected()));
ggbPref.savePreference(GeoGebraPreferences.EXPORT_WS_REMOVE_LINEBREAKS,
Boolean.toString(cbRemoveLinebreaks.isSelected()));
- //ggbPref.savePreference(GeoGebraPreferences.EXPORT_WS_BUTTON_TO_OPEN,
- // Boolean.toString(cbOpenButton.isSelected()));
ggbPref.savePreference(GeoGebraPreferences.EXPORT_WS_OFFLINE_ARCHIVE,
Boolean.toString(cbOfflineJars.isSelected()));
}
@@ -576,14 +565,6 @@ public class WorksheetExportDialog extends JDialog {
cbShowResetIcon = new JCheckBox(app.getMenu("ShowResetIcon"));
funcPanel.add(cbShowResetIcon);
- // framPossible
- //cbShowFrame = new JCheckBox(app.getPlain("DoubleClickToOpen"));
- //funcPanel.add(cbShowFrame);
-
- // button to open applet
- //cbOpenButton = new JCheckBox(app.getPlain("OpenButton"));
- //funcPanel.add(cbOpenButton);
-
funcPanel.add(Box.createVerticalGlue());
cbUseBrowserForJavaScript = new JCheckBox(app.getMenu("UseBrowserForJS"));
@@ -669,11 +650,11 @@ public class WorksheetExportDialog extends JDialog {
// left column
// include HTML5
- cbIncludeHTML5 = new JCheckBox(app.getMenu("IncludeHTML5"));
+ cbIncludeHTML5 = new JCheckBox(app.getMenu("HTML5Only"));
if (GeoGebra.IS_PRE_RELEASE) filePanelWest.add(cbIncludeHTML5);
// download jar files
- cbOfflineJars = new JCheckBox(app.getPlain("IncludeJARFiles"));
+ cbOfflineJars = new JCheckBox(app.getPlain("AllowOfflineUse"));
filePanelWest.add(cbOfflineJars);
// remove line breaks
@@ -814,15 +795,10 @@ public class WorksheetExportDialog extends JDialog {
case TYPE_MOODLE:
int appletWidth,
appletHeight;
- //if (cbOpenButton.isSelected()) { // change width and height for open
- // // button
- // appletWidth = BUTTON_WIDTH;
- // appletHeight = BUTTON_HEIGHT;
- //} else
- {
- appletWidth = sizePanel.getSelectedWidth();
- appletHeight = sizePanel.getSelectedHeight();
- }
+
+ appletWidth = sizePanel.getSelectedWidth();
+ appletHeight = sizePanel.getSelectedHeight();
+
stringSelection = new StringSelection(getAppletTag(app, null,
appletWidth, appletHeight, false, removeLineBreaks,
@@ -890,7 +866,7 @@ public class WorksheetExportDialog extends JDialog {
}
// open html file in browser
- guiManager.showURLinBrowser(HTMLfile.toURL());
+ guiManager.showURLinBrowser(HTMLfile.toURI().toURL());
} catch (Exception ex) {
app.showError("SaveFileFailed");
Application.debug(ex.toString());
@@ -1020,7 +996,7 @@ public class WorksheetExportDialog extends JDialog {
try {
// open html file in browser
- guiManager.showURLinBrowser(HTMLfile.toURL());
+ guiManager.showURLinBrowser(HTMLfile.toURI().toURL());
} catch (Exception ex) {
app.showError("SaveFileFailed");
Application.debug(ex.toString());
@@ -1095,7 +1071,7 @@ public class WorksheetExportDialog extends JDialog {
try {
// open html file in browser
- guiManager.showURLinBrowser(HTMLfile.toURL());
+ guiManager.showURLinBrowser(HTMLfile.toURI().toURL());
} catch (Exception ex) {
app.showError("SaveFileFailed");
Application.debug(ex.toString());
@@ -1194,7 +1170,7 @@ public class WorksheetExportDialog extends JDialog {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
try {
app.getXMLio().writeGeoGebraFile(baos, false);
- sb.append(geogebra.util.Base64.encode(baos.toByteArray(), 0));
+ sb.append(Base64.encode(baos.toByteArray(), 0));
} catch (IOException e) {
e.printStackTrace();
return false;
@@ -1254,7 +1230,7 @@ public class WorksheetExportDialog extends JDialog {
* appendWithLineBreak(sb, "<html xmlns=\"http://www.w3.org/1999/xhtml\">");
* appendWithLineBreak(sb, "<head>"); appendWithLineBreak(sb, "<title>");
* Construction cons = kernel.getConstruction(); String title =
- * cons.getTitle(); sb.append(Util.toHTMLString(title));
+ * cons.getTitle(); sb.append(StringUtil.toHTMLString(title));
* appendWithLineBreak(sb, "</title>"); appendWithLineBreak(sb, "<body>");
*
* appendWithLineBreak(sb, "<script type=\"text/javascript\">");
@@ -1287,7 +1263,7 @@ public class WorksheetExportDialog extends JDialog {
* appendWithLineBreak(sb, "<html xmlns=\"http://www.w3.org/1999/xhtml\">");
* appendWithLineBreak(sb, "<head>"); appendWithLineBreak(sb, "<title>");
* Construction cons = kernel.getConstruction(); String title =
- * cons.getTitle(); sb.append(Util.toHTMLString(title));
+ * cons.getTitle(); sb.append(StringUtil.toHTMLString(title));
* appendWithLineBreak(sb, "</title>");
*
* appendWithLineBreak(sb, " <style type=\"text/css\">");
@@ -1390,14 +1366,8 @@ public class WorksheetExportDialog extends JDialog {
// applet width
int appletWidth, appletHeight;
- //if (cbOpenButton.isSelected()) { // change width and height for open button
- // appletWidth = BUTTON_WIDTH;
- // appletHeight = BUTTON_HEIGHT;
- //} else
- {
- appletWidth = sizePanel.getSelectedWidth();
- appletHeight = sizePanel.getSelectedHeight();
- }
+ appletWidth = sizePanel.getSelectedWidth();
+ appletHeight = sizePanel.getSelectedHeight();
// width for table
int pageWidth = Math.max(appletWidth, DEFAULT_HTML_PAGE_WIDTH);
@@ -1537,7 +1507,7 @@ public class WorksheetExportDialog extends JDialog {
// for each GeoElement with a JavaScript, create a function call
// with the same name as the geo's label (prefixed by ggb)
sb.append("function ggb");
- sb.append(geo.getLabel());
+ sb.append(geo.getLabelSimple());
appendWithLineBreak(sb, "() {");
appendWithLineBreak(sb, "var ggbApplet = document.ggbApplet;");
appendWithLineBreak(sb, script);
@@ -1588,23 +1558,17 @@ public class WorksheetExportDialog extends JDialog {
StringBuilder sb = new StringBuilder();
- // JavaScript version for non-Java devices eg Android, iPhone
+ // GeoGebraWeb (JavaScript/HTML5) for non-Java devices eg Android, iPhone
if (includeHTML5) {
-
- appendWithLineBreak(
- sb,
- "<script type=\"text/javascript\" language=\"javascript\" src=\"http://www.geogebra.org/mobile/4.0/geogebramobile/geogebramobile.nocache.js\"></script>");
- sb.append("<article class=\"geogebramobile\" style=\"width: ");
- sb.append(width);
- sb.append("px; height: ");
- sb.append(height);
- appendWithLineBreak(sb, "px; border: 1px solid black;\"");
- sb.append("data-param-ggbbase64=\"");
- appendBase64(app, sb);
- sb.append("\"");
- appendWithLineBreak(sb, "></article>");
- appendWithLineBreak(sb, "<noscript id=\"ggbappletwrapper\">");
- }
+ appendWithLineBreak(sb, "<script type=\"text/javascript\" language=\"javascript\" src=\"");
+ sb.append(GeoGebra.GEOGEBRA_HTML5_BASE);
+ sb.append("\"></script>");
+ appendWithLineBreak(sb, "<article class=\"geogebraweb\" data-param-width=\""+width+"\" data-param-height=\""+height+"\" ");
+ appendGgbAppletParameters(sb, TYPE_GEOGEBRAWEB);
+ sb.append("data-param-ggbbase64=\"");
+ appendBase64(app, sb);
+ appendWithLineBreak(sb, "\"></article>");
+ } else {
// include applet
sb.append("<applet name=\"ggbApplet\" code=\"geogebra.GeoGebraApplet\"");
@@ -1658,99 +1622,114 @@ public class WorksheetExportDialog extends JDialog {
"\t<param name=\"centerimage\" value=\"true\" />");
}
- //if (!cbOpenButton.isSelected()) {
- appendAllAppletParameters(sb, TYPE_HTMLFILE);
- //} else {// button type
- // appendWithLineBreak(sb, "\t<param name=\"type\" value=\"button\" />");
- // // white background
- // appendWithLineBreak(sb, "\t<param name=\"bgcolor\" value=\"#FFFFFF\" />");
- //}
+ appendAllAppletParameters(sb, TYPE_HTMLFILE);
// problem with Moodle 1.9.5 mangling this
if (includeNoJavaMessage)
appendWithLineBreak(sb, app.getPlain("NoJavaMessage"));
sb.append("</applet>");
- if (includeHTML5) {
- appendWithLineBreak(sb, "</noscript>");
+
}
+
return sb.toString();
}
- private void appletParam(StringBuilder sb, String param, boolean value,
+ private void appletParam(StringBuilder sb, String[] param, boolean value,
int type) {
appletParam(sb, param, value + "", type);
}
- private void appletParam(StringBuilder sb, String param, String value,
+ private void appletParam(StringBuilder sb, String[] param, String value,
int type) {
switch (type) {
case TYPE_MEDIAWIKI:
sb.append(' ');
- sb.append(param);
+ sb.append(param[0]);
sb.append(" = \"");
sb.append(value);
sb.append('\"');
break;
case TYPE_GOOGLEGADGET:
- sb.append(param);
+ sb.append(param[0]);
sb.append(":\"");
sb.append(value);
sb.append("\", ");
break;
+ case TYPE_GEOGEBRAWEB:
+ if (param[1] != null) {
+ sb.append(param[1]);
+ sb.append("=\"");
+ sb.append(value);
+ sb.append("\" ");
+ }
+
+ break;
+
default: // HTML file/clipboard
sb.append("\t<param name=\"");
- sb.append(param);
+ sb.append(param[0]);
sb.append("\" value=\"");
sb.append(value);
appendWithLineBreak(sb, "\" />");
}
}
+
+ final static String[] enableLabelDrags = {"enableLabelDrags", "data-param-enableLabelDrags"};
+ final static String[] showResetIcon = {"showResetIcon", "data-param-showResetIcon"};
+ final static String[] enableRightClick = {"enableRightClick", null};
+ final static String[] errorDialogsActive = {"errorDialogsActive", null};
+ final static String[] showMenuBar = {"showMenuBar", "data-param-showMenuBar"};
+ final static String[] showToolBar = {"showToolBar", "data-param-showToolBar"};
+ final static String[] showToolBarHelp = {"showToolBarHelp", null};
+ final static String[] showAlgebraInput = {"showAlgebraInput", "data-param-showAlgebraInput"};
+ final static String[] useBrowserForJS = {"useBrowserForJS", "enableLabelDrags"};
+ final static String[] allowRescaling = {"allowRescaling", null};
+ final static String[] java_arguments = {"java_arguments", null};
+ final static String[] cache_archive = {"cache_archive", null};
+ final static String[] cache_version = {"cache_version", null};
private void appendGgbAppletParameters(StringBuilder sb, int type) {
- // framePossible (double click opens GeoGebra window)
- // appletParam(sb, "framePossible", cbShowFrame.isSelected(), type);
-
// showResetIcon
- appletParam(sb, "showResetIcon", cbShowResetIcon.isSelected(), type);
+ appletParam(sb, showResetIcon, cbShowResetIcon.isSelected(), type);
// TODO: implement show animation controls
- appletParam(sb, "showAnimationButton", true, type);
+ //appletParam(sb, showAnimationButton, true, type);
// enable right click
- appletParam(sb, "enableRightClick", cbEnableRightClick.isSelected(), type);
+ appletParam(sb, enableRightClick, cbEnableRightClick.isSelected(), type);
// enable error dialogs
- appletParam(sb, "errorDialogsActive", true, type);// sb.append(cbEnableErrorDialogs.isSelected());
+ appletParam(sb, errorDialogsActive, true, type);// sb.append(cbEnableErrorDialogs.isSelected());
// enable label drags
- appletParam(sb, "enableLabelDrags", cbEnableLabelDrags.isSelected(), type);
+ appletParam(sb, enableLabelDrags, cbEnableLabelDrags.isSelected(), type);
// showMenuBar
- appletParam(sb, "showMenuBar", cbShowMenuBar.isSelected(), type);
+ appletParam(sb, showMenuBar, cbShowMenuBar.isSelected(), type);
// showToolBar
- appletParam(sb, "showToolBar", cbShowToolBar.isSelected(), type);
+ appletParam(sb, showToolBar, cbShowToolBar.isSelected(), type);
// showToolBarHelp
- appletParam(sb, "showToolBarHelp", cbShowToolBarHelp.isSelected(), type);
+ appletParam(sb, showToolBarHelp, cbShowToolBarHelp.isSelected(), type);
// showAlgebraInput
- appletParam(sb, "showAlgebraInput", cbShowInputField.isSelected(), type);
+ appletParam(sb, showAlgebraInput, cbShowInputField.isSelected(), type);
// Use Browser for JavaScript (eg Buttons)
- appletParam(sb, "useBrowserForJS", cbUseBrowserForJavaScript.isSelected(),
+ appletParam(sb, useBrowserForJS, cbUseBrowserForJavaScript.isSelected(),
type);
// allowRescaling
- appletParam(sb, "allowRescaling", cbAllowRescaling.isSelected(), type);
+ appletParam(sb, allowRescaling, cbAllowRescaling.isSelected(), type);
}
@@ -1763,17 +1742,17 @@ public class WorksheetExportDialog extends JDialog {
// JVM arguments, for Java 1.6.0_10 and later
// increase heap memory for applets
- String javaArgs = "-Xmx" + GeoGebra.MAX_HEAP_SPACE
- + "m -Djnlp.packEnabled=true";
+ String javaArgs = "-Xmx" + GeoGebra.MAX_HEAP_SPACE+ "m";
+
// TODO: include pack.gz files in offline export
- // if (cbOfflineArchive.isSelected()) {
- // // look for local pack200 files: jar.pack.gz
- // javaArgs += " -Djnlp.packEnabled=true";
- // }
+ if (!cbOfflineJars.isSelected()) {
+ // look for local pack200 files: jar.pack.gz
+ javaArgs += " -Djnlp.packEnabled=true";
+ }
// sb.append("\t<param name=\"java_arguments\" value=\"" + javaArgs +
// "\" />");
- appletParam(sb, "java_arguments", javaArgs, type);
+ appletParam(sb, java_arguments, javaArgs, type);
// add caching information to help JVM with faster applet loading
// sb.append("\t<param name=\"cache_archive\" value=\"");
@@ -1785,7 +1764,7 @@ public class WorksheetExportDialog extends JDialog {
}
// sb.append("\" />");
- appletParam(sb, "cache_archive", sb2.toString(), type);
+ appletParam(sb, cache_archive, sb2.toString(), type);
// cache versions of jar files: if this version is already present on the
// client
@@ -1799,10 +1778,9 @@ public class WorksheetExportDialog extends JDialog {
sb2.append(", ");
}
// sb.append("\" />");
- appletParam(sb, "cache_version", sb2.toString(), type);
+ appletParam(sb, cache_version, sb2.toString(), type);
appendGgbAppletParameters(sb, type);
-
}
}
diff --git a/geogebra/export/epsgraphics/EpsGraphics.java b/geogebra/export/epsgraphics/EpsGraphics.java
index 4b284b6..bfe5931 100644
--- a/geogebra/export/epsgraphics/EpsGraphics.java
+++ b/geogebra/export/epsgraphics/EpsGraphics.java
@@ -247,6 +247,10 @@ public class EpsGraphics extends java.awt.Graphics2D {
*/
private void draw(Shape s, String action) {
if (s != null) {
+
+ // 20120115 bugfix: stroke needs to be appended each time
+ appendStroke();
+
if (!_transform.isIdentity()) {
s = _transform.createTransformedShape(s);
}
@@ -531,13 +535,24 @@ public class EpsGraphics extends java.awt.Graphics2D {
}
}
+ /*
+ * 20120115 bugfix: stroke needs to be appended each time
+ * (non-Javadoc)
+ * @see java.awt.Graphics2D#setStroke(java.awt.Stroke)
+ */
+ public void setStroke(final Stroke currentStroke) {
+ this.currentStroke = currentStroke;
+ }
+
+ Stroke currentStroke = null;
+
/**
* Sets the stroke. Only accepts BasicStroke objects (or subclasses of
* BasicStroke).
*/
- public void setStroke(Stroke s) {
- if (s instanceof BasicStroke) {
- _stroke = (BasicStroke) s;
+ public void appendStroke() {
+ if (currentStroke instanceof BasicStroke) {
+ _stroke = (BasicStroke) currentStroke;
append(_stroke.getLineWidth() + " setlinewidth");
double miterLimit = _stroke.getMiterLimit();
if (miterLimit < 1.0f) {
diff --git a/geogebra/gui/ContextMenuGeoElement.java b/geogebra/gui/ContextMenuGeoElement.java
index 348ac61..d8b29e5 100644
--- a/geogebra/gui/ContextMenuGeoElement.java
+++ b/geogebra/gui/ContextMenuGeoElement.java
@@ -922,6 +922,7 @@ public class ContextMenuGeoElement extends JPopupMenu {
public void actionPerformed(ActionEvent e) {
//tempArrayList.clear();
//tempArrayList.add(geo);
+ Application.debug(geos.size()+" "+geos.get(0).getLabel());
app.getGuiManager().showPropertiesDialog(geos);
}
});
diff --git a/geogebra/gui/FileDropTargetListener.java b/geogebra/gui/FileDropTargetListener.java
index 314a00d..d96d6fc 100644
--- a/geogebra/gui/FileDropTargetListener.java
+++ b/geogebra/gui/FileDropTargetListener.java
@@ -26,6 +26,7 @@ import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import java.util.ListIterator;
+import java.util.Locale;
import java.util.StringTokenizer;
public class FileDropTargetListener implements DropTargetListener {
@@ -86,10 +87,27 @@ public class FileDropTargetListener implements DropTargetListener {
ArrayList<File> al = getGGBfiles(t);
- if (al.size() == 0 || !isGGBFile(al.get(0).getName())) {
+ if (al.size() == 0) {
return false;
}
- else if (app.isSaved() || app.saveCurrentFile()) {
+
+ boolean allGGT = true;
+ for (int i = al.size() - 1 ; i >= 0 ; i--) {
+ if (!isGGBFile(al.get(i).getName()) && !isGGTFile(al.get(i).getName())) {
+ al.remove(i);
+ } else {
+ if (!isGGTFile(al.get(i).getName())) {
+ allGGT = false;
+ }
+
+ }
+ }
+
+ if (al.size() == 0) {
+ return false;
+ }
+
+ else if (allGGT || app.isSaved() || app.saveCurrentFile()) {
File [] files = new File[al.size()];
for (int i = 0 ; i < al.size() ; i++)
files[i] = al.get(i);
@@ -101,14 +119,25 @@ public class FileDropTargetListener implements DropTargetListener {
/**
- * Tests if a file has the GeoGebra extension
+ * Tests if a file has the GeoGebra extension .ggb
* @param fileName
* @return
*/
private boolean isGGBFile(String fileName){
int mid = fileName.lastIndexOf(".");
String ext = fileName.substring(mid+1,fileName.length());
- return ext.equals(Application.FILE_EXT_GEOGEBRA);
+ return ext.toLowerCase(Locale.US).equals(Application.FILE_EXT_GEOGEBRA);
+ }
+
+ /**
+ * Tests if a file has the GeoGebra tool extension .ggt
+ * @param fileName
+ * @return
+ */
+ private boolean isGGTFile(String fileName){
+ int mid = fileName.lastIndexOf(".");
+ String ext = fileName.substring(mid+1,fileName.length());
+ return ext.toLowerCase(Locale.US).equals(Application.FILE_EXT_GEOGEBRA_TOOL);
}
diff --git a/geogebra/gui/GeoGebraKeys.java b/geogebra/gui/GeoGebraKeys.java
index 42188ef..a7fa46e 100644
--- a/geogebra/gui/GeoGebraKeys.java
+++ b/geogebra/gui/GeoGebraKeys.java
@@ -306,14 +306,25 @@ Ctrl Alt { }
if (!insertStr.equals("")) {
JTextComponent comp = (JTextComponent) e.getComponent();
int pos = comp.getCaretPosition();
- String oldText = comp.getText();
- StringBuilder sb = new StringBuilder();
- sb.append(oldText.substring(0, pos));
- sb.append(insertStr);
- sb.append(oldText.substring(pos));
- comp.setText(sb.toString());
- comp.setCaretPosition(pos + insertStr.length());
+ // if we have a DynamicTextInputPane then using setText to
+ // insert will destroy any dynamic objects, so use its
+ // insertString method instead. #1672
+ if (comp instanceof DynamicTextInputPane) {
+ ((DynamicTextInputPane) comp).insertString(pos, insertStr,
+ null);
+ } else
+ // all other cases use setText
+ {
+ String oldText = comp.getText();
+ StringBuilder sb = new StringBuilder();
+ sb.append(oldText.substring(0, pos));
+ sb.append(insertStr);
+ sb.append(oldText.substring(pos));
+ comp.setText(sb.toString());
+ comp.setCaretPosition(pos + insertStr.length());
+ }
+
e.consume();
}
}
diff --git a/geogebra/gui/GuiManager.java b/geogebra/gui/GuiManager.java
index a0c7fcf..d03742e 100644
--- a/geogebra/gui/GuiManager.java
+++ b/geogebra/gui/GuiManager.java
@@ -1704,11 +1704,9 @@ public class GuiManager {
try {
setFileChooser(new GeoGebraFileChooser(app,
app.getCurrentImagePath())); // non-restricted
- // Added for Intergeo File Format (Yves Kreis) -->
getFileChooser().addPropertyChangeListener(
JFileChooser.FILE_FILTER_CHANGED_PROPERTY,
new FileFilterChangedListener());
- // <-- Added for Intergeo File Format (Yves Kreis)
} catch (Exception e) {
// fix for java.io.IOException: Could not get shell folder ID
// list
@@ -1737,29 +1735,31 @@ public class GuiManager {
// update locale
currentLocale = app.getLocale();
-
- // load javaui properties file for specific locale
- // next two lines edited by Zbynek Konecny 2010-04-23 to avoid false
- // exception message
- String underscoreLocale = "en".equals(currentLocale.getLanguage()) ? ""
- : "_" + currentLocale;
- rbJavaUI = MyResourceBundle.loadSingleBundleFile(Application.RB_JAVA_UI
- + underscoreLocale);
- boolean foundLocaleFile = rbJavaUI != null;
- if (!foundLocaleFile) {
- // fall back on English
+ String lang = currentLocale.getLanguage();
+ boolean deleteKeys = false;
+
+ if ("it".equals(lang)
+ || "zh".equals(lang)
+ || "ja".equals(lang)
+ || "de".equals(lang)
+ //|| "es".equals(lang) we have our own Spanish translation
+ //|| "fr".equals(lang) we have our own French translation
+ || "ko".equals(lang)
+ || "sv".equals(lang) ) {
+ // get keys to delete
+ // as Java is localized in these languages already
+ // http://openjdk.java.net/groups/i18n/
rbJavaUI = MyResourceBundle
- .loadSingleBundleFile(Application.RB_JAVA_UI);
+ .loadSingleBundleFile(Application.RB_JAVA_UI);
+ deleteKeys = true;
+ } else {
+ rbJavaUI = MyResourceBundle.createBundle(Application.RB_JAVA_UI, currentLocale);
}
-
- // set or delete all keys in UIManager
+
Enumeration<String> keys = rbJavaUI.getKeys();
while (keys.hasMoreElements()) {
String key = keys.nextElement();
- String value = foundLocaleFile ? rbJavaUI.getString(key) : null;
-
- // set or delete UIManager key entry (set values to null when locale
- // file not found)
+ String value = deleteKeys ? null : rbJavaUI.getString(key);
UIManager.put(key, value);
}
@@ -1990,31 +1990,16 @@ public class GuiManager {
}
}
- // Added for Intergeo File Format (Yves Kreis) -->
String[] fileExtensions;
String[] fileDescriptions;
- if (GeoGebra.DISABLE_I2G) {
- fileExtensions = new String[] { Application.FILE_EXT_GEOGEBRA };
- fileDescriptions = new String[] { app.getPlain("ApplicationName")
- + " " + app.getMenu("Files") };
- } else {
- fileExtensions = new String[] { Application.FILE_EXT_GEOGEBRA,
- Application.FILE_EXT_INTERGEO };
- fileDescriptions = new String[] {
- app.getPlain("ApplicationName") + " "
- + app.getMenu("Files"),
- "Intergeo " + app.getMenu("Files") + " [Version "
- + GeoGebra.I2G_FILE_FORMAT + "]" };
- }
- // <-- Added for Intergeo File Format (Yves Kreis)
+
+ fileExtensions = new String[] { Application.FILE_EXT_GEOGEBRA };
+ fileDescriptions = new String[] { app.getPlain("ApplicationName")
+ + " " + app.getMenu("Files") };
+
File file = showSaveDialog(
- // Modified for Intergeo File Format (Yves Kreis) -->
- // Application.FILE_EXT_GEOGEBRA, currentFile,
- // app.getPlain("ApplicationName") + " " +
- // app.getMenu("Files"));
fileExtensions, app.getCurrentFile(), fileDescriptions, true,
false);
- // <-- Modified for Intergeo File Format (Yves Kreis)
if (file == null) {
return false;
}
@@ -2033,7 +2018,6 @@ public class GuiManager {
selectedFile = removeExtension(app.getCurrentFile());
}
- // Added for Intergeo File Format (Yves Kreis) -->
String[] fileExtensions = { fileExtension };
String[] fileDescriptions = { fileDescription };
return showSaveDialog(fileExtensions, selectedFile, fileDescriptions,
@@ -2042,17 +2026,14 @@ public class GuiManager {
public File showSaveDialog(String[] fileExtensions, File selectedFile,
String[] fileDescriptions, boolean promptOverwrite, boolean dirsOnly) {
- // <-- Added for Intergeo File Format (Yves Kreis)
boolean done = false;
File file = null;
- // Added for Intergeo File Format (Yves Kreis) -->
if ((fileExtensions == null) || (fileExtensions.length == 0)
|| (fileDescriptions == null)) {
return null;
}
String fileExtension = fileExtensions[0];
- // <-- Added for Intergeo File Format (Yves Kreis)
initFileChooser();
getFileChooser().setMode(GeoGebraFileChooser.MODE_GEOGEBRA_SAVE);
@@ -2063,15 +2044,7 @@ public class GuiManager {
.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
}
- // set selected file
- // Modified for Intergeo File Format (Yves Kreis) -->
- /*
- * if (selectedFile == null) { selectedFile =
- * removeExtension(fileChooser.getSelectedFile()); }
- */
- // <-- Modified for Intergeo File Format (Yves Kreis)
if (selectedFile != null) {
- // Added for Intergeo File Format (Yves Kreis) -->
fileExtension = Application.getExtension(selectedFile);
int i = 0;
while ((i < fileExtensions.length)
@@ -2081,21 +2054,12 @@ public class GuiManager {
if (i >= fileExtensions.length) {
fileExtension = fileExtensions[0];
}
- // <-- Added for Intergeo File Format (Yves Kreis)
selectedFile = addExtension(selectedFile, fileExtension);
getFileChooser().setSelectedFile(selectedFile);
} else {
getFileChooser().setSelectedFile(null);
}
- // Modified for Intergeo File Format (Yves Kreis) -->
- /*
- * MyFileFilter fileFilter = new MyFileFilter();
- * fileFilter.addExtension(fileExtension); if (fileDescription != null)
- * fileFilter.setDescription(fileDescription);
- * fileChooser.resetChoosableFileFilters();
- * fileChooser.setFileFilter(fileFilter);
- */
getFileChooser().resetChoosableFileFilters();
MyFileFilter fileFilter;
MyFileFilter mainFilter = null;
@@ -2110,7 +2074,6 @@ public class GuiManager {
}
}
getFileChooser().setFileFilter(mainFilter);
- // <-- Modified for Intergeo File Format (Yves Kreis)
while (!done) {
// show save dialog
@@ -2119,7 +2082,6 @@ public class GuiManager {
if (returnVal == JFileChooser.APPROVE_OPTION) {
file = getFileChooser().getSelectedFile();
- // Added for Intergeo File Format (Yves Kreis) -->
if (getFileChooser().getFileFilter() instanceof geogebra.gui.app.MyFileFilter) {
fileFilter = (MyFileFilter) getFileChooser()
.getFileFilter();
@@ -2127,7 +2089,6 @@ public class GuiManager {
} else {
fileExtension = fileExtensions[0];
}
- // <-- Added for Intergeo File Format (Yves Kreis)
// remove all special characters from HTML filename
if (fileExtension == Application.FILE_EXT_HTML) {
@@ -2170,14 +2131,12 @@ public class GuiManager {
} else {
done = true;
}
- // Modified for Intergeo File Format (Yves Kreis) -->
} else {
// } else
// return null;
file = null;
break;
}
- // <-- Modified for Intergeo File Format (Yves Kreis)
}
return file;
@@ -2244,37 +2203,16 @@ public class GuiManager {
fileFilter.setDescription(app.getPlain("ApplicationName") + " "
+ app.getMenu("Files"));
getFileChooser().resetChoosableFileFilters();
- // Modified for Intergeo File Format (Yves Kreis & Ingo Schandeler)
// -->
getFileChooser().addChoosableFileFilter(fileFilter);
- // HTML File Filter (for ggbBase64 files)
- // MyFileFilter fileFilterHTML = new MyFileFilter();
- // fileFilterHTML.addExtension(Application.FILE_EXT_HTML);
- // fileFilterHTML.addExtension(Application.FILE_EXT_HTM);
- // fileFilterHTML.setDescription(Application.FILE_EXT_HTML + " "
- // + app.getMenu("Files"));
- // fileChooser.addChoosableFileFilter(fileFilterHTML);
-
- // Intergeo File Filter
- if (!GeoGebra.DISABLE_I2G) {
- MyFileFilter i2gFileFilter = new MyFileFilter();
- i2gFileFilter.addExtension(Application.FILE_EXT_INTERGEO);
- i2gFileFilter.setDescription("Intergeo " + app.getMenu("Files")
- + " [Version " + GeoGebra.I2G_FILE_FORMAT + "]");
- getFileChooser().addChoosableFileFilter(i2gFileFilter);
- }
- // fileChooser.setFileFilter(fileFilter);
- if (GeoGebra.DISABLE_I2G
- || (oldCurrentFile == null)
+ if ((oldCurrentFile == null)
|| Application.getExtension(oldCurrentFile).equals(
Application.FILE_EXT_GEOGEBRA)
|| Application.getExtension(oldCurrentFile).equals(
Application.FILE_EXT_GEOGEBRA_TOOL)) {
getFileChooser().setFileFilter(fileFilter);
}
- // <-- Modified for Intergeo File Format (Yves Kreis & Ingo
- // Schandeler)
app.setDefaultCursor();
int returnVal = getFileChooser().showOpenDialog(
@@ -2285,7 +2223,6 @@ public class GuiManager {
files = getFileChooser().getSelectedFiles();
}
- // Modified for Intergeo File Format (Yves Kreis) -->
if (getFileChooser().getFileFilter() instanceof geogebra.gui.app.MyFileFilter) {
fileFilter = (MyFileFilter) getFileChooser().getFileFilter();
doOpenFiles(files, true, fileFilter.getExtension());
@@ -2293,7 +2230,6 @@ public class GuiManager {
// doOpenFiles(files, true);
doOpenFiles(files, true);
}
- // <-- Modified for Intergeo File Format (Yves Kreis)
getFileChooser().setMultiSelectionEnabled(false);
}
@@ -2301,7 +2237,6 @@ public class GuiManager {
public synchronized void doOpenFiles(File[] files,
boolean allowOpeningInThisInstance) {
- // Added for Intergeo File Format (Yves Kreis) -->
doOpenFiles(files, allowOpeningInThisInstance,
Application.FILE_EXT_GEOGEBRA);
}
@@ -2310,7 +2245,6 @@ public class GuiManager {
boolean allowOpeningInThisInstance, String extension) {
// Zbynek Konecny, 2010-05-28 (see #126)
htmlLoaded = false;
- // <-- Added for Intergeo File Format (Yves Kreis)
// there are selected files
if (files != null) {
File file;
@@ -2319,8 +2253,6 @@ public class GuiManager {
file = files[i];
if (!file.exists()) {
- // Modified for Intergeo File Format (Yves Kreis) -->
- // file = addExtension(file, Application.FILE_EXT_GEOGEBRA);
file = addExtension(file, extension);
if (extension.equals(Application.FILE_EXT_GEOGEBRA)
&& !file.exists()) {
@@ -2352,7 +2284,6 @@ public class GuiManager {
JOptionPane.WARNING_MESSAGE);
}
- // <-- Modified for Intergeo File Format (Yves Kreis)
}
String ext = Application.getExtension(file).toLowerCase(
@@ -2775,7 +2706,6 @@ public class GuiManager {
}
}
- // Added for Intergeo File Format (Yves Kreis) -->
/*
* PropertyChangeListener implementation to handle file filter changes
*/
@@ -3362,10 +3292,17 @@ public class GuiManager {
propDialog.setVisible(false);
}
+ // can't move this after otherwise Object Properties doesn't work
kernel.notifyModeChanged(mode);
- // select toolbar button
- setToolbarMode(mode);
+ // select toolbar button, returns *actual* mode selected
+ int newMode = setToolbarMode(mode);
+
+ if (mode != EuclidianConstants.MODE_SELECTION_LISTENER && newMode != mode) {
+ mode = newMode;
+ kernel.notifyModeChanged(mode);
+ }
+
if (mode == EuclidianConstants.MODE_PROBABILITY_CALCULATOR) {
@@ -3393,13 +3330,14 @@ public class GuiManager {
}
- public void setToolbarMode(int mode) {
+ public int setToolbarMode(int mode) {
if (toolbarPanel == null) {
- return;
+ return -1;
}
- toolbarPanel.setMode(mode);
+ int ret = toolbarPanel.setMode(mode);
layout.getDockManager().setToolbarMode(mode);
+ return ret;
}
/**
diff --git a/geogebra/gui/InputDialogOpenURL.java b/geogebra/gui/InputDialogOpenURL.java
index 40c231b..1374bc1 100644
--- a/geogebra/gui/InputDialogOpenURL.java
+++ b/geogebra/gui/InputDialogOpenURL.java
@@ -19,7 +19,7 @@ public class InputDialogOpenURL extends InputDialog{
// check if there's a string starting http:// already on the clipboard
// (quite likely!!)
String clipboardString = app.getStringFromClipboard();
- if (clipboardString != null && (clipboardString.startsWith("http://") || clipboardString.startsWith("www")))
+ if (clipboardString != null && (clipboardString.startsWith("http://") || clipboardString.startsWith("https://") || clipboardString.startsWith("www")))
initString = clipboardString;
createGUI(app.getMenu("OpenWebpage"), app.getMenu("EnterAppletAddress"), false, DEFAULT_COLUMNS, 1, false, false, true, false, false, false, false);
diff --git a/geogebra/gui/LaTeXPreviewerPanel.java b/geogebra/gui/LaTeXPreviewerPanel.java
index f70dd29..340efd4 100644
--- a/geogebra/gui/LaTeXPreviewerPanel.java
+++ b/geogebra/gui/LaTeXPreviewerPanel.java
@@ -56,7 +56,7 @@ public class LaTeXPreviewerPanel extends JPanel {
boolean errorsActive = app.isErrorDialogsActive();
app.setErrorDialogsActive(false);
GeoText text = app.getKernel().getAlgebraProcessor()
- .evaluateToText(str, false);
+ .evaluateToText(str, false, true);
app.setErrorDialogsActive(errorsActive);
if (text != null) {
diff --git a/geogebra/gui/OptionsSpreadsheet.java b/geogebra/gui/OptionsSpreadsheet.java
index f3bccc2..ebcd29c 100644
--- a/geogebra/gui/OptionsSpreadsheet.java
+++ b/geogebra/gui/OptionsSpreadsheet.java
@@ -25,6 +25,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
+import java.net.URL;
import javax.swing.BorderFactory;
import javax.swing.Box;
@@ -63,6 +64,8 @@ class OptionsSpreadsheet extends JPanel implements ActionListener, FocusListene
private JTabbedPane tabbedPane;
+ private SpreadsheetView view;
+
/**
@@ -70,6 +73,7 @@ class OptionsSpreadsheet extends JPanel implements ActionListener, FocusListene
*/
public OptionsSpreadsheet(Application app, SpreadsheetView view) {
this.app = app;
+ this.view = view;
this.settings = app.getSettings().getSpreadsheet();
kernel = app.getKernel();
@@ -456,8 +460,15 @@ class OptionsSpreadsheet extends JPanel implements ActionListener, FocusListene
}
else if (source == setCurrentButton) {
- settings.setDefaultBrowser(false);
- }
+ settings().beginBatch();
+ settings().setDefaultBrowser(false);
+ if(settings().initialBrowserMode() == FileBrowserPanel.MODE_URL){
+ settings().setInitialURL(((URL) view.getFileBrowser().getRoot()).toExternalForm());
+ }else{
+ settings().setInitialFilePath(view.getFileBrowser().getRootString());
+ System.out.println(view.getFileBrowser().getRootString());
+ }
+ settings().endBatch(); }
updateGUI();
@@ -471,6 +482,12 @@ class OptionsSpreadsheet extends JPanel implements ActionListener, FocusListene
public void focusLost(FocusEvent e) {
doActionPerformed(e.getSource());
}
+
+ private SpreadsheetSettings settings(){
+ return app.getSettings().getSpreadsheet();
+ }
+
+
}
diff --git a/geogebra/gui/PropertiesPanel.java b/geogebra/gui/PropertiesPanel.java
index 9b1cf7b..3972b6a 100644
--- a/geogebra/gui/PropertiesPanel.java
+++ b/geogebra/gui/PropertiesPanel.java
@@ -3656,14 +3656,13 @@ public class PropertiesPanel extends JPanel implements SetLabels {
if (((GeoElement)geo0).isIndependent()
|| (geo0 instanceof GeoList)) { // don't want rounding option for lists of texts?
if (secondLineVisible) {
- remove(secondLine);
secondLineVisible = false;
}
} else {
if (!secondLineVisible) {
- add(secondLine, BorderLayout.SOUTH);
secondLineVisible = true;
}
+ secondLine.setVisible(secondLineVisible);
}
int style = geo0.getFontStyle();
@@ -6251,6 +6250,8 @@ class ColorFunctionPanel
}
colorSpace = geo0.getColorSpace();
cbColorSpace.setSelectedIndex(colorSpace);
+ allowSetComboBoxLabels = false;
+ setLabels();
for (int i=0; i < geos.length; i++) {
geo = (GeoElement) geos[i];
@@ -6269,13 +6270,17 @@ class ColorFunctionPanel
}
}
+ // set the color fields
tfRed.setText(strRed);
- tfRed.addActionListener(this);
tfGreen.setText(strGreen);
+ tfBlue.setText(strBlue);
+ tfAlpha.setText(strAlpha);
+
+
+ // restore action listeners
+ tfRed.addActionListener(this);
tfGreen.addActionListener(this);
- tfBlue.setText(strBlue);
tfBlue.addActionListener(this);
- tfAlpha.setText(strAlpha);
tfAlpha.addActionListener(this);
cbColorSpace.addActionListener(this);
return this;
@@ -6330,8 +6335,7 @@ class ColorFunctionPanel
list = kernel.getAlgebraProcessor().evaluateToList("{"+strRed + ","+strGreen+","+strBlue+"}");
- if (!"1".equals(strAlpha))
- listAlpha = kernel.getAlgebraProcessor().evaluateToList("{"+strRed + ","+strGreen+","+strBlue+","+strAlpha+"}");
+ listAlpha = kernel.getAlgebraProcessor().evaluateToList("{"+strRed + ","+strGreen+","+strBlue+","+strAlpha+"}");
}
diff --git a/geogebra/gui/ScriptInputDialog.java b/geogebra/gui/ScriptInputDialog.java
index ac842d9..161512d 100644
--- a/geogebra/gui/ScriptInputDialog.java
+++ b/geogebra/gui/ScriptInputDialog.java
@@ -71,8 +71,9 @@ public class ScriptInputDialog extends InputDialog {
languageSelector.addItem(app.getPlain("JavaScript"));
languageSelector.addActionListener(this);
+ setGeo(button);
+
if(forceJavaScript){
- languageSelector.setSelectedIndex(1);
languageSelector.setEnabled(false);
}
setJSMode(forceJavaScript);
@@ -156,6 +157,7 @@ public class ScriptInputDialog extends InputDialog {
}
private void setJSMode(boolean flag){
+ languageSelector.setSelectedIndex(flag ? 1 : 0);
javaScript = flag;
((GeoGebraEditorPane) inputPanel.getTextComponent()).setEditorKit(flag ? "javascript":"geogebra");
}
diff --git a/geogebra/gui/TextInputDialog.java b/geogebra/gui/TextInputDialog.java
index cdfaa07..94316b7 100644
--- a/geogebra/gui/TextInputDialog.java
+++ b/geogebra/gui/TextInputDialog.java
@@ -825,6 +825,12 @@ public class TextInputDialog extends InputDialog implements DocumentListener {
// make sure newText is using correct LaTeX setting
newText.setLaTeX(isLaTeX, true);
newText.updateRepaint();
+
+ // make sure rounding works
+ if(newText.getParentAlgorithm()!=null)
+ newText.getParentAlgorithm().update();
+ else
+ newText.updateRepaint();
app.doAfterRedefine(newText);
return newText != null;
diff --git a/geogebra/gui/TextPreviewPanel.java b/geogebra/gui/TextPreviewPanel.java
index 25f2343..b709003 100644
--- a/geogebra/gui/TextPreviewPanel.java
+++ b/geogebra/gui/TextPreviewPanel.java
@@ -222,6 +222,9 @@ public class TextPreviewPanel extends EuclidianView {
// set the display style
updateVisualProperties(previewGeoDependent, targetGeo, isLaTeX,
showErrorMessage);
+
+ // make sure rounding works
+ textAlgo.update();
}
// hide/show the preview geos
diff --git a/geogebra/gui/_license.txt b/geogebra/gui/_license.txt
index 7e3442d..f9e66f7 100644
--- a/geogebra/gui/_license.txt
+++ b/geogebra/gui/_license.txt
@@ -54,6 +54,7 @@ TRANSLATORS
* Albanian: Pellumb Klogjeri (Albania)
* Arabic: Brahim Boulakbech, Haboubi Abdessalem (Tunisia),
Maha Ah (Egypt)
+ * Armenian: Gagik Aghekyan (Armenia)
* Basque: Gonzalo Elcano Vizcay (Spain)
* Bosnian: Maja Hrbat (Bosnia and Herzegovina)
* Bulgarian: Hristo Stoyanov, Magdalena Metodieva Petkova (Bulgaria)
@@ -68,10 +69,11 @@ TRANSLATORS
* Czech: Zuzana Bouchalova, Michaela Norulakova, Marketa Tomanova,
Marie Pokorna (Czech Republic)
* Danish: Steen Grode (Denmark)
- * Dutch: Beatrijs Versichel, Ivan De Winne, Pedro Tytgat,
- Carel van de Giessen (Belgium)
+ * Dutch: Ivan De Winne, Chris Cambre, Jozef Van Remoortere,
+ Roger Van Nieuwenhuyze, Pedro Tytgat, Riggy Van de Wiele,
+ Beatrijs Versichel (Belgium)
* English: Markus Hohenwarter, Judith Hohenwarter (Austria),
- Yves Kreis (Luxembourg), Michael Borcherds (Great Britain)
+ Yves Kreis (Luxembourg), Michael Borcherds (UK)
* Estonian: Jane Albre (Estonia)
* Finnish: Juha Leino, Mikko Rahikka, Erkki Luoma-aho,
Teemu Hinkula (Finland)
diff --git a/geogebra/gui/app/GeoGebraFrame.java b/geogebra/gui/app/GeoGebraFrame.java
index bc5fbe0..ec4dda1 100644
--- a/geogebra/gui/app/GeoGebraFrame.java
+++ b/geogebra/gui/app/GeoGebraFrame.java
@@ -426,6 +426,9 @@ public class GeoGebraFrame extends JFrame implements WindowFocusListener {
*/
private void checkVersion() {
+ if (!Application.getVersionCheckAllowed())
+ return;
+
String lastVersionCheck = GeoGebraPreferences.getPref()
.loadPreference(GeoGebraPreferences.VERSION_LAST_CHECK, "");
Long nowL = new Date().getTime();
diff --git a/geogebra/gui/app/MyFileFilter.java b/geogebra/gui/app/MyFileFilter.java
index 66a32d4..eadb12f 100644
--- a/geogebra/gui/app/MyFileFilter.java
+++ b/geogebra/gui/app/MyFileFilter.java
@@ -153,10 +153,7 @@ public class MyFileFilter extends FileFilter implements java.io.FileFilter {
String filename = f.getName();
int i = filename.lastIndexOf('.');
if(i>0 && i<filename.length()-1)
- // Modified for Intergeo File Format (Yves Kreis) -->
- // return filename.substring(i+1).toLowerCase(Locale.US);;
return filename.substring(i+1).toLowerCase(Locale.US);
- // <-- Modified for Intergeo File Format (Yves Kreis)
}
return null;
}
@@ -178,11 +175,9 @@ public class MyFileFilter extends FileFilter implements java.io.FileFilter {
if(filters == null) {
filters = new ArrayList<String>(5);
}
- // Added for Intergeo File Format (Yves Kreis) -->
if (extension.indexOf(".") > -1) {
extension = extension.substring(0, extension.lastIndexOf("."));
}
- // <-- Added for Intergeo File Format (Yves Kreis)
filters.add(extension.toLowerCase(Locale.US));
fullDescription = null;
}
@@ -269,7 +264,6 @@ public class MyFileFilter extends FileFilter implements java.io.FileFilter {
/**
* Returns the first extension contained in the extension list.
*
- * Added for Intergeo File Format (Yves Kreis)
* @return first extension (without ".")
*/
public String getExtension() {
diff --git a/geogebra/gui/autocompletion/CompletionsPopup.java b/geogebra/gui/autocompletion/CompletionsPopup.java
index f973f8a..fac0348 100644
--- a/geogebra/gui/autocompletion/CompletionsPopup.java
+++ b/geogebra/gui/autocompletion/CompletionsPopup.java
@@ -10,8 +10,8 @@ import static java.awt.event.KeyEvent.VK_UP;
import static java.lang.Math.max;
import static java.lang.Math.min;
import geogebra.gui.inputfield.AutoCompleteTextField;
-import geogebra.main.Application;
+import java.awt.Font;
import java.awt.Rectangle;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
@@ -79,7 +79,15 @@ public class CompletionsPopup {
popup.setFocusable(false);
registerListeners();
}
-
+
+ /**
+ * Set the font to display the completions
+ * @param font the new font
+ */
+ public void setFont(Font font) {
+ list.setFont(font);
+ }
+
private class PopupListener implements PopupMenuListener {
public void popupMenuCanceled(PopupMenuEvent e) {
diff --git a/geogebra/gui/inputbar/AlgebraInput.java b/geogebra/gui/inputbar/AlgebraInput.java
index 223ba32..7e9113f 100644
--- a/geogebra/gui/inputbar/AlgebraInput.java
+++ b/geogebra/gui/inputbar/AlgebraInput.java
@@ -26,6 +26,7 @@ import geogebra.main.Application;
import geogebra.main.MyError;
import java.awt.BorderLayout;
+import java.awt.Font;
import java.awt.SystemColor;
import java.awt.dnd.DropTarget;
import java.awt.event.ActionEvent;
@@ -171,8 +172,19 @@ public class AlgebraInput extends JPanel implements ActionListener, KeyListener
public void updateFonts() {
- inputField.setFont(app.getBoldFont());
- inputLabel.setFont(app.getPlainFont());
+
+ Font bf = app.getBoldFont();
+ Font pf = app.getPlainFont();
+
+ // needed for Armenian
+ if (pf.canDisplayUpTo(inputLabel.getText()) != -1) {
+ pf = app.getFontCanDisplay(inputLabel.getText());
+ }
+
+ inputField.setFont(bf);
+ inputLabel.setFont(pf);
+
+ inputField.setPopupsFont(pf);
//update the help panel
if (app.getGuiManager().hasInputHelpPanel())
@@ -274,6 +286,13 @@ public class AlgebraInput extends JPanel implements ActionListener, KeyListener
GeoElement[] geos;
try {
geos = app.getKernel().getAlgebraProcessor().processAlgebraCommandNoExceptionHandling( input, true, false, true );
+
+ // need label if we type just eg
+ // lnx
+ if (geos.length == 1 && geos[0].label == null) {
+ geos[0].setLabel(geos[0].getDefaultLabel());
+ }
+
} catch (Exception ee) {
inputField.showError(ee);
return;
diff --git a/geogebra/gui/inputbar/InputBarHelpPanel.java b/geogebra/gui/inputbar/InputBarHelpPanel.java
index 74a8fa9..3059611 100644
--- a/geogebra/gui/inputbar/InputBarHelpPanel.java
+++ b/geogebra/gui/inputbar/InputBarHelpPanel.java
@@ -650,7 +650,10 @@ public class InputBarHelpPanel extends JPanel implements TreeSelectionListener,
//define the regular and italic style
Style def = StyleContext.getDefaultStyleContext().getStyle(StyleContext.DEFAULT_STYLE);
Style regular = doc.addStyle("regular", def);
- StyleConstants.setFontFamily(def, "SansSerif");
+
+ // changed to use getFontCanDisplayAwt() so that Armenian displays OK
+ StyleConstants.setFontFamily(def, app.getFontCanDisplay(description).getFamily());
+
Style s = doc.addStyle("italic", regular);
StyleConstants.setItalic(s, true);
diff --git a/geogebra/gui/inputfield/AutoCompleteTextField.java b/geogebra/gui/inputfield/AutoCompleteTextField.java
index 4e09f65..57d3dda 100644
--- a/geogebra/gui/inputfield/AutoCompleteTextField.java
+++ b/geogebra/gui/inputfield/AutoCompleteTextField.java
@@ -12,6 +12,7 @@ import geogebra.main.MyError;
import geogebra.util.AutoCompleteDictionary;
import java.awt.Component;
+import java.awt.Font;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
@@ -480,8 +481,9 @@ AutoComplete, KeyListener, GeoElementSelectionListener {
int caretPos = getCaretPosition();
String text = getText();
-
- if (ch == ',') {
+ // checking for isAltDown() because Alt+, prints another character on the PC
+ // TODO make this more robust - perhaps it could go in a document change listener
+ if (ch == ',' && !e.isAltDown()) {
if (caretPos < text.length() && text.charAt(caretPos) == ',') {
// User typed ',' just in ahead of an existing ',':
// We may be in the position of filling in the next argument of an autocompleted command
@@ -900,5 +902,18 @@ AutoComplete, KeyListener, GeoElementSelectionListener {
}
+ /**
+ * Set the font of completions and history commands
+ * @param font the new font
+ */
+ public void setPopupsFont(java.awt.Font font) {
+ if (this.completionsPopup != null) {
+ this.completionsPopup.setFont(font);
+ }
+ if (this.historyPopup != null) {
+ this.historyPopup.setFont(font);
+ }
+ }
+
}
diff --git a/geogebra/gui/inputfield/HistoryPopup.java b/geogebra/gui/inputfield/HistoryPopup.java
index 42d0366..e3a26e2 100644
--- a/geogebra/gui/inputfield/HistoryPopup.java
+++ b/geogebra/gui/inputfield/HistoryPopup.java
@@ -11,6 +11,7 @@ import geogebra.main.GeoGebraColorConstants;
import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;
+import java.awt.Font;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
@@ -70,6 +71,14 @@ public class HistoryPopup implements ListSelectionListener{
}
+ /**
+ * Set the font to display the history commands
+ * @param font the new font
+ */
+ public void setFont(Font font) {
+ historyList.setFont(font);
+ }
+
private class PopupListener implements PopupMenuListener {
private KeyListener[] listListeners;
diff --git a/geogebra/gui/toolbar/Toolbar.java b/geogebra/gui/toolbar/Toolbar.java
index 2742323..770d371 100644
--- a/geogebra/gui/toolbar/Toolbar.java
+++ b/geogebra/gui/toolbar/Toolbar.java
@@ -55,7 +55,6 @@ public class Toolbar extends JToolBar {
private int mode;
private ArrayList<ModeToggleMenu> modeToggleMenus;
- private ModeToggleMenu temporaryModes;
/**
* Creates general toolbar.
@@ -98,13 +97,7 @@ public class Toolbar extends JToolBar {
// add menus with modes to toolbar
addCustomModesToToolbar(bg);
- // add invisible temporary menu
- temporaryModes = new ModeToggleMenu(app, this, bg);
- temporaryModes.setVisible(false);
- modeToggleMenus.add(temporaryModes);
- add(temporaryModes);
-
- setMode(app.getMode(), false);
+ setMode(app.getMode());
}
/**
@@ -112,26 +105,18 @@ public class Toolbar extends JToolBar {
* @param mode see EuclidianConstants for mode numbers
*
* @param int mode Mode to set
- * @param boolean createTemporaryMode If temporary modes should be
- * added to the toolbar if the mode is not in the toolbar already.
- * If the value is false the mode is set to the default one.
*
- * @return true if mode could be selected in toolbar.
+ * @return actual mode number selected (might be different if it's not available)
*/
- public boolean setMode(int mode, boolean createTemporaryMode) {
+ public int setMode(int mode) {
boolean success = false;
-
+
// there is no special icon/button for the selection listener mode, use the
// move mode button instead
if (mode == EuclidianView.MODE_SELECTION_LISTENER) {
mode = EuclidianView.MODE_MOVE;
}
- if (temporaryModes != null && temporaryModes.isVisible()) {
- temporaryModes.clearModes();
- temporaryModes.setVisible(false);
- }
-
if (modeToggleMenus != null) {
for (int i = 0; i < modeToggleMenus.size(); i++) {
ModeToggleMenu mtm = (ModeToggleMenu) modeToggleMenus.get(i);
@@ -141,24 +126,18 @@ public class Toolbar extends JToolBar {
}
}
- this.mode = mode;
-
+ // Escape pressed when MOVE mode not in custom toolbar
+ // or mode set from GgbAPI which is not in current toolbar
+ // so select first mode visible
if (!success) {
- if(createTemporaryMode) {
- // don't display move mode icon in other views, this is a bit irritating
- if (dockPanel == null || mode != EuclidianView.MODE_MOVE) {
- // we insert a temporary icon if possible
- temporaryModes.addMode(mode);
- temporaryModes.setVisible(true);
- temporaryModes.selectMode(mode);
- }
- } else {
- setMode(getFirstMode(), true);
- }
+ mode = setMode(getFirstMode());
}
+
+ this.mode = mode;
+
}
- return success;
+ return mode;
}
public int getSelectedMode() {
diff --git a/geogebra/gui/toolbar/ToolbarContainer.java b/geogebra/gui/toolbar/ToolbarContainer.java
index ea8c58a..931a2d4 100644
--- a/geogebra/gui/toolbar/ToolbarContainer.java
+++ b/geogebra/gui/toolbar/ToolbarContainer.java
@@ -187,12 +187,20 @@ public class ToolbarContainer extends JPanel implements ComponentListener {
*
* @param mode
*/
- public void setMode(int mode) {
+ public int setMode(int mode) {
+ int ret = -1;
for(Toolbar toolbar : toolbars) {
- toolbar.setMode(mode, getViewId(toolbar) == activeToolbar);
+ int tmp = toolbar.setMode(mode);
+
+ // this will be the actual mode set
+ if (getViewId(toolbar) == activeToolbar) {
+ ret = tmp;
+ }
}
updateHelpText();
+
+ return ret;
}
/**
diff --git a/geogebra/gui/view/probcalculator/ProbabilityCalculator.java b/geogebra/gui/view/probcalculator/ProbabilityCalculator.java
index 76779d6..978bf56 100644
--- a/geogebra/gui/view/probcalculator/ProbabilityCalculator.java
+++ b/geogebra/gui/view/probcalculator/ProbabilityCalculator.java
@@ -357,22 +357,19 @@ implements View, ActionListener, FocusListener, ChangeListener, SettingListener
// plot panel (extension of EuclidianView)
- //======================================================
- plotPanel = new PlotPanelEuclidianView(app.getKernel());
- plotPanel.setMouseEnabled(true);
+ // ======================================================
+ plotPanel = new PlotPanelEuclidianView(app.getKernel(),
+ exportToEVAction);
+ plotPanel.setMouseEnabled(true, true);
plotPanel.setMouseMotionEnabled(true);
-
- plotPanel.setBorder(BorderFactory.createCompoundBorder(
- BorderFactory.createEmptyBorder(2, 2, 2, 2),
- BorderFactory.createBevelBorder(BevelBorder.LOWERED)));
-
- plotPanel.setBorder(BorderFactory.createEmptyBorder());
-
+
+ /*
+ * plotPanel.setBorder(BorderFactory.createCompoundBorder(
+ * BorderFactory.createEmptyBorder(2, 2, 2, 2),
+ * BorderFactory.createBevelBorder(BevelBorder.LOWERED)));
+ */
plotPanel.setBorder(BorderFactory.createEmptyBorder());
- addPlotPanelExportMenu(plotPanel);
-
-
// table panel
//======================================================
table = new ProbabilityTable(app, this);
@@ -669,7 +666,7 @@ implements View, ActionListener, FocusListener, ChangeListener, SettingListener
// offset = 1 - lowest discrete x value
double firstX = ((GeoNumeric)discreteValueList.get(0)).getDouble();
- MyDouble offset = new MyDouble(kernel, 1d - firstX);
+ MyDouble offset = new MyDouble(kernel, 1d - firstX + 0.5);
ExpressionNode low = new ExpressionNode(kernel, lowPoint, ExpressionNode.XCOORD, null);
ExpressionNode high = new ExpressionNode(kernel, highPoint, ExpressionNode.XCOORD, null);
@@ -745,9 +742,14 @@ implements View, ActionListener, FocusListener, ChangeListener, SettingListener
// create density curve
expr = buildDensityCurveExpression(selectedDist);
+
+ // make sure eg Normal works in Swedish (Normal == PerpendicularLine)
+ kernel.setUseInternalCommandNames(true);
densityCurve = createGeoFromString(expr, null, true);
+ kernel.setUseInternalCommandNames(false);
+
cons.removeFromConstructionList(densityCurve.getParentAlgorithm());
densityCurve.setObjColor(COLOR_PDF);
@@ -1288,6 +1290,13 @@ implements View, ActionListener, FocusListener, ChangeListener, SettingListener
if(isDiscrete){
high = Math.round(high);
low = Math.round(low);
+
+ // make sure arrow keys move points in 1s
+ lowPoint.setAnimationStep(1);
+ highPoint.setAnimationStep(1);
+ } else {
+ lowPoint.setAnimationStep(0.1);
+ highPoint.setAnimationStep(0.1);
}
setXAxisPoints();
updateIntervalProbability();
@@ -1972,28 +1981,44 @@ implements View, ActionListener, FocusListener, ChangeListener, SettingListener
//============================================================
- private void addPlotPanelExportMenu(PlotPanelEuclidianView plotPanel){
-
- AbstractAction exportToEVAction = new AbstractAction(app
- .getMenu("CopyToGraphics"), app
- .getImageIcon("edit-copy.png")) {
- private static final long serialVersionUID = 1L;
+ /**
+ * Action to export all GeoElements that are currently displayed in this
+ * panel to a EuclidianView. The viewID for the target EuclidianView is
+ * stored as a property with key "euclidianViewID".
+ *
+ * This action is passed as a parameter to plotPanel where it is used in
+ * the plotPanel context menu and the EuclidianView transfer handler
+ * when the plot panel is dragged into an EV.
+ */
+ AbstractAction exportToEVAction = new AbstractAction() {
+ private static final long serialVersionUID = 1L;
- public void actionPerformed(ActionEvent e) {
- if(app.getShiftDown())
- exportGeosToEV(Application.VIEW_EUCLIDIAN2);
- else
- exportGeosToEV(Application.VIEW_EUCLIDIAN);
+ public void actionPerformed(ActionEvent event){
+ Integer euclidianViewID = (Integer) this.getValue("euclidianViewID");
+
+ // if null ID then use EV1 unless shift is down, then use EV2
+ if(euclidianViewID == null){
+ euclidianViewID = app.getShiftDown()? app.getEuclidianView2().getViewID() : app.getEuclidianView().getViewID();
}
- };
-
- plotPanel.appendActionList(exportToEVAction);
- }
-
-
-
+
+ // do the export
+ exportGeosToEV(euclidianViewID);
+
+ // null out the ID property
+ this.putValue("euclidianViewID", null);
+ }
+ };
+
+
+
- public void exportGeosToEV(int viewID){
+ /**
+ * Exports all GeoElements that are currently displayed in this panel to a target
+ * EuclidianView.
+ *
+ * @param euclidianViewID viewID of the target EuclidianView
+ */
+ public void exportGeosToEV(int euclidianViewID){
app.setWaitCursor();
ArrayList<GeoElement> newGeoList = new ArrayList<GeoElement>();
@@ -2097,7 +2122,7 @@ implements View, ActionListener, FocusListener, ChangeListener, SettingListener
// create interval bar chart
// ============================
- double offset = 1 - ((GeoNumeric)discreteValueList.get(0)).getDouble();
+ double offset = 1 - ((GeoNumeric)discreteValueList.get(0)).getDouble() + 0.5;
expr = "Take[" + discreteProbListCopy.getLabel() + ", x("
+ lowPointCopy.getLabel() + ")+" + offset + ", x(" + highPointCopy.getLabel() +")+" + offset +"]";
GeoElement intervalProbList = (GeoList) createGeoFromString(expr, null, false);
@@ -2146,12 +2171,12 @@ implements View, ActionListener, FocusListener, ChangeListener, SettingListener
// set the EV location and auxiliary = false for all of the new geos
for(GeoElement geo: newGeoList){
geo.setAuxiliaryObject(false);
- if(viewID == Application.VIEW_EUCLIDIAN){
+ if(euclidianViewID == Application.VIEW_EUCLIDIAN){
geo.addView(Application.VIEW_EUCLIDIAN);
geo.removeView(Application.VIEW_EUCLIDIAN2);
geo.update();
}
- else if(viewID == Application.VIEW_EUCLIDIAN2){
+ else if(euclidianViewID == Application.VIEW_EUCLIDIAN2){
geo.addView(Application.VIEW_EUCLIDIAN2);
geo.removeView(Application.VIEW_EUCLIDIAN);
geo.update();
@@ -2159,7 +2184,7 @@ implements View, ActionListener, FocusListener, ChangeListener, SettingListener
}
// set the window dimensions of the target EV to match the prob calc dimensions
- EuclidianView ev = (EuclidianView) app.getView(viewID);
+ EuclidianView ev = (EuclidianView) app.getView(euclidianViewID );
ev.setRealWorldCoordSystem(plotSettings.xMin, plotSettings.xMax, plotSettings.yMin, plotSettings.yMax);
ev.setAutomaticAxesNumberingDistance(plotSettings.xAxesIntervalAuto, 0);
ev.setAutomaticAxesNumberingDistance(plotSettings.yAxesIntervalAuto, 1);
diff --git a/geogebra/gui/view/probcalculator/ProbabilityManager.java b/geogebra/gui/view/probcalculator/ProbabilityManager.java
index 9d51873..8ad6cc1 100644
--- a/geogebra/gui/view/probcalculator/ProbabilityManager.java
+++ b/geogebra/gui/view/probcalculator/ProbabilityManager.java
@@ -2,6 +2,7 @@ package geogebra.gui.view.probcalculator;
import geogebra.kernel.GeoElement;
import geogebra.kernel.GeoFunction;
+import geogebra.kernel.Kernel;
import geogebra.kernel.arithmetic.NumberValue;
import geogebra.main.Application;
@@ -659,7 +660,16 @@ public class ProbabilityManager {
private double evaluateExpression(String expr){
NumberValue nv;
- nv = app.getKernel().getAlgebraProcessor().evaluateToNumeric(expr, false);
+
+ Kernel kernel = app.getKernel();
+
+ // make sure eg Normal works in Swedish (Normal == PerpendicularLine)
+ kernel.setUseInternalCommandNames(true);
+
+ nv = kernel.getAlgebraProcessor().evaluateToNumeric(expr, false);
+
+ kernel.setUseInternalCommandNames(false);
+
double result = nv.getDouble();
return result;
diff --git a/geogebra/gui/view/spreadsheet/CellRangeProcessor.java b/geogebra/gui/view/spreadsheet/CellRangeProcessor.java
index 4472d57..9f9d648 100644
--- a/geogebra/gui/view/spreadsheet/CellRangeProcessor.java
+++ b/geogebra/gui/view/spreadsheet/CellRangeProcessor.java
@@ -209,14 +209,14 @@ public class CellRangeProcessor {
* Creates a GeoList of lists where each element is a list
* of cells in each column spanned by the range list
*/
- public GeoList createCollectionList(ArrayList<CellRange> rangeList, boolean copyByValue) {
+ public GeoList createCollectionList(ArrayList<CellRange> rangeList, boolean copyByValue, boolean addToConstruction) {
GeoList tempGeo = new GeoList(cons);
boolean oldSuppress = cons.isSuppressLabelsActive();
cons.setSuppressLabelCreation(true);
for(CellRange cr : rangeList){
for(int col=cr.getMinColumn(); col<=cr.getMaxColumn(); col++){
- tempGeo.add(createListFromColumn(col, copyByValue, false, false, GeoElement.GEO_CLASS_NUMERIC));
+ tempGeo.add(createListFromColumn(col, copyByValue, false, false, GeoElement.GEO_CLASS_NUMERIC, addToConstruction));
}
}
cons.setSuppressLabelCreation(oldSuppress);
@@ -606,7 +606,8 @@ public class CellRangeProcessor {
/** Creates a GeoList from the cells in an array of cellranges. Empty cells are ignored.
- * Uses these defaults: do not create undo point, do not sort, do not filter by geo type. */
+ * Uses these defaults: do not create undo point, do not sort, do not filter by geo type,
+ * set a label. */
public GeoElement createList(ArrayList<CellRange> rangeList, boolean scanByColumn, boolean copyByValue) {
return createList(rangeList, scanByColumn, copyByValue, false, false, null, true) ;
}
@@ -620,9 +621,11 @@ public class CellRangeProcessor {
GeoList geoList = null;
ArrayList<GeoElement> list = null;
- if (copyByValue) geoList = new GeoList(cons);
- else list = new ArrayList<GeoElement>();
-
+ if (copyByValue)
+ geoList = new GeoList(cons);
+ else
+ list = new ArrayList<GeoElement>();
+
ArrayList<Point> cellList = new ArrayList<Point>();
// temporary fix for catching duplicate cells caused by ctrl-seelct
@@ -666,33 +669,21 @@ public class CellRangeProcessor {
}
}
- // remove last comma
- //if(listString.length()>1)
- // listString.deleteCharAt(listString.length()-1);
- //listString.append("}");
-
if (!copyByValue) {
AlgoDependentList algo = new AlgoDependentList(cons, list, false);
+ if(!setLabel){
+ cons.removeFromConstructionList(algo);
+ }
geoList = (GeoList) algo.getGeoElements()[0];
}
if(isSorted){
- //listString.insert(0, "Sort[" );
- //listString.append("]");
AlgoSort algo = new AlgoSort(cons, geoList);
cons.removeFromConstructionList(algo);
geoList = (GeoList)algo.getGeoElements()[0];
}
-
- //Application.debug(listString);
- // convert list string to geo
- //geos = table.kernel.getAlgebraProcessor()
- //.processAlgebraCommandNoExceptions(listString.toString(), false);
-
-
-
} catch (Exception ex) {
Application.debug("Creating list failed with exception " + ex);
}
@@ -719,11 +710,11 @@ public class CellRangeProcessor {
* @param isSorted
* @param doStoreUndo
* @param geoTypeFilter
- * @param setLabel
+ * @param addToConstruction
* @return
*/
public GeoElement createListFromFrequencyTable(CellRange cr, boolean scanByColumn, boolean copyByValue,
- boolean isSorted, boolean doStoreUndo, Integer geoTypeFilter, boolean setLabel) {
+ boolean isSorted, boolean doStoreUndo, Integer geoTypeFilter, boolean addToConstruction) {
double value;
int freq;
@@ -764,7 +755,7 @@ public class CellRangeProcessor {
if(doStoreUndo)
app.storeUndoInfo();
- if (setLabel)
+ if (addToConstruction)
geoList.setLabel(null);
if(geoList != null)
@@ -780,14 +771,14 @@ public class CellRangeProcessor {
/** Creates a list from all cells in a spreadsheet column */
public GeoElement createListFromColumn(int column, boolean copyByValue, boolean isSorted,
- boolean storeUndoInfo, Integer geoTypeFilter) {
+ boolean storeUndoInfo, Integer geoTypeFilter, boolean addToConstruction) {
ArrayList<CellRange> rangeList = new ArrayList<CellRange>();
CellRange cr = new CellRange(table,column,-1);
cr.setActualRange();
rangeList.add(cr);
- return createList(rangeList, true, copyByValue, isSorted, storeUndoInfo, geoTypeFilter, true) ;
+ return createList(rangeList, true, copyByValue, isSorted, storeUndoInfo, geoTypeFilter, addToConstruction) ;
}
/** Returns true if all cell ranges in the list are columns */
@@ -804,13 +795,13 @@ public class CellRangeProcessor {
* Creates a string expression for a matrix where each sub-list is a list
* of cells in the columns spanned by the range list
*/
- public String createColumnMatrixExpression(ArrayList<CellRange> rangeList, boolean copyByValue) {
+ public String createColumnMatrixExpression(ArrayList<CellRange> rangeList, boolean copyByValue, boolean addToConstruction) {
GeoElement tempGeo;
StringBuilder sb = new StringBuilder();
sb.append("{");
for(CellRange cr : rangeList){
for(int col=cr.getMinColumn(); col<=cr.getMaxColumn(); col++){
- tempGeo = createListFromColumn(col, copyByValue, false, false, GeoElement.GEO_CLASS_NUMERIC);
+ tempGeo = createListFromColumn(col, copyByValue, false, false, GeoElement.GEO_CLASS_NUMERIC, addToConstruction);
sb.append(tempGeo.getCommandDescription());
sb.append(",");
tempGeo.remove();
diff --git a/geogebra/gui/view/spreadsheet/FileBrowserPanel.java b/geogebra/gui/view/spreadsheet/FileBrowserPanel.java
index 558e89d..326f9ab 100644
--- a/geogebra/gui/view/spreadsheet/FileBrowserPanel.java
+++ b/geogebra/gui/view/spreadsheet/FileBrowserPanel.java
@@ -254,7 +254,7 @@ public class FileBrowserPanel extends JPanel implements ActionListener, TreeSele
int returnVal = fc.showOpenDialog(browserPanel);
if (returnVal == JFileChooser.APPROVE_OPTION) {
setRoot(fc.getSelectedFile(), MODE_FILE);
- // ((JButton)e.getSource()).setText(fc.getSelectedFile().getName());
+ view.settings().setInitialBrowserMode(MODE_FILE);
}
}
});
diff --git a/geogebra/gui/view/spreadsheet/InspectorView.java b/geogebra/gui/view/spreadsheet/InspectorView.java
index 30e8a4a..28f7f77 100644
--- a/geogebra/gui/view/spreadsheet/InspectorView.java
+++ b/geogebra/gui/view/spreadsheet/InspectorView.java
@@ -988,7 +988,7 @@ public class InspectorView extends InputDialog implements View, MouseListener, L
private String evaluateToText(String expr){
- GeoText text = kernel.getAlgebraProcessor().evaluateToText(expr, false);
+ GeoText text = kernel.getAlgebraProcessor().evaluateToText(expr, false, true);
return text.getTextString();
}
diff --git a/geogebra/gui/view/spreadsheet/RelativeCopy.java b/geogebra/gui/view/spreadsheet/RelativeCopy.java
index c586037..fcbf586 100644
--- a/geogebra/gui/view/spreadsheet/RelativeCopy.java
+++ b/geogebra/gui/view/spreadsheet/RelativeCopy.java
@@ -9,6 +9,7 @@ import geogebra.kernel.GeoImage;
import geogebra.kernel.GeoList;
import geogebra.kernel.GeoText;
import geogebra.kernel.Kernel;
+import geogebra.main.Application;
import java.awt.Point;
import java.util.Iterator;
@@ -255,9 +256,23 @@ public class RelativeCopy {
text = value.getCommandDescription();
}
- // enclose in quotes if we are copying a GeoText
+ // handle GeoText source value
if (value.isGeoText() && !((GeoText) value).isTextCommand()) {
- text = "\"" + text + "\"";
+ // enclose text in quotes if we are copying an independent GeoText,
+ // e.g. "2+3"
+ if (value.isIndependent()) {
+ text = "\"" + text + "\"";
+ } else {
+
+ // check if 'text' parses to a GeoText
+ GeoText testGeoText = kernel.getAlgebraProcessor()
+ .evaluateToText(text, false, false);
+
+ // if it doesn't then force it to by adding +"" on the end
+ if (testGeoText == null) {
+ text = text + "+\"\"";
+ }
+ }
}
// for E1 = Polynomial[D1] we need value.getCommandDescription();
@@ -276,9 +291,9 @@ public class RelativeCopy {
}
}
- // Application.debug("before:"+text);
+ Application.debug("before:"+text);
text = updateCellReferences(value, text, dx, dy);
- // Application.debug("after:"+text);
+ Application.debug("after:"+text);
// condition to show object
GeoBoolean bool = value.getShowObjectCondition();
diff --git a/geogebra/gui/view/spreadsheet/SpreadsheetView.java b/geogebra/gui/view/spreadsheet/SpreadsheetView.java
index 464bfb4..e282448 100644
--- a/geogebra/gui/view/spreadsheet/SpreadsheetView.java
+++ b/geogebra/gui/view/spreadsheet/SpreadsheetView.java
@@ -339,10 +339,13 @@ View, ComponentListener, FocusListener, Gridable, SettingListener
doRemove(geo, location.y, location.x);
}
-
- if(geo.isGeoBoolean()){
- table.oneClickEditMap.remove(location);
- }
+ switch (geo.getGeoClassType()){
+ case GeoElement.GEO_CLASS_BOOLEAN:
+ case GeoElement.GEO_CLASS_BUTTON:
+ case GeoElement.GEO_CLASS_LIST:
+ table.oneClickEditMap.remove(geo);
+ }
+
}
private void doRemove(GeoElement geo, int row, int col) {
@@ -1210,6 +1213,7 @@ View, ComponentListener, FocusListener, Gridable, SettingListener
}
public boolean setFileBrowserDirectory(String rootString, int mode) {
+ settings().setInitialBrowserMode(mode);
return getFileBrowser().setRoot(rootString, mode);
}
diff --git a/geogebra/gui/view/spreadsheet/statdialog/BasicStatTable.java b/geogebra/gui/view/spreadsheet/statdialog/BasicStatTable.java
index 9ee742d..6d75fe0 100644
--- a/geogebra/gui/view/spreadsheet/statdialog/BasicStatTable.java
+++ b/geogebra/gui/view/spreadsheet/statdialog/BasicStatTable.java
@@ -185,6 +185,8 @@ public class BasicStatTable extends JPanel implements StatPanelInterface {
kernel.getConstruction().removeFromConstructionList(algo);
value = ((GeoNumeric)algo.getGeoElements()[0]).getDouble();
model.setValueAt(statDialog.format(value), row, 0);
+ }else{
+ model.setValueAt("", row, 0);
}
}
else if(statMap[row].length == 3){
@@ -193,6 +195,8 @@ public class BasicStatTable extends JPanel implements StatPanelInterface {
kernel.getConstruction().removeFromConstructionList(algo);
value = ((GeoNumeric)algo.getGeoElements()[0]).getDouble();
model.setValueAt(statDialog.format(value), row, 0);
+ }else{
+ model.setValueAt("", row, 0);
}
}
diff --git a/geogebra/gui/view/spreadsheet/statdialog/DataPanel.java b/geogebra/gui/view/spreadsheet/statdialog/DataPanel.java
index 21c06f6..a86551e 100644
--- a/geogebra/gui/view/spreadsheet/statdialog/DataPanel.java
+++ b/geogebra/gui/view/spreadsheet/statdialog/DataPanel.java
@@ -1,12 +1,11 @@
package geogebra.gui.view.spreadsheet.statdialog;
-import geogebra.gui.view.spreadsheet.MyTable;
-import geogebra.kernel.GeoList;
+import geogebra.kernel.GeoElement;
import geogebra.kernel.GeoPoint;
-import geogebra.kernel.Kernel;
import geogebra.main.Application;
import geogebra.main.GeoGebraColorConstants;
+import geogebra.main.settings.SpreadsheetSettings;
import java.awt.BorderLayout;
import java.awt.Color;
@@ -22,6 +21,7 @@ import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.image.BufferedImage;
+import java.util.ArrayList;
import javax.swing.BorderFactory;
import javax.swing.DefaultListModel;
@@ -47,7 +47,8 @@ public class DataPanel extends JPanel implements ActionListener, StatPanelInterf
private Application app;
- private Kernel kernel;
+ private StatDialog statDialog;
+ private StatDialogController statController;
private JTable dataTable;
private JButton btnEnableAll;
@@ -55,14 +56,11 @@ public class DataPanel extends JPanel implements ActionListener, StatPanelInterf
private MyColumnHeaderRenderer columnHeader;
private JScrollPane scrollPane;
- //private GeoList dataListAll;
-
private Boolean[] selectionList;
- private StatDialog statDialog;
- private StatDialogController statController;
- private int mode;
- public int preferredColumnWidth = MyTable.TABLE_CELL_WIDTH;
+ private JLabel lblHeader;
+ public int preferredColumnWidth = SpreadsheetSettings.TABLE_CELL_WIDTH;
+
private static final Color DISABLED_BACKGROUND_COLOR = Color.LIGHT_GRAY;
private static final Color SELECTED_BACKGROUND_COLOR_HEADER = GeoGebraColorConstants.TABLE_SELECTED_BACKGROUND_COLOR_HEADER;
@@ -74,21 +72,22 @@ public class DataPanel extends JPanel implements ActionListener, StatPanelInterf
/*************************************************
* Construct a DataPanel
*/
- public DataPanel(Application app, StatDialog statDialog, GeoList dataListAll, int mode){
-
+ public DataPanel(Application app, StatDialog statDialog)
+ {
this.app = app;
- kernel = app.getKernel();
this.statDialog = statDialog;
- this.mode = mode;
this.statController = statDialog.getStatDialogController();
- // this.dataListAll = dataAll;
- selectionList = new Boolean[dataListAll.size()];
- for(int i=0; i<dataListAll.size(); ++i){
- selectionList[i] = true;
- }
+ buildDataTable();
+ populateDataTable(statController.getDataArray());
+ createGUI();
+ }
+
- // build the data table
+
+
+ private void buildDataTable()
+ {
dataTable = new JTable(){
// disable cell edits (for now)
@Override
@@ -105,15 +104,16 @@ public class DataPanel extends JPanel implements ActionListener, StatPanelInterf
}
}
};
-
- populateDataTable(dataListAll);
+ }
+ private void createGUI()
+ {
// set table and column renderers
dataTable.setDefaultRenderer(Object.class, new MyCellRenderer());
columnHeader = new MyColumnHeaderRenderer();
- columnHeader.setPreferredSize(new Dimension(preferredColumnWidth, MyTable.TABLE_CELL_HEIGHT));
+ columnHeader.setPreferredSize(new Dimension(preferredColumnWidth, SpreadsheetSettings.TABLE_CELL_HEIGHT));
for (int i = 0; i < dataTable.getColumnCount(); ++ i) {
dataTable.getColumnModel().getColumn(i).setHeaderRenderer(columnHeader);
dataTable.getColumnModel().getColumn(i).setPreferredWidth(preferredColumnWidth);
@@ -172,115 +172,102 @@ public class DataPanel extends JPanel implements ActionListener, StatPanelInterf
scrollPane.setCorner(ScrollPaneConstants.LOWER_LEFT_CORNER, new Corner());
scrollPane.setCorner(ScrollPaneConstants.UPPER_RIGHT_CORNER, new Corner());
-
-
- // hide the table header
- //dataTable.setTableHeader(null);
- //scrollPane.setColumnHeaderView(null);
-
-
- // finally, load up our JPanel
- this.setLayout(new BorderLayout());
-
- //JPanel header = new JPanel(new FlowLayout(FlowLayout.LEFT));
- JLabel header = new JLabel(app.getMenu("Data"));
- //header.add(btnEnableAll);
- //header.add(lblData);
-
-
- header.setHorizontalAlignment(JLabel.LEFT);
- header.setBorder(BorderFactory.createCompoundBorder(
+ lblHeader = new JLabel();
+ lblHeader.setHorizontalAlignment(JLabel.LEFT);
+ lblHeader.setBorder(BorderFactory.createCompoundBorder(
BorderFactory.createEtchedBorder(),
BorderFactory.createEmptyBorder(2,5,2,2)));
-
-
- this.add(header, BorderLayout.NORTH);
+ // finally, load up our JPanel
+ this.setLayout(new BorderLayout());
+ this.add(lblHeader, BorderLayout.NORTH);
this.add(scrollPane, BorderLayout.CENTER);
-
this.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
+ this.setMinimumSize(dataTable.getPreferredSize());
+ }
- } // END constructor
-
-
public void removeGeos(){
- // if(dataListAll != null){
- // dataListAll.remove();
- // }
- // dataListAll = null;
}
+ private Boolean[] updateSelectionList(ArrayList<GeoElement> dataArray) {
+
+ selectionList = new Boolean[dataArray.size()];
+ for(int i=0; i<selectionList.length; ++i){
+ selectionList[i] = true;
+ }
+
+ return selectionList;
+ }
+
+ private void populateDataTable(ArrayList<GeoElement> dataArray){
+ if(dataArray == null || dataArray.size()<1){
+ return;
+ }
- private void populateDataTable(GeoList dataList){
TableModel dataModel = null;
GeoPoint geo = null;
String[] titles = statDialog.getDataTitles();
- switch(mode){
+ switch(statDialog.getMode()){
case StatDialog.MODE_ONEVAR:
- dataModel = new DefaultTableModel(dataList.size(),1);
- for (int row = 0; row < dataList.size(); ++row){
- dataModel.setValueAt(dataList.get(row).toDefinedValueString(),row,0);
+ dataModel = new DefaultTableModel(dataArray.size(),1);
+ for (int row = 0; row < dataArray.size(); ++row){
+ dataModel.setValueAt(dataArray.get(row).toDefinedValueString(),row,0);
}
dataTable.setModel(dataModel);
-
dataTable.getColumnModel().getColumn(0).setHeaderValue(titles[0]);
+ updateSelectionList(dataArray);
break;
case StatDialog.MODE_REGRESSION:
- dataModel = new DefaultTableModel(dataList.size(),2);
- for (int row = 0; row < dataList.size(); ++row){
- dataModel.setValueAt(((GeoPoint)(dataList.get(row))).getInhomX(),row,0);
- dataModel.setValueAt(((GeoPoint)(dataList.get(row))).getInhomY(),row,1);
+ dataModel = new DefaultTableModel(dataArray.size(),2);
+ for (int row = 0; row < dataArray.size(); ++row){
+ dataModel.setValueAt(((GeoPoint)(dataArray.get(row))).getInhomX(),row,0);
+ dataModel.setValueAt(((GeoPoint)(dataArray.get(row))).getInhomY(),row,1);
}
dataTable.setModel(dataModel);
-
dataTable.getColumnModel().getColumn(0).setHeaderValue(
app.getMenu("Column.X") + ": " + titles[0]);
dataTable.getColumnModel().getColumn(1).setHeaderValue(
app.getMenu("Column.Y") + ": " + titles[1]);
+ updateSelectionList(dataArray);
+
break;
}
-
-
-
-
-
-
-
}
- /** Updates the data table.
- * Called on data set changes. */
- public void updateDataTable(GeoList dataAll){
+ /**
+ * Loads the data table. Called on data set changes.
+ */
+ public void loadDataTable(ArrayList<GeoElement> dataArray){
// load the data model
- populateDataTable(dataAll);
+ populateDataTable(dataArray);
// prepare boolean selection list for the checkboxes
- selectionList = new Boolean[dataAll.size()];
- for(int i=0; i<dataAll.size(); ++i){
+ selectionList = new Boolean[dataArray.size()];
+ for(int i=0; i<dataArray.size(); ++i){
selectionList[i] = true;
}
@@ -334,26 +321,42 @@ public class DataPanel extends JPanel implements ActionListener, StatPanelInterf
public void setFont(Font font) {
super.setFont(font);
- if(dataTable != null){
- int size = font.getSize();
- if (size < 12) size = 12; // minimum size
- double multiplier = (size)/12.0;
+ if(dataTable != null && dataTable.getRowCount()>0 && dataTable.getColumnCount()>0){
+ // set the font for each component
dataTable.setFont(font);
+ if(dataTable.getTableHeader() != null)
+ dataTable.getTableHeader().setFont(font);
rowHeader.setFont(font);
+
+ // get row height needed to draw an "X" character
int h = dataTable.getCellRenderer(0,0).getTableCellRendererComponent(dataTable, "X",
false, false, 0, 0).getPreferredSize().height;
+ // use this height to set the table and row header heights
dataTable.setRowHeight(h);
rowHeader.setFixedCellHeight(h);
- preferredColumnWidth = (int) (MyTable.TABLE_CELL_WIDTH * multiplier);
- //columnHeader.setPreferredSize(new Dimension(preferredColumnWidth, (int)(MyTable.TABLE_CELL_HEIGHT * multiplier)));
+ // set the column width
+ int size = font.getSize();
+ if (size < 12) size = 12; // minimum size
+ double multiplier = (size)/12.0;
+ preferredColumnWidth = (int) (SpreadsheetSettings.TABLE_CELL_WIDTH * multiplier);
+
+ //columnHeader.setPreferredSize(new Dimension(preferredColumnWidth, (int)(MyTable.TABLE_CELL_HEIGHT * multiplier)));
+ //this.validate();
+ //dataTable.repaint();
}
+ if(dataTable != null)
+ dataTable.setPreferredScrollableViewportSize(dataTable.getPreferredSize());
+
}
+
+
+
public MyRowHeader getRowHeader(){
return rowHeader;
}
@@ -387,7 +390,7 @@ public class DataPanel extends JPanel implements ActionListener, StatPanelInterf
}
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int rowIndex, int colIndex) {
-
+ setFont(app.getPlainFont());
setText(value.toString());
return this;
@@ -416,7 +419,7 @@ public class DataPanel extends JPanel implements ActionListener, StatPanelInterf
setText("");
return this;
}
-
+ setFont(app.getPlainFont());
String text = value.toString();
//if (isSelected)
@@ -452,20 +455,7 @@ public class DataPanel extends JPanel implements ActionListener, StatPanelInterf
this.table = table;
this.dataPanel = dataPanel;
-
- /*
- model = new DefaultListModel();
- for(int i=0; i< table.getRowCount(); ++i){
- model.addElement(new Boolean(true));
- }
- setModel(model);
- */
-
- //model = (DefaultListModel) this.getModel();
-
setCellRenderer(new RowHeaderRenderer(table));
- //addListSelectionListener(new MySelectionListener());
- //setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
setSelectionModel( table.getSelectionModel());
this.addMouseListener(this);
@@ -490,11 +480,9 @@ public class DataPanel extends JPanel implements ActionListener, StatPanelInterf
setHorizontalAlignment(LEFT);
setFont(table.getFont());
-
- //iconShown = app.getImageIcon("shown.gif");
- //iconUnChecked = app.getImageIcon("hidden.gif");
}
+
public Component getListCellRendererComponent( JList list,
Object value, int index, boolean isSelected, boolean cellHasFocus) {
@@ -507,24 +495,16 @@ public class DataPanel extends JPanel implements ActionListener, StatPanelInterf
setIcon(iconUnChecked);
}
- // selection
-
- //if (isSelected)
- //setBackground(SELECTED_BACKGROUND_COLOR_HEADER);
- //setBackground(MyTable.BACKGROUND_COLOR_HEADER);
-
-
if(!(Boolean) value)
setBackground(DISABLED_BACKGROUND_COLOR);
else
setBackground(TABLE_HEADER_COLOR);
-
return this;
}
-
}
+
class MySelectionListener implements ListSelectionListener{
public void valueChanged(ListSelectionEvent e) {
if (e.getValueIsAdjusting() == false) {
@@ -535,15 +515,9 @@ public class DataPanel extends JPanel implements ActionListener, StatPanelInterf
}
}
- public void mouseClicked(MouseEvent e) {
-
- }
-
- public void mouseEntered(MouseEvent arg0) {
- }
-
- public void mouseExited(MouseEvent arg0) {
- }
+ public void mouseClicked(MouseEvent e) {}
+ public void mouseEntered(MouseEvent arg0) {}
+ public void mouseExited(MouseEvent arg0) {}
public void mousePressed(MouseEvent e) {
// check if we clicked in checkbox icon area
@@ -554,18 +528,8 @@ public class DataPanel extends JPanel implements ActionListener, StatPanelInterf
// icon clicked: toggle enable/disable data
selectionList[this.getSelectedIndex()] = !selectionList[this.getSelectedIndex()];
statController.updateSelectedDataList(this.getSelectedIndex(), selectionList[this.getSelectedIndex()] );
-
btnEnableAll.setEnabled(!isAllEnabled());
- // statDialog.handleDataPanelSelectionChange(selectionList);
-
- /*
- boolean bool = !((Boolean)getSelectedValue());
- for(int row = 0; row < table.getSelectedRows().length; ++row){
- model.setElementAt(bool,table.getSelectedRows()[row]);
-
- }
- */
table.repaint();
repaint();
return;
@@ -594,11 +558,8 @@ public class DataPanel extends JPanel implements ActionListener, StatPanelInterf
return false;
}
return true;
-
}
-
-
}
@@ -752,14 +713,12 @@ public class DataPanel extends JPanel implements ActionListener, StatPanelInterf
public void setLabels() {
- // TODO Auto-generated method stub
-
+ lblHeader.setText(app.getMenu("Data"));
}
public void updatePanel() {
// TODO Auto-generated method stub
-
}
}
diff --git a/geogebra/gui/view/spreadsheet/statdialog/OptionsPanel.java b/geogebra/gui/view/spreadsheet/statdialog/OptionsPanel.java
index 280f96c..966910c 100644
--- a/geogebra/gui/view/spreadsheet/statdialog/OptionsPanel.java
+++ b/geogebra/gui/view/spreadsheet/statdialog/OptionsPanel.java
@@ -294,27 +294,32 @@ public class OptionsPanel extends JPanel implements PropertyChangeListener, Acti
fldXMin = new MyTextField(app,fieldWidth);
fldXMin.setEditable(true);
fldXMin.addActionListener(this);
+ fldXMin.addFocusListener(this);
lblXMax = new JLabel();
fldXMax = new MyTextField(app,fieldWidth);
fldXMax.addActionListener(this);
+ fldXMax.addFocusListener(this);
lblYMin = new JLabel();
fldYMin = new MyTextField(app,fieldWidth);
fldYMin.addActionListener(this);
+ fldYMin.addFocusListener(this);
lblYMax = new JLabel();
fldYMax = new MyTextField(app,fieldWidth);
fldYMax.addActionListener(this);
+ fldYMax.addFocusListener(this);
lblXInterval = new JLabel();
fldXInterval = new MyTextField(app,fieldWidth);
fldXInterval.addActionListener(this);
+ fldXInterval.addFocusListener(this);
lblYInterval = new JLabel();
fldYInterval = new MyTextField(app,fieldWidth);
fldYInterval.addActionListener(this);
-
+ fldYInterval.addFocusListener(this);
// create graph options panel
JPanel graphOptionsPanel = new JPanel(new GridBagLayout());
@@ -503,8 +508,11 @@ public class OptionsPanel extends JPanel implements PropertyChangeListener, Acti
if(ckAutoWindow.isSelected()){
fldXMin.setText("" + statDialog.format(settings.xMin));
fldXMax.setText("" + statDialog.format(settings.xMax));
+ fldXInterval.setText("" + statDialog.format(settings.xAxesInterval));
+
fldYMin.setText("" + statDialog.format(settings.yMin));
fldYMax.setText("" + statDialog.format(settings.yMax));
+ fldYInterval.setText("" + statDialog.format(settings.yAxesInterval));
}
@@ -594,6 +602,9 @@ public class OptionsPanel extends JPanel implements PropertyChangeListener, Acti
}
else if(source == ckAutoWindow){
settings.isAutomaticWindow = ckAutoWindow.isSelected();
+
+ settings.xAxesIntervalAuto = ckAutoWindow.isSelected();
+ settings.yAxesIntervalAuto = ckAutoWindow.isSelected();
firePropertyChange("settings", true, false);
}
else if(source == ckShowFrequencyTable){
@@ -632,7 +643,10 @@ public class OptionsPanel extends JPanel implements PropertyChangeListener, Acti
}
- public void focusLost(FocusEvent arg0) {
+ public void focusLost(FocusEvent e) {
+ if(e.getSource() instanceof JTextField){
+ doTextFieldActionPerformed((JTextField)(e.getSource()));
+ }
}
diff --git a/geogebra/gui/view/spreadsheet/statdialog/PlotPanelEuclidianView.java b/geogebra/gui/view/spreadsheet/statdialog/PlotPanelEuclidianView.java
index b4a9a4b..f1bf1f6 100644
--- a/geogebra/gui/view/spreadsheet/statdialog/PlotPanelEuclidianView.java
+++ b/geogebra/gui/view/spreadsheet/statdialog/PlotPanelEuclidianView.java
@@ -2,6 +2,7 @@ package geogebra.gui.view.spreadsheet.statdialog;
import geogebra.euclidian.EuclidianController;
import geogebra.euclidian.EuclidianView;
+import geogebra.euclidian.EuclidianViewInterface;
import geogebra.kernel.Kernel;
import geogebra.main.Application;
@@ -15,7 +16,6 @@ import java.awt.datatransfer.UnsupportedFlavorException;
import java.awt.dnd.DnDConstants;
import java.awt.dnd.DragGestureEvent;
import java.awt.dnd.DragGestureListener;
-import java.awt.dnd.DragGestureRecognizer;
import java.awt.dnd.DragSource;
import java.awt.dnd.DragSourceDragEvent;
import java.awt.dnd.DragSourceDropEvent;
@@ -35,10 +35,15 @@ import javax.swing.JPopupMenu;
/**
*
- * Creates a JPanel with an extended instance of EuclidianView and methods for
- * creating geos in the panel.
+ * An extension of EuclidianView used for display of a set of GeoElements
+ * without all of the mouse and key controls of the full EuclidianView. Unlike
+ * EuclidianView, this view remains centered in the panel when resized.
*
- * @author gsturr 2010-6-30
+ * Includes a right-click context menu and DnD support for exporting either the
+ * set of GeoElements or an image of the view.
+ *
+ *
+ * @author G.Sturr 2010-6-30
*
*/
public class PlotPanelEuclidianView extends EuclidianView implements
@@ -47,136 +52,126 @@ public class PlotPanelEuclidianView extends EuclidianView implements
private final EuclidianController ec;
private final PlotPanelEuclidianView plotPanelEV;
- public int viewID;
-
private static boolean[] showAxes = { true, true };
private static boolean showGrid = false;
+ /** Plot panel viewID. This is not a constant; it is assigned by GuiManager. */
+ private final int viewID;
+
+ /** Settings to control EuclidianView features (e.g. axes visibility) */
private PlotSettings plotSettings;
+ /** Mouse listener to trigger context menu */
private MyMouseListener myMouseListener;
- private boolean enableContextMenu;
-
- public PlotSettings getPlotSettings() {
- return plotSettings;
- }
-
/**
- * Sets the given plotSettings and updates the panel accordingly
- *
- * @param plotSettings
+ * Flag to determine if the mouse is over the drag region, a thin rectangle
+ * at the top of the panel
*/
- public void updateSettings(PlotSettings plotSettings) {
- this.plotSettings = plotSettings;
- this.setEVParams();
- }
-
private boolean overDragRegion = false;
+
+ /** Drag source for DnD */
private DragSource ds;
- protected void enableDnD() {
- ds = new DragSource();
- DragGestureRecognizer dgr = ds.createDefaultDragGestureRecognizer(this,
- DnDConstants.ACTION_COPY, this);
- }
+ /** DnD cursors */
+ private final Cursor grabbingCursor, grabCursor;
+
+ /** List of AbstractActions for the popup context menu */
+ ArrayList<AbstractAction> actionList;
- protected static Cursor defaultCursor = Cursor.getDefaultCursor();
- protected static Cursor handCursor = Cursor
- .getPredefinedCursor(Cursor.HAND_CURSOR);
- protected static Cursor grabbingCursor, grabCursor;
+ /**
+ * Action method export of GeoElements to EuclidianView. Since the action is
+ * specific to the parent container, it is injected in the constructor.
+ * */
+ private final AbstractAction exportToEVAction;
+
+ /** DataFlavor for plotPanel drags */
+ public final static DataFlavor plotPanelFlavor = new DataFlavor(
+ DataFlavor.javaJVMLocalObjectMimeType
+ + ";class=javax.swing.AbstractAction", "plotPanelFlavor");
/*************************************************
* Construct the panel
*/
- public PlotPanelEuclidianView(Kernel kernel) {
+ public PlotPanelEuclidianView(final Kernel kernel,
+ final AbstractAction exportAction) {
super(new PlotPanelEuclidianController(kernel), showAxes, showGrid,
null);
+ // set fields
plotPanelEV = this;
- this.ec = this.getEuclidianController();
+ ec = getEuclidianController();
+ exportToEVAction = exportAction;
+ plotSettings = new PlotSettings();
+ // get viewID from GuiManager
viewID = kernel.getApplication().getGuiManager()
.assignPlotPanelID(this);
- grabCursor = getCursorForImage(app.getImageIcon("cursor_grab.gif")
- .getImage());
- grabbingCursor = getCursorForImage(app.getImageIcon(
+ // create cursors for DnD
+ grabCursor = getCursorForImage(getApplication().getImageIcon(
+ "cursor_grab.gif").getImage());
+ grabbingCursor = getCursorForImage(getApplication().getImageIcon(
"cursor_grabbing.gif").getImage());
- setMouseEnabled(false);
+ // enable/disable mouseListeners
+ setMouseEnabled(false, true);
setMouseMotionEnabled(false);
setMouseWheelEnabled(false);
+ addMouseMotionListener(new MyMouseMotionListener());
+
+ // set some default EV features
setAllowShowMouseCoords(false);
setAxesCornerCoordsVisible(false);
- setContextMenuEnabled(true);
-
- this.addMouseMotionListener(new MyMouseMotionListener());
-
setAntialiasing(true);
updateFonts();
+
+ // set preferred size so that updateSize will work and this EV can be
+ // properly initialized
setPreferredSize(new Dimension(300, 200));
setSize(new Dimension(300, 200));
updateSize();
- plotSettings = new PlotSettings();
-
+ // add a component listener that will allow the view to resize in a
+ // centered
addComponentListener(this);
enableDnD();
}
- public void setMouseEnabled(boolean enableMouse) {
-
- removeMouseListener(ec);
- if (enableMouse) {
- addMouseListener(ec);
- }
- setContextMenuEnabled(enableContextMenu);
- }
-
- public void setMouseMotionEnabled(boolean enableMouseMotion) {
- removeMouseMotionListener(ec);
- if (enableMouseMotion) {
- addMouseMotionListener(ec);
- }
- }
+ /*********** End Constructor **********************/
- public void setMouseWheelEnabled(boolean enableMouseWheel) {
- removeMouseWheelListener(ec);
- if (enableMouseWheel) {
- addMouseWheelListener(ec);
- }
+ /**
+ * Overrides EuclidianView setMode method so that no action is taken on a
+ * mode change.
+ */
+ @Override
+ public void setMode(final int mode) {
+ // .... do nothing
}
- public void setContextMenuEnabled(boolean enableContextMenu) {
- this.enableContextMenu = enableContextMenu;
- if (myMouseListener == null) {
- myMouseListener = new MyMouseListener();
- }
- removeMouseListener(myMouseListener);
- if (enableContextMenu) {
- addMouseListener(myMouseListener);
- }
- ;
+ /** Returns viewID */
+ @Override
+ public int getViewID() {
+ return viewID;
}
/**
- * Override UpdateSize() so that our plots stay centered and scaled in a
+ * Override updateSize() so that our plots stay centered and scaled in a
* resized window.
*/
@Override
public void updateSize() {
// record the old coord system
- double xminTemp = getXmin();
- double xmaxTemp = getXmax();
- double yminTemp = getYmin();
- double ymaxTemp = getYmax();
+ final double xminTemp = getXmin();
+ final double xmaxTemp = getXmax();
+ final double yminTemp = getYmin();
+ final double ymaxTemp = getYmax();
// standard update: change the coord system to match new window
- // dimensions
- // with the upper left corner fixed and the other bounds adjusted.
+ // dimensions with the upper left corner fixed and the other bounds
+ // adjusted.
super.updateSize();
// now reset the coord system so that our view dimensions are restored
@@ -184,19 +179,42 @@ public class PlotPanelEuclidianView extends EuclidianView implements
setRealWorldCoordSystem(xminTemp, xmaxTemp, yminTemp, ymaxTemp);
}
- @Override
- public void setMode(int mode) {
- // .... do nothing
+ // ==================================================
+ // Plot Settings
+ // =================================================
+
+ /**
+ * Returns plotSettings field for this panel.
+ *
+ * @return
+ */
+ public PlotSettings getPlotSettings() {
+ return plotSettings;
}
+ /**
+ * Sets the plotSettings field and updates the panel accordingly.
+ *
+ * @param plotSettings
+ */
+ public void updateSettings(final PlotSettings plotSettings) {
+ this.plotSettings = plotSettings;
+ setEVParams();
+ }
+
+ /**
+ * Uses the values stored in the plotSettings field to update the features
+ * of this EuclidianView (e.g. axes visibility)
+ */
public void setEVParams() {
showGrid(plotSettings.showGrid);
- setShowAxis(EuclidianView.AXIS_Y, plotSettings.showYAxis, false);
+ setShowAxis(EuclidianViewInterface.AXIS_Y, plotSettings.showYAxis,
+ false);
setAutomaticGridDistance(plotSettings.gridIntervalAuto);
if (!plotSettings.gridIntervalAuto) {
- this.setGridDistances(plotSettings.gridInterval);
+ setGridDistances(plotSettings.gridInterval);
}
if (plotSettings.showArrows) {
@@ -218,23 +236,26 @@ public class PlotPanelEuclidianView extends EuclidianView implements
if (plotSettings.forceXAxisBuffer) {
// ensure that the axis labels are shown
// by forcing a fixed pixel height below the x-axis
- double pixelOffset = (30 * app.getSmallFont().getSize()) / 12.0;
- double pixelHeight = this.getHeight();
+ final double pixelOffset = (30 * getApplication().getSmallFont()
+ .getSize()) / 12.0;
+ final double pixelHeight = getHeight();
plotSettings.yMin = (-pixelOffset * plotSettings.yMax)
/ (pixelHeight + pixelOffset);
}
setAxesCornerCoordsVisible(false);
- this.setAutomaticAxesNumberingDistance(plotSettings.xAxesIntervalAuto,
- 0);
- this.setAutomaticAxesNumberingDistance(plotSettings.yAxesIntervalAuto,
- 1);
+ setAutomaticAxesNumberingDistance(plotSettings.xAxesIntervalAuto, 0);
+ setAutomaticAxesNumberingDistance(plotSettings.yAxesIntervalAuto, 1);
if (!plotSettings.xAxesIntervalAuto) {
setAxesNumberingDistance(plotSettings.xAxesInterval, 0);
+ }else{
+ plotSettings.xAxesInterval = getAxesNumberingDistances()[0];
}
if (!plotSettings.yAxesIntervalAuto) {
setAxesNumberingDistance(plotSettings.yAxesInterval, 1);
+ }else{
+ plotSettings.yAxesInterval = getAxesNumberingDistances()[1];
}
setPointCapturing(plotSettings.pointCaptureStyle);
@@ -246,89 +267,141 @@ public class PlotPanelEuclidianView extends EuclidianView implements
repaint();
}
- // ==================================================
- // Component Listener (for resizing our EV)
- // =================================================
+ // ===========================================================
+ // Component Listener
+ // ===========================================================
- public void componentHidden(ComponentEvent arg0) {
+ public void componentHidden(final ComponentEvent arg0) {
+ // ignore
}
- public void componentMoved(ComponentEvent arg0) {
+ public void componentMoved(final ComponentEvent arg0) {
+ // ignore
}
- public void componentResized(ComponentEvent arg0) {
+ public void componentResized(final ComponentEvent arg0) {
// make sure that we force a pixel buffer under the x-axis
setEVParams();
}
- public void componentShown(ComponentEvent arg0) {
+ public void componentShown(final ComponentEvent arg0) {
+ // ignore
}
// ==================================================
- // Mouse Handlers
+ // Mouse Listeners
// =================================================
- @Override
- protected void processMouseEvent(MouseEvent e) {
- if (e.getClickCount() > 1) {
- e.consume();
- return;
+ /**
+ * Enables/disables the default EuclidianController mouse listener and
+ * myMouseListener, the listener that handles the right-click context menu.
+ *
+ * @param enableECMouseListener
+ * default = false
+ * @param enableMyMouseListener
+ * default = true
+ */
+ public void setMouseEnabled(final boolean enableECMouseListener,
+ final boolean enableMyMouseListener) {
+ if (myMouseListener == null) {
+ myMouseListener = new MyMouseListener();
}
+ removeMouseListener(myMouseListener);
+ removeMouseListener(ec);
- else if (Application.isRightClick(e)) {
- if (e.getID() == MouseEvent.MOUSE_RELEASED) {
- ContextMenu contextMenu = new ContextMenu();
- contextMenu.show(e.getComponent(), e.getX(), e.getY());
- e.consume();
- }
- return;
- } else {
- super.processMouseEvent(e);
+ if (enableMyMouseListener) {
+ addMouseListener(myMouseListener);
+ }
+ if (enableECMouseListener) {
+ addMouseListener(ec);
+ }
+ }
+
+ /**
+ * Enables/disables the EuclidianController mouse motion listener
+ *
+ * @param enableMouseMotion
+ * default = false
+ */
+ public void setMouseMotionEnabled(final boolean enableMouseMotion) {
+ removeMouseMotionListener(ec);
+ if (enableMouseMotion) {
+ addMouseMotionListener(ec);
+ }
+ }
+
+ /**
+ * Enables/disables the EuclidianController mouse wheel listener
+ *
+ * @param enableMouseWheel
+ * default = false
+ */
+ public void setMouseWheelEnabled(final boolean enableMouseWheel) {
+ removeMouseWheelListener(ec);
+ if (enableMouseWheel) {
+ addMouseWheelListener(ec);
}
}
- class MyMouseListener implements MouseListener {
+ /**
+ * Mouse listener class to handle right click trigger for the context menu.
+ * Right click events are consumed to prevent the EuclidianController from
+ * handling right-clicks as well.
+ */
+ private class MyMouseListener implements MouseListener {
- public void mouseClicked(MouseEvent e) {
- Object ob = e.getSource();
+ public void mouseClicked(final MouseEvent e) {
+ e.getSource();
// right click shows context menu
if (Application.isRightClick(e)) {
e.consume();
- // app.getGuiManager().showPopupMenu(temp, table, origin);
+ final ContextMenu popup = new ContextMenu();
+ popup.show(e.getComponent(), e.getX(), e.getY());
}
}
- public void mouseEntered(MouseEvent e) {
+ public void mousePressed(final MouseEvent e) {
+ if (Application.isRightClick(e)) {
+ e.consume();
+ }
}
- public void mouseExited(MouseEvent e) {
+ public void mouseReleased(final MouseEvent e) {
+ if (Application.isRightClick(e)) {
+ e.consume();
+ }
}
- public void mousePressed(MouseEvent e) {
+ public void mouseEntered(final MouseEvent e) {
+ // ignore
}
- public void mouseReleased(MouseEvent e) {
+ public void mouseExited(final MouseEvent e) {
+ // ignore
}
}
+ /**
+ * Mouse motion listener for handling DnD drags
+ */
class MyMouseMotionListener implements MouseMotionListener {
- public void mouseDragged(MouseEvent e) {
- // TODO Auto-generated method stub
-
+ public void mouseDragged(final MouseEvent e) {
+ // ignore
}
- public void mouseMoved(MouseEvent e) {
+ /** handles mouse motion over the drag region */
+ public void mouseMoved(final MouseEvent e) {
overDragRegion = e.getPoint().y < 10;
- // if(overDragRegion)
- // plotPanelEV.setSelectionRectangle(new Rectangle(0, 0,
- // plotPanelEV.getWidth(), plotPanelEV.getHeight()));
- // else
- // plotPanelEV.setSelectionRectangle(null);
+ setDefaultCursor();
}
}
+ /**
+ * Overrides EuclidianView.setDefaultCursor so that DnD grab hand cursors
+ * are drawn when over the drag region.
+ */
@Override
public void setDefaultCursor() {
if (overDragRegion) {
@@ -339,91 +412,122 @@ public class PlotPanelEuclidianView extends EuclidianView implements
}
// =============================================
- // Context Menu
+ // Context Menu Popup
// =============================================
+ /**
+ * Popup menu with menu items for exporting either the GeoElements or an
+ * image of the view.
+ */
private class ContextMenu extends JPopupMenu {
public ContextMenu() {
- this.setOpaque(true);
- // setBackground(bgColor);
- setFont(app.getPlainFont());
+ setOpaque(true);
+ setFont(getApplication().getPlainFont());
- for (AbstractAction action : getActionList()) {
+ for (final AbstractAction action : getActionList()) {
add(action);
}
}
}
- ArrayList<AbstractAction> actionList;
+ /**
+ * Sets the list of AbstractActions to be used in the popup context menu.
+ *
+ * @param actionList
+ */
+ public void setActionList(final ArrayList<AbstractAction> actionList) {
+ this.actionList = actionList;
+ }
+ /**
+ * Returns the list of AbstractActions to be used in the popup context menu.
+ *
+ * @return
+ */
public ArrayList<AbstractAction> getActionList() {
+
if (actionList == null) {
actionList = new ArrayList<AbstractAction>();
- // actionList.add(exportToEVAction);
actionList.add(drawingPadToClipboardAction);
actionList.add(exportGraphicAction);
+ if (exportToEVAction != null) {
+ exportToEVAction.putValue(AbstractAction.NAME, getApplication()
+ .getMenu("CopyToGraphics"));
+ exportToEVAction.putValue(AbstractAction.SMALL_ICON,
+ getApplication().getImageIcon("edit-copy.png"));
+ actionList.add(exportToEVAction);
+ }
}
return actionList;
}
- public void setActionList(ArrayList<AbstractAction> actionList) {
- this.actionList = actionList;
- }
-
- public void appendActionList(AbstractAction action) {
+ /**
+ * Adds an AbstractAction to the end of the list of AbstractActions
+ * displayed in the context menu.
+ *
+ * @param action
+ */
+ public void appendActionList(final AbstractAction action) {
getActionList().add(action);
}
- AbstractAction exportGraphicAction = new AbstractAction(
- app.getPlain("ExportAsPicture") + "...",
- app.getImageIcon("image-x-generic.png")) {
+ /**
+ * Action to export an image of the view as a file.
+ */
+ AbstractAction exportGraphicAction = new AbstractAction(getApplication()
+ .getPlain("ExportAsPicture") + "...", getApplication()
+ .getImageIcon("image-x-generic.png")) {
private static final long serialVersionUID = 1L;
- public void actionPerformed(ActionEvent e) {
+ public void actionPerformed(final ActionEvent e) {
try {
- Thread runner = new Thread() {
+ final Thread runner = new Thread() {
@Override
public void run() {
- app.setWaitCursor();
+ getApplication().setWaitCursor();
try {
- app.clearSelectedGeos();
+ getApplication().clearSelectedGeos();
// use reflection for
- JDialog d = new geogebra.export.GraphicExportDialog(
- app);
+ final JDialog d = new geogebra.export.GraphicExportDialog(
+ getApplication(), plotPanelEV);
d.setVisible(true);
- } catch (Exception e) {
+ } catch (final Exception e) {
Application
.debug("GraphicExportDialog not available");
}
- app.setDefaultCursor();
+ getApplication().setDefaultCursor();
}
};
runner.start();
}
- catch (java.lang.NoClassDefFoundError ee) {
- app.showError("ExportJarMissing");
+ catch (final java.lang.NoClassDefFoundError ee) {
+ getApplication().showError("ExportJarMissing");
ee.printStackTrace();
}
}
};
+ /**
+ * Action to export an image of the view to the clipboard.
+ */
AbstractAction drawingPadToClipboardAction = new AbstractAction(
- app.getMenu("CopyToClipboard"), app.getImageIcon("edit-copy.png")) {
+ getApplication().getMenu("CopyToClipboard"), getApplication()
+ .getImageIcon("edit-copy.png")) {
private static final long serialVersionUID = 1L;
- public void actionPerformed(ActionEvent e) {
- app.clearSelectedGeos();
+ public void actionPerformed(final ActionEvent e) {
+ getApplication().clearSelectedGeos();
- Thread runner = new Thread() {
+ final Thread runner = new Thread() {
@Override
public void run() {
- app.setWaitCursor();
- app.copyGraphicsViewToClipboard(plotPanelEV);
- app.setDefaultCursor();
+ getApplication().setWaitCursor();
+ getApplication().copyGraphicsViewToClipboard(plotPanelEV);
+ getApplication().setDefaultCursor();
}
};
runner.start();
@@ -434,22 +538,35 @@ public class PlotPanelEuclidianView extends EuclidianView implements
// Drag and Drop
// =====================================================
- public void dragDropEnd(DragSourceDropEvent e) {
+ protected void enableDnD() {
+ ds = new DragSource();
+ ds.createDefaultDragGestureRecognizer(this, DnDConstants.ACTION_COPY,
+ this);
}
- public void dragEnter(DragSourceDragEvent e) {
+ public void dragDropEnd(final DragSourceDropEvent e) {
+ // clean up selection rectangle
+ plotPanelEV.setSelectionRectangle(null);
+ plotPanelEV.repaint();
}
- public void dragExit(DragSourceEvent e) {
+ public void dragEnter(final DragSourceDragEvent e) {
+ // ignore
}
- public void dragOver(DragSourceDragEvent e) {
+ public void dragExit(final DragSourceEvent e) {
+ // ignore
}
- public void dropActionChanged(DragSourceDragEvent e) {
+ public void dragOver(final DragSourceDragEvent e) {
+ // ignore
}
- public void dragGestureRecognized(DragGestureEvent dge) {
+ public void dropActionChanged(final DragSourceDragEvent e) {
+ // ignore
+ }
+
+ public void dragGestureRecognized(final DragGestureEvent dge) {
if (overDragRegion) {
plotPanelEV.setSelectionRectangle(null);
@@ -460,9 +577,6 @@ public class PlotPanelEuclidianView extends EuclidianView implements
}
- public static final DataFlavor plotPanelFlavor = new DataFlavor(
- PlotPanelEuclidianView.class, "plotPanel");
-
/**
* Extension of Transferable for exporting PlotPanelEV contents
*/
@@ -471,19 +585,19 @@ public class PlotPanelEuclidianView extends EuclidianView implements
private final DataFlavor supportedFlavors[] = { plotPanelFlavor,
DataFlavor.imageFlavor };
- private final String plotPanelIdentifier;
private final Image image;
+ // private final Action act;
+
public TransferablePlotPanel() {
image = plotPanelEV.getExportImage(1d);
- plotPanelIdentifier = "ProbabilityCalculator";
}
public DataFlavor[] getTransferDataFlavors() {
return supportedFlavors;
}
- public boolean isDataFlavorSupported(DataFlavor flavor) {
+ public boolean isDataFlavorSupported(final DataFlavor flavor) {
for (int i = 0; i < supportedFlavors.length; i++) {
if (flavor.equals(supportedFlavors[i])) {
return true;
@@ -492,10 +606,10 @@ public class PlotPanelEuclidianView extends EuclidianView implements
return false;
}
- public Object getTransferData(DataFlavor flavor)
+ public Object getTransferData(final DataFlavor flavor)
throws UnsupportedFlavorException {
if (flavor.equals(plotPanelFlavor)) {
- return plotPanelIdentifier;
+ return exportToEVAction;
}
if (flavor.equals(DataFlavor.imageFlavor)) {
return image;
@@ -504,9 +618,4 @@ public class PlotPanelEuclidianView extends EuclidianView implements
}
}
- @Override
- public int getViewID() {
- return viewID;
- }
-
}
diff --git a/geogebra/gui/view/spreadsheet/statdialog/StatComboPanel.java b/geogebra/gui/view/spreadsheet/statdialog/StatComboPanel.java
index 325704f..693987a 100644
--- a/geogebra/gui/view/spreadsheet/statdialog/StatComboPanel.java
+++ b/geogebra/gui/view/spreadsheet/statdialog/StatComboPanel.java
@@ -1,13 +1,13 @@
package geogebra.gui.view.spreadsheet.statdialog;
import geogebra.euclidian.EuclidianView;
+import geogebra.gui.inputfield.AutoCompleteTextField;
import geogebra.gui.inputfield.MyTextField;
import geogebra.gui.util.GeoGebraIcon;
import geogebra.kernel.AlgoHistogram;
import geogebra.kernel.GeoElement;
import geogebra.kernel.GeoList;
import geogebra.main.Application;
-import geogebra.main.settings.EuclidianSettings;
import geogebra.util.Validation;
import java.awt.BorderLayout;
@@ -95,12 +95,11 @@ StatPanelInterface{
// geos
private GeoList regressionAnalysisList;
private ArrayList<GeoElement> plotGeoList;
-
+
private GeoElement[] boxPlotTitles;
private GeoElement histogram, dotPlot, frequencyPolygon, normalCurve,
- scatterPlot, scatterPlotLine, residualPlot;
-;
-
+ scatterPlot, scatterPlotLine, residualPlot, nqPlot, boxPlot;
+
// display panels
private JPanel displayCardPanel;
@@ -131,8 +130,8 @@ StatPanelInterface{
private JToolBar manualClassesPanel;
private JLabel lblStart;
private JLabel lblWidth;
- private MyTextField fldStart;
- private MyTextField fldWidth;
+ private AutoCompleteTextField fldStart;
+ private AutoCompleteTextField fldWidth;
private JLabel lblNumClasses;
@@ -151,7 +150,7 @@ StatPanelInterface{
private JLabel lblTitleX, lblTitleY;
private MyTextField fldTitleX, fldTitleY;
private FrequencyTable frequencyTable;
-
+
@@ -228,12 +227,9 @@ StatPanelInterface{
}
- // create display panels
- plotPanel = new PlotPanelEuclidianView(app.getKernel());
- addPlotPanelExportMenu(plotPanel);
- //plotPanel.setBorder(BorderFactory.createLineBorder(Color.GRAY));
- //settings.plotPanel = plotPanel;
+ plotPanel = new PlotPanelEuclidianView(app.getKernel(), exportToEVAction);
+
plotPanelNorth = new JPanel();
plotPanelSouth = new JPanel();
@@ -436,10 +432,10 @@ StatPanelInterface{
fldNumClasses.setEditable(false);
fldNumClasses.setOpaque(true);
fldNumClasses.setColumns(2);
- fldNumClasses.setHorizontalAlignment(JTextField.CENTER);
+ fldNumClasses.setHorizontalAlignment(SwingConstants.CENTER);
fldNumClasses.setBackground(Color.WHITE);
- sliderNumClasses = new JSlider(JSlider.HORIZONTAL, 3, 20, numClasses);
+ sliderNumClasses = new JSlider(SwingConstants.HORIZONTAL, 3, 20, numClasses);
Dimension d = sliderNumClasses.getPreferredSize();
d.width = 80;
sliderNumClasses.setPreferredSize(d);
@@ -498,7 +494,7 @@ StatPanelInterface{
lblStart = new JLabel();
lblWidth = new JLabel();
- fldStart = new MyTextField(app);
+ fldStart = new AutoCompleteTextField(4,app);
Dimension d = fldStart.getMaximumSize();
d.height = fldStart.getPreferredSize().height;
fldStart.setMaximumSize(d);
@@ -506,14 +502,14 @@ StatPanelInterface{
fldStart.setText("" + (int)settings.classStart);
fldStart.addFocusListener(this);
- fldWidth = new MyTextField(app);
+ fldWidth = new AutoCompleteTextField(4,app);
fldWidth.setMaximumSize(d);
fldStart.setColumns(4);
fldWidth.setColumns(4);
fldWidth.addActionListener(this);
fldWidth.setText("" + (int)settings.classWidth);
fldWidth.addFocusListener(this);
-
+
manualClassesPanel = new JToolBar();
manualClassesPanel.setFloatable(false);
manualClassesPanel.add(lblStart);
@@ -592,26 +588,18 @@ StatPanelInterface{
// DISPLAY UPDATE
//==============================================
-
+
public void updatePlot(boolean doCreate){
- updatePlot(doCreate, true);
- }
-
- public void updatePlot(boolean doCreate, boolean removeFromConstruction){
GeoList dataListSelected = statDialog.getStatDialogController().getDataSelected();
-
- statGeo.setRemoveFromConstruction(removeFromConstruction);
-
-
- if(!removeFromConstruction){
- statDialog.getStatDialogController().setRegressionGeo();
-
- }
-
-
+
+
+ //if(!statGeo.removeFromConstruction()){
+ //statDialog.getStatDialogController().setRegressionGeo();
+ //}
+
+
GeoElement geo;
- String underConstruction = "\\text{" + app.getPlain("NotAvailable") + "}";
if(hasControlPanel)
((CardLayout)controlCards.getLayout()).show(controlCards, "blankPanel");
@@ -627,7 +615,7 @@ StatPanelInterface{
if(doCreate){
if(histogram != null)
histogram.remove();
- histogram = statGeo.createHistogram( dataListSelected, numClasses, settings, false);
+ histogram = statGeo.createHistogram(dataListSelected, numClasses, settings, false);
plotGeoList.add(histogram);
if(frequencyPolygon != null)
@@ -663,9 +651,12 @@ StatPanelInterface{
break;
case PLOT_BOXPLOT:
- if(doCreate)
- plotGeoList.add(statGeo.createBoxPlot( dataListSelected));
-
+ if(doCreate){
+ if(boxPlot != null)
+ boxPlot.remove();
+ boxPlot = statGeo.createBoxPlot( dataListSelected);
+ plotGeoList.add(boxPlot);
+ }
statGeo.getBoxPlotSettings( dataListSelected, settings);
plotPanel.updateSettings(settings);
((CardLayout)displayCardPanel.getLayout()).show(displayCardPanel, "plotPanel");
@@ -697,7 +688,10 @@ StatPanelInterface{
case PLOT_NORMALQUANTILE:
if(doCreate){
- plotGeoList.add(statGeo.createNormalQuantilePlot( dataListSelected));
+ if(nqPlot != null)
+ nqPlot.remove();
+ nqPlot = statGeo.createNormalQuantilePlot( dataListSelected);
+ plotGeoList.add(nqPlot);
}
statGeo.updateNormalQuantilePlot(dataListSelected, settings);
plotPanel.updateSettings(settings);
@@ -775,7 +769,7 @@ StatPanelInterface{
}
- if(doCreate && removeFromConstruction){
+ if(doCreate && statGeo.removeFromConstruction()){
for(GeoElement listGeo:plotGeoList){
// add the geo to our view and remove it from EV
listGeo.addView(plotPanel.getViewID());
@@ -784,13 +778,13 @@ StatPanelInterface{
app.getEuclidianView().remove(listGeo);
}
}
-
+
if(histogram != null){
histogram.setEuclidianVisible(settings.showHistogram);
- histogram.updateRepaint();
+ histogram.updateRepaint();
}
-
-
+
+
}
@@ -835,7 +829,6 @@ StatPanelInterface{
optionsButton.setSelected(false);
}
-
}
private void doTextFieldActionPerformed(Object source){
@@ -858,7 +851,7 @@ StatPanelInterface{
public void focusGained(FocusEvent e) { }
-
+
public void clearPlotGeoList(){
for(GeoElement geo : plotGeoList){
@@ -870,8 +863,8 @@ StatPanelInterface{
plotGeoList.clear();
}
-
-
+
+
public void removeGeos(){
clearPlotGeoList();
}
@@ -939,7 +932,7 @@ StatPanelInterface{
// ComboBox Renderer with SEPARATOR
//============================================================
- class MyRenderer extends JLabel implements ListCellRenderer {
+ private static class MyRenderer extends JLabel implements ListCellRenderer {
public static final String SEPARATOR = "SEPARATOR";
JSeparator separator;
@@ -947,7 +940,7 @@ StatPanelInterface{
public MyRenderer() {
setOpaque(true);
setBorder(new EmptyBorder(1, 1, 1, 1));
- separator = new JSeparator(JSeparator.HORIZONTAL);
+ separator = new JSeparator(SwingConstants.HORIZONTAL);
}
public Component getListCellRendererComponent(JList list, Object value,
@@ -971,116 +964,147 @@ StatPanelInterface{
- private void addPlotPanelExportMenu(PlotPanelEuclidianView plotPanel){
- AbstractAction exportToEVAction = new AbstractAction(app
- .getMenu("CopyToGraphics"), app
- .getImageIcon("edit-copy.png")) {
- private static final long serialVersionUID = 1L;
+ // **********************************************
+ // Export
+ // **********************************************
- public void actionPerformed(ActionEvent e) {
- if(app.getShiftDown())
- exportGeosToEV(Application.VIEW_EUCLIDIAN2);
- else
- exportGeosToEV(Application.VIEW_EUCLIDIAN);
+ /**
+ * Action to export all GeoElements that are currently displayed in this
+ * panel to a EuclidianView. The viewID for the target EuclidianView is
+ * stored as a property with key "euclidianViewID".
+ *
+ * This action is passed as a parameter to plotPanel where it is used in
+ * the plotPanel context menu and the EuclidianView transfer handler
+ * when the plot panel is dragged into an EV.
+ */
+ AbstractAction exportToEVAction = new AbstractAction() {
+ private static final long serialVersionUID = 1L;
+ public void actionPerformed(ActionEvent event){
+ Integer euclidianViewID = (Integer) this.getValue("euclidianViewID");
+
+ // if null ID then use EV1 unless shift is down, then use EV2
+ if(euclidianViewID == null){
+ euclidianViewID = app.getShiftDown()? app.getEuclidianView2().getViewID() : app.getEuclidianView().getViewID();
}
- };
- plotPanel.appendActionList(exportToEVAction);
- }
+ // do the export
+ exportGeosToEV(euclidianViewID);
+ // null out the ID property
+ this.putValue("euclidianViewID", null);
+ }
+ };
+
+
+
+ /**
+ * Exports all GeoElements that are currently displayed in this panel to a
+ * target EuclidianView.
+ *
+ * @param euclidianViewID
+ * viewID of the target EuclidianView
+ */
+ public void exportGeosToEV(int euclidianViewID){
- public void exportGeosToEV(int viewID){
+ // TODO:
+ // in multivar mode create dynamic boxplots linked to separate lists
app.setWaitCursor();
- ArrayList<GeoElement> newGeoList = new ArrayList<GeoElement>();
- String expr;
+ //app.storeUndoInfo();
+ GeoElement regressionCopy = null;
+ EuclidianView targetEV = (EuclidianView) app.getView(euclidianViewID);
try {
- app.storeUndoInfo();
- // prepare the data list to display in the EV (e.g. set labels, auxiliary = false)
- GeoList dataListSelected = statDialog.getStatDialogController().getDataSelected();
- prepareGeoForEV(dataListSelected, viewID);
-
+ // =================================================================
+ // Step 1:
+ // Update the plot geos with the reomoveFromConstruction
+ // flag set to false. This ensures that the display geos have been
+ // put in the construction list and will be saved to xml.
+ // =================================================================
+
+ statGeo.setRemoveFromConstruction(false);
+ updatePlot(true);
- // update the plot to get a new set of geos that exist in the construction
- updatePlot(true, false);
+ // =================================================================
+ // Step 2:
+ // Prepare the geos for display in the currently active EV
+ // (set labels, make visible, etc).
+ // =================================================================
// remove the histogram from the plot geo list if it is not showing
- if(histogram != null && settings.showHistogram == false){
+ if (histogram != null && settings.showHistogram == false) {
plotGeoList.remove(histogram);
histogram.remove();
histogram = null;
}
- // prepare the new geos to display in the EV (e.g. set labels, auxiliary = false)
- for(GeoElement geo: plotGeoList){
- prepareGeoForEV(geo, viewID);
+ // prepare all display geos to appear in the EV
+ for (GeoElement geo : plotGeoList) {
+ prepareGeoForEV(geo, euclidianViewID);
}
-
- GeoElement regressionCopy = null;
- if(statDialog.getMode() == StatDialog.MODE_REGRESSION
- && statDialog.getRegressionMode() != StatDialog.REG_NONE)
- {
- regressionCopy = (GeoElement)statGeo.createRegressionPlot((GeoList) dataListSelected,
- statDialog.getRegressionMode(), statDialog.getRegressionOrder(), false);
- prepareGeoForEV(regressionCopy, viewID);
+
+ // the regression geo is maintained by StatDialog, so we create a
+ // copy and prepare this for the EV
+ if (statDialog.getMode() == StatDialog.MODE_REGRESSION
+ && statDialog.getRegressionMode() != StatDialog.REG_NONE) {
+
+ regressionCopy = statGeo.createRegressionPlot(
+ (GeoList) scatterPlot, statDialog.getRegressionMode(),
+ statDialog.getRegressionOrder(), false);
+ prepareGeoForEV(regressionCopy, euclidianViewID);
}
- // set the window dimensions of the target EV to match the plotPanel dimensions
- EuclidianView ev = (EuclidianView) app.getView(viewID);
- ev.setRealWorldCoordSystem(settings.xMin, settings.xMax, settings.yMin, settings.yMax);
- ev.setAutomaticAxesNumberingDistance(settings.xAxesIntervalAuto, 0);
- ev.setAutomaticAxesNumberingDistance(settings.yAxesIntervalAuto, 1);
- if(!settings.xAxesIntervalAuto){
- ev.setAxesNumberingDistance(settings.xAxesInterval, 0);
+ // =================================================================
+ // Step 3:
+ // Adjust the target EV window to match the plotPanel dimensions
+ // =================================================================
+
+ targetEV.setRealWorldCoordSystem(settings.xMin, settings.xMax,
+ settings.yMin, settings.yMax);
+ targetEV.setAutomaticAxesNumberingDistance(
+ settings.xAxesIntervalAuto, 0);
+ targetEV.setAutomaticAxesNumberingDistance(
+ settings.yAxesIntervalAuto, 1);
+ if (!settings.xAxesIntervalAuto) {
+ targetEV.setAxesNumberingDistance(settings.xAxesInterval, 0);
}
- if(!settings.yAxesIntervalAuto){
- ev.setAxesNumberingDistance(settings.yAxesInterval, 1);
+ if (!settings.yAxesIntervalAuto) {
+ targetEV.setAxesNumberingDistance(settings.yAxesInterval, 1);
}
- ev.updateBackground();
-
+ targetEV.updateBackground();
+
+ // =================================================================
+ // Step 4:
+ // Dereference the geos from fields in this class and the StatDialog
+ // =================================================================
- // null our display geos and clear the plotGeoList to unlink the new geos
+ // null the display geos
boxPlotTitles = null;
histogram = null;
dotPlot = null;
frequencyPolygon = null;
- normalCurve = null;
+ normalCurve = null;
scatterPlotLine = null;
-
- if(scatterPlot != null){
- scatterPlot.remove(); // dataListSelected already gives the scatterplot
- scatterPlot = null;
- }
-
- if(residualPlot != null){
- residualPlot = null;
- regressionCopy.remove();
- dataListSelected.setEuclidianVisible(false); // hide the dataListSelected scatterplot
- dataListSelected.updateRepaint();
-
- }
-
-
- //TODO: in multivar mode create dynamic boxplots linked to separate lists
- if(statDialog.getMode() == StatDialog.MODE_MULTIVAR){
- dataListSelected.remove();
- }
-
-
- plotGeoList.clear();
+ scatterPlot = null;
+ nqPlot = null;
+ boxPlot = null;
-
statDialog.getStatDialogController().removeRegressionGeo();
statDialog.getStatDialogController().removeDataListSelected();
+ plotGeoList.clear();
+
+ // =================================================================
+ // Step 5:
+ // Reload the data and create new display geos that are not
+ // in the construction list.
+ // =================================================================
+
statDialog.getStatDialogController().loadDataLists();
-
- //update the plot in removeFromConstruction mode to get a new set of geos for our plot
- updatePlot(true, true);
-
+ statGeo.setRemoveFromConstruction(true);
+ updatePlot(true);
} catch (Exception e) {
e.printStackTrace();
@@ -1088,20 +1112,29 @@ StatPanelInterface{
}
app.setDefaultCursor();
+ app.storeUndoInfo();
}
-
- private void prepareGeoForEV(GeoElement geo, int viewID){
+
+ /**
+ * Prepares the specified GeoElement for visibility in a target
+ * EuclidianView.
+ *
+ * @param geo
+ * @param euclidianViewID
+ * viewID of the target EuclidianView
+ */
+ private static void prepareGeoForEV(GeoElement geo, int euclidianViewID){
geo.setLabel(null);
geo.setEuclidianVisible(true);
geo.setAuxiliaryObject(false);
- if(viewID == Application.VIEW_EUCLIDIAN){
+ if(euclidianViewID == Application.VIEW_EUCLIDIAN){
geo.addView(Application.VIEW_EUCLIDIAN);
geo.removeView(Application.VIEW_EUCLIDIAN2);
geo.update();
}
- if(viewID == Application.VIEW_EUCLIDIAN2){
+ if(euclidianViewID == Application.VIEW_EUCLIDIAN2){
geo.addView(Application.VIEW_EUCLIDIAN2);
geo.removeView(Application.VIEW_EUCLIDIAN);
geo.update();
diff --git a/geogebra/gui/view/spreadsheet/statdialog/StatDialog.java b/geogebra/gui/view/spreadsheet/statdialog/StatDialog.java
index 34a40d5..efd6aab 100644
--- a/geogebra/gui/view/spreadsheet/statdialog/StatDialog.java
+++ b/geogebra/gui/view/spreadsheet/statdialog/StatDialog.java
@@ -72,13 +72,13 @@ SpecialNumberFormatInterface {
public static final Color NQPLOT_COLOR = GeoGebraColorConstants.GRAY5;
public static final Color REGRESSION_COLOR = Color.RED;
public static final Color OVERLAY_COLOR = GeoGebraColorConstants.DARKBLUE;
-
+
public static final float opacityBarChart = 0.3f;
public static final int thicknessCurve = 4;
public static final int thicknessBarChart = 3;
-
-
-
+
+
+
// regression types
public static final int REG_NONE = 0;
@@ -191,16 +191,6 @@ SpecialNumberFormatInterface {
statisticsPanel.setBorder(BorderFactory.createEmptyBorder(4, 2, 2, 2));
- // Create DataPanel to display the current data set(s) and allow
- // temporary editing.
- if(mode != MODE_MULTIVAR){
- dataPanel = new DataPanel(app, this, sdc.getDataAll(), mode);
- //dataPanel.setBorder(BorderFactory.createLineBorder(Color.GRAY));
- dataPanel.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
- }
-
-
-
// Init the GUI and attach this view to the kernel
initGUI();
@@ -215,7 +205,18 @@ SpecialNumberFormatInterface {
}
+ // Create DataPanel to display the current data set(s) and allow
+ // temporary editing.
+ protected DataPanel getDataPanel(){
+ if(dataPanel == null && mode != MODE_MULTIVAR){
+ dataPanel = new DataPanel(app, this);
+ dataPanel.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
+ }
+
+ return dataPanel;
+
+ }
//=================================================
// GUI
@@ -410,7 +411,7 @@ SpecialNumberFormatInterface {
public int getPrintDecimals(){
return nf.getPrintDecimals();
}
-
+
public int getPrintFigures(){
return nf.getPrintFigures();
}
@@ -821,19 +822,19 @@ SpecialNumberFormatInterface {
public int getViewID() {
return Application.VIEW_NONE;
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
}
diff --git a/geogebra/gui/view/spreadsheet/statdialog/StatDialogController.java b/geogebra/gui/view/spreadsheet/statdialog/StatDialogController.java
index 2656a71..42b7d21 100644
--- a/geogebra/gui/view/spreadsheet/statdialog/StatDialogController.java
+++ b/geogebra/gui/view/spreadsheet/statdialog/StatDialogController.java
@@ -1,494 +1,493 @@
-package geogebra.gui.view.spreadsheet.statdialog;
-
-import geogebra.gui.view.spreadsheet.CellRange;
-import geogebra.gui.view.spreadsheet.CellRangeProcessor;
-import geogebra.gui.view.spreadsheet.MyTable;
-import geogebra.gui.view.spreadsheet.RelativeCopy;
-import geogebra.gui.view.spreadsheet.SpreadsheetView;
-import geogebra.kernel.AlgoDependentList;
-import geogebra.kernel.Construction;
-import geogebra.kernel.GeoElement;
-import geogebra.kernel.GeoFunction;
-import geogebra.kernel.GeoList;
-import geogebra.kernel.Kernel;
-import geogebra.kernel.arithmetic.NumberValue;
-import geogebra.main.Application;
-
-import java.awt.Point;
-import java.util.ArrayList;
-
-import org.apache.commons.math.stat.descriptive.SummaryStatistics;
-import org.apache.commons.math.util.MultidimensionalCounter.Iterator;
-
-public class StatDialogController {
-
-
- private Application app;
- private Kernel kernel;
- private Construction cons;
- private MyTable spreadsheetTable;
- private SpreadsheetView spView;
- private StatDialog sd;
- private StatGeo statGeo;
-
- private Object dataSource;
- private GeoList dataAll, dataSelected;
-
-
- public GeoList getDataAll() {
- return dataAll;
- }
-
- public GeoList getDataSelected() {
- return dataSelected;
- }
-
- private GeoElement geoRegression;
-
- private int mode;
- private boolean leftToRight = true;
- public void setLeftToRight(boolean leftToRight) {
- this.leftToRight = leftToRight;
- }
-
- public GeoElement getRegressionModel() {
- return geoRegression;
- }
- public void setRegressionModel(GeoFunction regressionModel) {
- this.geoRegression = regressionModel;
- }
-
-
-
- public StatDialogController(Application app, SpreadsheetView spView, StatDialog statDialog){
-
- this.app = app;
- this.kernel = app.getKernel();
- this.cons = kernel.getConstruction();
- this.spView = spView;
- this.spreadsheetTable = spView.getTable();
- this.sd = statDialog;
- this.mode = sd.getMode();
- this.statGeo = sd.getStatGeo();
-
- }
-
-
- /**
- * Sets the data source. Returns false if data is invalid. Data may come
- * from either a selected GeoList or the currently selected spreadsheet cell
- * range.
- */
- protected boolean setDataSource(){
-
- dataSource = null;
- CellRangeProcessor cr = spreadsheetTable.getCellRangeProcessor();
- boolean success = true;
-
- try {
- GeoElement geo = app.getSelectedGeos().get(0);
- if(geo.isGeoList()){
- // TODO: handle validation for a geoList source
- dataSource = geo;
- } else {
- ArrayList<CellRange> rangeList = spreadsheetTable.selectedCellRanges;
- if(mode == StatDialog.MODE_ONEVAR){
- success = cr.isOneVarStatsPossible(rangeList);
- }
- else if(mode == StatDialog.MODE_REGRESSION){
- success = cr.isCreatePointListPossible(rangeList);
- }
- else if(mode == StatDialog.MODE_MULTIVAR){
- success = cr.isMultiVarStatsPossible(rangeList);
- }
-
- if(success)
- dataSource = (ArrayList<CellRange>) rangeList.clone();
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- success = false;
- }
-
- return success;
- }
-
-
-
- /**
- * Returns true if the current data source contains the specified GeoElement
- */
- protected boolean isInDataSource(GeoElement geo){
-
- if(dataSource == null) return false;
-
- // TODO handle case of GeoList data source
- if(dataSource instanceof GeoList){
- return geo.equals(((GeoList)dataSource));
- }else{
-
- Point location = geo.getSpreadsheetCoords();
- boolean isCell = (location != null && location.x < SpreadsheetView.MAX_COLUMNS && location.y < SpreadsheetView.MAX_ROWS);
-
- if(isCell){
- //Application.debug("---------> is cell:" + geo.toString());
- for(CellRange cr: (ArrayList<CellRange>)dataSource)
- if(cr.contains(geo)) return true;
-
- //Application.debug("---------> is not in data source:" + geo.toString());
- }
- }
-
- return false;
- }
-
-
- /**
- * Copies values from the current DataSource into the GeoList dataListAll
- * and then stores references to these values in the GeoList dataListSelected.
- */
- protected void loadDataLists(){
-
- if(dataSource == null) return;
-
- CellRangeProcessor crProcessor = spreadsheetTable.getCellRangeProcessor();
- String text = "";
-
- boolean scanByColumn = true;
- //boolean isSorted = false;
- boolean copyByValue = true;
- boolean doStoreUndo = false;
- boolean isSorted = false;
- boolean doCreateFreePoints = false;
-
-
- //=======================================
- // create/update dataListAll
- if(dataAll != null) dataAll.remove();
-
- if(dataSource instanceof GeoList){
- //dataListAll = dataSource;
- text = ((GeoList)dataSource).getLabel();
- //if(isSorted)
- // text = "Sort[" + text + "]";
-
- }else{
-
- ArrayList<CellRange> cellRangeList = (ArrayList<CellRange>) dataSource;
- switch (mode){
-
- case StatDialog.MODE_ONEVAR:
- dataAll = (GeoList) crProcessor.createList(
- cellRangeList,
- scanByColumn,
- copyByValue,
- false,
- doStoreUndo,
- GeoElement.GEO_CLASS_NUMERIC, false);
-
- break;
-
- case StatDialog.MODE_REGRESSION:
-
- if( cellRangeList.size()==1 && cellRangeList.get(0).isPointList()){
- dataAll = (GeoList) crProcessor.createList(
- cellRangeList,
- scanByColumn,
- copyByValue,
- isSorted,
- doStoreUndo,
- GeoElement.GEO_CLASS_POINT, false);
- }
-
- else{
-
- dataAll = (GeoList) crProcessor.createPointGeoList(
- cellRangeList,
- copyByValue,
- leftToRight,
- isSorted,
- doStoreUndo,
- doCreateFreePoints);
- }
- break;
-
- case StatDialog.MODE_MULTIVAR:
- cons.setSuppressLabelCreation(true);
- dataAll = crProcessor.createCollectionList((ArrayList<CellRange>)dataSource, true);
- cons.setSuppressLabelCreation(false);
- break;
-
- }
- }
-
-
- //=======================================
- // create/update dataListSelected
-
- if(dataSelected == null){
- cons.setSuppressLabelCreation(true);
- dataSelected = new GeoList(cons);
- cons.setSuppressLabelCreation(false);
- }
-
-
- try {
- dataSelected.clear();
- for(int i=0; i<dataAll.size(); ++i)
- dataSelected.add(dataAll.get(i));
- }
- catch (Exception e) {
- e.printStackTrace();
- }
-
- if( !sd.isIniting && sd.dataPanel != null){
- sd.dataPanel.updateDataTable(this.dataAll);
- }
-
- }
-
-
-
- /**
- * Add/remove elements from the selected data list.
- * Called by the data panel on checkbox click.
- */
- public void updateSelectedDataList(int index, boolean doAdd) {
-
- GeoElement geo = dataAll.get(index);
-
- if(doAdd){
- dataSelected.add(geo);
- }else{
- dataSelected.remove(geo);
- }
-
- dataSelected.updateCascade();
- updateAllStatPanels(false);
- if(sd.regressionPanel != null)
- sd.regressionPanel.updateRegressionPanel();
- //Application.debug("updateSelectedList: " + index + doAdd);
-
- }
-
-
- /**
- * Gets the data titles from the source cells.
- */
- public String[] getDataTitles(){
-
- if(dataSource == null) return null;
-
- CellRangeProcessor cellRangeProc = spreadsheetTable.getCellRangeProcessor();
- String[] title = null;
-
- switch(mode){
-
- case StatDialog.MODE_ONEVAR:
-
- title = new String[1];
-
- if(dataSource instanceof GeoList){
- title[0] = ((GeoList) dataSource).getLabel();
-
- }else{
-
- CellRange range = ((ArrayList<CellRange>)dataSource).get(0);
- if(range.isColumn()) {
- GeoElement geo = RelativeCopy.getValue(spreadsheetTable, range.getMinColumn(), range.getMinRow());
- if(geo != null && geo.isGeoText())
- title[0] = geo.toDefinedValueString();
- else
- title[0]= app.getCommand("Column") + " " +
- GeoElement.getSpreadsheetColumnName(range.getMinColumn());
-
- }else{
- title[0] = app.getMenu("Untitled");
- }
- }
-
- break;
-
- case StatDialog.MODE_REGRESSION:
- if(dataSource instanceof GeoList){
- //TODO -- handle geolist data source titles
- //title[0] = ((GeoList) dataSource).getLabel();
- }else{
- title = cellRangeProc.getPointListTitles((ArrayList<CellRange>)dataSource, leftToRight);
- }
- break;
-
- case StatDialog.MODE_MULTIVAR:
- if(dataSource instanceof GeoList){
- //TODO -- handle geolist data source titles
- //title[0] = ((GeoList) dataSource).getLabel();
- }else{
-
- // data is in a single cell range
- if(((ArrayList<CellRange>)dataSource).size() == 1)
- {
- CellRange cr = ((ArrayList<CellRange>)dataSource).get(0);
- title = new String[cr.getMaxColumn() - cr.getMinColumn()+1];
- for(int i = 0; i < title.length; i++){
- CellRange cr2 = new CellRange(spreadsheetTable,
- cr.getMinColumn()+i,
- cr.getMinRow(),
- cr.getMinColumn()+i,
- cr.getMaxRow() );
-
- title[i] = cellRangeProc.getCellRangeString(cr2);
- }
- }
-
- // data is in columns
- else
- {
- title = cellRangeProc.getColumnTitles((ArrayList<CellRange>)dataSource);
- }
- }
- break;
-
- }
-
- return title;
- }
-
-
- public void swapXY(){
- leftToRight = !leftToRight;
- updateDialog(false);
- }
-
-
-
- public void updateDialog(boolean doSetDataSource){
-
- removeStatGeos();
- boolean hasValidDataSource = doSetDataSource? setDataSource() : true;
- if(dataSource == null) return;
-
- if(hasValidDataSource){
- loadDataLists();
-
- updateAllStatPanels(true);
-
- if(mode == StatDialog.MODE_REGRESSION){
- setRegressionGeo();
- if(sd.regressionPanel != null)
- sd.regressionPanel.updateRegressionPanel();
- }
- }else{
- //TODO --- handle bad data
- }
-
- }
-
- public void updateAllStatPanels(boolean doCreateGeo){
-
- sd.comboStatPanel.updatePlot(doCreateGeo);
- if(sd.comboStatPanel2 != null)
- sd.comboStatPanel2.updatePlot(doCreateGeo);
- sd.statisticsPanel.updatePanel();
-
- }
-
-
-
-
- protected void handleRemovedDataGeo(GeoElement geo){
-
- //System.out.println("removed: " + geo.toString());
- if (isInDataSource(geo)) {
- //System.out.println("stat dialog removed: " + geo.toString());
- //removeStatGeos();
- dataSource = null;
- updateDialog(false);
- }
-
- }
-
-
-
- public void setRegressionGeo(){
-
- if(geoRegression != null){
- geoRegression.remove();
- }
-
- geoRegression = (GeoElement)statGeo.createRegressionPlot(dataSelected, sd.getRegressionMode(), sd.getRegressionOrder(), false);
-
- updateAllStatPanels(true);
- }
-
- public void removeRegressionGeo(){
- if(geoRegression != null)
- removeStatGeo(geoRegression);
- }
-
- public void removeDataListSelected(){
- dataSelected = null;
- }
-
-
- /**
- * Removes all geos maintained by this dialog and its child components
- */
- public void removeStatGeos(){
-
- removeStatGeo(dataAll);
- removeStatGeo(dataSelected);
- removeStatGeo(geoRegression);
-
- if(sd.comboStatPanel != null)
- sd.comboStatPanel.removeGeos();
-
- if(sd.comboStatPanel2 != null)
- sd.comboStatPanel2.removeGeos();
-
- }
-
- private void removeStatGeo(GeoElement statGeo){
- if(statGeo != null){
- statGeo.remove();
- statGeo = null;
- }
- }
-
-
- public SummaryStatistics getSummaryStatistics(GeoList dataList){
-
- SummaryStatistics stats = new SummaryStatistics();
- for (int i=0; i < dataList.size(); i++) {
- GeoElement geo = dataList.get(i);
- if (geo.isNumberValue()) {
- NumberValue num = (NumberValue) geo;
- stats.addValue(num.getDouble());
- }
- }
- return stats;
- }
-
-
-
- public double[] getValueArray(GeoList dataList){
- ArrayList<Double> list = new ArrayList<Double>();
- for (int i=0; i < dataList.size(); i++) {
- GeoElement geo = dataList.get(i);
- if (geo.isNumberValue()) {
- NumberValue num = (NumberValue) geo;
- list.add(num.getDouble());
- }
- }
- double[] val = new double[list.size()];
- for (int i=0; i < list.size(); i++)
- val[i] = list.get(i);
-
- return val;
- }
-
-
-
-
-
-}
+package geogebra.gui.view.spreadsheet.statdialog;
+
+import geogebra.gui.view.spreadsheet.CellRange;
+import geogebra.gui.view.spreadsheet.CellRangeProcessor;
+import geogebra.gui.view.spreadsheet.MyTable;
+import geogebra.gui.view.spreadsheet.RelativeCopy;
+import geogebra.gui.view.spreadsheet.SpreadsheetView;
+import geogebra.kernel.Construction;
+import geogebra.kernel.GeoElement;
+import geogebra.kernel.GeoFunction;
+import geogebra.kernel.GeoList;
+import geogebra.kernel.Kernel;
+import geogebra.kernel.arithmetic.NumberValue;
+import geogebra.main.Application;
+
+import java.awt.Point;
+import java.util.ArrayList;
+
+import org.apache.commons.math.stat.descriptive.SummaryStatistics;
+
+/**
+ * Class to control data management for StatDialog.
+ *
+ * @author G. Sturr
+ *
+ */
+public class StatDialogController {
+
+ private Application app;
+ private Kernel kernel;
+ private Construction cons;
+ private MyTable spreadsheetTable;
+ private SpreadsheetView spView;
+ private StatDialog sd;
+ private StatGeo statGeo;
+
+ private Object dataSource;
+
+ private ArrayList<GeoElement> dataArray;
+ public ArrayList<GeoElement> getDataArray() {
+ return dataArray;
+ }
+
+ private GeoList dataSelected;
+ public GeoList getDataSelected() {
+ return dataSelected;
+ }
+
+
+ private int mode;
+ private boolean leftToRight = true;
+ public void setLeftToRight(boolean leftToRight) {
+ this.leftToRight = leftToRight;
+ }
+
+ private GeoElement geoRegression;
+ public GeoElement getRegressionModel() {
+ return geoRegression;
+ }
+ public void setRegressionModel(GeoFunction regressionModel) {
+ this.geoRegression = regressionModel;
+ }
+
+
+ /****************************************************
+ * Constructs a StatDialogController
+ * @param app
+ * @param spView
+ * @param statDialog
+ */
+ public StatDialogController(Application app, SpreadsheetView spView, StatDialog statDialog){
+
+ this.app = app;
+ this.kernel = app.getKernel();
+ this.cons = kernel.getConstruction();
+ this.spView = spView;
+ this.spreadsheetTable = spView.getTable();
+ this.sd = statDialog;
+ this.mode = sd.getMode();
+ this.statGeo = sd.getStatGeo();
+
+ }
+
+
+ /**
+ * Sets the data source. Returns false if data is invalid. Data may come
+ * from either a selected GeoList or the currently selected spreadsheet cell
+ * range.
+ */
+ protected boolean setDataSource(){
+
+ dataSource = null;
+ CellRangeProcessor cr = spreadsheetTable.getCellRangeProcessor();
+ boolean success = true;
+
+ try {
+ GeoElement geo = app.getSelectedGeos().get(0);
+ if(geo.isGeoList()){
+ // TODO: handle validation for a geoList source
+ dataSource = geo;
+ } else {
+ ArrayList<CellRange> rangeList = spreadsheetTable.selectedCellRanges;
+ if(mode == StatDialog.MODE_ONEVAR){
+ success = cr.isOneVarStatsPossible(rangeList);
+ }
+ else if(mode == StatDialog.MODE_REGRESSION){
+ success = cr.isCreatePointListPossible(rangeList);
+ }
+ else if(mode == StatDialog.MODE_MULTIVAR){
+ success = cr.isMultiVarStatsPossible(rangeList);
+ }
+
+ if(success)
+ dataSource = (ArrayList<CellRange>) rangeList.clone();
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ success = false;
+ }
+
+ return success;
+ }
+
+
+
+ /**
+ * Returns true if the current data source contains the specified GeoElement
+ */
+ protected boolean isInDataSource(GeoElement geo){
+
+ if(dataSource == null) return false;
+
+ // TODO handle case of GeoList data source
+ if(dataSource instanceof GeoList){
+ return geo.equals(((GeoList)dataSource));
+ }else{
+
+ Point location = geo.getSpreadsheetCoords();
+ boolean isCell = (location != null && location.x < SpreadsheetView.MAX_COLUMNS && location.y < SpreadsheetView.MAX_ROWS);
+
+ if(isCell){
+ //Application.debug("---------> is cell:" + geo.toString());
+ for(CellRange cr: (ArrayList<CellRange>)dataSource)
+ if(cr.contains(geo)) return true;
+
+ //Application.debug("---------> is not in data source:" + geo.toString());
+ }
+ }
+
+ return false;
+ }
+
+
+ /**
+ * Loads references to GeoElements contained in the field dataSource into the
+ * GeoList field dataListSelected and the ArrayList field dataArray.
+ */
+ protected void loadDataLists(){
+
+ if(dataSource == null) return;
+
+ CellRangeProcessor crProcessor = spreadsheetTable.getCellRangeProcessor();
+
+ boolean scanByColumn = true;
+ boolean copyByValue = false;
+ boolean doStoreUndo = false;
+ boolean isSorted = false;
+ boolean doCreateFreePoints = false;
+ boolean setLabel = false;
+
+
+ //=======================================
+ // create/update dataListAll
+ if(dataSelected != null) dataSelected.remove();
+
+ //TODO: handle dataSource of type geoList
+ if(dataSource instanceof GeoList){
+
+
+ }else{
+
+ ArrayList<CellRange> cellRangeList = (ArrayList<CellRange>) dataSource;
+ switch (mode){
+
+ case StatDialog.MODE_ONEVAR:
+ dataSelected = (GeoList) crProcessor.createList(
+ cellRangeList,
+ scanByColumn,
+ copyByValue,
+ isSorted,
+ doStoreUndo,
+ GeoElement.GEO_CLASS_NUMERIC, setLabel);
+
+ break;
+
+ case StatDialog.MODE_REGRESSION:
+
+ // data is a cell range of points
+ if( cellRangeList.size()==1 && cellRangeList.get(0).isPointList()){
+ dataSelected = (GeoList) crProcessor.createList(
+ cellRangeList,
+ scanByColumn,
+ copyByValue,
+ isSorted,
+ doStoreUndo,
+ GeoElement.GEO_CLASS_POINT, setLabel);
+ }
+
+ // data is from two cell ranges of numbers that must be converted to points
+ else{
+ dataSelected = crProcessor.createPointGeoList(
+ cellRangeList,
+ copyByValue,
+ leftToRight,
+ isSorted,
+ doStoreUndo,
+ doCreateFreePoints);
+ }
+ break;
+
+ case StatDialog.MODE_MULTIVAR:
+ cons.setSuppressLabelCreation(true);
+ dataSelected = crProcessor.createCollectionList((ArrayList<CellRange>)dataSource, true, false);
+ cons.setSuppressLabelCreation(false);
+ break;
+
+ }
+ }
+
+
+ // create and update dataArray (list of all geos contained in dataSelected)
+
+ if(dataSelected != null){
+
+ if(dataArray == null)
+ dataArray = new ArrayList<GeoElement>();
+
+ dataArray.clear();
+ for(int i=0; i<dataSelected.size(); i++){
+ dataArray.add(i,dataSelected.get(i));
+ }
+ }
+
+ // load dataPanel with dataArray
+ if(mode != StatDialog.MODE_MULTIVAR){
+ sd.getDataPanel().loadDataTable(dataArray);
+ }
+
+ }
+
+
+
+ /**
+ * Add/remove elements from the selected data list.
+ * Called by the data panel on checkbox click.
+ */
+ public void updateSelectedDataList(int index, boolean doAdd) {
+
+ GeoElement geo = dataArray.get(index);
+
+ if(doAdd){
+ dataSelected.add(geo);
+ }else{
+ dataSelected.remove(geo);
+ }
+
+ dataSelected.updateCascade();
+ updateAllStatPanels(false);
+ if(sd.regressionPanel != null)
+ sd.regressionPanel.updateRegressionPanel();
+ //Application.debug("updateSelectedList: " + index + doAdd);
+
+ }
+
+
+ /**
+ * Gets the data titles from the source cells.
+ *
+ * @return String array of data titles
+ */
+ public String[] getDataTitles(){
+
+ if(dataSource == null) return null;
+
+ CellRangeProcessor cellRangeProc = spreadsheetTable.getCellRangeProcessor();
+ String[] title = null;
+
+ switch(mode){
+
+ case StatDialog.MODE_ONEVAR:
+
+ title = new String[1];
+
+ if(dataSource instanceof GeoList){
+ title[0] = ((GeoList) dataSource).getLabel();
+
+ }else{
+
+ CellRange range = ((ArrayList<CellRange>)dataSource).get(0);
+ if(range.isColumn()) {
+ GeoElement geo = RelativeCopy.getValue(app.getGuiManager().getSpreadsheetView().getTable(), range.getMinColumn(), range.getMinRow());
+ if(geo != null && geo.isGeoText())
+ title[0] = geo.toDefinedValueString();
+ else
+ title[0]= app.getCommand("Column") + " " +
+ GeoElement.getSpreadsheetColumnName(range.getMinColumn());
+
+ }else{
+ title[0] = app.getMenu("Untitled");
+ }
+ }
+
+ break;
+
+ case StatDialog.MODE_REGRESSION:
+ if(dataSource instanceof GeoList){
+ //TODO -- handle geolist data source titles
+ //title[0] = ((GeoList) dataSource).getLabel();
+ }else{
+ title = cellRangeProc.getPointListTitles((ArrayList<CellRange>)dataSource, leftToRight);
+ }
+ break;
+
+ case StatDialog.MODE_MULTIVAR:
+ if(dataSource instanceof GeoList){
+ //TODO -- handle geolist data source titles
+ //title[0] = ((GeoList) dataSource).getLabel();
+ }else{
+
+ // data is in a single cell range
+ if(((ArrayList<CellRange>)dataSource).size() == 1)
+ {
+ CellRange cr = ((ArrayList<CellRange>)dataSource).get(0);
+ title = new String[cr.getMaxColumn() - cr.getMinColumn()+1];
+ for(int i = 0; i < title.length; i++){
+ CellRange cr2 = new CellRange(app.getGuiManager().getSpreadsheetView().getTable(),
+ cr.getMinColumn()+i,
+ cr.getMinRow(),
+ cr.getMinColumn()+i,
+ cr.getMaxRow() );
+
+ title[i] = cellRangeProc.getCellRangeString(cr2);
+ }
+ }
+
+ // data is in columns
+ else
+ {
+ title = cellRangeProc.getColumnTitles((ArrayList<CellRange>)dataSource);
+ }
+ }
+ break;
+
+ }
+
+ return title;
+ }
+
+
+
+ public void swapXY(){
+ leftToRight = !leftToRight;
+ updateDialog(false);
+ }
+
+
+ public void updateDialog(boolean doSetDataSource){
+
+ removeStatGeos();
+ boolean hasValidDataSource = doSetDataSource? setDataSource() : true;
+ if(dataSource == null) return;
+
+ if(hasValidDataSource){
+ loadDataLists();
+
+ updateAllStatPanels(true);
+
+ if(mode == StatDialog.MODE_REGRESSION){
+ setRegressionGeo();
+ if(sd.regressionPanel != null)
+ sd.regressionPanel.updateRegressionPanel();
+ }
+ }else{
+ //TODO --- handle bad data
+ }
+
+ }
+
+ public void updateAllStatPanels(boolean doCreateGeo){
+
+ sd.comboStatPanel.updatePlot(doCreateGeo);
+ if(sd.comboStatPanel2 != null)
+ sd.comboStatPanel2.updatePlot(doCreateGeo);
+ sd.statisticsPanel.updatePanel();
+
+ }
+
+
+ protected void handleRemovedDataGeo(GeoElement geo){
+
+ //System.out.println("removed: " + geo.toString());
+ if (isInDataSource(geo)) {
+ //System.out.println("stat dialog removed: " + geo.toString());
+ //removeStatGeos();
+ dataSource = null;
+ updateDialog(false);
+ }
+
+ }
+
+
+
+ public void setRegressionGeo(){
+
+ if(geoRegression != null){
+ geoRegression.remove();
+ }
+
+ geoRegression = (GeoElement)statGeo.createRegressionPlot(dataSelected, sd.getRegressionMode(), sd.getRegressionOrder(), false);
+
+ updateAllStatPanels(true);
+ }
+
+ public void removeRegressionGeo(){
+ if(geoRegression != null)
+ removeStatGeo(geoRegression);
+ }
+
+ public void removeDataListSelected(){
+ dataSelected = null;
+ }
+
+
+ /**
+ * Removes all geos maintained by this dialog and its child components
+ */
+ public void removeStatGeos(){
+
+ removeStatGeo(dataSelected);
+ removeStatGeo(geoRegression);
+
+ if(sd.comboStatPanel != null) {
+ sd.comboStatPanel.removeGeos();
+ }
+
+ if(sd.comboStatPanel2 != null) {
+ sd.comboStatPanel2.removeGeos();
+ }
+ }
+
+ private static void removeStatGeo(GeoElement statGeo){
+ if(statGeo != null){
+ statGeo.remove();
+ statGeo = null;
+ }
+ }
+
+ public SummaryStatistics getSummaryStatistics(GeoList dataList){
+
+ SummaryStatistics stats = new SummaryStatistics();
+ for (int i=0; i < dataList.size(); i++) {
+ GeoElement geo = dataList.get(i);
+ if (geo.isNumberValue()) {
+ NumberValue num = (NumberValue) geo;
+ stats.addValue(num.getDouble());
+ }
+ }
+ return stats;
+ }
+
+
+
+ public double[] getValueArray(GeoList dataList){
+ ArrayList<Double> list = new ArrayList<Double>();
+ for (int i=0; i < dataList.size(); i++) {
+ GeoElement geo = dataList.get(i);
+ if (geo.isNumberValue()) {
+ NumberValue num = (NumberValue) geo;
+ list.add(num.getDouble());
+ }
+ }
+ double[] val = new double[list.size()];
+ for (int i=0; i < list.size(); i++)
+ val[i] = list.get(i);
+
+ return val;
+ }
+
+
+
+
+}
diff --git a/geogebra/gui/view/spreadsheet/statdialog/StatGeo.java b/geogebra/gui/view/spreadsheet/statdialog/StatGeo.java
index 7e29c8f..6a7099b 100644
--- a/geogebra/gui/view/spreadsheet/statdialog/StatGeo.java
+++ b/geogebra/gui/view/spreadsheet/statdialog/StatGeo.java
@@ -2,6 +2,7 @@ package geogebra.gui.view.spreadsheet.statdialog;
import geogebra.kernel.AlgoBoxPlot;
import geogebra.kernel.AlgoClasses;
+import geogebra.kernel.AlgoDependentList;
import geogebra.kernel.AlgoDependentListExpression;
import geogebra.kernel.AlgoDotPlot;
import geogebra.kernel.AlgoElement;
@@ -45,6 +46,7 @@ import geogebra.kernel.statistics.AlgoStandardDeviation;
import geogebra.main.Application;
import java.awt.Color;
+import java.util.ArrayList;
/**
*
@@ -68,7 +70,7 @@ public class StatGeo {
private boolean histogramRight;
private boolean removeFromConstruction = true;
-
+
@@ -128,6 +130,11 @@ public class StatGeo {
}
private void getDataBounds(GeoList dataList, boolean isPointList, boolean isMatrix){
+ // construction elements created by this method should always be
+ // removed from the construction
+ boolean currentRemoveFromConstructionStatus = removeFromConstruction;
+ removeFromConstruction = true;
+
//String label = dataList.getLabel();
dataBounds = new double[4];
@@ -135,14 +142,14 @@ public class StatGeo {
// create index for iterating through the lists in the matrix
GeoNumeric index = new GeoNumeric(cons, 1);
-
+
// create algo for extracting a list from the matrix that depends on index
AlgoListElement le = new AlgoListElement(cons, dataList, index);
removeFromConstructionList(le);
-
+
// create list from this algo
GeoList list = (GeoList) le.getGeoElements()[0];
-
+
// create algos to find the max and min values of the list
AlgoListMax maxAlgo = new AlgoListMax(cons, list);
AlgoListMin minAlgo = new AlgoListMin(cons, list);
@@ -160,7 +167,7 @@ public class StatGeo {
// iterate through the remaining lists to find the max/min for the matrix
double min, max;
for(int i = 1; i < dataList.size(); i++){
-
+
index.setValue(i+1); // use i+1 because Element[] uses 1-based counting
index.updateCascade();
min = minGeo.getDouble();
@@ -214,6 +221,9 @@ public class StatGeo {
xMaxData = dataBounds[1];
yMinData = dataBounds[2];
yMaxData = dataBounds[3];
+
+ // restore the removeFromConstruction flag
+ removeFromConstruction = currentRemoveFromConstructionStatus;
}
@@ -249,20 +259,20 @@ public class StatGeo {
//else
al2 = new AlgoHistogram(cons, new GeoBoolean(cons, settings.isCumulative),
(GeoList)al.getGeoElements()[0], dataList, new GeoBoolean(cons, true), new GeoNumeric(cons, density),histogramRight);
- removeFromConstructionList(al2);
if(isFrequencyPolygon){
AlgoPolyLine al3 = createFrequencyPolygon((AlgoHistogram) al2, settings.isCumulative);
- removeFromConstructionList(al3);
geo = al3.getGeoElements()[0];
geo.setObjColor(StatDialog.OVERLAY_COLOR);
geo.setLineThickness(StatDialog.thicknessCurve);
-
+ removeFromConstructionList(al2);
+ removeFromConstructionList(al3);
}else{
geo = al2.getGeoElements()[0];
geo.setObjColor(StatDialog.HISTOGRAM_COLOR);
geo.setAlphaValue(StatDialog.opacityBarChart);
geo.setLineThickness(StatDialog.thicknessBarChart);
+ removeFromConstructionList(al2);
}
return geo;
}
@@ -296,7 +306,6 @@ public class StatGeo {
cons.setSuppressLabelCreation(suppressLabelCreation);
AlgoPolyLine polyLine = new AlgoPolyLine(cons, null, points);
- removeFromConstructionList(polyLine);
return polyLine;
}
@@ -534,8 +543,7 @@ public class StatGeo {
public void updateNormalQuantilePlot(GeoList dataList, StatPanelSettings settings){
getDataBounds(dataList);
- String label = dataList.getLabel();
-
+
if(settings.isAutomaticWindow){
double buffer = .25*(xMaxData - xMinData);
settings.xMin = xMinData - buffer;
@@ -577,13 +585,15 @@ public class StatGeo {
public GeoElement createScatterPlot(GeoList dataList){
// copy the dataList geo
- GeoList geo = new GeoList(cons);
- geo.setAuxiliaryObject(true);
-
+ ArrayList<GeoElement> list = new ArrayList<GeoElement>();
for(int i=0; i<dataList.size(); ++i)
- geo.add(dataList.get(i));
-
+ list.add(dataList.get(i));
+ AlgoDependentList dl = new AlgoDependentList(cons, list, false);
+ removeFromConstructionList(dl);
+ GeoList geo = dl.getGeoList();
+
// set visibility
+ geo.setAuxiliaryObject(true);
geo.setEuclidianVisible(true);
geo.setAuxiliaryObject(true);
geo.setLabelVisible(false);
@@ -770,16 +780,16 @@ public class StatGeo {
return latex;
}
-
-
-
- public boolean doRemoveFromConstruction() {
+
+
+
+ public boolean removeFromConstruction() {
return removeFromConstruction;
}
public void setRemoveFromConstruction(boolean removeFromConstruction) {
this.removeFromConstruction = removeFromConstruction;
}
-
+
private void removeFromConstructionList(ConstructionElement ce){
if(removeFromConstruction)
cons.removeFromConstructionList(ce);
diff --git a/geogebra/gui/view/spreadsheet/statdialog/StatisticsPanel.java b/geogebra/gui/view/spreadsheet/statdialog/StatisticsPanel.java
index f548b96..4cb34ef 100644
--- a/geogebra/gui/view/spreadsheet/statdialog/StatisticsPanel.java
+++ b/geogebra/gui/view/spreadsheet/statdialog/StatisticsPanel.java
@@ -139,7 +139,7 @@ public class StatisticsPanel extends JPanel implements StatPanelInterface, Actio
break;
case INFER_ANOVA:
-
+
GridBagConstraints tab = new GridBagConstraints();
tab.gridx=0;
tab.gridy = GridBagConstraints.RELATIVE;
@@ -147,18 +147,18 @@ public class StatisticsPanel extends JPanel implements StatPanelInterface, Actio
tab.insets = new Insets(4,20,0,20);
tab.fill = GridBagConstraints.HORIZONTAL;
tab.anchor=GridBagConstraints.NORTHWEST;
-
+
JPanel p = new JPanel(new GridBagLayout());
p.add(getAnovaTable(),tab);
p.add(getMinMVStatPanel(),tab);
inferencePanel.add(p, BorderLayout.CENTER);
-
+
break;
default:
inferencePanel.add(statTable, BorderLayout.CENTER);
}
-
+
revalidate();
repaint();
this.setMinimumSize(this.getPreferredSize());
@@ -198,7 +198,7 @@ public class StatisticsPanel extends JPanel implements StatPanelInterface, Actio
minMVStatPanel = new MinimalMultiVarStatPanel(app, statDialog);
return minMVStatPanel;
}
-
+
/**
* Creates the JComboBox that selects inference mode
@@ -321,8 +321,8 @@ public class StatisticsPanel extends JPanel implements StatPanelInterface, Actio
revalidate();
repaint();
this.setMinimumSize(this.getPreferredSize());
- statDialog.updateStatDataPanelVisibility();
-
+ //statDialog.updateStatDataPanelVisibility();
+
}
public void actionPerformed(ActionEvent e) {
diff --git a/geogebra/gui/virtualkeyboard/keyboard.properties b/geogebra/gui/virtualkeyboard/keyboard.properties
index d889a20..8650c7a 100644
--- a/geogebra/gui/virtualkeyboard/keyboard.properties
+++ b/geogebra/gui/virtualkeyboard/keyboard.properties
@@ -265,6 +265,7 @@ B0307CU=\u0134
B0307CL=\u0135
B0308U=K
B0308L=k
+B0308QL=\u2113
B0308cU=\u0136
B0308cL=\u0137
B0309U=L
@@ -643,6 +644,6 @@ B0306QL=
B0306QU=
B0307QL=
B0307QU=
-B0308QL=
+#B0308QL=
B0308QU=
diff --git a/geogebra/io/DocHandler.java b/geogebra/io/DocHandler.java
index 9bfa219..3b9826c 100644
--- a/geogebra/io/DocHandler.java
+++ b/geogebra/io/DocHandler.java
@@ -25,7 +25,5 @@ public interface DocHandler {
public void startDocument() throws Exception;
public void endDocument() throws Exception;
public void text(String str) throws Exception;
- // Added for Intergeo File Format (Yves Kreis) -->
public int getConsStep();
- // <-- Added for Intergeo File Format (Yves Kreis)
}
diff --git a/geogebra/io/MyI2GHandler.java b/geogebra/io/MyI2GHandler.java
deleted file mode 100644
index b957afa..0000000
--- a/geogebra/io/MyI2GHandler.java
+++ /dev/null
@@ -1,987 +0,0 @@
-/*
-GeoGebra - Dynamic Mathematics for Everyone
-http://www.geogebra.org
-
-This file is part of GeoGebra.
-
-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
-the Free Software Foundation.
-
-*/
-
-/*
- * MyI2GHandler.java
- *
- * Created on 14. Juli 2008, 18:25
- */
-
-package geogebra.io;
-
-import geogebra.kernel.Construction;
-import geogebra.kernel.GeoElement;
-import geogebra.kernel.GeoLine;
-import geogebra.kernel.GeoPoint;
-import geogebra.kernel.GeoVec3D;
-import geogebra.kernel.GeoVector;
-import geogebra.kernel.Kernel;
-import geogebra.kernel.arithmetic.Command;
-import geogebra.kernel.arithmetic.ExpressionNode;
-import geogebra.kernel.parser.Parser;
-import geogebra.main.Application;
-import geogebra.main.MyError;
-
-import java.util.LinkedHashMap;
-
-import org.apache.commons.math.complex.Complex;
-import org.xml.sax.SAXException;
-
-/**
- * Added for Intergeo File Format
- *
- * @author Yves Kreis
- */
-public class MyI2GHandler implements DocHandler {
-
- private static final int MODE_INVALID = -1;
- private static final int MODE_CONSTRUCTION = 1;
- private static final int MODE_ELEMENTS = 1000;
- private static final int MODE_COORDINATES = 1100;
- private static final int MODE_COORDINATES_REAL_DOUBLE = 1101;
- private static final int MODE_COORDINATES_COMPLEX = 1110;
- private static final int MODE_COORDINATES_COMPLEX_DOUBLE = 1111;
- private static final int MODE_CONSTRAINTS = 2000;
- private static final int MODE_FREE = 2100;
-// private static final int MODE_FREE_OUTPUT = 2101;
- private static final int MODE_LINE_ANGULAR_BISECTOR_OF_THREE_POINTS = 2200;
-// private static final int MODE_LINE_ANGULAR_BISECTOR_OF_THREE_POINTS_OUTPUT = 2201;
-// private static final int MODE_LINE_ANGULAR_BISECTOR_OF_THREE_POINTS_INPUT = 2202;
- private static final int MODE_LINE_ANGULAR_BISECTORS_OF_TWO_LINES = 2210;
-// private static final int MODE_LINE_ANGULAR_BISECTORS_OF_TWO_LINES_OUTPUT = 2211;
-// private static final int MODE_LINE_ANGULAR_BISECTORS_OF_TWO_LINES_INPUT = 2212;
- private static final int MODE_LINE_PARALLEL_TO_LINE = 2220;
-// private static final int MODE_LINE_PARALLEL_TO_LINE_OUTPUT = 2221;
-// private static final int MODE_LINE_PARALLEL_TO_LINE_INPUT = 2222;
- private static final int MODE_LINE_PARALLEL_TO_LINE_THROUGH_POINT = 2230;
-// private static final int MODE_LINE_PARALLEL_TO_LINE_THROUGH_POINT_OUTPUT = 2231;
-// private static final int MODE_LINE_PARALLEL_TO_LINE_THROUGH_POINT_INPUT = 2232;
- private static final int MODE_LINE_PERPENDICULAR_TO_LINE = 2240;
-// private static final int MODE_LINE_PERPENDICULAR_TO_LINE_OUTPUT = 2241;
-// private static final int MODE_LINE_PERPENDICULAR_TO_LINE_INPUT = 2242;
- private static final int MODE_LINE_PERPENDICULAR_TO_LINE_THROUGH_POINT = 2250;
-// private static final int MODE_LINE_PERPENDICULAR_TO_LINE_THROUGH_POINT_OUTPUT = 2251;
-// private static final int MODE_LINE_PERPENDICULAR_TO_LINE_THROUGH_POINT_INPUT = 2252;
- private static final int MODE_LINE_THROUGH_POINT = 2260;
-// private static final int MODE_LINE_THROUGH_POINT_OUTPUT = 2261;
-// private static final int MODE_LINE_THROUGH_POINT_INPUT = 2262;
- private static final int MODE_LINE_THROUGH_TWO_POINTS = 2270;
-// private static final int MODE_LINE_THROUGH_TWO_POINTS_OUTPUT = 2271;
-// private static final int MODE_LINE_THROUGH_TWO_POINTS_INPUT = 2272;
- private static final int MODE_LINE_SEGMENT_BY_POINTS = 2300;
-// private static final int MODE_LINE_SEGMENT_BY_POINTS_OUTPUT = 2301;
-// private static final int MODE_LINE_SEGMENT_BY_POINTS_INPUT = 2302;
- private static final int MODE_POINT_INTERSECTION_OF_TWO_LINES = 2400;
-// private static final int MODE_POINT_INTERSECTION_OF_TWO_LINES_OUTPUT = 2401;
-// private static final int MODE_POINT_INTERSECTION_OF_TWO_LINES_INPUT = 2402;
- private static final int MODE_POINT_ON_LINE = 2410;
-// private static final int MODE_POINT_ON_LINE_OUTPUT = 2411;
-// private static final int MODE_POINT_ON_LINE_INPUT = 2412;
- private static final int MODE_DISPLAY = 3000;
- private static final int MODE_LABEL = 3100;
-
- private int mode;
- private int subMode;
-
- private GeoElement geo;
- private Command cmd;
- private String cmdName;
- private Application app;
-
- // for macros we need to change the kernel, so remember the original kernel too
- private Kernel kernel, origKernel;
- private Construction cons, origCons;
- private Parser parser, origParser;
-
- // to parse homogeneous/euclidean/polar coordinates
- private int coord;
- private Complex [] coords;
- // to parse labels of output/input arguments in commands
- private String label;
- // to store the last type while processing constraints
- private String lastType;
-
- // ignore coordinates for segment, import as line
- private boolean segment;
- private GeoPoint segmentStart;
- private GeoPoint segmentEnd;
- private GeoPoint segmentVia;
-
- /** Creates a new instance of MyI2GHandler */
- public MyI2GHandler(Kernel kernel, Construction cons) {
- origKernel = kernel;
- origCons = cons;
- origParser = new Parser(origKernel, origCons);
- app = origKernel.getApplication();
- initKernelVars();
-
- mode = MODE_INVALID;
- subMode = MODE_INVALID;
- }
-
- private void reset() {
- initKernelVars();
-
- mode = MODE_INVALID;
- subMode = MODE_INVALID;
- }
-
- private void initKernelVars() {
- this.kernel = origKernel;
- this.parser = origParser;
- this.cons = origKernel.getConstruction();
- }
-
- public int getConsStep() {
- return -2;
- }
-
- //===============================================
- // SAX ContentHandler methods
- //===============================================
-
- final public void startDocument() throws SAXException {
-debug("startDocument", "");
- reset();
- }
-
- final public void startElement(String eName, LinkedHashMap attrs) throws SAXException {
-debug("startElement", eName);
- switch (mode) {
- case MODE_CONSTRUCTION : // top level mode
- startConstruction(eName, attrs);
- break;
-
- case MODE_ELEMENTS :
- startElements(eName, attrs);
- break;
-
- case MODE_CONSTRAINTS :
- startConstraints(eName, attrs);
- break;
-
- case MODE_DISPLAY :
- startDisplay(eName, attrs);
- break;
-
- case MODE_INVALID :
- // is this an intergeo file?
- if (eName.equals("construction")) {
- mode = MODE_CONSTRUCTION;
- break;
- }
-
- default :
- Application.debug("unknown mode: " + mode);
- }
- }
-
- final public void text(String str) throws SAXException {
-//debug("text", str);
- switch (mode) {
- case MODE_ELEMENTS :
- textElements(str);
- break;
-
- case MODE_CONSTRAINTS :
- textConstraints(str);
- break;
-
- case MODE_DISPLAY :
- textDisplay(str);
- break;
- }
- }
-
- // set mode back to construction mode
- final public void endElement(String eName) throws SAXException {
-debug("endElement", eName);
- switch (mode) {
- case MODE_CONSTRUCTION :
- endConstruction(eName);
- break;
-
- case MODE_ELEMENTS :
- endElements(eName);
- break;
-
- case MODE_CONSTRAINTS :
- endConstraints(eName);
- break;
-
- case MODE_DISPLAY :
- endDisplay(eName);
- break;
- }
- }
-
- final public void endDocument() throws SAXException {
-debug("endDocument", "");
- if (mode == MODE_INVALID)
- throw new SAXException("invalid file: <construction> not found");
- else if (mode != MODE_CONSTRUCTION)
- throw new SAXException("closing tag </construction> not found");
- }
-
- //====================================
- // <construction>
- //====================================
- private void startConstruction(String eName, LinkedHashMap attrs) {
-debug("startConstruction", eName);
- if (eName.equals("elements")) {
- mode = MODE_ELEMENTS;
- } else if (eName.equals("constraints")) {
- mode = MODE_CONSTRAINTS;
- } else if (eName.equals("display")) {
- mode = MODE_DISPLAY;
- } else {
- Application.debug("unknown tag in <construction>: " + eName);
- }
- }
-
- private void endConstruction(String eName) {
-debug("endConstruction", eName);
- if (eName.equals("construction")) {
- mode = MODE_CONSTRUCTION;
- } else {
- Application.debug("invalid closing tag </" + eName + "> instead of </construction>");
- mode = MODE_INVALID;
- }
- }
-
- //====================================
- // <elements>
- //====================================
- private void startElements(String eName, LinkedHashMap attrs) {
-debug("startElements", eName);
- switch (subMode) {
- case MODE_INVALID :
- // TODO -> extend to further objects
- if (!eName.equals("line") && !eName.equals("line_segment") && !eName.equals("point")) {
- Application.debug("unknown tag in <elements>: " + eName);
- break;
- }
-
- String label = (String) attrs.get("id");
- if (label == null) {
- Application.debug("attribute id missing in <" + eName + ">");
- break;
- }
-
- // does a geo element with this label exist?
- geo = kernel.lookupLabel(label);
- if (geo != null) {
- geo = null;
- Application.debug("an element with id \"" + label + "\" already exists");
- break;
- }
-
- if (eName.equals("line_segment")) {
- eName = "segment";
- segment = true;
- segmentStart = new GeoPoint(cons);
- segmentEnd = new GeoPoint(cons);
- segmentVia = new GeoPoint(cons);
- } else {
- segment = false;
- }
-
- geo = kernel.createGeoElement(cons, eName);
- geo.setLoadedLabel(label);
- subMode = MODE_ELEMENTS;
- cmdName = eName;
- break;
-
- case MODE_ELEMENTS :
- String [] tags;
- if (cmdName.equals("point")) {
- tags = new String[] { "homogeneous_coordinates", "euclidean_coordinates", "polar_coordinates" };
- } else {
- tags = new String[] { "homogeneous_coordinates" };
- }
- int i;
- for (i = 0; i < tags.length; i++) {
- if (eName.equals(tags[i])) {
- break;
- }
- }
- if (i >= tags.length) {
- Application.debug("unknown tag in <" + geo.getI2GtypeString() + ">: " + eName);
- break;
- } else if (!(geo instanceof GeoVec3D)) {
- Application.debug("wrong element type for coordinates: " + geo.getI2GtypeString());
- break;
- }
-
- if (eName.equals("homogeneous_coordinates")) {
- coord = 0;
- coords = new Complex[] { Complex.NaN , Complex.NaN, Complex.NaN };
- } else if (eName.equals("euclidean_coordinates") || eName.equals("polar_coordinates")) {
- coord = 0;
- coords = new Complex[] { Complex.NaN, Complex.NaN };
- }
- subMode = MODE_COORDINATES;
- cmdName = eName;
- break;
-
- case MODE_COORDINATES :
- if (eName.equals("double")) {
- subMode = MODE_COORDINATES_REAL_DOUBLE;
- } else if (cmdName.equals("homogeneous_coordinates") && eName.equals("complex")) {
- subMode = MODE_COORDINATES_COMPLEX;
- } else {
- Application.debug("unknown tag in <" + cmdName + ">: " + eName);
- break;
- }
- if (coord >= coords.length) {
- break;
- }
- for (coord = 0; coord < coords.length; coord++) {
- if (coords[coord].isNaN()) {
- break;
- }
- }
- if (coord >= coords.length) {
- String tag = "<double>";
- if (cmdName.equals("homogeneous_coordinates")) {
- tag = "<double> or <complex>";
- }
- Application.debug("more than " + coords.length + " " + tag + " specified for <" + cmdName + ">");
- }
- break;
-
- case MODE_COORDINATES_COMPLEX :
- if (eName.equals("double")) {
- subMode = MODE_COORDINATES_COMPLEX_DOUBLE;
- } else {
- Application.debug("unknown tag in <complex>: " + eName);
- }
- break;
-
- case MODE_COORDINATES_REAL_DOUBLE :
- case MODE_COORDINATES_COMPLEX_DOUBLE :
- Application.debug("unknown tag in <double>: " + eName);
- break;
- }
- }
-
- private void textElements(String str) {
-//debug("textElements", str);
- switch (subMode) {
- case MODE_COORDINATES_REAL_DOUBLE :
- case MODE_COORDINATES_COMPLEX_DOUBLE :
-debug("textElements", str);
- if (coord < coords.length) {
- try {
- if (subMode == MODE_COORDINATES_REAL_DOUBLE) {
- coords[coord] = new Complex(Double.parseDouble(str), 0);
- } else if (Double.isNaN(coords[coord].getReal())) {
- coords[coord] = new Complex(Double.parseDouble(str), Double.NaN);
- } else if (Double.isNaN(coords[coord].getImaginary())) {
- coords[coord] = new Complex(coords[coord].getReal(),Double.parseDouble(str));
- } else {
- Application.debug("more than 2 <double> specified for <complex>");
- }
- } catch (Exception e) {
- Application.debug("could not parse double: " + str);
- }
- }
- break;
- }
- }
-
- private void endElements(String eName) {
-debug("endElements", eName);
- switch (subMode) {
- case MODE_INVALID :
- if (!eName.equals("elements")) {
- Application.debug("invalid closing tag </" + eName + "> instead of </elements>");
- }
- mode = MODE_CONSTRUCTION;
- break;
-
- case MODE_ELEMENTS :
- if (eName.equals("line_segment")) {
- GeoVec3D.lineThroughPoints(segmentStart, segmentEnd, (GeoLine) geo);
- }
- if (!eName.equals(geo.getI2GtypeString())) {
- Application.debug("invalid closing tag </" + eName + "> instead of </" + geo.getI2GtypeString() + ">");
- }
- subMode = MODE_INVALID;
- break;
-
- case MODE_COORDINATES :
- if (coords[coords.length - 1].isNaN()) {
- String tag = "<double>";
- if (cmdName.equals("homogeneous_coordinates")) {
- tag = "<double> or <complex>";
- }
- Application.debug("only " + (coords.length - 1) + " " + tag + " specified for <" + eName + ">");
- } else {
- GeoVec3D v;
- if (segment) {
- if (!segmentStart.isDefined()) {
- v = (GeoVec3D) segmentStart;
- } else if (!segmentEnd.isDefined()) {
- v = (GeoVec3D) segmentEnd;
- } else {
- v = (GeoVec3D) segmentVia;
- }
- } else {
- v = (GeoVec3D) geo;
- }
- if (coords.length == 3) {
- if (!isReal(coords[2])) {
- coords[0] = coords[0].divide(coords[2]);
- coords[1] = coords[1].divide(coords[2]);
- coords[2] = coords[2].divide(coords[2]);
- }
- if (isReal(coords[0]) && isReal(coords[1]) && isReal(coords[2])) {
- v.setCoords(coords[0].getReal(), coords[1].getReal(), coords[2].getReal());
- } else {
- Application.debug("could not import complex coordinates");
- }
- } else if (coords.length == 2) {
- if (cmdName.equals("euclidean_coordinates")) {
- v.setCoords(coords[0].getReal(), coords[1].getReal(), 1);
- } else if (cmdName.equals("polar_coordinates")) {
- v.setCoords(coords[0].getReal() * Math.cos( coords[1].getReal() ), coords[0].getReal() * Math.sin( coords[1].getReal() ), 1);
- // TODO -> do not modify point/kernel mode when these settings are stored in the file format
- v.setPolar();
- kernel.setAngleUnit(Kernel.ANGLE_RADIANT);
- }
- }
- }
- if (!eName.equals(cmdName)) {
- Application.debug("invalid closing tag </" + eName + "> instead of </" + cmdName + ">");
- }
- subMode = MODE_ELEMENTS;
- break;
-
- case MODE_COORDINATES_COMPLEX :
- if (coord < coords.length && coords[coord].isNaN()) {
- if (Double.isNaN(coords[coord].getReal())) {
- coords[coord] = new Complex(0, 0);
- Application.debug("no <double> specified for <complex>");
- } else if (Double.isNaN(coords[coord].getImaginary())) {
- coords[coord] = new Complex(coords[coord].getReal(), 0);
- Application.debug("only 1 <double> specified for <complex>");
- }
- }
- if (!eName.equals("complex")) {
- Application.debug("invalid closing tag </" + eName + "> instead of </complex>");
- }
- subMode = MODE_COORDINATES;
- break;
-
- case MODE_COORDINATES_REAL_DOUBLE :
- case MODE_COORDINATES_COMPLEX_DOUBLE :
- if (!eName.equals("double")) {
- Application.debug("invalid closing tag </" + eName + "> instead of </double>");
- }
- subMode = subMode - 1;
- break;
- }
- }
-
- final public boolean isReal(Complex c) {
- return Kernel.isZero(c.getImaginary());
- }
-
-
-
- //====================================
- // <constraints>
- //====================================
- private void startConstraints(String eName, LinkedHashMap attrs) {
-debug("startConstraints", eName);
- switch (subMode) {
- case MODE_INVALID :
- String name;
-
- if (eName.startsWith("free_")) {
- name = "Free";
- subMode = MODE_FREE;
- } else if (eName.equals("line_angular_bisector_of_three_points")) {
- name = "AngularBisector";
- subMode = MODE_LINE_ANGULAR_BISECTOR_OF_THREE_POINTS;
- } else if (eName.equals("line_angular_bisectors_of_two_lines")) {
- name = "AngularBisector";
- subMode = MODE_LINE_ANGULAR_BISECTORS_OF_TWO_LINES;
- } else if (eName.equals("line_parallel_to_line")) {
- name = "Line";
- subMode = MODE_LINE_PARALLEL_TO_LINE;
- } else if (eName.equals("line_parallel_to_line_through_point")) {
- name = "Line";
- subMode = MODE_LINE_PARALLEL_TO_LINE_THROUGH_POINT;
- } else if (eName.equals("line_perpendicular_to_line")) {
- name = "OrthogonalLine";
- subMode = MODE_LINE_PERPENDICULAR_TO_LINE;
- } else if (eName.equals("line_perpendicular_to_line_through_point")) {
- name = "OrthogonalLine";
- subMode = MODE_LINE_PERPENDICULAR_TO_LINE_THROUGH_POINT;
- } else if (eName.equals("line_through_point")) {
- name = "Line";
- subMode = MODE_LINE_THROUGH_POINT;
- } else if (eName.equals("line_through_two_points")) {
- name = "Line";
- subMode = MODE_LINE_THROUGH_TWO_POINTS;
- } else if (eName.equals("line_segment_by_points")) {
- name = "Segment";
- subMode = MODE_LINE_SEGMENT_BY_POINTS;
- } else if (eName.equals("point_intersection_of_two_lines")) {
- name = "Intersect";
- subMode = MODE_POINT_INTERSECTION_OF_TWO_LINES;
- } else if (eName.equals("point_on_line")) {
- name = "Point";
- subMode = MODE_POINT_ON_LINE;
- } else {
- Application.debug("unknown tag in <constraints>: " + eName);
- break;
- }
-
- cmd = new Command(kernel, name, false); // do not translate name
- cmdName = eName;
- break;
-
- case MODE_FREE :
- handleConstraintsStart(eName, attrs, cmdName.substring(5), 1, new String[] {}, new int[] {});
- break;
-
- case MODE_LINE_ANGULAR_BISECTOR_OF_THREE_POINTS :
- handleConstraintsStart(eName, attrs, "line", 1, new String[] { "point" }, new int[] { 3 });
- break;
-
- case MODE_LINE_ANGULAR_BISECTORS_OF_TWO_LINES :
- handleConstraintsStart(eName, attrs, "line", 2, new String[] { "line" }, new int[] { 2 });
- break;
-
- case MODE_LINE_PARALLEL_TO_LINE :
- handleConstraintsStart(eName, attrs, "line", 1, new String[] { "line" }, new int[] { 1 });
- break;
-
- case MODE_LINE_PARALLEL_TO_LINE_THROUGH_POINT :
- handleConstraintsStart(eName, attrs, "line", 1, new String[] { "line", "point"}, new int[] { 1, 1 });
- break;
-
- case MODE_LINE_PERPENDICULAR_TO_LINE :
- handleConstraintsStart(eName, attrs, "line", 1, new String[] { "line" }, new int[] { 1 });
- break;
-
- case MODE_LINE_PERPENDICULAR_TO_LINE_THROUGH_POINT :
- handleConstraintsStart(eName, attrs, "line", 1, new String[] { "line", "point"}, new int[] { 1, 1 });
- break;
-
- case MODE_LINE_THROUGH_POINT :
- handleConstraintsStart(eName, attrs, "line", 1, new String[] { "point" }, new int[] { 1 });
- break;
-
- case MODE_LINE_THROUGH_TWO_POINTS :
- handleConstraintsStart(eName, attrs, "line", 1, new String[] { "point" }, new int[] { 2 });
- break;
-
- case MODE_LINE_SEGMENT_BY_POINTS :
- handleConstraintsStart(eName, attrs, "line_segment", 1, new String[] { "point" }, new int[] { 2 });
- break;
-
- case MODE_POINT_INTERSECTION_OF_TWO_LINES :
- handleConstraintsStart(eName, attrs, "point", 1, new String[] { "line" }, new int[] { 2 });
- break;
-
- case MODE_POINT_ON_LINE :
- handleConstraintsStart(eName, attrs, "point", 1, new String[] { "line" }, new int[] { 1 });
- break;
-
- default:
- Application.debug("unknown tag in <" + cmdName + ">: " + eName);
- }
- }
-
- private void textConstraints(String str) {
-//debug("textConstraints", str);
- if (subMode > MODE_CONSTRAINTS && subMode % 10 != 0) {
-debug("textConstraints", str);
- // subMode == xxx_OUTPUT || subMode == xxx_INPUT
- label = str;
- }
- }
-
- private void endConstraints(String eName) {
-debug("endConstraints", eName);
- switch (subMode) {
- case MODE_INVALID :
- if (!eName.equals("constraints")) {
- Application.debug("invalid closing tag </" + eName + "> instead of </constraints>");
- }
- mode = MODE_CONSTRUCTION;
- break;
-
- case MODE_FREE :
- handleConstraintsEnd(eName, 1, 0);
- break;
-
- case MODE_POINT_ON_LINE :
- handleConstraintsEnd(eName, 1, 1);
- break;
-
- case MODE_LINE_PARALLEL_TO_LINE :
- case MODE_LINE_PERPENDICULAR_TO_LINE :
- handleConstraintsEnd(eName, 1, 1, false);
- break;
-
- case MODE_LINE_THROUGH_POINT :
- if (cmd.labelCount() == 1 &&
- cmd.getArgumentNumber() == 1 &&
- kernel.lookupLabel(cmd.getLabel(0)) instanceof GeoLine &&
- cmd.getArgument(0).getLeft() instanceof GeoPoint) {
- try {
- GeoLine geoLine = (GeoLine) kernel.lookupLabel(cmd.getLabel(0));
- GeoVector geoVector = new GeoVector(cons, null, geoLine.y, -geoLine.x, 0);
- geoVector.setStartPoint((GeoPoint) cmd.getArgument(0).getLeft());
- cmd.addArgument(new ExpressionNode(kernel, geoVector));
- } catch (Exception e) {
- // This should never happen
- e.printStackTrace();
- }
- } else {
- Application.debug("could not generate vector for <" + eName + ">");
- }
- handleConstraintsEnd(eName, 1, 2);
- break;
-
- case MODE_LINE_PARALLEL_TO_LINE_THROUGH_POINT :
- case MODE_LINE_PERPENDICULAR_TO_LINE_THROUGH_POINT :
- // GeoGebra uses inverted arguments here!
- ExpressionNode en[] = cmd.getArguments();
- cmd.setArgument(0, en[1]);
- cmd.setArgument(1, en[0]);
- case MODE_LINE_THROUGH_TWO_POINTS :
- case MODE_LINE_SEGMENT_BY_POINTS :
- case MODE_POINT_INTERSECTION_OF_TWO_LINES :
- handleConstraintsEnd(eName, 1, 2);
- break;
-
- case MODE_LINE_ANGULAR_BISECTOR_OF_THREE_POINTS :
- handleConstraintsEnd(eName, 1, 3);
- break;
-
- case MODE_LINE_ANGULAR_BISECTORS_OF_TWO_LINES :
- handleConstraintsEnd(eName, 2, 2);
- break;
-
- default:
- if (subMode > MODE_CONSTRAINTS && subMode < MODE_DISPLAY) {
- switch (subMode % 10) {
- case 1 :
- // subMode == xxx_OUTPUT
- handleConstraintsOutput(eName);
- break;
-
- case 2 :
- // subMode == xxx_INPUT
- handleConstraintsInput(eName);
- break;
-
- default:
- Application.debug("unknown subMode, this should never happen! :-(");
- }
- }
- }
- }
-
- private void handleConstraintsStart(String eName, LinkedHashMap attrs, String outputType, int outputQuantity, String[] inputType, int[] inputQuantity) {
- if (inputType.length != inputQuantity.length) {
- Application.debug("call of handleConstraintsStart with invalid arguments, this should never happen :-(");
- return;
- }
-
- label = null;
-
- if (eName.equals(outputType)) {
- if (inputType.length > 0 && outputType.equals(inputType[0])) {
- if ("true".equals((String) attrs.get("out"))) {
- if (cmd.labelCount() >= outputQuantity) {
- Application.debug("more than " + outputQuantity + " <" + eName + " out=\"true\"> specified for <" + cmdName + ">");
- return;
- }
- lastType = outputType;
- subMode = subMode + 1;
- return;
- } else if (handleConstraintsCheck(inputType[0], inputQuantity[0])) {
- lastType = inputType[0];
- subMode = subMode + 2;
- return;
- }
- } else {
- if (!"true".equals((String) attrs.get("out"))) {
- Application.debug("tag <" + eName + "> not set as output tag");
- }
- if (cmd.labelCount() >= outputQuantity) {
- Application.debug("more than " + outputQuantity + " <" + eName + "> specified for <" + cmdName + ">");
- return;
- }
- lastType = outputType;
- subMode = subMode + 1;
- return;
- }
- } else {
- for (int i = 0; i < inputType.length; i++) {
- if (eName.equals(inputType[i])) {
- if (handleConstraintsCheck(inputType[i], inputQuantity[i])) {
- lastType = inputType[i];
- subMode = subMode + 2;
- }
- return;
- }
- }
- }
- Application.debug("unknown tag in <" + cmdName + ">: " + eName);
- }
-
- private boolean handleConstraintsCheck(String inputType, int inputQuantity) {
- int count = 0;
- ExpressionNode [] en = cmd.getArguments();
- for (int i = 0; i < en.length; i++) {
- if (en[i].getLeft().isGeoElement()) {
- geo = (GeoElement) en[i].getLeft();
- if (geo.getI2GtypeString().equals(inputType)) {
- count++;
- }
- }
- }
- if (count >= inputQuantity) {
- Application.debug("more than " + inputQuantity + " <" + inputType + "> specified for <" + cmdName + ">");
- return false;
- }
- return true;
- }
-
- private void handleConstraintsEnd(String eName, int outputQuantity, int inputQuantity) {
- handleConstraintsEnd(eName, outputQuantity, inputQuantity, true);
- }
-
- private void handleConstraintsEnd(String eName, int outputQuantity, int inputQuantity, boolean processCommand) {
- boolean error = false;
-
- if (cmd.labelCount() < outputQuantity) {
- error = true;
- Application.debug("not enough output elements specified for <" + cmdName + ">");
- } else if (cmd.labelCount() > outputQuantity) {
- error = true;
- Application.debug("too many output elements specified for <" + cmdName + ">");
- }
- if (cmd.getArgumentNumber() < inputQuantity) {
- error = true;
- Application.debug("not enough input elements specified for <" + cmdName + ">");
- } else if (cmd.getArgumentNumber() > inputQuantity) {
- error = true;
- Application.debug("too many input elements specified for <" + cmdName + ">");
- }
-
- if (!processCommand) {
- // do not process the command, the constraint is not supported
- Application.debug("ignoring constraint <" + cmdName + ">, GeoGebra does not support it");
- } else if (error) {
- // do not process the command, the number of input/output arguments does not match
- } else if (cmd.getName().equals("Free")) {
- if (label != null) {
- GeoElement geo = kernel.lookupLabel(label);
- if (!geo.isIndependent() && !geo.isPointOnPath()) {
- Application.debug(lastType + " " + label + " is not free");
- }
- }
- } else {
- String [] labels = cmd.getLabels();
- GeoElement [] loadedGeo = new GeoElement[labels.length];
- for (int i = 0; i < labels.length; i++) {
- loadedGeo[i] = kernel.lookupLabel(labels[i]);
- loadedGeo[i].remove();
-System.out.println(loadedGeo[i]);
- }
- GeoElement [] outputGeo = kernel.getAlgebraProcessor().processCommand(cmd, true);
- if (outputGeo == null) {
- throw new MyError(app, "processing of command " + cmdName + " failed");
- }
-System.out.println(eName);
- for (int i = 0; i < labels.length; i++) {
- outputGeo[i].setLoadedLabel(labels[i]);
- outputGeo[i].set(loadedGeo[i]);
- }
- }
-
- if (!eName.equals(cmdName)) {
- Application.debug("invalid closing tag </" + eName + "> instead of </" + cmdName + ">");
- }
- subMode = MODE_INVALID;
- }
-
- private void handleConstraintsOutput(String eName) {
- if (handleConstraintsOutputInput(eName, subMode - 1)) {
- cmd.addLabel(label);
- }
- }
-
- private void handleConstraintsInput(String eName) {
- if (handleConstraintsOutputInput(eName, subMode - 2)) {
- cmd.addArgument(new ExpressionNode(kernel, geo));
- }
- }
-
- private boolean handleConstraintsOutputInput(String eName, int newMode) {
- boolean ok = true;
-
- if (label == null) {
- ok = false;
- Application.debug("no id specified for " + lastType);
- } else {
- geo = kernel.lookupLabel(label);
- if (geo == null) {
- ok = false;
- Application.debug("an element with id \"" + label + "\" does not exist");
- } else if (!geo.getI2GtypeString().equals(lastType)) {
- ok = false;
- Application.debug("the element with id \"" + label + "\" is not a " + lastType);
- }
- }
- if (!eName.equals(lastType)) {
- ok = false;
- Application.debug("invalid closing tag </" + eName + "> instead of </" + lastType + ">");
- }
- subMode = newMode;
- return ok;
- }
-
- //====================================
- // <display>
- //====================================
- private void startDisplay(String eName, LinkedHashMap attrs) {
-debug("startDisplay", eName);
- switch (subMode) {
- case MODE_INVALID :
- // TODO -> extend to further objects
- if (!eName.equals("point") && !eName.equals("line")) {
- Application.debug("unknown tag in <elements>: " + eName);
- break;
- }
-
- String label = (String) attrs.get("id");
- if (label == null) {
- Application.debug("attribute id missing in <" + eName + ">");
- break;
- }
-
- // does a geo element with this label exist?
- geo = kernel.lookupLabel(label);
- if (geo == null) {
- Application.debug("an element with id \"" + label + "\" does not exist");
- break;
- }
-
- subMode = MODE_DISPLAY;
- cmdName = eName;
- break;
-
- case MODE_DISPLAY :
- if (eName.equals("label")) {
- label = null;
- subMode = MODE_LABEL;
- } else {
- Application.debug("unknown tag in <" + cmdName + ">: " + eName);
- }
- break;
-
- case MODE_LABEL :
- Application.debug("unknown tag in <label>: " + eName);
- break;
- }
- }
-
- private void textDisplay(String str) {
-//debug("textElements", str);
- switch (subMode) {
- case MODE_LABEL :
-debug("textElements", str);
- label = str;
- break;
- }
- }
-
- private void endDisplay(String eName) {
-debug("endDisplay", eName);
- switch (subMode) {
- case MODE_INVALID :
- if (!eName.equals("display")) {
- Application.debug("invalid closing tag </" + eName + "> instead of </display>");
- }
- mode = MODE_CONSTRUCTION;
- break;
-
- case MODE_DISPLAY :
- if (!eName.equals(cmdName)) {
- Application.debug("invalid closing tag </" + eName + "> instead of </" + cmdName + ">");
- }
- subMode = MODE_INVALID;
- break;
-
- case MODE_LABEL :
- if (label == null) {
- Application.debug("no label specified for " + geo.getI2GtypeString());
- } else {
- try {
- geo.setCaption(label);
- geo.setLabelMode(GeoElement.LABEL_CAPTION);
- } catch (Exception e) {
- Application.debug("could not set label " + label + " for " + geo.getI2GtypeString());
- }
- }
- if (!eName.equals("label")) {
- Application.debug("invalid closing tag </" + eName + "> instead of </label>");
- }
- subMode = MODE_DISPLAY;
- break;
- }
- }
-
- //====================================
- // debugging
- //====================================
- private void debug(String tag, String eName) {
- if (true) {
- int length = 17;
- if (tag.length() < length) {
- System.out.print(tag);
- System.out.print(" ".substring(0, length - tag.length()));
- } else {
- System.out.print(tag.substring(0, length));
- }
- System.out.print(" : ");
- if (mode == MODE_INVALID) {
- System.out.print(" ");
- } else if (mode == MODE_CONSTRUCTION) {
- System.out.print(" ");
- }
- System.out.print(mode);
- System.out.print(" : ");
- if (subMode == MODE_INVALID) {
- System.out.print(" ");
- } else if (subMode == MODE_CONSTRUCTION) {
- System.out.print(" ");
- }
- System.out.print(subMode);
- if (!"".equals(eName)) {
- System.out.print(" : ");
- System.out.print(eName);
- }
- System.out.println();
- }
- }
-}
\ No newline at end of file
diff --git a/geogebra/io/MyXMLHandler.java b/geogebra/io/MyXMLHandler.java
index fecf72d..2eeb9b4 100644
--- a/geogebra/io/MyXMLHandler.java
+++ b/geogebra/io/MyXMLHandler.java
@@ -281,6 +281,11 @@ public class MyXMLHandler implements DocHandler {
hasGuiElement = false;
initKernelVars();
+
+ xmin.clear();
+ xmax.clear();
+ ymin.clear();
+ ymax.clear();
}
private void initKernelVars() {
@@ -4544,18 +4549,22 @@ public class MyXMLHandler implements DocHandler {
// enforce point or vector or line or plane type if it was given in attribute type
if (type != null) {
- if (type.equals("point")) {
+ if (type.equals("point") && ve instanceof ExpressionNode) {
((ExpressionNode) ve).setForcePoint();
- } else if (type.equals("vector")) {
+ } else if (type.equals("vector") && ve instanceof ExpressionNode) {
((ExpressionNode) ve).setForceVector();
- } else if (type.equals("line")) {
- ((Equation) ve).setForceLine();
- } else if (type.equals("plane")) {
- ((Equation) ve).setForcePlane();
- } else if (type.equals("conic")){
- ((Equation) ve).setForceConic();
- } else if (type.equals("implicitPoly")){
- ((Equation) ve).setForceImplicitPoly();
+ //we must check that we have Equation here as xAxis
+ //has also type "line" but is parsed as ExpressionNode
+ } else if (ve instanceof Equation){
+ if(type.equals("line") ) {
+ ((Equation) ve).setForceLine();
+ } else if (type.equals("plane")) {
+ ((Equation) ve).setForcePlane();
+ } else if (type.equals("conic")) {
+ ((Equation) ve).setForceConic();
+ } else if (type.equals("implicitPoly")) {
+ ((Equation) ve).setForceImplicitPoly();
+ }
}
}
diff --git a/geogebra/io/MyXMLio.java b/geogebra/io/MyXMLio.java
index 6f4c814..42aef1a 100644
--- a/geogebra/io/MyXMLio.java
+++ b/geogebra/io/MyXMLio.java
@@ -60,9 +60,6 @@ public class MyXMLio {
// All xml output is zipped. The created zip archive contains
// an entry named XML_FILE for the construction
final private static String XML_FILE = "geogebra.xml";
- // Added for Intergeo File Format (Yves Kreis) -->
- final private static String I2G_FILE = "construction/intergeo.xml";
- // <-- Added for Intergeo File Format (Yves Kreis)
// All xml output is zipped. The created zip archive contains
// an entry named XML_FILE_MACRO for the macros
@@ -74,35 +71,21 @@ public class MyXMLio {
// All xml output is zipped. The created zip archive *may* contain
// an entry named XML_FILE_THUMBNAIL for the construction
final private static String XML_FILE_THUMBNAIL = "geogebra_thumbnail.png";
- // Added for Intergeo File Format (Yves Kreis) -->
- final private static String I2G_FILE_THUMBNAIL = "construction/preview.png";
- // <-- Added for Intergeo File Format (Yves Kreis)
final public static double THUMBNAIL_PIXELS_X = 200.0; // max no of
// horizontal pixels
final public static double THUMBNAIL_PIXELS_Y = 200.0; // max no of
// vertical pixels
- // Added for Intergeo File Format (Yves Kreis) -->
- final private static String I2G_IMAGES = "resources/images/";
- final private static String I2G_PRIVATE = "private/org.geogebra/";
- final private static String I2G_PRIVATE_IMAGES = "private/org.geogebra/images/";
- // <-- Added for Intergeo File Format (Yves Kreis)
-
// Use the default (non-validating) parser
// private static XMLReaderFactory factory;
private Application app;
private Kernel kernel;
- // Modified for Intergeo File Format (Yves Kreis) -->
// private MyXMLHandler handler;
- private DocHandler handler, ggbDocHandler, i2gDocHandler;
- // <-- Modified for Intergeo File Format (Yves Kreis)
+ private DocHandler handler, ggbDocHandler;
private QDParser xmlParser;
- // Added for Intergeo File Format (Yves Kreis) -->
private Construction cons;
- // <-- Added for Intergeo File Format (Yves Kreis)
-
public MyXMLio(Kernel kernel, Construction cons) {
this.kernel = kernel;
this.cons = cons;
@@ -119,13 +102,6 @@ public class MyXMLio {
ggbDocHandler = kernel.newMyXMLHandler(cons);
return ggbDocHandler;
}
-
- private DocHandler getI2GHandler() {
- if (i2gDocHandler == null)
- i2gDocHandler = new MyI2GHandler(kernel, cons);
- return i2gDocHandler;
- }
-
/**
* Reads zipped file from input stream that includes the construction saved
@@ -175,20 +151,13 @@ public class MyXMLio {
break;
String name = entry.getName();
- if (name.equals(XML_FILE) || name.equals(I2G_PRIVATE + XML_FILE)) {
+ if (name.equals(XML_FILE)) {
// load xml file into memory first
xmlFileBuffer = Util.loadIntoMemory(zip);
xmlFound = true;
ggbHandler = true;
- // Added for Intergeo File Format (Yves Kreis) -->
handler = getGGBHandler();
- } else if (!ggbHandler && name.equals(I2G_FILE)) {
- // load i2g file into memory first
- xmlFileBuffer = Util.loadIntoMemory(zip);
- xmlFound = true;
- handler = getI2GHandler();
- // <-- Added for Intergeo File Format (Yves Kreis)
- } else if (name.equals(XML_FILE_MACRO) || name.equals(I2G_PRIVATE + XML_FILE_MACRO)) {
+ } else if (name.equals(XML_FILE_MACRO)) {
// load macro xml file into memory first
macroXmlFileBuffer = Util.loadIntoMemory(zip);
macroXMLfound = true;
@@ -388,17 +357,9 @@ public class MyXMLio {
// create file
FileOutputStream f = new FileOutputStream(file);
BufferedOutputStream b = new BufferedOutputStream(f);
- // Modified for Intergeo File Format (Yves Kreis) -->
- // writeGeoGebraFile(b);
- if (Application.getExtension(file)
- .equals(Application.FILE_EXT_INTERGEO)) {
- // File Extension for Intergeo: I2G
- writeIntergeoFile(b, true);
- } else {
- // File Extension for GeoGebra: GGB or GGT
- writeGeoGebraFile(b, true);
- }
- // <-- Modified for Intergeo File Format (Yves Kreis)
+
+ writeGeoGebraFile(b, true);
+
b.close();
f.close();
}
@@ -419,12 +380,10 @@ public class MyXMLio {
// write construction images
writeConstructionImages(kernel.getConstruction(), zip);
- // Modified for Intergeo File Format (Yves Kreis) -->
// write construction thumbnails
// writeThumbnail(kernel.getConstruction(), zip);
if (includeThumbail)
writeThumbnail(kernel.getConstruction(), zip, XML_FILE_THUMBNAIL);
- // <-- Modified for Intergeo File Format (Yves Kreis)
// save macros
if (kernel.hasMacros()) {
@@ -465,70 +424,6 @@ public class MyXMLio {
}
/**
- * Creates a zipped file containing the construction saved in xml and i2g
- * format plus all external images. Intergeo File Format (Yves Kreis)
- */
- public void writeIntergeoFile(OutputStream os, boolean includeThumbail) throws IOException {
- boolean isSaving = kernel.isSaving();
- kernel.setSaving(true);
-
- try {
- // zip stream
- ZipOutputStream zip = new ZipOutputStream(os);
- OutputStreamWriter osw = new OutputStreamWriter(zip, "UTF8");
-
- // write I2G file for construction
- zip.putNextEntry(new ZipEntry(I2G_FILE));
- osw.write(getFullI2G());
- osw.flush();
- zip.closeEntry();
-
- // write construction thumbnails
- if (includeThumbail)
- writeThumbnail(kernel.getConstruction(), zip, I2G_FILE_THUMBNAIL);
-
- // write construction images
- writeConstructionImages(kernel.getConstruction(), zip, I2G_IMAGES);
-
- // save macros
- if (kernel.hasMacros()) {
- // get all registered macros from kernel
- ArrayList macros = kernel.getAllMacros();
-
- // write all images used by macros
- writeMacroImages(macros, zip, I2G_PRIVATE_IMAGES);
-
- // write all macros to one special XML file in zip
- zip.putNextEntry(new ZipEntry(I2G_PRIVATE + XML_FILE_MACRO));
- osw.write(getFullMacroXML(macros));
- osw.flush();
- zip.closeEntry();
- }
-
- // write library JavaScript to one special file in zip
- zip.putNextEntry(new ZipEntry(I2G_PRIVATE + JAVASCRIPT_FILE));
- osw.write(kernel.getLibraryJavaScript());
- osw.flush();
- zip.closeEntry();
-
- // write XML file for construction
- zip.putNextEntry(new ZipEntry(I2G_PRIVATE + XML_FILE));
- osw.write(getFullXML());
- osw.flush();
- zip.closeEntry();
-
- osw.close();
- zip.close();
- }
- catch (IOException e) {
- throw e;
- }
- finally {
- kernel.setSaving(isSaving);
- }
- }
-
- /**
* Creates a zipped file containing the given macros in xml format plus all
* their external images (e.g. icons).
*/
@@ -570,7 +465,6 @@ public class MyXMLio {
/**
* Writes all images used in construction to zip.
*/
- // Modified for Intergeo File Format (Yves Kreis) -->
private void writeConstructionImages(Construction cons, ZipOutputStream zip)
throws IOException {
writeConstructionImages(cons, zip, "");
@@ -578,9 +472,6 @@ public class MyXMLio {
private void writeConstructionImages(Construction cons,
ZipOutputStream zip, String filePath) throws IOException {
- // <-- Modified for Intergeo File Format (Yves Kreis)
- // save all GeoImage images
- //TreeSet images = cons.getGeoSetLabelOrder(GeoElement.GEO_CLASS_IMAGE);
TreeSet geos = cons.getGeoSetLabelOrder();
if (geos == null)
return;
@@ -602,12 +493,10 @@ public class MyXMLio {
/**
* Writes thumbnail to zip. Michael Borcherds 2008-04-18
*/
- // Modified for Intergeo File Format (Yves Kreis) -->
// private void writeThumbnail(Construction cons, ZipOutputStream zip)
// throws IOException {
private void writeThumbnail(Construction cons, ZipOutputStream zip,
String fileName) throws IOException {
- // <-- Modified for Intergeo File Format (Yves Kreis)
EuclidianView ev = app.getEuclidianView();
@@ -622,10 +511,7 @@ public class MyXMLio {
//BufferedImage img = app.getExportImage(exportScale);
BufferedImage img = app.getExportImage(THUMBNAIL_PIXELS_X,THUMBNAIL_PIXELS_Y);
if (img != null)
- // Modified for Intergeo File Format (Yves Kreis) -->
- // writeImageToZip(zip, XML_FILE_THUMBNAIL, img);
writeImageToZip(zip, fileName, img);
- // <-- Modified for Intergeo File Format (Yves Kreis)
} catch (Exception e) { } // catch error if size is zero
}
@@ -633,7 +519,6 @@ public class MyXMLio {
/**
* Writes all images used in the given macros to zip.
*/
- // Modified for Intergeo File Format (Yves Kreis) -->
private void writeMacroImages(ArrayList macros, ZipOutputStream zip)
throws IOException {
writeMacroImages(macros, zip, "");
@@ -641,26 +526,19 @@ public class MyXMLio {
private void writeMacroImages(ArrayList macros, ZipOutputStream zip,
String filePath) throws IOException {
- // <-- Modified for Intergeo File Format (Yves Kreis)
if (macros == null)
return;
for (int i = 0; i < macros.size(); i++) {
// save all images in macro construction
Macro macro = (Macro) macros.get(i);
- // Modified for Intergeo File Format (Yves Kreis) -->
- // writeConstructionImages(macro.getMacroConstruction(), zip);
writeConstructionImages(macro.getMacroConstruction(), zip, filePath);
- // <-- Modified for Intergeo File Format (Yves Kreis)
// save macro icon
String fileName = macro.getIconFileName();
BufferedImage img = app.getExternalImage(fileName);
if (img != null)
- // Modified for Intergeo File Format (Yves Kreis) -->
- // writeImageToZip(zip, fileName, img);
writeImageToZip(zip, filePath + fileName, img);
- // <-- Modified for Intergeo File Format (Yves Kreis)
}
}
@@ -776,38 +654,6 @@ public class MyXMLio {
}
/**
- * Returns I2G representation of construction. Intergeo File Format.
- * (Yves Kreis)
- */
- public String getFullI2G() {
- StringBuilder sb = new StringBuilder();
- //addXMLHeader(sb);
-
- sb.append("<!--\n\tIntergeo File Format Version "
- + GeoGebra.I2G_FILE_FORMAT + "\n\twritten by "
- + app.getPlain("ApplicationName") + " "
- + GeoGebra.VERSION_STRING + " (" + GeoGebra.BUILD_DATE
- + ")\n-->\n");
-
- sb.append("<construction>\n");
-
- // save construction
- cons.getConstructionI2G(sb, Construction.CONSTRUCTION);
-
- StringBuilder display = new StringBuilder();
- cons.getConstructionI2G(display, Construction.DISPLAY);
- if (!display.toString().equals("")) {
- sb.append("\t<display>\n");
- sb.append(display.toString());
- sb.append("\t</display>\n");
- }
-
- sb.append("</construction>\n");
-
- return sb.toString();
- }
-
- /**
* Returns XML representation of all settings WITHOUT construction.
*/
public String getPreferencesXML() {
diff --git a/geogebra/io/QDParser.java b/geogebra/io/QDParser.java
index 2ab0c67..5188bbd 100644
--- a/geogebra/io/QDParser.java
+++ b/geogebra/io/QDParser.java
@@ -285,10 +285,8 @@ public class QDParser {
case '-':
if (sb.toString().equals("!-")) {
mode = COMMENT;
- // Added for Intergeo File Format (Yves Kreis) -->
} else {
sb.append((char) c);
- // <-- Added for Intergeo File Format (Yves Kreis)
}
break;
diff --git a/geogebra/io/layout/Perspective.java b/geogebra/io/layout/Perspective.java
index e6863a5..a149932 100644
--- a/geogebra/io/layout/Perspective.java
+++ b/geogebra/io/layout/Perspective.java
@@ -1,5 +1,7 @@
package geogebra.io.layout;
+import geogebra.util.Util;
+
/**
* Structure for a perspective which consists of the docks and the toolbar
* definition.
@@ -247,7 +249,7 @@ public class Perspective {
StringBuilder sb = new StringBuilder();
sb.append("<perspective id=\"");
- sb.append(getId());
+ sb.append(Util.encodeXML(getId()));
sb.append("\">\n");
sb.append("\t<panes>\n");
diff --git a/geogebra/kernel/AlgoConicFivePoints.java b/geogebra/kernel/AlgoConicFivePoints.java
index 4d02f04..5897d42 100644
--- a/geogebra/kernel/AlgoConicFivePoints.java
+++ b/geogebra/kernel/AlgoConicFivePoints.java
@@ -41,6 +41,11 @@ public class AlgoConicFivePoints extends AlgoElement {
private int i, j;
AlgoConicFivePoints(Construction cons, String label, GeoPoint[] P) {
+ this(cons, P);
+ conic.setLabel(label);
+ }
+
+ public AlgoConicFivePoints(Construction cons, GeoPoint[] P) {
super(cons);
this.P = P;
conic = new GeoConic(cons);
@@ -61,7 +66,6 @@ public class AlgoConicFivePoints extends AlgoElement {
C = new double[3][3];
compute();
- conic.setLabel(label);
}
private void setIncidence() {
@@ -88,7 +92,7 @@ public class AlgoConicFivePoints extends AlgoElement {
setDependencies(); // done by AlgoElement
}
- GeoConic getConic() {
+ public GeoConic getConic() {
return conic;
}
GeoPoint[] getPoints() {
diff --git a/geogebra/kernel/AlgoConicFromCoeffList.java b/geogebra/kernel/AlgoConicFromCoeffList.java
index d363d00..1c2a92c 100644
--- a/geogebra/kernel/AlgoConicFromCoeffList.java
+++ b/geogebra/kernel/AlgoConicFromCoeffList.java
@@ -28,10 +28,6 @@ import geogebra.euclidian.EuclidianConstants;
*/
public class AlgoConicFromCoeffList extends AlgoElement {
- /**
- *
- */
- private static final long serialVersionUID = 1L;
private GeoList L; // input A list of 6 coeffs
private GeoConic conic; // output
@@ -39,9 +35,11 @@ public class AlgoConicFromCoeffList extends AlgoElement {
AlgoConicFromCoeffList(Construction cons, String label, GeoList L) {
super(cons);
this.L = L;
- conic = new GeoConic(cons, label, L);
+ conic = new GeoConic(cons);
setInputOutput(); // for AlgoElement
+ compute();
+ conic.setLabel(label);
}
@@ -84,8 +82,6 @@ public class AlgoConicFromCoeffList extends AlgoElement {
final public String toString() {
- // Michael Borcherds 2008-03-30
- // simplified to allow better Chinese translation
- return app.getPlain("ConicFromCoeffList",L.getLabel());
+ return app.getPlain("ConicFromCoeffListA",L.getLabel());
}
}
diff --git a/geogebra/kernel/AlgoDefined.java b/geogebra/kernel/AlgoDefined.java
index bb8f6a7..57d6782 100644
--- a/geogebra/kernel/AlgoDefined.java
+++ b/geogebra/kernel/AlgoDefined.java
@@ -63,7 +63,7 @@ public class AlgoDefined extends AlgoElement {
outputBoolean.setValue(inputGeo.isDefined() && !p.isInfinite());
return;
}
- else if (inputGeo.isGeoPoint()) {
+ else if (inputGeo.isGeoVector()) {
GeoVector v = (GeoVector)inputGeo;
outputBoolean.setValue(inputGeo.isDefined() && !v.isInfinite());
return;
diff --git a/geogebra/kernel/AlgoDependentListExpression.java b/geogebra/kernel/AlgoDependentListExpression.java
index 03e7274..90cf1c0 100644
--- a/geogebra/kernel/AlgoDependentListExpression.java
+++ b/geogebra/kernel/AlgoDependentListExpression.java
@@ -257,6 +257,26 @@ public class AlgoDependentListExpression extends AlgoElement {
}
list.add(geo);
+ }else if (element instanceof GeoText){
+ GeoText text = (GeoText)element;
+ if (i < cachedListSize) {
+ GeoElement cachedGeo = list.getCached(i);
+
+ // the cached element is a point: set value
+ if (cachedGeo.isGeoText()) {
+ ((GeoText) cachedGeo).set(text);
+ geo = cachedGeo;
+ }
+ }
+
+ // no cached point: create new one
+ if (geo == null) {
+ GeoText geoFun = new GeoText(cons);
+ geoFun.set(text);
+ geo = geoFun;
+ }
+ list.add(geo);
+
}
else {
Application.debug("unsupported list addition: "+element.getClass()+"");
diff --git a/geogebra/kernel/AlgoDependentText.java b/geogebra/kernel/AlgoDependentText.java
index eee6c21..b1a0091 100644
--- a/geogebra/kernel/AlgoDependentText.java
+++ b/geogebra/kernel/AlgoDependentText.java
@@ -28,10 +28,6 @@ import geogebra.kernel.arithmetic.ExpressionNode;
*/
public class AlgoDependentText extends AlgoElement {
- /**
- *
- */
- private static final long serialVersionUID = 1L;
private ExpressionNode root; // input
private GeoText text; // output
@@ -75,17 +71,27 @@ public class AlgoDependentText extends AlgoElement {
protected void setInputOutput() {
input = root.getGeoElementVariables();
- output = new GeoElement[1];
- output[0] = text;
+ setOutputLength(1);
+ setOutput(0,text);
setDependencies(); // done by AlgoElement
}
public GeoText getGeoText() { return text; }
-
+ String oldFormat = "";
// calc the current value of the arithmetic tree
protected final void compute() {
-
+ String format = text.getPrintDecimals()+","+text.getPrintFigures();
text.setTemporaryPrintAccuracy();
+ if(!format.equals(oldFormat)){
+ oldFormat = format;
+ for(int i=0;i<input.length;i++)
+ if(input[i].getParentAlgorithm()!=null &&
+ input[i].isGeoText() && !input[i].isLabelSet()){
+ input[i].setVisualStyle(text);
+ input[i].getParentAlgorithm().update();
+ }
+ }
+
try {
boolean latex = text.isLaTeX();
@@ -108,11 +114,13 @@ public class AlgoDependentText extends AlgoElement {
final public String toString() {
// was defined as e.g. text0 = "Radius: " + r
+ if (root == null) return "";
return root.toString();
}
final public String toRealString() {
// was defined as e.g. text0 = "Radius: " + r
+ if (root == null) return "";
return root.toRealString();
}
}
diff --git a/geogebra/kernel/AlgoDeterminant.java b/geogebra/kernel/AlgoDeterminant.java
index 55fc74e..3c57384 100644
--- a/geogebra/kernel/AlgoDeterminant.java
+++ b/geogebra/kernel/AlgoDeterminant.java
@@ -22,11 +22,10 @@ import geogebra.util.GgbMat;
public class AlgoDeterminant extends AlgoElement {
- private static final long serialVersionUID = 1L;
private GeoList inputList; //input
private GeoNumeric num; //output
- AlgoDeterminant(Construction cons, String label, GeoList inputList) {
+ public AlgoDeterminant(Construction cons, String label, GeoList inputList) {
super(cons);
this.inputList = inputList;
@@ -37,24 +36,27 @@ public class AlgoDeterminant extends AlgoElement {
num.setLabel(label);
}
- public String getClassName() {
+ @Override
+ public String getClassName() {
return "AlgoDeterminant";
}
- protected void setInputOutput(){
+ @Override
+ protected void setInputOutput(){
input = new GeoElement[1];
input[0] = inputList;
- output = new GeoElement[1];
- output[0] = num;
+ super.setOutputLength(1);
+ super.setOutput(0, num);
setDependencies(); // done by AlgoElement
}
- GeoNumeric getResult() {
+ public GeoNumeric getResult() {
return num;
}
- protected final void compute() {
+ @Override
+ public final void compute() {
GgbMat matrix = new GgbMat(inputList);
@@ -63,7 +65,12 @@ public class AlgoDeterminant extends AlgoElement {
return;
}
- num.setValue(matrix.getDeterminant());
+ double det = matrix.determinant();
+
+ if(matrix.hasOnlyIntegers())
+ det = Math.round(det);
+
+ num.setValue(det);
// Determinant[{{1,2},{3,4}}]
}
diff --git a/geogebra/kernel/AlgoElement.java b/geogebra/kernel/AlgoElement.java
index 52b498d..edb7261 100644
--- a/geogebra/kernel/AlgoElement.java
+++ b/geogebra/kernel/AlgoElement.java
@@ -39,9 +39,6 @@ import java.util.TreeSet;
public abstract class AlgoElement extends ConstructionElement implements EuclidianViewCE {
private static ResourceBundle rbalgo2command;
- // Added for Intergeo File Format (Yves Kreis) -->
- private static ResourceBundle rbalgo2intergeo;
- // <-- Added for Intergeo File Format (Yves Kreis)
protected GeoElement[] input;
/**
@@ -384,24 +381,6 @@ public abstract class AlgoElement extends ConstructionElement implements Euclidi
return rbalgo2command.getString(classname);
}
- // Added for Intergeo File Format (Yves Kreis) -->
- private String getIntergeoString(String classname) {
- // init rbalgo2intergeo if needed
- // for translation of Algo-classname to Intergeo name
- if (rbalgo2intergeo == null) {
- rbalgo2intergeo = app.initAlgo2IntergeoBundle();
- }
-
- // translate algorithm class name to Intergeo name
- try {
- return rbalgo2intergeo.getString(classname);
- } catch (MissingResourceException e) {
- return classname;
- }
- }
-
- // <-- Added for Intergeo File Format (Yves Kreis)
-
// in setInputOutput() the member vars input and output are set
abstract protected void setInputOutput();
@@ -1029,7 +1008,9 @@ public abstract class AlgoElement extends ConstructionElement implements Euclidi
private void appendCheckVector(StringBuilder sb, GeoElement geo, boolean real) {
String cmd = real ? geo.getRealLabel() : geo.getLabel();
if (geo.isGeoVector()) {
- String vectorCommand = app.getCommand("Vector") + "["; // want it translated eg for redefine
+ String vectorCommand = "Vector[";
+ if(kernel.isPrintLocalizedCommandNames())
+ vectorCommand = app.getCommand("Vector") + "["; // want it translated eg for redefine
// dialog
boolean needsWrapping = !geo.isLabelSet() && !cmd.startsWith(vectorCommand);
@@ -1077,30 +1058,6 @@ public abstract class AlgoElement extends ConstructionElement implements Euclidi
}
/**
- * translate class name to Intergeo name Intergeo File Format (Yves Kreis)
- *
- * @return intergeo command name
- */
- String getIntergeoName() {
- String cmdname, classname;
- // get class name
- // classname = this.getClass().toString();
- // classname = classname.substring(classname.lastIndexOf('.') + 1);
- classname = getClassName();
- // dependent algorithm is an "Expression"
- if (classname.startsWith("AlgoDependent")) {
- cmdname = "Expression";
- } else if (classname.equals("AlgoPointOnPath")) {
- AlgoPointOnPath algo = (AlgoPointOnPath) this;
- cmdname = getIntergeoString(classname + "+" + algo.getPath().toGeoElement().getClassName());
- } else {
- // translate algorithm class name to Intergeo name
- cmdname = getIntergeoString(classname);
- }
- return cmdname;
- }
-
- /**
* Returns this algorithm and it's output objects (GeoElement) in XML format. GeoGebra File Format.
*/
@Override
@@ -1169,47 +1126,6 @@ public abstract class AlgoElement extends ConstructionElement implements Euclidi
}
}
- /**
- * Returns this algorithm or it's output objects (GeoElement) in I2G format. Intergeo File Format. (Yves
- * Kreis)
- */
- @Override
- public void getI2G(StringBuilder sb, int mode) {
- // this is needed for helper commands like
- // intersect for single intersection points
- if (!isPrintedInXML) {
- return;
- }
-
- // USE INTERNAL COMMAND NAMES IN EXPRESSION
- boolean oldValue = kernel.isPrintLocalizedCommandNames();
- kernel.setPrintLocalizedCommandNames(false);
-
- try {
- if (mode == CONSTRAINTS) {
- // command
- String cmdname = getIntergeoName();
- if (!cmdname.equals("Expression")) {
- sb.append(getCmdI2G(cmdname));
- }
- } else {// if (output != null){
- // output
- GeoElement geo;
- for (int i = 0; i < getOutputLength(); i++) {
- geo = getOutput(i);
- // save only GeoElements that have a valid label
- if (geo.isLabelSet()) {
- geo.getI2G(sb, mode);
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- kernel.setPrintLocalizedCommandNames(oldValue);
- }
-
// Expressions should be shown as out = expression
// e.g. <expression label="u" exp="a + 7 b"/>
protected String getExpXML() {
@@ -1322,56 +1238,11 @@ public abstract class AlgoElement extends ConstructionElement implements Euclidi
return sb.toString();
}
- // standard command has cmdname, output, input
- // Added for Intergeo File Format (Yves Kreis) -->
- private String getCmdI2G(String cmdname) {
- StringBuilder sb = new StringBuilder();
- sb.append("\t\t<" + cmdname + ">\n");
-
- String type;
-
- // add output information
- // if (output != null) {
- for (int i = 0; i < getOutputLength(); i++) {
- type = getXMLtypeString(getOutput(i));
- sb.append("\t\t\t<" + type + " out=\"true\">");
- sb.append(Util.encodeXML(getOutput(i).getLabel()));
- sb.append("</" + type + ">\n");
- }
- // }
-
- // add input information
- if (input != null) {
- if (cmdname.equals("line_parallel_to_line_through_point")
- || cmdname.equals("line_perpendicular_to_line_through_point")) {
- type = getXMLtypeString(input[1]);
- sb.append("\t\t\t<" + type + ">");
- sb.append(Util.encodeXML(input[1].getLabel()));
- sb.append("</" + type + ">\n");
- type = getXMLtypeString(input[0]);
- sb.append("\t\t\t<" + type + ">");
- sb.append(Util.encodeXML(input[0].getLabel()));
- sb.append("</" + type + ">\n");
- } else {
- for (int i = 0; i < input.length; i++) {
- type = getXMLtypeString(input[i]);
- sb.append("\t\t\t<" + type + ">");
- sb.append(Util.encodeXML(input[i].getLabel()));
- sb.append("</" + type + ">\n");
- }
- }
- }
-
- sb.append("\t\t</" + cmdname + ">\n");
- return sb.toString();
- }
final public String getXMLtypeString(GeoElement geo) {
return geo.getClassName().substring(3).toLowerCase(Locale.US);
}
- // <-- Added for Intergeo File Format (Yves Kreis)
-
/**
* Sets whether the output of this command should be labeled. This setting is used for getXML().
*
diff --git a/geogebra/kernel/AlgoIntersectConics.java b/geogebra/kernel/AlgoIntersectConics.java
index 73f2dea..2dbfea1 100644
--- a/geogebra/kernel/AlgoIntersectConics.java
+++ b/geogebra/kernel/AlgoIntersectConics.java
@@ -800,6 +800,10 @@ public class AlgoIntersectConics extends AlgoIntersect {
// Solving system of equations
solnr = sysSolver.solveSystemOfQuadraticEquations(param1, param2, res);
+ if (solnr == -1) {
+ return false;
+ }
+
for(int i=0; i<solnr; i++)
points[i].setCoords(res[i][0], res[i][1], 1.0d);
diff --git a/geogebra/kernel/AlgoIntersectLinePolygonalRegion.java b/geogebra/kernel/AlgoIntersectLinePolygonalRegion.java
index c80b63b..733f3cf 100644
--- a/geogebra/kernel/AlgoIntersectLinePolygonalRegion.java
+++ b/geogebra/kernel/AlgoIntersectLinePolygonalRegion.java
@@ -388,7 +388,7 @@ public class AlgoIntersectLinePolygonalRegion extends AlgoElement{
}
public String toString() {
- return app.getPlain("IntersectionPathsOfAB",((GeoElement) g).getLabel(),p.getLabel());
+ return app.getPlain("IntersectionOfAandB",((GeoElement) g).getLabel(),p.getLabel());
}
String labelPrefix = null;
diff --git a/geogebra/kernel/AlgoInvert.java b/geogebra/kernel/AlgoInvert.java
index a329f5f..0db656f 100644
--- a/geogebra/kernel/AlgoInvert.java
+++ b/geogebra/kernel/AlgoInvert.java
@@ -22,11 +22,10 @@ import geogebra.util.GgbMat;
public class AlgoInvert extends AlgoElement {
- private static final long serialVersionUID = 1L;
private GeoList inputList; //input
private GeoList outputList; //output
- AlgoInvert(Construction cons, String label, GeoList inputList) {
+ public AlgoInvert(Construction cons, String label, GeoList inputList) {
super(cons);
this.inputList = inputList;
@@ -37,61 +36,49 @@ public class AlgoInvert extends AlgoElement {
outputList.setLabel(label);
}
- public String getClassName() {
+ @Override
+ public String getClassName() {
return "AlgoInvert";
}
- protected void setInputOutput(){
+ @Override
+ protected void setInputOutput(){
input = new GeoElement[1];
input[0] = inputList;
- output = new GeoElement[1];
- output[0] = outputList;
+ super.setOutputLength(1);
+ super.setOutput(0, outputList);
setDependencies(); // done by AlgoElement
}
- GeoList getResult() {
+ public GeoList getResult() {
return outputList;
}
- protected final void compute() {
+ @Override
+ public final void compute() {
- GgbMat matrix = new GgbMat(inputList);
+ GgbMat matrix = new GgbMat(inputList);
if (matrix.isUndefined() || !matrix.isSquare()) {
outputList.setUndefined();
return;
}
- /*
- if (matrix.getRows() == 1) {
-
- double det = matrix.det();
-
- if (kernel.isZero(det)) {
- outputList.setUndefined();
- return;
- }
-
- // invert 1x1 matrix
- matrix = new GgbMatrix(1,1);
- matrix.set(1,1,1/det);
-
- outputList = matrix.getGeoList(outputList, cons);
- return;
- }*/
-
+ // needed for eg {{1, 2, 3}, {4, 5, 6}, {7, 8, 9}}
+ boolean integers = matrix.hasOnlyIntegers();
+ double det = Math.round(matrix.determinant());
matrix.inverseImmediate();
+ if(integers){
+ for(int i=0;i<inputList.size();i++)
+ for(int j=0;j<inputList.size();j++){
+ matrix.setEntry(i, j, Math.round(matrix.getEntry(i, j)*det)/det);
+ }
+ }
- if (matrix.isUndefined()) {
- //outputList.setUndefined();
- //return;
- }
// Invert[{{1,2},{3,4}}]
- outputList = matrix.getGeoList(outputList, cons);
-
- }
-
+ matrix.getGeoList(outputList, cons);
+ }
}
diff --git a/geogebra/kernel/AlgoLaTeX.java b/geogebra/kernel/AlgoLaTeX.java
index 55be987..e2795ca 100644
--- a/geogebra/kernel/AlgoLaTeX.java
+++ b/geogebra/kernel/AlgoLaTeX.java
@@ -30,7 +30,6 @@ import java.util.ArrayList;
*/
public class AlgoLaTeX extends AlgoElement {
- private static final long serialVersionUID = 1L;
private GeoElement geo; // input
private GeoBoolean substituteVars;
private GeoBoolean showName;
@@ -89,11 +88,11 @@ public class AlgoLaTeX extends AlgoElement {
input[i] = geos.get(i);
- output = new GeoElement[1];
- output[0] = text;
+ setOutputLength(1);
+ setOutput(0,text);
setDependencies(); // done by AlgoElement
}
-
+ private String oldFormat = "";
public GeoText getGeoText() { return text; }
// calc the current value of the arithmetic tree
@@ -111,7 +110,19 @@ public class AlgoLaTeX extends AlgoElement {
boolean substitute = substituteVars == null ? true : substituteVars.getBoolean();
boolean show = showName == null ? false : showName.getBoolean();
- text.setTemporaryPrintAccuracy();
+ String format = text.getPrintDecimals()+","+text.getPrintFigures();
+ text.setTemporaryPrintAccuracy();
+ if(!format.equals(oldFormat)){
+ oldFormat = format;
+ for(int i=0;i<input.length;i++)
+ if(input[i].getParentAlgorithm()!=null &&
+ input[i].isGeoText() && !input[i].isLabelSet()){
+ input[i].setVisualStyle(text);
+ input[i].getParentAlgorithm().update();
+ }
+ }
+
+
//Application.debug(geo.getFormulaString(ExpressionNode.STRING_TYPE_LATEX, substitute ));
if(show){
diff --git a/geogebra/kernel/AlgoLocus.java b/geogebra/kernel/AlgoLocus.java
index f8474e2..b2467e7 100644
--- a/geogebra/kernel/AlgoLocus.java
+++ b/geogebra/kernel/AlgoLocus.java
@@ -14,6 +14,7 @@ package geogebra.kernel;
import geogebra.euclidian.EuclidianConstants;
+import geogebra.kernel.implicit.GeoImplicitPoly;
import geogebra.main.Application;
import java.awt.geom.Point2D;
@@ -314,7 +315,7 @@ public class AlgoLocus extends AlgoElement implements EuclidianViewCE {
// compute locus line
final protected void compute() {
- if (!movingPoint.isDefined() || macroCons == null || !path.toGeoElement().isDefined()) {
+ if (!movingPoint.isDefined() || macroCons == null || !isPathIterable(path.toGeoElement())) {
locus.setUndefined();
return;
}
@@ -505,6 +506,12 @@ public class AlgoLocus extends AlgoElement implements EuclidianViewCE {
//Application.debug("LOCUS COMPUTE updateCascades: " + countUpdates + ", cache used: " + useCache);
}
+ private static boolean isPathIterable(GeoElement geoElement) {
+ if(geoElement.isGeoImplicitPoly())
+ return ((GeoImplicitPoly)geoElement).isOnScreen();
+ return geoElement.isDefined();
+ }
+
/**
* Calls Pcopy.updateCascade() to compute Qcopy. For non-continous constructions
* caching of previous paramater positions is used.
diff --git a/geogebra/kernel/AlgoMidpoint.java b/geogebra/kernel/AlgoMidpoint.java
index c8110e8..fe281d3 100644
--- a/geogebra/kernel/AlgoMidpoint.java
+++ b/geogebra/kernel/AlgoMidpoint.java
@@ -39,6 +39,7 @@ public class AlgoMidpoint extends AlgoMidpointND {
*/
AlgoMidpoint(Construction cons, String label, GeoPoint P, GeoPoint Q) {
this(cons, P, Q);
+
getPoint().setLabel(label);
}
@@ -50,6 +51,7 @@ public class AlgoMidpoint extends AlgoMidpointND {
*/
AlgoMidpoint(Construction cons, GeoPoint P, GeoPoint Q) {
super(cons,P,Q);
+
}
protected GeoPointND newGeoPoint(Construction cons) {
diff --git a/geogebra/kernel/AlgoRotateText.java b/geogebra/kernel/AlgoRotateText.java
index db884aa..fb4c6a4 100644
--- a/geogebra/kernel/AlgoRotateText.java
+++ b/geogebra/kernel/AlgoRotateText.java
@@ -22,7 +22,6 @@ package geogebra.kernel;
public class AlgoRotateText extends AlgoElement {
- private static final long serialVersionUID = 1L;
private GeoText text; //output
private GeoText args; //input
private GeoNumeric angle; // input
@@ -82,8 +81,20 @@ public class AlgoRotateText extends AlgoElement {
GeoText getResult() {
return text;
}
-
+ private String oldFormat = "";
protected final void compute() {
+ String format = text.getPrintDecimals()+","+text.getPrintFigures();
+ text.setTemporaryPrintAccuracy();
+ if(!format.equals(oldFormat)){
+ oldFormat = format;
+ for(int i=0;i<input.length;i++)
+ if(input[i].getParentAlgorithm()!=null &&
+ input[i].isGeoText() && !input[i].isLabelSet()){
+ input[i].setVisualStyle(text);
+ input[i].getParentAlgorithm().update();
+ }
+ }
+ text.restorePrintAccuracy();
if (!args.isDefined() || !angle.isDefined() || angle.isInfinite()) {
text.setTextString("");
return;
diff --git a/geogebra/kernel/AlgoShearOrStretch.java b/geogebra/kernel/AlgoShearOrStretch.java
index 67aa1a9..86f9eff 100644
--- a/geogebra/kernel/AlgoShearOrStretch.java
+++ b/geogebra/kernel/AlgoShearOrStretch.java
@@ -176,7 +176,7 @@ public class AlgoShearOrStretch extends AlgoTransformation {
}
protected boolean swapOrientation(boolean posOrientation){
- if(shear)
+ if(shear || num == null)
return posOrientation;
return posOrientation ^ (num.getDouble()<0);
}
diff --git a/geogebra/kernel/AlgoStemPlot.java b/geogebra/kernel/AlgoStemPlot.java
index 8f1da04..3387fa5 100644
--- a/geogebra/kernel/AlgoStemPlot.java
+++ b/geogebra/kernel/AlgoStemPlot.java
@@ -184,7 +184,7 @@ public class AlgoStemPlot extends AlgoElement {
leaf = Math.abs(n % 10);
// if our stem is not the current one, add stems until we reach it
- while(currentStem != stem){
+ while(currentStem < stem){
currentStem++;
lines.add(new ArrayList<Integer>());
lines.get(lines.size()-1).add(currentStem);
@@ -218,7 +218,7 @@ public class AlgoStemPlot extends AlgoElement {
double[] data = new double[size];
for (int i = 0 ; i < size ; i++) {
GeoElement geo = geoList.get(i);
- if (!geo.isGeoNumeric()) {
+ if (!geo.isGeoNumeric() || !geo.isDefined()) {
text.setTextString("");
return;
}
diff --git a/geogebra/kernel/AlgoText.java b/geogebra/kernel/AlgoText.java
index 1bb7485..4103b0f 100644
--- a/geogebra/kernel/AlgoText.java
+++ b/geogebra/kernel/AlgoText.java
@@ -115,7 +115,7 @@ public class AlgoText extends AlgoElement {
}
public GeoText getGeoText() { return text; }
-
+ private String oldFormat = "";
protected final void compute() {
// undefined text
@@ -128,7 +128,18 @@ public class AlgoText extends AlgoElement {
return;
}
- text.setTemporaryPrintAccuracy();
+ String format = text.getPrintDecimals()+","+text.getPrintFigures();
+ text.setTemporaryPrintAccuracy();
+ if(!format.equals(oldFormat)){
+ oldFormat = format;
+ for(int i=0;i<input.length;i++)
+ if(input[i].getParentAlgorithm()!=null &&
+ input[i].isGeoText() && !input[i].isLabelSet()){
+ input[i].setVisualStyle(text);
+ input[i].getParentAlgorithm().update();
+ }
+ }
+
// standard case: set text
boolean bool = substituteVars == null ? true : substituteVars.getBoolean();
diff --git a/geogebra/kernel/Construction.java b/geogebra/kernel/Construction.java
index fcb66a8..99acced 100644
--- a/geogebra/kernel/Construction.java
+++ b/geogebra/kernel/Construction.java
@@ -16,6 +16,8 @@ import geogebra.euclidian.EuclidianView;
import geogebra.io.MyXMLio;
import geogebra.kernel.arithmetic.ExpressionNode;
import geogebra.kernel.arithmetic.ExpressionNodeConstants;
+import geogebra.kernel.arithmetic.Function;
+import geogebra.kernel.arithmetic.FunctionVariable;
import geogebra.kernel.arithmetic.NumberValue;
import geogebra.kernel.cas.AlgoDependentCasCell;
import geogebra.kernel.kernelND.GeoPointND;
@@ -27,7 +29,6 @@ import geogebra.util.Util;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.TreeSet;
import java.util.regex.Matcher;
@@ -46,13 +47,6 @@ import java.util.regex.Matcher;
*/
public class Construction {
- /** Added for Intergeo File Format (Yves Kreis) -->
- writes the <elements> and the <constraints> part */
- public static final int CONSTRUCTION = 0;
- /** Added for Intergeo File Format (Yves Kreis)
- * writes the <display> part with the <display> tag */
- public static final int DISPLAY = 1;
-
private String title, author, date;
// text for dynamic worksheets: 0 .. above, 1 .. below
private String[] worksheetText = new String[2];
@@ -906,7 +900,7 @@ public class Construction {
if (updateAlgos != null) {
Application app = kernel.getApplication();
- if (app.useFullGui())
+ if (app.useFullGui() && app.getGuiManager() != null)
app.getGuiManager().updateConstructionProtocol();
}
@@ -1209,7 +1203,7 @@ public class Construction {
* @param label label to be looked for
* @return may return null
*/
- GeoElement lookupLabel(String label) {
+ public GeoElement lookupLabel(String label) {
return lookupLabel(label, false);
}
@@ -1416,150 +1410,159 @@ public class Construction {
}
}
+ } else if (label.length() == 1) {
+ if (label.equals("O")) {
+
+ createdGeo = new GeoPoint(this, 0d, 0d, 1d);
+ label = "O";
+ auxilliary = true;
+ fix = true;
+ }
} else if (label.length() == 3) {
if (label.equals("lnx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("ln(x)",true);
- label=createdGeo.getDefaultLabel();
+
+ createdGeo = createFunction(ExpressionNode.LOG);
+ label = null;
auxilliary = false;
fix = false;
}
} else if (label.length() == 4) {
if (label.equals("sinx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("sin(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.SIN);
+ label = null;
auxilliary = false;
fix = false;
} else if (label.equals("cosx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("cos(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.COS);
+ label = null;
auxilliary = false;
fix = false;
} else if (label.equals("tanx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("tan(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.TAN);
+ label = null;
auxilliary = false;
fix = false;
} else if (label.equals("secx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("sec(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.SEC);
+ label = null;
auxilliary = false;
fix = false;
} else if (label.equals("cscx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("csc(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.CSC);
+ label = null;
auxilliary = false;
fix = false;
} else if (label.equals("cotx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("cot(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.COT);
+ label = null;
auxilliary = false;
fix = false;
} else if (label.equals("logx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("log(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.LOG);
+ label = null;
auxilliary = false;
fix = false;
}
} else if (label.length() == 5) {
if (label.equals("sinhx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("sinh(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.SINH);
+ label = null;
auxilliary = false;
fix = false;
} else if (label.equals("coshx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("cosh(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.COSH);
+ label = null;
auxilliary = false;
fix = false;
} else if (label.equals("tanhx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("tanh(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.TANH);
+ label = null;
auxilliary = false;
fix = false;
} else if (label.equals("sechx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("sech(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.SECH);
+ label = null;
auxilliary = false;
fix = false;
} else if (label.equals("cothx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("coth(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.COTH);
+ label = null;
auxilliary = false;
fix = false;
} else if (label.equals("acosx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("acos(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.ARCCOS);
+ label = null;
auxilliary = false;
fix = false;
} else if (label.equals("asinx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("asin(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.ARCSIN);
+ label = null;
auxilliary = false;
fix = false;
} else if (label.equals("atanx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("atan(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.ARCTAN);
+ label = null;
auxilliary = false;
fix = false;
}
} else if (label.length() == 6) {
if (label.equals("cosecx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("cosec(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.CSC);
+ label = null;
auxilliary = false;
fix = false;
} else if (label.equals("arcosx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("acos(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.ARCCOS);
+ label = null;
auxilliary = false;
fix = false;
} else if (label.equals("asinhx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("asinh(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.ASINH);
+ label = null;
auxilliary = false;
fix = false;
} else if (label.equals("acoshx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("acosh(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.ACOSH);
+ label = null;
auxilliary = false;
fix = false;
} else if (label.equals("atanhx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("atanh(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.ATANH);
+ label = null;
auxilliary = false;
fix = false;
}
} else if (label.length() == 7) {
if (label.equals("arccosx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("acos(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.ARCCOS);
+ label = null;
auxilliary = false;
fix = false;
} else if (label.equals("arcsinx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("asin(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.ARCSIN);
+ label = null;
auxilliary = false;
fix = false;
} else if (label.equals("arctanx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("atan(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.ARCTAN);
+ label = null;
auxilliary = false;
fix = false;
}
} else if (label.length() == 8) {
if (label.equals("arccoshx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("acosh(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.ACOSH);
+ label = null;
auxilliary = false;
fix = false;
} else if (label.equals("arcsinhx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("asinh(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.ASINH);
+ label = null;
auxilliary = false;
fix = false;
} else if (label.equals("arctanhx")) {
- createdGeo = kernel.getAlgebraProcessor().evaluateToFunction("atanh(x)",true);
- label=createdGeo.getDefaultLabel();
+ createdGeo = createFunction(ExpressionNode.ATANH);
+ label = null;
auxilliary = false;
fix = false;
}
@@ -1576,7 +1579,9 @@ public class Construction {
//setSuppressLabelCreation(false);
createdGeo.setAuxiliaryObject(auxilliary);
- createdGeo.setLabel(label);
+ if (label != null) {
+ createdGeo.setLabel(label);
+ }
createdGeo.setFixed(fix);
// revert to previous label creation state
@@ -1606,6 +1611,13 @@ public class Construction {
return createdGeo;
}
+ private GeoFunction createFunction(int op) {
+ FunctionVariable x = new FunctionVariable(kernel);
+ ExpressionNode en = new ExpressionNode(kernel, x, op, null);
+ Function fun = new Function(en, x);
+ return new GeoFunction(this, fun);
+ }
+
/**
* Returns whether the specified label will automatically create a GeoElement
* when autoCreateGeoElement() is called with it.
@@ -2283,76 +2295,6 @@ public class Construction {
}
}
- /*
- * XML output
- */
-
-// /**
-// * Returns this construction in XML format. GeoGebra File Format.
-// */
-// public String getXML(boolean includeConstruction) {
-// StringBuilder sb = new StringBuilder();
-//
-// // kernel settings
-// sb.append("<kernel>\n");
-//
-// // continuity: true or false, since V3.0
-// sb.append("\t<continuous val=\"");
-// sb.append(kernel.isContinuous());
-// sb.append("\"/>\n");
-//
-// if (kernel.useSignificantFigures) {
-// // significant figures
-// sb.append("\t<significantfigures val=\"");
-// sb.append(kernel.getPrintFigures());
-// sb.append("\"/>\n");
-// }
-// else
-// {
-// // decimal places
-// sb.append("\t<decimals val=\"");
-// sb.append(kernel.getPrintDecimals());
-// sb.append("\"/>\n");
-// }
-//
-// // angle unit
-// sb.append("\t<angleUnit val=\"");
-// sb.append(angleUnit == Kernel.ANGLE_RADIANT ? "radiant" : "degree");
-// sb.append("\"/>\n");
-//
-// // coord style
-// sb.append("\t<coordStyle val=\"");
-// sb.append(kernel.getCoordStyle());
-// sb.append("\"/>\n");
-//
-// // animation
-// if (kernel.isAnimationRunning()) {
-// sb.append("\t<startAnimation val=\"");
-// sb.append(kernel.isAnimationRunning());
-// sb.append("\"/>\n");
-// }
-//
-// sb.append("</kernel>\n");
-//
-// // construction XML
-// if (includeConstruction)
-// sb.append(getConstructionXML());
-//
-// return sb.toString();
-// }
-
-// /**
-// * Returns this construction in I2G format. Intergeo File Format.
-// * (Yves Kreis)
-// */
-// public String getI2G(int mode) {
-// StringBuilder sb = new StringBuilder();
-//
-// // construction I2G
-// sb.append(getConstructionI2G(mode));
-//
-// return sb.toString();
-// }
/**
* Returns this construction in XML format. GeoGebra File Format.
@@ -2452,59 +2394,6 @@ public class Construction {
}
-
-
-
- /**
- * Returns this construction in I2G format. Intergeo File Format.
- * (Yves Kreis)
- * @param sb String builder to which the XML is appended
- * @param mode output mode, either CONSTRUCTION (0) or DISPLAY (1)
- */
- public void getConstructionI2G(StringBuilder sb, int mode) {
-
- // change kernel settings temporarily
- int oldCoordStlye = kernel.getCoordStyle();
- int oldPrintForm = kernel.getCASPrintForm();
- boolean oldValue = kernel.isPrintLocalizedCommandNames();
- kernel.setCoordStyle(Kernel.COORD_STYLE_DEFAULT);
- kernel.setCASPrintForm(ExpressionNode.STRING_TYPE_GEOGEBRA_XML);
- kernel.setPrintLocalizedCommandNames(false);
-
- try {
- ConstructionElement ce;
- int size = ceList.size();
-
- if (mode == CONSTRUCTION) {
- sb.append("\t<elements>\n");
- for (int i = 0; i < size; ++i) {
- ce = (ConstructionElement) ceList.get(i);
- ce.getI2G(sb, ConstructionElement.ELEMENTS);
- }
- sb.append("\t</elements>\n");
-
- sb.append("\t<constraints>\n");
- for (int i = 0; i < size; ++i) {
- ce = (ConstructionElement) ceList.get(i);
- ce.getI2G(sb, ConstructionElement.CONSTRAINTS);
- }
- sb.append("\t</constraints>\n");
- } else if (mode == DISPLAY) {
- for (int i = 0; i < size; ++i) {
- ce = (ConstructionElement) ceList.get(i);
- ce.getI2G(sb, ConstructionElement.DISPLAY);
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- kernel.setCoordStyle(oldCoordStlye);
- kernel.setCASPrintForm(oldPrintForm);
- kernel.setPrintLocalizedCommandNames(oldValue);
-
- }
-
/**
* Returns undo xml string of this construction.
* @return StringBuilder with xml of this construction.
diff --git a/geogebra/kernel/ConstructionElement.java b/geogebra/kernel/ConstructionElement.java
index 7177ab2..36139e9 100644
--- a/geogebra/kernel/ConstructionElement.java
+++ b/geogebra/kernel/ConstructionElement.java
@@ -19,15 +19,6 @@ import java.util.TreeSet;
public abstract class ConstructionElement
implements Comparable<ConstructionElement> {
- // Added for Intergeo File Format (Yves Kreis) -->
- // writes the <elements> part
- public static final int ELEMENTS = 0;
- // writes the <constraints> part
- public static final int CONSTRAINTS = 1;
- // writes the <display> part
- public static final int DISPLAY = 2;
- // <-- Added for Intergeo File Format (Yves Kreis)
-
protected transient Construction cons; // parent construction of this element
protected transient Kernel kernel; // parent kernel of this element
protected transient Application app; // parent application of this element
@@ -127,13 +118,6 @@ implements Comparable<ConstructionElement> {
public abstract void getXML(StringBuilder sb);
/**
- * Returns I2G representation of this object.
- * Intergeo File Format. (Yves Kreis)
- * @return xml String
- */
- public abstract void getI2G(StringBuilder sb, int mode);
-
- /**
* Removes this object from the current construction.
*/
public abstract void remove();
diff --git a/geogebra/kernel/GeoElement.java b/geogebra/kernel/GeoElement.java
index a973a1d..a96508c 100644
--- a/geogebra/kernel/GeoElement.java
+++ b/geogebra/kernel/GeoElement.java
@@ -889,7 +889,7 @@ public abstract class GeoElement extends ConstructionElement implements
R1 = X;
G1 = 0;
B1 = C;
- } else if (H < 6) {
+ } else {
R1 = C;
G1 = 0;
B1 = X;
@@ -2563,15 +2563,17 @@ public abstract class GeoElement extends ConstructionElement implements
}
sb.append(cellName);
- if (cellGeo.isGeoFunction()) {
- sb.append("(x)");
+ if (cellGeo instanceof FunctionalNVar){
+ sb.append("(");
+ sb.append(((FunctionalNVar)cellGeo).getVarString());
+ sb.append(")");
}
// getLabel() returns algoParent.getCommandDescription() or
// toValueString()
// if there's no label (eg {1,2})
String label = cellGeo.getLabel();
-
+
// need an = for B3=B4
// need a : for B2:x^2 + y^2 = 2
if (label.indexOf('=') == -1) {
@@ -2585,11 +2587,13 @@ public abstract class GeoElement extends ConstructionElement implements
// we only sometimes need (x), eg
// B2(x)=f(x)
// B2(x)=x^2
- if (cellGeo.isGeoFunction() && cellGeo.isLabelSet()) {
- sb.append("(x)");
+ if (cellGeo instanceof FunctionalNVar && cellGeo.isLabelSet()) {
+ sb.append('(');
+ sb.append(((FunctionalNVar) cellGeo).getVarString());
+ sb.append(')');
}
- // Application.debug(sb.toString());
+ //Application.debug(sb.toString());
app.getKernel().getAlgebraProcessor()
.processAlgebraCommand(sb.toString(), false);
@@ -4396,10 +4400,6 @@ public abstract class GeoElement extends ConstructionElement implements
return getClassName().substring(3).toLowerCase(Locale.US);
}
- public String getI2GtypeString() {
- return getXMLtypeString();
- }
-
public String getXML() {
StringBuilder sb = new StringBuilder();
getXML(sb);
@@ -4500,64 +4500,6 @@ public abstract class GeoElement extends ConstructionElement implements
}
}
- /**
- * save object in i2g format Intergeo File Format (Yves Kreis)
- */
- @Override
- public void getI2G(StringBuilder sb, int mode) {
- boolean oldValue = kernel.isPrintLocalizedCommandNames();
- kernel.setPrintLocalizedCommandNames(false);
-
- String type = getI2GtypeString();
-
- if (mode == CONSTRAINTS) {
- if (isIndependent() || isPointOnPath()) {
- sb.append("\t\t<free_");
- sb.append(type);
- sb.append(">\n");
-
- sb.append("\t\t\t<");
- sb.append(type);
- sb.append(" out=\"true\">");
- sb.append(Util.encodeXML(label));
- sb.append("</");
- sb.append(type);
- sb.append(">\n");
-
- sb.append("\t\t</free_");
- sb.append(type);
- sb.append(">\n");
- }
- } else {
- if ((mode == DISPLAY)
- && ((caption == null) || (caption.length() == 0) || caption
- .equals(label))) {
- return;
- }
-
- sb.append("\t\t<");
- sb.append(type);
- sb.append(" id=\"");
- sb.append(Util.encodeXML(label));
- sb.append("\">\n");
-
- if (mode == ELEMENTS) {
- getI2Gtags(sb);
- } else if (mode == DISPLAY) {
- // caption text
- sb.append("\t\t\t<label>");
- sb.append(Util.encodeXML(caption));
- sb.append("</label>\n");
- }
-
- sb.append("\t\t</");
- sb.append(type);
- sb.append(">\n");
- }
-
- kernel.setPrintLocalizedCommandNames(oldValue);
- }
-
final void getAuxiliaryXML(StringBuilder sb) {
if (!isAuxiliaryObjectByDefault()) {
if (auxiliaryObject) {
@@ -4858,15 +4800,6 @@ public abstract class GeoElement extends ConstructionElement implements
}
/**
- * returns all class-specific i2g tags for getI2G Intergeo File Format (Yves
- * Kreis)
- *
- * @param sb
- */
- protected void getI2Gtags(StringBuilder sb) {
- }
-
- /**
* Returns line type and line thickness as xml string.
*
* @param sb
diff --git a/geogebra/kernel/GeoFunctionNVar.java b/geogebra/kernel/GeoFunctionNVar.java
index b4eb062..65e5adb 100644
--- a/geogebra/kernel/GeoFunctionNVar.java
+++ b/geogebra/kernel/GeoFunctionNVar.java
@@ -731,4 +731,14 @@ implements FunctionalNVar, CasEvaluableFunction, Region, Transformable, Translat
public boolean isGeoFunctionNVar(){
return true;
}
+
+ protected void getXMLtags(StringBuilder sb) {
+ super.getXMLtags(sb);
+
+ // needed for inequalities
+ if (isInequality()) {
+ getLineStyleXML(sb);
+ }
+
+ }
}
diff --git a/geogebra/kernel/GeoList.java b/geogebra/kernel/GeoList.java
index 2f19f87..955e183 100644
--- a/geogebra/kernel/GeoList.java
+++ b/geogebra/kernel/GeoList.java
@@ -37,16 +37,15 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
public boolean trace;
- private static final long serialVersionUID = 1L;
private static String STR_OPEN = "{";
private static String STR_CLOSE = "}";
// GeoElement list members
- private ArrayList<GeoElement> geoList;
+ private final ArrayList<GeoElement> geoList;
// lists will often grow and shrink dynamically,
// so we keep a cacheList of all old list elements
- private ArrayList<GeoElement> cacheList;
+ private final ArrayList<GeoElement> cacheList;
private boolean isDefined = true;
private boolean isDrawable = true;
@@ -59,18 +58,19 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
*/
private boolean showAllProperties = false;
- private ArrayList<GeoElement> colorFunctionListener; // Michael Borcherds 2008-04-02
+ private ArrayList<GeoElement> colorFunctionListener; // Michael Borcherds
+ // 2008-04-02
- public GeoList(Construction c) {
+ public GeoList(final Construction c) {
this(c, 20);
}
- private GeoList(Construction c, int size) {
+ private GeoList(final Construction c, final int size) {
super(c);
-
+
// moved from GeoElement's constructor
// must be called from the subclass, see
- //http://benpryor.com/blog/2008/01/02/dont-call-subclass-methods-from-a-superclass-constructor/
+ // http://benpryor.com/blog/2008/01/02/dont-call-subclass-methods-from-a-superclass-constructor/
setConstructionDefaults(); // init visual settings
geoList = new ArrayList<GeoElement>(size);
@@ -78,24 +78,28 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
setEuclidianVisible(false);
}
- public void setParentAlgorithm(AlgoElement algo) {
+ @Override
+ public void setParentAlgorithm(final AlgoElement algo) {
super.setParentAlgorithm(algo);
setEuclidianVisible(true);
}
- public GeoList(GeoList list) {
+ public GeoList(final GeoList list) {
this(list.cons, list.size());
set(list);
}
+ @Override
public String getClassName() {
return "GeoList";
}
+ @Override
protected String getTypeString() {
return "List";
}
+ @Override
public int getGeoClassType() {
return GEO_CLASS_LIST;
}
@@ -109,11 +113,13 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
return elementType;
}
+ @Override
public GeoElement copy() {
return new GeoList(this);
}
- public void set(GeoElement geo) {
+ @Override
+ public void set(final GeoElement geo) {
if (geo.isGeoNumeric()) { // eg SetValue[list, 2]
// 1 -> first element
@@ -122,13 +128,13 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
return;
}
- GeoList l = (GeoList) geo;
+ final GeoList l = (GeoList) geo;
- if (l.cons != cons && isAlgoMacroOutput()) {
+ if ((l.cons != cons) && isAlgoMacroOutput()) {
// MACRO CASE
// this object is an output object of AlgoMacro
// we need to check the references to all geos in the list
- AlgoMacro algoMacro = (AlgoMacro) getParentAlgorithm();
+ final AlgoMacro algoMacro = (AlgoMacro) getParentAlgorithm();
algoMacro.initList(l, this);
} else {
// STANDARD CASE
@@ -146,25 +152,25 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
*
* @param showAllProperties
*/
- public void setShowAllProperties(boolean showAllProperties) {
+ public void setShowAllProperties(final boolean showAllProperties) {
this.showAllProperties = showAllProperties;
}
- private void copyListElements(GeoList otherList) {
- int otherListSize = otherList.size();
+ private void copyListElements(final GeoList otherList) {
+ final int otherListSize = otherList.size();
ensureCapacity(otherListSize);
geoList.clear();
for (int i = 0; i < otherListSize; i++) {
- GeoElement otherElement = otherList.get(i);
+ final GeoElement otherElement = otherList.get(i);
GeoElement thisElement = null;
// try to reuse cached GeoElement
if (i < cacheList.size()) {
- GeoElement cachedGeo = (GeoElement) cacheList.get(i);
+ final GeoElement cachedGeo = cacheList.get(i);
if (!cachedGeo.isLabelSet()
- && cachedGeo.getGeoClassType() == otherElement
- .getGeoClassType()) {
+ && (cachedGeo.getGeoClassType() == otherElement
+ .getGeoClassType())) {
// cached geo is unlabeled and has needed object type: use
// it
cachedGeo.set(otherElement);
@@ -182,50 +188,51 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
}
}
- private GeoElement getCopyForList(GeoElement geo) {
+ private GeoElement getCopyForList(final GeoElement geo) {
if (geo.isLabelSet()) {
// take original element
return geo;
} else {
// create a copy of geo
- GeoElement ret = geo.copyInternal(cons);
+ final GeoElement ret = geo.copyInternal(cons);
ret.setParentAlgorithm(getParentAlgorithm());
return ret;
}
}
- private void applyVisualStyle(GeoElement geo) {
+ private void applyVisualStyle(final GeoElement geo) {
if (!geo.isLabelSet()) {
- geo.setObjColor(this.getObjectColor());
+ geo.setObjColor(getObjectColor());
+
+ geo.setColorSpace(getColorSpace());
// copy color function
- if (this.getColorFunction() != null) {
- geo.setColorFunction(this.getColorFunction());
+ if (getColorFunction() != null) {
+ geo.setColorFunction(getColorFunction());
} else {
geo.removeColorFunction();
}
- geo.setLineThickness(this.getLineThickness());
- geo.setLineType(this.getLineType());
-
-
+ geo.setLineThickness(getLineThickness());
+ geo.setLineType(getLineType());
if (geo instanceof PointProperties) {
- ((PointProperties) geo).setPointSize(this.getPointSize());
- ((PointProperties) geo).setPointStyle(this.getPointStyle());
+ ((PointProperties) geo).setPointSize(getPointSize());
+ ((PointProperties) geo).setPointStyle(getPointStyle());
}
if (geo instanceof TextProperties) {
- ((TextProperties) geo).setFontSize(this.getFontSize());
- ((TextProperties) geo).setFontStyle(this.getFontStyle());
- ((TextProperties) geo).setSerifFont(this.isSerifFont());
- if (useSignificantFigures)
- ((TextProperties) geo).setPrintFigures(this
- .getPrintFigures(), false);
- else
- ((TextProperties) geo).setPrintDecimals(this
- .getPrintDecimals(), false);
+ ((TextProperties) geo).setFontSize(getFontSize());
+ ((TextProperties) geo).setFontStyle(getFontStyle());
+ ((TextProperties) geo).setSerifFont(isSerifFont());
+ if (useSignificantFigures) {
+ ((TextProperties) geo).setPrintFigures(getPrintFigures(),
+ false);
+ } else {
+ ((TextProperties) geo).setPrintDecimals(getPrintDecimals(),
+ false);
+ }
}
@@ -233,46 +240,70 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
geo.setHatchingAngle(hatchingAngle);
geo.setHatchingDistance(hatchingDistance);
geo.setImageFileName(imageFileName);
- geo.setAlphaValue(this.getAlphaValue());
+ geo.setAlphaValue(getAlphaValue());
- geo.setLayer(this.getLayer());
+ geo.setLayer(getLayer());
// copy ShowObjectCondition, unless it generates a
// CirclularDefinitionException
try {
- geo.setShowObjectCondition(this.getShowObjectCondition());
- } catch (Exception e) {
+ geo.setShowObjectCondition(getShowObjectCondition());
+ } catch (final Exception e) {
}
setElementEuclidianVisible(geo, isSetEuclidianVisible());
}
}
+ @Override
public final void removeColorFunction() {
super.removeColorFunction();
- if (geoList == null || geoList.size() == 0)
+ if ((geoList == null) || (geoList.size() == 0)) {
return;
+ }
- int size = geoList.size();
+ final int size = geoList.size();
for (int i = 0; i < size; i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (!geo.isLabelSet())
+ final GeoElement geo = geoList.get(i);
+ if (!geo.isLabelSet()) {
geo.removeColorFunction();
+ }
}
}
- public final void setColorFunction(GeoList col) {
+ @Override
+ public final void setColorFunction(final GeoList col) {
super.setColorFunction(col);
- if (geoList == null || geoList.size() == 0)
+ if ((geoList == null) || (geoList.size() == 0)) {
return;
+ }
- int size = geoList.size();
+ final int size = geoList.size();
for (int i = 0; i < size; i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (!geo.isLabelSet())
+ final GeoElement geo = geoList.get(i);
+ if (!geo.isLabelSet()) {
geo.setColorFunction(col);
+ }
+ }
+
+ }
+
+ @Override
+ public final void setColorSpace(final int colorSpace) {
+ super.setColorSpace(colorSpace);
+
+ if ((geoList == null) || (geoList.size() == 0)) {
+ return;
+ }
+
+ final int size = geoList.size();
+ for (int i = 0; i < size; i++) {
+ final GeoElement geo = geoList.get(i);
+ if (!geo.isLabelSet()) {
+ geo.setColorSpace(colorSpace);
+ }
}
}
@@ -291,23 +322,27 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
* }
*/
- public final void setShowObjectCondition(GeoBoolean bool)
+ @Override
+ public final void setShowObjectCondition(final GeoBoolean bool)
throws CircularDefinitionException {
super.setShowObjectCondition(bool);
- if (geoList == null || geoList.size() == 0)
+ if ((geoList == null) || (geoList.size() == 0)) {
return;
+ }
- int size = geoList.size();
+ final int size = geoList.size();
for (int i = 0; i < size; i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (!geo.isLabelSet())
+ final GeoElement geo = geoList.get(i);
+ if (!geo.isLabelSet()) {
geo.setShowObjectCondition(bool);
+ }
}
}
- public void setVisualStyle(GeoElement style) {
+ @Override
+ public void setVisualStyle(final GeoElement style) {
super.setVisualStyle(style);
// set point style
@@ -317,106 +352,123 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
}
// set visual style
- if (geoList == null || geoList.size() == 0)
+ if ((geoList == null) || (geoList.size() == 0)) {
return;
- int size = geoList.size();
+ }
+ final int size = geoList.size();
for (int i = 0; i < size; i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (!geo.isLabelSet())
+ final GeoElement geo = geoList.get(i);
+ if (!geo.isLabelSet()) {
geo.setVisualStyle(style);
+ }
}
}
- public void setObjColor(Color color) {
+ @Override
+ public void setObjColor(final Color color) {
super.setObjColor(color);
- if (geoList == null || geoList.size() == 0)
+ if ((geoList == null) || (geoList.size() == 0)) {
return;
+ }
- int size = geoList.size();
+ final int size = geoList.size();
for (int i = 0; i < size; i++) {
- GeoElement geo = get(i);
- if (!geo.isLabelSet())
+ final GeoElement geo = get(i);
+ if (!geo.isLabelSet()) {
geo.setObjColor(color);
+ }
}
}
- public void setBackgroundColor(Color color) {
+ @Override
+ public void setBackgroundColor(final Color color) {
super.setBackgroundColor(color);
- if (geoList == null || geoList.size() == 0)
+ if ((geoList == null) || (geoList.size() == 0)) {
return;
+ }
- int size = geoList.size();
+ final int size = geoList.size();
for (int i = 0; i < size; i++) {
- GeoElement geo = get(i);
- if (!geo.isLabelSet())
+ final GeoElement geo = get(i);
+ if (!geo.isLabelSet()) {
geo.setBackgroundColor(color);
+ }
}
}
- public void setEuclidianVisible(boolean visible) {
+ @Override
+ public void setEuclidianVisible(final boolean visible) {
super.setEuclidianVisible(visible);
- if (geoList == null || geoList.size() == 0)
+ if ((geoList == null) || (geoList.size() == 0)) {
return;
+ }
- int size = geoList.size();
+ final int size = geoList.size();
for (int i = 0; i < size; i++) {
- GeoElement geo = get(i);
+ final GeoElement geo = get(i);
setElementEuclidianVisible(geo, visible);
}
}
- private void setElementEuclidianVisible(GeoElement geo, boolean visible) {
- if (!geo.isLabelSet() && !geo.isGeoNumeric())
+ private void setElementEuclidianVisible(final GeoElement geo,
+ final boolean visible) {
+ if (!geo.isLabelSet() && !geo.isGeoNumeric()) {
geo.setEuclidianVisible(visible);
+ }
}
/**
* Returns this GeoList as a MyList object.
*/
public MyList getMyList() {
- int size = geoList.size();
- MyList myList = new MyList(kernel, size);
+ final int size = geoList.size();
+ final MyList myList = new MyList(kernel, size);
for (int i = 0; i < size; i++) {
- myList.addListElement(new ExpressionNode(kernel,
- (GeoElement) geoList.get(i)));
+ myList.addListElement(new ExpressionNode(kernel, geoList.get(i)));
}
return myList;
}
+ @Override
final public boolean isDefined() {
return isDefined;
}
- public void setDefined(boolean flag) {
+ public void setDefined(final boolean flag) {
isDefined = flag;
if (!isDefined) {
- int size = geoList.size();
+ final int size = geoList.size();
for (int i = 0; i < size; i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (!geo.isLabelSet())
+ final GeoElement geo = geoList.get(i);
+ if (!geo.isLabelSet()) {
geo.setUndefined();
+ }
}
}
}
+ @Override
public void setUndefined() {
setDefined(false);
}
+ @Override
protected boolean showInEuclidianView() {
return isDefined() && isDrawable();
}
+ @Override
public boolean isDrawable() {
return isDrawable;
}
+ @Override
public boolean showInAlgebraView() {
return true;
}
@@ -429,19 +481,21 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
* free up memory and set undefined
*/
public final void clearCache() {
- if (cacheList.size() > 0)
+ if (cacheList.size() > 0) {
for (int i = 0; i < cacheList.size(); i++) {
- GeoElement geo = (GeoElement) cacheList.get(i);
- if (geo != null && !geo.isLabelSet())
+ final GeoElement geo = cacheList.get(i);
+ if ((geo != null) && !geo.isLabelSet()) {
geo.remove();
+ }
}
+ }
cacheList.clear();
clear();
setUndefined();
System.gc();
}
- public final void add(GeoElement geo) {
+ public final void add(final GeoElement geo) {
// add geo to end of list
geoList.add(geo);
@@ -455,7 +509,7 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
*/
// add to cache
- int pos = geoList.size() - 1;
+ final int pos = geoList.size() - 1;
if (pos < cacheList.size()) {
cacheList.set(pos, geo);
} else {
@@ -483,37 +537,46 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
/**
* Removes geo from this list. Note: geo is not removed from the
* construction.
- * @param geo element to be removed
+ *
+ * @param geo
+ * element to be removed
*/
- public final void remove(GeoElement geo) {
+ public final void remove(final GeoElement geo) {
geoList.remove(geo);
}
/**
* Removes i-th element from this list. Note: this element is not removed
* from the construction.
- * @param index position of element to be removed
+ *
+ * @param index
+ * position of element to be removed
*/
- public final void remove(int index) {
+ public final void remove(final int index) {
geoList.remove(index);
}
/**
* Returns the element at the specified position in this list.
- * @param index element position
+ *
+ * @param index
+ * element position
* @return the element at the specified position in this list.
*/
- final public GeoElement get(int index) {
- return (GeoElement) geoList.get(index);
+ final public GeoElement get(final int index) {
+ return geoList.get(index);
}
/**
* Returns the element at the specified position in this (2D) list.
- * @param index element position -- row
- * @param index2 element position -- column
+ *
+ * @param index
+ * element position -- row
+ * @param index2
+ * element position -- column
* @return the element at the specified position in this (2D) list.
*/
- final public GeoElement get(int index, int index2) {
+ final public GeoElement get(final int index, final int index2) {
return ((GeoList) geoList.get(index)).get(index2);
}
@@ -524,17 +587,17 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
*/
public double[] toDouble() {
try {
- double[] valueArray = new double[geoList.size()];
+ final double[] valueArray = new double[geoList.size()];
for (int i = 0; i < valueArray.length; i++) {
valueArray[i] = ((NumberValue) geoList.get(i)).getDouble();
}
return valueArray;
- } catch (Exception e) {
+ } catch (final Exception e) {
return null;
}
}
- final public void ensureCapacity(int size) {
+ final public void ensureCapacity(final int size) {
geoList.ensureCapacity(size);
cacheList.ensureCapacity(size);
}
@@ -550,13 +613,16 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
/**
* Returns the cached element at the specified position in this list's
* cache.
- * @param index element position
+ *
+ * @param index
+ * element position
* @return cached alement at given position
*/
- final public GeoElement getCached(int index) {
- return (GeoElement) cacheList.get(index);
+ final public GeoElement getCached(final int index) {
+ return cacheList.get(index);
}
+ @Override
public String toString() {
sbToString.setLength(0);
sbToString.append(label);
@@ -564,7 +630,8 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
sbToString.append(buildValueString());
return sbToString.toString();
}
-
+
+ @Override
public String toStringMinimal() {
sbBuildValueString.setLength(0);
if (!isDefined) {
@@ -573,26 +640,26 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
}
// first (n-1) elements
- int lastIndex = geoList.size() - 1;
+ final int lastIndex = geoList.size() - 1;
if (lastIndex > -1) {
for (int i = 0; i < lastIndex; i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
+ final GeoElement geo = geoList.get(i);
sbBuildValueString.append(geo.getAlgebraDescriptionRegrOut());
sbBuildValueString.append(" ");
}
// last element
- GeoElement geo = (GeoElement) geoList.get(lastIndex);
+ final GeoElement geo = geoList.get(lastIndex);
sbBuildValueString.append(geo.getAlgebraDescriptionRegrOut());
}
return sbBuildValueString.toString();
}
-
StringBuilder sbToString = new StringBuilder(50);
+ @Override
public String toValueString() {
return buildValueString().toString();
}
@@ -603,55 +670,62 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
sbBuildValueString.append("?");
return sbBuildValueString;
}
-
- if(kernel.getCASPrintForm()==ExpressionNode.STRING_TYPE_LATEX)
+
+ if (kernel.getCASPrintForm() == ExpressionNode.STRING_TYPE_LATEX) {
sbBuildValueString.append("\\left\\");
- if (kernel.getCASPrintForm()==ExpressionNode.STRING_TYPE_MPREDUCE)
+ }
+ if (kernel.getCASPrintForm() == ExpressionNode.STRING_TYPE_MPREDUCE) {
sbBuildValueString.append("list(");
- else
- sbBuildValueString.append(STR_OPEN);
+ } else {
+ sbBuildValueString.append(STR_OPEN);
+ }
// first (n-1) elements
- int lastIndex = geoList.size() - 1;
+ final int lastIndex = geoList.size() - 1;
if (lastIndex > -1) {
for (int i = 0; i < lastIndex; i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
+ final GeoElement geo = geoList.get(i);
sbBuildValueString.append(geo.toOutputValueString());
sbBuildValueString.append(Application.unicodeComma);
sbBuildValueString.append(" ");
}
// last element
- GeoElement geo = (GeoElement) geoList.get(lastIndex);
+ final GeoElement geo = geoList.get(lastIndex);
sbBuildValueString.append(geo.toOutputValueString());
}
- if(kernel.getCASPrintForm()==ExpressionNode.STRING_TYPE_LATEX)
+ if (kernel.getCASPrintForm() == ExpressionNode.STRING_TYPE_LATEX) {
sbBuildValueString.append("\\right\\");
- if (kernel.getCASPrintForm()==ExpressionNode.STRING_TYPE_MPREDUCE)
+ }
+ if (kernel.getCASPrintForm() == ExpressionNode.STRING_TYPE_MPREDUCE) {
sbBuildValueString.append(")");
- else
- sbBuildValueString.append(STR_CLOSE);
+ } else {
+ sbBuildValueString.append(STR_CLOSE);
+ }
return sbBuildValueString;
}
- private StringBuilder sbBuildValueString = new StringBuilder(50);
+ private final StringBuilder sbBuildValueString = new StringBuilder(50);
+ @Override
public boolean isGeoList() {
return true;
}
+ @Override
public boolean isListValue() {
return true;
- }
+ }
/**
* save object in XML format
*/
- public final void getXML(StringBuilder sb) {
+ @Override
+ public final void getXML(final StringBuilder sb) {
// an independent list needs to add
// its expression itself
// e.g. {1,2,3}
- if (isIndependent() && getDefaultGeoType() < 0) {
+ if (isIndependent() && (getDefaultGeoType() < 0)) {
sb.append("<expression");
sb.append(" label =\"");
sb.append(Util.encodeXML(label));
@@ -687,7 +761,7 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
sb.append("\"/>\n");
// font settings
- if (serifFont || fontSize != 0 || fontStyle != 0) {
+ if (serifFont || (fontSize != 0) || (fontStyle != 0)) {
sb.append("\t<font serif=\"");
sb.append(serifFont);
sb.append("\" size=\"");
@@ -698,14 +772,14 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
}
// print decimals
- if (printDecimals >= 0 && !useSignificantFigures) {
+ if ((printDecimals >= 0) && !useSignificantFigures) {
sb.append("\t<decimals val=\"");
sb.append(printDecimals);
sb.append("\"/>\n");
}
// print significant figures
- if (printFigures >= 0 && useSignificantFigures) {
+ if ((printFigures >= 0) && useSignificantFigures) {
sb.append("\t<significantfigures val=\"");
sb.append(printFigures);
sb.append("\"/>\n");
@@ -720,13 +794,14 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
*
* @param geo
*/
- public void registerColorFunctionListener(GeoElement geo) {
- if (colorFunctionListener == null)
+ public void registerColorFunctionListener(final GeoElement geo) {
+ if (colorFunctionListener == null) {
colorFunctionListener = new ArrayList<GeoElement>();
+ }
colorFunctionListener.add(geo);
}
- public void unregisterColorFunctionListener(GeoElement geo) {
+ public void unregisterColorFunctionListener(final GeoElement geo) {
if (colorFunctionListener != null) {
colorFunctionListener.remove(geo);
}
@@ -736,13 +811,14 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
* Calls super.update() and update() for all registered condition listener
* geos. // Michael Borcherds 2008-04-02
*/
+ @Override
public void update() {
super.update();
if (getParentAlgorithm() instanceof AlgoMirror) {
- AlgoMirror algo = (AlgoMirror) getParentAlgorithm();
- GeoElement[] geos = algo.getInput();
- GeoList list = (GeoList) geos[0];
+ final AlgoMirror algo = (AlgoMirror) getParentAlgorithm();
+ final GeoElement[] geos = algo.getInput();
+ final GeoList list = (GeoList) geos[0];
Application.debug("size = " + list.size());
}
@@ -751,7 +827,7 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
if (colorFunctionListener != null) {
// Application.debug("GeoList update listeners");
for (int i = 0; i < colorFunctionListener.size(); i++) {
- GeoElement geo = (GeoElement) colorFunctionListener.get(i);
+ final GeoElement geo = colorFunctionListener.get(i);
kernel.notifyUpdate(geo);
// geo.toGeoElement().updateCascade();
}
@@ -762,16 +838,17 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
* Tells conidition listeners that their condition is removed and calls
* super.remove() // Michael Borcherds 2008-04-02
*/
+ @Override
public void doRemove() {
if (colorFunctionListener != null) {
// copy conditionListeners into array
- Object[] geos = colorFunctionListener.toArray();
+ final Object[] geos = colorFunctionListener.toArray();
colorFunctionListener.clear();
// tell all condition listeners
for (int i = 0; i < geos.length; i++) {
- GeoElement geo = (GeoElement) geos[i];
+ final GeoElement geo = (GeoElement) geos[i];
geo.removeColorFunction();
kernel.notifyUpdate(geo);
}
@@ -783,69 +860,78 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
/**
* return whether this list equals GeoList list Michael Borcherds 2008-04-12
*/
- final public boolean isEqual(GeoElement geo) {
+ @Override
+ final public boolean isEqual(final GeoElement geo) {
- if (!geo.isGeoList())
+ if (!geo.isGeoList()) {
return false;
+ }
- GeoList list = (GeoList) geo;
+ final GeoList list = (GeoList) geo;
// check sizes
- if (geoList.size() != list.size())
+ if (geoList.size() != list.size()) {
return false;
+ }
// check each element
for (int i = 0; i < list.geoList.size(); i++) {
- GeoElement geoA = (GeoElement) geoList.get(i);
- GeoElement geoB = list.get(i);
+ final GeoElement geoA = geoList.get(i);
+ final GeoElement geoB = list.get(i);
- if (!geoA.isEqual(geoB))
+ if (!geoA.isEqual(geoB)) {
return false;
- /*
- * if (geoA.isGeoNumeric() && geoB.isGeoNumeric()) { if
- * (!((GeoNumeric)geoA).equals((GeoNumeric)geoB)) return false; }
- * else if (geoA.isGeoConicPart() && geoB.isGeoConicPart()) { if
- * (!((GeoConicPart)geoA).equals((GeoConicPart)geoB)) return false;
- * } else if (geoA.isGeoConic() && geoB.isGeoConic()) { if
- * (!((GeoConic)geoA).equals((GeoConic)geoB)) return false; } else
- * if (geoA.isGeoAngle() && geoB.isGeoAngle()) { if
- * (!((GeoAngle)geoA).equals((GeoAngle)geoB)) return false; } else
- * if (geoA.isGeoPoint() && geoB.isGeoPoint()) { if
- * (!((GeoPoint)geoA).equals((GeoPoint)geoB)) return false; } else
- * if (geoA.isGeoPolygon() && geoB.isGeoPolygon()) { if
- * (!((GeoPolygon)geoA).equals((GeoPolygon)geoB)) return false; }
- * else if (geoA.isGeoSegment() && geoB.isGeoSegment()) { if
- * (!((GeoSegment)geoA).equals((GeoSegment)geoB)) return false; }
- * else if (geoA.isGeoList() && geoB.isGeoList()) { if
- * (!((GeoList)geoA).equals((GeoList)geoB)) return false; } else if
- * (!geoA.equals(geoB)) return false;
- */
+ /*
+ * if (geoA.isGeoNumeric() && geoB.isGeoNumeric()) { if
+ * (!((GeoNumeric)geoA).equals((GeoNumeric)geoB)) return false;
+ * } else if (geoA.isGeoConicPart() && geoB.isGeoConicPart()) {
+ * if (!((GeoConicPart)geoA).equals((GeoConicPart)geoB)) return
+ * false; } else if (geoA.isGeoConic() && geoB.isGeoConic()) {
+ * if (!((GeoConic)geoA).equals((GeoConic)geoB)) return false; }
+ * else if (geoA.isGeoAngle() && geoB.isGeoAngle()) { if
+ * (!((GeoAngle)geoA).equals((GeoAngle)geoB)) return false; }
+ * else if (geoA.isGeoPoint() && geoB.isGeoPoint()) { if
+ * (!((GeoPoint)geoA).equals((GeoPoint)geoB)) return false; }
+ * else if (geoA.isGeoPolygon() && geoB.isGeoPolygon()) { if
+ * (!((GeoPolygon)geoA).equals((GeoPolygon)geoB)) return false;
+ * } else if (geoA.isGeoSegment() && geoB.isGeoSegment()) { if
+ * (!((GeoSegment)geoA).equals((GeoSegment)geoB)) return false;
+ * } else if (geoA.isGeoList() && geoB.isGeoList()) { if
+ * (!((GeoList)geoA).equals((GeoList)geoB)) return false; } else
+ * if (!geoA.equals(geoB)) return false;
+ */
+ }
}
// all list elements equal
return true;
}
+ @Override
public void setZero() {
geoList.clear();
}
- public void setLineThickness(int thickness) {
+ @Override
+ public void setLineThickness(final int thickness) {
super.setLineThickness(thickness);
- if (geoList == null || geoList.size() == 0)
+ if ((geoList == null) || (geoList.size() == 0)) {
return;
+ }
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (!geo.isLabelSet())
+ final GeoElement geo = geoList.get(i);
+ if (!geo.isLabelSet()) {
geo.setLineThickness(thickness);
+ }
}
// Application.debug("GeoList.setLineThickness "+thickness);
}
+ @Override
public int getLineThickness() {
return super.getLineThickness();
}
@@ -854,37 +940,45 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
* @return minimum line thickness (normally 1, but 0 for polygons, integrals
* etc)
*/
+ @Override
public int getMinimumLineThickness() {
- if (geoList == null || geoList.size() == 0)
+ if ((geoList == null) || (geoList.size() == 0)) {
return 1;
+ }
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (!geo.isLabelSet())
- if (geo.getMinimumLineThickness() == 1)
+ final GeoElement geo = geoList.get(i);
+ if (!geo.isLabelSet()) {
+ if (geo.getMinimumLineThickness() == 1) {
return 1;
+ }
+ }
}
return 0;
}
- public void setLineType(int type) {
+ @Override
+ public void setLineType(final int type) {
super.setLineType(type);
- if (geoList == null || geoList.size() == 0)
+ if ((geoList == null) || (geoList.size() == 0)) {
return;
+ }
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (!geo.isLabelSet())
+ final GeoElement geo = geoList.get(i);
+ if (!geo.isLabelSet()) {
geo.setLineType(type);
+ }
}
// Application.debug("GeoList.setLineType");
}
+ @Override
public int getLineType() {
return super.getLineType();
}
@@ -892,16 +986,18 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
public int pointSize = EuclidianView.DEFAULT_POINT_SIZE;
private int pointStyle = -1; // use global option if -1
- public void setPointSize(int size) {
+ public void setPointSize(final int size) {
pointSize = size;
- if (geoList == null || geoList.size() == 0)
+ if ((geoList == null) || (geoList.size() == 0)) {
return;
+ }
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (!geo.isLabelSet() && geo instanceof PointProperties)
+ final GeoElement geo = geoList.get(i);
+ if (!geo.isLabelSet() && (geo instanceof PointProperties)) {
((PointProperties) geo).setPointSize(size);
+ }
}
}
@@ -909,28 +1005,31 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
return pointSize;
}
- public void setPointStyle(int style) {
+ public void setPointStyle(final int style) {
pointStyle = style;
- if (geoList == null || geoList.size() == 0)
+ if ((geoList == null) || (geoList.size() == 0)) {
return;
+ }
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (!geo.isLabelSet() && geo instanceof PointProperties)
+ final GeoElement geo = geoList.get(i);
+ if (!geo.isLabelSet() && (geo instanceof PointProperties)) {
((PointProperties) geo).setPointStyle(style);
+ }
}
}
+ @Override
public float getAlphaValue() {
if (super.getAlphaValue() == -1) {
// no alphaValue set
// so we need to set it to that of the first element, if there is
// one
- if (geoList != null && geoList.size() > 0) {
+ if ((geoList != null) && (geoList.size() > 0)) {
// get alpha value of first element
- float alpha = ((GeoElement) geoList.get(0)).getAlphaValue();
+ final float alpha = geoList.get(0).getAlphaValue();
// Application.debug("setting list alpha to "+alpha);
@@ -940,9 +1039,10 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
// if appropriate
if (geoList.size() > 1) {
for (int i = 1; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (!geo.isLabelSet())
+ final GeoElement geo = geoList.get(i);
+ if (!geo.isLabelSet()) {
geo.setAlphaValue(alpha);
+ }
}
}
@@ -954,7 +1054,8 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
return super.getAlphaValue();
}
- public void setAlphaValue(float alpha) {
+ @Override
+ public void setAlphaValue(final float alpha) {
if (alpha == -1) {
// wait until we have a GeoElement in the list to use
@@ -965,13 +1066,15 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
super.setAlphaValue(alpha);
- if (geoList == null || geoList.size() == 0)
+ if ((geoList == null) || (geoList.size() == 0)) {
return;
+ }
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (!geo.isLabelSet())
+ final GeoElement geo = geoList.get(i);
+ if (!geo.isLabelSet()) {
geo.setAlphaValue(alpha);
+ }
}
}
@@ -980,26 +1083,31 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
return pointStyle;
}
+ @Override
public boolean isFillable() {
- if (geoList == null || geoList.size() == 0)
+ if ((geoList == null) || (geoList.size() == 0)) {
return false;
+ }
boolean someFillable = false;
boolean allLabelsSet = true;
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (geo.isFillable())
+ final GeoElement geo = geoList.get(i);
+ if (geo.isFillable()) {
someFillable = true;
- if (!geo.isLabelSet())
+ }
+ if (!geo.isLabelSet()) {
allLabelsSet = false;
+ }
}
return someFillable && !allLabelsSet;
}
+ @Override
public GeoElement getGeoElementForPropertiesDialog() {
- if (geoList.size() > 0 && elementType != ELEMENT_TYPE_MIXED) {
+ if ((geoList.size() > 0) && (elementType != ELEMENT_TYPE_MIXED)) {
return get(0).getGeoElementForPropertiesDialog(); // getGeoElementForPropertiesDialog()
// to cope with
// lists of
@@ -1014,37 +1122,39 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
*/
public boolean isMatrix() {
- if (getElementType() != GeoElement.GEO_CLASS_LIST || size() == 0)
+ if ((getElementType() != GeoElement.GEO_CLASS_LIST) || (size() == 0)) {
return false;
+ }
-
- GeoElement geo0 = get(0);
- if (geo0.isGeoList()) {
- int length = ((GeoList) geo0).size();
- if (length == 0) {
- return false;
- } else {
- if (size() > 0)
- for (int i = 0; i < size(); i++) {
- GeoElement geoi = get(i);
- // Application.debug(((GeoList)geoi).get(0).getGeoClassType()+"");
- if (!get(i).isGeoList()
- || ((GeoList) geoi).size() == 0
- || ((GeoList) geoi).size() != length)
- return false;
- else {
- for (int j=0; j<((GeoList) geoi).size(); j++){
- GeoElement geoij=((GeoList)geoi).get(j);
- if (geoij.getGeoClassType() != GeoElement.GEO_CLASS_NUMERIC
- && geoij.getGeoClassType() != GeoElement.GEO_CLASS_FUNCTION
- && geoij.getGeoClassType() != GeoElement.GEO_CLASS_FUNCTION_NVAR)
- return false;
+ final GeoElement geo0 = get(0);
+ if (geo0.isGeoList()) {
+ final int length = ((GeoList) geo0).size();
+ if (length == 0) {
+ return false;
+ } else {
+ if (size() > 0) {
+ for (int i = 0; i < size(); i++) {
+ final GeoElement geoi = get(i);
+ // Application.debug(((GeoList)geoi).get(0).getGeoClassType()+"");
+ if (!get(i).isGeoList()
+ || (((GeoList) geoi).size() == 0)
+ || (((GeoList) geoi).size() != length)) {
+ return false;
+ } else {
+ for (int j = 0; j < ((GeoList) geoi).size(); j++) {
+ final GeoElement geoij = ((GeoList) geoi)
+ .get(j);
+ if ((geoij.getGeoClassType() != GeoElement.GEO_CLASS_NUMERIC)
+ && (geoij.getGeoClassType() != GeoElement.GEO_CLASS_FUNCTION)
+ && (geoij.getGeoClassType() != GeoElement.GEO_CLASS_FUNCTION_NVAR)) {
+ return false;
}
}
}
+ }
}
}
-
+ }
return true;
}
@@ -1061,16 +1171,18 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
return fontSize;
}
- public void setFontSize(int size) {
+ public void setFontSize(final int size) {
fontSize = size;
- if (geoList == null || geoList.size() == 0)
+ if ((geoList == null) || (geoList.size() == 0)) {
return;
+ }
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (geo instanceof TextProperties && !geo.isLabelSet())
+ final GeoElement geo = geoList.get(i);
+ if ((geo instanceof TextProperties) && !geo.isLabelSet()) {
((TextProperties) geo).setFontSize(size);
+ }
}
}
@@ -1078,16 +1190,18 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
return fontStyle;
}
- public void setFontStyle(int fontStyle) {
+ public void setFontStyle(final int fontStyle) {
this.fontStyle = fontStyle;
- if (geoList == null || geoList.size() == 0)
+ if ((geoList == null) || (geoList.size() == 0)) {
return;
+ }
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (geo instanceof TextProperties && !geo.isLabelSet())
+ final GeoElement geo = geoList.get(i);
+ if ((geo instanceof TextProperties) && !geo.isLabelSet()) {
((TextProperties) geo).setFontStyle(fontStyle);
+ }
}
}
@@ -1099,21 +1213,23 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
return printFigures;
}
- public void setPrintDecimals(int printDecimals, boolean update) {
+ public void setPrintDecimals(final int printDecimals, final boolean update) {
this.printDecimals = printDecimals;
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (geo instanceof TextProperties && !geo.isLabelSet())
+ final GeoElement geo = geoList.get(i);
+ if ((geo instanceof TextProperties) && !geo.isLabelSet()) {
((TextProperties) geo).setPrintDecimals(printDecimals, update);
+ }
}
}
- public void setPrintFigures(int printFigures, boolean update) {
+ public void setPrintFigures(final int printFigures, final boolean update) {
this.printFigures = printFigures;
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (geo instanceof TextProperties && !geo.isLabelSet())
+ final GeoElement geo = geoList.get(i);
+ if ((geo instanceof TextProperties) && !geo.isLabelSet()) {
((TextProperties) geo).setPrintFigures(printFigures, update);
+ }
}
}
@@ -1126,57 +1242,68 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
return serifFont;
}
- public void setSerifFont(boolean serifFont) {
+ public void setSerifFont(final boolean serifFont) {
this.serifFont = serifFont;
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (geo instanceof TextProperties && !geo.isLabelSet())
+ final GeoElement geo = geoList.get(i);
+ if ((geo instanceof TextProperties) && !geo.isLabelSet()) {
((TextProperties) geo).setSerifFont(serifFont);
+ }
}
}
- public void setHatchingAngle(int angle) {
+ @Override
+ public void setHatchingAngle(final int angle) {
super.setHatchingAngle(angle);
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (!geo.isLabelSet())
+ final GeoElement geo = geoList.get(i);
+ if (!geo.isLabelSet()) {
geo.setHatchingAngle(angle);
+ }
}
}
- public void setHatchingDistance(int distance) {
+ @Override
+ public void setHatchingDistance(final int distance) {
super.setHatchingDistance(distance);
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (!geo.isLabelSet())
+ final GeoElement geo = geoList.get(i);
+ if (!geo.isLabelSet()) {
geo.setHatchingDistance(distance);
+ }
}
}
- public void setFillType(int type) {
+ @Override
+ public void setFillType(final int type) {
super.setFillType(type);
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (!geo.isLabelSet())
+ final GeoElement geo = geoList.get(i);
+ if (!geo.isLabelSet()) {
geo.setFillType(type);
+ }
}
}
- public void setFillImage(String filename) {
+ @Override
+ public void setFillImage(final String filename) {
super.setFillImage(filename);
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (!geo.isLabelSet())
+ final GeoElement geo = geoList.get(i);
+ if (!geo.isLabelSet()) {
geo.setFillImage(filename);
+ }
}
}
- public void setImageFileName(String filename) {
+ @Override
+ public void setImageFileName(final String filename) {
super.setImageFileName(filename);
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (!geo.isLabelSet())
+ final GeoElement geo = geoList.get(i);
+ if (!geo.isLabelSet()) {
geo.setImageFileName(filename);
+ }
}
}
@@ -1185,13 +1312,15 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
* able to set the line properties
*/
public boolean showLineProperties() {
- if (showAllProperties)
+ if (showAllProperties) {
return true;
+ }
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (geo instanceof LineProperties && !geo.isLabelSet())
+ final GeoElement geo = geoList.get(i);
+ if ((geo instanceof LineProperties) && !geo.isLabelSet()) {
return true;
+ }
}
return false;
@@ -1202,40 +1331,47 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
* able to set the point properties
*/
public boolean showPointProperties() {
- if (showAllProperties)
+ if (showAllProperties) {
return true;
+ }
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (geo instanceof PointProperties && !geo.isLabelSet())
+ final GeoElement geo = geoList.get(i);
+ if ((geo instanceof PointProperties) && !geo.isLabelSet()) {
return true;
+ }
}
return false;
}
+ @Override
public boolean isVector3DValue() {
return false;
}
- public String toLaTeXString(boolean symbolic) {
+ @Override
+ public String toLaTeXString(final boolean symbolic) {
if (isMatrix()) {
-
- //int rows = size();
- int cols = ((GeoList)get(0)).size();
-
- StringBuilder sb = new StringBuilder();
+
+ // int rows = size();
+ final int cols = ((GeoList) get(0)).size();
+
+ final StringBuilder sb = new StringBuilder();
sb.append("\\left(\\begin{array}{");
// eg rr
- for (int i = 0; i < cols ; i++) sb.append('r');
+ for (int i = 0; i < cols; i++) {
+ sb.append('r');
+ }
sb.append("}");
for (int i = 0; i < size(); i++) {
- GeoList geo = (GeoList) get(i);
+ final GeoList geo = (GeoList) get(i);
for (int j = 0; j < geo.size(); j++) {
sb.append(geo.get(j).toLaTeXString(symbolic));
- if (j < geo.size() - 1)
+ if (j < (geo.size() - 1)) {
sb.append("&");
+ }
}
sb.append("\\\\");
}
@@ -1248,7 +1384,8 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
}
- protected void getXMLtags(StringBuilder sb) {
+ @Override
+ protected void getXMLtags(final StringBuilder sb) {
super.getXMLtags(sb);
getLineStyleXML(sb);
@@ -1258,19 +1395,16 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
/*
* for CmdSetLabelMode
- *
- * removed: no point setting labelmode for objects with no labels
- * and we don't want to set labelmode for objects with labels...
- public void setLabelMode(int mode) {
- super.setLabelMode(mode);
-
- for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (!geo.isLabelSet())
- geo.setLabelMode(mode);
- }
-
- }*/
+ *
+ * removed: no point setting labelmode for objects with no labels and we
+ * don't want to set labelmode for objects with labels... public void
+ * setLabelMode(int mode) { super.setLabelMode(mode);
+ *
+ * for (int i = 0; i < geoList.size(); i++) { GeoElement geo = (GeoElement)
+ * geoList.get(i); if (!geo.isLabelSet()) geo.setLabelMode(mode); }
+ *
+ * }
+ */
// G.Sturr 2010-6-12
// Selection index for lists used in comboBoxes
@@ -1282,7 +1416,7 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
return selectedIndex;
}
- public void setSelectedIndex(int selectedIndex0) {
+ public void setSelectedIndex(final int selectedIndex0) {
selectedIndex = selectedIndex0;
}
@@ -1291,6 +1425,7 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
/*
* mathieu : for drawing 3D elements of the list
*/
+ @Override
public boolean hasDrawable3D() {
return true;
}
@@ -1300,13 +1435,14 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
* the user or null if there's a problem
*/
public GeoElement getSelectedElement() {
- if (selectedIndex > -1 && selectedIndex < size())
+ if ((selectedIndex > -1) && (selectedIndex < size())) {
return get(selectedIndex);
- else
+ } else {
return null;
+ }
}
- public void setTrace(boolean trace) {
+ public void setTrace(final boolean trace) {
this.trace = trace;
}
@@ -1314,14 +1450,17 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
return trace;
}
+ @Override
public boolean isTraceable() {
return true;
}
+ @Override
public boolean isLimitedPath() {
return false;
}
+ @Override
public boolean isPath() {
return true;
}
@@ -1329,28 +1468,27 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
/*
* adapted from GeoLocus
*/
- public void pointChanged(GeoPointND P) {
+ public void pointChanged(final GeoPointND P) {
// Application.debug("pointChanged",1);
// GeoPoint P = (GeoPoint) PI;
P.updateCoords();
-
+
// update closestPointIndex
getNearestPoint(P);
-
- GeoElement geo = get(closestPointIndex);
+ final GeoElement geo = get(closestPointIndex);
if (!(geo instanceof PathOrPoint)) {
Application.debug("TODO: " + geo.getClassName()
+ " should implement PathOrPoint interface");
return;
}
- PathOrPoint path = (PathOrPoint) get(closestPointIndex);
+ final PathOrPoint path = (PathOrPoint) get(closestPointIndex);
path.pointChanged(P);
- PathParameter pp = P.getPathParameter();
+ final PathParameter pp = P.getPathParameter();
// update path param
// 0-1 for first obj
@@ -1358,20 +1496,21 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
// etc
// Application.debug(pp.t+" "+path.getMinParameter()+" "+path.getMaxParameter());
pp.t = closestPointIndex
- + PathNormalizer.toNormalizedPathParameter(pp.t, path
- .getMinParameter(), path.getMaxParameter());
+ + PathNormalizer.toNormalizedPathParameter(pp.t,
+ path.getMinParameter(), path.getMaxParameter());
// Application.debug(pp.t);
}
- public Point2D.Double getNearestPoint(GeoPointND p) {
+ @Override
+ public Point2D.Double getNearestPoint(final GeoPointND p) {
// Application.printStacktrace(p.inhomX+" "+p.inhomY);
double distance = Double.POSITIVE_INFINITY;
closestPointIndex = 0; // default - first object
// double closestIndex = -1;
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- double d = geo.distance(p);
+ final GeoElement geo = geoList.get(i);
+ final double d = geo.distance(p);
// Application.debug(d+" "+distance);
if (d < distance) {
distance = d;
@@ -1384,39 +1523,41 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
return get(closestPointIndex).getNearestPoint(p);
}
- public double distance(GeoPoint p) {
+ @Override
+ public double distance(final GeoPoint p) {
double distance = Double.POSITIVE_INFINITY;
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- double d = geo.distance(p);
+ final GeoElement geo = geoList.get(i);
+ final double d = geo.distance(p);
if (d < distance) {
distance = d;
}
}
-
+
return distance;
}
- public void pathChanged(GeoPointND PI) {
+ public void pathChanged(final GeoPointND PI) {
- PathParameter pp = PI.getPathParameter();
+ final PathParameter pp = PI.getPathParameter();
double t = pp.getT();
int n = (int) Math.floor(t);
// check n is in a sensible range
- if (n >= size() || n < 0) {
- double check = t - size();
+ if ((n >= size()) || (n < 0)) {
+ final double check = t - size();
// t = size() when at very end of path
// so check == 0 is OK, just need to set n = size() - 1
- if (check != 0.0)
+ if (check != 0.0) {
Application.debug("problem with path param " + PI.getLabel());
+ }
n = (n < 0) ? 0 : size() - 1;
}
- PathOrPoint path = (PathOrPoint) get(n);
+ final PathOrPoint path = (PathOrPoint) get(n);
- pp.setT(PathNormalizer.toParentPathParameter(t - n, path
- .getMinParameter(), path.getMaxParameter()));
+ pp.setT(PathNormalizer.toParentPathParameter(t - n,
+ path.getMinParameter(), path.getMaxParameter()));
// Application.debug("pathChanged "+n);
@@ -1425,18 +1566,19 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
t = pp.getT();
// Application.debug(PathNormalizer.toNormalizedPathParameter(t,
// path.getMinParameter(), path.getMaxParameter()));
- pp.setT(PathNormalizer.toNormalizedPathParameter(t, path
- .getMinParameter(), path.getMaxParameter())
+ pp.setT(PathNormalizer.toNormalizedPathParameter(t,
+ path.getMinParameter(), path.getMaxParameter())
+ n);
}
- public boolean isOnPath(GeoPointND PI, double eps) {
+ public boolean isOnPath(final GeoPointND PI, final double eps) {
// Application.debug("isOnPath",1);
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
- if (((PathOrPoint) geo).isOnPath(PI, eps))
+ final GeoElement geo = geoList.get(i);
+ if (((PathOrPoint) geo).isOnPath(PI, eps)) {
return true;
+ }
}
return false;
}
@@ -1462,20 +1604,24 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
return false;
}
- public boolean hasMoveableInputPoints(EuclidianViewInterface view) {
- //we don't want e.g. DotPlots to be dragged
- if(!(getParentAlgorithm() == null || getParentAlgorithm() instanceof AlgoDependentList))
- return false;
+ @Override
+ public boolean hasMoveableInputPoints(final EuclidianViewInterface view) {
+ // we don't want e.g. DotPlots to be dragged
+ if (!((getParentAlgorithm() == null) || (getParentAlgorithm() instanceof AlgoDependentList))) {
+ return false;
+ }
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
+ final GeoElement geo = geoList.get(i);
if (geo.isGeoPoint()) {
- if (!geo.isMoveable())
+ if (!geo.isMoveable()) {
return false;
+ }
} else {
// not point
- if (!geo.hasMoveableInputPoints(view))
+ if (!geo.hasMoveableInputPoints(view)) {
return false;
+ }
}
}
@@ -1486,85 +1632,98 @@ public class GeoList extends GeoElement implements ListValue, LineProperties,
* allow lists like this to be dragged {Segment[A, B], Segment[B, C], (3.92,
* 4)}
*/
- public ArrayList<GeoPoint> getFreeInputPoints(EuclidianViewInterface view) {
- ArrayList<GeoPoint> al = new ArrayList<GeoPoint>();
-
+ @Override
+ public ArrayList<GeoPoint> getFreeInputPoints(
+ final EuclidianViewInterface view) {
+ final ArrayList<GeoPoint> al = new ArrayList<GeoPoint>();
+
for (int i = 0; i < geoList.size(); i++) {
- GeoElement geo = (GeoElement) geoList.get(i);
+ final GeoElement geo = geoList.get(i);
if (geo.isGeoPoint()) {
- GeoPoint p = (GeoPoint) geo;
- if (p.isMoveable() && !al.contains(p))
+ final GeoPoint p = (GeoPoint) geo;
+ if (p.isMoveable() && !al.contains(p)) {
al.add(p);
+ }
} else {
- ArrayList<GeoPoint> al2 = geo.getFreeInputPoints(view);
+ final ArrayList<GeoPoint> al2 = geo.getFreeInputPoints(view);
- if (al2 != null)
+ if (al2 != null) {
for (int j = 0; j < al2.size(); j++) {
- GeoPoint p = al2.get(j);
+ final GeoPoint p = al2.get(j);
// make sure duplicates aren't added
- if (!al.contains(p))
+ if (!al.contains(p)) {
al.add(p);
+ }
}
+ }
}
}
return al;
}
-
+ @Override
final public boolean isCasEvaluableObject() {
return true;
}
-
- String getCASString(boolean symbolic) {
-
- // isMatrix() is rather expensive, and we only need it
+
+ @Override
+ String getCASString(final boolean symbolic) {
+
+ // isMatrix() is rather expensive, and we only need it
// if we're using Maxima, so test for that first
- int casPrinttype = kernel.getCASPrintForm();
- if ((casPrinttype != ExpressionNode.STRING_TYPE_MAXIMA && casPrinttype != ExpressionNode.STRING_TYPE_MPREDUCE) || !isMatrix())
+ final int casPrinttype = kernel.getCASPrintForm();
+ if (((casPrinttype != ExpressionNode.STRING_TYPE_MAXIMA) && (casPrinttype != ExpressionNode.STRING_TYPE_MPREDUCE))
+ || !isMatrix()) {
return super.getCASString(symbolic);
-
- StringBuilder sb = new StringBuilder();
- if (casPrinttype == ExpressionNode.STRING_TYPE_MAXIMA){
+ }
+
+ final StringBuilder sb = new StringBuilder();
+ if (casPrinttype == ExpressionNode.STRING_TYPE_MAXIMA) {
sb.append("matrix(");
for (int i = 0; i < size(); i++) {
- GeoList geo = (GeoList) get(i);
+ final GeoList geo = (GeoList) get(i);
sb.append('[');
for (int j = 0; j < geo.size(); j++) {
sb.append(geo.get(j).getCASString(symbolic));
- if (j != geo.size() - 1)
+ if (j != (geo.size() - 1)) {
sb.append(',');
+ }
}
sb.append(']');
- if (i != size() - 1)
+ if (i != (size() - 1)) {
sb.append(',');
+ }
}
sb.append(')');
} else {
sb.append("mat(");
for (int i = 0; i < size(); i++) {
- GeoList geo = (GeoList) get(i);
+ final GeoList geo = (GeoList) get(i);
sb.append("(");
for (int j = 0; j < geo.size(); j++) {
sb.append(geo.get(j).getCASString(symbolic));
- if (j != geo.size() - 1)
+ if (j != (geo.size() - 1)) {
sb.append(',');
+ }
}
sb.append(')');
- if (i != size() - 1)
+ if (i != (size() - 1)) {
sb.append(',');
+ }
}
sb.append(')');
}
return sb.toString();
}
-
- public boolean listContains(GeoElement geo){
- if(geoList == null)
+
+ public boolean listContains(final GeoElement geo) {
+ if (geoList == null) {
return true;
+ }
return geoList.contains(geo);
}
-
+
}
\ No newline at end of file
diff --git a/geogebra/kernel/GeoPolygon.java b/geogebra/kernel/GeoPolygon.java
index efd4062..27272c7 100644
--- a/geogebra/kernel/GeoPolygon.java
+++ b/geogebra/kernel/GeoPolygon.java
@@ -1163,36 +1163,33 @@ MatrixTransformable,Mirrorable,Translateable,Dilateable,GeoCoordSys2D,GeoPolyLin
return asBoundary;
}
-
-
-
-
-
-
/** returns 1 if the segment ((x1,y1),(x2,y2)) intersects y=0 for x>0,
- * 2 if (0,0) is on the segment and -1 otherwise*/
+ * 2 if (0,0) is on the segment and -1 otherwise
+ * If the segment only touches the line for x>0, this touch is counted only
+ * if the segment is in y>0.
+ *
+ * Segments lying entirely on y=0 are ignored, unless they go through (0,0).
+ * */
private static int intersectOx(double x1, double y1, double x2, double y2){
double eps = Kernel.STANDARD_PRECISION;
if (Kernel.isZero(y1)){ //first point on (Ox)
if (Kernel.isZero(y2)){ //second point on (Ox)
- if ((x1+eps<0) && (x2+eps<0)) //segment totally on the left
- return -1;
- else if ((x1>eps) && (x2>eps)) //segment totally on the right
- return 1;
- else //O on segment
+ if (Kernel.isGreaterEqual(0, x1*x2)) //0 on segment
return 2;
+ //ignore the segment on 0x if it is whole on left or right
+ return -1;
}
//only first point is on (Ox)
if (Kernel.isZero(x1)) //first point ~ 0
return 2;
- return -1;
+ return y2 > eps && x1 > eps ? 1 : -1;
}else if (Kernel.isZero(y2)){
//only second point is on (0x)
if (Kernel.isZero(x2)) //second point ~ 0
return 2;
- return -1;
+ return y1 > eps && x2 > eps ? 1 : -1;
}
else if (y1*y2>eps) //segment totally above or under
return -1;
@@ -1215,6 +1212,7 @@ MatrixTransformable,Mirrorable,Translateable,Dilateable,GeoCoordSys2D,GeoPolyLin
}
}
+
/**
* returns all class-specific xml tags for getXML
* GeoGebra File Format
diff --git a/geogebra/kernel/GeoSegment.java b/geogebra/kernel/GeoSegment.java
index b625876..6157dea 100644
--- a/geogebra/kernel/GeoSegment.java
+++ b/geogebra/kernel/GeoSegment.java
@@ -442,24 +442,6 @@ GeoSegmentND {
sb.append("\"/>\n");
}
-
- /**
- * returns all class-specific i2g tags for saveI2G
- * Intergeo File Format (Yves Kreis)
- */
- protected void getI2Gtags(StringBuilder sb) {
- GeoPoint point;
-
- point = getStartPoint();
- point.getI2Gtags(sb);
-
- point = getEndPoint();
- point.getI2Gtags(sb);
- }
-
- public String getI2GtypeString() {
- return "line_segment";
- }
/**
* creates new transformed segment
diff --git a/geogebra/kernel/GeoTextField.java b/geogebra/kernel/GeoTextField.java
index dd8edae..c31fff7 100644
--- a/geogebra/kernel/GeoTextField.java
+++ b/geogebra/kernel/GeoTextField.java
@@ -1,6 +1,7 @@
package geogebra.kernel;
import geogebra.gui.inputfield.AutoCompleteTextField;
+import geogebra.main.Application;
import geogebra.util.Util;
import javax.swing.JTextField;
@@ -12,7 +13,7 @@ public class GeoTextField extends GeoButton {
private static int defaultLength = 20;
- AutoCompleteTextField textField;
+ AutoCompleteTextField textField, textField2;
public GeoTextField(Construction c) {
@@ -51,6 +52,15 @@ public class GeoTextField extends GeoButton {
public void setLinkedGeo(GeoElement geo) {
linkedGeo = geo;
text = geo.getValueForInputBar();
+
+ // remove quotes from start and end
+ if (text.length() > 0 && text.charAt(0) == '"') {
+ text = text.substring(1);
+ }
+ if (text.length() > 0 && text.charAt(text.length() - 1) == '"') {
+ text = text.substring(0, text.length() - 1);
+ }
+
}
public GeoElement getLinkedGeo() {
@@ -76,8 +86,23 @@ public class GeoTextField extends GeoButton {
}
}
- public JTextField getTextField() {
- return textField;
+ public JTextField getTextField(int viewID) {
+
+ if (viewID != Application.VIEW_EUCLIDIAN2) {
+ return textField;
+ }
+
+ if (textField2 == null) {
+ textField2 = new AutoCompleteTextField(textField.getColumns(), app);
+ textField2.showPopupSymbolButton(true);
+ textField2.setAutoComplete(false);
+ textField2.enableColoring(false);
+
+ setLength(textField.getColumns());
+ }
+
+ return textField2;
+
}
@Override
public boolean canHaveUpdateScript(){
@@ -87,6 +112,12 @@ public class GeoTextField extends GeoButton {
textField.setColumns(l);
// don't show the popup button in small fields
textField.showPopupSymbolButton(l > 8);
+
+ if (textField2 != null) {
+ textField2.setColumns(l);
+ // don't show the popup button in small fields
+ textField2.showPopupSymbolButton(l > 8);
+ }
}
public int getLength() {
@@ -96,9 +127,16 @@ public class GeoTextField extends GeoButton {
public void setFocus(final String str) {
textField.requestFocus();
if (str != null) {
- SwingUtilities.invokeLater( new Runnable(){ public void
- run() { textField.setText(str);} });
-
+ SwingUtilities.invokeLater( new Runnable(){ public void
+ run() {
+ textField.setText(str);
+
+ if (textField2 != null) {
+ textField2.setText(str);
+ }
+ }
+ });
+
}
}
diff --git a/geogebra/kernel/GeoVec3D.java b/geogebra/kernel/GeoVec3D.java
index 401b823..572f967 100644
--- a/geogebra/kernel/GeoVec3D.java
+++ b/geogebra/kernel/GeoVec3D.java
@@ -400,20 +400,6 @@ implements Traceable {
sb.append(regrFormat(x) + " " + regrFormat(y) + " " + regrFormat(z));
}
- /**
- * returns all class-specific i2g tags for saveI2G
- * Intergeo File Format (Yves Kreis)
- */
- protected void getI2Gtags(StringBuilder sb) {
- super.getI2Gtags(sb);
-
- sb.append("\t\t\t<homogeneous_coordinates>\n");
- sb.append("\t\t\t\t<double>" + x + "</double>\n");
- sb.append("\t\t\t\t<double>" + y + "</double>\n");
- sb.append("\t\t\t\t<double>" + z + "</double>\n");
- sb.append("\t\t\t</homogeneous_coordinates>\n");
-
- }
public boolean isNumberValue() {
return false;
diff --git a/geogebra/kernel/Kernel.java b/geogebra/kernel/Kernel.java
index 6600190..0eb8f91 100644
--- a/geogebra/kernel/Kernel.java
+++ b/geogebra/kernel/Kernel.java
@@ -3002,6 +3002,7 @@ public class Kernel {
final public GeoPoint Midpoint(String label, GeoPoint P, GeoPoint Q) {
AlgoMidpoint algo = new AlgoMidpoint(cons, label, P, Q);
GeoPoint M = algo.getPoint();
+
return M;
}
@@ -7533,11 +7534,11 @@ public class Kernel {
return true;
}
- final public boolean isInteger(double x) {
+ final public static boolean isInteger(double x) {
if (x > 1E17) {
return true;
} else {
- return isEqual(x, Math.round(x));
+ return Kernel.isEqual(x, Math.round(x));
}
}
diff --git a/geogebra/kernel/algo2intergeo.properties b/geogebra/kernel/algo2intergeo.properties
deleted file mode 100644
index 519f8f5..0000000
--- a/geogebra/kernel/algo2intergeo.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#AlgoAngularBisectorLines=AngularBisector
-AlgoAngularBisectorLines=line_angular_bisectors_of_two_lines
-
-#AlgoAngularBisectorPoints=AngularBisector
-AlgoAngularBisectorPoints=line_angular_bisector_of_three_points
-
-#AlgoIntersectLines=Intersect
-AlgoIntersectLines=point_intersection_of_two_lines
-
-#AlgoJoinPoints=Line
-AlgoJoinPoints=line_through_two_points
-
-#AlgoJoinPointsSegment=Segment
-AlgoJoinPointsSegment=line_segment_by_points
-
-#AlgoLinePointLine=Line
-AlgoLinePointLine=line_parallel_to_line_through_point
-
-#AlgoOrthoLinePointLine=OrthogonalLine
-AlgoOrthoLinePointLine=line_perpendicular_to_line_through_point
-
-#AlgoPointOnPath=Point
-AlgoPointOnPath=point_on_line
\ No newline at end of file
diff --git a/geogebra/kernel/arithmetic/Command.java b/geogebra/kernel/arithmetic/Command.java
index d1cfcc9..e61ef59 100644
--- a/geogebra/kernel/arithmetic/Command.java
+++ b/geogebra/kernel/arithmetic/Command.java
@@ -35,7 +35,7 @@ import java.util.Set;
* @version
*/
public class Command extends ValidExpression
-implements ReplaceableValue {
+implements ReplaceableValue, ReplaceChildrenByValues {
// list of arguments
diff --git a/geogebra/kernel/arithmetic/ExpressionNode.java b/geogebra/kernel/arithmetic/ExpressionNode.java
index 1cb729c..70744ec 100644
--- a/geogebra/kernel/arithmetic/ExpressionNode.java
+++ b/geogebra/kernel/arithmetic/ExpressionNode.java
@@ -45,7 +45,7 @@ import javax.swing.text.Document;
* @author Markus
* @version
*/
-public class ExpressionNode extends ValidExpression implements ReplaceableValue, ExpressionNodeConstants {
+public class ExpressionNode extends ValidExpression implements ReplaceableValue, ExpressionNodeConstants, ReplaceChildrenByValues {
public Application app;
public Kernel kernel;
@@ -199,6 +199,9 @@ public class ExpressionNode extends ValidExpression implements ReplaceableValue,
if (ev.isExpressionNode()) {
ExpressionNode en = (ExpressionNode) ev;
ret = en.getCopy(kernel);
+ } else if (ev instanceof MyList) {
+ MyList en = (MyList) ev;
+ ret = en.getCopy(kernel);
}
// deep copy
else if (ev.isPolynomialInstance() || ev.isConstant() || (ev instanceof Command)) {
@@ -831,6 +834,8 @@ public class ExpressionNode extends ValidExpression implements ReplaceableValue,
// handle command arguments
else if (left instanceof Command) {
((Command) left).replaceChildrenByValues(geo);
+ } else if (left instanceof ReplaceChildrenByValues) {
+ ((ReplaceChildrenByValues) left).replaceChildrenByValues(geo);
}
// right tree
@@ -846,6 +851,8 @@ public class ExpressionNode extends ValidExpression implements ReplaceableValue,
// handle command arguments
else if (right instanceof Command) {
((Command) right).replaceChildrenByValues(geo);
+ } else if (right instanceof ReplaceChildrenByValues) {
+ ((ReplaceChildrenByValues) right).replaceChildrenByValues(geo);
}
}
}
diff --git a/geogebra/kernel/arithmetic/FunctionNVar.java b/geogebra/kernel/arithmetic/FunctionNVar.java
index 34827bf..258e716 100644
--- a/geogebra/kernel/arithmetic/FunctionNVar.java
+++ b/geogebra/kernel/arithmetic/FunctionNVar.java
@@ -14,6 +14,7 @@ package geogebra.kernel.arithmetic;
import geogebra.kernel.CasEvaluableFunction;
import geogebra.kernel.GeoElement;
+import geogebra.kernel.GeoFunction;
import geogebra.kernel.GeoFunctionNVar;
import geogebra.kernel.GeoPoint;
import geogebra.kernel.Kernel;
@@ -441,8 +442,11 @@ public class FunctionNVar extends ValidExpression implements ReplaceableValue,
} else if (ev.isNumberValue()) {
isBooleanFunction = false;
} else if (ev instanceof FunctionNVar){
- expression = ((FunctionNVar)ev).getExpression();
- fVars = ((FunctionNVar)ev).getFunctionVariables();
+ expression = ((FunctionNVar)ev).getExpression();
+ fVars = ((FunctionNVar)ev).getFunctionVariables();
+ } else if (ev instanceof GeoFunction){
+ expression = ((GeoFunction)ev).getFunctionExpression();
+ fVars = ((GeoFunction)ev).getFunction().getFunctionVariables();
}else{
Application.debug("InvalidFunction:" + expression.toString() + " "
+ ev.toString() + ev.getClass().getName());
@@ -836,15 +840,13 @@ public class FunctionNVar extends ValidExpression implements ReplaceableValue,
return initIneqs(leftTree, functional, tree,!negate);
}else if (op == ExpressionNode.FUNCTION_NVAR) {
FunctionalNVar nv = (FunctionalNVar)leftTree.getLeft();
- IneqTree otherTree = nv.getIneqs();
- if(otherTree == null || otherTree.getSize()==0){
- return false;
- }
- tree.left = otherTree.left;
- tree.right = otherTree.right;
- tree.operation =otherTree.operation;
- tree.ineq =otherTree.ineq;
- return true;
+ ExpressionNode subExpr = nv.getFunction().getExpression().getCopy(kernel);
+ FunctionVariable[] subVars = nv.getFunction().getFunctionVariables();
+ for(int i=0;i<subVars.length;i++)
+ subExpr.replace(subVars[i],
+ ((MyList)rightTree.getLeft()).getListElement(i));
+ return initIneqs(subExpr,functional,tree,negate);
+
}
else
return false;
diff --git a/geogebra/kernel/arithmetic/Inequality.java b/geogebra/kernel/arithmetic/Inequality.java
index 4d60d24..2f31fa9 100644
--- a/geogebra/kernel/arithmetic/Inequality.java
+++ b/geogebra/kernel/arithmetic/Inequality.java
@@ -170,8 +170,10 @@ public class Inequality {
border = conicBorder;
setAboveBorderFromConic();
}
- else{
- throw new MyError(kernel.getApplication(), "InvalidEquation");
+ else
+ {
+ type = INEQUALITY_INVALID;
+ return;
}
//TODO implicit ineq
/*if (newBorder.isGeoLine()) {
diff --git a/geogebra/kernel/arithmetic/MyList.java b/geogebra/kernel/arithmetic/MyList.java
index 168dac8..a8a16b9 100644
--- a/geogebra/kernel/arithmetic/MyList.java
+++ b/geogebra/kernel/arithmetic/MyList.java
@@ -36,7 +36,7 @@ import java.util.HashSet;
*
* @author Markus Hohenwarter
*/
-public class MyList extends ValidExpression implements ListValue, ReplaceableValue {
+public class MyList extends ValidExpression implements ListValue, ReplaceableValue, ReplaceChildrenByValues {
private Kernel kernel;
private int matrixRows = -1; // -1 means not calculated, 0 means not a matrix
@@ -957,6 +957,31 @@ public class MyList extends ValidExpression implements ListValue, ReplaceableVal
return isDefined;
}
+ public void clear() {
+ listElements.clear();
+ }
+
+ public void replaceChildrenByValues(GeoElement geo) {
+ for(int i=0;i<size();i++){
+ ExpressionValue insert = getListElement(i);
+ if(insert instanceof ReplaceChildrenByValues)
+ ((ReplaceChildrenByValues)insert).replaceChildrenByValues(geo);
+ }
+
+ }
+
+ /**
+ * Same as deep copy, but doesn't deep copy elements
+ * @param kernel2 kernel
+ * @return copy of this list
+ */
+ public MyList getCopy(Kernel kernel2) {
+ MyList ret = new MyList(kernel,size());
+ for(int i=0;i<size();i++){
+ ret.listElements.add(ExpressionNode.copy(listElements.get(i), kernel2));
+ }
+ return ret;
+ }
}
diff --git a/geogebra/kernel/arithmetic/ReplaceChildrenByValues.java b/geogebra/kernel/arithmetic/ReplaceChildrenByValues.java
new file mode 100644
index 0000000..71fdcdc
--- /dev/null
+++ b/geogebra/kernel/arithmetic/ReplaceChildrenByValues.java
@@ -0,0 +1,20 @@
+package geogebra.kernel.arithmetic;
+
+import geogebra.kernel.GeoElement;
+
+
+/**
+ * Interface for objects that can contain GeoElement
+ * and therefore need to replace it by value sometimes.
+ * @author Zbynek
+ *
+ */
+public interface ReplaceChildrenByValues {
+ /**
+ * Replaces geo and all its dependent geos in this tree by copies of their
+ * values.
+ * @param geo geo to be replaced
+ */
+ public void replaceChildrenByValues(GeoElement geo);
+
+}
diff --git a/geogebra/kernel/commands/AlgebraProcessor.java b/geogebra/kernel/commands/AlgebraProcessor.java
index 87648c8..2171230 100644
--- a/geogebra/kernel/commands/AlgebraProcessor.java
+++ b/geogebra/kernel/commands/AlgebraProcessor.java
@@ -37,7 +37,6 @@ import geogebra.kernel.arithmetic.Polynomial;
import geogebra.kernel.arithmetic.TextValue;
import geogebra.kernel.arithmetic.ValidExpression;
import geogebra.kernel.arithmetic.VectorValue;
-import geogebra.kernel.cas.AlgoDependentCasCell;
import geogebra.kernel.implicit.GeoImplicitPoly;
import geogebra.kernel.kernelND.GeoPointND;
import geogebra.kernel.parser.ParseException;
@@ -47,7 +46,6 @@ import geogebra.main.MyError;
import java.util.ArrayList;
import java.util.Set;
-import java.util.TreeSet;
public class AlgebraProcessor {
@@ -593,33 +591,46 @@ public class AlgebraProcessor {
}
/**
- * Parses given String str and tries to evaluate it to a GeoText.
- * Returns null if something went wrong.
+ * Parses given String str and tries to evaluate it to a GeoText. Returns
+ * null if something went wrong.
+ * @param str input string
+ * @param createLabel true to label result
+ * @param showErrors true to show error messages (only stacktrace otherwise)
+ * @return resulting text
*/
- public GeoText evaluateToText(String str, boolean createLabel) {
+ public GeoText evaluateToText(String str, boolean createLabel,
+ boolean showErrors) {
boolean oldMacroMode = cons.isSuppressLabelsActive();
cons.setSuppressLabelCreation(!createLabel);
GeoText text = null;
- GeoElement [] temp = null;;
+ GeoElement[] temp = null;
try {
- ValidExpression ve = parser.parseGeoGebraExpression(str);
+ ValidExpression ve = parser.parseGeoGebraExpression(str);
temp = processValidExpression(ve);
text = (GeoText) temp[0];
} catch (CircularDefinitionException e) {
- Application.debug("CircularDefinition");
- app.showError("CircularDefinition");
- } catch (Exception e) {
- e.printStackTrace();
- app.showError("InvalidInput", str);
+ if (showErrors) {
+ Application.debug("CircularDefinition");
+ app.showError("CircularDefinition");
+ }
+ } catch (Exception e) {
+ if (showErrors) {
+ e.printStackTrace();
+ app.showError("InvalidInput", str);
+ }
} catch (MyError e) {
- e.printStackTrace();
- app.showError(e);
+ if (showErrors) {
+ e.printStackTrace();
+ app.showError(e);
+ }
} catch (Error e) {
- e.printStackTrace();
- app.showError("InvalidInput", str);
- }
-
+ if (showErrors) {
+ e.printStackTrace();
+ app.showError("InvalidInput", str);
+ }
+ }
+
cons.setSuppressLabelCreation(oldMacroMode);
return text;
}
diff --git a/geogebra/kernel/commands/CmdNormal.java b/geogebra/kernel/commands/CmdNormal.java
index b9b857d..69e49d0 100644
--- a/geogebra/kernel/commands/CmdNormal.java
+++ b/geogebra/kernel/commands/CmdNormal.java
@@ -46,8 +46,7 @@ public class CmdNormal extends CommandProcessor {
kernel.restorePrintAccuracy();
if (cumulative) {
- GeoElement[] ret = kernel.getAlgebraProcessor().processAlgebraCommand( "(erf((x-("+mean+"))/abs("+sd+")) + 1)/2", true );
-
+ GeoElement[] ret = kernel.getAlgebraProcessor().processAlgebraCommand( "(erf((x-("+mean+"))/(sqrt(2)*abs("+sd+"))) + 1)/2", true );
return ret;
} else {
diff --git a/geogebra/kernel/commands/CommandProcessor.java b/geogebra/kernel/commands/CommandProcessor.java
index 4e7cd07..ea884e0 100644
--- a/geogebra/kernel/commands/CommandProcessor.java
+++ b/geogebra/kernel/commands/CommandProcessor.java
@@ -8836,7 +8836,7 @@ class CmdHideLayer extends CommandProcessor {
}
}
- GeoElement[] ret = { layerGeo };
+ GeoElement[] ret = {};
return ret;
} else {
@@ -9855,9 +9855,9 @@ class CmdStartAnimation extends CommandProcessor {
for (int i = 0; i < sliderCount; i++) {
if (arg[i].isGeoNumeric()) {
- ((GeoNumeric) arg[0]).setAnimating(start);
+ ((GeoNumeric) arg[i]).setAnimating(start);
} else {
- ((GeoPoint) arg[0]).setAnimating(start);
+ ((GeoPoint) arg[i]).setAnimating(start);
}
if (start) {
app.getKernel().getAnimatonManager().startAnimation();
diff --git a/geogebra/kernel/commands/MacroProcessor.java b/geogebra/kernel/commands/MacroProcessor.java
index 4750ae9..dbaddde 100644
--- a/geogebra/kernel/commands/MacroProcessor.java
+++ b/geogebra/kernel/commands/MacroProcessor.java
@@ -52,7 +52,7 @@ public class MacroProcessor extends CommandProcessor {
if (!lengthOk) {
StringBuilder sb = new StringBuilder();
- sb.append(app.getMenu("Macro") + " " + macro.getCommandName() + ":\n");
+ sb.append(app.getMenu("Tool") + " " + macro.getCommandName() + ":\n");
sb.append(app.getError("IllegalArgumentNumber") + ": " + arg.length);
sb.append("\n\nSyntax:\n" + macro.toString());
throw new MyError(app, sb.toString());
@@ -63,7 +63,7 @@ public class MacroProcessor extends CommandProcessor {
for (int i=0; i < macroInputTypes.length; i++) {
if (!macroInputTypes[i].isInstance(arg[i])) {
StringBuilder sb = new StringBuilder();
- sb.append(app.getPlain("Macro") + " " + macro.getCommandName() + ":\n");
+ sb.append(app.getMenu("Tool") + " " + macro.getCommandName() + ":\n");
sb.append(app.getError("IllegalArgument") + ": ");
sb.append(arg[i].getNameDescription());
sb.append("\n\nSyntax:\n" + macro.toString());
diff --git a/geogebra/kernel/discrete/AlgoHull.java b/geogebra/kernel/discrete/AlgoHull.java
index 9aa4204..6ed21c2 100644
--- a/geogebra/kernel/discrete/AlgoHull.java
+++ b/geogebra/kernel/discrete/AlgoHull.java
@@ -8,7 +8,7 @@ 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
the Free Software Foundation.
-*/
+ */
package geogebra.kernel.discrete;
@@ -31,176 +31,190 @@ import geogebra.kernel.kernelND.GeoPointND;
import java.util.ArrayList;
import java.util.Collection;
-
/**
* Mode of a list. Adapted from AlgoMode
+ *
* @author Michael Borcherds
- * @version
+ * @version
*/
public class AlgoHull extends AlgoElement {
private static final long serialVersionUID = 1L;
- protected GeoList inputList; //input
+ protected GeoList inputList; // input
private GeoNumeric percentage; // input
- protected GeoLocus locus; // output
- protected ArrayList<MyPoint> al;
- protected ArrayList<VPoint> vl;
- protected int size;
-
- public AlgoHull(Construction cons, String label, GeoList inputList, GeoNumeric percentage) {
- super(cons);
- this.inputList = inputList;
- this.percentage=percentage;
-
- locus = new GeoLocus(cons);
-
- setInputOutput();
- compute();
- locus.setLabel(label);
- }
-
- public String getClassName() {
- return "AlgoHull";
- }
-
- protected void setInputOutput(){
- input = new GeoElement[percentage == null ? 1 : 2];
- input[0] = inputList;
- if (percentage != null) input[1] = percentage;
-
- output = new GeoElement[1];
- output[0] = locus;
- setDependencies(); // done by AlgoElement
- }
-
- public GeoLocus getResult() {
- return locus;
- }
-
- protected void compute() {
-
- size = inputList.size();
- if (!inputList.isDefined() || size == 0) {
- locus.setUndefined();
- return;
- }
-
- if (vl == null) vl = new ArrayList<VPoint>();
- else vl.clear();
-
+ protected GeoLocus locus; // output
+ protected ArrayList<MyPoint> al;
+ protected ArrayList<VPoint> vl;
+ protected int size;
+
+ public AlgoHull(Construction cons, String label, GeoList inputList,
+ GeoNumeric percentage) {
+ super(cons);
+ this.inputList = inputList;
+ this.percentage = percentage;
+
+ locus = new GeoLocus(cons);
+
+ setInputOutput();
+ compute();
+ locus.setLabel(label);
+ }
+
+ public String getClassName() {
+ return "AlgoHull";
+ }
+
+ protected void setInputOutput() {
+ input = new GeoElement[percentage == null ? 1 : 2];
+ input[0] = inputList;
+ if (percentage != null)
+ input[1] = percentage;
+
+ output = new GeoElement[1];
+ output[0] = locus;
+ setDependencies(); // done by AlgoElement
+ }
+
+ public GeoLocus getResult() {
+ return locus;
+ }
+
+ protected void compute() {
+
+ size = inputList.size();
+ if (!inputList.isDefined() || size == 0) {
+ locus.setUndefined();
+ return;
+ }
+
+ if (vl == null)
+ vl = new ArrayList<VPoint>();
+ else
+ vl.clear();
+
double inhom[] = new double[2];
-
+
TriangulationRepresentation.CalcCutOff calccutoff = new TriangulationRepresentation.CalcCutOff() {
- public int calculateCutOff(TriangulationRepresentation rep) {
- // Get variables
- double percent = (percentage == null || !percentage.isDefined()) ? 1 : percentage.getDouble();
-
- if (percent < 0) percent = 0;
- else if (percent > 1) percent = 1;
-
- double min = rep.getMinLength();
- double max = rep.getMaxLength();
-
- // Calculate normalised length based off percentage
- int val = (int)( percent * (max-min) + min );
-
- return val;
- }
- };
-
- AbstractRepresentation representation;
- representation = RepresentationFactory.createTriangulationRepresentation();
-
- for (int i = 0 ; i < size ; i++) {
+ public int calculateCutOff(TriangulationRepresentation rep) {
+ // Get variables
+ double percent = (percentage == null || !percentage.isDefined()) ? 1
+ : percentage.getDouble();
+
+ if (percent < 0)
+ percent = 0;
+ else if (percent > 1)
+ percent = 1;
+
+ double min = rep.getMinLength();
+ double max = rep.getMaxLength();
+
+ // Calculate normalised length based off percentage
+ int val = (int) (percent * (max - min) + min);
+
+ return val;
+ }
+ };
+
+ AbstractRepresentation representation;
+ representation = RepresentationFactory
+ .createTriangulationRepresentation();
+
+ for (int i = 0; i < size; i++) {
GeoElement geo = inputList.get(i);
if (geo.isDefined() && geo.isGeoPoint()) {
- GeoPointND p = (GeoPointND)geo;
+ GeoPointND p = (GeoPointND) geo;
p.getInhomCoords(inhom);
- vl.add( representation.createPoint(inhom[0], inhom[1]) );
+ vl.add(representation.createPoint(inhom[0], inhom[1]));
}
}
- representation = RepresentationFactory.createTriangulationRepresentation();
-
- TriangulationRepresentation trianglarrep = (TriangulationRepresentation) representation;
- trianglarrep.setCalcCutOff(calccutoff);
-
- TestRepresentationWrapper representationwrapper = new TestRepresentationWrapper();
- representationwrapper.innerrepresentation = representation;
-
- VoronoiAlgorithm.generateVoronoi(representationwrapper, vl);
-
- ArrayList<VPoint> edge = ((TriangulationRepresentation)representation).getPointsFormingOutterBoundary();
-
- if (al == null) al = new ArrayList<MyPoint>();
- else al.clear();
- for (int i = 0 ; i < edge.size() ; i++) {
- VPoint p = edge.get(i);
- al.add(new MyPoint(p.x, p.y, i != 0));
-
- }
-
+ representation = RepresentationFactory
+ .createTriangulationRepresentation();
+
+ TriangulationRepresentation trianglarrep = (TriangulationRepresentation) representation;
+ trianglarrep.setCalcCutOff(calccutoff);
+
+ TestRepresentationWrapper representationwrapper = new TestRepresentationWrapper();
+ representationwrapper.innerrepresentation = representation;
+
+ VoronoiAlgorithm.generateVoronoi(representationwrapper, vl);
+
+ ArrayList<VPoint> edge = ((TriangulationRepresentation) representation)
+ .getPointsFormingOutterBoundary();
+ if (edge == null) {
+ locus.setUndefined();
+ return;
+ }
+ if (al == null)
+ al = new ArrayList<MyPoint>();
+ else
+ al.clear();
+ for (int i = 0; i < edge.size(); i++) {
+ VPoint p = edge.get(i);
+ al.add(new MyPoint(p.x, p.y, i != 0));
+
+ }
locus.setPoints(al);
locus.setDefined(true);
-
-
- }
-
- public class TestRepresentationWrapper implements RepresentationInterface {
-
- /* ***************************************************** */
- // Variables
-
- private final ArrayList<VPoint> circleevents = new ArrayList<VPoint>();
-
- RepresentationInterface innerrepresentation = null;
-
- /* ***************************************************** */
- // Data/Representation Interface Method
-
- // Executed before the algorithm begins to process (can be used to
- // initialise any data structures required)
- public void beginAlgorithm(Collection<VPoint> points) {
- // Reset the triangle array list
- circleevents.clear();
-
- // Call the inner representation
- if ( innerrepresentation!=null ) {
- innerrepresentation.beginAlgorithm(points);
- }
- }
-
- // Called to record that a vertex has been found
- public void siteEvent( VLinkedNode n1 , VLinkedNode n2 , VLinkedNode n3 ) {
- // Call the inner representation
- if ( innerrepresentation!=null ) {
- innerrepresentation.siteEvent(n1, n2, n3);
- }
- }
- public void circleEvent( VLinkedNode n1 , VLinkedNode n2 , VLinkedNode n3 , int circle_x , int circle_y ) {
- // Add the circle event
- circleevents.add( new VPoint(circle_x, circle_y) );
-
- // Call the inner representation
- if ( innerrepresentation!=null ) {
- innerrepresentation.circleEvent(n1, n2, n3, circle_x, circle_y);
- }
- }
-
- // Called when the algorithm has finished processing
- public void endAlgorithm(Collection<VPoint> points, double lastsweeplineposition, VLinkedNode headnode) {
- // Call the inner representation
- if ( innerrepresentation!=null ) {
- innerrepresentation.endAlgorithm(points, lastsweeplineposition, headnode);
- }
- }
-
- /* ***************************************************** */
- }
-
-
+ }
+
+ public class TestRepresentationWrapper implements RepresentationInterface {
+
+ /* ***************************************************** */
+ // Variables
+
+ private final ArrayList<VPoint> circleevents = new ArrayList<VPoint>();
+
+ RepresentationInterface innerrepresentation = null;
+
+ /* ***************************************************** */
+ // Data/Representation Interface Method
+
+ // Executed before the algorithm begins to process (can be used to
+ // initialise any data structures required)
+ public void beginAlgorithm(Collection<VPoint> points) {
+ // Reset the triangle array list
+ circleevents.clear();
+
+ // Call the inner representation
+ if (innerrepresentation != null) {
+ innerrepresentation.beginAlgorithm(points);
+ }
+ }
+
+ // Called to record that a vertex has been found
+ public void siteEvent(VLinkedNode n1, VLinkedNode n2, VLinkedNode n3) {
+ // Call the inner representation
+ if (innerrepresentation != null) {
+ innerrepresentation.siteEvent(n1, n2, n3);
+ }
+ }
+
+ public void circleEvent(VLinkedNode n1, VLinkedNode n2, VLinkedNode n3,
+ int circle_x, int circle_y) {
+ // Add the circle event
+ circleevents.add(new VPoint(circle_x, circle_y));
+
+ // Call the inner representation
+ if (innerrepresentation != null) {
+ innerrepresentation.circleEvent(n1, n2, n3, circle_x, circle_y);
+ }
+ }
+
+ // Called when the algorithm has finished processing
+ public void endAlgorithm(Collection<VPoint> points,
+ double lastsweeplineposition, VLinkedNode headnode) {
+ // Call the inner representation
+ if (innerrepresentation != null) {
+ innerrepresentation.endAlgorithm(points, lastsweeplineposition,
+ headnode);
+ }
+ }
+
+ /* ***************************************************** */
+ }
}
diff --git a/geogebra/kernel/implicit/GeoImplicitPoly.java b/geogebra/kernel/implicit/GeoImplicitPoly.java
index 8267ce1..fad9ebc 100644
--- a/geogebra/kernel/implicit/GeoImplicitPoly.java
+++ b/geogebra/kernel/implicit/GeoImplicitPoly.java
@@ -216,6 +216,10 @@ Dilateable, Transformable, EuclidianViewCE {
@Override
public boolean isDefined() {
+ return defined;
+ }
+
+ public boolean isOnScreen(){
return defined && locus.isDefined() && locus.getMyPointList().size() > 0;
}
@@ -1667,6 +1671,5 @@ Dilateable, Transformable, EuclidianViewCE {
return Double.NaN;
}
-
}
diff --git a/geogebra/kernel/kernelND/GeoConicND.java b/geogebra/kernel/kernelND/GeoConicND.java
index 973a86c..7443240 100644
--- a/geogebra/kernel/kernelND/GeoConicND.java
+++ b/geogebra/kernel/kernelND/GeoConicND.java
@@ -366,10 +366,38 @@ public abstract class GeoConicND extends GeoQuadricND implements LineProperties,
hb = halfAxes[1];
hc_2 = ha*ha - hb*hb;
+ //special case handling from:
+ //http://cdserv1.wbut.ac.in/81-8147-617-4/Linux/MagicSoftware/WildMagic2/Documentation/DistancePointToEllipse2.pdf
if (abspx<Kernel.EPSILON) {
- pp.setT(Math.asin(Math.max(-1,-hb*abspy/hc_2)));
+ // pp.setT(Math.asin(Math.max(-1,-hb*abspy/hc_2)));
+ if (abspy<Kernel.EPSILON){
+ if (hb<ha){
+ pp.setT(Math.PI/2);
+ }else{
+ pp.setT(0);
+ }
+ }else{
+ if (hb<ha){
+ pp.setT(Math.PI/2);
+ }else{
+ if (abspy*hb<hc_2){
+ pp.setT(Math.asin(hb*abspy/hc_2));
+ }else{
+ pp.setT(Math.PI/2);
+ }
+ }
+ }
} else if (abspy<Kernel.EPSILON) {
- pp.setT(Math.acos(Math.min(1,ha*abspx/hc_2)));
+// pp.setT(Math.acos(Math.min(1,ha*abspx/hc_2)));
+ if (ha<hb){
+ pp.setT(0);
+ }else{
+ if (abspx*ha<hc_2){
+ pp.setT(Math.acos(ha*abspx/hc_2));
+ }else{
+ pp.setT(0);
+ }
+ }
} else {
//To solve (1-u^2)*(b*py + (a^2-b^2)*u)^2-a^2*px^2*u^2 = 0, where u = sin(theta)
double roots[] = getZeroGradientParams(abspx,abspy);
diff --git a/geogebra/kernel/parser/Parser.jj b/geogebra/kernel/parser/Parser.jj
index 5f98d2d..440f65a 100644
--- a/geogebra/kernel/parser/Parser.jj
+++ b/geogebra/kernel/parser/Parser.jj
@@ -211,7 +211,7 @@ TOKEN : {
// dot operators for multiplication sign
| < MULTIPLY: ("*" | "\u22c5" | "\u2219") >
| < VECTORPRODUCT: "\u2297" >
- | < DIVIDE: "/" >
+ | < DIVIDE: ( "/" | "\u00f7" ) >
| < FACTORIAL: "!" >
| < UNDEFINED: ( "?" | "\ufffd" | "Undefined" | "NaN" | "und" ) >
// | < POWER0: "\u2070" >
@@ -297,7 +297,8 @@ TOKEN : {
"\u0061"-"\u007a", //lower case (a-z)
"\u00b7", // middle dot (for Catalan)
"\u00c0"-"\u00d6", //accentuated letters
- "\u00d8"-"\u01bf", //accentuated letters
+ "\u00d8"-"\u00f6", //accentuated letters
+ "\u00f8"-"\u01bf", //accentuated letters
"\u01c4"-"\u02a8", //accentuated letters
"\u0391"-"\u03f3", // Greek
"\u0401"-"\u0481", // Cyrillic
diff --git a/geogebra/main/Application.java b/geogebra/main/Application.java
index e5c7038..fb2d7ec 100644
--- a/geogebra/main/Application.java
+++ b/geogebra/main/Application.java
@@ -24,11 +24,11 @@ import geogebra.euclidian.DrawEquation;
import geogebra.euclidian.EuclidianController;
import geogebra.euclidian.EuclidianView;
import geogebra.euclidian.EuclidianViewInterface;
-import geogebra.export.GraphicExportDialog;
import geogebra.export.WorksheetExportDialog;
import geogebra.gui.GuiManager;
import geogebra.gui.app.GeoGebraFrame;
import geogebra.gui.inputbar.AlgebraInput;
+import geogebra.gui.toolbar.Toolbar;
import geogebra.gui.util.ImageSelection;
import geogebra.gui.view.algebra.AlgebraView;
import geogebra.io.MyXMLHandler;
@@ -176,6 +176,7 @@ public class Application implements KeyEventDispatcher {
supportedLocales.add(new Locale("sq")); // Albanian
}
+ supportedLocales.add(new Locale("hy")); // Armenian
supportedLocales.add(new Locale("ar")); // Arabic
supportedLocales.add(new Locale("eu")); // Basque
supportedLocales.add(new Locale("bs")); // Bosnian
@@ -311,9 +312,6 @@ public class Application implements KeyEventDispatcher {
// file extension string
public static final String FILE_EXT_GEOGEBRA = "ggb";
- // Added for Intergeo File Format (Yves Kreis) -->
- public static final String FILE_EXT_INTERGEO = "i2g";
- // <-- Added for Intergeo File Format (Yves Kreis)
public static final String FILE_EXT_GEOGEBRA_TOOL = "ggt";
public static final String FILE_EXT_PNG = "png";
public static final String FILE_EXT_EPS = "eps";
@@ -340,12 +338,6 @@ public class Application implements KeyEventDispatcher {
private static final String RB_SETTINGS = "/geogebra/export/settings";
private static final String RB_ALGO2COMMAND = "/geogebra/kernel/algo2command";
- // Added for Intergeo File Format (Yves Kreis) -->
- private static final String RB_ALGO2INTERGEO = "/geogebra/kernel/algo2intergeo";
- // <-- Added for Intergeo File Format (Yves Kreis)
-
- // private static Color COLOR_STATUS_BACKGROUND = new Color(240, 240, 240);
-
private boolean hasGui = false;
public static final int VIEW_NONE = 0;
@@ -556,20 +548,21 @@ public class Application implements KeyEventDispatcher {
// This is needed before handleFileArg because
// we don't want to redefine the toolbar string from the file.
boolean ggtloading = handleFileArgGGTMaybeLoaded(args);
+
+ // init xml io for construction loading
+ myXMLio = new MyXMLio(kernel, kernel.getConstruction());
+
+ // init default preferences if necessary
+ if (!isApplet) {
+ GeoGebraPreferences.getPref().initDefaultXML(this);
+ }
+
if (ggtloading) {
if (!isApplet) {
GeoGebraPreferences.getPref().loadXMLPreferences(this);
}
}
- // init default preferences if necessary
- if (!isApplet) {
- GeoGebraPreferences.getPref().initDefaultXML(this);
- }
-
- // init xml io for construction loading
- myXMLio = new MyXMLio(kernel, kernel.getConstruction());
-
// open file given by startup parameter
handleOptionArgsEarly(args); // for --regressionFile=...
boolean fileLoaded = handleFileArg(args);
@@ -595,10 +588,15 @@ public class Application implements KeyEventDispatcher {
}
}
- if (useFullGui() && (tmpPerspectives != null) && !ggtloading) {
+ //TODO shall ggtLoading affect this test ?
+ if (useFullGui() && (tmpPerspectives != null)) {
getGuiManager().getLayout().setPerspectives(tmpPerspectives);
}
+ if(useFullGui() && ggtloading) {
+ getGuiManager().setToolBarDefinition(Toolbar.getAllTools(this));
+ }
+
setUndoActive(undoActive);
// applet/command line options like file loading on startup
@@ -649,7 +647,8 @@ public class Application implements KeyEventDispatcher {
+ " --settingsFile=PATH|FILENAME\tload/save settings from/in a local file\n"
+ " --resetSettings\treset current settings\n"
+ " --antiAliasing=BOOLEAN\tturn anti-aliasing on/off\n"
- + " --regressionFile=FILENAME\texport textual representations of dependent objects, then exit\n");
+ + " --regressionFile=FILENAME\texport textual representations of dependent objects, then exit\n"
+ + " --versionCheckAllow=SETTING\tallow version check (on/off or true/false for single launch)\n");
System.exit(0);
}
// help debug applets
@@ -1079,6 +1078,9 @@ public class Application implements KeyEventDispatcher {
private String regressionFileName = null;
+ private String versionCheckAllow = null;
+ private static boolean versionCheckAllowed = true;
+
public void createRegressionFile() throws IOException {
if (regressionFileName == null) {
return;
@@ -1264,6 +1266,64 @@ public class Application implements KeyEventDispatcher {
this.getEuclidianView().setAntialiasing(antiAliasing);
this.getEuclidianView2().setAntialiasing(antiAliasing);
}
+
+ versionCheckAllow = args.getStringValue("versionCheckAllow");
+ setVersionCheckAllowed();
+ }
+
+ private void setVersionCheckAllowed() {
+ if (isApplet) {
+ versionCheckAllowed = false;
+ return;
+ }
+ if (versionCheckAllow != null) {
+ if (versionCheckAllow.equals("off")) {
+ GeoGebraPreferences.getPref().savePreference(
+ GeoGebraPortablePreferences.VERSION_CHECK_ALLOW,
+ "false");
+ versionCheckAllowed = false;
+ return;
+ }
+ if (versionCheckAllow.equals("on")) {
+ GeoGebraPreferences
+ .getPref()
+ .savePreference(
+ GeoGebraPortablePreferences.VERSION_CHECK_ALLOW,
+ "true");
+ versionCheckAllowed = true;
+ return;
+ }
+ if (versionCheckAllow.equals("false")) {
+ versionCheckAllowed = false;
+ return;
+ }
+ if (versionCheckAllow.equals("true")) {
+ versionCheckAllowed = true;
+ return;
+ }
+ // TODO: Throw a warning message here that the option is not
+ // recognized.
+ // Now everything is silently accepted.
+ }
+
+ versionCheckAllowed = Boolean
+ .valueOf(GeoGebraPreferences.getPref().loadPreference(
+ GeoGebraPreferences.VERSION_CHECK_ALLOW, "true"));
+ }
+
+ /**
+ * Reports if GeoGebra version check is allowed. The version_check_allowed
+ * preference is read to decide this, which can be set by the command line
+ * option --versionCheckAllow (off/on). For changing the behavior for a
+ * single run, the same command line option must be used with false/true
+ * parameters.
+ *
+ * @return if the check is allowed
+ * @author Zoltan Kovacs <zoltan at geogebra.org>
+ */
+ public static boolean getVersionCheckAllowed() {
+ return versionCheckAllowed;
+
}
private void handleOptionArgsEarly(CommandLineArguments args) {
@@ -1333,8 +1393,9 @@ public class Application implements KeyEventDispatcher {
if (success && !isMacroFile) {
if (!useFullGui()) {
- if (!isJustEuclidianVisible()) {
- hasGui = true;
+ if (showConsProtNavigation
+ || !isJustEuclidianVisible()) {
+ hasGui = true;
}
}
}
@@ -2217,13 +2278,6 @@ public class Application implements KeyEventDispatcher {
return MyResourceBundle.loadSingleBundleFile(RB_ALGO2COMMAND);
}
- // Added for Intergeo File Format (Yves Kreis) -->
- public ResourceBundle initAlgo2IntergeoBundle() {
- return MyResourceBundle.loadSingleBundleFile(RB_ALGO2INTERGEO);
- }
-
- // <-- Added for Intergeo File Format (Yves Kreis)
-
private void updateResourceBundles() {
if (rbmenu != null) {
rbmenu = MyResourceBundle.createBundle(RB_MENU, currentLocale);
@@ -5391,7 +5445,14 @@ public class Application implements KeyEventDispatcher {
@Override
public void run() {
setWaitCursor();
-
+
+ simpleExportToClipboard(ev);
+
+ /*
+ * doesn't work in Win7, XP pasting into eg Paint
+ * pasting into eg Office 2010 is OK
+ *
+ *
if (!WINDOWS_VISTA_OR_LATER) {
// use other method for WinXP or earlier
@@ -5411,7 +5472,7 @@ public class Application implements KeyEventDispatcher {
simpleExportToClipboard(ev);
}
- }
+ }*/
setDefaultCursor();
}
@@ -5426,8 +5487,8 @@ public class Application implements KeyEventDispatcher {
// Windows XP clipboard has trouble with images larger than this
// at double scale (with scale = 2d)
- if (size > 750000) {
- scale = 2.0 * Math.sqrt(750000 / size);
+ if (size > 500000) {
+ scale = 2.0 * Math.sqrt(500000 / size);
}
// copy drawing pad to the system clipboard
@@ -5728,7 +5789,7 @@ public class Application implements KeyEventDispatcher {
return codeBaseFolder.substring(WINDOWS ? 6 : 5);
}
- public void exportToLMS() {
+ public void exportToLMS(boolean ggbWeb) {
clearSelectedGeos();
WorksheetExportDialog d = new WorksheetExportDialog(this);
@@ -5746,7 +5807,7 @@ public class Application implements KeyEventDispatcher {
clipboard.setContents(
new StringSelection(d.getAppletTag(this, null, width, height,
- false, true, false, false)), null);
+ false, true, ggbWeb, false)), null);
d.setVisible(false);
d.dispose();
@@ -5855,6 +5916,10 @@ public class Application implements KeyEventDispatcher {
* neccesary by checking for eg ^2, \frac
*/
public static boolean isLaTeXneeded(String latex) {
+
+ // Unicode is fine to render these:
+ latex = latex.replace("\\leq", "");
+ latex = latex.replace("\\geq", "");
for (int i = 0; i < latex.length(); i++) {
char ch = latex.charAt(i);
diff --git a/geogebra/main/GeoGebraPreferences.java b/geogebra/main/GeoGebraPreferences.java
index 659470c..833acf9 100644
--- a/geogebra/main/GeoGebraPreferences.java
+++ b/geogebra/main/GeoGebraPreferences.java
@@ -42,7 +42,11 @@ public class GeoGebraPreferences {
public static final String VERSION = "version";
public static final String VERSION_LAST_CHECK = "version_last_check";
-
+ /**
+ * Allow checking of availability of a newer version
+ */
+ public static final String VERSION_CHECK_ALLOW = "version_check_allow";
+
// worksheet export dialog
public static final String EXPORT_WS_RIGHT_CLICK = "export_ws_right_click";
public static final String EXPORT_WS_LABEL_DRAGS = "export_ws_label_drags";
@@ -72,6 +76,7 @@ public class GeoGebraPreferences {
// misc
public static final String MISC_REVERSE_MOUSE_WHEEL = "misc_reverse_mouse_wheel";
+
// preferences node name for GeoGebra
diff --git a/geogebra/main/GlobalKeyDispatcher.java b/geogebra/main/GlobalKeyDispatcher.java
index 9d7819a..bf3830b 100644
--- a/geogebra/main/GlobalKeyDispatcher.java
+++ b/geogebra/main/GlobalKeyDispatcher.java
@@ -119,22 +119,24 @@ public class GlobalKeyDispatcher implements KeyEventDispatcher {
}
+ GeoElement geo;
+ if (app.selectedGeosSize() == 1) {
+ // selected geo
+ geo = app.getSelectedGeos().get(0);
+ }
+ else {
+ // last created geo
+ geo = app.getLastCreatedGeoElement();
+ }
+
// show RENAME dialog when a letter is typed
+ // or edit Textfield for any keypress
char ch = event.getKeyChar();
- if (Character.isLetter(ch) &&
+ if ((Character.isLetter(ch) &&
!event.isMetaDown() &&
!event.isAltDown() &&
- !event.isControlDown())
+ !event.isControlDown()) || geo instanceof GeoTextField)
{
- GeoElement geo;
- if (app.selectedGeosSize() == 1) {
- // selected geo
- geo = app.getSelectedGeos().get(0);
- }
- else {
- // last created geo
- geo = app.getLastCreatedGeoElement();
- }
// open rename dialog
if (geo != null) {
@@ -310,6 +312,14 @@ public class GlobalKeyDispatcher implements KeyEventDispatcher {
}
break;
+ // export to GeoGebraWeb
+ case KeyEvent.VK_B:
+ if (!app.isApplet() && event.isShiftDown()) {
+ app.exportToLMS(true);
+ consumed = true;
+ }
+ break;
+
case KeyEvent.VK_C:
// Ctrl-shift-c: copy graphics view to clipboard
// should also work in applets with no menubar
@@ -356,7 +366,7 @@ public class GlobalKeyDispatcher implements KeyEventDispatcher {
case KeyEvent.VK_M:
if (!app.isApplet() && event.isShiftDown()) {
- app.exportToLMS();
+ app.exportToLMS(false);
consumed = true;
} else if (!app.isApplet() || app.isRightClickEnabled()) {
app.setStandardView();
@@ -504,6 +514,8 @@ public class GlobalKeyDispatcher implements KeyEventDispatcher {
break;
// Ctrl + "+", Ctrl + "-" zooms in or out in graphics view
+ case KeyEvent.VK_ADD:
+ case KeyEvent.VK_SUBTRACT:
case KeyEvent.VK_PLUS:
case KeyEvent.VK_MINUS:
case KeyEvent.VK_EQUALS:
@@ -581,7 +593,7 @@ public class GlobalKeyDispatcher implements KeyEventDispatcher {
EuclidianViewInterface ev=app.getActiveEuclidianView();
int width = ev.getWidth();
int height = ev.getHeight();
- if (ev.hasFocus())
+ if (ev.hasFocus() && app.isShiftDragZoomEnabled())
switch (keyCode) {
case KeyEvent.VK_PAGE_UP:
diff --git a/geogebra/main/settings/SpreadsheetSettings.java b/geogebra/main/settings/SpreadsheetSettings.java
index 2234b7a..ef38d9e 100644
--- a/geogebra/main/settings/SpreadsheetSettings.java
+++ b/geogebra/main/settings/SpreadsheetSettings.java
@@ -12,6 +12,8 @@ import java.util.LinkedList;
*/
public class SpreadsheetSettings extends AbstractSettings {
+ public static final int TABLE_CELL_WIDTH = 70;
+ public static final int TABLE_CELL_HEIGHT = 21; //G.Sturr (old height 20) + 1 to stop cell editor clipping
// layout settings
private boolean showFormulaBar = false;
private boolean showGrid = true;
diff --git a/geogebra/plugin/GgbAPI.java b/geogebra/plugin/GgbAPI.java
index 7b8ba02..b07bae3 100644
--- a/geogebra/plugin/GgbAPI.java
+++ b/geogebra/plugin/GgbAPI.java
@@ -11,6 +11,7 @@ package geogebra.plugin;
*/
import geogebra.GeoGebra;
+import geogebra.JavaScriptAPI;
import geogebra.cas.GeoGebraCAS;
import geogebra.euclidian.EuclidianView;
import geogebra.io.MyImageIO;
@@ -27,6 +28,8 @@ import geogebra.kernel.Traceable;
import geogebra.kernel.arithmetic.NumberValue;
import geogebra.kernel.commands.AlgebraProcessor;
import geogebra.main.Application;
+import geogebra.util.Base64;
+import geogebra.util.Util;
import java.awt.Color;
import java.awt.geom.Rectangle2D;
@@ -71,7 +74,7 @@ import javax.imageio.stream.ImageOutputStream;
Tranferred applet interface methods (the relevant ones) from GeoGebraAppletBase
*/
-public class GgbAPI {
+public class GgbAPI implements JavaScriptAPI {
///// ----- Properties ----- /////
private Application app= null; //References ...
@@ -1177,6 +1180,47 @@ public class GgbAPI {
return geo.isMoveable();
}
+ final public String getBase64() {
+ return getBase64(false);
+ }
+
+
+ public void setOnTheFlyPointCreationActive(boolean flag) {
+ app.setOnTheFlyPointCreationActive(flag);
+
+ }
+
+ public void setUndoPoint() {
+ kernel.getConstruction().storeUndoInfo();
+ }
+
+
+ public String getIPAddress() {
+ return Util.getIPAddress();
+ }
+
+ public String getHostname() {
+ return Util.getHostname();
+ }
+
+ public void startAnimation() {
+ kernel.getAnimatonManager().startAnimation();
+ }
+
+ public void stopAnimation() {
+ kernel.getAnimatonManager().stopAnimation();
+ }
+
+ public void hideCursorWhenDragging(boolean hideCursorWhenDragging) {
+ kernel.getApplication()
+ .setUseTransparentCursorWhenDragging(hideCursorWhenDragging);
+ }
+
+ public boolean isAnimationRunning() {
+ return kernel.getAnimatonManager().isRunning();
+ }
+
+
diff --git a/geogebra/properties/colors_ca.properties b/geogebra/properties/colors_ca.properties
index c731ab7..3d92ce9 100644
--- a/geogebra/properties/colors_ca.properties
+++ b/geogebra/properties/colors_ca.properties
@@ -1,9 +1,9 @@
-aqua=Agua
+aqua=Aigua
black=Negre
blue=Blau
-brown=Marro
+brown=Marró
crimson=Carmesí
-cyan=cian
+cyan=Cian
darkblue=Blau fosc
darkgray=Gris fosc
darkgreen=Verd fosc
diff --git a/geogebra/properties/colors_eu.properties b/geogebra/properties/colors_eu.properties
index 869d1b1..3f9c5f1 100644
--- a/geogebra/properties/colors_eu.properties
+++ b/geogebra/properties/colors_eu.properties
@@ -8,7 +8,7 @@ darkblue=Urdin Iluna
darkgray=Gris Iluna
darkgreen=Berde Iluna
gold=Urrea
-gray=Gris
+gray=Grisa
green=Berdea
indigo=Indigoa
lightblue=Urdin Argia
diff --git a/geogebra/properties/colors_gl.properties b/geogebra/properties/colors_gl.properties
index e69de29..b9d549b 100644
--- a/geogebra/properties/colors_gl.properties
+++ b/geogebra/properties/colors_gl.properties
@@ -0,0 +1,32 @@
+aqua=Auga
+black=Negra
+blue=Azul
+brown=Marrón
+crimson=Carmesí
+cyan=Cian
+darkblue=Azul escura
+darkgray=Gris escura
+darkgreen=Verde escura
+gold=Ouro
+gray=Gris
+green=Verde
+indigo=anil
+lightblue=Celeste
+lightgray=Gris clara
+lightgreen=Verde clara
+lightorange=Laranxa clara
+lightpurple=Púrpura clara
+lightviolet=Lila
+lightyellow=Amarela clara
+lime=Lima
+magenta=Maxenta
+maroon=Granate
+orange=Laranxa
+pink=Rosa
+purple=Púrpura
+red=Vermella
+silver=Prata
+turquoise=Turquesa
+violet=Violeta
+white=Branca
+yellow=Amarela
\ No newline at end of file
diff --git a/geogebra/properties/colors_hy.properties b/geogebra/properties/colors_hy.properties
new file mode 100644
index 0000000..1fdcfb2
--- /dev/null
+++ b/geogebra/properties/colors_hy.properties
@@ -0,0 +1,32 @@
+aqua=\u0532\u0561\u0581 \u056f\u0561\u057a\u0578\u0582\u0575\u057f
+black=\u054d\u0587
+blue=\u053f\u0561\u057a\u0578\u0582\u0575\u057f
+brown=\u0544\u0578\u056d\u0580\u0561\u0563\u0578\u0582\u0575\u0576
+crimson=\u0544\u0578\u0580\u0561\u0563\u0578\u0582\u0575\u0576
+cyan=\u0535\u0580\u056f\u0576\u0561\u0563\u0578\u0582\u0575\u0576
+darkblue=\u0544\u0578\u0582\u0563 \u056f\u0561\u057a\u0578\u0582\u0575\u057f
+darkgray=\u0544\u0578\u0582\u0563 \u0574\u0578\u056d\u0580\u0561\u0563\u0578\u0582\u0575\u0576
+darkgreen=\u0544\u0578\u0582\u0563 \u056f\u0561\u0576\u0561\u0579
+gold=\u0548\u057d\u056f\u0565\u0563\u0578\u0582\u0575\u0576
+gray=\u0544\u0578\u056d\u0580\u0561\u0563\u0578\u0582\u0575\u0576
+green=\u053f\u0561\u0576\u0561\u0579
+indigo=\u053b\u0576\u0564\u056b\u0563\u0578
+lightblue=\u0532\u0561\u0581 \u056f\u0561\u057a\u0578\u0582\u0575\u057f
+lightgray=\u0532\u0561\u0581 \u0574\u0578\u056d\u0580\u0561\u0563\u0578\u0582\u0575\u0576
+lightgreen=\u0532\u0561\u0581 \u056f\u0561\u0576\u0561\u0579
+lightorange=\u0532\u0561\u0581 \u0576\u0561\u0580\u0576\u057b\u0561\u0563\u0578\u0582\u0575\u0576
+lightpurple=\u0532\u0561\u0581 \u056f\u0561\u0580\u0574\u056b\u0580
+lightviolet=\u0532\u0561\u0581 \u0574\u0561\u0576\u0578\u0582\u0577\u0561\u056f\u0561\u0563\u0578\u0582\u0575\u0576
+lightyellow=\u0532\u0561\u0581 \u0564\u0565\u0572\u056b\u0576
+lime=\u053f\u056b\u057f\u0580\u0578\u0576\u056b
+magenta=\u054e\u0561\u0580\u0564\u0561\u0563\u0578\u0582\u0575\u0576
+maroon=\u0547\u0561\u0563\u0561\u0576\u0561\u056f\u0561\u0574\u0578\u0580\u0561\u0563\u0578\u0582\u0575\u0576
+orange=\u0546\u0561\u0580\u0576\u057b\u0561\u0563\u0578\u0582\u0575\u0576
+pink=\u0532\u0561\u0581 \u057e\u0561\u0580\u0564\u0561\u0563\u0578\u0582\u0575\u0576
+purple=\u0544\u0578\u0582\u0563 \u0575\u0561\u057d\u0561\u0574\u0561\u0576\u0561\u0563\u0578\u0582\u0575\u0576
+red=\u053f\u0561\u0580\u0574\u056b\u0580
+silver=\u0531\u0580\u056e\u0561\u0569\u0561\u0563\u0578\u0582\u0575\u0576
+turquoise=\u0553\u056b\u0580\u0578\u0582\u0566
+violet=\u0544\u0561\u0576\u0578\u0582\u0577\u0561\u056f\u0561\u0563\u0578\u0582\u0575\u0576
+white=\u054d\u057a\u056b\u057f\u0561\u056f
+yellow=\u0534\u0565\u0572\u056b\u0576
\ No newline at end of file
diff --git a/geogebra/properties/colors_ne.properties b/geogebra/properties/colors_ne.properties
index e061026..923ff63 100644
--- a/geogebra/properties/colors_ne.properties
+++ b/geogebra/properties/colors_ne.properties
@@ -1,32 +1,32 @@
-aqua=Aqua\n\u0905\u0915\u094d\u0935\u093e
-black=Black\n\u0915\u093e\u0932\u094b
-blue=Blue\n\u0928\u093f\u0932\u094b
-brown=Brown\n\u0916\u0948\u0930\u094b
-crimson=Crimson\n\u0917\u093e\u0922\u093e\u0930\u093e\u0924\u094b
-cyan=Cyan\n\u0915\u094d\u092f\u093e\u0928
-darkblue=Dark Blue\n\u0917\u093e\u0922\u093e \u0928\u093f\u0932\u094b
-darkgray=Dark Gray\n\u0917\u093e\u0922\u093e \u0916\u0930\u093e\u0928\u0940
-darkgreen=Dark Green\n\u0917\u093e\u0922\u093e \u0939\u0930\u093f\u092f\u094b
-gold=Gold\n\u0938\u0941\u0928\u094c\u0932\u094b
-gray=Gray\n\u0916\u0948\u0930\u094b
-green=Green\n\u0939\u0930\u0940\u092f\u094b
-indigo=Indigo\n\u0908\u0928\u094d\u0921\u093f\u0917\u094b
-lightblue=Light Blue\n\u0939\u0932\u094d\u0915\u093e \u0928\u093f\u0932\u094b
-lightgray=Light Gray\n\u0939\u0932\u094d\u0915\u093e \u0916\u0948\u0930\u094b
-lightgreen=Light Green\n\u0939\u0932\u094d\u0915\u093e \u0939\u0930\u093f\u092f\u094b
-lightorange=Light Orange\n\u0939\u0932\u094d\u0915\u093e \u0938\u0941\u0928\u094d\u0924\u0932\u093e
-lightpurple=Light Purple\n\u0939\u0932\u094d\u0915\u093e \u092c\u0948\u0917\u0941\u0928\u093f
-lightviolet=Light Violet\n\u0939\u0932\u094d\u0915\u093e \u092c\u0948\u091c\u0928\u0940
-lightyellow=Light Yellow\n\u0939\u0932\u094d\u0915\u093e \u092a\u0902\u0939\u0947\u0932\u094b
-lime=Lime\n\u091a\u0941\u0928 \u091c\u0938\u094d\u0924\u0948
-magenta=Magenta\n\u092e\u094d\u092f\u093e\u0917\u0928\u094d\u091f\u093e
-maroon=Maroon\n\u092e\u0930\u0942\u0928
-orange=Orange\n\u0938\u0941\u0928\u094d\u0924\u0932\u093e
-pink=Pink\n\u0917\u0941\u0932\u093e\u092c\u0940
-purple=Purple\n\u0915\u0932\u0947\u091c\u0940
-red=Red\n\u0930\u093e\u0924\u094b
-silver=Silver\n\u091a\u093e\u0902\u0926\u0940
-turquoise=Turquoise\n\u091f\u0930\u0915\u094d\u092f\u0941\u091c
-violet=Violet\n\u092c\u0948\u091c\u0928\u0940
-white=White\n\u0938\u0947\u0924\u094b
-yellow=Yellow\n\u092a\u0902\u0939\u0947\u0932\u094b
\ No newline at end of file
+aqua=\u0905\u0915\u094d\u0935\u093e
+black=\u0915\u093e\u0932\u094b
+blue=\u0928\u093f\u0932\u094b
+brown=\u0916\u0948\u0930\u094b
+crimson=\u0917\u093e\u0922\u093e\u0930\u093e\u0924\u094b
+cyan=\u0915\u094d\u092f\u093e\u0928
+darkblue=\u0917\u093e\u0922\u093e \u0928\u093f\u0932\u094b
+darkgray=\u0917\u093e\u0922\u093e \u0916\u0930\u093e\u0928\u0940
+darkgreen=\u0917\u093e\u0922\u093e \u0939\u0930\u093f\u092f\u094b
+gold=\u0938\u0941\u0928\u094c\u0932\u094b
+gray=\u0916\u0948\u0930\u094b
+green=\u0939\u0930\u0940\u092f\u094b
+indigo=\u0908\u0928\u094d\u0921\u093f\u0917\u094b
+lightblue=\u0939\u0932\u094d\u0915\u093e \u0928\u093f\u0932\u094b
+lightgray=\u0939\u0932\u094d\u0915\u093e \u0916\u0948\u0930\u094b
+lightgreen=\u0939\u0932\u094d\u0915\u093e \u0939\u0930\u093f\u092f\u094b
+lightorange=\u0939\u0932\u094d\u0915\u093e \u0938\u0941\u0928\u094d\u0924\u0932\u093e
+lightpurple=\u0939\u0932\u094d\u0915\u093e \u092c\u0948\u0917\u0941\u0928\u093f
+lightviolet=\u0939\u0932\u094d\u0915\u093e \u092c\u0948\u091c\u0928\u0940
+lightyellow=\u0939\u0932\u094d\u0915\u093e \u092a\u0902\u0939\u0947\u0932\u094b
+lime=\u091a\u0941\u0928 \u091c\u0938\u094d\u0924\u0948
+magenta=\u092e\u094d\u092f\u093e\u0917\u0928\u094d\u091f\u093e
+maroon=\u092e\u0930\u0942\u0928
+orange=\u0938\u0941\u0928\u094d\u0924\u0932\u093e
+pink=\u0917\u0941\u0932\u093e\u092c\u0940
+purple=\u0915\u0932\u0947\u091c\u0940
+red=\u0930\u093e\u0924\u094b
+silver=\u091a\u093e\u0902\u0926\u0940
+turquoise=\u091f\u0930\u0915\u094d\u092f\u0941\u091c
+violet=\u092c\u0948\u091c\u0928\u0940
+white=\u0938\u0947\u0924\u094b
+yellow=\u092a\u0902\u0939\u0947\u0932\u094b
\ No newline at end of file
diff --git a/geogebra/properties/colors_nl.properties b/geogebra/properties/colors_nl.properties
index 11ea36f..f115983 100644
--- a/geogebra/properties/colors_nl.properties
+++ b/geogebra/properties/colors_nl.properties
@@ -1,9 +1,27 @@
black=Zwart
blue=Blauw
brown=Bruin
+crimson=Dieprood
cyan=Cyaan
darkblue=Donkerblauw
darkgray=Donkergrijs
+darkgreen=Donkergroen
gold=Goud
+gray=Grijs
+green=Groen
+lightblue=Lichtblauw
+lightgray=Lichtgrijs
+lightgreen=Lichtgroen
+lightorange=Lichtoranje
+lightpurple=Lichtpurper
+lightviolet=Lichtviolet
+lightyellow=Lichtgeel
+lime=Limoengroen
+maroon=Bruin-rood
+orange=Oranje
+pink=Roze
+purple=Purper
red=Rood
+silver=Zilver
+white=Wit
yellow=Geel
\ No newline at end of file
diff --git a/geogebra/properties/colors_ro.properties b/geogebra/properties/colors_ro.properties
index e69de29..5c227b1 100644
--- a/geogebra/properties/colors_ro.properties
+++ b/geogebra/properties/colors_ro.properties
@@ -0,0 +1,17 @@
+aqua=Ap\u0103
+black=Negru
+blue=Albastru
+brown=Brun
+darkblue=Albastru închis
+darkgray=Gri închis
+green=Verde
+lightgreen=Verde deschis
+lightorange=Portocaliu deschis
+lightpurple=Visiniu deschis
+lightviolet=Violet deschis
+lightyellow=Galben deschis
+maroon=Maron
+pink=Roy
+purple=Visiniu
+red=Rosu
+yellow=Galben
\ No newline at end of file
diff --git a/geogebra/properties/colors_sk.properties b/geogebra/properties/colors_sk.properties
index 2a46048..0b1d9c2 100644
--- a/geogebra/properties/colors_sk.properties
+++ b/geogebra/properties/colors_sk.properties
@@ -1,5 +1,5 @@
aqua=svetlomodrá
-black=\u010dierná
+black=\u010dierna
blue=modrá
brown=hnedá
crimson=karmínová
@@ -28,5 +28,5 @@ red=\u010derven
silver=strieborná
turquoise=tyrkysová
violet=fialová
-white=bielá
+white=biela
yellow=\u017eltá
\ No newline at end of file
diff --git a/geogebra/properties/colors_sv.properties b/geogebra/properties/colors_sv.properties
index 763f7c3..afd2edf 100644
--- a/geogebra/properties/colors_sv.properties
+++ b/geogebra/properties/colors_sv.properties
@@ -1,6 +1,9 @@
+aqua=Turkos
black=Svart
blue=Blå
brown=Brun
+crimson=Blodröd
+cyan=Blå
darkblue=Mörkblå
darkgray=Mörkgrå
darkgreen=Mörkgrön
@@ -10,10 +13,16 @@ green=Gr
lightblue=Ljusblå
lightgray=Ljusgrå
lightgreen=Ljusgrön
-lightorange=Ljust Orange
+lightorange=Ljusorange
+lightpurple=Ljuslila
+lightviolet=Ljusviolett
lightyellow=Ljusgul
+lime=Limegrön
+maroon=Rödbrun
pink=Skär
+purple=Violett
red=Röd
+turquoise=Turkos
violet=Violett
white=Vit
yellow=Gul
\ No newline at end of file
diff --git a/geogebra/properties/colors_tl.properties b/geogebra/properties/colors_tl.properties
new file mode 100644
index 0000000..54792b6
--- /dev/null
+++ b/geogebra/properties/colors_tl.properties
@@ -0,0 +1,30 @@
+aqua=Akwa
+black=Itim
+blue=Bughaw
+brown=Kayumanggi
+crimson=Krimson
+cyan=Sayan
+darkblue=Mapusyaw na Bughaw
+darkgray=Mapusyaw na Kulay-abo
+darkgreen=Mapusyaw na Luntian
+gold=Ginto
+gray=Kulay-abo
+green=Luntian
+lightblue=Matingkad na Bughaw
+lightgray=Matinghad na Kulay-abo
+lightgreen=Matingkad na Luntian
+lightorange=Matingkad na Kahel
+lightpurple=Matingkad na Lila
+lightviolet=Matingkad na Biyoleta
+lightyellow=Matingkad na Dilaw
+lime=Kulay-dayap
+magenta=Madyenta
+orange=Kahel
+pink=Rosas
+purple=Lila
+red=Pula
+silver=Pilak
+turquoise=Turkesa
+violet=Biyoleta
+white=Puti
+yellow=Dilaw
\ No newline at end of file
diff --git a/geogebra/properties/colors_uk.properties b/geogebra/properties/colors_uk.properties
index e69de29..548fd1e 100644
--- a/geogebra/properties/colors_uk.properties
+++ b/geogebra/properties/colors_uk.properties
@@ -0,0 +1,32 @@
+aqua=\u041c\u043e\u0440\u0441\u044c\u043a\u043e\u0457 \u0445\u0432\u0438\u043b\u0456
+black=\u0427\u043e\u0440\u043d\u0438\u0439
+blue=\u0421\u0438\u043d\u0456\u0439
+brown=\u041a\u043e\u0440\u0438\u0447\u043d\u0435\u0432\u0438\u0439
+crimson=\u041c\u0430\u043b\u0438\u043d\u043e\u0432\u0438\u0439
+cyan=\u0426\u0456\u0430\u043d
+darkblue=\u0422\u0435\u043c\u043d\u043e-\u0441\u0438\u043d\u0456\u0439
+darkgray=\u0422\u0435\u043c\u043d\u043e-\u0441\u0456\u0440\u0438\u0439
+darkgreen=\u0422\u0435\u043c\u043d\u043e-\u0437\u0435\u043b\u0435\u043d\u0438\u0439
+gold=\u0417\u043e\u043b\u043e\u0442\u0438\u0439
+gray=\u0421\u0456\u0440\u0438\u0439
+green=\u0417\u0435\u043b\u0435\u043d\u0438\u0439
+indigo=\u0406\u043d\u0434\u0438\u0433\u043e
+lightblue=\u0411\u043b\u0430\u043a\u0438\u0442\u043d\u0438\u0439
+lightgray=\u0421\u0432\u0456\u0442\u043b\u043e-\u0441\u0456\u0440\u0438\u0439
+lightgreen=\u0421\u0432\u0456\u0442\u043b\u043e-\u0437\u0435\u043b\u0435\u043d\u0438\u0439
+lightorange=\u0421\u0432\u0456\u0442\u043b\u043e-\u043f\u043e\u043c\u0430\u0440\u0430\u043d\u0447\u0435\u0432\u0438\u0439
+lightpurple=\u0421\u0432\u0456\u0442\u043b\u043e-\u043f\u0443\u0440\u043f\u0443\u0440\u043d\u0438\u0439
+lightviolet=\u0421\u0432\u0456\u0442\u043b\u043e-\u0444\u0456\u043e\u043b\u0435\u0442\u043e\u0432\u0438\u0439
+lightyellow=\u0421\u0432\u0456\u0442\u043b\u043e-\u0436\u043e\u0432\u0442\u0438\u0439
+lime=\u041b\u0430\u0439\u043c\u043e\u0432\u0438\u0439
+magenta=\u041c\u0430\u0434\u0436\u0435\u043d\u0442\u0430
+maroon=\u0422\u0435\u043c\u043d\u043e-\u0431\u043e\u0440\u0434\u043e\u0432\u0438\u0439
+orange=\u041f\u043e\u043c\u0430\u0440\u0430\u043d\u0447\u0435\u0432\u0438\u0439
+pink=\u0420\u043e\u0436\u0435\u0432\u0438\u0439
+purple=\u041f\u0443\u0440\u043f\u0443\u0440\u043d\u0438\u0439
+red=\u0427\u0435\u0440\u0432\u043e\u043d\u0438\u0439
+silver=\u0421\u0440\u0456\u0431\u043d\u0438\u0439
+turquoise=\u0411\u0456\u0440\u044e\u0437\u043e\u0432\u0438\u0439
+violet=\u0424\u0456\u043e\u043b\u0435\u0442\u043e\u0432\u0438\u0439
+white=\u0411\u0456\u043b\u0438\u0439
+yellow=\u0416\u043e\u0432\u0442\u0438\u0439
\ No newline at end of file
diff --git a/geogebra/properties/command.properties b/geogebra/properties/command.properties
index 0f455f3..94b2323 100644
--- a/geogebra/properties/command.properties
+++ b/geogebra/properties/command.properties
@@ -75,8 +75,6 @@ ColumnName=ColumnName
ColumnName.Syntax=[ <Spreadsheet Cell> ]
Command=Command
CommonDenominator=CommonDenominator
-CompetitionRank=CompetitionRank
-CompetitionRank.Syntax=[ <List> ]
CompleteSquare=CompleteSquare
CompleteSquare.Syntax=[ <Quadratic Function> ]
ComplexRoot=ComplexRoot
@@ -116,7 +114,7 @@ Delete.Syntax=[ <Object> ]
Denominator=Denominator
Denominator.Syntax=[ <Function> ]
Derivative=Derivative
-Derivative.Syntax=[ <Function> ]\n[ <Curve> ]\n[ <Function>, <Number> ]\n[ <Curve>, <Number> ]
+Derivative.Syntax=[ <Function> ]\n[ <Curve> ]\n[ <Function>, <Number> ]\n[ <Function>, <Variable> ]\n[ <Curve>, <Number> ]\n[ <Function>, <Variable>, <Number> ]
Determinant=Determinant
Determinant.Syntax=[ <Matrix> ]
Diameter=ConjugateDiameter
@@ -257,8 +255,6 @@ IntersectRegion=IntersectRegion
IntersectRegion.Syntax=[ <Polygon>, <Polygon> ]
Intersection=Intersection
Intersection.Syntax=[ <List>, <List> ]
-IntersectionPaths=IntersectionPaths
-IntersectionPaths.Syntax=\n[ <GeoLine>, <GeoPolygon> ]\n[ <GeoLine>, <GeoConic> ]
InverseBinomial=InverseBinomial
InverseBinomial.Syntax=[ <Number of Trials>, <Probability of Success>, <Probability> ]
InverseCauchy=InverseCauchy
@@ -407,11 +403,10 @@ Percentile=Percentile
Percentile.Syntax=[ <List of Numbers>, <Percent> ]
Perimeter=Perimeter
Perimeter.Syntax=[ <Polygon> ]\n[ <Conic> ]\n[ <Locus> ]
-Plane=Plane
PlaySound=PlaySound
PlaySound.Syntax=[ <File> ]\n[ <Boolean Play> ]\n[ <Note Sequence>, <Instrument> ]\n[ <Note>, <Duration>, <Instrument> ]\n[ <Function>, <Min Value>, <Max Value> ]\n[ <Function>, <Min Value>, <Max Value>, <Sample Rate>, <Sample Depth> ]
Point=Point
-Point.Syntax=[ <Object> ]\n[ <Object>, <Parameter> ]\n[ <Point>, <Vector> ]
+Point.Syntax=[ <Object> ]\n[ <Object>, <Parameter> ]\n[ <Point>, <Vector> ]\n[ <List> ]
PointIn=PointIn
PointIn.Syntax=[ <Region> ]
PointList=PointList
diff --git a/geogebra/properties/command_bg.properties b/geogebra/properties/command_bg.properties
index 7f0ba6c..aed4200 100644
--- a/geogebra/properties/command_bg.properties
+++ b/geogebra/properties/command_bg.properties
@@ -1,9 +1,12 @@
+ANOVA.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a>, <\u0421\u043f\u0438\u0441\u044a\u043a>, ... ]
AffineRatio=\u041e\u0442\u043d\u043e\u0448\u0435\u043d\u0438\u0435
AffineRatio.Syntax=[ <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]
Angle=\u042a\u0433\u044a\u043b
Angle.Syntax=[ <\u041e\u0431\u0435\u043a\u0442> ]\n[ <\u0412\u0435\u043a\u0442\u043e\u0440>, <\u0412\u0435\u043a\u0442\u043e\u0440> ]\n[ <\u041f\u0440\u0430\u0432\u0430>, <\u041f\u0440\u0430\u0432\u0430> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u0412\u0440\u044a\u0445>, <\u0422\u043e\u0447\u043a\u0430> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u0412\u0440\u044a\u0445>, <\u042a\u0433\u044a\u043b> ]
AngularBisector=\u042a\u0433\u043b\u043e\u043f\u043e\u043b\u043e\u0432\u044f\u0449\u0430
AngularBisector.Syntax=[ <\u041f\u0440\u0430\u0432\u0430>, <\u041f\u0440\u0430\u0432\u0430> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]
+Append.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a>, <\u041e\u0431\u0435\u043a\u0442> ]\n[ <\u041e\u0431\u0435\u043a\u0442>, <\u0421\u043f\u0438\u0441\u044a\u043a> ]
+ApplyMatrix.Syntax=[ <\u041c\u0430\u0442\u0440\u0438\u0446\u0430>, <\u041e\u0431\u0435\u043a\u0442> ]
Arc=\u0414\u044a\u0433\u0430
Arc.Syntax=[ <\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442>, <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]\n[ <\u0415\u043b\u0438\u043f\u0441\u0430>, <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]\n[ <\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442>, <\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438\u0447\u043d\u0430 \u0432\u0435\u043b\u0438\u0447\u0438\u043d\u0430>, <\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438\u0447\u043d\u0430 \u0432\u0435\u043b\u0438\u0447\u0438\u043d\u0430> ]\n[ <\u0415\u043b\u0438\u043f\u0441\u0430>, <\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438\u0447\u043d\u0430 \u0432\u0435\u043b\u0438\u0447\u0438\u043d\u0430>, <\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438\u0447\u043d\u0430 \u0432\u0435\u043b\u0438\u0447\u0438\u043d\u0430> ]
Area=\u041f\u043b\u043e\u0449
@@ -12,6 +15,7 @@ Asymptote=\u0410\u0441\u0438\u043c\u043f\u0442\u043e\u0442\u0430
Asymptote.Syntax=[ <\u041a\u043e\u043d\u0438\u0447\u043d\u043e \u0441\u0435\u0447\u0435\u043d\u0438\u0435> ]\n[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f> ]\n[ <\u041d\u0435\u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0430 \u043a\u0440\u0438\u0432\u0430> ]
Axes=\u041e\u0441\u0438
Axes.Syntax=[ <\u041a\u043e\u043d\u0438\u0447\u043d\u043e \u0441\u0435\u0447\u0435\u043d\u0438\u0435> ]
+Bernoulli=\u0411\u0435\u0440\u043d\u0443\u043b\u0438
Binomial=\u0411\u0438\u043d\u043e\u043c\u0435\u043d \u043a\u043e\u0435\u0444\u0438\u0446\u0438\u0435\u043d\u0442
Binomial.Syntax=[ <\u0427\u0438\u0441\u043b\u043e n>, <\u0427\u0438\u0441\u043b\u043e n> ]
Button=\u0411\u0443\u0442\u043e\u043d
@@ -28,33 +32,52 @@ Checkbox=\u041f\u043e\u043b\u0435 \u0437\u0430 \u043f\u043e\u0441\u0442\u0430\u0
Checkbox.Syntax=[ ]\n[ <\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435> ]\n[ <\u0421\u043f\u0438\u0441\u044a\u043a> ]\n[ <\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435>, <\u0421\u043f\u0438\u0441\u044a\u043a> ]
Circle=\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442
Circle.Syntax=[ <\u0422\u043e\u0447\u043a\u0430>, <\u0420\u0430\u0434\u0438\u0443\u0441> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u041e\u0442\u0441\u0435\u0447\u043a\u0430> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]
-CircleArc=\u0414\u044a\u0433\u0430 \u043e\u0442 \u043e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442 \u0441 \u0446\u0435\u043d\u0442\u044a\u0440 \u043f\u0440\u0435\u0437 \u0434\u0432\u0435 \u0442\u043e\u0447\u043a\u0438
+CircleArc=\u0414\u044a\u0433\u0430\u041e\u0442\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442\u0421\u0426\u0435\u043d\u0442\u044a\u0440\u041f\u0440\u0435\u0437\u0414\u0432\u0435\u0422\u043e\u0447\u043a\u0438
CircleArc.Syntax=[ <\u0421\u0440\u0435\u0434\u043d\u0430 \u0442\u043e\u0447\u043a\u0430 / \u0446\u0435\u043d\u0442\u044a\u0440>, <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]
-CircleSector=\u0414\u044a\u0433\u0430 \u043e\u0442 \u043e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442 \u0441 \u0446\u0435\u043d\u0442\u044a\u0440 \u043f\u0440\u0435\u0437 \u0434\u0432\u0435 \u0442\u043e\u0447\u043a\u0438
+CircleSector=\u0421\u0435\u043a\u0442\u043e\u0440\u041e\u0442\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442\u0421\u0426\u0435\u043d\u0442\u044a\u0440\u041f\u0440\u0435\u0437\u0414\u0432\u0435\u0422\u043e\u0447\u043a\u0438
CircleSector.Syntax=[ <\u0421\u0440\u0435\u0434\u043d\u0430 \u0442\u043e\u0447\u043a\u0430 / \u0446\u0435\u043d\u0442\u044a\u0440>, <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]
-CircumcircleArc=\u0414\u044a\u0433\u0430 \u043e\u0442 \u043e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442 \u043f\u0440\u0435\u0437 \u0442\u0440\u0438 \u0442\u043e\u0447\u043a\u0438
+CircumcircleArc=\u0414\u044a\u0433\u0430\u041e\u0442\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442\u041f\u0440\u0435\u0437\u0422\u0440\u0438\u0422\u043e\u0447\u043a\u0438
CircumcircleArc.Syntax=[ <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]
-CircumcircleSector=\u0421\u0435\u043a\u0442\u043e\u0440 \u043d\u0430 \u043e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442 \u043f\u0440\u0435\u0437 \u0442\u0440\u0438 \u0442\u043e\u0447\u043a\u0438
+CircumcircleSector=\u0421\u0435\u043a\u0442\u043e\u0440\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442\u041f\u0440\u0435\u0437\u0422\u0440\u0438\u0422\u043e\u0447\u043a\u0438
CircumcircleSector.Syntax=[ <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]
Circumference=\u041e\u0431\u0438\u043a\u043e\u043b\u043a\u0430
Circumference.Syntax=[ <\u041a\u043e\u043d\u0438\u0447\u043d\u043e \u0441\u0435\u0447\u0435\u043d\u0438\u0435> ]
+Classes=\u041a\u043b\u0430\u0441\u043e\u0432\u0435
+Classes.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0434\u0430\u043d\u043d\u0438>, <\u0411\u0440\u043e\u0439 \u043a\u043b\u0430\u0441\u043e\u0432\u0435> ]\n[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0434\u0430\u043d\u043d\u0438>, <\u041d\u0430\u0447\u0430\u043b\u043e>, <\u0428\u0438\u0440\u0438\u043d\u0430 \u043d\u0430 \u043a\u043b\u0430\u0441\u043e\u0432\u0435\u0442\u0435> ]
+ClosestPoint.Syntax=[ <\u0422\u0440\u0430\u0435\u043a\u0442\u043e\u0440\u0438\u044f>, <\u0422\u043e\u0447\u043a\u0430> ]
Coefficients=\u041a\u043e\u0435\u0444\u0438\u0446\u0438\u0435\u043d\u0442\u0438
Coefficients.Syntax=[ <\u041c\u043d\u043e\u0433\u043e\u0447\u043b\u0435\u043d> ]\n[ <\u041a\u043e\u043d\u0438\u0447\u043d\u043e \u0441\u0435\u0447\u0435\u043d\u0438\u0435> ]
Column=\u041a\u043e\u043b\u043e\u043d\u0430
Column.Syntax=[ <\u041a\u043b\u0435\u0442\u043a\u0430 \u043e\u0442 \u0435\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u0430\u0442\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430> ]
-ColumnName=\u0418\u043c\u0435 \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430
+ColumnName=\u0418\u043c\u0435\u041a\u043e\u043b\u043e\u043d\u0430
ColumnName.Syntax=[ <\u041a\u043b\u0435\u0442\u043a\u0430 \u043e\u0442 \u0435\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u0430\u0442\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430> ]
Command=\u041a\u043e\u043c\u0430\u043d\u0434\u0430
-CommonDenominator=\u041e\u0431\u0438\u043a\u043d\u043e\u0432\u0435\u043d \u0437\u043d\u0430\u043c\u0435\u043d\u0430\u0442\u0435\u043b
-ComplexRoot=\u041a\u043e\u043c\u043f\u043b\u0435\u043a\u0441\u0435\u043d \u043a\u043e\u0440\u0435\u043d
+CommonDenominator=\u041e\u0431\u0438\u043a\u043d\u043e\u0432\u0435\u043d\u0417\u043d\u0430\u043c\u0435\u043d\u0430\u0442\u0435\u043b
+CompleteSquare.Syntax=[ <\u041a\u0432\u0430\u0434\u0440\u0430\u0442\u043d\u0430 \u0444\u0443\u043d\u043a\u0446\u0438\u044f> ]
+ComplexRoot=\u041a\u043e\u043c\u043f\u043b\u0435\u043a\u0441\u0435\u043d\u041a\u043e\u0440\u0435\u043d
ComplexRoot.Syntax=[ <\u041f\u043e\u043b\u0438\u043d\u043e\u043c> ]
-Conic=\u041a\u043e\u043d\u0438\u0447\u043d\u043e \u0441\u0435\u0447\u0435\u043d\u0438\u0435
+Conic=\u041a\u043e\u043d\u0438\u0447\u043d\u043e\u0421\u0435\u0447\u0435\u043d\u0438\u0435
Conic.Syntax=[ <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]\n[ <\u0427\u0438\u0441\u043b\u043e>, <\u0427\u0438\u0441\u043b\u043e>, <\u0427\u0438\u0441\u043b\u043e>, <\u0427\u0438\u0441\u043b\u043e>, <\u0427\u0438\u0441\u043b\u043e>, <\u0427\u0438\u0441\u043b\u043e> ]
-ConstructionStep=\u0411\u0440\u043e\u0439 \u0441\u0442\u044a\u043f\u043a\u0438 \u043d\u0430 \u043a\u043e\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f
+ConstructionStep=\u0411\u0440\u043e\u0439\u0421\u0442\u044a\u043f\u043a\u0438\u041a\u043e\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f
ConstructionStep.Syntax=[ <\u041e\u0431\u0435\u043a\u0442> ]
-CopyFreeObject=\u041a\u043e\u043f\u0438\u0440\u0430\u0439 \u0441\u0432\u043e\u0431\u043e\u0434\u043d\u0438\u044f \u043e\u0431\u0435\u043a\u0442
+ConvexHull.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438> ]
+CopyFreeObject=\u041a\u043e\u043f\u0438\u0440\u0430\u0439\u0421\u0432\u043e\u0431\u043e\u0434\u043d\u0438\u044f\u041e\u0431\u0435\u043a\u0442
CopyFreeObject.Syntax=[ <\u041e\u0431\u0435\u043a\u0442> ]
-Decimal=\u0414\u0435\u0441\u0435\u0442\u0438\u0447\u043d\u0430 \u0434\u0440\u043e\u0431
+CountIf=\u041f\u0440\u0435\u0431\u0440\u043e\u0439\u0410\u043a\u043e
+CountIf.Syntax=[ <\u0421\u044a\u0441\u0442\u043e\u044f\u043d\u0438\u0435>, <\u0421\u043f\u0438\u0441\u044a\u043a> ]
+Covariance=\u041a\u043e\u0432\u0430\u0440\u0438\u0430\u0446\u0438\u044f
+Covariance.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438> ]\n[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0447\u0438\u0441\u043b\u0430>, <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0447\u0438\u0441\u043b\u0430> ]
+CrossRatio.Syntax=[ <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]
+Curvature.Syntax=[ <\u0422\u043e\u0447\u043a\u0430>, <\u0424\u0443\u043d\u043a\u0446\u0438\u044f> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u041a\u0440\u0438\u0432\u0430> ]
+CurvatureVector.Syntax=[ <\u0422\u043e\u0447\u043a\u0430>, <\u0424\u0443\u043d\u043a\u0446\u0438\u044f> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u041a\u0440\u0438\u0432\u0430> ]
+CurveCartesian=\u041a\u0440\u0438\u0432\u0430
+CurveCartesian.Syntax=[ <\u0418\u0437\u0440\u0430\u0437>, <\u0418\u0437\u0440\u0430\u0437>, <\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438\u0447\u043d\u0430 \u043f\u0440\u043e\u043c\u0435\u043d\u043b\u0438\u0432\u0430>, <\u041d\u0430\u0447\u0430\u043b\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442>, <\u041a\u0440\u0430\u0439\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442> ]
+Decimal=\u0414\u0435\u0441\u0435\u0442\u0438\u0447\u043d\u0430\u0414\u0440\u043e\u0431
+Defined=\u0410\u043a\u043e\u0415\u0414\u0435\u0444\u0438\u043d\u0438\u0440\u0430\u043d
+Defined.Syntax=[ <\u041e\u0431\u0435\u043a\u0442> ]
+Degree=\u0413\u0440\u0430\u0434\u0443\u0441
+Degree.Syntax=[ <\u041f\u043e\u043b\u0438\u043d\u043e\u043c> ]
+DelauneyTriangulation.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438> ]
Delete=\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043d\u0435
Delete.Syntax=[ <\u041e\u0431\u0435\u043a\u0442> ]
Denominator=\u0417\u043d\u0430\u043c\u0435\u043d\u0430\u0442\u0435\u043b
@@ -63,8 +86,9 @@ Derivative=\u041f\u0440\u043e\u0438\u0437\u0432\u043e\u0434\u043d\u0430
Derivative.Syntax=[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f> ]\n[ <\u041a\u0440\u0438\u0432\u0430> ]\n[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u0427\u0438\u0441\u043b\u043e> ]\n[ <\u041a\u0440\u0438\u0432\u0430>, <\u0427\u0438\u0441\u043b\u043e> ]
Determinant=\u0414\u0435\u0442\u0435\u0440\u043c\u0438\u043d\u0430\u043d\u0442\u0430
Determinant.Syntax=[ <\u041c\u0430\u0442\u0440\u0438\u0446\u0430> ]
-Diameter=\u0421\u0432\u044a\u0440\u0437\u0432\u0430\u0449 \u0434\u0438\u0430\u043c\u0435\u0442\u044a\u0440
+Diameter=\u0421\u0432\u044a\u0440\u0437\u0432\u0430\u0449\u0414\u0438\u0430\u043c\u0435\u0442\u044a\u0440
Diameter.Syntax=[ <\u0412\u0435\u043a\u0442\u043e\u0440>, <\u041a\u043e\u043d\u0438\u0447\u043d\u043e \u0441\u0435\u0447\u0435\u043d\u0438\u0435> ]\n[ <\u041f\u0440\u0430\u0432\u0430>, <\u041a\u043e\u043d\u0438\u0447\u043d\u043e \u0441\u0435\u0447\u0435\u043d\u0438\u0435> ]
+Dilate.Syntax=[ <\u041e\u0431\u0435\u043a\u0442>, <Dilation Factor> ]\n[ <\u041e\u0431\u0435\u043a\u0442>, <Dilation Factor>, <Dilation Center Point> ]
Dimension=\u0418\u0437\u043c\u0435\u0440\u0435\u043d\u0438\u0435
Direction=\u041f\u043e\u0441\u043e\u043a\u0430
Direction.Syntax=[ <\u041f\u0440\u0430\u0432\u0430> ]
@@ -76,34 +100,52 @@ Div=\u0414\u0435\u043b\u0435\u043d\u0438\u0435
Div.Syntax=[ <\u0414\u0435\u043b\u0438\u043c\u043e (\u0447\u0438\u0441\u043b\u043e)>, <\u0414\u0435\u043b\u0438\u0442\u0435\u043b (\u0447\u0438\u0441\u043b\u043e)> ]\n[ <\u0414\u0435\u043b\u0438\u043c\u043e (\u043c\u043d\u043e\u0433\u043e\u0447\u043b\u0435\u043d)>, <\u0414\u0435\u043b\u0438\u0442\u0435\u043b (\u043c\u043d\u043e\u0433\u043e\u0447\u043b\u0435\u043d)> ]
Division=\u0414\u0435\u043b\u0435\u043d\u0438\u0435
Divisors=\u0414\u0435\u043b\u0438\u0442\u0435\u043b\u0438
-DivisorsList=\u0421\u043f\u0438\u0441\u044a\u043a \u0434\u0435\u043b\u0438\u0442\u0435\u043b\u0438
-DivisorsSum=\u0421\u0443\u043c\u0430 \u043d\u0430 \u0434\u0435\u043b\u0438\u0442\u0435\u043b\u0438
+DivisorsList=\u0421\u043f\u0438\u0441\u044a\u043a\u0414\u0435\u043b\u0438\u0442\u0435\u043b\u0438
+DivisorsSum=\u0421\u0443\u043c\u0430\u0414\u0435\u043b\u0438\u0442\u0435\u043b\u0438
+DynamicCoordinates.Syntax=[ <\u0422\u043e\u0447\u043a\u0430>, <\u0427\u0438\u0441\u043b\u043e>, <\u0427\u0438\u0441\u043b\u043e> ]
Element=\u0415\u043b\u0435\u043c\u0435\u043d\u0442
Element.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a>, <\u041f\u043e\u0437\u0438\u0446\u0438\u044f \u043d\u0430 \u0435\u043b\u0435\u043c\u0435\u043d\u0442\u0430> ]\n[ <\u041c\u0430\u0442\u0440\u0438\u0446\u0430>, <\u0420\u0435\u0434>, <\u041a\u043e\u043b\u043e\u043d\u0430> ]\n[ <\u0421\u043f\u0438\u0441\u044a\u043a>, <\u0418\u043d\u0434\u0435\u043a\u0441 1>, <\u0418\u043d\u0434\u0435\u043a\u0441 2>, ... ]
Ellipse=\u0415\u043b\u0438\u043f\u0441\u0430
Ellipse.Syntax=[ <\u0424\u043e\u043a\u0443\u0441\u043d\u0430 \u0442\u043e\u0447\u043a\u0430>, <\u0424\u043e\u043a\u0443\u0441\u043d\u0430 \u0442\u043e\u0447\u043a\u0430>, <\u0414\u044a\u043b\u0436\u0438\u043d\u0430 \u043d\u0430 \u043f\u043e-\u0434\u044a\u043b\u0433\u0430\u0442\u0430 \u043e\u0441> ]\n[ <\u0424\u043e\u043a\u0443\u0441\u043d\u0430 \u0442\u043e\u0447\u043a\u0430>, <\u0424\u043e\u043a\u0443\u0441\u043d\u0430 \u0442\u043e\u0447\u043a\u0430>, <\u041e\u0442\u0441\u0435\u0447\u043a\u0430> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]
-Expand=\u0418\u0437\u0432\u0435\u0436\u0434\u0430\u043d\u0435 (\u0444\u043e\u0440\u043c\u0443\u043b\u0430 / \u0443\u0440\u0430\u0432\u043d\u0435\u043d\u0438\u0435)
+Execute.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0422\u0435\u043a\u0441\u0442> ]\n[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0442\u0435\u043a\u0441\u0442>, <\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u044a\u0440>, <\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u044a\u0440>, ... ]
+Expand=\u0418\u0437\u0432\u0435\u0436\u0434\u0430\u043d\u0435\u0424\u043e\u0440\u043c\u0443\u043b\u0430_\u0423\u0440\u0430\u0432\u043d\u0435\u043d\u0438\u0435
Expand.Syntax=[ <\u0418\u0437\u0440\u0430\u0437> ]
Extremum=\u0415\u043a\u0441\u0442\u0440\u0435\u043c\u0443\u043c
Extremum.Syntax=[ <\u041c\u043d\u043e\u0433\u043e\u0447\u043b\u0435\u043d> ]\n[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u041d\u0430\u0447\u0430\u043b\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445>, <\u041a\u0440\u0430\u0439\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445> ]
-FillCells=\u0417\u0430\u043f\u044a\u043b\u043d\u0438 \u043a\u043b\u0435\u0442\u043a\u0438
+FillCells=\u0417\u0430\u043f\u044a\u043b\u043d\u0438\u041a\u043b\u0435\u0442\u043a\u0438
FillCells.Syntax=[ <\u0414\u0438\u0430\u043f\u0430\u0437\u043e\u043d \u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0430>, <\u041e\u0431\u0435\u043a\u0442> ]\n[ <\u041a\u043b\u0435\u0442\u043a\u0430>, <\u0421\u043f\u0438\u0441\u044a\u043a> ]\n[ <\u041a\u043b\u0435\u0442\u043a\u0430>, <\u041c\u0430\u0442\u0440\u0438\u0446\u0430> ]
-FillColumn=\u0417\u0430\u043f\u044a\u043b\u043d\u0438 \u043a\u043e\u043b\u043e\u043d\u0430
+FillColumn=\u0417\u0430\u043f\u044a\u043b\u043d\u0438\u041a\u043e\u043b\u043e\u043d\u0430
FillColumn.Syntax=[ <\u041a\u043e\u043b\u043e\u043d\u0430>, <\u0421\u043f\u0438\u0441\u044a\u043a> ]
-FillRow=\u0417\u0430\u043f\u044a\u043b\u043d\u0438 \u0440\u0435\u0434
+FillRow=\u0417\u0430\u043f\u044a\u043b\u043d\u0438\u0420\u0435\u0434
FillRow.Syntax=[ <\u0420\u0435\u0434>, <\u0421\u043f\u0438\u0441\u044a\u043a> ]
First=\u041f\u044a\u0440\u0432\u0438
-FirstAxis=\u0413\u043b\u0430\u0432\u043d\u0430 \u043e\u0441
+First.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a> ]\n[ <\u0422\u0435\u043a\u0441\u0442> ]\n[ <\u0421\u043f\u0438\u0441\u044a\u043a>, <\u0411\u0440\u043e\u0439 \u0435\u043b\u0435\u043c\u0435\u043d\u0442\u0438> ]\n[ <\u0422\u0435\u043a\u0441\u0442>, <\u0411\u0440\u043e\u0439 \u0435\u043b\u0435\u043c\u0435\u043d\u0442\u0438> ]\n[ <Locus>, <\u0411\u0440\u043e\u0439 \u0435\u043b\u0435\u043c\u0435\u043d\u0442\u0438> ]
+FirstAxis=\u0413\u043b\u0430\u0432\u043d\u0430\u041e\u0441
FirstAxis.Syntax=[ <\u041a\u043e\u043d\u0438\u0447\u043d\u043e \u0441\u0435\u0447\u0435\u043d\u0438\u0435> ]
-FirstAxisLength=\u0414\u044a\u043b\u0436\u0438\u043d\u0430 \u043d\u0430 \u0433\u043b\u0430\u0432\u043d\u0430\u0442\u0430 \u043f\u043e\u043b\u0443\u043e\u0441
+FirstAxisLength=\u0414\u044a\u043b\u0436\u0438\u043d\u0430\u0413\u043b\u0430\u0432\u043d\u0430\u041f\u043e\u043b\u0443\u043e\u0441
FirstAxisLength.Syntax=[ <\u041a\u043e\u043d\u0438\u0447\u043d\u043e \u0441\u0435\u0447\u0435\u043d\u0438\u0435> ]
+Fit.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0442\u043e\u0447\u043a\u0438>, <\u0421\u043f\u0438\u0441\u044a\u043a \u0444\u0443\u043d\u043a\u0446\u0438\u0438> ]\n[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0442\u043e\u0447\u043a\u0438>, <\u0424\u0443\u043d\u043a\u0446\u0438\u044f> ]
+FitExp.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0442\u043e\u0447\u043a\u0438> ]
+FitGrowth.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0442\u043e\u0447\u043a\u0438> ]
+FitLineX.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0442\u043e\u0447\u043a\u0438> ]
+FitLineY.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0442\u043e\u0447\u043a\u0438> ]
+FitLog.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0442\u043e\u0447\u043a\u0438> ]
+FitLogistic.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0442\u043e\u0447\u043a\u0438> ]
+FitPoly.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0442\u043e\u0447\u043a\u0438>, <Degree of Polynomial> ]
+FitPow.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0442\u043e\u0447\u043a\u0438> ]
+FitSin.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0442\u043e\u0447\u043a\u0438> ]
Focus=\u0424\u043e\u043a\u0443\u0441
Focus.Syntax=[ <\u041a\u043e\u043d\u0438\u0447\u043d\u043e \u0441\u0435\u0447\u0435\u043d\u0438\u0435> ]
+FractionText.Syntax=[ <\u0427\u0438\u0441\u043b\u043e> ]
Function=\u0424\u0443\u043d\u043a\u0446\u0438\u044f
Function.Syntax=[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u041d\u0430\u0447\u0430\u043b\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445>, <\u041a\u0440\u0430\u0439\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445> ]
-GCD=\u041d\u0430\u0439-\u0433\u043e\u043b\u044f\u043c \u043e\u0431\u0449 \u0434\u0435\u043b\u0438\u0442\u0435\u043b
+GCD=\u041d\u041e\u0414
GCD.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0447\u0438\u0441\u043b\u0430> ]\n[ <\u0427\u0438\u0441\u043b\u043e>, <\u0427\u0438\u0441\u043b\u043e> ]
+GeometricMean.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0442\u043e\u0447\u043a\u0438> ]
+HarmonicMean.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0447\u0438\u0441\u043b\u0430> ]
+HideLayer.Syntax=[ <\u0427\u0438\u0441\u043b\u043e> ]
Histogram=\u0425\u0438\u0441\u0442\u043e\u0433\u0440\u0430\u043c\u0430
+Hull.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0442\u043e\u0447\u043a\u0438>, <\u041f\u0440\u043e\u0446\u0435\u043d\u0442> ]
Hyperbola=\u0425\u0438\u043f\u0435\u0440\u0431\u043e\u043b\u0430
Hyperbola.Syntax=[ <\u0424\u043e\u043a\u0443\u0441 \u0442\u043e\u0447\u043a\u0430>, <\u0424\u043e\u043a\u0443\u0441 \u0442\u043e\u0447\u043a\u0430>, <\u0413\u043b\u0430\u0432\u043d\u0430 \u043f\u043e\u043b\u0443\u043e\u0441> ]\n[ <\u0413\u043e\u043a\u0443\u0441 \u0442\u043e\u0447\u043a\u0430>, <\u0424\u043e\u043a\u0443\u0441 \u0442\u043e\u0447\u043a\u0430>, <\u041e\u0442\u0441\u0435\u0447\u043a\u0430> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]
Identity=\u0422\u044a\u0436\u0434\u0435\u0441\u0442\u0432\u043e
@@ -111,170 +153,245 @@ Identity.Syntax=[ <\u0427\u0438\u0441\u043b\u043e> ]
If=\u0410\u043a\u043e
If.Syntax=[ <\u0423\u0441\u043b\u043e\u0432\u0438\u0435>, <\u0422\u043e\u0433\u0430\u0432\u0430> ]\n[ <\u0423\u0441\u043b\u043e\u0432\u0438\u0435>, <\u0422\u043e\u0433\u0430\u0432\u0430>, <\u0418\u043d\u0430\u0447\u0435> ]
Imaginary=\u0418\u043c\u0430\u0433\u0438\u043d\u0435\u0440\u043d\u043e\u0441\u0442
+Incircle.Syntax=[ <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]
+IndexOf.Syntax=[ <\u041e\u0431\u0435\u043a\u0442>, <\u0421\u043f\u0438\u0441\u044a\u043a> ]\n[ <\u0422\u0435\u043a\u0441\u0442>, <\u0422\u0435\u043a\u0441\u0442> ]\n[ <\u041e\u0431\u0435\u043a\u0442>, <\u0421\u043f\u0438\u0441\u044a\u043a>, <Start Index> ]\n[ <\u0422\u0435\u043a\u0441\u0442>, <\u0422\u0435\u043a\u0441\u0442>, <Start Index> ]
Insert=\u0412\u044a\u0432\u0435\u0434\u0438
Insert.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a>, <\u0421\u043f\u0438\u0441\u044a\u043a>, <\u041f\u043e\u0437\u0438\u0446\u0438\u044f> ]\n[ <\u041e\u0431\u0435\u043a\u0442>, <\u0421\u043f\u0438\u0441\u044a\u043a>, <\u041f\u043e\u0437\u0438\u0446\u0438\u044f> ]
Integral=\u0418\u043d\u0442\u0435\u0433\u0440\u0430\u043b
Integral.Syntax=[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f> ]\n[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u041d\u0430\u0447\u0430\u043b\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445>, <\u041a\u0440\u0430\u0439\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445> ]\n[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u041d\u0430\u0447\u0430\u043b\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445>, <\u041a\u0440\u0430\u0439\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445>, <\u0411\u0443\u043b\u0435\u0432\u0430 \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u044f> ]
+IntegralBetween.Syntax=[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u041d\u0430\u0447\u0430\u043b\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u043d\u0430 x>, <\u041a\u0440\u0430\u0439\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u043d\u0430 x> ]\n[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u041d\u0430\u0447\u0430\u043b\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u043d\u0430 x>, <\u041a\u0440\u0430\u0439\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u043d\u0430 x>, <Boolean Evaluate> ]
Intersect=\u0421\u0435\u0447\u0435\u043d\u0438\u0435
Intersect.Syntax=[ <\u041e\u0431\u0435\u043a\u0442>, <\u041e\u0431\u0435\u043a\u0442> ]
-Intersection=\u0422\u043e\u0447\u043a\u0430/\u043b\u0438\u043d\u0438\u044f \u043d\u0430 \u043f\u0440\u0435\u0441\u0438\u0447\u0430\u043d\u0435
+Intersection=\u0422\u043e\u0447\u043a\u0430_\u041f\u0440\u0430\u0432\u0430\u041d\u0430\u041f\u0440\u0435\u0441\u0438\u0447\u0430\u043d\u0435
Intersection.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a>, <\u0421\u043f\u0438\u0441\u044a\u043a> ]
-Invert=\u041e\u0431\u0440\u0430\u0442\u043d\u0430 \u043c\u0430\u0442\u0440\u0438\u0446\u0430
+Invert=\u041e\u0431\u0440\u0430\u0442\u043d\u0430\u041c\u0430\u0442\u0440\u0438\u0446\u0430
Invert.Syntax=[ <\u041c\u0430\u0442\u0440\u0438\u0446\u0430> ]
+IsInteger.Syntax=[ <\u0427\u0438\u0441\u043b\u043e> ]
Join=\u041f\u0440\u0438\u0441\u044a\u0435\u0434\u0438\u043d\u0438
Join.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0441\u043f\u0438\u0441\u044a\u0446\u0438> ]\n[ <\u0421\u043f\u0438\u0441\u044a\u043a>, <\u0421\u043f\u0438\u0441\u044a\u043a>, ... ]
-LCM=\u041d\u0430\u0439-\u043c\u0430\u043b\u043a\u043e \u043e\u0431\u0449\u043e \u043a\u0440\u0430\u0442\u043d\u043e
+KeepIf=\u0417\u0430\u043f\u0430\u0437\u0438\u0410\u043a\u043e
+KeepIf.Syntax=[ <\u0421\u044a\u0441\u0442\u043e\u044f\u043d\u0438\u0435>, <\u0421\u043f\u0438\u0441\u044a\u043a> ]
+LCM=\u041d\u041e\u041a
LCM.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0447\u0438\u0441\u043b\u0430> ]\n[ <\u0427\u0438\u0441\u043b\u043e>, <\u0427\u0438\u0441\u043b\u043e> ]
+LaTeX.Syntax=[ <\u041e\u0431\u0435\u043a\u0442> ]\n[ <\u041e\u0431\u0435\u043a\u0442>, <Boolean for Substitution of Variables> ]\n[ <\u041e\u0431\u0435\u043a\u0442>, <Boolean for Substitution of Variables>, <Boolean Show Name> ]
Last=\u041f\u043e\u0441\u043b\u0435\u0434\u0435\u043d
-LeftSide=\u041b\u044f\u0432\u0430 \u0441\u0442\u0440\u0430\u043d\u0430
-LeftSum=\u041b\u044f\u0432\u0430 \u0441\u0443\u043c\u0430
+Last.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a> ]\n[ <\u0422\u0435\u043a\u0441\u0442> ]\n[ <\u0421\u043f\u0438\u0441\u044a\u043a>, <\u0411\u0440\u043e\u0439 \u0435\u043b\u0435\u043c\u0435\u043d\u0442\u0438> ]\n[ <\u0422\u0435\u043a\u0441\u0442>, <\u0411\u0440\u043e\u0439 \u0435\u043b\u0435\u043c\u0435\u043d\u0442\u0438> ]
+LeftSide=\u041b\u044f\u0432\u0430\u0421\u0442\u0440\u0430\u043d\u0430
+LeftSum=\u041b\u044f\u0432\u0430\u0421\u0443\u043c\u0430
LeftSum.Syntax=[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u041d\u0430\u0447\u0430\u043b\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445>, <\u041a\u0440\u0430\u0439\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445>, <\u0411\u0440\u043e\u0439 \u043f\u0440\u0430\u0432\u043e\u044a\u0433\u044a\u043b\u043d\u0438\u0446\u0438> ]
Length=\u0414\u044a\u043b\u0436\u0438\u043d\u0430
Length.Syntax=[ <\u0412\u0435\u043a\u0442\u043e\u0440> ]\n[ <\u0422\u043e\u0447\u043a\u0430> ]\n[ <\u0421\u043f\u0438\u0441\u044a\u043a> ]\n[ <\u0422\u0435\u043a\u0441\u0442> ]\n[ <\u041b\u043e\u0442\u0443\u0441> ]\n[ <\u041e\u0442\u0441\u0435\u0447\u043a\u0430> ]\n[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u041d\u0430\u0447\u0430\u043b\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445>, <\u041a\u0440\u0430\u0439\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445> ]\n[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u041d\u0430\u0447\u0430\u043b\u043d\u0430 \u0442\u043e\u0447\u043a\u0430>, <\u041a\u0440\u0430\u0439\u043d\u0430 \u0442\u043e\u0447\u043a\u0430> ]\n[ <\u041a\u0440\u0438\u0432\u0430>, <\u041d\u0430\u0447\u0430\u043b\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445>, <\u041a\u0440\u0430\u0439\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445> ]\n[ <\u041a\u0440\u0438\u0432\u0430>, <\u041d\u0430\u0447\u0430\u043b\u043d\u0430 \u0442\u043e\u0447\u043a\u0430>, <\u041a\u0440\u0430\u0439\u043d\u0430 \u0442\u043e\u0447\u043a\u0430> ]
Limit=\u0413\u0440\u0430\u043d\u0438\u0446\u0430
Limit.Syntax=[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u0412\u0435\u043b\u0438\u0447\u0438\u043d\u0430> ]
+LimitAbove.Syntax=[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u0421\u0442\u043e\u0439\u043d\u043e\u0441\u0442> ]
+LimitBelow.Syntax=[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u0421\u0442\u043e\u0439\u043d\u043e\u0441\u0442> ]
Line=\u041f\u0440\u0430\u0432\u0430
Line.Syntax=[ <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u0423\u0441\u043f\u043e\u0440\u0435\u0434\u043d\u0430 \u043f\u0440\u0430\u0432\u0430> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u041d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0432\u0435\u043a\u0442\u043e\u0440> ]
-LineBisector=\u041f\u0435\u0440\u043f\u0435\u043d\u0434\u0438\u043a\u0443\u043b\u044f\u0440\u043d\u0430 \u043f\u0440\u0430\u0432\u0430
+LineBisector=\u041f\u0435\u0440\u043f\u0435\u043d\u0434\u0438\u043a\u0443\u043b\u044f\u0440\u043d\u0430\u041f\u0440\u0430\u0432\u0430
LineBisector.Syntax=[ <\u041e\u0442\u0441\u0435\u0447\u043a\u0430> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]
-LowerSum=\u0414\u043e\u043b\u043d\u0430 \u0441\u0443\u043c\u0430
+LowerSum=\u0414\u043e\u043b\u043d\u0430\u0421\u0443\u043c\u0430
LowerSum.Syntax=[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u041d\u0430\u0447\u0430\u043b\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445>, <\u041a\u0440\u0430\u0439\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445>, <\u0411\u0440\u043e\u0439 \u043f\u0440\u0430\u0432\u043e\u044a\u0433\u044a\u043b\u043d\u0438\u0446\u0438> ]
-MatrixRank=\u0420\u0430\u043d\u0433 \u043d\u0430 \u043c\u0430\u0442\u0440\u0438\u0446\u0430
+MatrixRank=\u0420\u0430\u043d\u0433\u041c\u0430\u0442\u0440\u0438\u0446\u0430
Max=\u041c\u0430\u043a\u0441\u0438\u043c\u0443\u043c
Max.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a> ]\n[ <\u0418\u043d\u0442\u0435\u0440\u0432\u0430\u043b> ]\n[ <\u0427\u0438\u0441\u043b\u043e>, <\u0427\u0438\u0441\u043b\u043e> ]\n[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u041d\u0430\u0447\u0430\u043b\u043d\u043e \u0445>, <\u041a\u0440\u0430\u0439\u043d\u043e \u0445> ]
Maximize=\u041c\u0430\u043a\u0441\u0438\u043c\u0438\u0437\u0438\u0440\u0430\u0439
Maximize.Syntax=[ <\u0417\u0430\u0432\u0438\u0441\u0438\u043c\u043e \u0447\u0438\u0441\u043b\u043e>, <\u0421\u0432\u043e\u0431\u043e\u0434\u043d\u043e \u0447\u0438\u0441\u043b\u043e> ]
-Mean=\u0421\u0440\u0435\u0434\u043d\u043e \u0430\u0440\u0438\u0442\u043c\u0435\u0442\u0438\u0447\u043d\u043e
+Mean=\u0421\u0440\u0435\u0434\u043d\u043e\u0410\u0440\u0438\u0442\u043c\u0435\u0442\u0438\u0447\u043d\u043e
Mean.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0447\u0438\u0441\u043b\u0430> ]
+MeanY.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0442\u043e\u0447\u043a\u0438> ]
Median=\u0421\u0440\u0435\u0434\u0430
Median.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0442\u043e\u0447\u043a\u0438> ]
-Midpoint=\u0421\u0440\u0435\u0434\u043d\u0430 \u043e\u0442\u0441\u0435\u0447\u043a\u0430
+Midpoint=\u0421\u0440\u0435\u0434\u043d\u0430\u041e\u0442\u0441\u0435\u0447\u043a\u0430
Midpoint.Syntax=[ <\u041e\u0442\u0441\u0435\u0447\u043a\u0430> ]\n[ <\u041a\u043e\u043d\u0438\u0447\u043d\u043e \u0441\u0435\u0447\u0435\u043d\u0438\u0435> ]\n[ <\u0418\u043d\u0442\u0435\u0440\u0432\u0430\u043b> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]
Min=\u041c\u0438\u043d\u0438\u043c\u0443\u043c
-Min.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a> ]\n[ <\u0418\u043d\u0442\u0435\u0440\u0432\u0430\u043b> ]\n[ <\u0427\u0438\u0441\u043b\u043e>, <\u0427\u0438\u0441\u043b\u043e> ]\n[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u041d\u0430\u0447\u0430\u043b\u043d\u043e \u0445>, <\u041a\u0440\u0430\u0439\u043d\u043e \u0445> ]
+Min.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a> ]\n[ <\u0418\u043d\u0442\u0435\u0440\u0432\u0430\u043b> ]\n[ <\u0427\u0438\u0441\u043b\u043e>, <\u0427\u0438\u0441\u043b\u043e> ]\n[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u041d\u0430\u0447\u0430\u043b\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u043d\u0430 \u0445>, <\u041a\u0440\u0430\u0439\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u043d\u0430 \u0445> ]
Minimize=\u041c\u0438\u043d\u0438\u043c\u0438\u0437\u0438\u0440\u0430\u0439
Minimize.Syntax=[ <\u0417\u0430\u0432\u0438\u0441\u0438\u043c\u043e \u0447\u0438\u0441\u043b\u043e>, <\u0421\u0432\u043e\u0431\u043e\u0434\u043d\u043e \u0447\u0438\u0441\u043b\u043e> ]
+MinimumSpanningTree.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0442\u043e\u0447\u043a\u0438> ]
Mirror=\u041e\u0442\u0440\u0430\u0436\u0435\u043d\u0438\u0435
Mirror.Syntax=[ <\u041e\u0431\u0435\u043a\u0442>, <\u0422\u043e\u0447\u043a\u0430> ]\n[ <\u041e\u0431\u0435\u043a\u0442>, <\u041f\u0440\u0430\u0432\u0430> ]\n[ <\u041e\u0431\u0435\u043a\u0442>, <\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442> ]
+Mode.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0442\u043e\u0447\u043a\u0438> ]
Name=\u0418\u043c\u0435
Name.Syntax=[ <\u041e\u0431\u0435\u043a\u0442> ]
Numerator=\u0427\u0438\u0441\u043b\u0438\u0442\u0435\u043b
Numerator.Syntax=[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f> ]
Object=\u041e\u0431\u0435\u043a\u0442
Object.Syntax=[ <\u0418\u043c\u0435 \u043d\u0430 \u043e\u0431\u0435\u043a\u0442\u0430 \u043a\u0430\u0442\u043e \u0442\u0435\u043a\u0441\u0442> ]
-OrthogonalLine=\u041f\u0435\u0440\u043f\u0435\u043d\u0434\u0438\u043a\u0443\u043b\u044f\u0440\u043d\u0430 \u043f\u0440\u0430\u0432\u0430
+OrdinalRank.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a> ]
+OrthogonalLine=\u041f\u0435\u0440\u043f\u0435\u043d\u0434\u0438\u043a\u0443\u043b\u044f\u0440\u043d\u0430\u041f\u0440\u0430\u0432\u0430
OrthogonalLine.Syntax=[ <\u0422\u043e\u0447\u043a\u0430>, <\u041f\u0440\u0430\u0432\u0430> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u041e\u0442\u0441\u0435\u0447\u043a\u0430> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u0412\u0435\u043a\u0442\u043e\u0440> ]
-OrthogonalVector=\u041f\u0435\u0440\u043f\u0435\u043d\u0434\u0438\u043a\u0443\u043b\u044f\u0440\u0435\u043d \u0432\u0435\u043a\u0442\u043e\u0440
+OrthogonalVector=\u041f\u0435\u0440\u043f\u0435\u043d\u0434\u0438\u043a\u0443\u043b\u044f\u0440\u0435\u043d\u0412\u0435\u043a\u0442\u043e\u0440
OrthogonalVector.Syntax=[ <\u041f\u0440\u0430\u0432\u0430> ]\n[ <\u041e\u0442\u0441\u0435\u0447\u043a\u0430> ]\n[ <\u0412\u0435\u043a\u0442\u043e\u0440> ]
-OsculatingCircle=\u0414\u043e\u043f\u0438\u0440\u0430\u0442\u0435\u043b\u043d\u0430 \u043e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442
+OsculatingCircle=\u0414\u043e\u043f\u0438\u0440\u0430\u0442\u0435\u043b\u043d\u0430\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442
OsculatingCircle.Syntax=[ <\u0422\u043e\u0447\u043a\u0430>, <\u0424\u0443\u043d\u043a\u0446\u0438\u044f> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u041a\u0440\u0438\u0432\u0430> ]
-PMCC=\u041a\u043e\u0440\u0435\u043b\u0430\u0446\u0438\u043e\u043d\u0435\u043d \u043a\u043e\u0435\u0444\u0438\u0446\u0438\u0435\u043d\u0442
+PMCC=\u041a\u043e\u0440\u0435\u043b\u0430\u0446\u0438\u043e\u043d\u0435\u043d\u041a\u043e\u0435\u0444\u0438\u0446\u0438\u0435\u043d\u0442
PMCC.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438> ]\n[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0445 \u043a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u0438>, <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0443 \u043a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u0438> ]
Parabola=\u041f\u0430\u0440\u0430\u0431\u043e\u043b\u0430
Parabola.Syntax=[ <\u0422\u043e\u0447\u043a\u0430>, <\u041f\u0440\u0430\u0432\u0430> ]
Parameter=\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u044a\u0440
Parameter.Syntax=[ <\u041f\u0430\u0440\u0430\u0431\u043e\u043b\u0430> ]
-PartialFractions=\u041f\u0440\u0438\u0432\u0435\u0436\u0434\u0430\u043d\u0435 \u043f\u043e\u0434 \u043e\u0431\u0449 \u0437\u043d\u0430\u043c\u0435\u043d\u0430\u0442\u0435\u043b
+PartialFractions=\u041f\u0440\u0438\u0432\u0435\u0436\u0434\u0430\u043d\u0435\u041f\u043e\u0434\u041e\u0431\u0449\u0417\u043d\u0430\u043c\u0435\u043d\u0430\u0442\u0435\u043b
PartialFractions.Syntax=[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f> ]
-Percentile=\u041f\u0440\u043e\u0446\u0435\u043d\u0442\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442
+Percentile=\u041f\u0440\u043e\u0446\u0435\u043d\u0442\u043d\u0430\u0421\u0442\u043e\u0439\u043d\u043e\u0441\u0442
Percentile.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0447\u0438\u0441\u043b\u0430>, <\u041f\u0440\u043e\u0446\u0435\u043d\u0442> ]
Perimeter=\u041f\u0435\u0440\u0438\u043c\u0435\u0442\u044a\u0440
Perimeter.Syntax=[ <\u041c\u043d\u043e\u0433\u043e\u044a\u0433\u044a\u043b\u043d\u0438\u043a> ]\n[ <\u041a\u043e\u043d\u0438\u0447\u043d\u043e \u0441\u0435\u0447\u0435\u043d\u0438\u0435> ]\n[ <\u0413\u0435\u043e\u043c\u0435\u0442\u0440\u0438\u0447\u043d\u043e \u043c\u044f\u0441\u0442\u043e/\u0422\u0440\u0430\u0435\u043a\u0442\u043e\u0440\u0438\u044f> ]
-Plane=\u0420\u0430\u0432\u043d\u0438\u043d\u0430
Point=\u0422\u043e\u0447\u043a\u0430
Point.Syntax=[ <\u041e\u0431\u0435\u043a\u0442> ]\n[ <\u041e\u0431\u0435\u043a\u0442>, <\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u044a\u0440> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u0412\u0435\u043a\u0442\u043e\u0440> ]
-PointList=\u0421\u043f\u0438\u0441\u044a\u043a \u0442\u043e\u0447\u043a\u0438
+PointList=\u0421\u043f\u0438\u0441\u044a\u043a\u0422\u043e\u0447\u043a\u0438
PointList.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a> ]
+PolyLine.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, ..., <\u0422\u043e\u0447\u043a\u0430> ]
Polygon=\u041c\u043d\u043e\u0433\u043e\u044a\u0433\u044a\u043b\u043d\u0438\u043a
-Polygon.Syntax=[ <T\u043e\u0447\u043a\u0430>, ....., <\u0422\u043e\u0447\u043a\u0430> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430>, <\u0411\u0440\u043e\u0439 \u0432\u044a\u0440\u0445\u0430> ]
+Polygon.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438> ]\n[ <T\u043e\u0447\u043a\u0430>, ..., <\u0422\u043e\u0447\u043a\u0430> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430>, <\u0411\u0440\u043e\u044f\u0442 \u043d\u0430 \u0432\u044a\u0440\u0445\u043e\u0432\u0435\u0442\u0435> ]
Polynomial=\u041c\u043d\u043e\u0433\u043e\u0447\u043b\u0435\u043d
Polynomial.Syntax=[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f> ]\n[ <\u0421\u043f\u0438\u0441\u044a\u043a \u0442\u043e\u0447\u043a\u0438> ]
+PrimeFactors.Syntax=[ <\u0427\u0438\u0441\u043b\u043e> ]
+Product.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0447\u0438\u0441\u043b\u0430> ]\n[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0447\u0438\u0441\u043b\u0430>, <\u0411\u0440\u043e\u0439 \u0435\u043b\u0435\u043c\u0435\u043d\u0442\u0438> ]
+Q1.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0447\u0438\u0441\u043b\u0430> ]
+Q3.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0447\u0438\u0441\u043b\u0430> ]
+RSquare.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438>, <\u0424\u0443\u043d\u043a\u0446\u0438\u044f> ]
Radius=\u0420\u0430\u0434\u0438\u0443\u0441
Radius.Syntax=[ <\u041a\u043e\u043d\u0438\u0447\u043d\u043e \u0441\u0435\u0447\u0435\u043d\u0438\u0435> ]
+RandomElement.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a> ]
Rationalize=\u0420\u0430\u0446\u0438\u043e\u043d\u0430\u043b\u0438\u0437\u0438\u0440\u0430\u043d\u0435
Ray=\u041b\u044a\u0447
Ray.Syntax=[ <\u041d\u0430\u0447\u0430\u043b\u043d\u0430 \u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]\n[ <\u041d\u0430\u0447\u0430\u043b\u043d\u0430 \u0422\u043e\u0447\u043a\u0430>, <\u041d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043d\u0430 \u0432\u0435\u043a\u0442\u043e\u0440> ]
+ReducedRowEchelonForm.Syntax=[ <\u041c\u0430\u0442\u0440\u0438\u0446\u0430> ]
Relation=\u041e\u0442\u043d\u043e\u0448\u0435\u043d\u0438\u0435
Relation.Syntax=[ <\u041e\u0431\u0435\u043a\u0442>, <\u041e\u0431\u0435\u043a\u0442> ]
Rename=\u041f\u0440\u0435\u0438\u043c\u0435\u043d\u0443\u0432\u0430\u0439
Rename.Syntax=[ <\u041e\u0431\u0435\u043a\u0442>, <\u0418\u043c\u0435> ]
-Reverse=\u041e\u0431\u0440\u0430\u0442\u0435\u043d \u0440\u0435\u0434
+ResidualPlot.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438>, <\u0424\u0443\u043d\u043a\u0446\u0438\u044f> ]
+Reverse=\u041e\u0431\u0440\u0430\u0442\u0435\u043d\u0420\u0435\u0434
Reverse.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a> ]
-RightSide=\u0414\u044f\u0441\u043d\u0430 \u0441\u0442\u0440\u0430\u043d\u0430
-RigidPolygon=\u041d\u0435\u043f\u043e\u0434\u0432\u0438\u0436\u0435\u043d \u043c\u043d\u043e\u0433\u043e\u044a\u0433\u044a\u043b\u043d\u0438\u043a
+RightSide=\u0414\u044f\u0441\u043d\u0430\u0421\u0442\u0440\u0430\u043d\u0430
+RigidPolygon=\u041d\u0435\u043f\u043e\u0434\u0432\u0438\u0436\u0435\u043d\u041c\u043d\u043e\u0433\u043e\u044a\u0433\u044a\u043b\u043d\u0438\u043a
RigidPolygon.Syntax=[ <\u0421\u0432\u043e\u0431\u043e\u0434\u043d\u0430 \u0442\u043e\u0447\u043a\u0430>, ..., <\u0421\u0432\u043e\u0431\u043e\u0434\u043d\u0430 \u0442\u043e\u0447\u043a\u0430> ]
Root=\u041a\u043e\u0440\u0435\u043d
+RootList.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a> ]
Roots=\u041a\u043e\u0440\u0435\u043d\u0438
Roots.Syntax=[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u041d\u0430\u0447\u0430\u043b\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445>, <\u041a\u0440\u0430\u0439\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445> ]
Rotate=\u0420\u043e\u0442\u0430\u0446\u0438\u044f
Rotate.Syntax=[ <\u041e\u0431\u0435\u043a\u0442>, <\u042a\u0433\u044a\u043b> ]\n[ <\u041e\u0431\u0435\u043a\u0442>, <\u042a\u0433\u044a\u043b>, <\u0422\u043e\u0447\u043a\u0430> ]
-RotateText=\u0417\u0430\u0432\u044a\u0440\u0442\u0438 \u0442\u0435\u043a\u0441\u0442
+RotateText=\u0417\u0430\u0432\u044a\u0440\u0442\u0438\u0422\u0435\u043a\u0441\u0442
RotateText.Syntax=[ <\u0422\u0435\u043a\u0441\u0442>, <\u042a\u0433\u044a\u043b> ]
Row=\u0420\u0435\u0434
Row.Syntax=[ <\u0420\u0435\u0434 \u043d\u0430 \u0435\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430> ]
-SecondAxis=\u0412\u0442\u043e\u0440\u043e\u0441\u0442\u0435\u043f\u0435\u043d\u043d\u0430 \u043e\u0441
+SD.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0447\u0438\u0441\u043b\u0430> ]
+SDX.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438> ]
+SDY.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438> ]
+SXX.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0447\u0438\u0441\u043b\u0430> ]\n[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438> ]
+SampleSD.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438> ]
+SampleSDX.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438> ]
+SampleSDY.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438> ]
+SecondAxis=\u0412\u0442\u043e\u0440\u043e\u0441\u0442\u0435\u043f\u0435\u043d\u043d\u0430\u041e\u0441
SecondAxis.Syntax=[ <\u041a\u043e\u043d\u0438\u0447\u043d\u043e \u0441\u0435\u0447\u0435\u043d\u0438\u0435> ]
-SecondAxisLength=\u0414\u044a\u043b\u0436\u0438\u043d\u0430 \u043d\u0430 \u0412\u0442\u043e\u0440\u043e\u0441\u0442\u0435\u043f\u0435\u043d\u043d\u0430\u0442\u0430 \u043e\u0441
+SecondAxisLength=\u0414\u044a\u043b\u0436\u0438\u043d\u0430\u0412\u0442\u043e\u0440\u043e\u0441\u0442\u0435\u043f\u0435\u043d\u043d\u0430\u0442\u0430\u041e\u0441
SecondAxisLength.Syntax=[ <\u041a\u043e\u043d\u0438\u0447\u043d\u043e \u0441\u0435\u0447\u0435\u043d\u0438\u0435> ]
Sector=\u0421\u0435\u043a\u0442\u043e\u0440
Sector.Syntax=[ <\u041a\u043e\u043d\u0438\u0447\u043d\u043e \u0441\u0435\u0447\u0435\u043d\u0438\u0435>, <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]\n[ <\u041a\u043e\u043d\u0438\u0447\u043d\u043e \u0441\u0435\u0447\u0435\u043d\u0438\u0435>, <\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u044a\u0440>, <\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u044a\u0440> ]
Segment=\u041e\u0442\u0441\u0435\u0447\u043a\u0430
Segment.Syntax=[ <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u0414\u044a\u043b\u0436\u0438\u043d\u0430> ]
-SelectObjects=\u0418\u0437\u0431\u0435\u0440\u0438 \u043e\u0431\u0435\u043a\u0442\u0438
+SelectObjects=\u0418\u0437\u0431\u0435\u0440\u0438\u041e\u0431\u0435\u043a\u0442\u0438
SelectObjects.Syntax=[ ]\n[ <\u041e\u0431\u0435\u043a\u0442>, <\u041e\u0431\u0435\u043a\u0442>, ... ]
-SelectedElement=\u0418\u0437\u0431\u0440\u0430\u043d \u0435\u043b\u0435\u043c\u0435\u043d\u0442
+SelectedElement=\u0418\u0437\u0431\u0440\u0430\u043d\u0415\u043b\u0435\u043c\u0435\u043d\u0442
SelectedElement.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a> ]
-Semicircle=\u041f\u043e\u043b\u0443\u043a\u0440\u044a\u0433
+SelectedIndex.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a> ]
+Semicircle=\u041f\u043e\u043b\u0443\u043e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442
Semicircle.Syntax=[ <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]
-ShortestDistance=\u041d\u0430\u0439-\u043a\u044a\u0441\u043e \u0440\u0430\u0437\u0441\u0442\u043e\u044f\u043d\u0438\u0435
-ShowLabel=\u041f\u043e\u043a\u0430\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u0435\u0442\u0438\u043a\u0435\u0442
+Sequence=\u0420\u0435\u0434\u0438\u0446\u0430
+SetAxesRatio.Syntax=[ <\u0427\u0438\u0441\u043b\u043e>, <\u0427\u0438\u0441\u043b\u043e> ]
+SetBackgroundColor.Syntax=[ <\u041e\u0431\u0435\u043a\u0442>, "<\u0426\u0432\u044f\u0442>" ]\n[ <\u041e\u0431\u0435\u043a\u0442>, <\u0427\u0435\u0440\u0432\u0435\u043d>, <\u0417\u0435\u043b\u0435\u043d>, <\u0421\u0438\u043d> ]
+SetCaption.Syntax=[ <\u041e\u0431\u0435\u043a\u0442>, <\u0422\u0435\u043a\u0441\u0442> ]
+SetColor.Syntax=[ <\u041e\u0431\u0435\u043a\u0442>, "<\u0426\u0432\u044f\u0442>" ]\n[ <\u041e\u0431\u0435\u043a\u0442>, <\u0427\u0435\u0440\u0432\u0435\u043d>, <\u0417\u0435\u043b\u0435\u043d>, <\u0421\u0438\u043d> ]
+SetConditionToShowObject.Syntax=[ <\u041e\u0431\u0435\u043a\u0442>, <Condition> ]
+SetCoords.Syntax=[ <\u0422\u043e\u0447\u043a\u0430>, <x>, <y> ]
+SetDynamicColor.Syntax=[ <\u041e\u0431\u0435\u043a\u0442>, <\u0427\u0435\u0440\u0432\u0435\u043d>, <\u0417\u0435\u043b\u0435\u043d>, <\u0421\u0438\u043d> ]\n[ <\u041e\u0431\u0435\u043a\u0442>, <\u0427\u0435\u0440\u0432\u0435\u043d>, <\u0417\u0435\u043b\u0435\u043d>, <\u0421\u0438\u043d>, <\u041f\u0440\u043e\u0437\u0440\u0430\u0447\u043d\u043e\u0441\u0442> ]
+SetFilling.Syntax=[ <\u041e\u0431\u0435\u043a\u0442>, <\u0427\u0438\u0441\u043b\u043e> ]
+SetFixed.Syntax=[ <\u041e\u0431\u0435\u043a\u0442>, <\u0438\u0441\u0442\u0438\u043d\u0430 | \u043b\u044a\u0436\u0430> ]
+SetLabelMode.Syntax=[ <\u041e\u0431\u0435\u043a\u0442>, <\u0427\u0438\u0441\u043b\u043e> ]
+SetLayer.Syntax=[ <\u041e\u0431\u0435\u043a\u0442>, <Layer> ]
+SetLineStyle.Syntax=[ <\u041f\u0440\u0430\u0432\u0430>, <\u0427\u0438\u0441\u043b\u043e> ]
+SetLineThickness.Syntax=[ <\u041f\u0440\u0430\u0432\u0430>, <\u0427\u0438\u0441\u043b\u043e> ]
+SetPointSize.Syntax=[ <\u0422\u043e\u0447\u043a\u0430>, <\u0427\u0438\u0441\u043b\u043e> ]
+SetPointStyle.Syntax=[ <\u0422\u043e\u0447\u043a\u0430>, <\u0427\u0438\u0441\u043b\u043e> ]
+SetTooltipMode.Syntax=[ <\u041e\u0431\u0435\u043a\u0442>, <\u0427\u0438\u0441\u043b\u043e> ]
+Shear.Syntax=[ <\u041e\u0431\u0435\u043a\u0442>, <\u041f\u0440\u0430\u0432\u0430>, <\u041e\u0442\u043d\u043e\u0448\u0435\u043d\u0438\u0435> ]
+ShortestDistance=\u041d\u0430\u0439_\u043a\u044a\u0441\u043e\u0420\u0430\u0437\u0441\u0442\u043e\u044f\u043d\u0438\u0435
+ShortestDistance.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u043e\u0442\u0441\u0435\u0447\u043a\u0438>, <\u041d\u0430\u0447\u0430\u043b\u043d\u0430 \u0442\u043e\u0447\u043a\u0430>, <\u041a\u0440\u0430\u0439\u043d\u0430 \u0442\u043e\u0447\u043a\u0430>, <Boolean Weighted> ]
+ShowLabel=\u041f\u043e\u043a\u0430\u0437\u0432\u0430\u043d\u0435\u0415\u0442\u0438\u043a\u0435\u0442
+ShowLabel.Syntax=[ <\u041e\u0431\u0435\u043a\u0442>, <Boolean> ]
+ShowLayer.Syntax=[ <\u0427\u0438\u0441\u043b\u043e> ]
Shuffle=\u0420\u0430\u0437\u0431\u044a\u0440\u043a\u0432\u0430\u043d\u0435
Shuffle.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a> ]
+SigmaXX.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438> ]\n[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0447\u0438\u0441\u043b\u0430> ]
+SigmaXY.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438> ]\n[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 x-\u043a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u0438>, <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 y-\u043a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u0438> ]
+SigmaYY.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438> ]
Simplify=\u041e\u043f\u0440\u043e\u0441\u0442\u0438
Simplify.Syntax=[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f> ]\n[ <\u0422\u0435\u043a\u0441\u0442> ]
Slider=\u041f\u043b\u044a\u0437\u0433\u0430\u0447
Slider.Syntax=[ <\u041c\u0438\u043d\u0438\u043c\u0430\u043b\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442>, <\u041c\u0430\u043a\u0441\u0438\u043b\u0430\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442>, <\u0421\u043a\u043e\u0440\u043e\u0441\u0442>, <\u0428\u0438\u0440\u0438\u043d\u0430>, <\u042a\u0433\u044a\u043b \u043b\u0438 \u0435>, <\u0425\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b>, <\u0410\u043d\u0438\u043c\u0438\u0440\u0430\u0439>, <\u041f\u0440\u043e\u0438\u0437\u0432\u043e\u043b\u0435\u043d> ]
-Slope=\u042a\u0433\u043b\u043e\u0432 \u043a\u043e\u0435\u0444\u0438\u0446\u0438\u0435\u043d\u0442
+Slope=\u042a\u0433\u043b\u043e\u0432\u041a\u043e\u0435\u0444\u0438\u0446\u0438\u0435\u043d\u0442
Slope.Syntax=[ <\u041f\u0440\u0430\u0432\u0430> ]
-Solve=\u041d\u0430\u043c\u0435\u0440\u0438 \u0440\u0435\u0448\u0435\u043d\u0438\u0435
+SlowPlot.Syntax=[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f> ]
+Solutions=\u0420\u0435\u0448\u0435\u043d\u0438\u044f
+Solve=\u041d\u0430\u043c\u0435\u0440\u0438\u0420\u0435\u0448\u0435\u043d\u0438\u0435
Sort=\u0421\u043e\u0440\u0442\u0438\u0440\u0430\u043d\u0435
Sort.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a> ]
-StartAnimation=\u0421\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u0439 \u0430\u043d\u0438\u043c\u0430\u0446\u0438\u044f
+Spearman.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438> ]\n[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438>, <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438> ]
+StartAnimation=\u0421\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u0439\u0410\u043d\u0438\u043c\u0430\u0446\u0438\u044f
+StemPlot.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a> ]\n[ <\u0421\u043f\u0438\u0441\u044a\u043a>, <Adjustment -1|0|1> ]
+Stretch.Syntax=[ <\u041e\u0431\u0435\u043a\u0442>, <\u0412\u0435\u043a\u0442\u043e\u0440> ]\n[ <\u041e\u0431\u0435\u043a\u0442>, <\u041f\u0440\u0430\u0432\u0430>, <\u041e\u0442\u043d\u043e\u0448\u0435\u043d\u0438\u0435> ]
Sum=\u0421\u0443\u043c\u0430
Sum.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a> ]\n[ <\u0421\u043f\u0438\u0441\u044a\u043a>, <\u0411\u0440\u043e\u0439 \u0435\u043b\u0435\u043c\u0435\u043d\u0442\u0438> ]
+SumSquaredErrors.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438>, <\u0424\u0443\u043d\u043a\u0446\u0438\u044f> ]
+TableText.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a>, <\u0421\u043f\u0438\u0441\u044a\u043a>, ... ]\n[ <\u0421\u043f\u0438\u0441\u044a\u043a>, <\u0421\u043f\u0438\u0441\u044a\u043a>, ..., <\u041f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u0442\u0435\u043a\u0441\u0442> ]
Take=\u0412\u0437\u0435\u043c\u0438
Take.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a>, <\u0421\u0442\u0430\u0440\u0442\u043e\u0432\u0430 \u043f\u043e\u0437\u0438\u0446\u0438\u044f>, <\u041a\u0440\u0430\u0439\u043d\u0430 \u043f\u043e\u0437\u0438\u0446\u0438\u044f> ]\n[ <\u0422\u0435\u043a\u0441\u0442>, <\u0421\u0442\u0430\u0440\u0442\u043e\u0432\u0430 \u043f\u043e\u0437\u0438\u0446\u0438\u044f>, <\u041a\u0440\u0430\u0439\u043d\u0430 \u043f\u043e\u0437\u0438\u0446\u0438\u044f> ]
Tangent=\u0422\u0430\u043d\u0433\u0435\u043d\u0442\u0430
Tangent.Syntax=[ <\u0422\u043e\u0447\u043a\u0430>, <\u041a\u043e\u043d\u0438\u0447\u043d\u043e \u0441\u0435\u0447\u0435\u043d\u0438\u0435> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u0424\u0443\u043d\u043a\u0446\u0438\u044f> ]\n[ <\u0422\u043e\u0447\u043a\u0430 \u043e\u0442 \u043a\u0440\u0438\u0432\u0430>, <\u041a\u0440\u0438\u0432\u0430> ]\n[ <\u0445 - \u0421\u0442\u043e\u0439\u043d\u043e\u0441\u0442>, <\u0424\u0443\u043d\u043a\u0446\u0438\u044f> ]\n[ <\u041f\u0440\u0430\u0432\u0430>, <\u041a\u043e\u043d\u0438\u0447\u043d\u043e \u0441\u0435\u0447\u0435\u043d\u0438\u0435> ]\n[ <\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442>, <\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442> ]
-TaylorSeries=\u041f\u043e\u043b\u0438\u043d\u043e\u043c \u043d\u0430 \u0422\u0435\u0439\u043b\u043e\u0440
+TaylorSeries=\u041f\u043e\u043b\u0438\u043d\u043e\u043c\u0422\u0435\u0439\u043b\u043e\u0440
TaylorSeries.Syntax=[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u0421\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445>, <\u0421\u0442\u0435\u043f\u0435\u043d/\u041f\u043e\u0440\u044f\u0434\u044a\u043a> ]
Text=\u0422\u0435\u043a\u0441\u0442
-Textfield=\u041f\u043e\u043b\u0435 \u0437\u0430 \u0432\u044a\u0432\u0435\u0436\u0434\u0430\u043d\u0435
+Text.Syntax=[ <\u041e\u0431\u0435\u043a\u0442> ]\n[ <\u041e\u0431\u0435\u043a\u0442>, <Boolean for Substitution of Variables> ]\n[ <\u041e\u0431\u0435\u043a\u0442>, <\u0422\u043e\u0447\u043a\u0430> ]\n[ <\u041e\u0431\u0435\u043a\u0442>, <\u0422\u043e\u0447\u043a\u0430>, <Boolean for Substitution of Variables> ]\n[ <\u041e\u0431\u0435\u043a\u0442>, <\u0422\u043e\u0447\u043a\u0430>, <Boolean for Substitution of Variables>, <Boolean for LaTeX formula> ]
+TextToUnicode.Syntax=[ "<\u0422\u0435\u043a\u0441\u0442>" ]
+Textfield=\u041f\u043e\u043b\u0435\u0417\u0430\u0412\u044a\u0432\u0435\u0436\u0434\u0430\u043d\u0435
Textfield.Syntax=[ ]\n[ <\u0421\u0432\u044a\u0440\u0437\u0432\u0430\u0449 \u043e\u0431\u0435\u043a\u0442> ]
+TiedRank.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a> ]
+ToolImage=\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0418\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435
+ToolImage.Syntax=[ <\u0427\u0438\u0441\u043b\u043e> ]
Translate=\u0422\u0440\u0430\u043d\u0441\u043b\u0430\u0446\u0438\u044f
Translate.Syntax=[ <\u041e\u0431\u0435\u043a\u0442>, <\u0412\u0435\u043a\u0442\u043e\u0440> ]\n[ <\u0412\u0435\u043a\u0442\u043e\u0440>, <\u041d\u0430\u0447\u0430\u043b\u043d\u0430 \u0442\u043e\u0447\u043a\u0430> ]
Transpose=\u0422\u0440\u0430\u043d\u0441\u043f\u043e\u043d\u0438\u0440\u0430\u043d\u0435
Transpose.Syntax=[ <\u041c\u0430\u0442\u0440\u0438\u0446\u0430> ]
-TrapezoidalSum=\u0421\u0443\u043c\u0430, \u0438\u0437\u0447\u0438\u0441\u043b\u0435\u043d\u0430 \u043f\u043e \u043c\u0435\u0442\u043e\u0434\u0430 \u043d\u0430 \u0442\u0440\u0430\u043f\u0435\u0446\u0438\u0442\u0435
+TrapezoidalSum=\u0421\u0443\u043c\u0430\u0418\u0437\u0447\u0438\u0441\u043b\u0435\u043d\u0430\u041f\u043e\u041c\u0435\u0442\u043e\u0434\u041d\u0430\u0422\u0440\u0430\u043f\u0435\u0446\u0438\u0442\u0435
TrapezoidalSum.Syntax=[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u041d\u0430\u0447\u0430\u043b\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445>, <\u041a\u0440\u0430\u0439\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445>, <\u0411\u0440\u043e\u0439 \u0442\u0440\u0430\u043f\u0435\u0446\u0438> ]
-TurningPoint=\u0418\u043d\u0444\u043b\u0435\u043a\u0441\u043d\u0430 \u0442\u043e\u0447\u043a\u0430
+TravelingSalesman.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438> ]
+Triangular.Syntax=[ <\u0414\u043e\u043b\u043d\u0430 \u0433\u0440\u0430\u043d\u0438\u0446\u0430>, <\u0413\u043e\u0440\u043d\u0430 \u0433\u0440\u0430\u043d\u0438\u0446\u0430>, <Mode>, x ]\n[ <\u0414\u043e\u043b\u043d\u0430 \u0433\u0440\u0430\u043d\u0438\u0446\u0430>, <\u0413\u043e\u0440\u043d\u0430 \u0433\u0440\u0430\u043d\u0438\u0446\u0430>, <Mode>, <Variable Value> ]\n[ <\u0414\u043e\u043b\u043d\u0430 \u0433\u0440\u0430\u043d\u0438\u0446\u0430>, <\u0413\u043e\u0440\u043d\u0430 \u0433\u0440\u0430\u043d\u0438\u0446\u0430>, <Mode>, x, <Boolean Cumulative> ]
+TurningPoint=\u0418\u043d\u0444\u043b\u0435\u043a\u0441\u043d\u0430\u0422\u043e\u0447\u043a\u0430
TurningPoint.Syntax=[ <\u041c\u043d\u043e\u0433\u043e\u044a\u0433\u044a\u043b\u043d\u0438\u043a> ]
+UnicodeToLetter.Syntax=[ <\u0426\u044f\u043b\u043e \u0447\u0438\u0441\u043b\u043e> ]
+UnicodeToText.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0446\u0435\u043b\u0438 \u0447\u0438\u0441\u043b\u0430> ]
+Uniform.Syntax=[ <\u0414\u043e\u043b\u043d\u0430 \u0433\u0440\u0430\u043d\u0438\u0446\u0430>, <\u0413\u043e\u0440\u043d\u0430 \u0433\u0440\u0430\u043d\u0438\u0446\u0430>, x ]\n[ <\u0414\u043e\u043b\u043d\u0430 \u0433\u0440\u0430\u043d\u0438\u0446\u0430>, <\u0413\u043e\u0440\u043d\u0430 \u0433\u0440\u0430\u043d\u0438\u0446\u0430>, <\u0421\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u043d\u0430 \u043f\u0440\u043e\u043c\u0435\u043d\u043b\u0438\u0432\u0430> ]\n[ <\u0414\u043e\u043b\u043d\u0430 \u0433\u0440\u0430\u043d\u0438\u0446\u0430>, <\u0413\u043e\u0440\u043d\u0430 \u0433\u0440\u0430\u043d\u0438\u0446\u0430>, x, <Boolean Cumulative> ]
Union=\u041e\u0431\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435
Union.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a>, <\u0421\u043f\u0438\u0441\u044a\u043a> ]\n[ <\u041c\u043d\u043e\u0433\u043e\u044a\u0433\u044a\u043b\u043d\u0438\u043a>, <\u041c\u043d\u043e\u0433\u043e\u044a\u0433\u044a\u043b\u043d\u0438\u043a> ]
-UnitOrthogonalVector=\u0415\u0434\u0438\u043d\u0438\u0447\u0435\u043d \u043f\u0435\u0440\u043f\u0435\u043d\u0434\u0438\u043a\u0443\u043b\u044f\u0440\u0435\u043d \u0432\u0435\u043a\u0442\u043e\u0440
+Unique=\u0423\u043d\u0438\u043a\u0430\u043b\u043d\u043e\u0441\u0442
+Unique.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a> ]
+UnitOrthogonalVector=\u0415\u0434\u0438\u043d\u0438\u0447\u0435\u043d\u041e\u0440\u0442\u043e\u0433\u043e\u043d\u0430\u043b\u0435\u043d\u0412\u0435\u043a\u0442\u043e\u0440
UnitOrthogonalVector.Syntax=[ <\u041f\u0440\u0430\u0432\u0430> ]\n[ <\u041e\u0442\u0441\u0435\u0447\u043a\u0430> ]\n[ <\u0412\u0435\u043a\u0442\u043e\u0440> ]
UnitVector=\u0415\u0434\u0438\u043d\u0438\u0447\u0435\u043d \u0432\u0435\u043a\u0442\u043e\u0440
UnitVector.Syntax=[ <\u0412\u0435\u043a\u0442\u043e\u0440> ]\n[ <\u041f\u0440\u0430\u0432\u0430> ]\n[ <\u041e\u0442\u0441\u0435\u0447\u043a\u0430> ]
-UpdateConstruction=\u041e\u0431\u043d\u043e\u0432\u0438 \u043f\u043e\u0441\u0442\u0440\u043e\u0435\u043d\u0438\u0435\u0442\u043e
-UpperSum=\u0413\u043e\u0440\u043d\u0430 \u0441\u0443\u043c\u0430
+UpdateConstruction=\u041e\u0431\u043d\u043e\u0432\u0438\u041f\u043e\u0441\u0442\u0440\u043e\u0435\u043d\u0438\u0435\u0442\u043e
+UpperSum=\u0413\u043e\u0440\u043d\u0430\u0421\u0443\u043c\u0430
UpperSum.Syntax=[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u041d\u0430\u0447\u0430\u043b\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445>, <\u041a\u0440\u0430\u0439\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442 \u0445>, <\u0411\u0440\u043e\u0439 \u043f\u0440\u0430\u0432\u043e\u044a\u0433\u044a\u043b\u043d\u0438\u0446\u0438> ]
-Variance=\u0414\u0438\u0441\u043f\u0435\u0440\u0441\u0438\u044f \u043d\u0430 \u0441\u043b\u0443\u0447\u0430\u0439\u043d\u0430 \u0432\u0435\u043b\u0438\u0447\u0438\u043d\u0430
+Variance=\u0414\u0438\u0441\u043f\u0435\u0440\u0441\u0438\u044f\u041d\u0430\u0421\u043b\u0443\u0447\u0430\u0439\u043d\u0430\u0412\u0435\u043b\u0438\u0447\u0438\u043d\u0430
Variance.Syntax=[ <\u0421\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0447\u0438\u0441\u043b\u0430> ]
Vector=\u0412\u0435\u043a\u0442\u043e\u0440
Vector.Syntax=[ <\u0422\u043e\u0447\u043a\u0430> ]\n[ <\u041d\u0430\u0447\u0430\u043b\u043d\u0430 \u0442\u043e\u0447\u043a\u0430>, <\u041a\u0440\u0430\u0439\u043d\u0430 \u0442\u043e\u0447\u043a\u0430> ]
Vertex=\u0412\u0440\u044a\u0445
Vertex.Syntax=[ <\u041a\u043e\u043d\u0438\u0447\u043d\u043e \u0441\u0435\u0447\u0435\u043d\u0438\u0435> ]\n[ <\u041c\u043d\u043e\u0433\u043e\u044a\u0433\u044a\u043b\u043d\u0438\u043a> ]\n[ <\u041c\u043d\u043e\u0433\u043e\u044a\u0433\u044a\u043b\u043d\u0438\u043a>, <\u0418\u043d\u0434\u0435\u043a\u0441> ]
-VerticalText=\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u0435\u043d \u0442\u0435\u043a\u0441\u0442
+VerticalText=\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u0435\u043d\u0422\u0435\u043a\u0441\u0442
VerticalText.Syntax=[ <\u0422\u0435\u043a\u0441\u0442> ]
ZoomIn=\u0423\u0432\u0435\u043b\u0438\u0447\u0438
-ZoomOut=\u041d\u0430\u043c\u0430\u043b\u0438
\ No newline at end of file
+ZoomOut=\u041d\u0430\u043c\u0430\u043b\u0438
+nPr=\u041a\u0430\u043b\u043a\u0443\u043b\u0430\u0442\u043e\u0440\u041f\u0435\u0440\u043c\u0443\u0442\u0430\u0446\u0438\u0438
\ No newline at end of file
diff --git a/geogebra/properties/command_bs.properties b/geogebra/properties/command_bs.properties
index b0913f9..34872df 100644
--- a/geogebra/properties/command_bs.properties
+++ b/geogebra/properties/command_bs.properties
@@ -12,9 +12,9 @@ ApplyMatrix.Syntax=[ <Matrica>, <Figura> ]
Arc=Luk
Arc.Syntax=[ <Kru\u017enica>, <Ta\u010dka>, <Ta\u010dka> ]\n[ <Elipsa>, <Ta\u010dka>, <Ta\u010dka> ]\n[ <Kru\u017enica>, <Vrijednost parametra>, <Vrijednost parametra> ]\n[ <Elipsa>, <Vrijednost parametra>, <Vrijednost parametra> ]
Area=Povr\u0161ina
-Area.Syntax=[ <Konika> ]\n[ <Ta\u010dka>, ..., <Ta\u010dka> ]
+Area.Syntax=[ <Konika> ]\n[ <Mnogougao> ]\n[ <Ta\u010dka>, ..., <Ta\u010dka> ]
Asymptote=Asimptote
-Asymptote.Syntax=[ <Konika> ]\n[ <Funkcija> ]\n[ <ImplicitnaKriva> ]
+Asymptote.Syntax=[ <Konika> ]\n[ <Funkcija> ]\n[ <Implicitna Kriva> ]
Axes=Ose
Axes.Syntax=[ <Konika> ]
AxisStepX=MjeraXosa
@@ -22,11 +22,11 @@ AxisStepY=MjeraYosa
BarChart=\u0160tapi\u010dastiDijagram
BarChart.Syntax=[ <Lista podataka>, <Lista frekvencija> ]\n[ <Lista ulaznih podataka>, <\u0160irina> ]\n[ <Lista podataka>, <Lista frekvencija>, <\u0160irina> ]\n[ <Po\u010detna vrijednost>, <Krajnja vrijednost>, <Lista visina> ]\n[ <Po\u010detna vrijednost>, <Krajnja vrijednost>, <Izraz>, <Promjenljiva>, <od>, <do> ]\n[ <Po\u010detna vrijednost>, <Krajnja vrijednost>, <Izraz>, <Promjenljiva>, <od>, <do>, <korak> ]
Bernoulli=BernoulliDist
-Bernoulli.Syntax=[ <Vjerovatno\u0107a>, <Kumulativna Boolean-ova vrijednost> ]
+Bernoulli.Syntax=[ <Vjerovatno\u0107a>, <Kumulativna Boolean vrijednost> ]
Binomial=BinomniKoeficijent
Binomial.Syntax=[ <Broj n>, <Broj k> ]
BinomialDist=BinomnaDist
-BinomialDist.Syntax=[ <Broj poku\u0161aja>, <Vjerovatno\u0107a uspjeha> ]\n[ <Broj poku\u0161aja>, <Vjerovatno\u0107a uspjeha>, <Kumulativna Boolean-ova vrijednost> ]\n[ <Broj poku\u0161aja>, <Vjerovatno\u0107a uspjeha>, <Broj uspje\u0161nih ishoda>, <Kumulativna Boolean-ova vrijednost> ]
+BinomialDist.Syntax=[ <Broj poku\u0161aja>, <Vjerovatno\u0107a uspjeha> ]\n[ <Broj poku\u0161aja>, <Vjerovatno\u0107a uspjeha>, <Kumulativna Boolean vrijednost> ]\n[ <Broj poku\u0161aja>, <Vjerovatno\u0107a uspjeha>, <Vrijednost promjenljive>, <Kumulativna Boolean vrijednost> ]
BoxPlot=PravougaoniDijagram
BoxPlot.Syntax=[ <yPomak>, <ySkala>, <Lista ulaznih podataka> ]\n[ <yPomak>, <ySkala>, <Po\u010detna vrijednost>, <Q1>, <Medijan>, <Q3>, <Krajnja vrijednost> ]
Button=Dugme
@@ -35,7 +35,7 @@ CFactor=KFaktor
CSolutions=KRje\u0161enja
CSolve=KRje\u0161enje
Cauchy=CauchyDist
-Cauchy.Syntax=[ <Medijan>, <Skala>, x ]\n[ <Medijan>, <Skala>, <Vrijednost promjenljive> ]\n[ <Medijan>, <Skala>, x, <Kumulativna Boolean-ova vrijednost> ]
+Cauchy.Syntax=[ <Medijan>, <Skala>, x ]\n[ <Medijan>, <Skala>, <Vrijednost promjenljive> ]\n[ <Medijan>, <Skala>, x, <Kumulativna Boolean vrijednost> ]
Cell=Polje
Cell.Syntax=[ <Kolona>, <Red> ]
CellRange=Veli\u010dinaPolja
@@ -47,7 +47,7 @@ Centroid.Syntax=[ <Mnogougao> ]
Checkbox=IzborniOkvir
Checkbox.Syntax=[ ]\n[ <Naslov> ]\n[ <Lista> ]\n[ <Naslov>, <Lista> ]
ChiSquared=HiKvadrat
-ChiSquared.Syntax=[ <Stepen slobode>, x ]\n[ <Stepen slobode>, <Vrijednost promjenljive> ]\n[ <Stepen slobode>, x, <Kumulativna Boolean-ova vrijednost> ]
+ChiSquared.Syntax=[ <Stepen slobode>, x ]\n[ <Stepen slobode>, <Vrijednost promjenljive> ]\n[ <Stepen slobode>, x, <Kumulativna Boolean vrijednost> ]
Circle=Kru\u017enica
Circle.Syntax=[ <Ta\u010dka>, <Du\u017eina polupre\u010dnika> ]\n[ <Ta\u010dka>, <Polupre\u010dnik> ]\n[ <Ta\u010dka>, <Ta\u010dka> ]\n[ <Ta\u010dka>, <Ta\u010dka>, <Ta\u010dka> ]
CircleArc=Kru\u017eniLuk
@@ -72,8 +72,6 @@ ColumnName=ImeKolone
ColumnName.Syntax=[ <\u0107elija tabele> ]
Command=Naredba
CommonDenominator=Zajedni\u010dkiNazivnik
-CompetitionRank=RangLista
-CompetitionRank.Syntax=[ <Lista> ]
CompleteSquare=PotpunKvadrat
CompleteSquare.Syntax=[ <Kvadratna funkcija> ]
ComplexRoot=KompleksneNule
@@ -87,7 +85,7 @@ ConvexHull.Syntax=[ <Lista ta\u010daka> ]
CopyFreeObject=KopirajNezavisnuFiguru
CopyFreeObject.Syntax=[ <Figura> ]
Corner=UgaoSlike
-Corner.Syntax=[ <Broj ugla> ]\n[ Slika>, <Broj ugla> ]\n[ <Tekst>, <Broj ugla> ]\n[ <Radna povr\u0161>, <Broj ugla> ]
+Corner.Syntax=[ <Broj ugla> ]\n[ <Slika>, <Broj ugla> ]\n[ <Tekst>, <Broj ugla> ]\n[ <Radna povr\u0161>, <Broj ugla> ]
CountIf=BrojElemenata
CountIf.Syntax=[ <Uvjet>, <Lista> ]
Covariance=Kovarijanca
@@ -102,7 +100,7 @@ CurvatureVector.Syntax=[ <Ta\u010dka>, <Funkcija> ]\n[ <Ta\u010dka>, <Kriva> ]
CurveCartesian=Kriva
CurveCartesian.Syntax=[ <Izraz>, <Izraz>, <Parametar promjenljive>, <Po\u010detna vrijednost>, <Krajnja vrijednost> ]
Decimal=DecimalnaVrijednost
-Defined=JeLiDefinirana
+Defined=JeLiDef
Defined.Syntax=[ <Figura> ]
Degree=Stepen
Degree.Syntax=[ <Polinom> ]
@@ -113,10 +111,10 @@ Delete.Syntax=[ <Figura> ]
Denominator=Nazivnik
Denominator.Syntax=[ <Funkcija> ]
Derivative=Izvod
-Derivative.Syntax=[ <Funkcija> ]\n[ <Kriva> ]\n[ <Funkcija>, <Broj> ]\n[ <Kriva>, <Broj> ]
+Derivative.Syntax=[ <Funkcija> ]\n[ <Kriva> ]\n[ <Funkcija>, <Broj> ]\n[ <Funkcija>, <Promjenljiva> ]\n[ <Kriva>, <Broj> ]\n[ <Funkcija>, <Promjenljiva>, <Broj> ]
Determinant=Determinanta
Determinant.Syntax=[ <Matrica> ]
-Diameter=KonjugovaniPre\u010dnik
+Diameter=KonjugiraniPre\u010dnik
Diameter.Syntax=[ <Vektor>, <Konika> ]\n[ <Prava>, <Konika> ]
Dilate=Homotetija
Dilate.Syntax=[ <Figura>, <Koeficijent homotetije> ]\n[ <Figura>, <Koeficijent homotetije>, <Centar homotetije> ]
@@ -136,7 +134,7 @@ DivisorsSum=SumaDjeljitelja
Dot=SkalarniProizvod
DotPlot=Ta\u010dkastiDijagram
DotPlot.Syntax=[ <Lista ulaznih podataka> ]
-DynamicCoordinates=Dinami\u010dneKoordinate
+DynamicCoordinates=Dinami\u010dkeKoordinate
DynamicCoordinates.Syntax=[ <Ta\u010dka>, <Broj>, <Broj> ]
Eccentricity=Ekscentricitet
Eccentricity.Syntax=[ <Konika> ]
@@ -144,7 +142,7 @@ Element.Syntax=[ <Lista>, <Pozicija elementa> ]\n[ <Matrica>, <Red>, <Kolona> ]\
Ellipse=Elipsa
Ellipse.Syntax=[ <Fokus>, <Fokus>, <Glavna poluosa> ]\n[ <Fokus>, <Fokus>, <Du\u017e> ]\n[ <Ta\u010dka>, <Ta\u010dka>, <Ta\u010dka> ]
Erlang=ErlangDist
-Erlang.Syntax=[ <Parametar oblika>, <Parametar mjere>, x ]\n[ <Parametar oblika>, <Parametar mjere>, <Vrijednost promjenljive> ]\n[ <Parametar oblika>, <Parametar mjere>, x, <Kumulativna Boolean-ova vrijednost> ]
+Erlang.Syntax=[ <Parametar oblika>, <Parametar mjere>, x ]\n[ <Parametar oblika>, <Parametar mjere>, <Vrijednost promjenljive> ]\n[ <Parametar oblika>, <Parametar mjere>, x, <Kumulativna Boolean vrijednost> ]
Excentricity=LinearniEkscentricitet
Excentricity.Syntax=[ <Konika> ]
Execute=Kreiraj
@@ -152,11 +150,11 @@ Execute.Syntax=[ <Tekst Lista> ]\n[ <Tekst Lista>, <Parametar>, <Parametar> ]
Expand=SrediIzraz
Expand.Syntax=[ <Izraz> ]
Exponential=EksponencijalnaDist
-Exponential.Syntax=[ <Parametar lambda>, x ]\n[ <Parametar lambda>, x, <Kumulativna Boolean-ova vrijednost> ]\n[ <Parametar lambda>, x, <Vrijednost promjenljive> ]
+Exponential.Syntax=[ <Parametar lambda>, x ]\n[ <Parametar lambda>, <Vrijednost promjenljive> ]\n[ <Parametar lambda>, <Kumulativna Boolean vrijednost> ]
Extremum=Ekstrem
Extremum.Syntax=[ <Polinom> ]\n[ <Funkcija>, <Po\u010detna x-vrijednost>, <Krajnja x-vrijednost> ]
FDistribution=FDist
-FDistribution.Syntax=[ <Stepen slobode- brojnik>, <Stepen slobode-nazivnik>, x ]\n[ <Stepen slobode- brojnik>, <Stepen slobode-nazivnik>, <Vrijednost promjenljive> ]\n[ <Stepen slobode- brojnik>, <Stepen slobode-nazivnik>, x, <Kumulativna Boolean-ova vrijednost> ]
+FDistribution.Syntax=[ <Stepen slobode- brojnik>, <Stepen slobode-nazivnik>, x ]\n[ <Stepen slobode- brojnik>, <Stepen slobode-nazivnik>, <Vrijednost promjenljive> ]\n[ <Stepen slobode- brojnik>, <Stepen slobode-nazivnik>, x, <Kumulativna Boolean vrijednost> ]
Factor=Faktoriziraj
Factor.Syntax=[ <Polinom> ]
Factors=Faktori
@@ -168,7 +166,7 @@ FillColumn.Syntax=[ <Kolona>, <Lista> ]
FillRow=IspuniRed
FillRow.Syntax=[ <Red>, <Lista> ]
First=Prvi
-First.Syntax=[ <Lista> ]\n[ <Tekst> ]\n[ <Tekst> ]\n[ <Lista>, <Broj elemenata> ]\n[ <Tekst>, <Broj elemenata> ]\n[ <Lokus>, <Broj elemenata> ]
+First.Syntax=[ <Lista> ]\n[ <Tekst> ]\n[ <Lista>, <Broj elemenata> ]\n[ <Tekst>, <Broj elemenata> ]\n[ <Lokus>, <Broj elemenata> ]
FirstAxis=GlavnaOsa
FirstAxis.Syntax=[ <Konika> ]
FirstAxisLength=GlavnaPoluosa
@@ -199,17 +197,17 @@ FractionText=Razlomak
FractionText.Syntax=[ <Broj> ]
FractionalPart=RazlomljeniDio
Frequency=Frekvencija
-Frequency.Syntax=[ <Lista ulaznih podataka> ]\n[ <Kumulativna>, <Lista ulaznih podataka> ]\n[ <Lista klase vrijednosti granica>, <Lista ulaznih podataka>, ]\n[ <Kumulativna>, <Lista klase vrijednosti granica>, <Lista ulaznih podataka> ]\n[ <Lista klase vrijednosti granica>, <Lista ulaznih podataka>, <Gusto\u0107a>, <Gusto\u0107a faktor omjera> (neobavezno) ]\n[ <Kumulativna Boolean-ova vrijednost>, <Lista klase vrijednosti granica>, <Lista ulaznih podataka>, <Gusto\u0107a>, <Gusto\u0107a faktor omjera> (neobavezno) ]
+Frequency.Syntax=[ <Lista ulaznih podataka> ]\n[ <Kumulativna Boolean vrijednost>, <Lista ulaznih podataka> ]\n[ <Lista klase vrijednosti granica>, <Lista ulaznih podataka> ]\n[ <Kumulativna Boolean vrijednost>, <Lista klase vrijednosti granica>, <Lista ulaznih podataka> ]\n[ <Lista klase vrijednosti granica>, <Lista ulaznih podataka>, <Gusto\u0107a>, <Gusto\u0107a faktor omjera(neobavezno)> ]\n[ <Kumulativna Boolean vrijednost>, <Lista klase vrijednosti granica>, <Lista ulaznih podataka>, <Gusto\u0107a>, <Gusto\u0107a faktor omjera(neobavezno)> ]
FrequencyPolygon=DijagramFrekvencija
-FrequencyPolygon.Syntax=[ <Lista klase vrijednosti granica>, <Lista visina> ]\n[ <Lista klase vrijednosti granica>, <Lista ulaznih podataka>, <Gusto\u0107a>, <Gusto\u0107a Faktor omjera> (neobavezno) ]\n[ <Kumulativna Boolean-ova vrijednost>, <Lista klase granica>, <Lista ulaznih podataka>, <Gusto\u0107a>, <Gusto\u0107a faktor omjera> (neobavezno) ]
+FrequencyPolygon.Syntax=[ <Lista klase vrijednosti granica>, <Lista visina> ]\n[ <Lista klase vrijednosti granica>, <Lista ulaznih podataka>, <Gusto\u0107a>, <Gusto\u0107a Faktor omjera(neobavezno)> ]\n[ <Kumulativna Boolean vrijednost>, <Lista klase granica>, <Lista ulaznih podataka>, <Gusto\u0107a>, <Gusto\u0107a faktor omjera(neobavezno)> ]
FrequencyTable=TabelaFrekvencija
-FrequencyTable.Syntax=[ <Lista ulaznih podataka> ]\n[ <Kumulativna>, <Lista ulaznih podataka> ]\n[ <Lista klase vrijednosti granica>, <Lista ulaznih podataka>, ]\n[ <Kumulativna>, <Lista klase vrijednosti granica>, <Lista ulaznih podataka> ]\n[ <Lista klase vrijednosti granica>, <Lista ulaznih podataka>, <Gusto\u0107a>, <Gusto\u0107a faktor omjera> (neobavezno) ]\n[ <Kumulativna Boolean-ova vrijednost>, <Lista klase vrijednosti granica>, <Lista ulaznih podataka>, <Gusto\u0107a>, <Gusto\u0107a faktor omjera> (neobavezno) ]
+FrequencyTable.Syntax=[ <Lista ulaznih podataka> ]\n[ <Kumulativna Boolean vrijednost>, <Lista ulaznih podataka> ]\n[ <Lista klase vrijednosti granica>, <Lista ulaznih podataka> ]\n[ <Kumulativna Boolean vrijednost>, <Lista klase vrijednosti granica>, <Lista ulaznih podataka> ]\n[ <Lista klase vrijednosti granica>, <Lista ulaznih podataka>, <Gusto\u0107a>, <Gusto\u0107a faktor omjera(neobavezno)> ]\n[ <Kumulativna Boolean vrijednost>, <Lista klase vrijednosti granica>, <Lista ulaznih podataka>, <Gusto\u0107a>, <Gusto\u0107a faktor omjera(neobavezno)> ]
Function=Funkcija
Function.Syntax=[ <Funkcija>, <Po\u010detna x-vrijednost>, <Krajnja x-vrijednost> ]
GCD=NZD
GCD.Syntax=[ <Lista brojeva> ]\n[ <Broj>, <Broj> ]
Gamma=GammaDist
-Gamma.Syntax=[ <Alfa>, <Beta>, x ]\n[ <Alfa>, <Beta>, <Vrijednost promjenljive> ]\n[ <Alfa>, <Beta>, x, <Kumulativna Boolean-ova vrijednost> ]
+Gamma.Syntax=[ <Alfa>, <Beta>, x ]\n[ <Alfa>, <Beta>, <Vrijednost promjenljive> ]\n[ <Alfa>, <Beta>, x, <Kumulativna Boolean vrijednost> ]
GeometricMean=GeometrijskaSredina
GeometricMean.Syntax=[ <Lista brojeva> ]
GetTime=TrenutnoVrijeme
@@ -217,13 +215,13 @@ HarmonicMean=HarmonijskaSredina
HarmonicMean.Syntax=[ <Lista brojeva> ]
HideLayer=SakrijSloj
HideLayer.Syntax=[ <Broj> ]
-Histogram.Syntax=[ <Lista klase vrijednosti granica>, <Lista visina> ]\n[ <Lista klase vrijednosti granica>, <Lista ulaznih podataka>, <Gusto\u0107a>, <Gusto\u0107a Faktor omjera> (neobavezno) ]\n[ <Kumulativna Boolean-ova vrijednost>, <Lista klase granica>, <Lista ulaznih podataka>, <Gusto\u0107a>, <Gusto\u0107a faktor omjera> (neobavezno) ]
+Histogram.Syntax=[ <Lista klase vrijednosti granica>, <Lista visina> ]\n[ <Lista klase vrijednosti granica>, <Lista ulaznih podataka>, <Gusto\u0107a>, <Gusto\u0107a Faktor omjera(neobavezno)> ]\n[ <Kumulativna Boolean vrijednost>, <Lista klase granica>, <Lista ulaznih podataka>, <Gusto\u0107a>, <Gusto\u0107a faktor omjera(neobavezno)> ]
HistogramRight=HistogramDesni
-HistogramRight.Syntax=[ <Lista klase vrijednosti granica>, <Lista visina> ]\n[ <Lista klase vrijednosti granica>, <Lista ulaznih podataka>, <Gusto\u0107a>, <Gusto\u0107a Faktor omjera> (neobavezno) ]\n[ <Kumulativna Boolean-ova vrijednost>, <Lista klase granica>, <Lista ulaznih podataka>, <Gusto\u0107a>, <Gusto\u0107a faktor omjera> (neobavezno) ]
+HistogramRight.Syntax=[ <Lista klase vrijednosti granica>, <Lista visina> ]\n[ <Lista klase vrijednosti granica>, <Lista ulaznih podataka>, <Gusto\u0107a>, <Gusto\u0107a Faktor omjera(neobavezno)> ]\n[ <Kumulativna Boolean vrijednost>, <Lista klase granica>, <Lista ulaznih podataka>, <Gusto\u0107a>, <Gusto\u0107a faktor omjera(neobavezno)> ]
Hull=Okolina
Hull.Syntax=[ <Lista ta\u010daka>, <Procent> ]
HyperGeometric=HiperGeometrijskaDist
-HyperGeometric.Syntax=[ <Veli\u010dina populacije>, <Broj uspje\u0161nih testiranja>, <Veli\u010dina uzorka> ]\n[ <Veli\u010dina populacije>, <Broj uspje\u0161nih testiranja>, <Veli\u010dina uzorka>, <Kumulativna Boolean-ova promjenljiva> ]\n[ <Veli\u010dina populacije>, <Broj uspje\u0161nih testiranja>, <Veli\u010dina uzorka>, <Vrijednost promjenljive>, <Kumulativna Boolean-ova promjenljiva> ]
+HyperGeometric.Syntax=[ <Veli\u010dina populacije>, <Broj uspje\u0161nih testiranja>, <Veli\u010dina uzorka> ]\n[ <Veli\u010dina populacije>, <Broj uspje\u0161nih testiranja>, <Veli\u010dina uzorka>, <Kumulativna Boolean vrijednost> ]\n[ <Veli\u010dina populacije>, <Broj uspje\u0161nih testiranja>, <Veli\u010dina uzorka>, <Vrijednost promjenljive>, <Kumulativna Boolean vrijednost> ]
Hyperbola=Hiperbola
Hyperbola.Syntax=[ <Fokus>, <Fokus>, <Glavna poluosa> ]\n[ <Fokus>, <Fokus>, <Du\u017e> ]\n[ <Ta\u010dka>, <Ta\u010dka>, <Ta\u010dka> ]
Identity=Identitet
@@ -232,7 +230,7 @@ If=Ako
If.Syntax=[ <uvjet>, <onda> ]\n[ <uvjet>, <onda>, <u suprotnom> ]
Imaginary=ImaginarniDio
ImplicitCurve=ImplicitnaKriva
-ImplicitCurve.Syntax=[ <Lista ta\u010daka> ]\n[ <f(x, y)> ]
+ImplicitCurve.Syntax=[ <Lista ta\u010daka> ]\n[ <f (x.y)> ]
ImplicitDerivative=ImplicitniIzvod
Incircle=UpisanaKru\u017enica
Incircle.Syntax=[ <Ta\u010dka>, <Ta\u010dka>, <Ta\u010dka> ]
@@ -241,17 +239,15 @@ IndexOf.Syntax=[ <Figura>, <Lista> ]\n[ <Tekst>, <Tekst> ]\n[ <Figura>, <Lista>,
Insert=Ubaci
Insert.Syntax=[ <Lista>, <Lista>, <Pozicija> ]\n[ <Figura>, <Lista>, <Pozicija> ]
IntegerPart=CijeliDio
-Integral.Syntax=[ <Funkcija> ]\n[ <Funkcija>, <Po\u010detna x-vrijednost>, <Krajnja x-vrijednost> ]\n[ <Funkcija>, <Po\u010detna x-vrijednost>, <Krajnja x-vrijednost>, <Boolean-ova vrijednost> ]
+Integral.Syntax=[ <Funkcija> ]\n[ <Funkcija>, <Po\u010detna x-vrijednost>, <Krajnja x-vrijednost> ]\n[ <Funkcija>, <Po\u010detna x-vrijednost>, <Krajnja x-vrijednost>, <Boolean vrijednost> ]
IntegralBetween=IntegralIzme\u0111u
-IntegralBetween.Syntax=[ <Funkcija>, <Funkcija>, <Po\u010detna x-vrijednost>, <Krajnja x-vrijednost> ]\n[ <Funkcija>, <Funkcija>, <Po\u010detna x-vrijednost>, <Krajnja x-vrijednost>, <Boolean-ova vrijednost> ]
+IntegralBetween.Syntax=[ <Funkcija>, <Funkcija>, <Po\u010detna x-vrijednost>, <Krajnja x-vrijednost> ]\n[ <Funkcija>, <Funkcija>, <Po\u010detna x-vrijednost>, <Krajnja x-vrijednost>, <Boolean vrijednost> ]
Intersect=Presje\u010dneTa\u010dke
-Intersect.Syntax=[ <Figura>, <Figura> ]\n[ <Figura>, <Figura>, <Broj presje\u010dnih ta\u010daka> ]\n[ <Figura>, <Figura>, <Po\u010detna ta\u010dka> ]\n[ <Funkcija>, <Funkcija>, <Po\u010detna x-vrijednost>, <Krajnja x-vrijednost> ]
+Intersect.Syntax=[ <Figura>, <Figura> ]\n[ <Figura>, <Figura>, <Indeks presje\u010dne ta\u010dke> ]\n[ <Figura>, <Figura>, <Po\u010detna ta\u010dka> ]\n[ <Funkcija>, <Funkcija>, <Po\u010detna x-vrijednost>, <Krajnja x-vrijednost> ]
IntersectRegion=Presje\u010dniRegion
IntersectRegion.Syntax=[ <Mnogougao>, <Mnogougao> ]
Intersection=Presjek
Intersection.Syntax=[ <Lista>, <Lista> ]
-IntersectionPaths=Presje\u010dnaPutanja
-IntersectionPaths.Syntax=\n[ <GeoPrava>, <GeoMnogougao> ]\n[ <GeoPrava>, <GeoKonika> ]
InverseBinomial=InverznaBinomnaDist
InverseBinomial.Syntax=[ <Broj poku\u0161aja>, <Vjerovatno\u0107a uspje\u0161nih>, <Vjerovatno\u0107a> ]
InverseCauchy=InverznaCauchyDist
@@ -292,19 +288,19 @@ IterationList.Syntax=[ <Funkcija>, <Po\u010detna-vrijednost>, <Broj iteracija> ]
Join=Spoji
Join.Syntax=[ <Listu od listi> ]\n[ <Lista>, <Lista>, ... ]
KeepIf=Filter
-KeepIf.Syntax=[ <uvjet>, <lista> ]
+KeepIf.Syntax=[ <uvjet>, <Lista> ]
LCM=NZS
LCM.Syntax=[ <Lista brojeva> ]\n[ <Broj>, <Broj> ]
LaTeX=LaTexFormula
-LaTeX.Syntax=[ <Figura> ]\n[ <Figura>, <Boolean-ova promjenljiva za supstituciju promjenjivih> ]\n[ <Figura>, <Boolean-ova promjenljiva za supstituciju promjenjivih>, <Boolean-ova promjenljiva Prika\u017ei ime> ] ]
+LaTeX.Syntax=[ <Figura> ]\n[ <Figura>, <Boolean vrijednost za supstituciju promjenjivih> ]\n[ <Figura>, <Boolean vrijednost za supstituciju promjenjivih>, <Boolean vrijednost prikaz imena> ]
Last=Posljednji
Last.Syntax=[ <Lista> ]\n[ <Tekst> ]\n[ <Lista>, <Broj elemenata> ]\n[ <Tekst>, <Broj elemenata> ]
LeftSide=LijevaStrana
LeftSum=LijevaSuma
LeftSum.Syntax=[ <Funkcija>, <Po\u010detna x-vrijednost>, <Krajnja x-vrijednost>, <Broj pravougaonika> ]
Length=Du\u017eina
-Length.Syntax=[ <Lista> ]\n[ <Tekst> ]\n[ <Lokus> ]\n[ <Funkcija>, <Po\u010detna x-vrijednost>, <Krajnja x-vrijednost> ]\n[ <Funkcija>, <Po\u010detna ta\u010dka>, <Krajnja ta\u010dka> ]\n[ <Kriva>, <Po\u010detna x-vrijednost>, <Krajnja x-vrijednost> ]\n[ <Kriva>, <Po\u010detna ta\u010dka>, <Krajnja ta\u010dka> ]
-LetterToUnicode=UnikodKaraktera
+Length.Syntax=[ <Vektor> ]\n[ <Ta\u010dka> ]\n[ <Lista> ]\n[ <Tekst> ]\n[ <Lokus> ]\n[ <Du\u017e> ]\n[ <Funkcija>, <Po\u010detna x-vrijednost>, <Krajnja x-vrijednost> ]\n[ <Funkcija>, <Po\u010detna ta\u010dka>, <Krajnja ta\u010dka> ]\n[ <Kriva>, <Po\u010detna x-vrijednost>, <Krajnja x-vrijednost> ]\n[ <Kriva>, <Po\u010detna ta\u010dka>, <Krajnja ta\u010dka> ]
+LetterToUnicode=UniKod
LetterToUnicode.Syntax=[ "<Karakter>" ]
Limit=Limes
Limit.Syntax=[ <Funkcija>, <Broj> ]
@@ -317,11 +313,11 @@ Line.Syntax=[ <Ta\u010dka>, <Ta\u010dka> ]\n[ <Ta\u010dka>, <Paralelno s> ]\n[ <
LineBisector=SimetralaDu\u017ei
LineBisector.Syntax=[ <Du\u017e> ]\n[ <Ta\u010dka>, <Ta\u010dka> ]
Locus=Lokus
-Locus.Syntax=[ <Ta\u010dka lokusa>, <Ta\u010dka> ]
+Locus.Syntax=[ <Ta\u010dka lokusa>, <Ta\u010dka> ]\n[ <Ta\u010dka lokusa>, <Kliza\u010d> ]
LogNormal=NormalnaLogDist
-LogNormal.Syntax=[ <Srednja vrijednost>, <Standardna devijacija>, x ]\n[ <Srednja vrijednost>, <Standardna devijacija>, <Vrijednost promjenljive> ]\n[ <Srednja vrijednost>, <Standardna devijacija>, x, <Kumulativna Boolean-ova vrijednost> ]
+LogNormal.Syntax=[ <Srednja vrijednost>, <Standardna devijacija>, x ]\n[ <Srednja vrijednost>, <Standardna devijacija>, <Vrijednost promjenljive> ]\n[ <Srednja vrijednost>, <Standardna devijacija>, x, <Kumulativna Boolean vrijednost> ]
Logistic=Logisti\u010dkaDist
-Logistic.Syntax=[ <Srednja vrijednost>, <Skala>, x ]\n[ <Srednja vrijednost>, <Skala>, <Vrijednost promjenljive> ]\n[ <Srednja vrijednost>, <Skala>, x, <Kumulativna Boolean-ova vrijednost> ]
+Logistic.Syntax=[ <Srednja vrijednost>, <Skala>, x ]\n[ <Srednja vrijednost>, <Skala>, <Vrijednost promjenljive> ]\n[ <Srednja vrijednost>, <Skala>, x, <Kumulativna Boolean vrijednost> ]
LowerSum=DonjaSuma
LowerSum.Syntax=[ <Funkcija>, <Po\u010detna x-vrijednost>, <Krajnja x-vrijednost>, <Broj pravougaonika> ]
MatrixRank=RangMatrice
@@ -355,9 +351,9 @@ NSolutions=NRje\u0161enja
NSolve=NRje\u0161enje
Name=Ime
Name.Syntax=[ <Figura> ]
-NextPrime=Slijede\u0107iProstBroj
+NextPrime=Sljede\u0107iProstBroj
Normal=NormalnaDist
-Normal.Syntax=[ <Srednja vrijednost>, <Standardna devijacija>, x ]\n[ <Srednja vrijednost>, <Standardna devijacija>, <Vrijednost promjenljive> ]\n[ <Srednja vrijednost>, <Standardna devijacija>, x, <Kumulativna Boolean-ova vrijednost> ]
+Normal.Syntax=[ <Srednja vrijednost>, <Standardna devijacija>, x ]\n[ <Srednja vrijednost>, <Standardna devijacija>, <Vrijednost promjenljive> ]\n[ <Srednja vrijednost>, <Standardna devijacija>, x, <Kumulativna Boolean vrijednost> ]
NormalQuantilePlot=NormalniQQDijagram
NormalQuantilePlot.Syntax=[ <Lista ulaznih podataka> ]
Numerator=Brojnik
@@ -386,23 +382,22 @@ ParseToNumber.Syntax=[ <Broj>, <Niz> ]
PartialFractions=ParcijalniRazlomci
PartialFractions.Syntax=[ <Funkcija> ]
Pascal=PascalDist
-Pascal.Syntax=[ <Broj uspje\u0161nih poku\u0161aja>, <Vjerovatno\u0107a uspjeha> ]\n[ <Broj uspje\u0161nih poku\u0161aja>, <Vjerovatno\u0107a uspjeha>, <Kumulativna Boolean-ova vrijednost> ]\n[ <Broj uspje\u0161nih poku\u0161aja>, <Vjerovatno\u0107a uspjeha>, <Vrijednost promjenljive>, <Kumulativna Boolean-ova vrijednost> ]
+Pascal.Syntax=[ <Broj uspje\u0161nih poku\u0161aja>, <Vjerovatno\u0107a uspjeha> ]\n[ <Broj uspje\u0161nih poku\u0161aja>, <Vjerovatno\u0107a uspjeha>, <Kumulativna Boolean vrijednost> ]\n[ <Broj uspje\u0161nih poku\u0161aja>, <Vjerovatno\u0107a uspjeha>, <Vrijednost promjenljive>, <Kumulativna Boolean vrijednost> ]
PathParameter=ParametarPutanje
PathParameter.Syntax=[ <Ta\u010dka na putanji> ]
Percentile=Percentil
Percentile.Syntax=[ <Lista numeri\u010dkih vrijednosti>, <Procent> ]
Perimeter=Obim
Perimeter.Syntax=[ <Mnogougao> ]\n[ <Konika> ]\n[ <Lokus> ]
-Plane=Ravan
PlaySound=Sviraj
PlaySound.Syntax=[ <Datoteka> ]\n[ <Boolean vrijednost> ]\n[ <Niz nota>, <Instrument> ]\n[ <Note>, <Trajanje>, <Instrument> ]\n[ <Funkcija>, <Min Vrijednost>, <Max Vrijednost> ]\n[ <Funkcija>, <Min Vrijednost>, <Max Vrijednost>, <Tempo>, <Dubina> ]
Point=Ta\u010dka
-Point.Syntax=[ <Figura> ]\n[ <Figura>, <Parametar> ]\n[ <Ta\u010dka>, <Vektor> ]
+Point.Syntax=[ <Figura> ]\n[ <Lista> ]\n[ <Figura>, <Parametar> ]\n[ <Ta\u010dka>, <Vektor> ]
PointIn=Ta\u010dkaU
PointList=ListaTa\u010daka
PointList.Syntax=[ <Lista> ]
Poisson=PoissonDist
-Poisson.Syntax=[ <Srednja vrijednost> ]\n[ <Srednja vrijednost>, <Kumulativna Boolean-ova vrijednost> ]\n[ <Srednja vrijednost>, <Vrijednost promjenljive>, <Kumulativna Boolean-ova vrijednost> ]
+Poisson.Syntax=[ <Srednja vrijednost> ]\n[ <Srednja vrijednost>, <Kumulativna Boolean vrijednost> ]\n[ <Srednja vrijednost>, <Vrijednost promjenljive>, <Kumulativna Boolean vrijednost> ]
Polar=Polara
Polar.Syntax=[ <Ta\u010dka>, <Konika> ]
PolyLine=MnogougaonaLinija
@@ -428,7 +423,7 @@ RandomBinomial=BinomnaSlu\u010dajnaPromjenljiva
RandomBinomial.Syntax=[ <Broj poku\u0161aja>, <Vjerovatno\u0107a> ]
RandomElement=Slu\u010dajniElement
RandomElement.Syntax=[ <Lista> ]
-RandomNormal=NormalnaSlu\u010dajnaPromjenjliva
+RandomNormal=NormalnaSlu\u010dajnaPromjenljiva
RandomNormal.Syntax=[ <Srednja vrijednost>, <Standardna devijacija> ]
RandomPoisson=PoissonSlu\u010dajnaPromjenljiva
RandomPoisson.Syntax=[ <Srednja vrijednost> ]
@@ -440,11 +435,11 @@ Ray.Syntax=[ <Po\u010detna ta\u010dka>, <Ta\u010dka> ]\n[ <Po\u010detna ta\u010d
Real=RealniDio
RectangleSum=SumaPravougaonika
RectangleSum.Syntax=[ <Funkcija>, <Po\u010detna x-vrijednost>, <Krajnja x-vrijednost>, <Broj pravougaonika>, <Pozicija po\u010detnog pravougaonika> ]
-ReducedRowEchelonForm=ReducirajRedEchelonForme
+ReducedRowEchelonForm=ReducirajRedEchelonFormu
ReducedRowEchelonForm.Syntax=[ <Matrica> ]
Relation=Relacija
Relation.Syntax=[ <Figura>, <Figura> ]
-RemoveUndefined=Obri\u0161iNedefinisano
+RemoveUndefined=Obri\u0161iNedefinirano
RemoveUndefined.Syntax=[ <Lista> ]
Rename=Preimenuj
Rename.Syntax=[ <Figura>, <Ime> ]
@@ -454,7 +449,7 @@ Reverse=InverzniNiz
Reverse.Syntax=[ <Lista> ]
RightSide=DesnaStrana
RigidPolygon=FiksniMnogougao
-RigidPolygon.Syntax=[ <Slobodna Ta\u010dka>, ..., <Slobodna Ta\u010dka> ]
+RigidPolygon.Syntax=[ <Nezavisna Ta\u010dka>, ..., <Nezavisna Ta\u010dka> ]
Root=Nula
Root.Syntax=[ <Polinom> ]\n[ <Funkcija>, <Po\u010detna x-vrijednost> ]\n[ <Funkcija>, <Po\u010detna x-vrijednost>, <Krajnja x-vrijednost> ]
RootList=ListaNula
@@ -511,47 +506,48 @@ Sequence=Niz
Sequence.Syntax=[ <Krajnja vrijednost> ]\n[ <Izraz>, <Promjenljiva>, <Po\u010detna vrijednost>, <Krajnja vrijednost> ]\n[ <Izraz>, <Promjenljiva>, <Po\u010detna vrijednost>, <Krajnja vrijednost>, <Korak> ]
SetActiveView=AktivirajPrikaz
SetActiveView.Syntax=[ <Prikaz broj 1|2> ]
-SetAxesRatio=PromijeniOmjerOsa
+SetAxesRatio=PostaviOmjerOsa
SetAxesRatio.Syntax=[ <Broj>, <Broj> ]
-SetBackgroundColor=PromijeniBojuPozadine
+SetBackgroundColor=PostaviBojuPozadine
SetBackgroundColor.Syntax=[ <Figura>, "<boja>" ]\n[ <Figura>, <Crvena>, <Zelena>, <Plava> ]
-SetCaption=PromijeniNaslov
+SetCaption=PostaviNaslov
SetCaption.Syntax=[ <Figura>, <Tekst> ]
-SetColor=PromijeniBoju
+SetColor=PostaviBoju
SetColor.Syntax=[ <Figura>, "<boja>" ]\n[ <Figura>, <Crvena>, <Zelena>, <Plava> ]
-SetConditionToShowObject=PromijeniUvjetZaPrikazFigure
+SetConditionToShowObject=PostaviUvjetZaPrikazFigure
SetConditionToShowObject.Syntax=[ <Figura>, <Uvjet> ]
-SetCoords=PromijeniKoordinate
+SetCoords=PostaviKoordinate
SetCoords.Syntax=[ <Ta\u010dka>, <x>, <y> ]
-SetDynamicColor=PostaviDinami\u010dneBoje
+SetDynamicColor=PostaviDinami\u010dkeBoje
SetDynamicColor.Syntax=[ <Figura>, <Crvena>, <Zelena>, <Plava> ]\n[ <Figura>, <Crvena>, <Zelena>, <Plava>, <Neprovidnost> ]
-SetFilling=PromijeniIspunuFigure
+SetFilling=PostaviIspunuFigure
SetFilling.Syntax=[ <Figura>, <Broj> ]
SetFixed=FiksirajFiguru
SetFixed.Syntax=[ <Figura>, <da | ne> ]
-SetLabelMode=PromijeniNa\u010dinOzna\u010davanja
+SetLabelMode=PostaviNa\u010dinOzna\u010davanja
SetLabelMode.Syntax=[ <Figura>, <Broj> ]
SetLayer=PostaviSloj
SetLayer.Syntax=[ <Figura>, <Oznaka sloja> ]
-SetLineStyle=PromijeniIzgledLinije
+SetLineStyle=PostaviIzgledLinije
SetLineStyle.Syntax=[ <Linija>, <Broj> ]
-SetLineThickness=PromijeniDebljinuLinije
+SetLineThickness=PostaviDebljinuLinije
SetLineThickness.Syntax=[ <Linija>, <Broj> ]
-SetPointSize=PromijeniVeli\u010dinuTa\u010dke
+SetPointSize=PostaviVeli\u010dinuTa\u010dke
SetPointSize.Syntax=[ <Ta\u010dka>, <Broj> ]
-SetPointStyle=PromijeniIzgledTa\u010dke
+SetPointStyle=PostaviIzgledTa\u010dke
SetPointStyle.Syntax=[ <Ta\u010dka>, <Broj> ]
-SetTooltipMode=PromijeniIzgledKratkeBilje\u0161ke
+SetTooltipMode=PostaviIzgledKratkeBilje\u0161ke
SetTooltipMode.Syntax=[ <Figura>, <Broj> ]
SetValue=PostaviVrijednost
SetValue.Syntax=[ <Boolean>, <0|1> ]\n[ <Figura>, <Figura> ]\n[ <Lista>, <Broj>, <Figura> ]
-SetVisibleInView=PromijeniVidljivostFigure
+SetVisibleInView=PostaviVidljivostFigure
SetVisibleInView.Syntax=[ <Figura>, <Prikaz broj 1|2>, <Boolean> ]
+Shear=Smicanje
Shear.Syntax=[ <Figura>, <Prava>, <Omjer> ]
ShortestDistance=Najkra\u0107aUdaljenost
ShortestDistance.Syntax=[ <Lista du\u017ei>, <Po\u010detna ta\u010dka>, <Krajnja ta\u010dka>, <Boolean> ]
-ShowLabel=PrikazOznake
-ShowLabel.Syntax=[ <Figura>, <Boolean-ova vrijednost> ]
+ShowLabel=Prika\u017eiOznaku
+ShowLabel.Syntax=[ <Figura>, <Boolean vrijednost> ]
ShowLayer=Prika\u017eiSloj
ShowLayer.Syntax=[ <Broj> ]
Shuffle=Izmije\u0161aj
@@ -565,7 +561,7 @@ SigmaYY.Syntax=[ <Lista ta\u010daka> ]
Simplify=Uprosti
Simplify.Syntax=[ <Funkcija> ]\n[ <Tekst> ]
Slider=Kliza\u010d
-Slider.Syntax=[ <Min>, <Max>, <Prirast>, <Brzina>, <\u0160irina>, <je ugao>, <Horizontalno>, <Animiraj>, <Slu\u010dajno> ]
+Slider.Syntax=[ <Min>, <Max>, <Prirast>, <Brzina>, <\u0160irina>, <je ugao>, <Horizontalno>, <Animiraj>, <Slu\u010dajno generirani> ]
Slope=Nagib
Slope.Syntax=[ <Prava> ]
SlowPlot=PolahkoCrtaj
@@ -573,7 +569,7 @@ SlowPlot.Syntax=[ <Funkcija> ]
Solutions=Rje\u0161enja
Solve=Rje\u0161enje
SolveODE=Rje\u0161enjeDifJne
-SolveODE.Syntax=[ <f'(x, y)>, <Start x>, <Start y>, <Kraj x>, <Korak> ]\n[ <y'>, <x'>, <Start x>, <Start y>, <Kraj t>, <Korak> ]\n[ <b(x)>, <c(x)>, <f(x)>, <Start x>, <Start y>, <Start y'>, <Kraj x>, <Korak> ]
+SolveODE.Syntax=[ <f'(x.y)>, <Start x>, <Start y>, <Kraj x>, <Korak> ]\n[ <y'>, <x'>, <Start x>, <Start y>, <Kraj t>, <Korak> ]\n[ <b(x)>, <c(x)>, <f(x)>, <Start x>, <Start y>, <Start y'>, <Kraj x>, <Korak> ]
Sort=Sortiraj
Sort.Syntax=[ <Lista> ]
Spearman.Syntax=[ <Lista ta\u010daka> ]\n[ <Lista numeri\u010dkih vrijednosti>, <Lista numeri\u010dkih vrijednosti> ]
@@ -589,7 +585,7 @@ Sum.Syntax=[ <Lista> ]\n[ <Lista>, <Broj elemenata> ]
SumSquaredErrors=SumaKvadrataGre\u0161ke
SumSquaredErrors.Syntax=[ <Lista ta\u010daka>, <Funkcija> ]
TDistribution=TDist
-TDistribution.Syntax=[ <Stepen slobode>, x ]\n[ <Stepen slobode>, <vrijednost promjenljive> ]\n[ <Stepen slobode>, x, <Kumulativna Boolean-ova vrijednost> ]
+TDistribution.Syntax=[ <Stepen slobode>, x ]\n[ <Stepen slobode>, <Vrijednost promjenljive> ]\n[ <Stepen slobode>, x, <Kumulativna Boolean vrijednost> ]
TMean2Estimate=TSrednja2Procjena
TMean2Estimate.Syntax=[ <Lista podataka 1>, <Lista podataka 2>, <Kriti\u010dna vrijednost>, <Boolean> ]\n[ <Lista podataka 1>, <Standardna devijacija 1>, <Veli\u010dina uzorka1>, <Srednja vrijednost 2>, <Standardna devijacija 2>, <Veli\u010dina uzorka 2>, <Srednje o\u010dekivanje>, <Kriti\u010dna vrijednost>, <Boolean> ]
TMeanEstimate=TSrednjaProcjena
@@ -601,21 +597,23 @@ TTestPaired.Syntax=[ <Lista podataka 1>, <Lista podataka 2>, <Kriti\u010dna vrij
TableText=TabelaTekst
TableText.Syntax=[ <Lista>, <Lista>, ... ]\n[ <Lista>, <Lista>, ..., <Poravnanje teksta> ]
Take=PodLista
-Take.Syntax=[ <Lista>, <od>, <do> ]\n[ <tekst>, <od>, <do> ]
+Take.Syntax=[ <Lista>, <od>, <do> ]\n[ <Tekst>, <od>, <do> ]
Tangent=Tangenta
Tangent.Syntax=[ <Ta\u010dka>, <Konika> ]\n[ <Ta\u010dka>, <Funkcija> ]\n[ <Ta\u010dka na krivoj>, <Kriva> ]\n[ <x -vrijednost>, <Funkcija> ]\n[ <Prava>, <Konika> ]\n[ <Kru\u017enica>, <Kru\u017enica> ]
TaylorSeries=TaylorPolinom
TaylorSeries.Syntax=[ <Funkcija>, <x-vrijednost>, <Redni broj> ]
Text=Tekst
-Text.Syntax=[ <Figura> ]\n[ <Figura>, <Boolean za supstituciju promjenljive> ]\n[ <Figura>, <Ta\u010dka> ]\n[ <Figura>, <Ta\u010dka>, <Boolean za supstituciju promjenljive> ]\n[ <Figura>, <Ta\u010dka>, <Boolean za supstituciju promjenljive>, <Boolean za LaTeX formulu> ]
-TextToUnicode=TekstUUnicod
+Text.Syntax=[ <Figura> ]\n[ <Figura>, <Boolean vrijednost za supstituciju promjenljive> ]\n[ <Figura>, <Ta\u010dka> ]\n[ <Figura>, <Ta\u010dka>, <Boolean vrijednost za supstituciju promjenljive> ]\n[ <Figura>, <Ta\u010dka>, <Boolean vrijednost za supstituciju promjenljive>, <Boolean vrijednost za LaTeX formulu> ]
+TextToUnicode=UUnicod
TextToUnicode.Syntax=[ "<Tekst>" ]
Textfield=TekstPolje
Textfield.Syntax=[ ]\n[ <Vezano za figuru> ]
-TiedRank=TiedRangLista
+TiedRank=VezanaRangLista
TiedRank.Syntax=[ <Lista> ]
-ToExponential=EksponencijalnaForma
-ToPolar=PolarneKoordinate
+ToComplex=UAlgebarskiOblik
+ToExponential=UEksponencijalniOblik
+ToPoint=UUre\u0111enPar
+ToPolar=UPolarneKoordinate
ToolImage=SlikaAlata
ToolImage.Syntax=[ <Broj> ]
Translate=Translacija
@@ -627,15 +625,18 @@ TrapezoidalSum.Syntax=[ <Funkcija>, <Po\u010detna x-vrijednost>, <Krajnja x-vrij
TravelingSalesman=TSP
TravelingSalesman.Syntax=[ <Lista ta\u010daka> ]
Triangular=Triangulacija
-Triangular.Syntax=[ <Donja suma>, <Gornja suma>, <Najfrekventnija vrijednost>, x ]\n[ <Donja suma>, <Gornja suma>, <Najfrekventnija vrijednost>, x, <Kumulativna Boolean-ova vrijednost> ]\n[ <Donja suma>, <Gornja suma>, <Najfrekventnija vrijednost>, x, <Vrijednost promjenljive> ]
+Triangular.Syntax=[ <Donja suma>, <Gornja suma>, <Najfrekventnija vrijednost>, x ]\n[ <Donja suma>, <Gornja suma>, <Najfrekventnija vrijednost>, <Vrijednost promjenljive> ]\n[ <Donja suma>, <Gornja suma>, <Najfrekventnija vrijednost>, x, <Kumulativna Boolean vrijednost> ]
+TrigCombine=TrigKomb
+TrigExpand=TrigPro\u0161iri
+TrigSimplify=TrigPojednostavi
TurningPoint=Ta\u010dkaPrevoja
TurningPoint.Syntax=[ <Polinom> ]
-UnicodeToLetter=UnicodUSlovo
+UnicodeToLetter=UniKodUSlovo
UnicodeToLetter.Syntax=[ <Broj> ]
-UnicodeToText=UnicodUTekst
+UnicodeToText=UniKodUTekst
UnicodeToText.Syntax=[ <Lista numeri\u010dkih vrijednosti> ]
Uniform=RavnomjernaDist
-Uniform.Syntax=[ <Donja suma>, <Gornja suma>, x ]\n[ <Donja suma>, <Gornja suma>, <Vrijednost promjenljive> ]\n[ <Donja suma>, <Gornja suma>, x, <Kumulativna Boolean-ova vrijednost> ]
+Uniform.Syntax=[ <Donja suma>, <Gornja suma>, x ]\n[ <Donja suma>, <Gornja suma>, <Vrijednost promjenljive> ]\n[ <Donja suma>, <Gornja suma>, x, <Kumulativna Boolean vrijednost> ]
Union=Unija
Union.Syntax=[ <Lista>, <Lista> ]\n[ <Mnogougao>, <Mnogougao> ]
Unique=Jedinstven
@@ -644,9 +645,9 @@ UnitOrthogonalVector=Jedini\u010dniNormalniVektor
UnitOrthogonalVector.Syntax=[ <Prava> ]\n[ <Du\u017e> ]\n[ <Vektor> ]
UnitVector=Jedini\u010dniVektor
UnitVector.Syntax=[ <Vektor> ]\n[ <Prava> ]\n[ <Du\u017e> ]
-UpdateConstruction=NadogradnjaKonstrukcije
+UpdateConstruction=NadogradiKonstrukciju
UpperSum=GornjaSuma
-UpperSum.Syntax=[ <Funkcija>, Po\u010detna x-vrijednost>, <Krajnja x-vrijednost>, <Broj pravougaonika> ]
+UpperSum.Syntax=[ <Funkcija>, <Po\u010detna x-vrijednost>, <Krajnja x-vrijednost>, <Broj pravougaonika> ]
Variance=Varijanca
Variance.Syntax=[ <Lista numeri\u010dkih vrijednosti> ]
Vector=Vektor
@@ -658,10 +659,10 @@ VerticalText.Syntax=[ <Tekst> ]
Voronoi=VoronoiDijagram
Voronoi.Syntax=[ <Lista ta\u010daka> ]
Weibull=WeibullDist
-Weibull.Syntax=[ <Oblik>, <Skala>, x ]\n[ <Oblik>, <Skala>, <Vrijednost promjenljive> ]\n[ <Oblik>, <Skala>, x, <Kumulativna Boolean-ova vrijednost> ]
+Weibull.Syntax=[ <Oblik>, <Skala>, x ]\n[ <Oblik>, <Skala>, <Vrijednost promjenljive> ]\n[ <Oblik>, <Skala>, x, <Kumulativna Boolean vrijednost> ]
Zip.Syntax=[ <Izraz>, <Promjenljiva1>, <Lista1>, <Promjenljiva2>, <Lista2>, ... ]
Zipf=ZipfDist
-Zipf.Syntax=[ <Broj elemenata>, <Eksponent> ]\n[ <Broj elemenata>, <Eksponent>, <Kumulativna Boolean-ova vrijednost> ]\n[ <<Broj elemenata>, <Eksponent>, <Vrijednost promjenljive>, <Kumulativna Boolean-ova vrijednost> ]
+Zipf.Syntax=[ <Broj elemenata>, <Eksponent> ]\n[ <Broj elemenata>, <Eksponent>, <Kumulativna Boolean vrijednost> ]\n[ <<Broj elemenata>, <Eksponent>, <Vrijednost promjenljive>, <Kumulativna Boolean vrijednost> ]
ZoomIn=Uve\u0107anje
ZoomIn.Syntax=[ <Koeficijent uve\u0107anja> ]\n[ <Koeficijent uve\u0107anja>, <Ta\u010dka-centar> ]\n[ <Min x>, <Min y>, <Max x>, <Max y> ]
ZoomOut=Umanjenje
diff --git a/geogebra/properties/command_ca.properties b/geogebra/properties/command_ca.properties
index 784a249..4fe243b 100644
--- a/geogebra/properties/command_ca.properties
+++ b/geogebra/properties/command_ca.properties
@@ -1,16 +1,16 @@
ANOVA.Syntax=[ <Llista>, <Llista>, ... ]
AffineRatio=RaóSimple
AffineRatio.Syntax=[ <Punt>, <Punt>, <Punt> ]
-Angle.Syntax=[ <Nombre> ]\n[ <Vector> ]\n[ <Punt> ]\n[ <Cònica> ]\n[ <Polígon> ]\n[ <Vector>, <Vector> ]\n[ <Recta>, <Recta> ]\n[ <Punt>, <Punt>, <Punt> ]\n[ <Punt>, <Punt>, <Angle> ]
+Angle.Syntax=[ <Objecte> ]\n[ <Vector>, <Vector> ]\n[ <Recta>, <Recta> ]\n[ <Punt>, <Vèrtex>, <Punt> ]\n[ <Punt>, <Vèrtex>, <Angle> ]
AngularBisector=Bisectriu
AngularBisector.Syntax=[ <Recta>, <Recta> ]\n[ <Punt>, <Punt>, <Punt> ]
Append=Afegeix
Append.Syntax=[ <Llista>, <Objecte> ]\n[ <Objecte>, <Llista> ]
ApplyMatrix=AplicaMatriu
ApplyMatrix.Syntax=[ <Matriu>, <Objecte> ]
-Arc.Syntax=[ <Cònica>, <Punt>, <Punt> ]\n[ <Cònica>, <Nombre>, <Nombre> ]
+Arc.Syntax=[ <Circumferència>, <Punt>, <Punt> ]\n[ <El·lipse>, <Punt>, <Punt> ]\n[ <Circumferència>, <Valor del paràmetre>, <Valor del paràmetre> ]\n[ <El·lipse>, <Valor del paràmetre>, <Valor del paràmetre> ]
Area=Àrea
-Area.Syntax=[ <Punt>, ..., <Punt> ]
+Area.Syntax=[ <Cònica> ]\n[ <Polígon> ]\n[ <Punt>, ..., <Punt> ]
Asymptote=Asímptota
Asymptote.Syntax=[ <Cònica> ]\n[ <Funció> ]\n[ <Corba implícita> ]
Axes=Eixos
@@ -19,18 +19,19 @@ AxisStepX=PasEixX
AxisStepY=PasEixY
BarChart=DiagramaDeBarres
BarChart.Syntax=[ <Llista de Dades>, <Llista de Freqüències> ]\n[ <Llista de Totes les Dades>, <Amplada de les Classes> ]\n[ <Llista de Dades>, <Llista de Freqüències>, <Amplada de les Barres> ]\n[ <Valor Inicial>, <Valor Final>, <Llista de les Altures> ]\n[ <Valor Inicial>, <Valor Final>, <Expressió>, <Variable>, <Des del Nombre>, <Fins al Nombre> ]\n[ <Valor Inicial>, <Valor Final>, <Expressió>, <Variable>, <Des del Nombre>, <Fins al Nombre>, <Amplada del Pas> ]
-Bernoulli.Syntax=[ <Probabilitat>, <Booleà acumulatà> ]
+Bernoulli.Syntax=[ <Probabilitat>, <Acumulada true/false> ]
Binomial=CoeficientBinomial
Binomial.Syntax=[ <Nombre>, <Nombre> ]
-BinomialDist.Syntax=[ <Nombre de repeticions>, <Probabilitat d'èxit> ]\n[ <Nombre de repeticions>, <Probabilitat d'èxit>, <Booleà acumulat> ]\n[ <Nombre de repeticions>, <Probabilitat d'èxit>, <Valor de la variable>, <Booleà acumulat> ]
+BinomialDist=Binomial
+BinomialDist.Syntax=[ <Nombre de repeticions>, <Probabilitat d'èxit> ]\n[ <Nombre de repeticions>, <Probabilitat d'èxit>, <Acumulada true/false> ]\n[ <Nombre de repeticions>, <Probabilitat d'èxit>, <Valor de la variable>, <Acumulada true/false> ]
BoxPlot=DiagramaDeCaixa
-BoxPlot.Syntax=[ <Posició Vertical>, <Alçada Caixa>, <Llista de Totes les Dades> ]\n[ <Posició Vertical>, <AlçadaCaixa>, <Mínim>, <Q1>, <Mediana>, <Q3>, <Màxim> ]
+BoxPlot.Syntax=[ <Posició vertical>, <Meitat de l'altura de la caixa>, <Llista de totes les dades> ]\n[ <Posició vertical>, <Meitat de l'altura de la caixa>, <Mínim>, <Q1>, <Mediana>, <Q3>, <Màxim> ]
Button=Botó
Button.Syntax=[ ]\n[ <Títol> ]
CFactor=FactoritzaC
CSolutions=SolucionsC
CSolve=ResolC
-Cauchy.Syntax=[ <Mediana>, <Escala>, x ]\n[ <Mediana>, <Escala>, <Valor de la variable> ]\n[ <Mediana>, <Escala>, x, <Booleà acumulat> ]
+Cauchy.Syntax=[ <Mediana>, <Escala>, x ]\n[ <Mediana>, <Escala>, <Valor de la variable> ]\n[ <Mediana>, <Escala>, x, <Acumulada true/false> ]
Cell=Cel·la
Cell.Syntax=[ <Columna>, <Fila> ]
CellRange=RangCel·les
@@ -42,13 +43,13 @@ Centroid.Syntax=[ <Pol
Checkbox=CasellaDeControl
Checkbox.Syntax=[ ]\n[ <Títol> ]\n[ <Llista> ]\n[ <Títol>, <Llista> ]
ChiSquared=KhiQuadrat
-ChiSquared.Syntax=[ <Graus de llibertat>, x ]\n[ <Graus de llibertat>, <Valor de la variable> ]\n[ <Graus de llibertat>, x, <Booleà acumulat> ]
+ChiSquared.Syntax=[ <Graus de llibertat>, x ]\n[ <Graus de llibertat>, <Valor de la variable> ]\n[ <Graus de llibertat>, x, <Acumulada true/false> ]
Circle=Circumferència
Circle.Syntax=[ <Punt>, <Nombre> ]\n[ <Punt>, <Segment> ]\n[ <Punt>, <Punt> ]\n[ <Punt>, <Punt>, <Punt> ]
CircleArc=ArcDeCircumferència
-CircleArc.Syntax=[ <Punt>, <Punt>, <Punt> ]
+CircleArc.Syntax=[ <Centre>, <Punt>, <Punt> ]
CircleSector=SectorCircular
-CircleSector.Syntax=[ <Punt>, <Punt>, <Punt> ]
+CircleSector.Syntax=[ <Centre>, <Punt>, <Punt> ]
CircumcircleArc=ArcCircumcircular
CircumcircleArc.Syntax=[ <Punt>, <Punt>, <Punt> ]
CircumcircleSector=SectorCircumcircular
@@ -68,7 +69,7 @@ Command=Comandament
CommonDenominator=DenominadorComú
CompleteSquare=CompletaQuadrat
CompleteSquare.Syntax=[ <Funció quadràtica> ]
-ComplexRoot=ArrelComplexa
+ComplexRoot=ArrelsComplexes
ComplexRoot.Syntax=[ <Polinomi> ]
Conic=Cònica
Conic.Syntax=[ <Punt>, <Punt>, <Punt>, <Punt>, <Punt> ]\n[ <Nombre>, <Nombre>, <Nombre>, <Nombre>, <Nombre>, <Nombre> ]
@@ -79,7 +80,7 @@ ConvexHull.Syntax=[ <Llista de punts> ]
CopyFreeObject=CopiaObjecteLliure
CopyFreeObject.Syntax=[ <Objecte> ]
Corner=Cantonada
-Corner.Syntax=[ <Imatge>, <Nombre> ]
+Corner.Syntax=[ <Nombre de la cantonada> ]\n[ <Imatge>, <Nombre de la cantonada> ]\n[ <Text>, <Nombre de la cantonada> ]\n[ <Finestra gràfica 1/2>, <Nombre de la cantonada> ]
CountIf=ComptaSi
CountIf.Syntax=[ <Condició>, <Llista> ]
Covariance=Covariància
@@ -104,12 +105,12 @@ Delete.Syntax=[ <Objecte> ]
Denominator=Denominador
Denominator.Syntax=[ <Funció> ]
Derivative=Derivada
-Derivative.Syntax=[ <Funció> ]\n[ <Funció>, <Nombre> ]
+Derivative.Syntax=[ <Funció> ]\n[ <Corba> ]\n[ <Funció>, <Nombre> ]\n[ <Funció>, <Variable> ]\n[ <Corba>, <Nombre> ]\n[ <Funció>, <Variable>, <Nombre> ]
Determinant.Syntax=[ <Matriu> ]
-Diameter=Diàmetre
+Diameter=DiàmetreConjugat
Diameter.Syntax=[ <Vector>, <Cònica> ]\n[ <Recta>, <Cònica> ]
Dilate=Homotecia
-Dilate.Syntax=[ <Objecte>, <Raó>, <Punt> ]
+Dilate.Syntax=[ <Objecte>, <Raó> ]\n[ <Objecte>, <Raó>, <Centre d'homotècia> ]
Dimension=Dimensió
Direction=Direcció
Direction.Syntax=[ <Recta> ]
@@ -121,6 +122,8 @@ Div=Quocient
Div.Syntax=[ <Dividend>, <Divisor> ]\n[ <Polinomi dividend>, <Polinomi divisor> ]
Division=Divisió
Divisors=NombreDeDivisors
+DivisorsList=Divisors
+DivisorsSum=SumaDivisors
Dot=PuntGràfic
DotPlot=GràficDePunts
DotPlot.Syntax=[ <Llista de totes les dades> ]
@@ -130,20 +133,20 @@ Eccentricity=Excentricitat
Eccentricity.Syntax=[ <Cònica> ]
Element.Syntax=[ <Llista>, <Posició de l\u2019element> ]\n[ <Matriu>, <Fila>, <Columna> ]\n[ <Llista>, <Índex1>, <Índex2>, ... ]
Ellipse=El·lipse
-Ellipse.Syntax=[ <Punt>, <Punt>, <Nombre> ]\n[ <Punt>, <Punt>, <Segment> ]
-Erlang.Syntax=[ <Forma>, <Raó>, x ]\n[ <Forma>, <Raó>, <Valor variable> ] ]\n[ <Forma>, <Raó>, x, <Booleà acumulat> ]
+Ellipse.Syntax=[ <Focus>, <Focus>, <Longitud semieix major> ]\n[ <Focus>, <Focus>, <Segment> ]\n[ <Focus>, <Focus>, <Punt de la corba> ]
+Erlang.Syntax=[ <Forma>, <Raó>, x ]\n[ <Forma>, <Raó>, <Valor de la variable> ]\n[ <Forma>, <Raó>, x, <Acumulada true/false> ]
Excentricity=SemidistànciaFocal
Excentricity.Syntax=[ <Cònica> ]
Execute=Executa
-Execute.Syntax=[ <Llista en format de text> ]\n[ <Llista en format de text>, <Paràmetre>, <Paràmetre>, ... ]
+Execute.Syntax=[ <Llista de cadenes de text> ]\n[ <Llista de cadenes de text>, <Paràmetre>, <Paràmetre>, ... ]
Expand=Opera
-Expand.Syntax=[ <Funció> ]
+Expand.Syntax=[ <Expressió> ]
Exponential=Exponencial
-Exponential.Syntax=[ <Lambda>, x ]\n[ <Lambda>, <Valor variable> ]\n[ <Lambda>, x, <Booleà acumulat> ]
-Extremum=Extrem
-Extremum.Syntax=[ <Polinomi> ]
+Exponential.Syntax=[ <Lambda>, x ]\n[ <Lambda>, <Valor variable> ]\n[ <Lambda>, x, <Acumulada true/false> ]
+Extremum=Extrems
+Extremum.Syntax=[ <Polinomi> ]\n[ <Funció>, <valor inicial de x>, <valor final de x> ]
FDistribution=DistribucióF
-FDistribution.Syntax=[ <Graus de llibertat del numerador>, <Graus de llibertat del denominador>, x ]\n[ <Graus de llibertat del numerador>, <Graus de llibertat del denominador>, <Valor variable> ]\n[ <Graus de llibertat del numerador>, <Graus de llibertat del denominador>, x, <Booleà acumulat> ]
+FDistribution.Syntax=[ <Graus de llibertat del numerador>, <Graus de llibertat del denominador>, x ]\n[ <Graus de llibertat del numerador>, <Graus de llibertat del denominador>, <Valor de la variable> ]\n[ <Graus de llibertat del numerador>, <Graus de llibertat del denominador>, x, <Acumulada true/false> ]
Factor=Factoritza
Factor.Syntax=[ <Polinomi> ]
Factors.Syntax=[ <Polinomi> ]\n[ <Nombre> ]
@@ -154,16 +157,16 @@ FillColumn.Syntax=[ <Columna>, <Llista> ]
FillRow=OmpleFila
FillRow.Syntax=[ <Fila>, <Llista> ]
First=Primer
-First.Syntax=[ <Llista> ]\n[ <Text> ]\n[ <Llista>, <Nombre d\u2019elements> ]\n[ <Text>, <Nombre d\u2019elements> ]\n[ <Locus>, <Nombre d\u2019elements> ]
+First.Syntax=[ <Llista> ]\n[ <Text> ]\n[ <Llista>, <Nombre d\u2019elements> ]\n[ <Text>, <Nombre d\u2019elements> ]\n[ <Lloc geomètric>, <Nombre de punts que volem considerar> ]
FirstAxis=PrimerEix
FirstAxis.Syntax=[ <Cònica> ]
-FirstAxisLength=LongitudPrimerEix
+FirstAxisLength=LongitudPrimerSemiEix
FirstAxisLength.Syntax=[ <Cònica> ]
Fit=Ajusta
Fit.Syntax=[ <Llista de punts>, <Llista de funcions> ]\n[ <Llista de punts>, <Funció> ]
FitExp=RegExponencial
FitExp.Syntax=[ <Llista de Punts> ]
-FitGrowth=RegMultiplicativa
+FitGrowth=RegExpBaseb
FitGrowth.Syntax=[ <Llista de punts> ]
FitLineX=RegLinealX
FitLineX.Syntax=[ <Llista de Punts> ]
@@ -183,17 +186,17 @@ Focus.Syntax=[ <C
FractionText=FraccióText
FractionText.Syntax=[ <Nombre> ]
FractionalPart=PartFraccionària
-Frequency=Freqüència
-Frequency.Syntax=[ <Llista de totes les dades> ]\n[ <Booleà acumulat>, <Llista de totes les dades> ]\n[ <Llista dels límits de classe>, <Llista de totes les dades> ]\n[ <Booleà acumulat>, <Llista dels límits de classe>, <Llista de totes les dades> ]\n[ <Llista dels límits de classe>, <Llista de totes les dades>, <Densitat>, <Factor d\u2019escala de densitat> (opcional) ]\n[ <Booleà acumulat>, <Llista dels límits de classe>, <Llista de totes les dades>, <Densitat>, <Factor d\u2019escala de densitat> (opcional) ]
+Frequency=Freqüències
+Frequency.Syntax=[ <Llista de totes les dades> ]\n[ <Acumulades true/false>, <Llista de totes les dades> ]\n[ <Llista dels límits de les classes>, <Llista de totes les dades> ]\n[ <Acumulades true/false>, <Llista dels límits de les classes>, <Llista de totes les dades> ]\n[ <Llista dels límits de les classes>, <Llista de totes les dades>, <Densitat true/false>, <Factor d\u2019escala de densitat (opcional)> ]\n[ <Acumulades true/false>, <Llista dels límits de les classes>, <Llista de totes les dades>, <Densitat true/false>, <Factor d\u2019escala de densitat(opcional)> ]
FrequencyPolygon=PolígonDeFreqüències
-FrequencyPolygon.Syntax=[ <Llista dels límits de classe>, <Llista d\u2019altures> ]\n[ <Llista dels límits de classe>, <Llista de totes les dades>, <Densitat>, <Factor densitat> (opcional) ]\n[ <Booleà acumulat>, <Llista dels límits de classe>, <Llista de totes les dades>, <Densitat>, <Factor d\u2019escala de densitat> (opcional) ]
+FrequencyPolygon.Syntax=[ <Llista dels límits de les classes>, <Llista d\u2019altures> ]\n[ <Llista dels límits de les classes>, <Llista de totes les dades>, <Densitat true/false>, <Factor densitat (opcional)> ]\n[ <Acumulades true/false>, <Llista dels límits de les classes>, <Llista de totes les dades>, <Densitat true/false>, <Factor d\u2019escala de densitat (opcional)> ]
FrequencyTable=TaulaDeFreqüències
-FrequencyTable.Syntax=[ <Llista dels límits de classe>, <Llista d\u2019altures> ]\n[ <Llista dels límits de classe>, <Llista de totes les dades>, <Densitat>, <Factor d\u2019escala de densitat> (opcional) ]\n[ <Booleà acumulat>, <Llista dels límits de classe>, <Llista de totes les dades>, <Densitat>, <Factor d\u2019escala de densitat> (opcional) ]
+FrequencyTable.Syntax=[ <Llista de totes les dades> ]\n[ <Acumulades true/false>, <Llista de totes les dades> ]\n[ <Llista dels límits de les classes>, <Llista de totes les dades> ]\n[ <Acumulades true/false>, <Llista dels límits de les classes>, <Llista de totes les dades> ]\n[ <Llista dels límits de les classes>, <Llista de totes les dades>, <Densitat true/false>, <Factor d\u2019escala de densitat (opcional)> ]\n[ <Acumulades true/false>, <Llista dels límits de les classes>, <Llista de totes les dades>, <Densitat true/false>, <Factor d\u2019escala de densitat (opcional)> ]
Function=Funció
Function.Syntax=[ <Funció>, <Nombre>, <Nombre> ]
GCD=MCD
GCD.Syntax=[ <Llista de nombres> ]\n[ <Nombre>, <Nombre> ]
-Gamma.Syntax=[ <Alpha>, <Beta>, x ]\n[ <Alpha>, <Beta>, <Valor variable> ]\n[ <Alpha>, <Beta>, x, <Booleà acumulat> ]
+Gamma.Syntax=[ <Alpha>, <Beta>, x ]\n[ <Alpha>, <Beta>, <Valor variable> ]\n[ <Alpha>, <Beta>, x, <Acumulada true/false> ]
GeometricMean=MitjanaGeomètrica
GeometricMean.Syntax=[ <Llista de nombres> ]
GetTime=HoraData
@@ -202,17 +205,17 @@ HarmonicMean.Syntax=[ <Llista de nombres> ]
HideLayer=AmagaCapa
HideLayer.Syntax=[ <Nombre> ]
Histogram=Histograma
-Histogram.Syntax=[ <Llista dels límits de classe>, <Llista d'altures> ]\n[ <Llista dels límits de classe>, <Llista de totes les dades> ]
+Histogram.Syntax=[ <Llista dels límits de les classes>, <Llista d'altures> ]\n[ <Llista dels límits de les classes>, <Llista de totes les dades>, <Densitat true/false>, <Factor d'escala de densitat (opcional)> ]\n[ <Acumulatiu true/false>, <Llista dels límits de les classes>, <Llista de totes les dades>, <Densitat true/false>, <Factor d'escala de densitat (opcional)> ]
HistogramRight=HistogramaDreta
-HistogramRight.Syntax=[ <Llista dels límits de classe>, <Llista d\u2019altures> ]\n[ <Llista dels límits de classe>, <Llista de totes les dades>, <Densitat>, <Factor d\u2019escala de densitat> (opcional) ]\n[ <Booleà acumulat>, <Llista dels límits de classe>, <Llista de totes les dades>, <Densitat>, <Factor d\u2019escala de densitat> (opcional) ]
+HistogramRight.Syntax=[ <Llista dels límits de les classes>, <Llista d'altures> ]\n[ <Llista dels límits de les classes>, <Llista de totes les dades>, <Densitat true/false>, <Factor d'escala de densitat (opcional)> ]\n[ <Acumulatiu true/false>, <Llista dels límits de les classes>, <Llista de totes les dades>, <Densitat true/false>, <Factor d'escala de densitat (opcional)> ]
Hull=Embolcall
-Hull.Syntax=[ <Llista de punts>, <Percentatges> ]
+Hull.Syntax=[ <Llista de punts>, <Percentatge> ]
HyperGeometric=HiperGeomètrica
-HyperGeometric.Syntax=[ <Mida de la població>, <Nombre de repeticions>, <Mida de la mostra> ]\n[ <Mida de la població>, <Nombre de repeticions>, <Mida de la mostra>, <Booleà acumulat> ]\n[ <Mida de la població>, <Nombre de repeticions>, <Mida de la mostra>, <Valor variable>, <Booleà acumulat> ]
+HyperGeometric.Syntax=[ <Mida de la població>, <Casos favorables>, <Mida de la mostra> ]\n[ <Mida de la població>, <Casos favorables>, <Mida de la mostra>, <Acumulada true/false> ]\n[ <Mida de la població>, <Casos favorables>, <Mida de la mostra>, <Valor variable>, <Acumulada true/false> ]
Hyperbola=Hipèrbola
-Hyperbola.Syntax=[ <Punt>, <Punt>, <Nombre> ]\n[ <Punt>, <Punt>, <Segment> ]
-Identity=Identitat
-Identity.Syntax=[ <Nombre> ]
+Hyperbola.Syntax=[ <Focus>, <Focus>, <Longitud Semieix Principal> ]\n[ <Focus>, <Focus>, <Segment> ]\n[ <Focus>, <Focus>, <Punt de la corba> ]
+Identity=MatriuIdentitat
+Identity.Syntax=[ <Ordre de la matriu> ]
If=Si
If.Syntax=[ <Condició>, <Aleshores> ]\n[ <Condició>, <Aleshores>, <Altrament> ]
Imaginary=PartImaginària
@@ -226,17 +229,15 @@ IndexOf.Syntax=[ <Objecte>, <Llista> ]\n[ <Text>, <Text> ]\n[ <Objecte>, <Llista
Insert=Insereix
Insert.Syntax=[ <Llista>, <Llista>, <Posició> ]\n[ <Objecte>, <Llista>, <Posició> ]
IntegerPart=PartEntera
-Integral.Syntax=[ <Funció> ]\n[ <Funció>, <Valor x inicial>, <Valor x final> ]\n[ <Funció>, <Valor x inicial>, <Valor x final>, <Avaluació booleana> ]
+Integral.Syntax=[ <Funció> ]\n[ <Funció>, <Valor x inicial>, <Valor x final> ]\n[ <Funció>, <Valor x inicial>, <Valor x final>, <Avaluació true/false> ]
IntegralBetween=IntegralEntre
-IntegralBetween.Syntax=[ <Funció>, <Funció>, <Valor x inicial>, <Valor x final> ]\n[ <Funció>, <Funció>, <Valor x inicial>, <Valor x final>, <Avaluació Booleana> ]
+IntegralBetween.Syntax=[ <Funció>, <Funció>, <Valor x inicial>, <Valor x final> ]\n[ <Funció>, <Funció>, <Valor x inicial>, <Valor x final>, <Avaluació true/false> ]
Intersect=Interseca
-Intersect.Syntax=[ <Objecte>, <Objecte> ]\n[ <Objecte>, <Objecte>, <Nombre> ]\n[ <Objecte>, <Objecte>, <Punt> ]
+Intersect.Syntax=[ <Objecte>, <Objecte> ]\n[ <Objecte>, <Objecte>, <Índex del punt d'intersecció> ]\n[ <Objecte>, <Objecte>, <Punt inicial> ]\n[ <Funció>, <Funció>, <Valor inicial de x>, <Valor final de x> ]
IntersectRegion=IntersecaRegions
IntersectRegion.Syntax=[ <Polígon>, <Polígon> ]
Intersection=Intersecció
Intersection.Syntax=[ <Llista>, <Llista> ]
-IntersectionPaths=InterseccióDeRecorreguts
-IntersectionPaths.Syntax=\n[ <Recta>, <Polígon> ]\n[ <Recta>, <Cònica> ]
InverseBinomial=BinomialInversa
InverseBinomial.Syntax=[ <Nombre de repeticions>, <Probabilitat d'èxit>, <Probabilitat> ]
InverseCauchy=CauchyInversa
@@ -250,17 +251,17 @@ InverseFDistribution.Syntax=[ <Graus de llibertat del numerador>, <Graus de llib
InverseGamma=GammaInversa
InverseGamma.Syntax=[ <Alpha>, <Beta>, <Probabilitat> ]
InverseHyperGeometric=HipergeomètricaInversa
-InverseHyperGeometric.Syntax=[ <Grandària de la població>, <Nombre de repeticions>, <Grandària de la mostra><Probbilitat> ]
-InverseNormal=InversaNormal
+InverseHyperGeometric.Syntax=[ <Mida de la població>, <Casos favorables>, <Grandària de la mostra>, <Probabilitat> ]
+InverseNormal=NormalInversa
InverseNormal.Syntax=[ <Mitjana>, <Desviació Estàndard>, <Probabilitat> ]
InversePascal=PascalInversa
-InversePascal.Syntax=[ <Nombre de repeticions>, <Probabilitat d\u2019exit><Probabilitat> ]
+InversePascal.Syntax=[ <Nombre d'èxits>, <Probabilitat d\u2019èxit>, <Probabilitat> ]
InversePoisson=PoissonInversa
InversePoisson.Syntax=[ <Mitjana>, <Probabilitat> ]
InverseTDistribution=DistribucióTInversa
InverseTDistribution.Syntax=[ <Graus de llibertat>, <Probabilitat> ]
InverseWeibull=WeibullInversa
-InverseWeibull.Syntax=[ <Forma>, <Escala><Probabilitat> ]
+InverseWeibull.Syntax=[ <Forma>, <Escala>, <Probabilitat> ]
InverseZipf=ZipfInversa
InverseZipf.Syntax=[ <Nombre d\u2019elements>, <Exponent>, <Probabilitat> ]
Invert=MatriuInversa
@@ -271,49 +272,49 @@ IsInteger=
IsInteger.Syntax=[ <Nombre> ]
IsPrime=ÉsPrimer
Iteration=Iteració
-Iteration.Syntax=[ <Funció>, <Valor inicial>, <Nombre n> ]
+Iteration.Syntax=[ <Funció>, <Valor inicial>, <Nombre d'iteracions> ]
IterationList=LlistaIteracions
-IterationList.Syntax=[ <Funció>, <Valor inicial>, <Nombre n> ]
+IterationList.Syntax=[ <Funció>, <Valor inicial>, <Nombre d'iteracions> ]
Join=Concatena
-Join.Syntax=[ <Llista de Llistes>\n[ <Llista>, <Llista>, ... ]
+Join.Syntax=[ <Llista de Llistes> ]\n[ <Llista>, <Llista>, ... ]
KeepIf=TriaSi
KeepIf.Syntax=[ <Condició>, <Llista> ]
LCM=MCM
LCM.Syntax=[ <Llista de nombres> ]\n[ <Nombre>, <Nombre> ]
LaTeX=FórmulaText
-LaTeX.Syntax=[ <Objecte> ]\\nFórmulaText[ <Objecte>, <Booleana per Substitució de Variables> ]
+LaTeX.Syntax=[ <Objecte> ]\n[ <Objecte>, <Substitució de variables true/false> ]\n[ <Objecte>, <Substitució de variables true/false>, <Mostra nom true/false> ]
Last=Últim
-Last.Syntax=[ <Llista>, <Nombre d'Elements> ]
+Last.Syntax=[ <Llista> ]\n[ <Text> ]\n[ <Llista>, <Nombre d'elements> ]\n[ <Text>, <Nombre d'elements> ]
LeftSide=MembreEsquerre
LeftSum=SumaEsquerra
LeftSum.Syntax=[ <Funció>, <Valor x inicial>, <Valor x final>, <Nombre de rectangles> ]
Length=Longitud
-Length.Syntax=[ <Vector> ]\n[ <Punt> ]
+Length.Syntax=[ <Segment> ]\n[ <Vector> ]\n[ <Punt> ]\n[ <Llista> ]\n[ <Text> ]\n[ <Lloc geomètric> ]\n[ <Funció>, <Valor inicial>, <Valor final> ]\n[ <Funció>, <Punt inicial>, <Punt final> ]\n[ <Corba>, <Valor inicial>, <Valor final> ]\n[ <Corba>, <Punt inicial>, <Punt final> ]
LetterToUnicode=LletraEnUnicode
LetterToUnicode.Syntax=[ <Text> ]
Limit=Límit
Limit.Syntax=[ <Funció>, <Valor> ]
-LimitAbove=LímitSuperior
+LimitAbove=LímitDreta
LimitAbove.Syntax=[ <Funció>, <Valor> ]
-LimitBelow=LímitInferior
+LimitBelow=LímitEsquerra
LimitBelow.Syntax=[ <Funció>, <Valor> ]
Line=Recta
Line.Syntax=[ <Punt>, <Punt> ]\n[ <Punt>, <Recta> ]\n[ <Punt>, <Vector> ]
LineBisector=Mediatriu
LineBisector.Syntax=[ <Segment> ]\n[ <Punt>, <Punt> ]
Locus=LlocGeomètric
-Locus.Syntax=[ <Punt>, <Punt> ]
+Locus.Syntax=[ <Punt del lloc geomètric>, <Punt base de la construcció> ]\n[ <Punt del lloc geomètric>, <Punt lliscant> ]
LogNormal=LogarítmicaNormal
-LogNormal.Syntax=[ <Mitjana>, <Desviació standard>, x ]\n[ <Mitjana>, <Desviació standard>, <Valor variable> ]\n[ <Mitjana>, <Desviació standard>, x, <Booleana acumulativa> ]
+LogNormal.Syntax=[ <Mitjana>, <Desviació standard>, x ]\n[ <Mitjana>, <Desviació standard>, <Valor de la variable> ]\n[ <Mitjana>, <Desviació standard>, x, <Acumulada true/false> ]
Logistic=Logística
-Logistic.Syntax=[ <Mitjana>, <Escala>, x ]\n[ <Mitjana>, <Escala>, x, <Booleana acumulativa> ]\n[ <Mitjana>, <Escala>, x, <Valor variable> ]
+Logistic.Syntax=[ <Mitjana>, <Escala>, x ]\n[ <Mitjana>, <Escala>, x, <Acumulada true/false> ]\n[ <Mitjana>, <Escala>, x, <Valor de la variable> ]
LowerSum=SumaInferior
-LowerSum.Syntax=[ <Funció>, <Nombre>, <Nombre>, <Nombre> ]
+LowerSum.Syntax=[ <Funció>, <Valor inicial de x>, <Valor final de x>, <Nombre de rectangles> ]
MatrixRank=RangMatriu
Max=Màx
-Max.Syntax=[ <Llista> ]\n[ <Nombre>, <Nombre> ]
+Max.Syntax=[ <Llista> ]\n[ <Interval> ]\n[ <Nombre>, <Nombre> ]\n[ <Funció>, <Valor inicial de x>, <Valor final de x> ]
Maximize=Maximitza
-Maximize.Syntax=[ <Nombre dependent>, <Nombre Lliure> ]
+Maximize.Syntax=[ <Nombre dependent>, <Nombre lliure (punt lliscant)> ]
Mean=Mitjana
Mean.Syntax=[ <Llista de Nombres> ]
MeanX=MitjanaX
@@ -323,16 +324,17 @@ MeanY.Syntax=[ <Llista de N
Median=Mediana
Median.Syntax=[ <Llista de Nombres> ]
Midpoint=PuntMitjà
-Midpoint.Syntax=[ <Punt>, <Punt> ]PuntMitjà[ <Segment> ]PuntMitjà[ <Cònica> ]
+Midpoint.Syntax=[ <Segment> ]\n[ <Cònica> ]\n[ <Interval> ]\n[ <Punt>, <Punt> ]
Min=Mín
-Min.Syntax=[ <Llista> ]\n[ <Nombre>, <Nombre> ]
+Min.Syntax=[ <Llista> ]\n[ <Interval> ]\n[ <Nombre>, <Nombre> ]\n[ <Funció>, <Valor inicial de x>, <Valor final de x> ]
Minimize=Minimitza
-Minimize.Syntax=[ <Nombre dependent>, <Nombre lliure> ]
+Minimize.Syntax=[ <Nombre dependent>, <Nombre lliure (punt lliscant)> ]
MinimumSpanningTree=ArbreRecobridorMínim
MinimumSpanningTree.Syntax=[ <Llista de punts> ]
Mirror=Simetria
-Mirror.Syntax=[ <Cònica>, <Punt> ]\n[ <Polígon>, <Punt> ]\n[ <Imatge>, <Punt> ]\n[ <Punt>, <Recta> ]\n[ <Recta>, <Recta> ]\n[ <Cònica>, <Recta> ]\n[ <Polígon>, <Recta> ]\n[ <Imatge>, <Recta> ]\n[ <Punt>, <Punt> ]Simetria[ <Recta>, <Punt> ]
-MixedNumber=FraccióPròpia
+Mirror.Syntax=[ <Objecte>, <Punt> ]\n[ <Objecte>, <Recta> ]\n[ <Objecte>, <Circumferència> ]
+MixedNumber=NombreMixt
+Mod=Residu
Mod.Syntax=[ <Dividend>, <Divisor> ]\n[ <Polinomi dividend>, <Polinomi divisor> ]
Mode=Moda
Mode.Syntax=[ <Llista de Nombres> ]
@@ -343,7 +345,7 @@ NSolve=ResolN
Name=Nom
Name.Syntax=[ <Objecte> ]
NextPrime=SegüentPrimer
-Normal.Syntax=[ <Mitjana>, <Desviació Estàndard>, <Valor de la Variable> ]
+Normal.Syntax=[ <Mitjana>, <Desviació Estàndard>, <Valor de la Variable> ]\n[ <Mitjana>, <Desviació Estàndard>, x ]\n[ <Mitjana>, <Desviació Estàndard>, x, <Acumulada true/false> ]
NormalQuantilePlot=DiagramaQQ
NormalQuantilePlot.Syntax=[ <Llista de totes les dades> ]
Numerator=Numerador
@@ -352,8 +354,10 @@ Numeric=ValorNum
Object=Objecte
Object.Syntax=[ <Nom de l'Objecte com a Text> ]
Ordinal.Syntax=[ <Enter> ]
+OrdinalRank=Rangs
+OrdinalRank.Syntax=[ <Llista> ]
OrthogonalLine=Perpendicular
-OrthogonalLine.Syntax=[ <Punt>, <Recta> ]\n[ <Punt>, <Vector> ]
+OrthogonalLine.Syntax=[ <Punt>, <Recta> ]\n[ <Punt>, <Vector> ]\n[ <Punt>, <Segment> ]
OrthogonalVector=VectorPerpendicular
OrthogonalVector.Syntax=[ <Recta> ]\n[ <Vector> ]
OsculatingCircle=CercleOsculador
@@ -362,44 +366,43 @@ PMCC=CoefCorrel
PMCC.Syntax=[ <Llista de Punts> ]\n[ <Llista de Coordenades x>, <Llista de Coordenades y> ]
Pan=DesplaçaFinestra
Parabola=Paràbola
-Parabola.Syntax=[ <Punt>, <Línia> ]
+Parabola.Syntax=[ <Focus>, <Directriu> ]
Parameter=Paràmetre
-Parameter.Syntax=[ <Cònica> ]
+Parameter.Syntax=[ <Paràbola> ]
ParseToFunction=ConverteixAFunció
ParseToFunction.Syntax=[ <Funció>, <Cadena> ]
ParseToNumber=ConverteixANombre
ParseToNumber.Syntax=[ <Nombre>, <Cadena> ]
PartialFractions=FraccionsSimples
PartialFractions.Syntax=[ <Funció> ]
-Pascal.Syntax=[ <Nombre de repeticions>, <Probabilitat de l\u2019èxit> ]\n[ <Nombre d\u2019èxits>, <Probabilitat de l\u2019èxit>, <Booleà acumulat> ]\n[ <Nombre de repeticions>, <Probabilitat de l\u2019èxit>, <Valor de la variable>, <Booleà acumulat> ]
-PathParameter=ParàmetreRecorregut
-PathParameter.Syntax=[ <Punt en recorregut> ]
+Pascal.Syntax=[ <Nombre d'èxits>, <Probabilitat de l\u2019èxit> ]\n[ <Nombre d\u2019èxits>, <Probabilitat de l\u2019èxit>, <Acumulada true/false> ]\n[ <Nombre d'èxits>, <Probabilitat de l\u2019èxit>, <Valor de la variable>, <Acumulada true/false> ]
+PathParameter=ParàmetreEnElRecorregut
+PathParameter.Syntax=[ <Punt en un recorregut> ]
Percentile=Percentil
Percentile.Syntax=[ <Llista de nombres>, <Percentatge> ]
Perimeter=Perímetre
-Perimeter.Syntax=[ <Polígon> ]\n[ <Cònica> ]
-Plane=Pla
+Perimeter.Syntax=[ <Polígon> ]\n[ <Cònica> ]\n[ <Lloc geomètric> ]
PlaySound=ReprodueixSo
-PlaySound.Syntax=[ <Arxiu> ]\n[ <Reproducció booleana> ]\n[ <Seqüència de Notes>, <Instrument> ]\n[ <Nota>, <Duració>, <Longitud> ]\n[ <Funció>, <Valor Mínim>, <Valor Màxim> ]\n[ <Funció>, <Valor Mínim>, Valor Màxim>, <Freqüència de mostreig>, <Profunditat de Mostreig> ]
+PlaySound.Syntax=[ <Arxiu> ]\n[ <Reproducció booleana> ]\n[ <Seqüència de Notes>, <Instrument> ]\n[ <Nota>, <Duració>, <Instrument> ]\n[ <Funció>, <Valor Mínim>, <Valor Màxim> ]\n[ <Funció>, <Valor Mínim>, <Valor Màxim>, <Freqüència de mostreig>, <Profunditat de Mostreig> ]
Point=Punt
-Point.Syntax=[ <Recta> ]\n[ <Cònica> ]\n[ <Funció> ]\n[ <Vector> ]\n[ <Punt>, <Vector> ]
-PointIn=PuntPertany
+Point.Syntax=[ <Objecte> ]\n[ <Llista> ]\n[ <Objecte>, <Paràmetre> ]\n[ <Punt>, <Vector> ]
+PointIn=PuntEn
PointIn.Syntax=[ <Regió> ]
PointList=LlistaDePunts
PointList.Syntax=[ <Llista> ]
-Poisson.Syntax=[ <Mitjana> ]\n[ <Mitjana>, <Booleà acumulatiu> ]\n[ <Mitjana>, <Valor variable>, <Booleà acumulatiu> ]
+Poisson.Syntax=[ <Mitjana> ]\n[ <Mitjana>, <Acumulada true/false> ]\n[ <Mitjana>, <Valor variable>, <Acumulada true/false> ]
Polar.Syntax=[ <Punt>, <Cònica> ]
PolyLine=LíniaPoligonal
PolyLine.Syntax=[ <Llista de Punts> ]\n[ <Punt>, ..., <Punt> ]
Polygon=Polígon
Polygon.Syntax=[ <Llista de punts> ]\n[ <Punt>, ..., <Punt> ]\n[ <Punt>, <Punt>, <Nombre de vèrtexs> ]
Polynomial=Polinomi
-Polynomial.Syntax=[ <Funció> ]
+Polynomial.Syntax=[ <Funció> ]\n[ <Llista de punts> ]
PreviousPrime=PrimerAnterior
PrimeFactors=FactorsPrimers
PrimeFactors.Syntax=[ <Nombre> ]
Product=Producte
-Product.Syntax=[ <Llista> ]
+Product.Syntax=[ <Llista numèrica> ]\n[ <Llista numèrica>, <Nombre d'elements> ]
Q1=Quartil1
Q1.Syntax=[ <Llista de Nombres> ]
Q3=Quartil3
@@ -407,7 +410,7 @@ Q3.Syntax=[ <Llista de Nombres> ]
RSquare=RQuadrat
RSquare.Syntax=[ <Llista de punts>, <Funció> ]
Radius=Radi
-Radius.Syntax=[ <Cònica> ]
+Radius.Syntax=[ <Circumferència> ]
Random=AleatoriEntre
Random.Syntax=[ <Mínim enter>, <Màxim enter> ]
RandomBinomial=AleatoriBinomial
@@ -423,7 +426,8 @@ RandomUniform=AleatoriUniforme
RandomUniform.Syntax=[ <Mín>, <Màx> ]
Rationalize=Racionalitza
Ray=Semirecta
-Ray.Syntax=[ <Punt>, <Punt> ]\n[ <Punt>, <Vector> ]
+Ray.Syntax=[ <Punt origen>, <Punt de la semirecta> ]\n[ <Punt origen>, <Vector de direcció> ]
+Real=PartReal
RectangleSum=SumaRectangles
RectangleSum.Syntax=[ <Funció>, <Valor x-inicial>, <Valor x-final>, <Nombre de rectangles>, <Posició rectangle inicial> ]
ReducedRowEchelonForm=MatriuEsglaonadaFiles
@@ -443,29 +447,28 @@ RigidPolygon=Pol
RigidPolygon.Syntax=[ <Punt lliure>, ..., <Punt lliure> ]
Root=Arrel
Root.Syntax=[ <Polinomi> ]\n[ <Funció>, <Nombre> ]\n[ <Funció>, <Nombre>, <Nombre> ]
-RootList=LlistaArrels
+RootList=PuntsEixX
RootList.Syntax=[ <llista> ]
RootMeanSquare=MitjanaQuadràtica
RootMeanSquare.Syntax=[ <llista de nombres> ]
Roots=Arrels
Roots.Syntax=[ <Funció>, <Valor inicial-x>, <Valor final-x> ]
Rotate=Rotació
-Rotate.Syntax=[ <Punt>, <Angle> ]\n[ <Vector>, <Angle> ]\n[ <Recta>, <Angle> ]\n[ <Cònica>, <Angle> ]\n[ <Polígon>, <Angle> ]\n[ <Imatge>, <Angle> ]\n[ <Punt>, <Angle>, <Punt> ]\n[ <Recta>, <Angle>, <Punt> ]\n[ <Cònica>, <Angle>, <Punt> ]\n[ <Polígon>, <Angle>, <Punt> ]\n[ <Imatge>, <Angle>, <Punt> ]
+Rotate.Syntax=[ <Objecte>, <Angle> ]\n[ <Objecte>, <Angle>, <Centre de rotació> ]
RotateText=GiraText
Row=Fila
Row.Syntax=[ <Cel·la del full de càlcul> ]
SD=DesviacióEstàndard
SD.Syntax=[ <Llista de Nombres> ]
+SDX=DesviacióEstàndardX
SDX.Syntax=[ <Llista de punts> ]
+SDY=DesviacióEstàndardY
SDY.Syntax=[ <Llista de punts> ]
-SXX=SXX
SXX.Syntax=[ <Llista de Punts> ]\n[ <Llista de Nombres>, <Llista de Nombres> ]
-SXY=SXY
SXY.Syntax=[ <Llista de Punts> ]\n[ <Llista de Nombres>, <Llista de Nombres> ]
-SYY=SYY
-SYY.Syntax=[ <Llista de Punts> ]\n[ <Llista de Nombres>, <Llista de Nombres> ]
+SYY.Syntax=[ <Llista de Punts> ]
Sample=Mostra
-Sample.Syntax=[ <Llista>, <Mida> ]\n[ <Llista>, <Mida>, <Amb reemplaçament> ]
+Sample.Syntax=[ <Llista>, <Mida> ]\n[ <Llista>, <Mida>, <Amb reemplaçament true/false> ]
SampleSD=DesviacióEstàndardMostral
SampleSD.Syntax=[ <Llista de nombres> ]
SampleSDX=DesviacióEstàndardMostralX
@@ -476,10 +479,10 @@ SampleVariance=Vari
SampleVariance.Syntax=[ <Llista de nombres> ]
SecondAxis=SegonEix
SecondAxis.Syntax=[ <Cònica> ]
-SecondAxisLength=LongitudSegonEix
+SecondAxisLength=LongitudSegonSemiEix
SecondAxisLength.Syntax=[ <Cònica> ]
-Sector.Syntax=[ <Cònica>, <Punt>, <Punt> ]\n[ <Cònica>, <Nombre>, <Nombre> ]
-Segment.Syntax=[ <Punt>, <Punt> ]\n[ <Punt>, <Nombre> ]
+Sector.Syntax=[ <Cònica>, <Punt>, <Punt> ]\n[ <Cònica>, <Valor del paràmetre punt origen>, <Valor del paràmetre punt extrem> ]
+Segment.Syntax=[ <Punt>, <Punt> ]\n[ <Punt>, <Lomgitud> ]
SelectObjects=SeleccionaObjectes
SelectObjects.Syntax=[ ]\n[ <Objecte>, <Objecte>, ... ]
SelectedElement=ElementSeleccionat
@@ -489,7 +492,7 @@ SelectedIndex.Syntax=[ <Llista> ]
Semicircle=Semicircumferència
Semicircle.Syntax=[ <Punt>, <Punt> ]
Sequence=Seqüència
-Sequence.Syntax=[ <expressió>, <variable>, <des de>, <fins a> ]\n[ <expressió>, <variable>, <des de>, <fins a>, <increment> ]
+Sequence.Syntax=[ <Valor final> ]\n[ <Expressió>, <Variable>, <des de>, <fins a> ]\n[ <Expressió>, <Variable>, <des de>, <fins a>, <increment> ]
SetActiveView=DefineixZonaGràfica
SetActiveView.Syntax=[ <Nombre Vista 1|2> ]
SetAxesRatio=DefineixRaóEixos
@@ -504,12 +507,12 @@ SetConditionToShowObject=DefineixCondici
SetConditionToShowObject.Syntax=[ <Objecte>, <Condició> ]
SetCoords=DefineixCoordenades
SetCoords.Syntax=[ <Punt>, <x>, <y> ]
-SetDynamicColor=DefineixColorsDinàmics
+SetDynamicColor=DefineixColorDinàmic
SetDynamicColor.Syntax=[ <Objecte>, <Vermell>, <Verd>, <Blau> ]\n[ <Objecte>, <Vermell>, <Verd>, <Blau>, <Opacitat> ]
SetFilling=DefineixEmplenat
SetFilling.Syntax=[ <Objecte>, <Nombre> ]
SetFixed=DefineixObjecteFix
-SetFixed.Syntax=[ <Objecte>, <true | false> ]
+SetFixed.Syntax=[ <Objecte>, <true/false> ]
SetLabelMode=DefineixModeEtiqueta
SetLabelMode.Syntax=[ <Objecte>, <Nombre> ]
SetLayer=DefineixCapa
@@ -525,13 +528,13 @@ SetPointStyle.Syntax=[ <Punt>, <Nombre> ]
SetTooltipMode=DefineixModeDescriptiu
SetTooltipMode.Syntax=[ <Objecte>, <Nombre> ]
SetValue=DefineixValor
-SetValue.Syntax=[ <Booleà>, <0|1> ]\n[ <Llista>, <Element> ]\n[ <Objecte>, <Objecte> ]\n[ <Llista>, <Nombre>, <Objecte> ]
+SetValue.Syntax=[ <Booleà>, <true/false> ]\n[ <Objecte>, <Objecte> ]\n[ <Llista>, <Posició en la llista>, <Objecte> ]
SetVisibleInView=DefineixVisibleEnZonaGràfica
-SetVisibleInView.Syntax=[>Objecte>, <Nombre Vista 1|2>, <Booleà> ]
-Shear=Desplaça
+SetVisibleInView.Syntax=[ <Objecte>, <Nombre Vista 1|2>, <true/false> ]
+Shear=Transvecció
Shear.Syntax=[ <Objecte>, <Recta>, <Raó> ]
ShortestDistance=DistànciaMésCurta
-ShortestDistance.Syntax=[ <Llista de segments>, <Punt d\u2019inici>, <Punt final>, <Pes Booleà> ]
+ShortestDistance.Syntax=[ <Llista de segments del graf>, <Inici (punt del graf)>, <Final (punt del graf)>, <Amb longitud/només segments (true/false)> ]
ShowLabel=MostraEtiqueta
ShowLabel.Syntax=[ <Objecte>, <Booleà> ]
ShowLayer=MostraCapa
@@ -542,11 +545,11 @@ SigmaXX.Syntax=[ <Llista de Nombres> ]\n[ <Llista de Punts> ]
SigmaXY.Syntax=[ <Llista de Punts> ]\n[ <Llista de Coordenades x>, <Llista de Coordenades y> ]
SigmaYY.Syntax=[ <Llista de Punts> ]
Simplify=Simplifica
-Simplify.Syntax=[ <Funció> ]
+Simplify.Syntax=[ <Funció> ]\n[ <Text> ]
Slider=PuntLliscant
-Slider.Syntax=[ <Mín>, <Màx>, <Increment>, <Velocitat>, <Amplada>, <És angle>, <Horitzontal>, <Animació>, <Aleatòri> ]
+Slider.Syntax=[ <Mín>, <Màx>, <Increment>, <Velocitat>, <Amplada>, <Angle true/false>, <Horitzontal true/false>, <Animació true/false>, <Aleatori true/false> ]
Slope=Pendent
-Slope.Syntax=[ <Recta> ]\n[ <Funció> ]
+Slope.Syntax=[ <Recta> ]
SlowPlot=DibuixaPuntAPunt
SlowPlot.Syntax=[ <Funció> ]
Solutions=Solucions
@@ -555,12 +558,12 @@ SolveODE=ResolEDO
SolveODE.Syntax=[ <f\u2019(x, y)>, <Inici x>, <Inici y>, <Pas> ]\n[ <y\u2019>, <x\u2019>, <Inici x>, <Inici y>, <Final t>, <Pas> ]\n[ <b(x)>, <c(x)>, <f(x)><Inici x>, <Inici y>, <Inici y\u2019>, <Final x>, <Pas> ]
Sort=Ordena
Sort.Syntax=[ <Llista> ]
-Spearman.Syntax=[ <Llista de Punts> ]\n[ <Llista de Nombres>, <Llista of Nombres> ]
+Spearman.Syntax=[ <Llista de Punts> ]\n[ <Llista de Nombres>, <Llista de Nombres> ]
StartAnimation=IniciaAnimació
-StartAnimation.Syntax=[ ]\n[ <Booleà> ]\n[ <Punt lliscant o Punt ], <Punt lliscant o Punt ], ... ]\n[ <Punt lliscant o Punt ], <Punt lliscant o Punt ], ..., <Booleà> ]
-StemPlot=DiagramaDeTijaFulles
-StemPlot.Syntax=[ <Llista> ]\n[ <Llista>, <Ajusta -1|0|1> ]
-Stretch=Estira
+StartAnimation.Syntax=[ ]\n[ <Booleà> ]\n[ <Punt lliscant o Punt>, <Punt lliscant o Punt>, ... ]\n[ <Punt lliscant o Punt>, <Punt lliscant o Punt>, ..., <Booleà> ]
+StemPlot=DiagramaDeTijaIFulles
+StemPlot.Syntax=[ <Llista> ]\n[ <Llista>, <Ajusta unitat de la tija -1|0|1> ]
+Stretch=Dilatació
Stretch.Syntax=[ <Objecte>, <Vector> ]\n[ <Objecte>, <Recta>, <Raó> ]
Substitute=Substitueix
Sum=Suma
@@ -568,41 +571,48 @@ Sum.Syntax=[ <Llista> ]\n[ <Llista>, <Nombre d'Elements> ]
SumSquaredErrors=SumaErrorsQuadrat
SumSquaredErrors.Syntax=[ <Llista de Punts>, <Funció> ]
TDistribution=DistribucióT
-TDistribution.Syntax=[ <Graus de llibertat>, x ]\n[ <Graus de llibertat>, <Valor de la variable> ]\n[ <Graus de llibertat>, x, <Booleà acumulat> ]
-TMean2Estimate=TMitjana2Estimada
-TMean2Estimate.Syntax=[ <Llista de dades de la mostra 1>, <Llista de dades de la mostra 2>, <Nivell>, <Composició booleana> ]\n[ <Mitjana de la mostra 1>, <Desviació estàndard de la mostra 1>, <Mida de la mostra 1>, <Mitjana de la mostra 2>, <Desviació estàndard de la mostra 2>, <Mida de la mostra 2>, <Nivell>, <Composició booleana> ]
-TMeanEstimate=TMitjanaEstimada
+TDistribution.Syntax=[ <Graus de llibertat>, x ]\n[ <Graus de llibertat>, <Valor de la variable> ]\n[ <Graus de llibertat>, x, <Acumulada true/false> ]
+TMean2Estimate=EstimaDiferènciaMitjanesT
+TMean2Estimate.Syntax=[ <Llista de dades de la mostra 1>, <Llista de dades de la mostra 2>, <Nivell>, <Variàncies iguals true/false> ]\n[ <Mitjana de la mostra 1>, <Desviació estàndard de la mostra 1>, <Mida de la mostra 1>, <Mitjana de la mostra 2>, <Desviació estàndard de la mostra 2>, <Mida de la mostra 2>, <Nivell>, <Variàncies iguals true/false> ]
+TMeanEstimate=EstimaMitjanaT
TMeanEstimate.Syntax=[ <Llista de dades de la mostra>, <Nivell> ]\n[ <Mitjana de la mostra>, <Desviació estàndard de la mostra>, <Mida de la mostra>, <Nivell> ]
-TTest=TestT
-TTest.Syntax=[ <Llista de dades de la mostra>, <Mitjana hipotètica>, <Cua> ]\n[ <Mitjana de la mostra>, <Desviació estàndard de la mostra>, <Mida de la mostra>, <Mitjana hipotètica>, <Cua> ]
-TTest2=TestT2
-TTest2.Syntax=[ <Llista de dades de la mostra 1>, <Llista de dades de la mostra 2>, <Cua>, <Composició booleana> ]\n[ <Mitjana de la mostra 1>, <Desviació estàndard de la mostra 1>, <Mida de la mostra 1>, <Mitjana de la mostra 2>, <Desviació estàndard de la mostra 2>, <Mida de la mostra 2>, <Mitjana hipotètica>, <Cua>, <Composició booleana> ]
-TTestPaired=TestTParelles
+TTest=ProvaT
+TTest.Syntax=[ <Llista de dades de la mostra>, <Mitjana a contrastar>, <Cua> ]\n[ <Mitjana de la mostra>, <Desviació estàndard de la mostra>, <Mida de la mostra>, <Mitjana a contrastar>, <Cua> ]
+TTest2=ProvaTDifMitj
+TTest2.Syntax=[ <Llista de dades de la mostra 1>, <Llista de dades de la mostra 2>, <Cua>, <Variàncies iguals o no> ]\n[ <Mitjana de la mostra 1>, <Desviació estàndard de la mostra 1>, <Mida de la mostra 1>, <Mitjana de la mostra 2>, <Desviació estàndard de la mostra 2>, <Mida de la mostra 2>, <Cua>, <Varàncies iguals o no> ]
+TTestPaired=ProvaTDadesAparellades
TTestPaired.Syntax=[ <Llista de dades de la mostra 1>, <Llista de dades de la mostra 2>, <Cua> ]
TableText=Taula
TableText.Syntax=[ <Llista>, <Llista>, ... ]\n[ <Llista>, <Llista>, ..., <Alineació del Text> ]
Take=Tria
-Take.Syntax=[ <Llista>, <Posició Inicial>, <Posició Final> ]
+Take.Syntax=[ <Llista>, <Posició Inicial>, <Posició Final> ]\n[ <Text>, <Posició Inicial>, <Posició Final> ]
Tangent.Syntax=[ <Punt>, <Cònica> ]\n[ <Punt>, <Funció> ]\n[ <Punt de la corba>, <Corba> ]\n[ <Valor-x>, <Funció> ]\n[ <Línia>, <Cònica> ]\n[ <Cercle>, <Cercle> ]
TaylorSeries=PolinomiDeTaylor
-TaylorSeries.Syntax=[ <Funció>, <Nombre>, <Nombre> ]
-Text.Syntax=[ <Objecte> ]\n[ <Objecte>, <Booleana per a Substitució de Variables> ]\n[ <Objecte>, <Punt> ]\n[ <Objecte>, <Punt>, <Booleana per a Substitució de Variables> ]
+TaylorSeries.Syntax=[ <Funció>, <Valor de x>, <Grau del polinomi> ]
+Text.Syntax=[ <Objecte> ]\n[ <Objecte>, <Substitució de variables true/false> ]\n[ <Objecte>, <Punt> ]\n[ <Objecte>, <Punt>, <Substitució de variables true/false> ]\n[ <Objecte>, <Punt>, <Substitució de variables true/false>, <Fórmula LaTeX true/false> ]
TextToUnicode=TextEnUnicode
-TextToUnicode.Syntax=[ <Text> ]
-Textfield=CampDeText
+Textfield=CasellaEntradaSortida
Textfield.Syntax=[ ]\n[ <Object vinculat> ]
+TiedRank=RangsAmbEmpats
+TiedRank.Syntax=[ <Llista> ]
+ToComplex=ConverteixEnComplex
+ToExponential=FormaExponencial
+ToPoint=ConverteixEnPunt
ToPolar=APolar
ToolImage=ImatgeEina
ToolImage.Syntax=[ <Nombre> ]
Translate=Translació
-Translate.Syntax=[ <Punt>, <Vector> ]\n[ <Recta>, <Vector> ]\n[ <Cònica>, <Vector> ]\n[ <Funció>, <Vector> ]\n[ <Punt>, <Vector> ]\n[ <Polígon>, <Vector> ]\n[ <Imatge>, <Vector> ]\n[ <Vector>, <Punt> ]
+Translate.Syntax=[ <Objecte>, <Vector> ]\n[ <Vector>, <Punt inicial> ]
Transpose=Transposa
Transpose.Syntax=[ <Matriu> ]
TrapezoidalSum=SumaTrapezis
-TrapezoidalSum.Syntax=[ <Funció>, <Valor Inicial x>, <Valor Final x>, <Nombre de Trapezoides> ]
+TrapezoidalSum.Syntax=[ <Funció>, <Valor inicial x>, <Valor final x>, <Nombre de trapezis> ]
TravelingSalesman=ProblemaDelViatjantDeComerç
TravelingSalesman.Syntax=[ <Llista de punts> ]
-Triangular.Syntax=[ <Límit inferior>, <Límit superior>, <Moda>, x ]\n[ <Límit inferior>, <Límit superior>, <Moda>, <Valor de la variable> ]\n[ <Límit inferior>, <Límit superior>, <Moda>, x, <Booleà acumulat> ]
+Triangular.Syntax=[ <Límit inferior>, <Límit superior>, <Moda>, x ]\n[ <Límit inferior>, <Límit superior>, <Moda>, <Valor de la variable> ]\n[ <Límit inferior>, <Límit superior>, <Moda>, x, <Acumulada true/false> ]
+TrigCombine=TransformaTrig
+TrigExpand=OperaTrig
+TrigSimplify=SimplificaTrig
TurningPoint=PuntInflexió
TurningPoint.Syntax=[ <Polinomi> ]
UnicodeToLetter=UnicodeEnLletra
@@ -610,29 +620,31 @@ UnicodeToLetter.Syntax=[ <Enter> ]
UnicodeToText=UnicodeEnText
UnicodeToText.Syntax=[ <Llista d'Enters> ]
Uniform=Uniforme
-Uniform.Syntax=[ <Límit inferior>, <Límit superior>, x ]\n[ <Límit inferior>, <Límit superior>, <Valor de la variable> ]\n[ <Límit inferior>, <Límit superior>, x, <Booleà acumulat> ]
+Uniform.Syntax=[ <Límit inferior>, <Límit superior>, x ]\n[ <Límit inferior>, <Límit superior>, <Valor de la variable> ]\n[ <Límit inferior>, <Límit superior>, x, <Acumulada true/false> ]
Union=Unió
-Union.Syntax=[ <Llista>, <Llista> ]
-Unique=Dades
+Union.Syntax=[ <Llista>, <Llista> ]\n[ <Polígon>, <Polígon> ]
+Unique=LlistaDades
Unique.Syntax=[ <Llista> ]
UnitOrthogonalVector=VersorPerpendicular
UnitOrthogonalVector.Syntax=[ <Recta> ]\n[ <Vector> ]
UnitVector=Versor
-UnitVector.Syntax=[ <Vector> ]\n[ <Recta> ]
+UnitVector.Syntax=[ <Vector> ]\n[ <Recta> ]\n[ <Segment> ]
UpdateConstruction=ActualitzaConstrucció
UpperSum=SumaSuperior
-UpperSum.Syntax=[ <Funció>, <Nombre>, <Nombre>, <Nombre> ]
+UpperSum.Syntax=[ <Funció>, <Valor inicial de x>, <Valor final de x>, <Nombre de rectangles> ]
Variance=Variància
Variance.Syntax=[ <Llista de Nombres> ]
-Vector.Syntax=[ <Punt> ]\n[ <Punt>, <Punt> ]
+Vector.Syntax=[ <Punt> ]\n[ <Origen>, <Extrem> ]
Vertex=Vèrtex
-Vertex.Syntax=[ <Cònica> ]
+Vertex.Syntax=[ <Cònica> ]\n[ <Polígon> ]\n[ <Polígon>, <Nombre del vèrtex> ]
VerticalText=TextVertical
Voronoi.Syntax=[ <Llista de punts> ]
-Weibull.Syntax=[ <Forma>, <Escala>, x ]\n[ <Forma>, <Escala>, <Valor de la variable> ]\n[ <Forma>, <Escala>, x, <Booleà acumulat> ]
+Weibull.Syntax=[ <Forma>, <Escala>, x ]\n[ <Forma>, <Escala>, <Valor de la variable> ]\n[ <Forma>, <Escala>, x, <Acumulada true/false> ]
+Zip=LlistaDeSubstitucions
Zip.Syntax=[ <Expressió>, <Variable1>, <Llista1>, <Variable2>, <Llista2>, ... ]
-Zipf.Syntax=[ <Nombre d\u2019elements>, <Exponent> ]\n[ <Nombre d\u2019elements>, <Exponent>, <Booleà acumulat> ]\n[ <Nombre d\u2019elements>, <Exponent>, <Valor de la variable>, <Booleà acumulat> ]
+Zipf.Syntax=[ <Nombre d\u2019elements>, <Exponent> ]\n[ <Nombre d\u2019elements>, <Exponent>, <Acumulada true/false> ]\n[ <Nombre d\u2019elements>, <Exponent>, <Valor de la variable>, <Acumulada true/false> ]
ZoomIn=Apropa
ZoomIn.Syntax=[ <Factor d\u2019escala> ]\n[ <Factor d\u2019escala>, <Punt de centre> ]\n[ <x mínima>, <y mínima>, <x màxima>, <y màxima> ]
ZoomOut=Allunya
-ZoomOut.Syntax=[ <Factor d\u2019escala> ]\n[ <Factor d\u2019escala>, <Punt de centre> ]
\ No newline at end of file
+ZoomOut.Syntax=[ <Factor d\u2019escala> ]\n[ <Factor d\u2019escala>, <Punt de centre> ]
+nPr=Vnr
\ No newline at end of file
diff --git a/geogebra/properties/command_cs.properties b/geogebra/properties/command_cs.properties
index 7382f6f..7af68ed 100644
--- a/geogebra/properties/command_cs.properties
+++ b/geogebra/properties/command_cs.properties
@@ -71,8 +71,6 @@ ColumnName=NazevSloupce
ColumnName.Syntax=[ <Bu\u0148ky> ]
Command=P\u0159íkaz
CommonDenominator=SpolecnyJmenovatel
-CompetitionRank=SoutezniPoradi
-CompetitionRank.Syntax=[ <Seznam> ]
CompleteSquare=UplnyCtverec
CompleteSquare.Syntax=[ <Kvadratická funkce> ]
ComplexRoot=KomplexniKoren
@@ -113,7 +111,7 @@ Denominator.Syntax=[ <Funkce> ]
Derivative=Derivace
Derivative.Syntax=[ <Funkce> ]\n[ <K\u0159ivka> ]\n[ <Funkce>, <\u010císlo> ]\n[ <K\u0159ivka>, <\u010císlo> ]
Determinant.Syntax=[ <Matice> ]
-Diameter=PrumerVeSmeru
+Diameter=SdruzenyPrumer
Diameter.Syntax=[ <Vektor>, <Ku\u017eelose\u010dka> ]\n[ <P\u0159ímka>, <Ku\u017eelose\u010dka> ]
Dilate=Stejnolehlost
Dilate.Syntax=[ <Objekt>, <Dilatace faktoru> ]\n[ <Objekt>, <Dilatace faktoru>, <Dilatace st\u0159edu> ]
@@ -246,8 +244,6 @@ IntersectRegion=PrunikOblasti
IntersectRegion.Syntax=[ <Mnohoúhelník>, <Mnohoúhelník> ]
Intersection=Prunik
Intersection.Syntax=[ <Seznam>, <Seznam> ]
-IntersectionPaths=Prusecnice
-IntersectionPaths.Syntax=[ <P\u0159ímka>, <Mnohoúhelník> ]\n[ <P\u0159ímka>, <Ku\u017eelose\u010dka> ]
InverseBinomial=InverzniBinomicke
InverseBinomial.Syntax=[ <Po\u010dt pokus\u016f>, <Pravd\u011bpodopnost úsp\u011bchu>, <Pravd\u011bpodobnost> ]
InverseCauchy=InverzniCauchy
@@ -299,7 +295,7 @@ LeftSide=LevaStrana
LeftSum=LevySoucet
LeftSum.Syntax=[ <Funkce>, <Po\u010dáte\u010dní hodnotat x>, <Koncová hodnota x>, <Po\u010det obdélník\u016f> ]
Length=Delka
-Length.Syntax=[ <Vektor> ]\n[ <Bod> ]\n[ <Seznam> ]\n[ <Text> ]\n[ <Místo> ]\n[ <Funkce>, <Po\u010dáte\u010dní hodnota x>, <Koncová hodnota x> ]\n[ <Funkce>, <Po\u010dáte\u010dní Bod>, <Koncový Bod> ]\n[ <K\u0159ivka>, <Po\u010dáte\u010dní hodnota x>, <Koncová hodnota x> ]\n[ <K\u0159ivka>, <Po\u010dáte\u010dní Bod>, <Koncový Bod> ]
+Length.Syntax=[ <Vektor> ]\n[ <Bod> ]\n[ <Seznam> ]\n[ <Text> ]\n[ <Místo> ]\n[ <Úse\u010dka> ]\n[ <Funkce>, <Po\u010dáte\u010dní hodnota x>, <Koncová hodnota x> ]\n[ <Funkce>, <Po\u010dáte\u010dní Bod>, <Koncový Bod> ]\n[ <K\u0159ivka>, <Po\u010dáte\u010dní hodnota parametru>, <Koncová hodnota parametru> ]\n[ <K\u0159ivka>, <Po\u010dáte\u010dní Bod>, <Koncový Bod> ]
LetterToUnicode=ZnakNaUnicode
LetterToUnicode.Syntax=[ "<Znak>" ]
Limit=Limita
@@ -313,7 +309,7 @@ Line.Syntax=[ <Bod>, <Bod> ]\n[ <Bod>, <P\u0159
LineBisector=OsaUsecky
LineBisector.Syntax=[ <Úse\u010dka> ]\n[ <Bod>, <Bod> ]
Locus=MnozinaBodu
-Locus.Syntax=[ <Vytvo\u0159it p\u0159ímku z bodu>, <Bod> ]
+Locus.Syntax=[ <Vybrat bod tvo\u0159ící mno\u017einu>, <Bod na objektu> ]\n[ <Vybrat bod tvo\u0159ící mno\u017einu>, <Posuvník> ]
LogNormal=LogNormalni
LogNormal.Syntax=[ <Pr\u016fm\u011br>, <Standardní odchylka>, x ]\n[ <Pr\u016fm\u011br>, <Standardní odchylka>, <Hodnota prom\u011bnné> ]\n[ <Pr\u016fm\u011br>, <Standardní odchylka>, x, <Kumulativní (logická hodnota)> ]
Logistic=Logisticke
@@ -335,7 +331,7 @@ Median.Syntax=[ <Seznam \u010d
Midpoint=StredSoumernosti
Midpoint.Syntax=[ <Úse\u010dka> ]\n[ <Ku\u017eelose\u010dka> ]\n[ <Interval> ]\n[ <Bod>, <Bod> ]
Min=Minimum
-Min.Syntax=[ <Seznam> ]\n[ <Interval> ]\n[ <\u010císlo>, <\u010císlo> ]\n[ <Funkce>, <Po\u010dáte\u010dní hodnota x>, <Koncová hodnota x> ]
+Min.Syntax=[ <Seznam \u010dísel> ]\n[ <Interval> ]\n[ <\u010císlo>, <\u010císlo> ]\n[ <Funkce>, <Po\u010dáte\u010dní hodnota x>, <Koncová hodnota x> ]
Minimize=Minimalizovat
Minimize.Syntax=[ <Závislé \u010díslo>, <Volné \u010díslo> ]
MinimumSpanningTree=MinimalniKostra
@@ -389,7 +385,6 @@ Percentile=Percentil
Percentile.Syntax=[ <Seznam \u010dísel>, <Procento> ]
Perimeter=Obvod
Perimeter.Syntax=[ <Mnohoúhelník> ]\n[ <Ku\u017eelose\u010dka> ]\n[ <Místo> ]
-Plane=Rovina
PlaySound=PrehratZvuk
PlaySound.Syntax=[ <Soubor> ]\n[ <Po\u0159adí záznamu>, <Nástroj> ]\n[ <Záznam>, <Trvání>, <Délka> ]\n[ <Funkce>, <Minimální hodnota>, <Maximální hodnota> ]\n[ <Funkce>, <Minimální hodnota>, <Maximální hodnota>, <Rychlost>, <Hloubka> ]
Point=Bod
@@ -451,7 +446,7 @@ Reverse.Syntax=[ <Seznam> ]
RightSide=PravaStrana
RigidPolygon=PevnyMnohouhelnik
RigidPolygon.Syntax=[ <Volný bod>, ..., <Volný bod> ]
-Root=NulovyBod
+Root=NuloveBody
Root.Syntax=[ <Mnoho\u010dlen> ]\n[ <Funkce>, <P\u016fvodní hodnota x> ]\n[ <Funkce>, <Po\u010dáte\u010dní hodnota x>, <Koncová hodnota x> ]
RootList=SeznamNulovychBodu
RootList.Syntax=[ <Seznam> ]
@@ -543,7 +538,7 @@ SetVisibleInView.Syntax=[ <Objekt>, <N
Shear=Zkoseni
Shear.Syntax=[ <Objekt>, <\u010cára>, <Procento> ]
ShortestDistance=NejkratsiVzdalenost
-ShortestDistance.Syntax=[ <Seznam segment\u016f>, <Po\u010dáte\u010dní bod>, <Koncový bod>, <Booleovsky vá\u017eený> ]
+ShortestDistance.Syntax=[ <Seznam úse\u010dek>, <Po\u010dáte\u010dní bod>, <Koncový bod>, <Booleovska hodnota> ]
ShowLabel=ZobrazitPopis
ShowLabel.Syntax=[ <Objekt>, <Logická hodnota> ]
ShowLayer=ZobrazitVrstvu
@@ -573,7 +568,7 @@ StartAnimation.Syntax=[ ]\n[ <Boolean> ]\n[ <Posuvn
StemPlot=SGraf
StemPlot.Syntax=[ <Seznam> ]\n[ <Seznam>, <Nastavení -1|0|1> ]
Stretch=Roztazeni
-Stretch.Syntax=[ <Objekt>, <Vektor> ]\n[ <Objekt>, <P\u0159ímka>, <Procento> ]
+Stretch.Syntax=[ <Objekt>, <Vektor> ]\n[ <Objekt>, <P\u0159ímka>, <Pom\u011br> ]
Substitute=Substituce
Sum=Suma
Sum.Syntax=[ <Seznam> ]\n[ <Seznam>, <Po\u010det prvk\u016f> ]
diff --git a/geogebra/properties/command_da.properties b/geogebra/properties/command_da.properties
index 4babd49..b4389dd 100644
--- a/geogebra/properties/command_da.properties
+++ b/geogebra/properties/command_da.properties
@@ -67,7 +67,6 @@ ColumnName=S
ColumnName.Syntax=[ <celle> ]
Command=Kommando
CommonDenominator=FællesNævner
-CompetitionRank.Syntax=[ <Liste> ]
CompleteSquare=Kvadratkomplettering
CompleteSquare.Syntax=[ <andengrads polynomium> ]
ComplexRoot=KompleksRod
@@ -225,8 +224,6 @@ Intersect.Syntax=[ <Objekt>, <Objekt> ]\n[ <Objekt>, <Objekt>, <indeks for sk
IntersectRegion=Fællesområde
Intersection=Fællesmængde
Intersection.Syntax=[ <Liste>, <Liste> ]
-IntersectionPaths=Periferilinje
-IntersectionPaths.Syntax=[ <Linje>, <Polygon> ]\n[ <Linje>, <Keglesnit> ]
InverseNormal.Syntax=[ <middel>, <standard afvigelse>, <tal> ]
Invert=Inverter
IsInRegion=iOmråde
@@ -329,7 +326,6 @@ Percentile=Percentil
Percentile.Syntax=[ <liste af tal>, <procent> ]
Perimeter=Omkreds
Perimeter.Syntax=[ <Polygon> ]\n[ <Konisk> ]
-Plane=Plan
PlaySound=SpilLyd
PlaySound.Syntax=[ <File> ]\n[ <Boolean Play> ] ]\n[ <Node Sekvens>, <Instrument> ]\n[ <Node>, <Varighed>, <Instrument> ]\n[ <Funktion>, <Min Værdi>, <Max Værdi> ]\n[ <Funktion>, <Min Værdi>, <Max Værdi>, <Sample Rate>, <Sample Dybde>
Point=Punkt
diff --git a/geogebra/properties/command_de.properties b/geogebra/properties/command_de.properties
index dce0e41..5ef3bea 100644
--- a/geogebra/properties/command_de.properties
+++ b/geogebra/properties/command_de.properties
@@ -132,7 +132,7 @@ Eccentricity=NumerischeExzentrizit
Eccentricity.Syntax=[ <Kegelschnitt> ]
Element.Syntax=[ <Liste>, <Position des Elements> ]\n[ <Matrix>, <Zeile>, <Spalte> ]\n[ <Liste>, <Index1>, <Index2>, ... ]
Ellipse.Syntax=[ <Brennpunkt>, <Brennpunkt>, <Halbachsenlänge> ]\n[ <Brennpunkt>, <Brennpunkt>, <Strecke> ]\n[ <Brennpunkt>, <Brennpunkt>, <Punkt> ]
-Erlang.Syntax=[ <Parameter n>, <Parameter>, x ]\n[ <Parameter n>, <Parameter>, <Wert der Variable> ]\n[ <Parameter n>, <Parameter>, <Wert der Variablen>, <Wahrheitswert Verteilungsfunktion> ]
+Erlang.Syntax=[ <Parameter n>, <Parameter>, x ]\n[ <Parameter n>, <Parameter>, <Wert der Variable> ]\n[ <Parameter n>, <Parameter>, x, <Wahrheitswert Verteilungsfunktion> ]
Excentricity=LineareExzentrizität
Excentricity.Syntax=[ <Kegelschnitt> ]
Execute=Ausführen
@@ -233,7 +233,7 @@ IntegralBetween.Syntax=[ <Funktion>, <Funktion>, <Startwert>, <Endwert> ]\n[ <Fu
Intersect=Schneide
Intersect.Syntax=[ <Objekt>, <Objekt> ]\n[ <Objekt>, <Objekt>, <Nummer des Schnittpunkts> ]\n[ <Objekt>, <Objekt>, <Anfangspunkt> ]\n[ <Funktion>, <Funktion>, <Anfangswert>, <Endwert> ]
IntersectRegion=SchneideBereich
-IntersectRegion.Syntax=[ <Vielecke>, <Vielecke> ]
+IntersectRegion.Syntax=[ <Vieleck>, <Vieleck> ]
Intersection=Schnittmenge
Intersection.Syntax=[ <Liste>, <Liste> ]
InverseBinomial=InversBinomial
@@ -334,7 +334,7 @@ NSolutions=NL
NSolve=NLöse
Name.Syntax=[ <Objekt> ]
NextPrime=NächstePrimzahl
-Normal.Syntax=[ <Mittelwert>, <Standardabweichung>, x ]\n[ <Mittelwert>, <Standardabweichung>, <Wert der Variablen> ]\n[ <Mittelwert>, <Standardabweichung>, x, <Wahrheitswert Verteilungsfunktion> ]
+Normal.Syntax=[ <Erwartungswert>, <Standardabweichung>, x ]\n[ <Erwartungswert>, <Standardabweichung>, <Wert der Variablen> ]\n[ <Erwartungswert>, <Standardabweichung>, x, <Wahrheitswert Verteilungsfunktion> ]
NormalQuantilePlot=NormalQuantilPlot
NormalQuantilePlot.Syntax=[ <Liste von Rohdaten> ]
Numerator=Zähler
@@ -372,7 +372,6 @@ Percentile=Perzentil
Percentile.Syntax=[ <Liste von Zahlen>, <Prozent> ]
Perimeter=Umfang
Perimeter.Syntax=[ <Vieleck> ]\n[ <Kegelschnitt> ]\n[ <Ortslinie> ]
-Plane=Ebene
PlaySound=SpieleTon
PlaySound.Syntax=[ <Datei> ]\n[ <Wahrheitswert Play> ] ]\n[ <Notensequenz>, <Instrument> ]\n[ <Note>, <Dauer>, <Instrument> ]\n[ <Funktion>, <minimaler Wert>, <maximaler Wert> ]\n[ <Funktion>, <minimaler Wert>, <maximaler Wert>, <Sample Rate>, <Sample Tiefe> ]
Point=Punkt
@@ -381,7 +380,7 @@ PointIn=PunktIn
PointIn.Syntax=[ <Bereich> ]
PointList=PunktListe
PointList.Syntax=[ <Liste> ]
-Poisson.Syntax=[ <Mittelwert> ]\n[ <Mittelwert>, <Wahrheitswert Verteilungsfunktion> ]\n[ <Mittelwert>, <Wert der Variablen>, <Wahrheitswert Verteilungsfunktion> ]
+Poisson.Syntax=[ <Erwartungswert> ]\n[ <Erwartungswert>, <Wahrheitswert Verteilungsfunktion> ]\n[ <Erwartungswert>, <Wert der Variablen>, <Wahrheitswert Verteilungsfunktion> ]
Polar=Polare
Polar.Syntax=[ <Punkt>, <Kegelschnitt> ]
PolyLine=Streckenzug
diff --git a/geogebra/properties/command_el.properties b/geogebra/properties/command_el.properties
index f6c03f3..d061b1b 100644
--- a/geogebra/properties/command_el.properties
+++ b/geogebra/properties/command_el.properties
@@ -71,7 +71,6 @@ ColumnName=\u03a3\u03c4\u03ae\u03bb\u03b7\u039f\u03bd\u03bf\u03bc\u03b1
ColumnName.Syntax=[ <\u039a\u03b5\u03bb\u03af \u039b\u03bf\u03b3\u03b9\u03c3\u03c4\u03b9\u03ba\u03bf\u03cd \u03a6\u03cd\u03bb\u03bb\u03bf\u03c5> ]
Command=\u0395\u03bd\u03c4\u03bf\u03bb\u03ae
CommonDenominator=\u0395\u03bb\u03ac\u03c7\u03b9\u03c3\u03c4\u03bf\u039a\u03bf\u03b9\u03bd\u03cc\u03a0\u03bf\u03bb\u03bb\u03b1\u03c0\u03bb\u03ac\u03c3\u03b9\u03bf\u03a0\u03b1\u03c1\u03bf\u03bd\u03bf\u03bc\u03b1\u03c3\u03c4\u03ce\u03bd
-CompetitionRank.Syntax=[ <\u039b\u03af\u03c3\u03c4\u03b1> ]
CompleteSquare=\u03a3\u03c5\u03bc\u03c0\u03bb\u03ae\u03c1\u03c9\u03c3\u03b7\u03a4\u03b5\u03c4\u03c1\u03b1\u03b3\u03ce\u03bd\u03bf\u03c5
CompleteSquare.Syntax=[ <\u03a4\u03c1\u03b9\u03ce\u03bd\u03c5\u03bc\u03bf> ]
ComplexRoot=\u039c\u03b9\u03b3\u03b1\u03b4\u03b9\u03ba\u03ae\u03a1\u03af\u03b6\u03b1
@@ -111,7 +110,7 @@ Delete.Syntax=[ <\u0391\u03bd\u03c4\u03b9\u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u0
Denominator=\u03a0\u03b1\u03c1\u03bf\u03bd\u03bf\u03bc\u03b1\u03c3\u03c4\u03ae\u03c2
Denominator.Syntax=[ <\u03a3\u03c5\u03bd\u03ac\u03c1\u03c4\u03b7\u03c3\u03b7> ]
Derivative=\u03a0\u03b1\u03c1\u03ac\u03b3\u03c9\u03b3\u03bf\u03c2
-Derivative.Syntax=[ <\u03a3\u03c5\u03bd\u03ac\u03c1\u03c4\u03b7\u03c3\u03b7> ]\n[ <\u039a\u03b1\u03bc\u03c0\u03cd\u03bb\u03b7> ]\n[ <\u03a3\u03c5\u03bd\u03ac\u03c1\u03c4\u03b7\u03c3\u03b7>, <\u0391\u03c1\u03b9\u03b8\u03bc\u03cc\u03c2> ]\n[ <\u039a\u03b1\u03bc\u03c0\u03cd\u03bb\u03b7>, <\u0391\u03c1\u03b9\u03b8\u03bc\u03cc\u03c2> ]
+Derivative.Syntax=[ <\u03a3\u03c5\u03bd\u03ac\u03c1\u03c4\u03b7\u03c3\u03b7> ]\n[ <\u039a\u03b1\u03bc\u03c0\u03cd\u03bb\u03b7> ]\n[ <\u03a3\u03c5\u03bd\u03ac\u03c1\u03c4\u03b7\u03c3\u03b7>, <\u0391\u03c1\u03b9\u03b8\u03bc\u03cc\u03c2> ]\n[ <\u03a3\u03c5\u03bd\u03ac\u03c1\u03c4\u03b7\u03c3\u03b7>, <\u039c\u03b5\u03c4\u03b1\u03b2\u03bb\u03b7\u03c4\u03ae> ]\n[ <\u039a\u03b1\u03bc\u03c0\u03cd\u03bb\u03b7>, <\u0391\u03c1\u03b9\u03b8\u03bc\u03cc\u03c2> ]\n[ <\u03a3\u03c5\u03bd\u03ac\u03c1\u03c4\u03b7\u03c3\u03b7>, <\u039c\u03b5\u03c4\u03b1\u03b2\u03bb\u03b7\u03c4\u03ae>, <\u0391\u03c1\u03b9\u03b8\u03bc\u03cc\u03c2> ]
Determinant=\u039f\u03c1\u03af\u03b6\u03bf\u03c5\u03c3\u03b1
Determinant.Syntax=[ <\u03a0\u03af\u03bd\u03b1\u03ba\u03b1\u03c2> ]
Diameter=\u0394\u03b9\u03ac\u03bc\u03b5\u03c4\u03c1\u03bf\u03c2
@@ -251,8 +250,6 @@ IntersectRegion=\u03a4\u03bf\u03bc\u03ae\u03a0\u03bf\u03bb\u03c5\u03b3\u03ce\u03
IntersectRegion.Syntax=[ <\u03a0\u03bf\u03bb\u03cd\u03b3\u03c9\u03bd\u03bf>, <\u03a0\u03bf\u03bb\u03cd\u03b3\u03c9\u03bd\u03bf> ]
Intersection=\u03a4\u03bf\u03bc\u03ae\u039b\u03b9\u03c3\u03c4\u03ce\u03bd
Intersection.Syntax=[ <\u039b\u03af\u03c3\u03c4\u03b1>, <\u039b\u03af\u03c3\u03c4\u03b1> ]
-IntersectionPaths=\u03a4\u03bf\u03bc\u03ae\u0393\u03b5\u03c9\u03bc\u03b5\u03c4\u03c1\u03b9\u03ba\u03ce\u03bd
-IntersectionPaths.Syntax=\n[ <\u0395\u03c5\u03b8\u03b5\u03af\u03b1>, <\u03a0\u03bf\u03bb\u03cd\u03b3\u03c9\u03bd\u03bf> ]\n[ <\u0395\u03c5\u03b8\u03b5\u03af\u03b1>, <\u039a\u03c9\u03bd\u03b9\u03ba\u03ae> ]
InverseBinomial=\u0391\u03bd\u03c4\u03af\u03c3\u03c4\u03c1\u03bf\u03c6\u03b7\u0394\u03b9\u03c9\u03bd\u03c5\u03bc\u03b9\u03ba\u03ae
InverseBinomial.Syntax=[ <\u0391\u03c1\u03b9\u03b8\u03bc\u03cc\u03c2 \u03b4\u03bf\u03ba\u03b9\u03bc\u03ce\u03bd>, <\u03a0\u03b9\u03b8\u03b1\u03bd\u03cc\u03c4\u03b7\u03c4\u03b1 \u03c4\u03c9\u03bd \u0395\u03c0\u03b9\u03c4\u03c5\u03c7\u03b9\u03ce\u03bd>, <\u03a0\u03b9\u03b8\u03b1\u03bd\u03cc\u03c4\u03b7\u03c4\u03b1> ]
InverseCauchy=\u0391\u03bd\u03c4\u03af\u03c3\u03c4\u03c1\u03bf\u03c6\u03b7Cauchy
@@ -400,11 +397,10 @@ Percentile=\u0395\u03ba\u03b1\u03c4\u03bf\u03c3\u03c4\u03b7\u03bc\u03cc\u03c1\u0
Percentile.Syntax=[ <\u039b\u03af\u03c3\u03c4\u03b1 \u0391\u03c1\u03b9\u03b8\u03bc\u03ce\u03bd>, <\u03a0\u03bf\u03c3\u03bf\u03c3\u03c4\u03cc> ]
Perimeter=\u03a0\u03b5\u03c1\u03af\u03bc\u03b5\u03c4\u03c1\u03bf\u03c2
Perimeter.Syntax=[ <\u03a0\u03bf\u03bb\u03cd\u03b3\u03c9\u03bd\u03bf> ]\n[ <\u039a\u03c9\u03bd\u03b9\u03ba\u03ae \u03a4\u03bf\u03bc\u03ae> ]\n[ <\u0393\u03b5\u03c9\u03bc\u03b5\u03c4\u03c1\u03b9\u03ba\u03cc\u03c2 \u03a4\u03cc\u03c0\u03bf\u03c2> ]
-Plane=\u0395\u03c0\u03af\u03c0\u03b5\u03b4\u03bf
PlaySound=\u03a0\u03b1\u03af\u03be\u03b5\u0397\u03c7\u03bf
PlaySound.Syntax=[ <\u0391\u03c1\u03c7\u03b5\u03af\u03bf> ]\n[ <Boolean \u03a0\u03b1\u03af\u03be\u03b5> ]\n[ <\u0391\u03ba\u03bf\u03bb\u03bf\u03c5\u03b8\u03af\u03b1 \u03b1\u03c0\u03cc \u03bd\u03cc\u03c4\u03b5\u03c2>, <\u039c\u03bf\u03c5\u03c3\u03b9\u03ba\u03cc \u038c\u03c1\u03b3\u03b1\u03bd\u03bf(\u03b1\u03ba\u03ad\u03c1\u03b1\u03b9\u03bf\u03c2)> ]\n[ <\u039d\u03cc\u03c4\u03b1(0-127)>, <\u0394\u03b9\u03ac\u03c1\u03ba\u03b5\u03b9\u03b1(\u03c3\u03b5 sec)>, <\u039c\u03bf\u03c5\u03c3\u03b9\u03ba\u03cc \u038c\u03c1\u03b3\u03b1\u03bd\u03bf(\u03b1\u03ba\u03ad\u03c1\u03b1\u03b9\u03bf\u03c2)> ]\n[ <\u03a3\u03c5\u03bd\u03ac\u03c1\u03c4\u03b7\u03c3\u03b7>, <\u0395\u03bb\u03ac\u03c7\u03b9\u03c3\u03c4\u03b7 \u03c4\u03b9\u03bc\u03ae>, <\u039c\u03ad\u03b3\u03b9\u03c3\u03c4\u03b7 \u03c4\u03b9\u03bc\u03ae> ]\n[ <\u03a3\u03c5\u03bd\u03ac\u03c1\u03c4\u03b7\u03c3\u03b7>, <\u0395\u03bb\u03ac\u03c7\u03b9\u03c3\u03c4\u03b7 \u03c4\u03b9\u03bc\u03ae>, <\u039c\u03ad\u03b3\u03b9\u03c3\u03c4\u03b7 \u03c4\u03b9\u03bc\u03ae>, <\u03a0\u03bf\u03c3\u03bf\u03c3\u03c4\u03cc \u03b4\u03b5\u03af\u03b3\u03bc\u03b1\u03c4\u03bf\u03c2>, <\u0392\u03ac\u03b8\u03bf\u03c2 \u03b4\u03b5\u03af\u03b3\u03bc\u03b1\u03c4\u03bf\u03c2> ]
Point=\u03a3\u03b7\u03bc\u03b5\u03af\u03bf
-Point.Syntax=[ <\u0391\u03bd\u03c4\u03b9\u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03bf> ]\n[ <\u0391\u03bd\u03c4\u03b9\u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03bf>, <\u03a0\u03b1\u03c1\u03ac\u03bc\u03b5\u03c4\u03c1\u03bf\u03c2> ]\n[ <\u03a3\u03b7\u03bc\u03b5\u03af\u03bf>, <\u0394\u03b9\u03ac\u03bd\u03c5\u03c3\u03bc\u03b1> ]
+Point.Syntax=[ <\u0391\u03bd\u03c4\u03b9\u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03bf> ]\n[ <\u039b\u03af\u03c3\u03c4\u03b1> ]\n[ <\u0391\u03bd\u03c4\u03b9\u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03bf>, <\u03a0\u03b1\u03c1\u03ac\u03bc\u03b5\u03c4\u03c1\u03bf\u03c2> ]\n[ <\u03a3\u03b7\u03bc\u03b5\u03af\u03bf>, <\u0394\u03b9\u03ac\u03bd\u03c5\u03c3\u03bc\u03b1> ]
PointIn=\u03a3\u03b7\u03bc\u03b5\u03af\u03bf\u03a3\u03b5
PointIn.Syntax=[ <\u03a0\u03b5\u03c1\u03b9\u03bf\u03c7\u03ae> ]
PointList=\u039b\u03af\u03c3\u03c4\u03b1\u03a3\u03b7\u03bc\u03b5\u03af\u03c9\u03bd
diff --git a/geogebra/properties/command_en_GB.properties b/geogebra/properties/command_en_GB.properties
index 5c2bef9..ad8a6af 100644
--- a/geogebra/properties/command_en_GB.properties
+++ b/geogebra/properties/command_en_GB.properties
@@ -1,4 +1,3 @@
-Button.Syntax=[ ]
\n[ <Caption> ]
CFactor=CFactorise
Center=Centre
Dilate=Enlarge
diff --git a/geogebra/properties/command_es.properties b/geogebra/properties/command_es.properties
index 46198e0..5cdcbc7 100644
--- a/geogebra/properties/command_es.properties
+++ b/geogebra/properties/command_es.properties
@@ -39,7 +39,7 @@ CellRange=RangoCeldas
CellRange.Syntax=[ <Celda Inicial>, <Celda Final> ]
Center=Centro
Center.Syntax=[ <Cónica> ]
-Centroid=Baricentro
+Centroid=Centroide
Centroid.Syntax=[ <Polígono> ]
Checkbox=CasillaControl
Checkbox.Syntax=[ ]\n[ <Subtítulo> ]\n[ <Lista> ]\n[ <Subtítulo>, <Lista> ]
@@ -69,8 +69,6 @@ ColumnName=NombreColumna
ColumnName.Syntax=[ <Celda de Hoja de Cálculo> ]
Command=Comando
CommonDenominator=ComúnDenominador
-CompetitionRank=RangoCompetencia
-CompetitionRank.Syntax=[ <Lista> ]
CompleteSquare=CompletaCuadrado
CompleteSquare.Syntax=[ <Función Cuadrática> ]
ComplexRoot=RaízCompleja
@@ -109,7 +107,7 @@ Delete.Syntax=[ <Objeto> ]
Denominator=Denominador
Denominator.Syntax=[ <Función> ]
Derivative=Derivada
-Derivative.Syntax=[ <Función> ]\n[ <Curva> ]\n[ <Función>, <Orden de la Derivada (número o valor numérico)> ]\n[ <Curva>, <Orden de la Derivada (número o valor numérico)> ]
+Derivative.Syntax=[ <Función> ]\n[ <Curva> ]\n[ <Función>, <Orden de la Derivada (número o valor numérico)> ]\n[ <Función>, <Variable> ]\n[ <Curva>, <Orden de la Derivada (número o valor numérico)> ]\n[ <Función>, <Variable>, <Orden de la Derivada (número o valor numérico)> ]
Determinant=Determinante
Determinant.Syntax=[ <Matriz> ]
Diameter=DiámetroConjugado
@@ -218,7 +216,7 @@ HistogramRight=HistogramaDerecha
HistogramRight.Syntax=[ <Lista de Extremos de Intervalo>, <Lista de Alturas> ]\n[ <Lista de Extremos de Intervalo>, <Lista de Datos en Bruto>, <Densidad en Uso>, <Factor de Escala de Densidad> (opcional) ]\n[ <Boolenana Acumulativa>, <Lista de Extremos de Intervalo>, <Lista de Datos en Bruto>, <Densidad en Uso>, <Factor de Escala de Densidad> (opcional) ]
Hull=Cierre
Hull.Syntax=[ <Lista de Puntos>, <Porcentaje> ]
-HyperGeometric=DistribuciónHipergeométrica
+HyperGeometric=Hipergeométrica
HyperGeometric.Syntax=[ <Tamaño de Población>, <Número de Éxitos>, <Tamaño de Muestra> ]\n[ <Tamaño de Población>, <Número de Éxitos>, <Tamaño de Muestra>, <Acumulativa Booleana> ]\n[ <Tamaño de Población>, <Número de Éxitos>, <Tamaño de Muestra>, <Valor de Variable>, <Acumulativa Booleana> ]
Hyperbola=Hipérbola
Hyperbola.Syntax=[ <Foco (punto)>, <Foco (punto)>, <Semieje Real (número o valor numérico)> ]\n[ <Foco (punto)>, <Foco (punto)>, <Segmento> ]\n[ <Punto>, <Punto>, <Punto> ]
@@ -239,15 +237,13 @@ Insert.Syntax=[ <Lista>, <Lista>, <Posici
IntegerPart=ParteEntera
Integral.Syntax=[ <Función> ]\n[ <Función>, <Valor Inicial de x>, <Valor Final de x> ]\n[ <Función>, <Valor Inicial de x>, <Valor Final de x>, <Condicionante Booleana> ]
IntegralBetween=IntegralEntre
-IntegralBetween.Syntax=[ <Función>, <Función>, <Valor Inicial de x>, <Valor Final de x> ]\n[ <Función>, <Función>, <Valor Inicial de x>, <Valor Final de x>, <Evaluaciòn Booleana> ]
+IntegralBetween.Syntax=[ <Función>, <Función>, <Valor Inicial de x>, <Valor Final de x> ]\n[ <Función>, <Función>, <Valor Inicial de x>, <Valor Final de x>, <Evaluación Booleana> ]
Intersect=Interseca
Intersect.Syntax=[ <Objeto>, <Objeto> ]\n[ <Objeto>, <Objeto>, <Número del Punto de Intersección> ]\n[ <Objeto>, <Objeto>, <Punto Inicial> ]\n[ <Función>, <Función>, <Valor Inicial de x>, <Valor Final de x> ]
IntersectRegion=IntersecaRegiones
IntersectRegion.Syntax=[ <Polígono>, <Polígono> ]
Intersection=Intersección
Intersection.Syntax=[ <Lista>, <Lista> ]
-IntersectionPaths=IntersecaRecorridos
-IntersectionPaths.Syntax=\n[ <Recta (semirrecta o segmento)>, <Polígono> ]\n[ <Recta (semirrecta o segmento)>, <Cónica> ]
InverseBinomial=BinomialInversa
InverseBinomial.Syntax=[ <Número de Ensayos>, <Probabilidad de Exito>, <Probabilidad> ]
InverseCauchy=CauchyInversa
@@ -391,11 +387,10 @@ Percentile=Percentil
Percentile.Syntax=[ <Lista de Números>, <Porcentaje> ]
Perimeter=Perímetro
Perimeter.Syntax=[ <Polígono> ]\n[ <Cônica> ]\n[ <Lugar Geométrico> ]
-Plane=Plano
PlaySound=TocaSonido
PlaySound.Syntax=[ <Archivo> ]\n[ <Ejecución Booleana> ]\n[ <Secuencia de Notas>, <Instrumento> ]\n[ <Nota>, <Duración>, <Instrumento> ]\n[ <Función>, <Valor Mínimo>, <Valor Máximo> ]\n[ <Función>, <Valor Mínimo>, <Valor Máximo>, <Razón Muestral>, <Profundidad Muestral> ]
Point=Punto
-Point.Syntax=[ <Objeto> ]\n[ <Objeto>, <Parámetro> ]\n[ <Punto>, <Vector> ]
+Point.Syntax=[ <Objeto> ]\n[ <Lista> ]\n[ <Objeto>, <Parámetro> ]\n[ <Punto>, <Vector> ]
PointIn=PuntoEn
PointIn.Syntax=[ <Región> ]
PointList=ListaPuntos
@@ -569,7 +564,7 @@ Sort=Ordena
Sort.Syntax=[ <Lista> ]
Spearman.Syntax=[ <Lista de Puntos> ]\n[ <Lista de Números>, <Lista de Números> ]
StartAnimation=IniciaAnimación
-StartAnimation.Syntax=[ ]\n[ <Booleano> ]\n[ <Deslizador o Punto>, <Deslizador o Punto>, .... ]\n[ <Deslizador o Punto>, <Deslizador o Punto>, ...., <Booleano> ]
+StartAnimation.Syntax=[ ]\n[ <Booleano> ]\n[ <Deslizador o Punto>, <Deslizador o Punto>, ... ]\n[ <Deslizador o Punto>, <Deslizador o Punto>, ..., <Booleano> ]
StemPlot=DiagramaTalloHojas
StemPlot.Syntax=[ <Lista> ]\n[ <Lista>, <Ajuste -1|0|1> ]
Stretch=Estira
diff --git a/geogebra/properties/command_et.properties b/geogebra/properties/command_et.properties
index ea23477..c6cdeb0 100644
--- a/geogebra/properties/command_et.properties
+++ b/geogebra/properties/command_et.properties
@@ -375,7 +375,6 @@ Percentile=Protsentiil
Percentile.Syntax=[ <Arvude loend>, <Protsent> ]
Perimeter=Ümbermõõt
Perimeter.Syntax=[ <Hulknurk> ]\n[ <Koonuselõige> ]\n[ <Lookus> ]
-Plane=Tasand
PlaySound=MängiHeli
PlaySound.Syntax=[ <Fail> ]\n[ <Nootide rida>, <Instrument> ]\n[ <Noot>, <Kestus>, <Pikkus> ]\n[ <Funktsioon>, <Minimaalne väärtus>, <Maksimaalne väärtus> ]\n[ <Funktsioon>, <Minimaalne väärtus>, <Maksimaalne väärtus>, <Näidiskiirus>, <Näidissügavus> ]
Point=Punkt
diff --git a/geogebra/properties/command_eu.properties b/geogebra/properties/command_eu.properties
index 8d4ee17..a4d5881 100644
--- a/geogebra/properties/command_eu.properties
+++ b/geogebra/properties/command_eu.properties
@@ -70,8 +70,6 @@ ColumnName=ZutabeaIzena
ColumnName.Syntax=[ <Kalkulu-Orriaren Gelaxka> ]
Command=Komandoa
CommonDenominator=IzendatzaileKomuna
-CompetitionRank=LehiarenHeina
-CompetitionRank.Syntax=[ <Zerrenda> ]
CompleteSquare=OsatuBerbidura
CompleteSquare.Syntax=[ <Funtzio Koadratikoa> ]
ComplexRoot=ErroKonplexua
@@ -249,8 +247,6 @@ IntersectRegion=EbakiEskualdea
IntersectRegion.Syntax=[ <Poligonoa>, <Poligonoa> ]
Intersection=Ebakidura
Intersection.Syntax=[ <Zerrenda>, <Zerrenda> ]
-IntersectionPaths=EbakiBideak
-IntersectionPaths.Syntax=[ <Lerroa>, <Poligonoa> ]\n[ <Lerroa>, <Konika> ]
InverseBinomial=AlderantzizkoBinomiala
InverseBinomial.Syntax=[ <Zenbat Saiakuntza>, <Aldeko Kasuaren Probabilitatea>, <Probabilitatea> ]
InverseCauchy=AlderantzizkoCauchy
@@ -395,7 +391,6 @@ Percentile=Pertzentila
Percentile.Syntax=[ <Zenbakien Zerrenda>, <Ehunekoa> ]
Perimeter=Perimetroa
Perimeter.Syntax=[ <Poligonoa> ]\n[ <Konika> ]\n[ <Leku Geometrikoa> ]
-Plane=Planoa
PlaySound=ErreproduzituSoinua
PlaySound.Syntax=[ <Fitxategia> ]\n[ <Nota-Segida>, <Instrumentua> ]\n[ <Nota>, <Iraupena>, <Luzera> ]\n[ <Funtzioa>, <Balio Minimoa>, <Balio Maximoa> ]\n[ <Funtzioa>, <Balio Minimoa>, <Balio Maximoa>, <Lagin-Tasa>, <Lagin-Sakonera> ]
Point=Puntua
diff --git a/geogebra/properties/command_fi.properties b/geogebra/properties/command_fi.properties
index 705babd..6af31a6 100644
--- a/geogebra/properties/command_fi.properties
+++ b/geogebra/properties/command_fi.properties
@@ -374,7 +374,6 @@ Percentile=Prosenttipiste
Percentile.Syntax=[ <Lukulista>, <Prosentti> ]
Perimeter=Piiri
Perimeter.Syntax=[ <Monikulmio> ]\n[ <Kartioleikkaus> ]\n[ <Ura> ]
-Plane=Taso
PlaySound=SoitaÄäni
PlaySound.Syntax=[ <Tiedosto> ]\n[ <Nuotin sekvenssi>, <Soitin> ]\n[ <Nuotti>, <Kesto>, <Pituus> ]\n[ <Funktio>, <Minimiarvo>, <Maksimiarvo> ]\n[ <Funktio>, <Minimiarvo>, <Maksimiarvo>, <Näytteenottotaajuus>, <Näytteen syvyys> ]
Point=Piste
@@ -492,7 +491,7 @@ SelectedIndex.Syntax=[ <Lista> ]
Semicircle=Puoliympyrä
Semicircle.Syntax=[ <Piste>, <Piste> ]
Sequence=Jono
-Sequence.Syntax=[ <Lauseke>, <Muuttuja>, <Alkuarvo>, <Loppuarvo> ]\n[ <Lauseke>, <Muuttuja>, <Alkuarvo>, <Loppuarvo>, <Askelien määrä> ]
+Sequence.Syntax=[ <Loppuarvo> ]\n[ <Lauseke>, <Muuttuja>, <Alkuarvo>, <Loppuarvo> ]\n[ <Lauseke>, <Muuttuja>, <Alkuarvo>, <Loppuarvo>, <Askeleen pituus> ]
SetActiveView=AsetaAktiivinenPiirtoikkuna
SetActiveView.Syntax=[ <Ikkunan numero 1|2> ]
SetAxesRatio=AsetaAkselienSuhde
diff --git a/geogebra/properties/command_fr.properties b/geogebra/properties/command_fr.properties
index 42de5cb..f5f0766 100644
--- a/geogebra/properties/command_fr.properties
+++ b/geogebra/properties/command_fr.properties
@@ -10,7 +10,7 @@ ApplyMatrix=AppliquerMatrice
ApplyMatrix.Syntax=[ <Matrice>, <Objet> ]
Arc.Syntax=[ <Cercle>, <Point>, <Point> ]\n[ <Ellipse>, <Point>, <Point> ]\n[ <Cercle>, <Valeur Paramètre>, <Valeur Paramètre> ]\n[ <Ellipse>, <Valeur Paramètre>, <Valeur Paramètre> ]
Area=Aire
-Area.Syntax=[ <Conique> ]\n[ <Point>, ..., <Point> ]
+Area.Syntax=[ <Conique> ]\n[ <Polygone> ]\n[ <Point>, ..., <Point> ]
Asymptote.Syntax=[ <Conique> ]\n[ <Fonction> ]\n[ <Courbe implicite> ]
Axes.Syntax=[ <Conique> ]
AxisStepX=PasAxeX
@@ -61,8 +61,6 @@ ColumnName=NomColonne
ColumnName.Syntax=[ <Cellule> ]
Command=Commande
CommonDenominator=DénominateurCommun
-CompetitionRank=Classement
-CompetitionRank.Syntax=[ <Liste> ]
CompleteSquare=FormeCanonique
CompleteSquare.Syntax=[ <Fonction 2d degré> ]
ComplexRoot=RacineComplexe
@@ -100,7 +98,7 @@ Delete.Syntax=[ <Objet> ]
Denominator=Dénominateur
Denominator.Syntax=[ <Fonction> ]
Derivative=Dérivée
-Derivative.Syntax=[ <Fonction> ]\n[ <Courbe> ]\n[ <Fonction>, <Valeur> ]\n[ <Courbe>, <Valeur> ]
+Derivative.Syntax=[ <Fonction> ]\n[ <Courbe> ]\n[ <Fonction>, <Ordre> ]\n[ <Fonction>, <Variable> ]\n[ <Courbe>, <Ordre> ]\n[ <Fonction>, <Variable>, <Ordre> ]
Determinant=Déterminant
Determinant.Syntax=[ <Matrice> ]
Diameter=Diamètre
@@ -229,8 +227,6 @@ IntersectRegion=IntersectionR
IntersectRegion.Syntax=[ <Polygone>, <Polygone> ]
Intersection=Inter
Intersection.Syntax=[ <Liste>, <Liste> ]
-IntersectionPaths=IntersectionChemins
-IntersectionPaths.Syntax=\n[ <Ligne>, <Polygone> ]\n[ <Ligne>, <Conique> ]
InverseBinomial=InverseBinomiale
InverseBinomial.Syntax=[ <Nombre Essais>, <Probabilité Succès>, <Probabilité> ]
InverseCauchy.Syntax=[ <Médiane>, <Echelle>, <Probabilité> ]
@@ -274,7 +270,7 @@ LeftSide=MembreGauche
LeftSum=SommeGauche
LeftSum.Syntax=[ <Fonction>, <x min>, <x max>, <Nombre Rectangles> ]
Length=Longueur
-Length.Syntax=[ <Vecteur> ]\n[ <Point> ]\n[ <Liste> ]\n[ <Texte> ]\n[ <Lieu> ]\n[ <Fonction>, <x min>, <x max> ]\n[ <Fonction>, <Point Début>, <Point Fin> ]\n[ <Courbe>, <x min>, <x max> ]\n[ <Courbe>, <Point Début>, <Point Fin> ]
+Length.Syntax=[ <Vecteur> ]\n[ <Point> ]\n[ <Liste> ]\n[ <Texte> ]\n[ <Lieu> ]\n[ <Segment> ]\n[ <Fonction>, <x min>, <x max> ]\n[ <Fonction>, <Point Début>, <Point Fin> ]\n[ <Courbe>, <x min>, <x max> ]\n[ <Courbe>, <Point Début>, <Point Fin> ]
LetterToUnicode=LettreEnUnicode
LetterToUnicode.Syntax=[ "<Lettre>" ]
Limit=Limite
@@ -363,10 +359,9 @@ Percentile=Centile
Percentile.Syntax=[ <Liste Nombres>, <Pourcentage> ]
Perimeter=Périmètre
Perimeter.Syntax=[ <Polygone> ]\n[ <Conique> ]\n[ <Lieu> ]
-Plane=Plan
PlaySound=JouerSon
PlaySound.Syntax=[ <Fichier> ]\n[ <false|true> ]\n[ <Chaîne Notes>, <Instrument> ]\n[ <Note>, <Durée>, <Instrument> ]\n[ <Fonction>, <Valeur Min>, <Valeur Max> ]\n[ <Fonction>, <Valeur Min>, <Valeur Max>, <Débit>, <Profondeur> ]
-Point.Syntax=[ <Objet> ]\n[ <Objet>, <Paramètre> ]\n[ <Point>, <Vecteur> ]
+Point.Syntax=[ <Objet> ]\n[ <Liste> ]\n[ <Objet>, <Paramètre> ]\n[ <Point>, <Vecteur> ]
PointIn=PointDans
PointIn.Syntax=[ <Région> ]
PointList=PointListe
diff --git a/geogebra/properties/command_gl.properties b/geogebra/properties/command_gl.properties
index 0e11dce..90a2793 100644
--- a/geogebra/properties/command_gl.properties
+++ b/geogebra/properties/command_gl.properties
@@ -1,316 +1,677 @@
-AffineRatio=RazónSegmentos
-AffineRatio.Syntax=[ <Punto>, <Punto>, <Punto> ]
+ANOVA.Syntax=[ <Lista>, <Lista>, ...]
+AffineRatio=RazónSimple
+AffineRatio.Syntax=[ <Punto inicial>, <Punto final>, <Punto aliñado> ]
Angle=Ángulo
-Angle.Syntax=[ <Obxecto> ]\n[ <Vector>, <Vector> ]\n[ <Recta>, <Recta> ]\n[ <Punto>, <Punto>, <Punto> ]\n[ <Punto>, <Punto>, <Ángulo> ]
+Angle.Syntax=[ <Obxecto> ]\n[ <Vector inicial>, <Vector final> ]\n[ <Lado (recta, semirecta ou segmento)>, <lado (recta, semirecta ou segmento)> ]\n[ <Punto no lado inicial>, <Vértice>, <Punto no lado final> ]\n[ <Punto no lado inicial>, <Vértice>, <Ángulo antihorario> ]
AngularBisector=Bisectriz
AngularBisector.Syntax=[ <Recta>, <Recta> ]\n[ <Punto>, <Punto>, <Punto> ]
-Append=Engadir
+Append=Engade
Append.Syntax=[ <Lista>, <Obxecto> ]\n[ <Obxecto>, <Lista> ]
+ApplyMatrix=AplicaMatriz
+ApplyMatrix.Syntax=[ <Matriz>, <Obxecto> ]
Arc=Arco
-Arc.Syntax=[ <Cónica>, <Punto>, <Punto> ]\n[ <Cónica>, <Parámetro Variable>, <Parámetro Variable> ]
+Arc.Syntax=[ <Circunferencia>, <Punto>, <Punto> ]\n[ <Elipse>, <Punto>, <Punto> ]\n[ <Circunferencia>, <Valor parámetro>, <Valor parámetro> ]\n[ <Elipse>, <Valor parámetro>, <Valor parámetro> ]
Area=Área
-Area.Syntax=[ <Cónica> ]\n[ <Punto>, ..., <Punto> ]
+Area.Syntax=[ <Circunferencia ou elipse> ]\n[ <Punto>, ..., <Punto> ]\n[ <Polígono> ]
Asymptote=Asíntota
-Asymptote.Syntax=[ <Cónica> ]
+Asymptote.Syntax=[ <Cónica> ]\n[ <Función> ]\n[ <Curva implícita> ]
Axes=Eixes
Axes.Syntax=[ <Cónica> ]
AxisStepX=PasoEixeX
+AxisStepX.Syntax=[]
AxisStepY=PasoEixeY
+AxisStepY.Syntax=[]
BarChart=GráficoBarras
-BarChart.Syntax=[ <Lista Datos>, <Lista Frecuencias> ]\n[ <Serie Bruta>, <Ancho Barras> ]\n[ <Lista Datos>, <Lista Frecuencias>, <Ancho Barras> ]\n[ <Valor Inicial>, <Valor Final>, <Lista Alturas> ]\n[ <Valor Inicial>, <Valor Final>, <Expresión>, <Variable>, <Dende Número>, <Ata Número> ]\n[ <Valor Inicial>, <Valor Final>, <Expresión>, <Variable>, <Dende Número>, <Ata Número>, <Incremento> ]
-Binomial=Binomio
-Binomial.Syntax=[ <Número>, <Número> ]
-BoxPlot=DiagramaCaja
-BoxPlot.Syntax=[ <yDesprazamento>, <yEscala>, <Serie Bruta> ]\n[ <yDesprazamento>, <yEscala>, <Valor Inicial>, <Q1>, <Mediana>, <Q3>, <Valor Final> ]
+BarChart.Syntax=[ <Lista datos>, <Lista frecuencias> ]\n[ <Lista datos>, <Lista frecuencias>, <Ancho barras> ]\n[ <Lista datos en bruto>, <Ancho barras> ]\n[ <Valor inicial>, <Valor final>, <Lista alturas> ]\n[ <Valor inicial>, <Valor final>, <Expresión>, <Variable>, <Dende número>, <Ata número> ]\n[ <Valor inicial>, <Valor final>, <Expresión>, <Variable>, <Dende número>, <Ata número>, <Incremento> ]
+Bernoulli=DistribuciónBernouilli
+Bernoulli.Syntax=[ <Probabilidade>, <Acumula (Booleana)> ]
+Binomial=NúmeroCombinatorio
+Binomial.Syntax=[ <Número n>, <Número k> ]
+BinomialDist=DistribuciónBinomial
+BinomialDist.Syntax=[ <Número de ensaios>, <Probabilidade de éxito> ]\n[ <Número de ensaios>, <Probabilidade de éxito>, <Acumula (Booleana)> ]\n[ <Número de ensaios>, <Probabilidade de éxito>, <Valor da variable>, <Acumula (Booleana)> ]
+BoxPlot=DiagramaCaixa
+BoxPlot.Syntax=[ <yDesprazamento>, <yEscala>, <Lista datos en bruto> ]\n[ <yDesprazamento>, <yEscala>, <Valor Inicial>, <Q1>, <Mediana>, <Q3>, <Valor Final> ]
+Button=Botón
+Button.Syntax=[]\n[ <Título> ]
+CFactor=FactorizaC
+CSolutions=SoluciónsC
+CSolve=ResolveC
+Cauchy=DistribuciónCauchy
+Cauchy.Syntax=[ <Mediana>, <Escala>, x ]\n[ <Mediana>, <Escala>, x, <Acumular (Booleana)> ]\n[ <Mediana>, <Escala>, <Valor da variable> ]
+Cell=Cela
+Cell.Syntax=[ <Columna>, <Fila> ]
CellRange=RangoCela
CellRange.Syntax=[ <Cela Inicial>, <Cela Final> ]
Center=Centro
Center.Syntax=[ <Cónica> ]
Centroid=Centroide
Centroid.Syntax=[ <Polígono> ]
+Checkbox=CaixaControl
+Checkbox.Syntax=[]\n[ <Título> ]\n[ <Lista>]\n[ <Título> , <Lista>]
+ChiSquared=DistribuciónChiCuadrado
+ChiSquared.Syntax=[ <Graos de liberdade>, x ]\n[ <Graos de liberdade>, x, <Acumula (Booleana)> ] \n[ <Graos de liberdade>, <Valor da variable> ]
Circle=Circunferencia
-Circle.Syntax=[ <Punto>, <Radio en números> ]\n[ <Punto>, <Segmento> ]\n[ <Punto>, <Punto> ]\n[ <Punto>, <Punto>, <Punto> ]
-CircleArc=ArcoCircular
-CircleArc.Syntax=[ <Punto Medio>, <Punto>, <Punto> ]
+Circle.Syntax=[ <Centro>, <Raio (número)> ]\n[ <Centro>, <Raio (segmento)> ]\n[ <Centro>, <Punto> ]\n[ <Punto>, <Punto>, <Punto> ]
+CircleArc=ArcoCircunferencia
+CircleArc.Syntax=[ <Centro>, <Punto inicial>, <Punto final antihorario> ]
CircleSector=SectorCircular
-CircleSector.Syntax=[ <Punto Medio>, <Punto>, <Punto> ]
-CircumcircleArc=ArcoCircunferencia
-CircumcircleArc.Syntax=[ <Punto>, <Punto>, <Punto> ]
-CircumcircleSector=SectorCircunferencia
-CircumcircleSector.Syntax=[ <Punto>, <Punto>, <Punto> ]
+CircleSector.Syntax=[ <Centro>, <Punto inicial>, <Punto final antihorario> ]
+CircumcircleArc=ArcoCirc3P
+CircumcircleArc.Syntax=[ <Punto extremo>, <Punto medio>, <Punto extremo> ]
+CircumcircleSector=SectorCircular3P
+CircumcircleSector.Syntax=[ <Punto extremo>, <Punto medio>, <Punto extremo> ]
Circumference=PerímetroCónica
-Circumference.Syntax=[ <Cónica> ]
+Circumference.Syntax=[ <Circunferencia ou elipse> ]
+Classes=Clases
+Classes.Syntax=[ <Lista de datos>, <Número de clases> ]\n[ <Lista de datos>, <Inicio>, <Ancho das clases> ]
+ClosestPoint=PuntoMáisPróximo
+ClosestPoint.Syntax=[ <Percorrido>, <Punto> ]
+Coefficients=Coeficientes
+Coefficients.Syntax=[ <Polinomio> ]\n[ <Cónica> ]
Column=Columna
Column.Syntax=[ <Cela da Folla de Cálculo> ]
ColumnName=NomeColumna
ColumnName.Syntax=[ <Cela da Folla de Cálculo> ]
Command=Comando
+CommonDenominator=ComúnDenominador
+CompleteSquare=CompletaCadrado
+CompleteSquare.Syntax=[ <Función cuadrática> ]
+ComplexRoot=RaícesComplexas
+ComplexRoot.Syntax=[ <Polinomio> ]
Conic=Cónica
-Conic.Syntax=[ <Punto>, <Punto>, <Punto>, <Punto>, <Punto> ]
+Conic.Syntax=[ <Punto>, <Punto>, <Punto>, <Punto>, <Punto> ]\n[ <Coef. x^2>, <Coef. xy>, <Coef. y^2>, <Coef. x>, <Coef. y>, <Termo ind.> ]
ConstructionStep=PasoConstrución
-ConstructionStep.Syntax=[ ]\n[ <Obxecto> ]
+ConstructionStep.Syntax=[]\n[ <Obxecto> ]
+ConvexHull=PecheConvexo
+ConvexHull.Syntax=[ <Lista de puntos> ]
+CopyFreeObject=CopiaObxectoLibre
+CopyFreeObject.Syntax=[ <Obxecto>]
Corner=Esquina
-Corner.Syntax=[ <Número de Esquina> ]\n[ <Imaxe>, <Número de Esquina> ]\n[ <Texto>, <Número de Esquina> ]
+Corner.Syntax=[ <Imaxe>, <Número de Esquina> ]\n[ <Texto>, <Número de Esquina> ]\n[ <Vista gráfica>, <Número de Esquina> ]\n[ <Número de Esquina> ]
CountIf=ContarSe
CountIf.Syntax=[ <Condición>, <Lista> ]
Covariance=Covarianza
Covariance.Syntax=[ <Lista de Puntos> ]\n[ <Lista de Números>, <Lista de Números> ]
-CrossRatio=RazónDupla
+Cross=ProdutoVectorial
+CrossRatio=RazónDobre
CrossRatio.Syntax=[ <Punto>, <Punto>, <Punto>, <Punto> ]
Curvature=Curvatura
Curvature.Syntax=[ <Punto>, <Función> ]\n[ <Punto>, <Curva> ]
CurvatureVector=VectorCurvatura
CurvatureVector.Syntax=[ <Punto>, <Función> ]\n[ <Punto>, <Curva> ]
-CurveCartesian=Curva
-CurveCartesian.Syntax=[ <Expresión>, <Expresión>, <Parámetro Variable>, <Valor Inicial>, <Valor Final> ]
+CurveCartesian=CurvaParamétrica
+CurveCartesian.Syntax=[ <Expresión>, <Expresión>, <Parámetro>, <Valor Inicial>, <Valor Final> ]
Defined=EstáDefinido
Defined.Syntax=[ <Obxecto> ]
-Delete=Borrar
+Degree=Grao
+Degree.Syntax=[ <Polinomio> ]
+DelauneyTriangulation=Delauney
+DelauneyTriangulation.Syntax=[ <Lista de puntos> ]
+Delete=Borra
Delete.Syntax=[ <Obxecto> ]
+Denominator=Denominador
+Denominator.Syntax=[ <Función> ]
Derivative=Derivada
-Derivative.Syntax=[ <Función> ]\n[ <Curva> ]\n[ <Función>, <Número> ]\n[ <Curva>, <Número> ]
+Derivative.Syntax=[ <Función> ]\n[ <Curva> ]\n[ <Función>, <Orde da derivada> ]\n[ <Función>, <Variable> ]\n[ <Curva>, <Orde da derivada> ]\n[ <Función>, <Variable>, <Orde da derivada> ]
Determinant=Determinante
Determinant.Syntax=[ <Matriz> ]
-Diameter=Diámetro
-Diameter.Syntax=[ <Vector>, <Cónica> ]\n[ <Recta>, <Cónica> ]
+Diameter=DiámetroConxugado
+Diameter.Syntax=[ <Vector>, <Cónica> ]\n[ <Dirección (recta, semirrecta ou segmento)>, <Cónica> ]
Dilate=Homotecia
-Dilate.Syntax=[ <Obxecto>, <Factor>, <Centro> ]
+Dilate.Syntax=[ <Obxecto>, <Factor de Escala (número o valor numérico)>, <Centro (punto)> ]\n[ <Obxecto>, <Factor de Escala (número o valor numérico)>]
+Dimension=Dimensión
Direction=Dirección
-Direction.Syntax=[ <Recta> ]
+Direction.Syntax=[ <Recta, semirrecta ou segmento> ]
Directrix=Directriz
-Directrix.Syntax=[ <Cónica> ]
+Directrix.Syntax=[ <Parábola> ]
Distance=Distancia
-Distance.Syntax=[ <Punto>, <Punto> ]\n[ <Punto>, <Recta> ]
-Div=División
-Div.Syntax=[ <Dividendo>, <Divisor> ]
+Distance.Syntax=[ <Punto>, <Obxecto (punto, recta, cónica... )> ]
+Div=Cociente
+Div.Syntax=[ <Dividendo (número ou valor numérico)>, <Divisor (número ou valor numérico) ]\n[ <Dividendo (polinomio)>, <Divisor (polinomio)> ]
+Division=Cociente
+Divisors=NúmeroDivisores
+DivisorsList=ListaDivisores
+DivisorsSum=SumaDivisores
+Dot=ProductoEscalar
+DotPlot=GráficoDePuntos[ <Lista de números> ]DotPlotSyntax=GráficoDePuntos[ <Lista de números> ]DotSyntaxCAS=ProductoEscalar[ <Vector>, <Vector> ]
+DotPlot.Syntax=[ <Lista de datos en bruto> ]
+DynamicCoordinates=CoordenadasDinámicas
+DynamicCoordinates.Syntax=[ <Punto>, <Número>, <Número> ]
+Eccentricity=Excentricidade
+Eccentricity.Syntax=[ <Cónica>]
Element=Elemento
-Element.Syntax=[ <Lista>, <Posición do Elemento> ]
+Element.Syntax=[ <Lista>, <Posición do elemento> ]\n[ <Matriz>, <Fila>, <Columna> ]\n[ <Lista>, <Índice1>, <Índice2>, ... ]
Ellipse=Elipse
-Ellipse.Syntax=[ <Foco>, <Foco>, <Lonxitude Eixe Principal> ]\n[ <Foco>, <Foco>, <Segmento> ]\n[ <Punto>, <Punto>, <Punto> ]
-Excentricity=Excentricidade
+Ellipse.Syntax=[ <Foco>, <Foco>, <Semieixe principal (número)> ]\n[ <Foco>, <Foco>, <Semieixe principal (segmento)> ]\n[ <Foco>, <Foco>, <Punto polo que pasa> ]
+Erlang=DistribuciónErlang
+Erlang.Syntax=[ <Forma (número)>, <Razón>, x ]\n[ <Forma (número)>, <Razón>, x, <Acumula (booleana)> ]\n[ <Forma (número)>, <Razón>, <Valor da variable> ]
+Excentricity=SemidistanciaFocal
Excentricity.Syntax=[ <Cónica> ]
-Expand=Expandir
+Execute=Executa
+Execute.Syntax=[ <Lista de textos> ]\n[ <Lista de textos>, <Parámetro>, <Parámetro>, ...]
+Expand=Desenvolve
Expand.Syntax=[ <Función> ]
+Exponential=DistribuciónExponencial
+Exponential.Syntax=[ <Parámetro Lambda>, x ]\n[ <Parámetro Lambda>, x, <Acumula (booleana)> ]\n[ <Parámetro Lambda>, <Valor da variable> ]
Extremum=Extremo
-Extremum.Syntax=[ <Polinomio> ]
+Extremum.Syntax=[ <Polinomio> ]\n[ <Función>, <Valor x inicial>, <Valor x final> ] ]
+FDistribution=DistribuciónF
+FDistribution.Syntax=[ <Graos de liberdade do numerador>, <Graos de liberdade do denominador>, x ]\n[ <Graos de liberdade do numerador>, <Graos de liberdade do denominador>, x , <Acumula (booleana)> ]\n[ <Graos de liberdade do numerador>, <Graos de liberdade do denominador>, <Valor da variable> ]
+Factor=Factoriza
Factor.Syntax=[ <Polinomio> ]
+Factors=Factores
+Factors.Syntax=[ <Polinomio> ]\n[ <Número> ]
+FillCells=RecheaCelas
+FillCells.Syntax=[ <Rango de celas>, <Obxecto> ]\n[ <Cela>, <Lista> ]\n[ <Cela>, <Matriz> ]
+FillColumn=RecheaColumna
+FillColumn.Syntax=[ <Columna>, <Lista> ]
+FillRow=RecheaFila
+FillRow.Syntax=[ <Fila>, <Lista> ]
First=Primeiro
-First.Syntax=[ <Lista> ]\n[ <Lista>, <Número de Elementos> ]
+First.Syntax=[ <Lista> ]\n[ <Lista>, <Número de elementos> ]\n[ <Texto> ]\n[ <Texto>, <Número de elementos> ]\n[ <Lugar xeométrico>, <Número de elementos> ]
FirstAxis=EixePrincipal
FirstAxis.Syntax=[ <Cónica> ]
FirstAxisLength=LonxitudeEixePrincipal
FirstAxisLength.Syntax=[ <Cónica> ]
+Fit=Axusta
+Fit.Syntax=[ <Lista de puntos>, <Lista de funcións> ]\n[ <Lista de puntos>, <Función> ]
FitExp=AxusteExp
-FitExp.Syntax=[ <Lista de Puntos> ]
-FitLineX=AxusteRectaX
-FitLineX.Syntax=[ <Lista de Puntos> ]
-FitLineY=AxusteRectaY
-FitLineY.Syntax=[ <Lista de Puntos> ]
-FitLog=AxusteFnLogarítmica
+FitExp.Syntax=[ <Lista de puntos> ]
+FitGrowth=AxusteExp
+FitGrowth.Syntax=[ <Lista de puntos> ]
+FitLineX=AxusteLinealX
+FitLineX.Syntax=[ <Lista de puntos> ]
+FitLineY=AxusteLineal
+FitLineY.Syntax=[ <Lista de puntos> ]
+FitLog=AxusteLogarítmico
FitLog.Syntax=[ <Lista de puntos> ]
-FitLogistic=AxusteFnLoxística
-FitLogistic.Syntax=[ <Lista de Puntos> ]
-FitPoly=AxusteFnPolinómica
-FitPoly.Syntax=[ <Lista de puntos>, <Grao do Polinomio> ]
-FitPow=AxusteFnPotencial
-FitPow.Syntax=[ <Lista de Puntos> ]
-FitSin=FixaSin
-FitSin.Syntax=[ <Lista de Puntos> ]
+FitLogistic=AxusteLoxístico
+FitLogistic.Syntax=[ <Lista de puntos> ]
+FitPoly=AxustePolinómico
+FitPoly.Syntax=[ <Lista de puntos>, <Grao do polinomio> ]
+FitPow=AxustePotencial
+FitPow.Syntax=[ <Lista de puntos> ]
+FitSin=AxusteSinusoidal
+FitSin.Syntax=[ <Lista de Puntos (polo menos 4)> ]
Focus=Foco
Focus.Syntax=[ <Cónica> ]
FractionText=TextoFracción
FractionText.Syntax=[ <Número> ]
+FractionalPart=ParteFraccionaria
+Frequency=Frecuencia
+Frequency.Syntax=[ <Lista de datos> ]\n[ <Acumula (booleana), <Lista de datos> ]\n[ <Lista de límites de clase>, <Lista de datos> ]\n[ <Acumula (booleana), <Lista de límites de clase>, <Lista de datos> ]\n[ <Lista de límites de clase>, <Lista de datos>, <Usa densidade (booleana)>, <Factor de escala de densidade> (opcional)> ]\n[ <Acumula (booleana), <Lista de límites de clase>, <Lista de datos>, <Usa densidade (booleana)>, <Factor de escala de densidade> (opcional)> ]
+FrequencyPolygon=PolígonoFrecuencia
+FrequencyPolygon.Syntax=[ <Lista de límites de clase>, <Lista de alturas> ]\n[ <Lista de límites de clase>, <Lista de datos>, <Usa densidade (booleana)>, <Factor de escala de densidade (opcional)> ]\n[ <Acumula (booleana)>, <Lista de límites de clase>, <Lista de datos>, <Usa densidade (booleana)>, <Factor de escala de densidade> (opcional)> ]
+FrequencyTable=TáboaFrecuencia
+FrequencyTable.Syntax=[ <Lista de datos> ]\n[ <Acumula (booleana), <Lista de datos> ]\n[ <Lista de límites de clase>, <Lista de datos> ]\n[ <Acumula (booleana), <Lista de límites de clase>, <Lista de datos> ]\n[ <Lista de límites de clase>, <Lista de datos>, <Usa densidade (booleana)>, <Factor de escala de densidade> (opcional)> ]\n[ <Acumula (booleana), <Lista de límites de clase>, <Lista de datos>, <Usa densidade (booleana)>, <Factor de escala de densidade> (opcional)> ]
Function=Función
-Function.Syntax=[ <Función>, <Valor Inicial X>, <Valor Final X> ]
+Function.Syntax=[ <Función>, <Valor inicial x>, <Valor final x> ]
GCD=MCD
-GCD.Syntax=[ <Lista de Números> ]\n[ <Número>, <Número> ]
+GCD.Syntax=[ <Número>, <Número> ]\n[ <Lista de números> ]
+Gamma=DistribuciónGamma
+Gamma.Syntax=[ <Alfa>, <Beta>, x ]\n[ <Alfa>, <Beta>, x, <Acumula (booleana)> ]\n[ <Alfa>, <Beta>, <Valor da variable> ]
+GeometricMean=MediaXeométrica
+GeometricMean.Syntax=[ <Lista de números> ]
+GetTime=TempoActual
+GetTime.Syntax=[]
+HarmonicMean=MediaHarmónica
+HarmonicMean.Syntax=[ <Lista de números> ]
+HideLayer=OcultaCapa
+HideLayer.Syntax=[ <Número> ]
Histogram=Histograma
-Histogram.Syntax=[ <Serie Clases>, <Serie Alturas> ]\n[ <Serie Clases>, <Serie Bruta> ]
+Histogram.Syntax=[ <Lista de límites de clases>, <Lista de alturas> ]\n[ <Lista de límites de clases>, <Lista de datos>, <Usa densidade (booleana)>, <Factor de escala de densidade (opcional)> ]\n[ <Acumula (booleana)>, <Lista de límites de clase>, <Lista de datos>, <Usa densidade (booleana)>, <Factor de escala de densidade> (opcional)> ]
+HistogramRight=HistogramaDereita
+HistogramRight.Syntax=[ <Lista de límites de clases>, <Lista de alturas> ]\n[ <Lista de límites de clases>, <Lista de datos>, <Usa densidade (booleana)>, <Factor de escala de densidade (opcional)> ]\n[ <Acumula (booleana)>, <Lista de límites de clase>, <Lista de datos>, <Usa densidade (booleana)>, <Factor de escala de densidade> (opcional)> ]
+Hull=Peche
+Hull.Syntax=[ <Lista de puntos>, <Tanto por un> ]
+HyperGeometric=DistribuciónHiperXeométrica
+HyperGeometric.Syntax=[ <Tamaño da poboación>, <Número de éxitos>, <Tamaño da mostra> ]\n[ <Tamaño da poboación>, <Número de éxitos>, <Tamaño da mostra>, <Acumula (booleana)> ]\n[ <Tamaño da poboación>, <Número de éxitos>, <Tamaño da mostra>, <Valor da variable>, <Acumula (booleana)> ]
Hyperbola=Hipérbole
-Hyperbola.Syntax=[ <Foco>, <Foco>, <Lonxitude Eixe Principal> ]\n[ <Foco>, <Foco>, <Segmento> ]\n[ <Punto>, <Punto>, <Punto> ]
+Hyperbola.Syntax=[ <Foco>, <Foco>, <Semieixe principal (lonxitude )> ]\n[ <Foco>, <Foco>, <Semieixe principal (segmento)> ]\n[ <Foco>, <Foco>, <Punto polo que pasa> ]
+Identity=Identidade
+Identity.Syntax=[ <Número> ]
If=Se
If.Syntax=[ <Condición>, <Entón> ]\n[ <Condición>, <Entón>, <Senón> ]
+Imaginary=ParteImaxinaria
+ImplicitCurve=CurvaImplícita
+ImplicitCurve.Syntax=[ <Lista de puntos> ]\n[ <f(x, y)> ]
+ImplicitDerivative=DerivadaImplícita
+Incircle=CircunferenciaInscrita
+Incircle.Syntax=[ <Punto>, <Punto>, <Punto> ]IndexOf=Índice
+IndexOf=ÍndiceDe
+IndexOf.Syntax=[ <Obxecto>, <Lista> ]\n[ <Obxecto>, <Lista>, <Índice inicial> ]\n[ <Texto>, <Texto> ]\n[ <Texto>, <Texto>, <Índice inicial> ]
Insert=Inserir
Insert.Syntax=[ <Lista>, <Lista>, <Posición> ]\n[ <Obxecto>, <Lista>, <Posición> ]
-Integral.Syntax=[ <Función> ]\n[ <Función>, <Valor Inicial X>, <Valor Final X> ]\n[ <Función>, <Función>, <Valor Inicial X>, <Valor Final X> ]
-Intersect=Intersección
-Intersect.Syntax=[ <Obxecto>, <Obxecto> ]\n[ <Obxecto>, <Obxecto>, <Número do Punto de Intersección> ]\n[ <Obxecto>, <Obxecto>, <Punto Inicial> ]
+IntegerPart=ParteEnteira
+Integral.Syntax=[ <Función> ]\n[ <Función>, <Valor inicial x>, <Valor final x> ]\n[ <Función>, <Valor Inicial x>, <Valor final x>, <Avalía (booleana)> ]
+IntegralBetween=IntegralEntre
+IntegralBetween.Syntax=[ <Función>, <Función>, <Valor inicial x>, <Valor final x> ]\n[ <Función>, <Función>, <Valor Inicial x>, <Valor final x>, <Avalía (booleana)> ]
+Intersect=Interseca
+Intersect.Syntax=[ <Obxecto>, <Obxecto> ]\n[ <Obxecto>, <Obxecto>, <Número do punto de intersección> ]\n[ <Obxecto>, <Obxecto>, <Punto inicial> ]\n[ <Función>, <Función>, <Valor inicial x>, <Valor final x> ]
+IntersectRegion=IntersecaRexións
+IntersectRegion.Syntax=[ <Polígono>, <Polígono> ]
Intersection=Intersección
Intersection.Syntax=[ <Lista>, <Lista> ]
-InverseNormal=NormalInversa
-InverseNormal.Syntax=[ <Media>, <Desviación Estándar>, <Probabilidade> ]
-Invert=Inversa
+InverseBinomial=DistribuciónBinomialInversa
+InverseBinomial.Syntax=[ <Número de ensaios>, <Probabilidade de éxito>, <Probabilidade> ]
+InverseCauchy=DistribuciónCauchyInversa
+InverseCauchy.Syntax=[ <Mediana>, <Escala>, <Probabilidade> ]
+InverseChiSquared=DistribuciónChiCuadradoInversa
+InverseChiSquared.Syntax=[ <Graos de liberdade>, <Probabilidade> ]
+InverseExponential=DistribuciónExponencialInversa
+InverseExponential.Syntax=[ <Parámetro Lambda>, <Probabilidade> ]
+InverseFDistribution=DistribuciónFInversa
+InverseFDistribution.Syntax=[ <Graos de liberdade do numerador>, <Graos de liberdade do denominador>, <Probabilidade> ]
+InverseGamma=DistribuciónGammaInversa
+InverseGamma.Syntax=[ <Alfa>, <Beta>, <Probabilidade> ]
+InverseHyperGeometric=DistribuciónHiperXeométricaInversa
+InverseHyperGeometric.Syntax=[ <Tamaño da poboación>, <Número de éxitos>, <Tamaño da mostra>, <Probabilidade> ]
+InverseNormal=DistribuciónNormalInversa
+InverseNormal.Syntax=[ <Media>, <Desviación estándar>, <Probabilidade> ]
+InversePascal=DistribuciónPascalInversa
+InversePascal.Syntax=[ <Número de éxitos>, <Probabilidade de éxito>, <Probabilidade> ]
+InversePoisson=DistribuciónPoissonInversa
+InversePoisson.Syntax=[ <Media>, <Probabilidade> ]
+InverseTDistribution=DistribuciónTInversa
+InverseTDistribution.Syntax=[ <Graos de liberdade>, <Probabilidade> ]
+InverseWeibull=DistribuciónWeibullInversa
+InverseWeibull.Syntax=[ <Forma (número)>, <Escala>, <Probabilidade> ]
+InverseZipf=DistribuciónZipfInversa
+InverseZipf.Syntax=[ <Número de elementos>, <Expoñente>, <Probabilidade> ]
+Invert=Inverte
Invert.Syntax=[ <Matriz> ]
-IsInteger=EsEntero
+IsInRegion=EstáEnRexión
+IsInRegion.Syntax=[ <Punto>, <Rexión> ]
+IsInteger=ÉEnteiro
IsInteger.Syntax=[ <Número> ]
+IsPrime=ÉPrimo
Iteration=Iteración
-Iteration.Syntax=[ <Función>, <Valor Inicial>, <Número de Iteracións> ]
+Iteration.Syntax=[ <Función>, <Valor inicial>, <Número de iteracións> ]
IterationList=ListaIteración
-IterationList.Syntax=[ <Función>, <Valor inicial>, <Número de Iteracións> ]
-Join=Concatenar
-Join.Syntax=[ <Lista de Listas> ]\n[ <Lista>, <Lista>, ... ]
+IterationList.Syntax=[ <Función>, <Valor inicial>, <Número de iteracións> ]
+Join=Concatena
+Join.Syntax=[ <Lista>, <Lista>, ... ]\n[ <Lista de listas> ]
KeepIf=ManterSe
KeepIf.Syntax=[ <Condición>, <Lista> ]
LCM=MCM
-LCM.Syntax=[ <Lista de Números> ]\n[ <Número>, <Número> ]
-LaTeX=LaTeX
-LaTeX.Syntax=[ <Obxecto> ]\n[ <Obxecto>, <Valor Booleano para a Substitución de Variables> ]
+LCM.Syntax=[ <Número>, <Número> ]\n[ <Lista de números> ]
+LaTeX=FórmulaTexto
+LaTeX.Syntax=[ <Obxecto> ]\n[ <Obxecto>, <Substitúe variables (booleana)> ]\n[ <Obxecto>, <Substitúe variables (booleana)>, <Mostra nome (booleana)> ]
Last=Último
-Last.Syntax=[ <Lista>, <Número> ]\n[ <Lista>, <Número de Elementos> ]
+Last.Syntax=[ <Lista> ]\n[ <Lista>, <Número de elementos> ]\n[ <Texto> ]\n[ <Texto>, <Número de caracteres> ]
+LeftSide=PrimeiroMembro
+LeftSum=SumaEsquerda
+LeftSum.Syntax=[ <Función>, <Valor inicial x>, <Valor final x>, <Número de rectángulos> ]
Length=Lonxitude
-Length.Syntax=[ <Vector> ]\n[ <Punto> ]\n[ <Lista> ]\n[ <Función>, <Valor Inicial X>, <Valor Final X> ]\n[ <Función>, <Punto Inicial>, <Punto Final> ]\n[ <Curva>, <Valor Inicial X>, <Valor Final X> ]\n[ <Curva>, <Punto Inicial>, <Punto Final> ]
-LetterToUnicode=LetraAUnicode
-LetterToUnicode.Syntax=[ <Texto> ]
+Length.Syntax=[ <Vector> ]\n[ <Punto> ]\n[ <Función>, <Valor inicial x>, <Valor final x> ]\n[ <Función>, <Punto inicial>, <Punto final> ]\n[ <Curva>, <Valor inicial x>, <Valor final x> ]\n[ <Curva>, <Punto inicial>, <Punto final> ]\n[ <Lista> ]\n[ <Texto> ]\n[ <Lugar xeométrico> ]\n[ <Segmento> ]
+LetterToUnicode=CódigoDeCarácter
+LetterToUnicode.Syntax=[ "<Carácter>" ]
Limit=Límite
-Limit.Syntax=[ <Función>, <Número> ]
+Limit.Syntax=[ <Función>, <Valor> ]
+LimitAbove=LímiteLateralDereito
+LimitAbove.Syntax=[ <Función>, <Valor> ]
+LimitBelow=LímiteLateralEsquerdo
+LimitBelow.Syntax=[ <Función>, <Valor> ]
Line=Recta
-Line.Syntax=[ <Punto>, <Punto> ]\n[ <Punto>, <Recta Paralela> ]\n[ <Punto>, <Vector de Dirección> ]
+Line.Syntax=[ <Punto>, <Punto> ]\n[ <Punto>, <Recta paralela> ]\n[ <Punto>, <Vector de dirección> ]
LineBisector=Mediatriz
-LineBisector.Syntax=[ <Segmento> ]\n[ <Punto>, <Punto> ]
+LineBisector.Syntax=[ <Punto>, <Punto> ]\n[ <Segmento> ]
Locus=LugarXeométrico
-Locus.Syntax=[ <Punto de Orixe>, <Punto> ]
+Locus.Syntax=[ <Punto do lugar>, <Punto> ]\n[ <Punto do lugar>, <Esvarador> ]
+LogNormal=DistribuciónLogNormal
+LogNormal.Syntax=[ <Media>, <Desviación estándar>, x ]\n[ <Media>, <Desviación estándar>, x, <Acumula (booleana)> ]\n[ <Media>, <Desviación estándar>, <Valor da variable> ]
+Logistic=DistribuciónLoxística
+Logistic.Syntax=[ <Media>, <Escala>, x ]\n[ <Media>, <Escala>, x, <Acumula (booleana)> ]\n[ <Media>, <Escala>, <Valor da variable> ]
LowerSum=SumaInferior
-LowerSum.Syntax=[ <Función>, <Valor Inicial X>, <Valor Final X>, <Número de Rectángulos> ]
+LowerSum.Syntax=[ <Función>, <Valor inicial x>, <Valor final x>, <Número de rectángulos> ]
+MatrixRank=RangoMatriz
Max=Máximo
-Max.Syntax=[ <Lista> ]\n[ <Número>, <Número> ]
+Max.Syntax=[ <Número>, <Número> ]\n[ <Lista> ]\n[ <Intervalo> ]\n[ <Función>, <Valor inicial x>, <Valor final x> ]
+Maximize=Maximiza
+Maximize.Syntax=[ <Número dependente>, <Número libre (esvarador)> ]
Mean=Media
-Mean.Syntax=[ <Lista de Números> ]
+Mean.Syntax=[ <Lista de números> ]
MeanX=MediaX
-MeanX.Syntax=[ <Lista de Puntos> ]
+MeanX.Syntax=[ <Lista de puntos> ]
MeanY=MediaY
-MeanY.Syntax=[ <Lista de Puntos> ]
+MeanY.Syntax=[ <Lista de puntos> ]
Median=Mediana
-Median.Syntax=[ <Lista de Números> ]
+Median.Syntax=[ <Lista de números> ]
Midpoint=PuntoMedio
-Midpoint.Syntax=[ <Segmento> ]\n[ <Cónica> ]\n[ <Punto>, <Punto> ]
+Midpoint.Syntax=[ <Punto>, <Punto> ]\n[ <Segmento> ]\n[ <Cónica> ]\n[ <Intervalo> ]
Min=Mínimo
-Min.Syntax=[ <Lista> ]\n[ <Número>, <Número> ]
-Mirror=Reflexión
-Mirror.Syntax=[ <Obxecto>, <Punto> ]\n[ <Obxecto>, <Recta> ]\n[ <Punto>, <Circunferencia> ]
+Min.Syntax=[ <Número>, <Número> ]\n[ <Lista> ]\n[ <Intervalo> ]\n[ <Función>, <Valor inicial x>, <Valor final x> ]
+Minimize=Minimiza
+Minimize.Syntax=[ <Número dependente>, <Número libre (esvarador)> ]
+MinimumSpanningTree=ÁrboreExpansiónMínima
+MinimumSpanningTree.Syntax=[ <Lista de puntos> ]
+Mirror=Reflexa
+Mirror.Syntax=[ <Obxecto>, <Punto> ]\n[ <Obxecto>, <Recta> ]\n[ <Obxecto>, <Circunferencia> ]
+MixedNumber=NúmeroMixto
Mod=Resto
-Mod.Syntax=[ <Dividendo>, <Divisor> ]
+Mod.Syntax=[ <Dividendo>, <Divisor> ]\n[ <Polinomio dividendo>, <Polinomio divisor> ]
Mode=Moda
-Mode.Syntax=[ <Lista> ]
+Mode.Syntax=[ <Lista de números> ]
+NIntegral=IntegralNum
+NRoot=RaízN
+NSolutions=ResolveNum
+NSolve=ResolveNum
Name=Nome
Name.Syntax=[ <Obxecto> ]
-Normal.Syntax=[ <Media>, <Desviación Estándar>, <Número> ]
+NextPrime=PrimoSeguinte
+Normal=DistribuciónNormal
+Normal.Syntax=[ <Media>, <Desviación estándar>, x ]\n[ <Media>, <Desviación estándar>, x, <Acumula (booleana)> ]\n[ <Media>, <Desviación estándar>, <Valor da variable> ]
+NormalQuantilePlot=GráficoCuantilNormal
+NormalQuantilePlot.Syntax=[ <lista de datos]> ]
+Numerator=Numerador
+Numerator.Syntax=[ <Función> ]
+Numeric=ValorNumérico
Object=Obxecto
-Object.Syntax=[ <Nome do Obxecto como Texto> ]
+Object.Syntax=[ <Nome do obxecto como texto> ]
+Ordinal.Syntax=[ <Número positivo> ]
+OrdinalRank=ListaOrdinal
+OrdinalRank.Syntax=[ <Lista> ]
OrthogonalLine=Perpendicular
OrthogonalLine.Syntax=[ <Punto>, <Recta> ]\n[ <Punto>, <Segmento> ]\n[ <Punto>, <Vector> ]
OrthogonalVector=VectorPerpendicular
OrthogonalVector.Syntax=[ <Recta> ]\n[ <Segmento> ]\n[ <Vector> ]
OsculatingCircle=CírculoOsculador
OsculatingCircle.Syntax=[ <Punto>, <Función> ]\n[ <Punto>, <Curva> ]
-PMCC=CorrelaciónPearson
-PMCC.Syntax=[ <Lista de Puntos> ]\n[ <Lista Valores X>, <Lista Valores Y> ]
+PMCC=CoeficienteCorrelación
+PMCC.Syntax=[ <Lista de puntos> ]\n[ <Lista de valores x>, <Lista de valores y> ]
+Pan=DesprazaVista
+Pan.Syntax=[ <desp x>, < desp y>]
Parabola=Parábola
-Parabola.Syntax=[ <Punto>, <Recta> ]
+Parabola.Syntax=[ <Foco>, <Directriz> ]
Parameter=Parámetro
-Parameter.Syntax=[ <Cónica> ]
+Parameter.Syntax=[ <Parábola> ]
+ParseToFunction=AsignaFunción
+ParseToFunction.Syntax=[ <Función (nome)>, <Cadea texto> ]
+ParseToNumber=AsignaNúmero
+ParseToNumber.Syntax=[ <Variable (nome)>, <Cadea texto co valor> ]
+PartialFractions=FracciónsSimples
+PartialFractions.Syntax=[ <Función> ]
+Pascal=DistribuciónPascal
+Pascal.Syntax=[ <Número de éxitos>, Probabilidade de éxito> ]\n[ <Número de éxitos>, Probabilidade de éxito>, <Acumula (booleana)> ]\n[ <Número de éxitos>, Probabilidade de éxito>, >Valor da variable>, <Acumula (booleana)> ]
+PathParameter=ParámetroNoPercorrido
+PathParameter.Syntax=[ <Punto en percorrido> ]
+Percentile=Percentil
+Percentile.Syntax=[ <Lista de números>, <Tanto por un> ]
Perimeter=Perímetro
-Perimeter.Syntax=[ <Polígono> ]\n[ <Cónica> ]
+Perimeter.Syntax=[ <Polígono> ]\n[ <Cónica> ]\n[ <Lugar xeométrico> ]
+PlaySound=TocaSon
+PlaySound.Syntax=[ <Nota>, <Duración>, <Instrumento> ]\n[ <Secuencia de notas>, <Instrumento> ]\n[ <Ficheiro> ]\n[ <Función>, <Valor mínimo>, <Valor máximo> ]\n[ <Función>, <Valor mínimo>, <Valor máximo>, <Taxa de mostraxe>, <Profundidade de mostraxe> ]\n[ <Toca (booleana)> ]
Point=Punto
-Point.Syntax=[ <Obxecto> ]\n[ <Punto>, <Vector> ]
+Point.Syntax=[ <Obxecto> ]\n[ <Percorrido>, <Parámetro> ]\n[ <Punto>, <Vector> ]
+PointIn=PuntoEn
+PointIn.Syntax=[ <Rexión> ]
+PointList=ListaPuntos
+PointList.Syntax=[ <Lista> ]
+Poisson=DistribuciónPoisson
+Poisson.Syntax=[ <Media> ]\n[ <Media>, <Acumula (booleana)> ]\n[ <Media>, <Valor da variable>, <Acumula (booleana)> ]
Polar.Syntax=[ <Punto>, <Cónica> ]
PolyLine=Poligonal
-PolyLine.Syntax=[ <Punto>, ..., <Punto> ]
+PolyLine.Syntax=[ <Punto>, ..., <Punto> ]\n[ <Lista de puntos> ]
Polygon=Polígono
-Polygon.Syntax=[ <Punto>, ..., <Punto> ]\n[ <Punto, <Punto>, <Número de Vértices> ]
+Polygon.Syntax=[ <Punto>, ..., <Punto> ]\n[ <Punto, <Punto>, <Número de vértices> ]\n[ <Lista de puntos> ]
Polynomial=Polinomio
-Polynomial.Syntax=[ <Función> ]\n[ <Lista de Puntos> ]
-Product=Producto
-Product.Syntax=[ <Lista> ]
-Q1.Syntax=[ <Lista de Números> ]
-Q3.Syntax=[ <Lista de Números> ]
+Polynomial.Syntax=[ <Función> ]\n[ <Lista de puntos> ]
+PreviousPrime=PrimoAnterior
+PrimeFactors=FactoresPrimos
+PrimeFactors.Syntax=[ <Número> ]
+Product=Produto
+Product.Syntax=[ <Lista de números> ]\n[ <Lista de números>, <Número de elementos> ]
+Q1.Syntax=[ <Lista de números> ]
+Q3.Syntax=[ <Lista de números> ]
+RSquare=RCadrado
+RSquare.Syntax=[ <Lista de puntos>, <Función> ]
Radius=Raio
Radius.Syntax=[ <Cónica> ]
-Random=AleatoriaEntre
-Random.Syntax=[ <Mínimo Entero>, <Máximo Entero> ]
-RandomBinomial=AleatoriaBinomial
-RandomBinomial.Syntax=[ <Número de Intentos>, <Probabilidade> ]
-RandomNormal=AleatoriaNormal
-RandomNormal.Syntax=[ <Media>, <Desviación Estándar> ]
-RandomPoisson=AleatoriaPoisson
+Random=AleatorioEntre
+Random.Syntax=[ <Mínimo enteiro>, <Máximo enteiro> ]
+RandomBinomial=AleatorioBinomial
+RandomBinomial.Syntax=[ <Número de intentos>, <Probabilidade> ]
+RandomElement=ElementoAleatorio
+RandomElement.Syntax=[ <Lista> ]
+RandomNormal=AleatorioNormal
+RandomNormal.Syntax=[ <Media>, <Desviación estándar> ]
+RandomPoisson=AleatorioPoisson
RandomPoisson.Syntax=[ <Media> ]
+RandomPolynomial=PolinomioAleatorio
+RandomUniform=AleatorioUniforme
+RandomUniform.Syntax=[ <Mínimo real>, <Máximo real> ]
+Rationalize=PasaAFracción
Ray=Semirrecta
-Ray.Syntax=[ <Punto>, <Punto> ]\n[ <Punto>, <Vector de Dirección> ]
+Ray.Syntax=[ <Punto inicial>, <Punto> ]\n[ <Punto inicial>, <Vector de dirección> ]
+Real=ParteReal
+RectangleSum=SumaRectangular
+RectangleSum.Syntax=[ <Función>, <Valor inicial x>, <Valor final x>, <Número de rectángulos>, <Posición altura do rectángulo> ]
+ReducedRowEchelonForm=GraduadaReducida
+ReducedRowEchelonForm.Syntax=[ <Matriz> ]
Relation=Relación
Relation.Syntax=[ <Obxecto>, <Obxecto> ]
-RemoveUndefined=LimparIndefinido
+RemoveUndefined=EliminaIndefinidos
RemoveUndefined.Syntax=[ <Lista> ]
-Reverse=Inverter
+Rename=Renomea
+Rename.Syntax=[ <Obxecto>, <Nome> ]
+ResidualPlot=GráficaResidual
+ResidualPlot.Syntax=[ <Lista de puntos>, <Función> ]
+Reverse=Inverte
Reverse.Syntax=[ <Lista> ]
+RightSide=SegundoMembro
+RigidPolygon=PolígonoRíxido
+RigidPolygon.Syntax=[ <Punto libre>, ..., <Punto libre> ]
Root=Raíz
-Root.Syntax=[ <Polinomio> ]\n[ <Función>, <Valor Inicial X> ]\n[ <Función>, <Valor Inicial X>, <Valor Final X> ]
-Rotate=Rotación
+Root.Syntax=[ <Polinomio> ]\n[ <Función>, <Valor inicial x> ]\n[ <Función>, <Valor inicial x>, <Valor final x> ]
+RootList=ListaRaíces
+RootList.Syntax=[ <Lista números>]
+RootMeanSquare=MediaCadrática
+RootMeanSquare.Syntax=[ <Lista de números> ]
+Roots=Raíces
+Roots.Syntax=[ <Función>, <Valor inicial x>, <Valor final x> ]
+Rotate=Rota
Rotate.Syntax=[ <Obxecto>, <Ángulo> ]\n[ <Obxecto>, <Ángulo>, <Punto> ]
+RotateText=RotaTexto
+RotateText.Syntax=[ <Texto>, <Ángulo> ]
Row=Fila
-Row.Syntax=[ <Folla de Cálculo> ]
-SD=DesviaciónEstándar
-SD.Syntax=[ <Lista de Números> ]
-SXX=SXX
-SXX.Syntax=[ <Lista de Puntos> ]\n[ <Lista de Números>, <Lista de Números> ]
-SXY=SXY
-SXY.Syntax=[ <Lista de Puntos> ]\n[ <Lista de Números>, <Lista de Números> ]
-SYY=SYY
-SYY.Syntax=[ <Lista de Puntos> ]\n[ <Lista de Números>, <Lista de Números> ]
+Row.Syntax=[ <Cela de folla de cálculo> ]
+SD=DT
+SD.Syntax=[ <Lista de números> ]
+SDX=DTx
+SDX.Syntax=[ <Lista de puntos> ]
+SDY=DTy
+SDY.Syntax=[ <Lista de puntos> ]
+SXX.Syntax=[ <Lista de números> ]\n[ <Lista de puntos> ]
+SXY.Syntax=[ <Lista de números>, <Lista de números> ]\n[ <Lista de puntos> ]
+SYY.Syntax=[ <Lista de puntos> ]
+Sample=Mostra
+Sample.Syntax=[ <Lista>, <Tamaño> ]\n[ <Lista>, <Tamaño>, <Con substitución> ]
+SampleSD=DTMostra
+SampleSD.Syntax=[ <lista de números> ]
+SampleSDX=DTxMostra
+SampleSDX.Syntax=[ <Lista de puntos> ]
+SampleSDY=DTyMostra
+SampleSDY.Syntax=[ <Lista de puntos> ]
+SampleVariance=VarianzaMostra
+SampleVariance.Syntax=[ <Lista de números> ]
SecondAxis=EixeSecundario
SecondAxis.Syntax=[ <Cónica> ]
-SecondAxisLength=LonxitudeEixeSecundario
+SecondAxisLength=LonxitudeSemieixeSecundario
SecondAxisLength.Syntax=[ <Cónica> ]
-Sector.Syntax=[ <Cónica>, <Punto>, <Punto> ]\n[ <Cónica>, <Valor Parámetro>, <Valor Parámetro> ]
+Sector.Syntax=[ <Cónica>, <Punto>, <Punto> ]\n[ <Cónica>, <Valor parámetro>, <Valor parámetro> ]
Segment=Segmento
Segment.Syntax=[ <Punto>, <Punto> ]\n[ <Punto>, <Lonxitude> ]
-Semicircle=Semicírculo
+SelectObjects=SeleccionaObxectos
+SelectObjects.Syntax=[ ]\n[ <Obxecto>, <Obxecto>, ...]
+SelectedElement=ElementoSeleccionado
+SelectedElement.Syntax=[ <Lista> ]
+SelectedIndex=ÍndiceSeleccionado
+SelectedIndex.Syntax=[ <Lista> ]
+Semicircle=Semicircunferencia
Semicircle.Syntax=[ <Punto>, <Punto> ]
Sequence=Secuencia
-Sequence.Syntax=[ <Expresión>, <Variable>, <Valor Inicial>, <Valor Final> ]\n[ <Expresión>, <Variable>, <Valor Inicial>, <Valor Final>, <Número de Pasos> ]
-SigmaXX.Syntax=[ <Lista de Números> ]\n[ <Lista de Puntos> ]
-SigmaXY.Syntax=[ <Lista de Puntos> ]\n[ <Lista Coordenadas X>, <Lista Coordenadas Y> ]
-SigmaYY.Syntax=[ <Lista de Puntos> ]
-Simplify=Simplificar
-Simplify.Syntax=[ <Función> ]
+Sequence.Syntax=[ <Expresión>, <Variable>, <Valor inicial>, <Valor final> ]\n[ <Expresión>, <Variable>, <Valor inicial>, <Valor final>, <Incremento> ]\n[ <Valor final> ]
+SetActiveView=VistaActiva
+SetActiveView.Syntax=[ <1 | 2> ]
+SetAxesRatio=RazónEixes
+SetAxesRatio.Syntax=[ <Número>, <Número> ]
+SetBackgroundColor=CorFondo
+SetBackgroundColor.Syntax=[ <Obxecto>, "<Cor>" ]\n[ <Obxecto>, <Vermello>, <Verde>, <Azul> ]
+SetCaption=Subtítulo
+SetCaption.Syntax=[ <Obxecto>, <Texto> ]
+SetColor=Cor
+SetColor.Syntax=[ <Obxecto>, "<Cor>" ]\n[ <Obxecto>, <Vermello>, <Verde>, <Azul> ]
+SetConditionToShowObject=CondiciónParaMostrar
+SetConditionToShowObject.Syntax=[ <Obxecto>, <Condición> ]
+SetCoords=Coordenadas
+SetCoords.Syntax=[ <Punto>, <x>, <y> ]
+SetDynamicColor=CorDinámico
+SetDynamicColor.Syntax=[ <Obxecto>, <Vermello>, <Verde>, <Azul> ]\n[ <Obxecto>, <Vermello>, <Verde>, <Azul>, <Opacidade> ]
+SetFilling=Opacidade
+SetFilling.Syntax=[ <Obxecto>, <Número> ]
+SetFixed=Fixo
+SetFixed.Syntax=[ <Obxecto>, <true | false> ]
+SetLabelMode=ModoRótulo
+SetLabelMode.Syntax=[ <Obxecto>, <0 | 1 | 2 | 3> ]
+SetLayer=Capa
+SetLayer.Syntax=[ <Obxecto>, <Número de capa> ]
+SetLineStyle=EstiloLiña
+SetLineStyle.Syntax=[ <Liña>, <Número> ]
+SetLineThickness=GrosorLiña
+SetLineThickness.Syntax=[ <Liña>, <Número> ]
+SetPointSize=TamañoPunto
+SetPointSize.Syntax=[ <Punto>, <Número> ]
+SetPointStyle=EstiloPunto
+SetPointStyle.Syntax=[ <Punto>, <Número> ]
+SetTooltipMode=ModoDescrición
+SetTooltipMode.Syntax=[ <Obxecto>, <0|1|2|3|4> ]
+SetValue=Valor
+SetValue.Syntax=[ <Booleano>, <0|1> ]\n[ <Obxecto>, <Obxecto> ]\n[ <Lista>, <Índice>, <Obxecto> ]
+SetVisibleInView=VisibleNaVista
+SetVisibleInView.Syntax=[ <Obxecto>, <Número de vista 1|2>, <Booleana>]
+Shear=Cisalla
+Shear.Syntax=[ <Obxecto>, <Sentido (vector, recta, semirrecta o segmento)>, <Razón> ]
+ShortestDistance=CamiñoMínimo
+ShortestDistance.Syntax=[ <Lista de segmentos>, <Punto inicial>, <Punto final>, <Ponderación (booleana)> ]
+ShowLabel=AmosaRótulo
+ShowLabel.Syntax=[ <Obxecto>, <Booleana> ]
+ShowLayer=AmosaCapa
+ShowLayer.Syntax=[ <Número de capa> ]
+Shuffle=Baralla
+Shuffle.Syntax=[ <Lista> ]
+SigmaXX.Syntax=[ <Lista de números> ]\n[ <Lista de puntos> ]
+SigmaXY.Syntax=[ <Lista coordenadas x>, <Lista coordenadas y> ]\n[ <Lista de puntos> ]
+SigmaYY.Syntax=[ <Lista de puntos> ]
+Simplify=Simplifica
+Simplify.Syntax=[ <Función> ]\n[ <Texto> ]
+Slider=Esvarador
+Slider.Syntax=[ <Mín>, <Máx>, <Incremento>, <Velocidade>, <Ancho>, <É Ángulo>, <Horizontal>, <Animación>, <Aleatorio> ]
Slope=Pendente
-Slope.Syntax=[ <Recta> ]
-Sort=Ordenar
+Slope.Syntax=[ <Recta, semirrecta o segmento> ]
+SlowPlot=GráficaAnimada
+SlowPlot.Syntax=[ <Función> ]
+Solutions=Solucións
+Solve=Resolve
+SolveODE=ResolveODE
+SolveODE.Syntax=[ <f'(x,y)>, <x inicial>, <y inicial>, <x final>, <Paso> ]\n[ <f(x,y)>, <g(x,y)>, <x inicial>, <y inicial>, <t final>, <Paso> ]\n[ <b(x)>, <c(x)>, <f(x)>, <x inicial>, <y inicial>, <y' inicial>, <x final>, <Paso> ]
+Sort=Ordena
Sort.Syntax=[ <Lista> ]
-Sum=Sumar
-Sum.Syntax=[ <Lista> ]\n[ <Lista>, <Número de Elementos> ]
-TableText=TextoTáboa
-TableText.Syntax=[ <Lista>, <Lista>, ... ]\n[ <Lista>, <Lista>, ..., <Aliñamento do Texto> ]
-Take=Coller
-Take.Syntax=[ <Lista>, <Posición Inicial>, <Posición Final> ]
+Spearman=CoeficienteCorrelaciónSpearman
+Spearman.Syntax=[ <Lista de puntos> ]\n[ <Lista de números>, <Lista de números> ]
+StartAnimation=IniciaAnimación
+StartAnimation.Syntax=[ ]\n[ <Esvarador ou punto>, <Esvarador ou punto>, ... ]\n[ <Booleana> ]\n[ <Esvarador ou punto>, <Esvarador ou punto>, ... , <Booleana> ]
+StemPlot=GráficoTaloFollas
+StemPlot.Syntax=[ <lista> ]\n[ <Lista>, <Axuste -1|0|1> ]
+Stretch=Estira
+Stretch.Syntax=[ <Obxecto>, <Dirección (vector, recta, semirrecta o segmento)>, <Razón> ]\n[ <Obxecto>, <Vector> ]
+Substitute=Substitúe
+Sum=Suma
+Sum.Syntax=[ <Lista> ]\n[ <Lista>, <Número de elementos> ]
+SumSquaredErrors=SumaCadradoDiferenzas
+SumSquaredErrors.Syntax=[ <Lista de puntos>, <Función> ]
+TDistribution=DistribuciónT
+TDistribution.Syntax=[ <Graos de liberdade>, x ]\n[ <Graos de liberdade>, x, <Acumula (booleana)> ]\n[ <Graos de liberdade>, <Valor da variable> ]
+TMean2Estimate=IntervaloConfianza2
+TMean2Estimate.Syntax=[ <Lista 1 de datos mostrais>, <Lista 2 de datos mostrais>, <Nivel>, <Composición (booleana)>]\n[ <Media mostral 1>, <Desviación típica mostral 1>, <Tamaño mostral 1>, <Media mostral 2>, <Desviación típica mostral 2>, <Tamaño mostral 2>, <Nivel>,<Composición (booleana)>]
+TMeanEstimate=IntervaloConfianza
+TMeanEstimate.Syntax=[ <Lista de datos mostra>, <Nivel> ]\n[ <Media da mostra>, <Desviación típica da mostra>, <Tamaño da mostra>, <Nivel> ]
+TTest=TestT
+TTest.Syntax=[ <Lista de datos mostrais>, <Media hipotetizada>, <Cola> ]\n[ <Media mostral>, <Desviación típica mostral>, <Tamaño mostral>, <Media hipotetizada>, <Cola> ]
+TTest2=TestT2
+TTest2.Syntax=[ <Lista datos mostrais 1>, <Lista datos mostrais 2>, <Cola>,<Composición (booleana)> ]\n[ <Media mostral 1 >, <Desviación típica mostral 1>, <Tamaño mostral 1>, <Media mostral 2>, <Desviación típica mostral 2 >, <Tamaño mostra 2>, <Cola>, <Composición (booleana)> ]
+TTestPaired=TestTParellado
+TTestPaired.Syntax=[ <Lista datos mostrais 1>, <Lista datos mostrais 2>, <Cola> ]
+TableText=TáboaTexto
+TableText.Syntax=[ <Lista>, <Lista>, ... ]\n[ <Lista>, <Lista>, ..., <Aliñamento do texto> ]
+Take=Colle
+Take.Syntax=[ <Lista>, <Posición inicial>, <Posición final> ]\n[ <Texto>, <Posición inicial>, <Posición final> ]
Tangent=Tanxente
-Tangent.Syntax=[ <Punto>, <Cónica> ]\n[ <Punto>, <Función> ]\n[ <Punto>, <Curva> ]\n[ <Valor X>, <Función> ]\n[ <Recta Paralela>, <Cónica> ]\n[ <Segmento Paralelo>, <Cónica> ]
+Tangent.Syntax=[ <Punto>, <Cónica> ]\n[ <Punto>, <Curva> ]\n[ <Valor x>, <Función> ]\n[ <Punto na gráfica>, <Función> ]\n[ <Recta, semirrecta ou segmento paralelo>, <Cónica> ]\n[ <Circunferencia>, <Circunferencia> ]
TaylorSeries=PolinomioTaylor
-TaylorSeries.Syntax=[ <Función>, <Valor X>, <Número de Orde> ]
+TaylorSeries.Syntax=[ <Función>, <Valor x>, <Orde> ]
Text=Texto
-Text.Syntax=[ <Obxecto> ]\n[ <Obxecto>, <Valor Booleano para a Substitución de Variables> ]\n[ <Obxecto>, <Punto> ]\n[ <Obxecto>, <Punto>, <Valor Booleano para a Substitución de Variables> ]
-TextToUnicode=TextoAUnicode
-TextToUnicode.Syntax=[ <Texto> ]
-Translate=Translación
-Translate.Syntax=[ <Obxecto>, <Vector> ]\n[ <Vector>, <Punto Inicial> ]
-Transpose=Trasposta
+Text.Syntax=[ <Obxecto> ]\n[ <Obxecto>, <Substitución de variables (booleano)> ]\n[ <Obxecto>, <Punto> ]\n[ <Obxecto>, <Punto>, <Substitución de variables (booleano)> ]\n[ <Obxecto>, <Punto>, <Substitución de variables (booleano), <Fórmula LaTeX (booleano)> ]
+TextToUnicode=TextoACódigo
+TextToUnicode.Syntax=[ "<Texto>" ]
+Textfield=CampoEntrada
+Textfield.Syntax=[ ]\n[ <Obxecto vinculado> ]
+TiedRank=RangoAxustado
+TiedRank.Syntax=[ <Lista> ]
+ToComplex=EnComplexo
+ToExponential=EnExponencial
+ToPoint=EnPunto
+ToPolar=EnPolar
+ToolImage=ImaxenFerramenta
+ToolImage.Syntax=[ <Número> ]
+Translate=Translada
+Translate.Syntax=[ <Obxecto>, <Vector> ]\n[ <Vector>, <Punto inicial> ]
+Transpose=Traspón
Transpose.Syntax=[ <Matriz> ]
TrapezoidalSum=SumaTrapezoidal
-TrapezoidalSum.Syntax=[ <Función>, <Valor Inicial X>, <Valor Final X>, Número de Trapezoides> ]
+TrapezoidalSum.Syntax=[ <Función>, <Valor inicial x>, <Valor final x>, <Número de trapecios> ]
+TravelingSalesman=Viaxante
+TravelingSalesman.Syntax=[ <lista de puntos> ]
+Triangular=DistribuciónTriangular
+Triangular.Syntax=[ <Límite inferior>, <Límite superior>, <Moda>, x ]\n[ <Límite inferior>, <Límite superior>, <Moda>, x, <Acumula (booleana)> ]\n[ <Límite inferior>, <Límite superior>, <Moda>, <Valor da variable> ]
+TrigCombine=TrigoProductoASuma
+TrigExpand=TrigoExpande
+TrigSimplify=TrigoSimplifica
TurningPoint=PuntoInflexión
TurningPoint.Syntax=[ <Polinomio> ]
-UnicodeToLetter=UnicodeALetra
-UnicodeToLetter.Syntax=[ <Entero> ]
-UnicodeToText=UnicodeATexto
-UnicodeToText.Syntax=[ <Lista de Enteros> ]
+UnicodeToLetter=CódigoALetra
+UnicodeToLetter.Syntax=[ <Enteiro> ]
+UnicodeToText=CódigoATexto
+UnicodeToText.Syntax=[ <Lista de Enteiros> ]
+Uniform=DistribuciónUniforme
+Uniform.Syntax=[ <Límite inferior>, <Límite superior>, x ]\n[ <Límite inferior>, <Límite superior>, x, <Acumula (booleana)> ]\n[ <Límite inferior>, <Límite superior>, <Valor da variable> ]
Union=Unión
-Union.Syntax=[ <Lista>, <Lista> ]
-UnitOrthogonalVector=VersorPerpendicular
-UnitOrthogonalVector.Syntax=[ <Recta> ]\n[ <Segmento> ]\n[ <Vector> ]
-UnitVector=Versor
-UnitVector.Syntax=[ <Vector> ]\n[ <Recta> ]\n[ <Segmento> ]
+Union.Syntax=[ <Lista>, <Lista> ]\n[ <Polígono>, <Polígono> ]
+Unique=Único
+Unique.Syntax=[ <Lista>]
+UnitOrthogonalVector=VectorUnitarioPerpendicular
+UnitOrthogonalVector.Syntax=[ <Recta, semirecta ou segmento> ]\n[ <Vector> ]
+UnitVector=VectorUnitario
+UnitVector.Syntax=[ <Vector> ]\n[ <Recta, semirecta ou segmento> ]
+UpdateConstruction=ActualizaConstrución
+UpdateConstruction.Syntax=[]
UpperSum=SumaSuperior
-UpperSum.Syntax=[ <Función>, <Valor Inicial X>, <Valor Final X>, <Número de Rectángulos> ]
+UpperSum.Syntax=[ <Función>, <Valor inicial x>, <Valor final x>, <Número de rectángulos> ]
Variance=Varianza
-Variance.Syntax=[ <Lista de Números> ]
-Vector.Syntax=[ <Punto> ]\n[ <Punto Inicial>, <Punto Final> ]
+Variance.Syntax=[ <Lista de números> ]
+Vector.Syntax=[ <Punto extremo> ]\n[ <Punto orixe>, <Punto extremo> ]
Vertex=Vértice
-Vertex.Syntax=[ <Cónica> ]
\ No newline at end of file
+Vertex.Syntax=[ <Cónica> ]\n[ <Polígono> ]\n[ <Polígono>, <Índice> ]
+VerticalText=TextoVertical
+VerticalText.Syntax=[ Texto> ]
+Voronoi.Syntax=[ <lista de puntos> ]
+Weibull=DistribuciónWeibull
+Weibull.Syntax=[ <Forma (número)>, <Escala>, x ]\n[ <Forma (número)>, <Escala>, x, <Acumula (booleana)> ]\n[ <Forma (número)>, <Escala>, <Valor da variable> ]
+Zip=SubstitúeLista
+Zip.Syntax=[ <Expresión>, <Variable1>, <Lista1>, <Variable2>, <Lista2>, ...]
+Zipf=DistribuciónZipf
+Zipf.Syntax=[ <Número de elementos>, <Expoñente> ]\n[ <Número de elementos>, <Expoñente>, <Acumula (booleana)> ]\n[ <Número de elementos>, <Expoñente>, <Valor da variable>, <Acumula (booleana)> ]
+ZoomIn=ZoomAchega
+ZoomIn.Syntax=[ <Factor de escala> ]\n[ <Factor de escala>, <Centro> ]\n[ <Min x>, <Min y>, <Max x>, <Max y> ]
+ZoomOut=ZoomAfasta
+ZoomOut.Syntax=[ <Factor de escala> ]\n[ <Factor de escala>, <Centro> ]
+nPr=Variacións
\ No newline at end of file
diff --git a/geogebra/properties/command_hr.properties b/geogebra/properties/command_hr.properties
index 19e85ea..237580d 100644
--- a/geogebra/properties/command_hr.properties
+++ b/geogebra/properties/command_hr.properties
@@ -72,8 +72,6 @@ ColumnName=NazivStupca
ColumnName.Syntax=[ <\u0107elija tablice> ]
Command=Naredba
CommonDenominator=Zajedni\u010dkiNazivnik
-CompetitionRank=Rangiranje
-CompetitionRank.Syntax=[ <lista> ]
CompleteSquare=PotpuniKvadrat
CompleteSquare.Syntax=[ <kvadratna funkcija> ]
ComplexRoot=KompleksniKorijen
@@ -113,7 +111,7 @@ Delete.Syntax=[ <objekt> ]
Denominator=Nazivnik
Denominator.Syntax=[ <funkcija> ]
Derivative=Derivacija
-Derivative.Syntax=[ <funkcija> ]\n[ <krivulja> ]\n[ <funkcija>, <broj> ]\n[ <krivulja>, <broj> ]
+Derivative.Syntax=[ <funkcija> ]\n[ <krivulja> ]\n[ <funkcija>, <broj> ]\n[ <funkcija>, <varijabla> ]\n[ <krivulja>, <broj> ]\n[ <funkcija>, <varijabla>, <broj> ]
Determinant=Determinanta
Determinant.Syntax=[ <matrica> ]
Diameter=KonjugiraniPromjer
@@ -250,8 +248,6 @@ IntersectRegion=PresjekPodru\u010dja
IntersectRegion.Syntax=[ <mnogokut>, <mnogokut> ]
Intersection=Presjek
Intersection.Syntax=[ <lista>, <lista> ]
-IntersectionPaths=PresjekPutanja
-IntersectionPaths.Syntax=\n[ <GeoPravac>, <GeoMnogokut> ]\n[ <GeoPravac>, <GeoKonika> ]
InverseBinomial=InverznaBinomnaRazdioba
InverseBinomial.Syntax=[ <broj poku\u0161aja>, <vjerojatnost pogotka>, <vjerojatnost> ]
InverseCauchy=InverznaCauchyjevaRazdioba
@@ -397,7 +393,6 @@ Percentile=Percentil
Percentile.Syntax=[ <lista brojeva>, <postotak> ]
Perimeter=Opseg
Perimeter.Syntax=[ <mnogokut> ]\n[ <konika> ]\n[ <lokus> ]
-Plane=Ravnina
PlaySound=Zvuk
PlaySound.Syntax=[ <datoteka> ]\n[ <sviraj \u2013 logi\u010dka vrijednost> ]\n[ <niz nota>, <instrument> ]\n[ <nota>, <trajanje>, <instrument> ]\n[ <funkcija>, <najmanja vrijednost>, <najve\u0107a vrijednost> ]\n[ <funkcija>, <najmanja vrijednost>, <najve\u0107a vrijednost>, <frekvencija uzorka>, <dubina uzorka> ]
Point=To\u010dka
diff --git a/geogebra/properties/command_hu.properties b/geogebra/properties/command_hu.properties
index 5851433..5f3b127 100644
--- a/geogebra/properties/command_hu.properties
+++ b/geogebra/properties/command_hu.properties
@@ -110,7 +110,7 @@ Delete.Syntax=[ <Alakzat> ]
Denominator=Nevez\u0151
Denominator.Syntax=[ <Függvény> ]
Derivative=Derivált
-Derivative.Syntax=[ <Függvény> ]\n[ <Görbe> ]\n[ <Függvény>, <Szám> ]\n[ <Görbe>, <Szám> ]
+Derivative.Syntax=[ <Függvény> ]\n[ <Görbe> ]\n[ <Függvény>, <Szám> ]\n[ <Függvény>, <Változó> ]\n[ <Görbe>, <Szám> ]\n[ <Görbe>, <Változó>, <Szám> ]
Determinant=Determináns
Determinant.Syntax=[ <Mátrix> ]
Diameter=Átmér\u0151
@@ -396,11 +396,10 @@ Percentile=Percentilis
Percentile.Syntax=[ <Számok listája>, <Százalék (törtként)> ]
Perimeter=Kerület
Perimeter.Syntax=[ <Sokszög> ]\n[ <Kúpszelet> ]\n[ <Mértani hely> ]
-Plane=Sík
PlaySound=HangLejátszás
PlaySound.Syntax=[ <Fájl> ]\n[ <Logikai érték lejátszáshoz> ]\n[ <Hangsor>, <Hangszer száma> ]\n[ <Hang>, <Id\u0151tartam (secundum)>, <Hangszer száma> ]\n[ <Függvény>, <Kezd\u0151érték>, <Végérték> ]\n[ <Függvény>, <Kezd\u0151érték>, <Végérték>, <Mintavétel s\u0171r\u0171sége>, <Mintavétel mélysége> ]
Point=Pont
-Point.Syntax=[ <Alakzat> ]\n[ <Alakzat>, <Paraméter> ]\n[ <Pont>, <Vektor> ]
+Point.Syntax=[ <Alakzat> ]\n[ <Lista> ]\n[ <Alakzat>, <Paraméter> ]\n[ <Pont>, <Vektor> ]
PointIn=Bels\u0151Pont
PointIn.Syntax=[ <Tartomány> ]
PointList=PontLista
diff --git a/geogebra/properties/command_hy.properties b/geogebra/properties/command_hy.properties
new file mode 100644
index 0000000..ede47ab
--- /dev/null
+++ b/geogebra/properties/command_hy.properties
@@ -0,0 +1,640 @@
+ANOVA=\u0534\u056b\u057d\u057a\u0565\u0580\u057d\u056b\u0578\u0576_\u0531\u0576\u0561\u056c\u056b\u0566
+ANOVA.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f>, <\u0551\u0578\u0582\u0581\u0561\u056f>, ... ]
+AffineRatio=\u0531\u0586\u056b\u0576\u0575\u0561\u0576_\u0533\u0578\u0580\u056e\u0561\u056f\u056b\u0581
+AffineRatio.Syntax=[ <\u053f\u0565\u057f>, <\u053f\u0565\u057f>, <\u053f\u0565\u057f> ]
+Angle=\u0531\u0576\u056f\u0575\u0578\u0582\u0576
+Angle.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f> ]\n[ <\u054e\u0565\u056f\u057f\u0578\u0580>, <\u054e\u0565\u056f\u057f\u0578\u0580> ]\n[ <\u0548\u0582\u0572\u056b\u0572>, <\u0548\u0582\u0572\u056b\u0572> ]\n[ <\u053f\u0565\u057f>, <\u0533\u0561\u0563\u0561\u0569>, <\u053f\u0565\u057f> ]\n[ <\u053f\u0565\u057f>, <\u0533\u0561\u0563\u0561\u0569>, <\u0531\u0576\u056f\u0575\u0578\u0582\u0576> ]
+AngularBisector=\u0531\u0576\u056f\u0575\u0561\u0576_\u053f\u056b\u057d\u0578\u0580\u0564
+AngularBisector.Syntax=[ <\u0548\u0582\u0572\u056b\u0572>, <\u0548\u0582\u0572\u056b\u0572> ]\n[ <\u053f\u0565\u057f>, <\u053f\u0565\u057f>, <\u053f\u0565\u057f> ]
+Append=\u0531\u057e\u0565\u056c\u0561\u0581\u0576\u0565\u0574
+Append.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f>, <\u0555\u0562\u0575\u0565\u056f\u057f> ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0551\u0578\u0582\u0581\u0561\u056f> ]
+ApplyMatrix=\u053f\u056b\u0580\u0561\u057c\u0565\u0574_\u0544\u0561\u057f\u0580\u056b\u0581
+ApplyMatrix.Syntax=[ <\u0544\u0561\u057f\u0580\u056b\u0581>, <\u0555\u0562\u0575\u0565\u056f\u057f> ]
+Arc=\u0531\u0572\u0565\u0572
+Arc.Syntax=[ <\u0547\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e>, <\u053f\u0565\u057f>, <\u056f\u0565\u057f> ]\n[ <\u0537\u056c\u056b\u057a\u057d>, <\u053f\u0565\u057f>, <\u053f\u0565\u057f> ]\n[ <\u0547\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e>, <\u054a\u0561\u0580\u0561\u0574\u0565\u057f\u0580\u056b \u0561\u0580\u056a\u0565\u0584\u0568>, <\u054a\u0561\u0580\u0561\u0574\u0565\u057f\u0580\u056b \u0561\u0580\u056a\u0565\u0584\u0568> ]\n[ <\u0537\u056c\u056b\u057a\u057d>, <\u054a\u0561\u0580\u0561\u0574\u0565\u057f\u0580\u056b \u0561\u0580\u056a\u0565\u0584\u0568>, <\u054a\u0561\u0580\u0561\u0574\u0565\u057f\u0580\u056b \u0561\u0580\u056a\u0565\u0584\u0568> ]
+Area=\u0544\u0561\u056f\u0565\u0580\u0565\u057d
+Area.Syntax=[ <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569> ]\n[ <\u0532\u0561\u0566\u0574\u0561\u0576\u056f\u0575\u0578\u0582\u0576> ]\n[ <\u053f\u0565\u057f>, ..., <\u053f\u0565\u057f> ]
+Asymptote=\u0531\u057d\u056b\u0574\u057a\u057f\u0578\u057f
+Asymptote.Syntax=[ <\u0547\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e> ]\n[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561> ]\n[ <\u0548\u0579 \u0562\u0561\u0581\u0561\u0570\u0561\u0575\u057f \u056f\u0578\u0580> ]
+Axes=\u0531\u057c\u0561\u0576\u0581\u0584\u0576\u0565\u0580
+Axes.Syntax=[ <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569> ]
+AxisStepX=\u0554\u0561\u0575\u056c_\u0531\u0562\u057d\u0581\u056b\u057d\u0576\u0565\u0580\u056b_\u0531\u057c\u0561\u0576\u0581\u0584\u0578\u057e
+AxisStepY=\u0554\u0561\u0575\u056c_\u0555\u0580\u0564\u056b\u0576\u0561\u057f\u0576\u0565\u0580\u056b_\u0531\u057c\u0561\u0576\u0581\u0584\u0578\u057e
+BarChart=\u0534\u056b\u0561\u0563\u0580\u0561\u0574\u0561
+Bernoulli=\u0532\u0565\u057c\u0576\u0578\u0582\u056c\u056b
+Bernoulli.Syntax=[ <\u0540\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576>, <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+Binomial=\u0535\u0580\u056f\u0561\u0576\u0564\u0561\u0574\u0561\u0575\u056b\u0576_\u0533\u0578\u0580\u056e\u0561\u056f\u056b\u0581
+Binomial.Syntax=[ <n \u0569\u056b\u057e>, <r \u0569\u056b\u057e> ]
+BinomialDist=\u0535\u0580\u056f\u0561\u0576\u0564\u0561\u0574\u0561\u0575\u056b\u0576_\u0532\u0561\u0577\u056d\u0578\u0582\u0574
+BinomialDist.Syntax=[ <\u0553\u0578\u0580\u0571\u0561\u0580\u056f\u0578\u0582\u0574\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568>, <\u0532\u0561\u0580\u0565\u0570\u0561\u057b\u0578\u0572 \u0565\u056c\u0584\u0565\u0580\u056b \u0570\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568> ]\n[ <\u0553\u0578\u0580\u0571\u0561\u0580\u056f\u0578\u0582\u0574\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568>, <\u0532\u0561\u0580\u0565\u0570\u0561\u057b\u0578\u0572 \u0565\u056c\u0584\u0565\u0580\u056b \u0570\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568>, <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]\n[ <\u0553\u0578\u0580\u0571\u0561\u0580\u056f\u0578\u0582\u0574\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568>, <\u0532\u0561\u0580\u0565\u0570\u0561\u057b\u0578\u0572 \u0565\u056c\u0584\u0565\u0580\u056b \u0570\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u056b \u0561\u0580\u056a\u0565\u0584\u0568>, <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+BoxPlot=\u0531\u0580\u056f\u0572\u0561\u0575\u056b\u0576_\u0534\u056b\u0561\u0563\u0580\u0561\u0574
+Button=\u053f\u0578\u0573\u0561\u056f
+Button.Syntax=[ ]\n[ <\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580> ]
+CFactor=C\u054e\u0565\u0580\u056c\u0578\u0582\u056e\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+CSolutions=C\u053c\u0578\u0582\u056e\u0578\u0582\u0574\u0576\u0565\u0580
+CSolve=C\u053c\u0578\u0582\u056e\u0578\u0582\u0574
+Cauchy=\u053f\u0578\u0577\u056b
+Cauchy.Syntax=[ <\u0544\u056b\u057b\u056b\u0576>, <\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f \u0577\u0565\u0572\u0578\u0582\u0574>, x ]\n[ <\u0544\u056b\u057b\u056b\u0576>, <\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f \u0577\u0565\u0572\u0578\u0582\u0574>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u056b \u0561\u0580\u056a\u0565\u0584\u0568> ]\n[ <\u0544\u056b\u057b\u056b\u0576>, <\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f \u0577\u0565\u0572\u0578\u0582\u0574>, x, <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+Cell=\u054e\u0561\u0576\u0564\u0561\u056f
+Cell.Syntax=[ <\u054d\u0575\u0578\u0582\u0576>, <\u054f\u0578\u0572> ]
+CellRange=\u054e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580\u056b_\u0544\u056b\u057b\u0561\u056f\u0561\u0575\u0584
+CellRange.Syntax=[ <\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u057e\u0561\u0576\u0564\u0561\u056f>, <\u054e\u0565\u0580\u057b\u056b\u0576 \u057e\u0561\u0576\u0564\u0561\u056f> ]
+Center=\u053f\u0565\u0576\u057f\u0580\u0578\u0576
+Center.Syntax=[ <\u0547\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e> ]
+Centroid=\u0551\u0565\u0576\u057f\u0580\u0578\u056b\u0564
+Centroid.Syntax=[ <\u0532\u0561\u0566\u0574\u0561\u0576\u056f\u0575\u0578\u0582\u0576> ]
+Checkbox=\u0534\u0580\u0578\u0577\u0561\u056f
+Checkbox.Syntax=[ ]\n[ <\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580> ]\n[ <\u0551\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580>, <\u0551\u0578\u0582\u0581\u0561\u056f> ]
+ChiSquared=\u03c7²
+ChiSquared.Syntax=[ <\u0531\u0566\u0561\u057f\u0578\u0582\u0569\u0575\u0561\u0576 \u0561\u057d\u057f\u056b\u0573\u0561\u0576>, x ]\n[ <\u0531\u0566\u0561\u057f\u0578\u0582\u0569\u0575\u0561\u0576 \u0561\u057d\u057f\u056b\u0573\u0561\u0576>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u056b \u0561\u0580\u056a\u0565\u0584\u0568> ]\n[ <\u0531\u0566\u0561\u057f\u0578\u0582\u0569\u0575\u0561\u0576 \u0561\u057d\u057f\u056b\u0573\u0561\u0576>, x, <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+Circle=\u0547\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e
+Circle.Syntax=[ <\u053f\u0565\u057f>, <\u0547\u0561\u057c\u0561\u057e\u056b\u0572> ]\n[ <\u053f\u0565\u057f>, <\u0540\u0561\u057f\u057e\u0561\u056e> ]\n[ <\u053f\u0565\u057f>, <\u053f\u0565\u057f> ]\n[ <\u053f\u0565\u057f>, <\u053f\u0565\u057f>, <\u053f\u0565\u057f> ]
+CircleArc=\u0547\u0580\u057b\u0561\u0576\u0561\u0563\u056e\u056b_\u0531\u0572\u0565\u0572
+CircleArc.Syntax=[ <\u053f\u0565\u0576\u057f\u0580\u0578\u0576>, <\u053f\u0565\u057f>, <\u053f\u0565\u057f> ]
+CircleSector=\u0547\u0580\u057b\u0561\u0576\u0561\u0575\u056b\u0576_\u054d\u0565\u056f\u057f\u0578\u0580
+CircleSector.Syntax=[ <\u053f\u0565\u0576\u057f\u0580\u0578\u0576>, <\u053f\u0565\u057f>, <\u053f\u0565\u057f> ]
+CircumcircleArc=\u0531\u0580\u057f\u0561\u0563\u056e\u0561\u056e_\u0531\u0572\u0565\u0572
+CircumcircleArc.Syntax=[ <\u053f\u0565\u057f>, <\u053f\u0565\u057f>, <\u053f\u0565\u057f> ]
+CircumcircleSector=\u0531\u0580\u057f\u0561\u0563\u056e\u0561\u056e_\u054d\u0565\u056f\u057f\u0578\u0580
+CircumcircleSector.Syntax=[ <\u053f\u0565\u057f>, <\u053f\u0565\u057f>, <\u053f\u0565\u057f> ]
+Circumference=\u053f\u0578\u0580\u056b_\u0535\u0580\u056f\u0561\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Circumference.Syntax=[ <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569> ]
+Classes=\u0534\u0561\u057d\u0565\u0580
+ClosestPoint=\u0531\u0574\u0565\u0576\u0561\u0574\u0578\u057f_\u053f\u0565\u057f\u0568
+ClosestPoint.Syntax=[ <\u0540\u0565\u057f\u0561\u0563\u056b\u056e>, <\u053f\u0565\u057f> ]
+Coefficients=\u0533\u0578\u0580\u056e\u0561\u056f\u056b\u0581\u0576\u0565\u0580
+Coefficients.Syntax=[ <\u0532\u0561\u0566\u0574\u0561\u0576\u0564\u0561\u0574> ]\n[ <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569> ]
+Column=\u054d\u0575\u0578\u0582\u0576
+Column.Syntax=[ <\u054e\u0561\u0576\u0564\u0561\u056f> ]
+ColumnName=\u054d\u0575\u0561\u0576_\u0531\u0576\u0578\u0582\u0576\u0568
+ColumnName.Syntax=[ <\u054e\u0561\u0576\u0564\u0561\u056f> ]
+Command=\u0540\u0580\u0561\u0574\u0561\u0576
+CommonDenominator=\u0538\u0576\u0564\u0570\u0561\u0576\u0578\u0582\u0580_\u0540\u0561\u0575\u057f\u0561\u0580\u0561\u0580
+CompleteSquare=\u0531\u0576\u057b\u0561\u057f\u0565\u0574_\u053c\u0580\u056b\u057e_\u0554\u0561\u057c\u0561\u056f\u0578\u0582\u057d\u056b
+CompleteSquare.Syntax=[ <\u0554\u0561\u057c\u0561\u056f\u0578\u0582\u057d\u0561\u0575\u056b\u0576 \u0586\u0578\u0582\u0576\u056f\u0581\u056b\u0561> ]
+ComplexRoot=\u053f\u0578\u0574\u057a\u056c\u0565\u0584\u057d_\u0531\u0580\u0574\u0561\u057f
+ComplexRoot.Syntax=[ <\u0532\u0561\u0566\u0574\u0561\u0576\u0564\u0561\u0574> ]
+Conic=\u053f\u0578\u0576\u0561\u056f\u0561\u0576_\u0540\u0561\u057f\u0578\u0582\u0575\u0569
+Conic.Syntax=[ <\u053f\u0565\u057f>, <\u053f\u0565\u057f>, <\u053f\u0565\u057f>, <\u053f\u0565\u057f>, <\u053f\u0565\u057f> ]\n[ <\u0539\u056b\u057e>, <\u0539\u056b\u057e>, <\u0539\u056b\u057e>, <\u0539\u056b\u057e>, <\u0539\u056b\u057e>, <\u0539\u056b\u057e> ]
+ConstructionStep=\u053f\u0561\u057c\u0578\u0582\u0581\u0574\u0561\u0576_\u0554\u0561\u0575\u056c
+ConstructionStep.Syntax=[ ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f> ]
+ConvexHull=\u0548\u0582\u057c\u0578\u0582\u0581\u056b\u056f_\u0539\u0561\u0572\u0561\u0576\u0569
+ConvexHull.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+CopyFreeObject=\u053f\u0580\u056f\u0576\u0585\u0580\u056b\u0576\u0561\u056f\u0565\u0574_\u0531\u0566\u0561\u057f_\u0555\u0562\u0575\u0565\u056f\u057f\u0568
+CopyFreeObject.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f> ]
+Corner=\u053f\u0578\u0578\u0580\u0564\u056b\u0576\u0561\u057f\u0576\u0565\u0580
+Corner.Syntax=[ <\u0533\u0561\u0563\u0561\u0569\u056b \u0570\u0561\u0574\u0561\u0580\u0568> ]\n[ <\u0546\u056f\u0561\u0580>, <\u0533\u0561\u0563\u0561\u0569\u056b \u0570\u0561\u0574\u0561\u0580\u0568> ]\n[ <\u054f\u0565\u0584\u057d\u057f>, <\u0533\u0561\u0563\u0561\u0569\u056b \u0570\u0561\u0574\u0561\u0580\u0568> ]\n[ <\u053f\u057f\u0561\u057e>, <\u0533\u0561\u0563\u0561\u0569\u056b \u0570\u0561\u0574\u0561\u0580\u0568> ]
+CountIf=\u0537\u056c\u0565\u0574\u0565\u0576\u057f\u0576\u0565\u0580\u056b_\u0554\u0561\u0576\u0561\u056f\u0568
+CountIf.Syntax=[ <\u054a\u0561\u0575\u0574\u0561\u0576>, <\u0551\u0578\u0582\u0581\u0561\u056f> ]
+Covariance=\u053f\u0578\u057e\u0561\u0580\u056b\u0561\u0581\u056b\u0561
+Covariance.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f>, <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+Cross=\u054e\u0565\u056f\u057f\u0578\u0580\u0561\u056f\u0561\u0576_\u0531\u0580\u057f\u0561\u0564\u0580\u0575\u0561\u056c
+CrossRatio.Syntax=[ <\u053f\u0565\u057f>, <\u053f\u0565\u057f>, <\u053f\u0565\u057f>, <\u053f\u0565\u057f> ]
+Curvature=\u053f\u0578\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Curvature.Syntax=[ <\u053f\u0565\u057f>, <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561> ]\n[ <\u053f\u0565\u057f>, <\u053f\u0578\u0580> ]
+CurvatureVector=\u053f\u0578\u0580\u0578\u0582\u0569\u0575\u0561\u0576_\u054e\u0565\u056f\u057f\u0578\u0580
+CurvatureVector.Syntax=[ <\u053f\u0565\u057f>, <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561> ]\n[ <\u053f\u0565\u057f>, <\u053f\u0578\u0580> ]
+CurveCartesian=\u053f\u0578\u0580
+CurveCartesian.Syntax=[ <\u0531\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576>, <\u0531\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576>, <\u054a\u0561\u0580\u0561\u0574\u0565\u057f\u0580>, <\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <\u054e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568> ]
+Decimal=\u054f\u0561\u057d\u0561\u056f\u0561\u0576_\u0540\u0561\u0574\u0561\u056f\u0561\u0580\u0563
+Defined=\u0548\u0580\u0578\u0577\u057e\u0561\u056e_\u0567
+Defined.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f> ]
+Degree=\u0531\u057d\u057f\u056b\u0573\u0561\u0576
+Degree.Syntax=[ <\u0532\u0561\u0566\u0574\u0561\u0576\u0564\u0561\u0574> ]
+DelauneyTriangulation=\u0534\u0565\u056c\u0578\u0576\u0565\u056b_\u054f\u0580\u056b\u0561\u0576\u0563\u0578\u0582\u056c\u0575\u0561\u0581\u056b\u0561
+DelauneyTriangulation.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+Delete=\u054b\u0576\u057b\u0565\u0574
+Delete.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f> ]
+Denominator=\u0540\u0561\u0575\u057f\u0561\u0580\u0561\u0580
+Denominator.Syntax=[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561> ]
+Derivative=\u0531\u056e\u0561\u0576\u0581\u056b\u0561\u056c
+Derivative.Syntax=[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561> ]\n[ <\u053f\u0578\u0580> ]\n[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <\u0539\u056b\u057e> ]\n[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576> ]\n[ <\u053f\u0578\u0580>, <\u0539\u056b\u057e> ]\n[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576>, <\u0539\u056b\u057e> ]
+Determinant=\u0548\u0580\u0578\u0577\u056b\u0579
+Determinant.Syntax=[ <\u0544\u0561\u057f\u0580\u056b\u0581> ]
+Diameter=\u0540\u0561\u0574\u0561\u056c\u0578\u0582\u0575\u056e_\u054f\u0580\u0561\u0574\u0561\u0563\u056b\u056e
+Diameter.Syntax=[ <\u054e\u0565\u056f\u057f\u0578\u0580>, <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569> ]\n[ <\u0548\u0582\u0572\u056b\u0572>, <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569> ]
+Dilate=\u0540\u0578\u0574\u0578\u057f\u0565\u057f\u056b\u0561
+Dilate.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0540\u0578\u0574\u0578\u057f\u0565\u057f\u056b\u0561\u0575\u056b \u0563\u0578\u0580\u056e\u0561\u056f\u056b\u0581> ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0540\u0578\u0574\u0578\u057f\u0565\u057f\u056b\u0561\u0575\u056b \u0563\u0578\u0580\u056e\u0561\u056f\u056b\u0581>, <\u0540\u0578\u0574\u0578\u057f\u0565\u057f\u056b\u0561\u0575\u056b \u056f\u0565\u0576\u057f\u0580\u0578\u0576> ]
+Dimension=\u054f\u0561\u0580\u0561\u056e\u0578\u0582\u0569\u0575\u0561\u0576_\u0549\u0561\u0583
+Direction=\u0548\u0582\u0572\u0572\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Direction.Syntax=[ <\u0548\u0582\u0572\u056b\u0572> ]
+Directrix=\u0534\u056b\u0580\u0565\u056f\u057f\u0580\u056b\u057d\u0561
+Directrix.Syntax=[ <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569> ]
+Distance=\u0540\u0565\u057c\u0561\u057e\u0578\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Distance.Syntax=[ <\u053f\u0565\u057f>, <\u0555\u0562\u0575\u0565\u056f\u057f> ]
+Div=\u0532\u0561\u056a\u0561\u0576\u0578\u0582\u0574
+Div.Syntax=[ <\u0532\u0561\u056a\u0561\u0576\u0565\u056c\u056b>, <\u0532\u0561\u056a\u0561\u0576\u0561\u0580\u0561\u0580> ]\n[ <\u0532\u0561\u056a\u0561\u0576\u0565\u056c\u056b \u0562\u0561\u0566\u0574\u0561\u0576\u0564\u0561\u0574>, <\u0532\u0561\u056a\u0561\u0576\u0561\u0580\u0561\u0580 \u0562\u0561\u0566\u0574\u0561\u0576\u0564\u0561\u0574> ]
+Division=\u0532\u0561\u056a\u0561\u0576\u0578\u0582\u0574
+Divisors=\u0532\u0561\u056a\u0561\u0576\u0561\u0580\u0561\u0580\u0576\u0565\u0580\u056b_\u0554\u0561\u0576\u0561\u056f\u0568
+DivisorsList=\u0532\u0561\u056a\u0561\u0576\u0561\u0580\u0561\u0580\u0576\u0565\u0580\u056b_\u0551\u0578\u0582\u0581\u0561\u056f\u0568
+DivisorsSum=\u0532\u0561\u056a\u0561\u0576\u0561\u0580\u0561\u0580\u0576\u0565\u0580\u056b_\u0533\u0578\u0582\u0574\u0561\u0580\u0568
+Dot=\u054d\u056f\u0561\u056c\u0575\u0561\u0580_\u0531\u0580\u057f\u0561\u0564\u0580\u0575\u0561\u056c
+DotPlot=\u053f\u0565\u057f\u0561\u0575\u056b\u0576_\u0534\u056b\u0561\u0563\u0580\u0561\u0574
+DynamicCoordinates=\u0534\u056b\u0576\u0561\u0574\u056b\u056f_\u053f\u0578\u0578\u0580\u0564\u056b\u0576\u0561\u057f\u0576\u0565\u0580
+DynamicCoordinates.Syntax=[ <\u053f\u0565\u057f>, <\u053f\u0565\u057f>, <\u0539\u056b\u057e> ]
+Eccentricity=\u0537\u0584\u057d\u0581\u0565\u0576\u057f\u0580\u056b\u057d\u056b\u057f\u0565\u057f
+Eccentricity.Syntax=[ <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569> ]
+Element=\u0537\u056c\u0565\u0574\u0565\u0576\u057f
+Element.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f>, <\u0537\u056c\u0565\u0574\u0565\u0576\u057f\u056b \u0570\u0561\u0574\u0561\u0580\u0568> ]\n[ <\u0544\u0561\u057f\u0580\u056b\u0581>, <\u054f\u0578\u0572>, <\u054d\u0575\u0578\u0582\u0576> ]\n[ <\u0551\u0578\u0582\u0581\u0561\u056f>, <\u056b\u0576\u0564\u0565\u0584\u057d1>, <\u056b\u0576\u0564\u0565\u0584\u057d2>, ... ]
+Ellipse=\u0537\u056c\u056b\u057a\u057d
+Ellipse.Syntax=[ <\u0556\u0578\u056f\u0578\u0582\u057d>, <\u0556\u0578\u056f\u0578\u0582\u057d>, <\u0533\u056c\u056d\u0561\u057e\u0578\u0580 \u056f\u056b\u057d\u0561\u0561\u057c\u0561\u0576\u0581\u0584\u056b \u0565\u0580\u056f\u0561\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568> ]\n[ <\u0556\u0578\u056f\u0578\u0582\u057d>, <\u0556\u0578\u056f\u0578\u0582\u057d>, <\u0540\u0561\u057f\u057e\u0561\u056e> ]\n[ <\u053f\u0565\u057f>, <\u053f\u0565\u057f>, <\u053f\u0565\u057f> ]
+Erlang=\u0537\u0580\u056c\u0561\u0576\u0563
+Excentricity=\u0537\u0584\u057d\u0581\u0565\u0576\u057f\u0580\u056b\u057d\u056b\u057f\u0565\u057f
+Excentricity.Syntax=[ <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569> ]
+Execute=\u0533\u0578\u0580\u056e\u0561\u0580\u056f\u0565\u0574
+Execute.Syntax=[ <\u054f\u0565\u0584\u057d\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u054f\u0565\u0584\u057d\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f>, <\u054a\u0561\u0580\u0561\u0574\u0565\u057f\u0580>, <\u054a\u0561\u0580\u0561\u0574\u0565\u057f\u0580>, ... ]
+Expand=\u054a\u0561\u0580\u0566\u0565\u0581\u0576\u0565\u0574_\u0531\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+Expand.Syntax=[ <\u0531\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+Exponential=\u0537\u0584\u057d\u057a\u0578\u0576\u0565\u0576\u0581\u056b\u0561\u056c_\u0532\u0561\u0577\u056d\u0578\u0582\u0574
+Exponential.Syntax=[ <\u053c\u0575\u0561\u0574\u0562\u0564\u0561>, x ]\n[ <\u053c\u0575\u0561\u0574\u0562\u0564\u0561>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u056b \u0561\u0580\u056a\u0565\u0584\u0568> ]\n[ <\u053c\u0575\u0561\u0574\u0562\u0564\u0561>, x, <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+Extremum=\u0537\u0584\u057d\u057f\u0580\u0565\u0574\u0578\u0582\u0574
+Extremum.Syntax=[ <\u0532\u0561\u0566\u0574\u0561\u0576\u0564\u0561\u0574> ]\n[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <x-\u056b \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <x-\u056b \u057e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568> ]
+FDistribution=F_\u0532\u0561\u0577\u056d\u0578\u0582\u0574
+FDistribution.Syntax=[ <\u0531\u0566\u0561\u057f\u0578\u0582\u0569\u0575\u0561\u0576 \u0561\u057d\u057f\u056b\u0573\u0561\u0576\u056b \u0570\u0561\u0574\u0561\u0580\u056b\u0579>, <\u0531\u0566\u0561\u057f\u0578\u0582\u0569\u0575\u0561\u0576 \u0561\u057d\u057f\u056b\u0573\u0561\u0576\u056b \u0570\u0561\u0575\u057f\u0561\u0580\u0561\u0580>, x ]\n[ <\u0531\u0566\u0561\u057f\u0578\u0582\u0569\u0575\u0561\u0576 \u0561\u057d\u057f\u056b\u0573\u0561\u0576\u056b \u0570\u0561\u0574\u0561\u0580\u056b\u0579>, <\u0531\u0566\u0561\u057f\u0578\u0582\u0569\u0575\u0561\u0576 \u0561\u057d\u057f\u056b\u0573\u0561\u0576\u056b \u0570\u0561\u0575\u057f\u0561\u0580\u0561\u0580>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u056b \u0561\u0580\u056a\u0565\u0584\u0568> ]\n[ <\u0531\u0566\u0561\u057f\u0578\u0582\u0569\u0575\u0561\u0576 \u0561\u057d\u057f\u056b\u0573\u0561\u0576\u056b \u0570\u0561\u0574\u0561\u0580\u056b\u0579>, <\u0531\u0566\u0561\u057f\u0578\u0582\u0569\u0575\u0561\u0576 \u0561\u057d\u057f\u056b\u0573\u0561\u0576\u056b \u0570\u0561\u0575\u057f\u0561\u0580\u0561\u0580>, x, <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+Factor=\u054e\u0565\u0580\u056c\u0578\u0582\u056e\u0565\u0574
+Factor.Syntax=[ <\u0532\u0561\u0566\u0574\u0561\u0576\u0564\u0561\u0574> ]
+Factors=\u054e\u0565\u0580\u056c\u0578\u0582\u056e\u0565\u0574
+Factors.Syntax=[ <\u0532\u0561\u0566\u0574\u0561\u0576\u0564\u0561\u0574> ]\n[ <\u0539\u056b\u057e> ]
+FillCells=\u053c\u0580\u0561\u0581\u0576\u0565\u0574_\u054e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580\u0568
+FillColumn=\u053c\u0580\u0561\u0581\u0576\u0565\u0574_\u054d\u0575\u0578\u0582\u0576\u0568
+FillColumn.Syntax=[ <\u054d\u0575\u0578\u0582\u0576>, <\u0551\u0578\u0582\u0581\u0561\u056f> ]
+FillRow=\u053c\u0580\u0561\u0581\u0576\u0565\u0574_\u054f\u0578\u0572\u0568
+FillRow.Syntax=[ <\u054f\u0578\u0572>, <\u0551\u0578\u0582\u0581\u0561\u056f> ]
+First=\u054d\u056f\u056b\u0566\u0562
+First.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u054f\u0565\u0584\u057d\u057f> ]\n[ <\u0551\u0578\u0582\u0581\u0561\u056f>, <\u0537\u056c\u0565\u0574\u0565\u0576\u057f\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568> ]\n[ <\u054f\u0565\u0584\u057d\u057f>, <\u0537\u056c\u0565\u0574\u0565\u0576\u057f\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568> ]\n[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0565\u0580\u056f\u0580\u0561\u0579\u0561\u0583\u0561\u056f\u0561\u0576 \u057f\u0565\u0572>, <\u0537\u056c\u0565\u0574\u0565\u0576\u057f\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568> ]
+FirstAxis=\u0556\u0578\u056f\u0561\u056c_\u0531\u057c\u0561\u0576\u0581\u0584
+FirstAxis.Syntax=[ <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569> ]
+FirstAxisLength=\u0544\u0565\u056e_\u056f\u056b\u057d\u0561\u0561\u057c\u0561\u0576\u0581\u0584
+FirstAxisLength.Syntax=[ <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569> ]
+Fit=\u0544\u0578\u057f\u0561\u0580\u056f\u0578\u0582\u0574
+Fit.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f>, <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561\u0576\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f>, <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561> ]
+FitExp=\u0537\u0584\u057d\u057a\u0578\u0576\u0565\u0581\u056b\u0561\u056c_\u0544\u0578\u057f\u0561\u0580\u056f\u0578\u0582\u0574
+FitExp.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+FitGrowth.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+FitLineX=\u0533\u056e\u0561\u0575\u056b\u0576_\u0544\u0578\u057f\u0561\u0580\u056f\u0578\u0582\u0574_\u0538\u057d\u057f_x
+FitLineX.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+FitLineY=\u0533\u056e\u0561\u0575\u056b\u0576_\u0544\u0578\u057f\u0561\u0580\u056f\u0578\u0582\u0574
+FitLineY.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+FitLog=\u053c\u0578\u0563\u0561\u0580\u056b\u0569\u0574\u0561\u056f\u0561\u0576_\u0544\u0578\u057f\u0561\u0580\u056f\u0578\u0582\u0574
+FitLog.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+FitLogistic=\u053c\u0578\u0563\u056b\u057d\u057f\u056b\u056f_\u0544\u0578\u057f\u0561\u0580\u056f\u0578\u0582\u0574
+FitLogistic.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+FitPoly=\u0532\u0561\u0566\u0574\u0561\u0576\u0564\u0561\u0574\u0561\u0575\u056b\u0576_\u0544\u0578\u057f\u0561\u0580\u056f\u0578\u0582\u0574
+FitPoly.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f>, <\u0532\u0561\u0566\u0574\u0561\u0576\u0564\u0561\u0574\u056b \u0561\u057d\u057f\u056b\u0573\u0561\u0576\u0568> ]
+FitPow=\u0531\u057d\u057f\u056b\u0573\u0561\u0576\u0561\u0575\u056b\u0576_\u0544\u0578\u057f\u0561\u0580\u056f\u0578\u0582\u0574
+FitPow.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+FitSin=\u054d\u056b\u0576\u0578\u0582\u057d\u0578\u056b\u0564\u0561\u056c_\u0544\u0578\u057f\u0561\u0580\u056f\u0578\u0582\u0574
+FitSin.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+Focus=\u0556\u0578\u056f\u0578\u0582\u057d
+Focus.Syntax=[ <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569> ]
+FractionText=\u0534\u0561\u0580\u0571\u0576\u0565\u0574_\u054d\u0578\u057e\u0578\u0580\u0561\u056f\u0561\u0576_\u053f\u0578\u057f\u0578\u0580\u0561\u056f
+FractionText.Syntax=[ <\u0539\u056b\u057e> ]
+FractionalPart=\u053f\u0578\u057f\u0578\u0580\u0561\u056f\u0561\u0575\u056b\u0576_\u0544\u0561\u057d
+Frequency=\u0540\u0561\u0573\u0561\u056d\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+FrequencyPolygon=\u0540\u0561\u0573\u0561\u056d\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u056b_\u054a\u0578\u056c\u056b\u0563\u0578\u0576
+FrequencyTable=\u0540\u0561\u0573\u0561\u056d\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u056b_\u0531\u0572\u0575\u0578\u0582\u057d\u0561\u056f
+Function=\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561
+Function.Syntax=[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <x-\u056b \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <x-\u056b \u057e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568> ]
+GCD=\u0531\u0574\u0565\u0576\u0561\u0574\u0565\u056e_\u0538\u0576\u0564\u0570\u0561\u0576\u0578\u0582\u0580_\u0532\u0561\u056a\u0561\u0576\u0561\u0580\u0561\u0580
+GCD.Syntax=[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u0539\u056b\u057e>, <\u0539\u056b\u057e> ]
+Gamma=\u0533\u0561\u0574\u0561_\u0532\u0561\u0577\u056d\u0578\u0582\u0574
+Gamma.Syntax=[ <\u0531\u056c\u0586\u0561>, <\u0532\u0565\u057f\u0561>, x ]\n[ <\u0531\u056c\u0586\u0561>, <\u0532\u0565\u057f\u0561>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u056b \u0561\u0580\u056a\u0565\u0584\u0568> ]\n[ <\u0531\u056c\u0586\u0561>, <\u0532\u0565\u057f\u0561>, x, <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u057a\u0561\u0575\u0574\u0561\u0576> ]
+GeometricMean=\u0544\u056b\u057b\u056b\u0576_\u0535\u0580\u056f\u0580\u0561\u0579\u0561\u0583\u0561\u056f\u0561\u0576
+GeometricMean.Syntax=[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+GetTime=\u053a\u0561\u0574\u0561\u0576\u0561\u056f
+HarmonicMean=\u0544\u056b\u057b\u056b\u0576_\u0535\u0580\u056f\u0580\u0561\u0579\u0561\u0583\u0561\u056f\u0561\u0576
+HarmonicMean.Syntax=[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+HideLayer=\u0539\u0561\u0584\u0581\u0576\u0565\u0574_\u0547\u0565\u0580\u057f\u0568
+HideLayer.Syntax=[ <\u0539\u056b\u057e> ]
+Histogram=\u0540\u056b\u057d\u057f\u0578\u0563\u0580\u0561\u0574\u0561
+Hull=\u0539\u0561\u0572\u0561\u0576\u0569
+Hull.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f>, <\u054f\u0578\u056f\u0578\u057d> ]
+HyperGeometric=\u0540\u056b\u057a\u0565\u0580\u0565\u0580\u056f\u0580\u0561\u0579\u0561\u0583\u0561\u056f\u0561\u0576
+Hyperbola=\u0540\u056b\u057a\u0565\u0580\u0562\u0578\u056c\u0561
+Hyperbola.Syntax=[ <\u0556\u0578\u056f\u0578\u0582\u057d>, <\u0556\u0578\u056f\u0578\u0582\u057d>, <\u0544\u0565\u056e \u056f\u056b\u057d\u0561\u0561\u057c\u0561\u0576\u0581\u0584\u056b \u0565\u0580\u056f\u0561\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]\n[ <\u0556\u0578\u056f\u0578\u0582\u057d>, <\u0556\u0578\u056f\u0578\u0582\u057d>, <\u0540\u0561\u057f\u057e\u0561\u056e> ]\n[ <\u053f\u0565\u057f>, <\u053f\u0565\u057f>, <\u053f\u0565\u057f> ]
+Identity=\u0544\u056b\u0561\u057e\u0578\u0580_\u0544\u0561\u057f\u0580\u056b\u0581
+Identity.Syntax=[ <\u0539\u056b\u057e> ]
+If=\u0535\u0569\u0565
+If.Syntax=[ <\u054a\u0561\u0575\u0574\u0561\u0576>, <\u0531\u057a\u0561> ]\n[ <\u054a\u0561\u0575\u0574\u0561\u0576>, <\u0531\u057a\u0561>, <\u0540\u0561\u056f\u0561\u057c\u0561\u056f \u0564\u0565\u057a\u0584\u0578\u0582\u0574> ]
+Imaginary=\u053f\u0565\u0572\u056e_\u0544\u0561\u057d
+ImplicitCurve=\u0531\u0576\u0562\u0561\u0581\u0561\u0570\u0561\u0575\u057f_\u053f\u0578\u0580
+ImplicitCurve.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]\n[ <f(x)> ]
+ImplicitDerivative=\u0531\u0576\u0562\u0561\u0581\u0561\u0570\u0561\u0575\u057f_\u0531\u056e\u0561\u0576\u0581\u056b\u0561\u056c
+Incircle=\u0535\u057c\u0561\u0576\u056f\u0575\u0561\u0576\u0568_\u0546\u0565\u0580\u0563\u056e\u0561\u056e_\u0547\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e
+Incircle.Syntax=[ <\u053f\u0565\u057f>, <\u053f\u0565\u057f>, <\u053f\u0565\u057f> ]
+IndexOf.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0551\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u054f\u0565\u0584\u057d\u057f>, <\u054f\u0565\u0584\u057d\u057f> ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0551\u0578\u0582\u0581\u0561\u056f>, <\u054d\u056f\u057d\u0561\u056e> ]\n[ <\u054f\u0565\u0584\u057d\u057f>, <\u054f\u0565\u0584\u057d\u057f>, <\u054d\u056f\u057d\u0561\u056e> ]
+Insert=\u0546\u0565\u0580\u0574\u0578\u0582\u056e\u0565\u0574
+Insert.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f>, <\u0551\u0578\u0582\u0581\u0561\u056f>, <\u0534\u056b\u0580\u0584> ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0551\u0578\u0582\u0581\u0561\u056f>, <\u0534\u056b\u0580\u0584> ]
+IntegerPart=\u0531\u0574\u0562\u0578\u0572\u057b_\u0544\u0561\u057d
+Integral=\u053b\u0576\u057f\u0565\u0563\u0580\u0561\u056c
+Integral.Syntax=[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561> ]\n[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <x-\u056b \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <x-\u056b \u057e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568> ]\n[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <x-\u056b \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <x-\u056b \u057e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0563\u0576\u0561\u0570\u0561\u057f\u0561\u056f\u0561\u0576> ]
+IntegralBetween=\u053b\u0576\u057f\u0565\u0563\u0580\u0561\u056c
+IntegralBetween.Syntax=[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <x-\u056b \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584>, <x-\u056b \u057e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568> ]\n[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <x-\u056b \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584>, <x-\u056b \u057e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0563\u0576\u0561\u0570\u0561\u057f\u0561\u056f\u0561\u0576> ]
+Intersect=\u0540\u0561\u057f\u0574\u0561\u0576_\u053f\u0565\u057f
+Intersect.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0555\u0562\u0575\u0565\u056f\u057f> ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0540\u0561\u057f\u0574\u0561\u0576 \u056f\u0565\u057f\u056b \u0570\u0561\u0574\u0561\u0580\u0568> ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0531\u057c\u0561\u057b\u056b\u0576 \u0574\u0578\u057f\u0561\u057e\u0578\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]\n[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <x-\u056b \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <x-\u056b \u057e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568> ]
+IntersectRegion=\u0540\u0561\u057f\u0574\u0561\u0576_\u054f\u056b\u0580\u0578\u0582\u0575\u0569
+IntersectRegion.Syntax=[ <\u0532\u0561\u0566\u0574\u0561\u0576\u056f\u0575\u0578\u0582\u0576>, <\u0532\u0561\u0566\u0574\u0561\u0576\u056f\u0575\u0578\u0582\u0576> ]
+Intersection=\u0532\u0561\u0566\u0574\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u056b_\u0540\u0561\u057f\u0578\u0582\u0574\u0568
+Intersection.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f>, <\u0551\u0578\u0582\u0581\u0561\u056f> ]
+InverseBinomial=\u0535\u0580\u056f\u0561\u0576\u0564\u0561\u0574\u0561\u0575\u056b\u0576_\u0547\u0580\u057b\u0578\u0582\u0574
+InverseBinomial.Syntax=[ <\u0553\u0578\u0580\u0571\u0561\u0580\u056f\u0578\u0582\u0574\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568>, <\u0532\u0561\u0580\u0565\u0570\u0561\u057b\u0578\u0572 \u0565\u056c\u0584\u0565\u0580\u056b \u0570\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568>, <\u0540\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+InverseCauchy=\u053f\u0578\u0577\u0578\u0582_\u0547\u0580\u057b\u0578\u0582\u0574
+InverseCauchy.Syntax=[ <\u0544\u056b\u057b\u056b\u0576>, <\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f \u0577\u0565\u0572\u0578\u0582\u0574>, <\u0540\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+InverseChiSquared=\u03c7²_\u0547\u0580\u057b\u0578\u0582\u0574
+InverseChiSquared.Syntax=[ <\u0531\u0566\u0561\u057f\u0578\u0582\u0569\u0575\u0561\u0576 \u0561\u057d\u057f\u056b\u0573\u0561\u0576>, <\u0540\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+InverseExponential=\u0537\u0584\u057d\u057a\u0578\u0576\u0565\u0576\u0581\u056b\u0561\u056c_\u0547\u0580\u057b\u0578\u0582\u0574
+InverseExponential.Syntax=[ <\u053c\u0575\u0561\u0574\u0562\u0564\u0561>, <\u0540\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+InverseFDistribution=F_\u0532\u0561\u0577\u056d\u0574\u0561\u0576_\u0547\u0580\u057b\u0578\u0582\u0574
+InverseFDistribution.Syntax=[ <\u0531\u0566\u0561\u057f\u0578\u0582\u0569\u0575\u0561\u0576 \u0561\u057d\u057f\u056b\u0573\u0561\u0576\u056b \u0570\u0561\u0574\u0561\u0580\u056b\u0579>, <\u0531\u0566\u0561\u057f\u0578\u0582\u0569\u0575\u0561\u0576 \u0561\u057d\u057f\u056b\u0573\u0561\u0576\u056b \u0570\u0561\u0575\u057f\u0561\u0580\u0561\u0580>, <\u0540\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+InverseGamma=\u0533\u0561\u0574\u0561_\u0547\u0580\u057b\u0578\u0582\u0574
+InverseGamma.Syntax=[ <\u0531\u056c\u0586\u0561>, <\u0532\u0565\u057f\u0561>, <\u0540\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+InverseHyperGeometric=\u0540\u056b\u057a\u0565\u0580\u0565\u0580\u056f\u0580\u0561\u0579\u0561\u0583\u0561\u056f\u0561\u0576_\u0547\u0580\u057b\u0578\u0582\u0574
+InverseHyperGeometric.Syntax=[ <\u054a\u0578\u057a\u0578\u0582\u056c\u0561\u0581\u056b\u0561\u0575\u056b \u0579\u0561\u0583\u0568>, <\u0532\u0561\u0580\u0565\u0570\u0561\u057b\u0578\u0572 \u0565\u056c\u0584\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568>, <\u0546\u0574\u0578\u0582\u056e\u056b \u0579\u0561\u0583\u0568>, <\u0540\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+InverseNormal=\u0546\u0578\u0580\u0574\u0561\u056c_\u0547\u0580\u057b\u0578\u0582\u0574
+InverseNormal.Syntax=[ <\u0544\u056b\u057b\u056b\u0576>, <\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f \u0577\u0565\u0572\u0578\u0582\u0574>, <\u0540\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+InversePascal=\u054a\u0561\u057d\u056f\u0561\u056c\u056b_\u0547\u0580\u057b\u0578\u0582\u0574
+InversePascal.Syntax=[ <\u0532\u0561\u0580\u0565\u0570\u0561\u057b\u0578\u0572 \u0565\u056c\u0584\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568>, <\u0532\u0561\u0580\u0565\u0570\u0561\u057b\u0578\u0572 \u0565\u056c\u0584\u0565\u0580\u056b \u0570\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0561\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568>, <\u0540\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0561\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+InversePoisson=\u054a\u0578\u0582\u0561\u057d\u0578\u0576\u056b_\u0547\u0580\u057b\u0578\u0582\u0574
+InversePoisson.Syntax=[ <\u0544\u056b\u057b\u056b\u0576>, <\u0540\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+InverseTDistribution=T_\u0532\u0561\u0577\u056d\u0574\u0561\u0576_\u0547\u0580\u057b\u0578\u0582\u0574
+InverseTDistribution.Syntax=[ <\u0531\u0566\u0561\u057f\u0578\u0582\u0569\u0575\u0561\u0576 \u0561\u057d\u057f\u056b\u0573\u0561\u0576>, <\u0540\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+InverseWeibull=\u054e\u0565\u0575\u0562\u0578\u0582\u056c\u056b_\u0547\u0580\u057b\u0578\u0582\u0574
+InverseZipf=\u0536\u056b\u0586\u056b_\u0547\u0580\u057b\u0578\u0582\u0574
+InverseZipf.Syntax=[ <\u0537\u056c\u0565\u0574\u0565\u0576\u057f\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568>, <\u0537\u0584\u057d\u057a\u0578\u0576\u0565\u0576\u057f>, <\u0540\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+Invert=\u0540\u0561\u056f\u0561\u0564\u0561\u0580\u0571_\u0544\u0561\u057f\u0580\u056b\u0581
+Invert.Syntax=[ <\u0544\u0561\u057f\u0580\u056b\u0581> ]
+IsInRegion=\u054f\u056b\u0580\u0578\u0582\u0575\u0569\u0578\u0582\u0574_\u0567
+IsInRegion.Syntax=[ <\u053f\u0565\u057f>, <\u054f\u056b\u0580\u0578\u0582\u0575\u0569> ]
+IsInteger=\u0531\u0574\u0562\u0578\u0572\u057b_\u0539\u056b\u057e
+IsInteger.Syntax=[ <\u0539\u056b\u057e> ]
+IsPrime=\u054a\u0561\u0580\u0566_\u0539\u056b\u057e
+Iteration=\u053b\u057f\u0565\u0580\u0561\u0581\u056b\u0561
+Iteration.Syntax=[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <\u053b\u057f\u0565\u0580\u0561\u0581\u056b\u0561\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568> ]
+IterationList=\u053b\u057f\u0565\u0580\u0561\u0581\u056b\u0561\u0576\u0565\u0580\u056b_\u0547\u0561\u0580\u0584
+IterationList.Syntax=[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <\u053b\u057f\u0565\u0580\u0561\u0581\u056b\u0561\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568> ]
+Join=\u053f\u0581\u0578\u0582\u0574_\u053f\u0578\u0576\u056f\u0561\u057f\u0565\u0576\u0561\u0581\u056b\u0561
+Join.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f\u0576\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u0551\u0578\u0582\u0581\u0561\u056f>, <\u0551\u0578\u0582\u0581\u0561\u056f>, ... ]
+KeepIf=\u0538\u0576\u057f\u0580\u0565\u0574_\u0538\u057d\u057f_\u054a\u0561\u0575\u0574\u0561\u0576\u056b
+KeepIf.Syntax=[ <\u054a\u0561\u0575\u0574\u0561\u0576>, <\u0551\u0578\u0582\u0581\u0561\u056f> ]
+LCM=\u0531\u0574\u0565\u0576\u0561\u0583\u0578\u0584\u0580_\u0538\u0576\u0564\u0570\u0561\u0576\u0578\u0582\u0580_\u0532\u0561\u0566\u0574\u0561\u057a\u0561\u057f\u056b\u056f
+LCM.Syntax=[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u0539\u056b\u057e>, <\u0539\u056b\u057e> ]
+LaTeX=LaTex_\u0562\u0561\u0576\u0561\u0571\u0587
+LaTeX.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f> ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u0576\u0565\u0580\u056b \u0561\u0580\u056a\u0565\u0584\u0576\u0565\u0580\u056b \u057f\u0565\u0572\u0561\u0564\u0580\u0578\u0582\u0574> ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u0576\u0565\u0580\u056b \u0561\u0580\u056a\u0565\u0584\u0576\u0565\u0580\u056b \u057f\u0565\u0572\u0561\u0564\u0580\u0578\u0582\u0574>, <\u0531\u0576\u0578\u0582\u0576> ]
+Last=\u054e\u0565\u0580\u057b
+Last.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u054f\u0565\u0584\u057d\u057f> ]\n[ <\u0551\u0578\u0582\u0581\u0561\u056f>, <\u0537\u056c\u0565\u0574\u0565\u0576\u057f\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568> ]\n[ <\u054f\u0565\u0584\u057d\u057f>, <\u0537\u056c\u0565\u0574\u0565\u0576\u057f\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568> ]
+LeftSide=\u0541\u0561\u056d_\u0544\u0561\u057d
+LeftSum=\u0541\u0561\u056d_\u0533\u0578\u0582\u0574\u0561\u0580
+LeftSum.Syntax=[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <x-\u056b \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <x-\u056b \u057e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <\u0548\u0582\u0572\u0572\u0561\u0576\u056f\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568> ]
+Length=\u0535\u0580\u056f\u0561\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Length.Syntax=[ <\u054e\u0565\u056f\u057f\u0578\u0580> ]\n[ <\u053f\u0565\u057f> ]\n[ <\u0551\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u054f\u0565\u0584\u057d\u057f> ]\n[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0565\u0580\u056f\u0580\u0561\u0579\u0561\u0583\u0561\u056f\u0561\u0576 \u057f\u0565\u0572> ]\n[ <\u0540\u0561\u057f\u057e\u0561\u056e> ]\n[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <x-\u056b \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <x-\u056b \u057e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568> ]\n[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0565\u057f>, <\u054e\u0565\u0580\u057b\u0576\u0561\u056f\u0565\u057f> ]\n[ <\u053f\u0578\u0580>, <x-\u056b \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <x-\u056b \u057e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568> ]\n[ <\u053f\u0578\u0580>, <\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0565\u057f>, <\u054e\u0565\u0580\u057b\u0576\u0561\u056f\u0565\u057f> ]
+LetterToUnicode=\u054f\u0561\u057c\u056b_\u0545\u0578\u0582\u0576\u056b\u056f\u0578\u0564\u0578\u057e_\u0539\u056b\u057e\u0568
+LetterToUnicode.Syntax=[ <"\u054f\u0561\u057c"> ]
+Limit=\u054d\u0561\u0570\u0574\u0561\u0576
+Limit.Syntax=[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <\u0531\u0580\u056a\u0565\u0584> ]
+LimitAbove=\u054e\u0565\u0580\u056b\u0576_\u054d\u0561\u0570\u0574\u0561\u0576
+LimitAbove.Syntax=[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <\u0531\u0580\u056a\u0565\u0584> ]
+LimitBelow=\u054d\u057f\u0578\u0580\u056b\u0576_\u054d\u0561\u0570\u0574\u0561\u0576
+LimitBelow.Syntax=[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <\u0531\u0580\u056a\u0565\u0584> ]
+Line=\u0548\u0582\u0572\u056b\u0572
+Line.Syntax=[ <\u053f\u0565\u057f>, <\u053f\u0565\u057f> ]\n[ <\u053f\u0565\u057f>, <\u0536\u0578\u0582\u0563\u0561\u0570\u0565\u057c \u0578\u0582\u0572\u056b\u0572> ]\n[ <\u053f\u0565\u057f>, <\u0548\u0582\u0572\u0572\u0578\u0582\u0569\u0575\u0561\u0576 \u057e\u0565\u056f\u057f\u0578\u0580> ]
+LineBisector=\u0544\u056b\u057b\u0576\u0578\u0582\u0572\u0572\u0561\u0570\u0561\u0575\u0561\u0581
+LineBisector.Syntax=[ <\u0540\u0561\u057f\u057e\u0561\u056e> ]\n[ <\u053f\u0565\u057f>, <\u053f\u0565\u057f> ]
+Locus=\u053f\u0565\u057f\u0565\u0580\u056b_\u0535\u0580\u056f\u0580\u0561\u0579\u0561\u0583\u0561\u056f\u0561\u0576_\u054f\u0565\u0572
+Locus.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0565\u0580\u056f\u0580\u0561\u0579\u0561\u0583\u0561\u056f\u0561\u0576 \u057f\u0565\u0572 \u057d\u057f\u0565\u0572\u056e\u0578\u0572 \u056f\u0565\u057f>, <\u053f\u0565\u057f> ]\n[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0565\u0580\u056f\u0580\u0561\u0579\u0561\u0583\u0561\u056f\u0561\u0576 \u057f\u0565\u0572 \u057d\u057f\u0565\u0572\u056e\u0578\u0572 \u056f\u0565\u057f>, <\u054d\u0578\u0572\u0576\u0561\u056f> ]
+LogNormal=\u053c\u0578\u0563\u0578\u0576\u0578\u0580\u0574\u0561\u056c_\u0532\u0561\u0577\u056d\u0578\u0582\u0574
+LogNormal.Syntax=[ <\u0544\u056b\u057b\u056b\u0576>, <\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f \u0577\u0565\u0572\u0578\u0582\u0574>, x ]\n[ <\u0544\u056b\u057b\u056b\u0576>, <\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f \u0577\u0565\u0572\u0578\u0582\u0574>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u056b \u0561\u0580\u056a\u0565\u0584\u0568> ]\n[ <\u0544\u056b\u057b\u056b\u0576>, <\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f \u0577\u0565\u0572\u0578\u0582\u0574>, x, <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+Logistic=\u053c\u0578\u0563\u056b\u057d\u057f\u056b\u056f_\u0532\u0561\u0577\u056d\u0578\u0582\u0574
+Logistic.Syntax=[ <\u0544\u056b\u057b\u056b\u0576>, <\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f \u0577\u0565\u0572\u0578\u0582\u0574>, x ]\n[ <\u0544\u056b\u057b\u056b\u0576>, <\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f \u0577\u0565\u0572\u0578\u0582\u0574>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u056b \u0561\u0580\u056a\u0565\u0584\u0568> ]\n[ <\u0544\u056b\u057b\u056b\u0576>, <\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f \u0577\u0565\u0572\u0578\u0582\u0574>, x, <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u057f\u0561\u0570\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+LowerSum=\u054d\u057f\u0578\u0580\u056b\u0576_\u0533\u0578\u0582\u0574\u0561\u0580
+LowerSum.Syntax=[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <x-\u056b \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <x-\u056b \u057e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <\u0548\u0582\u0572\u0572\u0561\u0576\u056f\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568> ]
+MatrixRank=\u0544\u0561\u057f\u0580\u056b\u0581\u056b_\u054c\u0561\u0576\u0563
+Max=\u0544\u0561\u0584\u057d\u056b\u0574\u0578\u0582\u0574
+Max.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u0544\u056b\u057b\u0561\u056f\u0561\u0575\u0584> ]\n[ <\u0539\u056b\u057e>, <\u0539\u056b\u057e> ]\n[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <x-\u056b \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <x-\u056b \u057e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568> ]
+Maximize=\u0544\u0565\u056e\u0561\u0563\u0578\u0582\u0575\u0576
+Maximize.Syntax=[ <\u053f\u0561\u056d\u0575\u0561\u056c \u0569\u056b\u057e>, <\u0531\u0566\u0561\u057f \u0569\u056b\u057e> ]
+Mean=\u0544\u056b\u057b\u056b\u0576_\u0539\u057e\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576
+Mean.Syntax=[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+MeanX=X\u0544\u056b\u057b\u056b\u0576
+MeanX.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+MeanY=Y\u0544\u056b\u057b\u056b\u0576
+MeanY.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+Median=\u053f\u056b\u057d\u0578\u0572
+Median.Syntax=[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+Midpoint=\u0544\u056b\u057b\u0576\u0561\u056f\u0565\u057f
+Midpoint.Syntax=[ <\u0540\u0561\u057f\u057e\u0561\u056e> ]\n[ <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569> ]\n[ <\u0544\u056b\u057b\u0561\u056f\u0561\u0575\u0584> ]\n[ <\u053f\u0565\u057f>, <\u053f\u0565\u057f> ]
+Min=\u0553\u0578\u0584\u0580\u0561\u0563\u0578\u0582\u0575\u0576_\u0531\u0580\u056a\u0565\u0584
+Min.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u0544\u056b\u057b\u0561\u056f\u0561\u0575\u0584> ]\n[ <\u0539\u056b\u057e>, <\u0539\u056b\u057e> ]\n[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <x-\u056b \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <x-\u056b \u057e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568> ]
+Minimize=\u0553\u0578\u0584\u0580\u0561\u0563\u0578\u0582\u0575\u0576
+Minimize.Syntax=[ <\u053f\u0561\u056d\u0575\u0561\u056c \u0569\u056b\u057e>, <\u0531\u0566\u0561\u057f \u0569\u056b\u057e> ]
+MinimumSpanningTree.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+Mirror=\u0540\u0561\u0574\u0561\u0579\u0561\u0583
+Mirror.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u053f\u0565\u057f> ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0548\u0582\u0572\u056b\u0572> ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0547\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e> ]
+MixedNumber=\u053f\u0561\u0576\u0578\u0576\u0561\u057e\u0578\u0580_\u053f\u0578\u057f\u0578\u0580\u0561\u056f
+Mod=\u0544\u0576\u0561\u0581\u0578\u0580\u0564
+Mod.Syntax=[ <\u0532\u0561\u056a\u0561\u0576\u0565\u056c\u056b>, <\u0532\u0561\u056a\u0561\u0576\u0561\u0580\u0561\u0580> ]\n[ <\u0532\u0561\u056a\u0561\u0576\u0565\u056c\u056b \u0562\u0561\u0566\u0574\u0561\u0576\u0564\u0561\u0574>, <\u0532\u0561\u056a\u0561\u0576\u0561\u0580\u0561\u0580 \u0562\u0561\u0566\u0574\u0561\u0576\u0564\u0561\u0574> ]
+Mode=\u0544\u0578\u0564
+Mode.Syntax=[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+NIntegral=\u0539\u057e\u0561\u0575\u056b\u0576_\u053b\u0576\u057f\u0565\u0563\u0580\u0578\u0582\u0574
+NRoot=\u0539\u057e\u0561\u0575\u056b\u0576_\u053c\u0578\u0582\u056e\u0578\u0582\u0574
+NSolutions=\u0539\u057e\u0561\u0575\u056b\u0576_\u053c\u0578\u0582\u056e\u0578\u0582\u0574\u0576\u0565\u0580
+NSolve=\u0539\u057e\u0561\u0575\u056b\u0576_\u053c\u0578\u0582\u056e\u0578\u0582\u0574
+Name=\u0531\u0576\u0578\u0582\u0576
+Name.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f> ]
+NextPrime=\u0540\u0561\u057b\u0578\u0580\u0564_\u054a\u0561\u0580\u0566_\u0539\u056b\u057e\u0568
+Normal=\u0546\u0578\u0580\u0574\u0561\u056c_\u0532\u0561\u0577\u056d\u0578\u0582\u0574
+Normal.Syntax=[ <\u0544\u056b\u057b\u056b\u0576>, <\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f \u0577\u0565\u0572\u0578\u0582\u0574>, x ]\n[ <\u0544\u056b\u057b\u056b\u0576>, <\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f \u0577\u0565\u0572\u0578\u0582\u0574>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u056b \u0561\u0580\u056a\u0565\u0584\u0568> ]\n[ <\u0544\u056b\u057b\u056b\u0576>, <\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f \u0577\u0565\u0572\u0578\u0582\u0574>, x, <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+NormalQuantilePlot=\u0546\u0578\u0580\u0574\u0561\u056c_\u0554\u057e\u0561\u0576\u057f\u056b\u056c\u0576\u0565\u0580\u056b_\u0533\u0580\u0561\u0586\u056b\u056f
+Numerator=\u0540\u0561\u0574\u0561\u0580\u056b\u0579
+Numerator.Syntax=[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561> ]
+Numeric=\u054f\u0561\u057d\u0576\u0578\u0580\u0564\u0561\u056f\u0561\u0576_\u053f\u0578\u057f\u0578\u0580\u0561\u056f
+Object=\u0555\u0562\u0575\u0565\u056f\u057f
+Object.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f\u056b \u0561\u0576\u0578\u0582\u0576\u0568 \u0578\u0580\u057a\u0565\u057d \u057f\u0565\u0584\u057d\u057f> ]
+Ordinal=\u053f\u0561\u0580\u0563\u0561\u0575\u056b\u0576_\u0540\u0561\u0574\u0561\u0580\u0568
+Ordinal.Syntax=[ <\u0531\u0574\u0562\u0578\u0572\u057b \u0539\u056b\u057e> ]
+OrdinalRank.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f> ]
+OrthogonalLine=\u0548\u0582\u0572\u0572\u0561\u0570\u0561\u0575\u0561\u0581_\u0548\u0582\u0572\u056b\u0572
+OrthogonalLine.Syntax=[ <\u053f\u0565\u057f>, <\u0548\u0582\u0572\u056b\u0572> ]\n[ <\u053f\u0565\u057f>, <\u0540\u0561\u057f\u057e\u0561\u056e> ]\n[ <\u053f\u0565\u057f>, <\u054e\u0565\u056f\u057f\u0578\u0580> ]
+OrthogonalVector=\u0548\u0582\u0572\u0572\u0561\u0570\u0561\u0575\u0561\u0581_\u054e\u0565\u056f\u057f\u0578\u0580
+OrthogonalVector.Syntax=[ <\u0548\u0582\u0572\u056b\u0572> ]\n[ <\u0540\u0561\u057f\u057e\u0561\u056e> ]\n[ <\u054e\u0565\u056f\u057f\u0578\u0580> ]
+OsculatingCircle=\u053f\u0578\u0580\u0578\u0582\u0569\u0575\u0561\u0576_\u0547\u0580\u057b\u0561\u0576
+OsculatingCircle.Syntax=[ <\u053f\u0565\u057f>, <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561> ]\n[ <\u053f\u0565\u057f>, <\u053f\u0578\u0580> ]
+PMCC=\u053f\u0578\u0580\u0565\u056c\u056b\u0561\u0581\u056b\u0561\u0575\u056b_\u0533\u0578\u0580\u056e\u0561\u056f\u056b\u0581
+PMCC.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]\n[ <x \u056f\u0578\u0578\u0580\u0564\u056b\u0576\u0561\u057f\u0576\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f>, <y \u056f\u0578\u0578\u0580\u0564\u056b\u0576\u0561\u057f\u0576\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+Pan=\u0540\u0561\u0574\u0561\u0575\u0576\u0561\u057a\u0561\u057f\u056f\u0565\u0580
+Pan.Syntax=[ <x-\u056b \u0569\u056b\u057e\u0568>, <y-\u056b \u0569\u056b\u057e\u0568> ]
+Parabola=\u054a\u0561\u0580\u0561\u0562\u0578\u056c\u0561
+Parabola.Syntax=[ <\u053f\u0565\u057f>, <\u0548\u0582\u0572\u056b\u0572> ]
+Parameter=\u054a\u0561\u0580\u0561\u0574\u0565\u057f\u0580
+Parameter.Syntax=[ <\u054a\u0561\u0580\u0561\u0562\u0578\u056c\u0561> ]
+ParseToFunction=\u0540\u0565\u057f\u0561\u0566\u0578\u057f\u0565\u0574_\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561\u0576
+ParseToNumber=\u0540\u0565\u057f\u0561\u0566\u0578\u057f\u0565\u0574_\u0539\u057e\u0565\u0580\u0568
+PartialFractions=\u053f\u0578\u057f\u0578\u0580\u0561\u056f
+PartialFractions.Syntax=[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561> ]
+Pascal=\u054a\u0561\u057d\u056f\u0561\u056c
+Pascal.Syntax=[ <\u0532\u0561\u0580\u0565\u0570\u0561\u057b\u0578\u0572 \u0565\u056c\u0584\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568>, <\u0532\u0561\u0580\u0565\u0570\u0561\u057b\u0578\u0572 \u0565\u056c\u0584\u0565\u0580\u056b \u0570\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568> ]\n[ <\u0532\u0561\u0580\u0565\u0570\u0561\u057b\u0578\u0572 \u0565\u056c\u0584\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568>, <\u0532\u0561\u0580\u0565\u0570\u0561\u057b\u0578\u0572 \u0565\u056c\u0584\u0565\u0580\u056b \u0570\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568>, <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]\n[ <\u0532\u0561\u0580\u0565\u0570\u0561\u057b\u0578\u0572 \u0565\u056c\u0584\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568>, <\u0532\u0561\u0580\u0565\u0570\u0561\u057b\u0578\u0572 \u0565\u056c\u0584\u0565\u0580\u056b \u0570\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u056b \u0561\u0580\u056a\u0565\u0584\u0568>, <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+PathParameter=\u0540\u0565\u057f\u0561\u0563\u056e\u056b_\u054a\u0561\u0580\u0561\u0574\u0565\u057f\u0580
+PathParameter.Syntax=[ <\u0540\u0565\u057f\u0561\u0563\u056e\u056b \u056f\u0565\u057f> ]
+Percentile=\u054a\u0580\u0578\u0581\u0565\u0576\u057f\u056b\u056c
+Percentile.Syntax=[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f>, <\u054f\u0578\u056f\u0578\u057d> ]
+Perimeter=\u054a\u0561\u0580\u0561\u0563\u056b\u056e
+Perimeter.Syntax=[ <\u0532\u0561\u0566\u0574\u0561\u0576\u056f\u0575\u0578\u0582\u0576> ]\n[ <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569> ]\n[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0565\u0580\u056f\u0580\u0561\u0579\u0561\u0583\u0561\u056f\u0561\u0576 \u057f\u0565\u0572> ]
+PlaySound=\u0541\u0561\u0575\u0576
+Point=\u053f\u0565\u057f
+Point.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f> ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u054a\u0561\u0580\u0561\u0574\u0565\u057f\u0580> ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u054a\u0561\u0580\u0561\u0574\u0565\u057f\u0580> ]\n[ <\u053f\u0565\u057f>, <\u054e\u0565\u056f\u057f\u0578\u0580> ]
+PointIn=\u0546\u0565\u0580\u0584\u056b\u0576_\u053f\u0565\u057f
+PointIn.Syntax=[ <\u054f\u056b\u0580\u0578\u0582\u0575\u0569> ]
+PointList=\u053f\u0565\u057f\u0565\u0580\u056b_\u0551\u0578\u0582\u0581\u0561\u056f
+PointList.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f> ]
+Poisson=\u054a\u0578\u0582\u0561\u057d\u0578\u0576
+Poisson.Syntax=[ <\u0544\u056b\u057b\u056b\u0576> ]\n[ <\u0544\u056b\u057b\u056b\u0576>, <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]\n[ <\u0544\u056b\u057b\u056b\u0576>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u056b \u0561\u0580\u056a\u0565\u0584\u0568>, <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+Polar=\u054a\u0578\u056c\u0575\u0561\u0580
+Polar.Syntax=[ <\u053f\u0565\u057f>, <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569> ]
+PolyLine=\u0532\u0565\u056f\u0575\u0561\u056c
+PolyLine.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u053f\u0565\u057f>, ..., <\u053f\u0565\u057f> ]
+Polygon=\u0532\u0561\u0566\u0574\u0561\u0576\u056f\u0575\u0578\u0582\u0576
+Polygon.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u053f\u0565\u057f>, ..., <\u053f\u0565\u057f> ]\n[ <\u053f\u0565\u057f>, <\u053f\u0565\u057f>, <\u0533\u0561\u0563\u0561\u0569\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568> ]
+Polynomial=\u0532\u0561\u0566\u0574\u0561\u0576\u0564\u0561\u0574
+Polynomial.Syntax=[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561> ]\n[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+PrimeFactors=\u054a\u0561\u0580\u0566_\u0531\u0580\u057f\u0561\u0564\u0580\u056b\u0579\u0576\u0565\u0580
+PrimeFactors.Syntax=[ <\u0539\u056b\u057e> ]
+Product=\u0531\u0580\u057f\u0561\u0564\u0580\u0575\u0561\u056c
+Product.Syntax=[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f>, <\u0537\u056c\u0565\u0574\u0565\u0576\u057f\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568> ]
+Q1=\u054d\u057f\u0578\u0580\u056b\u0576_\u0554\u057e\u0561\u0580\u057f\u056b\u056c
+Q1.Syntax=[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+Q3=\u054e\u0565\u0580\u056b\u0576_\u0554\u057e\u0561\u0580\u057f\u056b\u056c
+Q3.Syntax=[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+RSquare.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f>, <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561> ]
+Radius=\u0547\u0561\u057c\u0561\u057e\u056b\u0572
+Radius.Syntax=[ <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569> ]
+Random=\u054a\u0561\u057f\u0561\u0570\u0561\u056f\u0561\u0576_\u0539\u056b\u057e
+Random.Syntax=[ <\u0553\u0578\u0584\u0580\u0561\u0563\u0578\u0582\u0575\u0576 \u0561\u0574\u0562\u0578\u0572\u057b \u0561\u0580\u056a\u0565\u0584\u0568>, <\u0544\u0565\u056e\u0561\u0563\u0578\u0582\u0575\u0576 \u0561\u0574\u0562\u0578\u0572\u057b \u0561\u0580\u056a\u0565\u0584\u0568> ]
+RandomBinomial.Syntax=[ <\u0553\u0578\u0580\u0571\u0561\u0580\u056f\u0578\u0582\u0574\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568>, <\u0540\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+RandomElement=\u054a\u0561\u057f\u0561\u0570\u0561\u056f\u0561\u0576_\u0537\u056c\u0565\u0574\u0565\u0576\u057f
+RandomElement.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f> ]
+RandomNormal=\u054a\u0561\u057f\u0561\u0570\u0561\u056f\u0561\u0576_\u0546\u0578\u0580\u0574\u0561\u056c
+RandomNormal.Syntax=[ <\u0544\u056b\u057b\u056b\u0576>, <\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f \u0577\u0565\u0572\u0578\u0582\u0574> ]
+RandomPoisson.Syntax=[ <\u0544\u056b\u057b\u056b\u0576> ]
+RandomPolynomial=\u054a\u0561\u057f\u0561\u0570\u0561\u056f\u0561\u0576_\u0532\u0561\u0566\u0574\u0561\u0576\u0564\u0561\u0574
+Rationalize=\u0546\u0565\u0580\u056f\u0561\u0575\u0561\u0581\u0576\u0565\u0574_\u053f\u0578\u057f\u0578\u0580\u0561\u056f\u056b_\u054f\u0565\u057d\u0584\u0578\u057e
+Ray=\u0543\u0561\u057c\u0561\u0563\u0561\u0575\u0569
+Ray.Syntax=[ <\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0565\u057f>, <\u053f\u0565\u057f> ]\n[ <\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0565\u057f>, <\u0548\u0582\u0572\u0572\u0578\u0582\u0569\u0575\u0561\u0576 \u057e\u0565\u056f\u057f\u0578\u0580> ]
+Real=\u053b\u0580\u0561\u056f\u0561\u0576_\u0544\u0561\u057d
+RectangleSum=\u0548\u0582\u0572\u0572\u0561\u0576\u056f\u0575\u0578\u0582\u0576_\u0533\u0578\u0582\u0574\u0561\u0580
+RectangleSum.Syntax=[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <x-\u056b \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <x-\u056b \u057e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <\u0548\u0582\u0572\u0572\u0561\u0576\u056f\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568>, <\u0534\u056b\u0580\u0584\u0568 \u0578\u0582\u0572\u0572\u0561\u0576\u056f\u0575\u0578\u0582\u0576 \u057d\u057f\u0561\u0580\u057f\u056b \u0570\u0561\u0574\u0561\u0580> ]
+ReducedRowEchelonForm=\u0546\u0565\u0580\u056f\u0561\u0575\u0561\u0581\u0576\u0565\u0574_\u0531\u0572\u0575\u0578\u0582\u057d\u0561\u056f\u0578\u057e
+ReducedRowEchelonForm.Syntax=[ <\u0544\u0561\u057f\u0580\u056b\u0581> ]
+Relation=\u0540\u0561\u0580\u0561\u0562\u0565\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Relation.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0555\u0562\u0575\u0565\u056f\u057f> ]
+RemoveUndefined=\u054b\u0576\u057b\u0565\u0574_\u0549\u057d\u0561\u0570\u0574\u0561\u0576\u057e\u0561\u056e\u0576\u0565\u0580\u0568
+RemoveUndefined.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f> ]
+Rename=\u054e\u0565\u0580\u0561\u0576\u057e\u0561\u0576\u0565\u0574
+Rename.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0531\u0576\u0578\u0582\u0576> ]
+ResidualPlot.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f>, <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561> ]
+Reverse=\u0547\u0580\u057b\u0565\u0574
+Reverse.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f> ]
+RightSide=\u0531\u057b_\u0544\u0561\u057d
+RigidPolygon=\u053f\u0578\u0577\u057f_\u0532\u0561\u0566\u0574\u0561\u0576\u056f\u0575\u0578\u0582\u0576
+RigidPolygon.Syntax=[ <\u0531\u0566\u0561\u057f \u056f\u0565\u057f>, ..., <\u0531\u0566\u0561\u057f \u056f\u0565\u057f> ]
+Root=\u0531\u0580\u0574\u0561\u057f
+Root.Syntax=[ <\u0532\u0561\u0566\u0574\u0561\u0576\u0564\u0561\u0574> ]\n[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <\u0531\u057c\u0561\u057b\u056b\u0576 \u0574\u0578\u057f\u0561\u057e\u0578\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]\n[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <x-\u056b \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <x-\u056b \u057e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568> ]
+RootList=\u0531\u0580\u0574\u0561\u057f\u0576\u0565\u0580\u056b_\u0551\u0578\u0582\u0581\u0561\u056f
+RootList.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f> ]
+RootMeanSquare=\u0544\u056b\u057b\u056b\u0576_\u0554\u0561\u057c\u0561\u056f\u0578\u0582\u057d\u0561\u0575\u056b\u0576
+RootMeanSquare.Syntax=[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+Roots=\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561\u0575\u056b_\u0536\u0580\u0578\u0576\u0565\u0580\u0568
+Roots.Syntax=[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <x-\u056b \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <x-\u056b \u057e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568> ]
+Rotate=\u054a\u057f\u057f\u0565\u0574
+Rotate.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0531\u0576\u056f\u0575\u0578\u0582\u0576> ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0531\u0576\u056f\u0575\u0578\u0582\u0576>, <\u053f\u0565\u057f> ]
+RotateText=\u054a\u057f\u057f\u0565\u0574_\u054f\u0565\u0584\u057d\u057f\u0568
+RotateText.Syntax=[ <\u054f\u0565\u0584\u057d\u057f>, <\u0531\u0576\u056f\u0575\u0578\u0582\u0576> ]
+Row=\u054f\u0578\u0572
+SD=\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f_\u0547\u0565\u0572\u0578\u0582\u0574
+SD.Syntax=[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+SDX=\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f_\u0547\u0565\u0572\u0578\u0582\u0574_x
+SDX.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+SDY=\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f_\u0547\u0565\u0572\u0578\u0582\u0574_y
+SDY.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+SXX.Syntax=[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+SXY.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f>, <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+SYY.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+Sample=\u0546\u0574\u0578\u0582\u0577
+Sample.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f>, <\u0549\u0561\u0583> ]\n[ <\u0551\u0578\u0582\u0581\u0561\u056f>, <\u0549\u0561\u0583>, <\u054f\u0565\u0572\u0561\u0583\u0578\u056d\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u0578\u057e> ]
+SampleSD=\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f_\u0547\u0565\u0572\u0574\u0561\u0576_\u0546\u0574\u0578\u0582\u0577
+SampleSD.Syntax=[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+SampleSDX=\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f_\u0547\u0565\u0572\u0574\u0561\u0576_\u0546\u0574\u0578\u0582\u0577_x
+SampleSDX.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+SampleSDY=\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f_\u0547\u0565\u0572\u0574\u0561\u0576_\u0546\u0574\u0578\u0582\u0577_y
+SampleSDY.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+SampleVariance=\u0546\u0574\u0578\u0582\u0577\u0561\u0575\u056b\u0576_\u0534\u056b\u057d\u057a\u0565\u0580\u057d\u056b\u0561
+SampleVariance.Syntax=[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+SecondAxis=\u0535\u0580\u056f\u0580\u0578\u0580\u0564\u0561\u056f\u0561\u0576_\u0531\u057c\u0561\u0576\u0581\u0584
+SecondAxis.Syntax=[ <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569> ]
+SecondAxisLength=\u0553\u0578\u0584\u0580_\u053f\u056b\u057d\u0561\u0561\u057c\u0561\u0576\u0581\u0584
+SecondAxisLength.Syntax=[ <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569> ]
+Sector=\u054d\u0565\u056f\u057f\u0578\u0580
+Sector.Syntax=[ <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569>, <\u053f\u0565\u057f>, <\u053f\u0565\u057f> ]\n[ <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569>, <\u054a\u0561\u0580\u0561\u0574\u0565\u057f\u0580\u056b \u0561\u0580\u056a\u0565\u0584>, <\u054a\u0561\u0580\u0561\u0574\u0565\u057f\u0580\u056b \u0561\u0580\u056a\u0565\u0584> ]
+Segment=\u0540\u0561\u057f\u057e\u0561\u056e
+Segment.Syntax=[ <\u053f\u0565\u057f>, <\u053f\u0565\u057f> ]\n[ <\u053f\u0565\u057f>, <\u0535\u0580\u056f\u0561\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+SelectObjects=\u0538\u0576\u057f\u0580\u0565\u0574_\u0555\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580
+SelectObjects.Syntax=[ ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0555\u0562\u0575\u0565\u056f\u057f>, ... ]
+SelectedElement=\u0538\u0576\u057f\u0580\u057e\u0561\u056e_\u0537\u056c\u0565\u0574\u0565\u0576\u057f
+SelectedElement.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f> ]
+SelectedIndex=\u0538\u0576\u057f\u0580\u057e\u0561\u056e_\u0537\u056c\u0565\u0574\u0565\u0576\u057f\u056b_\u0540\u0561\u0574\u0561\u0580\u0568
+SelectedIndex.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f> ]
+Semicircle=\u053f\u056b\u057d\u0561\u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e
+Semicircle.Syntax=[ <\u053f\u0565\u057f>, <\u053f\u0565\u057f> ]
+Sequence=\u0540\u0561\u057b\u0578\u0580\u0564\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Sequence.Syntax=[ <\u054e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568> ]\n[ <\u0531\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576>, <\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <\u054e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568> ]\n[ <\u0531\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576>, <\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <\u054e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <\u0554\u0561\u0575\u056c> ]
+SetActiveView=\u0531\u056f\u057f\u056b\u057e_\u054f\u0565\u057d\u0584
+SetActiveView.Syntax=[ <\u0539\u056b\u057e 1|2> ]
+SetAxesRatio=\u0531\u057c\u0561\u0576\u0581\u0584\u0576\u0565\u0580\u056b_\u0540\u0561\u0580\u0561\u0562\u0565\u0580\u0561\u056f\u0581\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+SetAxesRatio.Syntax=[ <\u0539\u056b\u057e>, <\u0539\u056b\u057e> ]
+SetBackgroundColor=\u0538\u0576\u057f\u0580\u0565\u0574_\u0556\u0578\u0576\u056b_\u0533\u0578\u0582\u0575\u0576\u0568
+SetBackgroundColor.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f>, "<\u0533\u0578\u0582\u0575\u0576>" ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u053f\u0561\u0580\u0574\u056b\u0580>, <\u053f\u0561\u0576\u0561\u0579>, <\u053f\u0561\u057a\u0578\u0582\u0575\u057f> ]
+SetCaption=\u0538\u0576\u057f\u0580\u0565\u0574_\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580\u0568
+SetCaption.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u054f\u0565\u0584\u057d\u057f> ]
+SetColor=\u0538\u0576\u057f\u0580\u0565\u0574_\u0533\u0578\u0582\u0575\u0576\u0568
+SetColor.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f>, "<\u0533\u0578\u0582\u0575\u0576>" ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u053f\u0561\u0580\u0574\u056b\u0580>, <\u053f\u0561\u0576\u0561\u0579>, <\u053f\u0561\u057a\u0578\u0582\u0575\u057f> ]
+SetConditionToShowObject=\u0538\u0576\u057f\u0580\u0565\u0574_\u0555\u0562\u0575\u0565\u056f\u057f\u056b_\u0551\u0578\u0582\u0581\u0561\u0564\u0580\u0574\u0561\u0576_\u054a\u0561\u0575\u0574\u0561\u0576\u0576\u0565\u0580\u0568
+SetConditionToShowObject.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u054a\u0561\u0575\u0574\u0561\u0576> ]
+SetCoords=\u0546\u0577\u0565\u0574_\u053f\u0578\u0578\u0580\u0564\u056b\u0576\u0561\u057f\u0576\u0565\u0580\u0568
+SetCoords.Syntax=[ <\u053f\u0565\u057f>, <x>, <y> ]
+SetDynamicColor=\u0538\u0576\u057f\u0580\u0565\u0574_\u0534\u056b\u0576\u0561\u0574\u056b\u056f_\u0533\u0578\u0582\u0576\u0561\u057e\u0578\u0580\u0578\u0582\u0574\u0568
+SetDynamicColor.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u053f\u0561\u0580\u0574\u056b\u0580>, <\u053f\u0561\u0576\u0561\u0579>, <\u053f\u0561\u057a\u0578\u0582\u0575\u057f> ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u053f\u0561\u0580\u0574\u056b\u0580>, <\u053f\u0561\u0576\u0561\u0579>, <\u053f\u0561\u057a\u0578\u0582\u0575\u057f>, <\u0546\u0565\u0580\u056f\u0578\u0582\u0574> ]
+SetFilling.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0539\u056b\u057e> ]
+SetFixed=\u0556\u056b\u0584\u057d\u0565\u0574
+SetFixed.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <true | false> ]
+SetLabelMode=\u0546\u0577\u0561\u0576\u0561\u056f\u0574\u0561\u0576_\u054f\u0565\u057d\u0584\u0568
+SetLabelMode.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0539\u056b\u057e> ]
+SetLayer=\u0538\u0576\u057f\u0580\u0565\u0574_\u0547\u0565\u0580\u057f\u0568
+SetLayer.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0547\u0565\u0580\u057f> ]
+SetLineStyle=\u0538\u0576\u057f\u0580\u0565\u0574_\u0533\u056e\u056b_\u0548\u0573\u0568
+SetLineStyle.Syntax=[ <\u0548\u0582\u0572\u056b\u0572>, <\u0539\u056b\u057e> ]
+SetLineThickness=\u0538\u0576\u057f\u0580\u0565\u0574_\u0533\u056e\u056b_\u0540\u0561\u057d\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+SetLineThickness.Syntax=[ <\u0548\u0582\u0572\u056b\u0572>, <\u0539\u056b\u057e> ]
+SetPointSize=\u0538\u0576\u057f\u0580\u0565\u0574_\u053f\u0565\u057f\u056b_\u0549\u0561\u0583\u057d\u0568
+SetPointSize.Syntax=[ <\u053f\u0565\u057f>, <\u0539\u056b\u057e> ]
+SetPointStyle=\u0538\u0576\u057f\u0580\u0565\u0574_\u053f\u0565\u057f\u056b_\u0548\u0573\u0568
+SetPointStyle.Syntax=[ <\u053f\u0565\u057f>, <\u0539\u056b\u057e> ]
+SetTooltipMode=\u0540\u0578\u0582\u0577\u0578\u0582\u0574\u0576\u0565\u0580\u056b_\u054c\u0565\u056a\u056b\u0574
+SetTooltipMode.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0539\u056b\u057e> ]
+SetValue=\u0538\u0576\u057f\u0580\u0565\u0574_\u0531\u0580\u056a\u0565\u0584\u0568
+SetValue.Syntax=[ <\u0532\u0578\u0582\u056c\u0575\u0561\u0576>, <0|1> ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0555\u0562\u0575\u0565\u056f\u057f> ]\n[ <\u0551\u0578\u0582\u0581\u0561\u056f>, <\u0539\u056b\u057e>, <\u0555\u0562\u0575\u0565\u056f\u057f> ]
+SetVisibleInView=\u0538\u0576\u057f\u0580\u0565\u0574_\u0534\u056b\u0580\u0584\u0568
+SetVisibleInView.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <1|2 \u057f\u0565\u057d\u0584\u056b \u0570\u0561\u0574\u0561\u0580>, <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+Shear=\u0547\u0565\u0572\u0578\u0582\u0574
+Shear.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0548\u0582\u0572\u056b\u0572>, <\u0533\u0578\u0580\u056e\u0561\u056f\u056b\u0581> ]
+ShortestDistance=\u0553\u0578\u0584\u0580\u0561\u0563\u0578\u0582\u0575\u0576_\u0540\u0565\u057c\u0561\u057e\u0578\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+ShowLabel=\u0551\u0578\u0582\u0575\u0581_\u054f\u0561\u0574_\u0546\u0577\u0561\u0576\u0561\u056f\u0578\u0582\u0574\u0568
+ShowLabel.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568> ]
+ShowLayer=\u0551\u0578\u0582\u0575\u0581_\u054f\u0561\u0574_\u0547\u0565\u0580\u057f\u0568
+ShowLayer.Syntax=[ <\u0539\u056b\u057e> ]
+Shuffle=\u053d\u0561\u057c\u0576\u0565\u0574_\u0540\u0565\u0580\u0569\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+Shuffle.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f> ]
+SigmaXX=\u054d\u056b\u0563\u0574\u0561XX
+SigmaXX.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+SigmaXY=\u054d\u056b\u0563\u0574\u0561XY
+SigmaXY.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]\n[ <x-\u056f\u0578\u0578\u0580\u0564\u056b\u0576\u0561\u057f\u0576\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f>, <y-\u056f\u0578\u0578\u0580\u0564\u056b\u0576\u0561\u057f\u0576\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+SigmaYY=\u054d\u056b\u0563\u0574\u0561YY
+SigmaYY.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+Simplify=\u054a\u0561\u0580\u0566\u0565\u0581\u0576\u0565\u0574
+Simplify.Syntax=[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561> ]\n[ <\u054f\u0565\u0584\u057d\u057f> ]
+Slider=\u054d\u0578\u0572\u0576\u0561\u056f
+Slider.Syntax=[ <\u0544\u056b\u0576\u056b\u0574\u0578\u0582\u0574>, <\u0544\u0561\u0584\u057d\u056b\u0574\u0578\u0582\u0574>, <\u0554\u0561\u0575\u056c>, <\u0531\u0580\u0561\u0563\u0578\u0582\u0569\u0575\u0578\u0582\u0576>, <\u053c\u0561\u0575\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576>, <\u0531\u0576\u056f\u0575\u0578\u0582\u0576 \u0567\u055e>, <\u0540\u0578\u0580\u056b\u0566\u0578\u0576\u0561\u056f\u0561\u0576>, <\u0531\u0576\u056b\u0574\u0561\u0581\u056b\u0561>, <\u054a\u0561\u057f\u0561\u0570\u0561\u056f\u0561\u0576 \u0569\u056b\u057e> ]
+Slope=\u0539\u0565\u0584\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Slope.Syntax=[ <\u0548\u0582\u0572\u056b\u0572> ]
+SlowPlot=\u0551\u0578\u0582\u0575\u0581_\u054f\u0561\u0574_\u0533\u0580\u0561\u0586\u056b\u056f\u0568
+SlowPlot.Syntax=[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561> ]
+Solutions=\u053c\u0578\u0582\u056e\u0578\u0582\u0574\u0576\u0565\u0580
+Solve=\u053c\u0578\u0582\u056e\u0565\u0574
+SolveODE=\u053c\u0578\u0582\u056e\u0565\u0574_\u054d\u0534\u0540
+SolveODE.Syntax=[ <f'(x)>, <\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 x>, <\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 y>, <\u054e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 x>, <\u0554\u0561\u0575\u056c> ]\n[ <y'>, <x'>, <\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 x>, <\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 y>, <\u054e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 t>, <\u0554\u0561\u0575\u056c> ]\n[ <b(x)>, <c(x)>, <f(x)>, <\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 x>, <\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 y>, <\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 y'>, <\u054e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 x>, <\u0554\u0561\u0575\u056c> ]
+Sort=\u054f\u0565\u057d\u0561\u056f\u0561\u057e\u0578\u0580\u0565\u0574
+Sort.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f> ]
+Spearman.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f>, <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+StartAnimation=\u054d\u056f\u057d\u0565\u0574_\u0531\u0576\u056b\u0574\u0561\u0581\u056b\u0561\u0576
+StartAnimation.Syntax=[ ]\n[ <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584> ]\n[ <\u054d\u0578\u0572\u0576\u0561\u056f \u056f\u0561\u0574 \u056f\u0565\u057f>, <\u054d\u0578\u0572\u0576\u0561\u056f \u056f\u0561\u0574 \u056f\u0565\u057f>, ... ]\n[ <\u054d\u0578\u0572\u0576\u0561\u056f \u056f\u0561\u0574 \u056f\u0565\u057f>, <\u054d\u0578\u0572\u0576\u0561\u056f \u056f\u0561\u0574 \u056f\u0565\u057f>, ..., <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584> ]
+StemPlot=\u054d\u0569\u0565\u0574_\u0533\u0580\u0561\u0586\u056b\u056f
+StemPlot.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u0551\u0578\u0582\u0581\u0561\u056f>, <Adjustment -1|0|1> ]
+Stretch=\u0541\u0563\u0565\u0574
+Stretch.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u054e\u0565\u056f\u057f\u0578\u0580> ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0548\u0582\u0572\u056b\u0572>, <\u0533\u0578\u0580\u056e\u0561\u056f\u056b\u0581> ]
+Substitute=\u0553\u0578\u056d\u0561\u0580\u056b\u0576\u0565\u0574
+Sum=\u0533\u0578\u0582\u0574\u0561\u0580
+Sum.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u0551\u0578\u0582\u0581\u0561\u056f>, <\u0567\u056c\u0565\u0574\u0565\u0576\u057f\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568> ]
+SumSquaredErrors=\u0533\u0578\u0582\u0574\u0561\u0580_\u0554\u0561\u057c\u0561\u056f\u0578\u0582\u057d\u0561\u0575\u056b\u0576_\u054d\u056d\u0561\u056c
+SumSquaredErrors.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f>, <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561> ]
+TDistribution=T_\u0562\u0561\u0577\u056d\u0578\u0582\u0574
+TDistribution.Syntax=[ <\u0531\u0566\u0561\u057f\u0578\u0582\u0569\u0575\u0561\u0576 \u0561\u057d\u057f\u056b\u0573\u0561\u0576>, x ]\n[ <\u0531\u0566\u0561\u057f\u0578\u0582\u0569\u0575\u0561\u0576 \u0561\u057d\u057f\u056b\u0573\u0561\u0576>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u056b \u0561\u0580\u056a\u0565\u0584\u0568> ]\n[ <\u0531\u0566\u0561\u057f\u0578\u0582\u0569\u0575\u0561\u0576 \u0561\u057d\u057f\u056b\u0573\u0561\u0576>, x, <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+TTest=T\u0539\u0565\u057d\u057f
+TTest2=T\u0539\u0565\u057d\u057f2
+TableText=\u0531\u0572\u0575\u0578\u0582\u057d\u0561\u056f
+TableText.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f>, <\u0551\u0578\u0582\u0581\u0561\u056f>, ... ]\n[ <\u0551\u0578\u0582\u0581\u0561\u056f>, <\u0551\u0578\u0582\u0581\u0561\u056f>, ..., <\u054f\u0565\u0584\u057d\u057f\u056b \u0570\u0561\u057e\u0561\u057d\u0561\u0580\u0565\u0581\u0578\u0582\u0574> ]
+Take=\u0534\u0578\u0582\u0580\u057d_\u0533\u0580\u0565\u0574
+Take.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f>, <\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0564\u056b\u0580\u0584>, <\u054e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0564\u056b\u0580\u0584> ]\n[ <\u054f\u0565\u0584\u057d\u057f>, <\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0564\u056b\u0580\u0584>, <\u054e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0564\u056b\u0580\u0584> ]
+Tangent=\u0547\u0578\u0577\u0561\u0583\u0578\u0572
+Tangent.Syntax=[ <\u053f\u0565\u057f>, <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569> ]\n[ <\u053f\u0565\u057f>, <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561> ]\n[ <\u053f\u0565\u057f \u056f\u0578\u0580\u056b \u057e\u0580\u0561>, <\u053f\u0578\u0580> ]\n[ <x-\u056b \u0561\u0580\u056a\u0565\u0584\u0568>, <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561> ]\n[ <\u0548\u0582\u0572\u056b\u0572>, <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569> ]\n[ <\u0547\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e>, <\u0547\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e> ]
+TaylorSeries=\u0539\u0565\u0575\u056c\u0578\u0580\u056b_\u0547\u0561\u0580\u0584
+TaylorSeries.Syntax=[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <x-\u056b \u0561\u0580\u056a\u0565\u0584\u0568>, <\u053f\u0561\u0580\u0563> ]
+Text=\u054f\u0565\u0584\u057d\u057f
+Text.Syntax=[ <\u0555\u0562\u0575\u0565\u056f\u057f> ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u0576\u0565\u0580\u056b \u0561\u0580\u056a\u0565\u0584\u0576\u0565\u0580\u056b \u057f\u0565\u0572\u0561\u0564\u0580\u0578\u0582\u0574> ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u053f\u0565\u057f> ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u053f\u0565\u057f>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u0576\u0565\u0580\u056b \u0561\u0580\u056a\u0565\u0584\u0576\u0565\u0580\u056b \u057f\u0565\u0572\u0561\u0564\u0580\u0578\u0582\u0574> ]\n[ <\u0555\u0562\u0575\u0565\u056f\u057f>, <\u053f\u0565\u057f>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u0576\u0565\u0580\u056b \u0561\u0580\u056a\u0565\u0584\u0576\u0565\u0580\u056b \u057f\u0565\u0572\u0561\u0564\u0580\u0578\u0582\u0574>, <LaTeX \u0562\u0561\u0576\u0561\u0571\u0587\u056b \u057f\u0565\u0572\u0561\u0564\u0580\u0578\u0582\u0574> ]
+TextToUnicode=\u054f\u0565\u0584\u057d\u057f\u056b_\u0545\u0578\u0582\u0576\u056b\u056f\u0578\u0564\u0578\u057e_\u0539\u057e\u0565\u0580\u0568
+TextToUnicode.Syntax=[ <"\u054f\u0565\u0584\u057d\u057f"> ]
+Textfield=\u0544\u0578\u0582\u057f\u0584\u056b_\u054a\u0561\u057f\u0578\u0582\u0570\u0561\u0576
+Textfield.Syntax=[ ]\n[ <\u053f\u0561\u057a\u057e\u0561\u056e \u0585\u0562\u0575\u0565\u056f\u057f> ]
+TiedRank=\u0540\u0561\u0574\u0568\u0576\u056f\u0576\u0578\u0572_\u054c\u0561\u0576\u0563
+TiedRank.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f> ]
+ToComplex=\u053f\u0578\u0574\u057a\u056c\u0565\u0584\u057d_\u0539\u057e\u0578\u057e
+ToExponential=\u0537\u0584\u057d\u057a\u0578\u0576\u0565\u0576\u0581\u056b\u0561\u056c_\u054f\u0565\u057d\u0584\u0578\u057e
+ToPoint=\u053f\u0565\u057f\u0578\u0582\u0574
+ToPolar=\u0532\u0587\u0565\u057c\u0561\u0575\u056b\u0576_\u053f\u0578\u0578\u0580\u0564\u056b\u0576\u0561\u057f\u0576\u0565\u0580
+ToolImage=\u0533\u0578\u0580\u056e\u056b\u0584\u056b_\u054a\u0561\u057f\u056f\u0565\u0580\u0561\u056f\u0568
+ToolImage.Syntax=[ <\u0539\u056b\u057e> ]
+Translate=\u054f\u0565\u0572\u0561\u0583\u0578\u056d\u0565\u0574
+Translate.Syntax=[ <\u0555\u0562\u0575\u0565\u057f\u056f>, <\u054e\u0565\u056f\u057f\u0578\u0580> ]\n[ <\u054e\u0565\u056f\u057f\u0578\u0580>, <\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0565\u057f> ]
+Transpose=\u054f\u0580\u0561\u0576\u057d\u057a\u0578\u0576\u0561\u0581\u0576\u0565\u0574
+Transpose.Syntax=[ <\u0544\u0561\u057f\u0580\u056b\u0581> ]
+TrapezoidalSum=\u054d\u0565\u0572\u0561\u0576\u0561\u056f\u0565\u0580\u057a_\u0533\u0578\u0582\u0574\u0561\u0580
+TrapezoidalSum.Syntax=[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <x-\u056b \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <x-\u056b \u057e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <\u054d\u0565\u0572\u0561\u0576\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568> ]
+TravelingSalesman.Syntax=[ <\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+Triangular=\u0535\u057c\u0561\u0576\u056f\u0575\u0578\u0582\u0576_\u0532\u0561\u0577\u056d\u0578\u0582\u0574
+Triangular.Syntax=[ <\u054d\u057f\u0578\u0580\u056b\u0576 \u0563\u0576\u0561\u0570\u0561\u057f\u0561\u056f\u0561\u0576>, <\u054e\u0565\u0580\u056b\u0576 \u0563\u0576\u0561\u0570\u0561\u057f\u0561\u056f\u0561\u0576>, <\u0544\u0578\u0564>, x ]\n[ <\u054d\u057f\u0578\u0580\u056b\u0576 \u0563\u0576\u0561\u0570\u0561\u057f\u0561\u056f\u0561\u0576>, <\u054e\u0565\u0580\u056b\u0576 \u0563\u0576\u0561\u0570\u0561\u057f\u0561\u056f\u0561\u0576>, <\u0544\u0578\u0564>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u056b \u0561\u0580\u056a\u0565\u0584\u0568> ]\n[ <\u054d\u057f\u0578\u0580\u056b\u0576 \u0563\u0576\u0561\u0570\u0561\u057f\u0561\u056f\u0561\u0576>, <\u054e\u0565\u0580\u056b\u0576 \u0563\u0576\u0561\u0570\u0561\u057f\u0561\u056f\u0561\u0576>, <\u0544\u0578\u0564>, x, <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+TrigExpand=\u0535\u057c\u0561\u0576\u056f\u0575\u0578\u0582\u0576\u0561\u0579\u0561\u0583\u0561\u056f\u0561\u0576_\u0541\u0587\u0561\u0583\u0578\u056d\u0578\u0582\u0574
+TrigSimplify=\u0535\u057c\u0561\u0576\u056f\u0575\u0578\u0582\u0576\u0561\u0579\u0561\u0583\u0561\u056f\u0561\u0576_\u054a\u0561\u0580\u0566\u0565\u0581\u0578\u0582\u0574
+TurningPoint=\u0547\u0580\u057b\u0574\u0561\u0576_\u053f\u0565\u057f
+TurningPoint.Syntax=[ <\u0532\u0561\u0566\u0574\u0561\u0576\u0564\u0561\u0574> ]
+UnicodeToLetter=\u0545\u0578\u0582\u0576\u056b\u056f\u0578\u0564\u0578\u057e_\u0539\u057e\u056b_\u054f\u0561\u057c\u0568
+UnicodeToLetter.Syntax=[ <\u0531\u0574\u0562\u0578\u0572\u057b \u0569\u056b\u057e> ]
+UnicodeToText=\u0545\u0578\u0582\u0576\u056b\u056f\u0578\u0564\u0578\u057e_\u0539\u057e\u0565\u0580\u056b_\u054f\u0565\u0584\u057d\u057f\u0568
+UnicodeToText.Syntax=[ <{\u0531\u0574\u0562\u0578\u0572\u057b \u0569\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f}> ]
+Uniform=\u0531\u0576\u0568\u0576\u0564\u0570\u0561\u057f_\u0540\u0561\u057e\u0561\u057d\u0561\u0580\u0561\u0579\u0561\u0583_\u0532\u0561\u0577\u056d\u0578\u0582\u0574
+Uniform.Syntax=[ <\u054d\u057f\u0578\u0580\u056b\u0576 \u0563\u0576\u0561\u0570\u0561\u057f\u0561\u056f\u0561\u0576>, <\u054e\u0565\u0580\u056b\u0576 \u0563\u0576\u0561\u0570\u0561\u057f\u0561\u056f\u0561\u0576>, x ]\n[ <\u054d\u057f\u0578\u0580\u056b\u0576 \u0563\u0576\u0561\u0570\u0561\u057f\u0561\u056f\u0561\u0576>, <\u054e\u0565\u0580\u056b\u0576 \u0563\u0576\u0561\u0570\u0561\u057f\u0561\u056f\u0561\u0576>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u056b \u0561\u0580\u056a\u0565\u0584\u0568> ]\n[ <\u054d\u057f\u0578\u0580\u056b\u0576 \u0563\u0576\u0561\u0570\u0561\u057f\u0561\u056f\u0561\u0576>, <\u054e\u0565\u0580\u056b\u0576 \u0563\u0576\u0561\u0570\u0561\u057f\u0561\u056f\u0561\u0576>, x, <\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576> ]
+Union=\u0532\u0561\u0566\u0574\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u056b_\u0544\u056b\u0561\u057e\u0578\u0580\u0578\u0582\u0574\u0568
+Union.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f>, <\u0551\u0578\u0582\u0581\u0561\u056f> ]\n[ <\u0532\u0561\u0566\u0574\u0561\u0576\u056f\u0575\u0578\u0582\u0576>, <\u0532\u0561\u0566\u0574\u0561\u0576\u056f\u0575\u0578\u0582\u0576> ]
+Unique=\u0544\u056b\u0561\u056f
+Unique.Syntax=[ <\u0551\u0578\u0582\u0581\u0561\u056f> ]
+UnitOrthogonalVector=\u0555\u0580\u0569\u0578\u0576\u0578\u0580\u0574\u0561\u056c
+UnitOrthogonalVector.Syntax=[ <\u0548\u0582\u0572\u056b\u0572> ]\n[ <\u0540\u0561\u057f\u057e\u0561\u056e> ]\n[ <\u054e\u0565\u056f\u057f\u0578\u0580> ]
+UnitVector=\u0544\u056b\u0561\u057e\u0578\u0580_\u054e\u0565\u056f\u057f\u0578\u0580
+UnitVector.Syntax=[ <\u054e\u0565\u056f\u057f\u0578\u0580> ]\n[ <\u0548\u0582\u0572\u056b\u0572> ]\n[ <\u0540\u0561\u057f\u057e\u0561\u056e> ]
+UpdateConstruction=\u0539\u0561\u0580\u0574\u0561\u0581\u0576\u0565\u0574
+UpperSum=\u054e\u0565\u0580\u056b\u0576_\u0533\u0578\u0582\u0574\u0561\u0580
+UpperSum.Syntax=[ <\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561>, <x-\u056b \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <x-\u056b \u057e\u0565\u0580\u057b\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0568>, <\u0548\u0582\u0572\u0572\u0561\u0576\u056f\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568> ]
+Variance=\u054e\u0561\u0580\u056b\u0561\u0581\u056b\u0561
+Variance.Syntax=[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+Vector=\u054e\u0565\u056f\u057f\u0578\u0580
+Vector.Syntax=[ <\u053f\u0565\u057f> ]\n[ <\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0565\u057f>, <\u054e\u0565\u0580\u057b\u0576\u0561\u056f\u0565\u057f> ]
+Vertex=\u0533\u0561\u0563\u0561\u0569
+Vertex.Syntax=[ <\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569> ]\n[ <\u0532\u0561\u0566\u0574\u0561\u0576\u056f\u0575\u0578\u0582\u0576> ]\n[ <\u0532\u0561\u0566\u0574\u0561\u0576\u056f\u0575\u0578\u0582\u0576>, <\u053b\u0576\u0564\u0565\u0584\u057d> ]
+VerticalText=\u0548\u0582\u0572\u0572\u0561\u0571\u056b\u0563_\u054f\u0565\u0584\u057d\u057f
+VerticalText.Syntax=[ <\u054f\u0565\u0584\u057d\u057f> ]
+Voronoi=\u054e\u0578\u0580\u0578\u0576\u0578\u0575\u056b_\u0534\u056b\u0561\u0563\u0580\u0561\u0574
+Voronoi.Syntax=[ <\u0539\u057e\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f> ]
+Weibull=\u054e\u0565\u0575\u0562\u0578\u0582\u056c\u056b_\u0534\u056b\u0561\u0563\u0580\u0561\u0574
+Zip=\u053f\u056b\u0580\u0561\u057c\u0565\u0574_\u0532\u0561\u0576\u0561\u0571\u0587\u0568_\u0551\u0578\u0582\u0581\u0561\u056f\u056b_\u0537\u056c\u0565\u0574\u0565\u0576\u057f\u0576\u0565\u0580\u056b_\u054e\u0580\u0561
+Zip.Syntax=[ <\u0531\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u05761>, <\u0551\u0578\u0582\u0581\u0561\u056f1>, <\u0553\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u05762>, <\u0551\u0578\u0582\u0581\u0561\u056f2>, ... ]
+Zipf=\u0536\u056b\u0586
+ZoomIn=\u0544\u0565\u056e\u0561\u0581\u0576\u0565\u0574_\u0544\u0561\u057d\u0577\u057f\u0561\u0562\u0568
+ZoomIn.Syntax=[ <\u0531\u0580\u057f\u0561\u0564\u0580\u056b\u0579\u056b \u0561\u0580\u056a\u0565\u0584\u0568> ]\n[ <\u0544\u0561\u057d\u0577\u057f\u0561\u0562>, <\u0544\u0565\u056e\u0561\u0581\u0574\u0561\u0576 \u056f\u0565\u0576\u057f\u0580\u0578\u0576> ]\n[ <Min x>, <Min y>, <Max x>, <Max y> ]
+ZoomOut=\u0553\u0578\u0584\u0580\u0561\u0581\u0576\u0565\u0574_\u0544\u0561\u057d\u0577\u057f\u0561\u0562\u0568
+ZoomOut.Syntax=[ <\u0531\u0580\u057f\u0561\u0564\u0580\u056b\u0579\u056b \u0561\u0580\u056a\u0565\u0584\u0568> ]\n[ <\u0544\u0561\u057d\u0577\u057f\u0561\u0562>, <\u0544\u0565\u056e\u0561\u0581\u0574\u0561\u0576 \u056f\u0565\u0576\u057f\u0580\u0578\u0576> ]
+nPr=\u053f\u0561\u0580\u0563\u0561\u057e\u0578\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u056b_\u0554\u0561\u0576\u0561\u056f
\ No newline at end of file
diff --git a/geogebra/properties/command_is.properties b/geogebra/properties/command_is.properties
index 2dfcf8a..f326792 100644
--- a/geogebra/properties/command_is.properties
+++ b/geogebra/properties/command_is.properties
@@ -244,8 +244,6 @@ IntersectRegion=Sni
IntersectRegion.Syntax=[ <Marghyrningur>, <Marghyrningur> ]
Intersection=SameiginlegStök
Intersection.Syntax=[ <Listi>, <Listi> ]
-IntersectionPaths=SkurðFerlar
-IntersectionPaths.Syntax=\n[ <GeoLína>, <GeoMarghyrningur> ]\n[ <GeoLína>, <GeoKeilusnið> ]
InverseBinomial=AndhverfTvíliðudreifing
InverseBinomial.Syntax=[ <Fjöldi tilrauna>, <Líkur á happi>, <Líkur> ]
InverseCauchy=AndhverfCauchy
@@ -383,7 +381,6 @@ Percentile=Hundra
Percentile.Syntax=[ <Listi talna>, <Prósent> ]
Perimeter=Ummál
Perimeter.Syntax=[ <Marghyrningur> ]\n[ <Keilusnið> ]\n[ <Leg> ]
-Plane=Plan
PlaySound=SpilaHljóð
PlaySound.Syntax=[ <Skrá> ]\n[ <Boole spilun> ]\n[ <Nótnaröð>, <Hljóðfæri> ]\n[ <Nóta>, <TímalengdSek>, <Hljóðfæri> ]\n[ <Fall>, <Minnsta gildi>, <Stærsta gildi> ]\n[ <Fall>, <Minnsta gildi>, <Stærsta gildi>, <Sample rate>, <Sample depth> ]
Point=Punktur
diff --git a/geogebra/properties/command_it.properties b/geogebra/properties/command_it.properties
index 136f072..da1caa3 100644
--- a/geogebra/properties/command_it.properties
+++ b/geogebra/properties/command_it.properties
@@ -68,8 +68,6 @@ ColumnName=NomeColonna
ColumnName.Syntax=[ <Cella del foglio di calcolo> ]
Command=Comando
CommonDenominator=DenominatoreComune
-CompetitionRank=PosizioneGara
-CompetitionRank.Syntax=[ <Lista> ]
CompleteSquare=CompletaQuadrato
CompleteSquare.Syntax=[ <Funzione quadratica> ]
ComplexRoot=RadiciComplesse
@@ -108,7 +106,7 @@ Delete.Syntax=[ <Oggetto> ]
Denominator=Denominatore
Denominator.Syntax=[ <Funzione> ]
Derivative=Derivata
-Derivative.Syntax=[ <Funzione> ]\n[ <Curva> ]\n[ <Funzione>, <Numero> ]\n[ <Curva>, <Numero> ]
+Derivative.Syntax=[ <Funzione> ]\n[ <Curva> ]\n[ <Funzione>, <Numero> ]\n[ <Funzione>, <Variabile> ]\n[ <Curva>, <Numero> ]\n[ <Funzione>, <Variabile>, <Numero> ]
Determinant=Determinante
Determinant.Syntax=[ <Matrice> ]
Diameter=DiametroConiugato
@@ -246,8 +244,6 @@ IntersectRegion=IntersezRegione
IntersectRegion.Syntax=[ <Poligono>, <Poligono> ]
Intersection=Interseca
Intersection.Syntax=[ <Lista>, <Lista> ]
-IntersectionPaths=IntersecaPercorsi
-IntersectionPaths.Syntax=[ <Retta>, <Poligono> ]\n[ <Retta>, <Conica> ]
InverseBinomial=BinomialeInversa
InverseBinomial.Syntax=[ <Numero di prove>, <Probabilità di successo>, <Probabilità> ]
InverseCauchy=CauchyInversa
@@ -389,11 +385,10 @@ PathParameter.Syntax=[ <Punto su percorso> ]
Percentile.Syntax=[ <Lista di numeri>, <Percentuale> ]
Perimeter=Perimetro
Perimeter.Syntax=[ <Poligono> ]\n[ <Conica> ]\n[ <Luogo> ]
-Plane=Piano
PlaySound=Suono
PlaySound.Syntax=[ <File> ]\n[ <Booleano Esegui> ]\n[ <Sequenza di note>, <Strumento> ]\n[ <Nota>, <Durata>, <Strumento> ]\n[ <Funzione>, <Valore min>, <Valore max> ]\n[ <Funzione>, <Valore min>, <Valore max>, <Frequenza campionamento>, <Profondità> ]
Point=Punto
-Point.Syntax=[ <Oggetto> ]\n[ <Oggetto>, <Parametro> ]\n[ <Punto>, <Vettore> ]
+Point.Syntax=[ <Oggetto> ]\n[ <Lista> ]\n[ <Oggetto>, <Parametro> ]\n[ <Punto>, <Vettore> ]
PointIn=PuntoIn
PointIn.Syntax=[ <Regione> ]
PointList=ListaPunti
diff --git a/geogebra/properties/command_ja.properties b/geogebra/properties/command_ja.properties
index 0982dfe..d86eedf 100644
--- a/geogebra/properties/command_ja.properties
+++ b/geogebra/properties/command_ja.properties
@@ -18,16 +18,22 @@ AxisStepX=\u8ef8\u30b9\u30c6\u30c3\u30d7X
AxisStepY=\u8ef8\u30b9\u30c6\u30c3\u30d7Y
BarChart=\u68d2\u30b0\u30e9\u30d5
BarChart.Syntax=[ <\u30c7\u30fc\u30bf\u306e\u30ea\u30b9\u30c8>, <\u5ea6\u6570\u306e\u30ea\u30b9\u30c8> ]\n[ <\u751f\u30c7\u30fc\u30bf\u306e\u30ea\u30b9\u30c8>, <\u68d2\u306e\u5e45> ]\n[ <\u30c7\u30fc\u30bf\u306e\u30ea\u30b9\u30c8>, <\u5ea6\u6570\u306e\u30ea\u30b9\u30c8>, <\u68d2\u306e\u5e45> ]\n[ <\u958b\u59cb\u5024>, <\u7d42\u4e86\u5024>, <\u9ad8\u3055\u306e\u30ea\u30b9\u30c8> ]\n[ <\u958b\u59cb\u5024>, <\u7d42\u4e86\u5024>, <\u5f0f>, <\u5909\u6570>, <\u59cb\u70b9>, <\u7d42\u70b9> ]\n[ <\u958b\u59cb\u5024>, <\u7d42\u4e86\u5024>, <\u5f0f>, <\u5909\u6570>, <\u59cb\u70b9>, <\u7d42\u70b9>, <\u9593\u9694> ]
+Bernoulli=\u30d9\u30eb\u30cc\u30fc\u30a4
Binomial=\u4e8c\u9805\u4fc2\u6570
Binomial.Syntax=[ <\u6570\u5024>, <\u6570\u5024> ]
+BinomialDist=\u4e8c\u9805\u5206\u5e03
BoxPlot.Syntax=[ <y\u30aa\u30d5\u30bb\u30c3\u30c8>, <y\u30b9\u30b1\u30fc\u30eb>, <\u30c7\u30fc\u30bf\u306e\u30ea\u30b9\u30c8> ]\n[ <y\u30aa\u30d5\u30bb\u30c3\u30c8>, <y\u30b9\u30b1\u30fc\u30eb>, <\u958b\u59cb\u5024>, <Q1>, <\u4e2d\u592e\u5024>, <Q3>, <\u7d42\u4e86\u5024> ]
+Button=\u30dc\u30bf\u30f3
+Cauchy=\u30b3\u30fc\u30b7\u30fc
Cell=\u30bb\u30eb
+Cell.Syntax=[ <\u5217>, <\u884c> ]
CellRange=\u30bb\u30eb\u7bc4\u56f2
CellRange.Syntax=[ <\u958b\u59cb\u30bb\u30eb>, <\u7d42\u4e86\u30bb\u30eb> ]
Center=\u4e2d\u5fc3
Center.Syntax=[ <\uff12\u6b21\u66f2\u7dda> ]
Centroid=\u91cd\u5fc3
Centroid.Syntax=[ <\u591a\u89d2\u5f62> ]
+Checkbox=\u30c1\u30a7\u30c3\u30af\u30dc\u30c3\u30af\u30b9
Circle=\u5186
Circle.Syntax=[ <\u70b9>, <\u534a\u5f84\u306e\u6570\u5024> ]\n[ <\u70b9>, <\u7dda\u5206> ]\n[ <\u70b9>, <\u70b9> ]\n[ <\u70b9>, <\u70b9>, <\u70b9> ]
CircleArc=\u5186\u5f27
@@ -89,7 +95,7 @@ Excentricity.Syntax=[ <\uff12\u6b21\u66f2\u7dda> ]
Expand=\u5c55\u958b
Expand.Syntax=[ <\u95a2\u6570> ]
Extremum=\u6975\u5024
-Extremum.Syntax=[ <\u591a\u9805\u5f0f> ]
+Extremum.Syntax=[ <\u591a\u9805\u5f0f> ]\n[ <\u95a2\u6570>, <x\u958b\u59cb\u5024>, <x\u7d42\u4e86\u5024> ]
Factor=\u56e0\u6570\u5206\u89e3
Factor.Syntax=[ <\u591a\u9805\u5f0f> ]
First=\u5148\u982d
diff --git a/geogebra/properties/command_ji.properties b/geogebra/properties/command_ji.properties
index fe44558..21e5f63 100644
--- a/geogebra/properties/command_ji.properties
+++ b/geogebra/properties/command_ji.properties
@@ -1,3 +1,3 @@
Frequency.Syntax=[ <List of Raw Data> ]\n[ <Boolean Cumulative>, <List of Raw Data> ]\n[ <List of Class Boundaries>, <List of Raw Data> ]\n[ <Boolean Cumulative>, <List of Class Boundaries>, <List of Raw Data> ]\n[ <List of Class Boundaries>, <List of Raw Data>, <Use Density>, <Density Scale Factor (optional)> ]\n[ <Boolean Cumulative>, <List of Class Boundaries>, <List of Raw Data>, <Use Density>, <Density Scale Factor (optional)> ]
HistogramRight.Syntax=[ <List of Class Boundaries>, <List of Heights> ]\n[ <List of Class Boundaries>, <List of Raw Data>, <Use Density>, <Density Scale Factor (optional)> ]\n[ <Boolean Cumulative>, <List of Class Boundaries>, <List of Raw Data>, <Use Density>, <Density Scale Factor (optional)> ]
-IntersectionPaths.Syntax=[ <GeoLine>, <GeoPolygon> ]\n[ <GeoLine>, <GeoConic> ]
\ No newline at end of file
+Point.Syntax=[ <Object> ]\n[ <List> ]\n[ <Object>, <Parameter> ]\n[ <Point>, <Vector> ]
\ No newline at end of file
diff --git a/geogebra/properties/command_kk.properties b/geogebra/properties/command_kk.properties
index 2dd1b99..c2f0c64 100644
--- a/geogebra/properties/command_kk.properties
+++ b/geogebra/properties/command_kk.properties
@@ -377,7 +377,6 @@ Percentile=\u041f\u0430\u0439\u044b\u0437\u0434\u044b\u049b\u0411\u0456\u0440\u0
Percentile.Syntax=[ <\u0421\u0430\u043d\u0434\u0430\u0440 \u0422\u0456\u0437\u0456\u043c\u0456>, <\u041f\u0430\u0439\u044b\u0437> ]
Perimeter=\u041f\u0435\u0440\u0438\u043c\u0435\u0442\u0440
Perimeter.Syntax=[ <\u041a\u04e9\u043f\u0431\u04b1\u0440\u044b\u0448> ]\n[ <\u041a\u043e\u043d\u0443\u0441\u0442\u044b\u049b \u049a\u0438\u043c\u0430> ]\n[ <\u041b\u043e\u043a\u0443\u0441> ]
-Plane=\u0416\u0430\u0437\u044b\u049b\u0442\u044b\u049b
PlaySound=\u04d8\u0443\u0435\u043d\u0434\u0456\u049a\u043e\u0441
PlaySound.Syntax=[ <\u0424\u0430\u0439\u043b> ]\n[ <\u041d\u043e\u0442\u0430\u043b\u0430\u0440 \u0420\u0435\u0442\u0456>, <\u0410\u0441\u043f\u0430\u043f> ]\n[ <\u041d\u043e\u0442\u0430>, <\u0416\u0430\u043b\u0493\u0430\u0441\u044b>, <\u04b0\u0437\u0430\u049b\u0442\u044b\u049b> ]\n[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u041c\u0438\u043d \u0428\u0430\u043c\u0430>, <\u041c\u0430\u043a\u0441 \u0428\u0430\u043c\u0430> ]\n[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u041c\u0438\u043d \u0428\u0430\u043c\u0430>, <\u041c\u0430\u043a\u0441 \u0428\u0430\u043c\u0430>, <\u04ae\u043b\u0433\u0456\u043b\u0456 \u0416\u044b\u043b\u0434\u0430\u043c\u0434\u044b\u049b>, <\u04ae\u043b\u0433\u0456\u043b\u0456 \u0422\u0435\u0440\u0435\u04a3\u0434\u0456\u043a> ]
Point=\u041d\u04af\u043a\u0442\u0435
diff --git a/geogebra/properties/command_ko.properties b/geogebra/properties/command_ko.properties
index e1f6eff..8821183 100644
--- a/geogebra/properties/command_ko.properties
+++ b/geogebra/properties/command_ko.properties
@@ -70,8 +70,6 @@ ColumnName=\uc5f4\uc774\ub984
ColumnName.Syntax=[ <\uc2a4\ud504\ub808\ub4dc\uc2dc\ud2b8 \uc140> ]
Command=\uba85\ub839
CommonDenominator=\uacf5\ud1b5\ubd84\ubaa8
-CompetitionRank=\uacbd\uc7c1\uacc4\uc218
-CompetitionRank.Syntax=[ <\ub9ac\uc2a4\ud2b8> ]
CompleteSquare=\uc644\uc804\uc81c\uacf1
CompleteSquare.Syntax=[ <\uc774\ucc28\ud568\uc218> ]
ComplexRoot=\ubcf5\uc18c\uadfc
@@ -111,7 +109,7 @@ Delete.Syntax=[ <\ub300\uc0c1> ]
Denominator=\ubd84\ubaa8
Denominator.Syntax=[ <\ud568\uc218> ]
Derivative=\ubbf8\ubd84
-Derivative.Syntax=[ <\ud568\uc218> ]\n[ <\uace1\uc120> ]\n[ <\ud568\uc218>, <\uc218> ]\n[ <\uace1\uc120>, <\uc218> ]
+Derivative.Syntax=[ <\ud568\uc218> ]\n[ <\uace1\uc120> ]\n[ <\ud568\uc218>, <\uc218> ]\n[ <\ud568\uc218>, <\ubcc0\uc218> ]\n[ <\uace1\uc120>, <\uc218> ]\n[ <\ud568\uc218>, <\ubcc0\uc218>, <\uc218> ]
Determinant=\ud589\ub82c\uc2dd
Determinant.Syntax=[ <\ud589\ub82c> ]
Diameter=\uc9c0\ub984
@@ -251,8 +249,6 @@ IntersectRegion=\uacb9\uce58\ub294\uc601\uc5ed
IntersectRegion.Syntax=[ <\ub2e4\uac01\ud615>, <\ub2e4\uac01\ud615> ]
Intersection=\uad50\uc9d1\ud569
Intersection.Syntax=[ <\ub9ac\uc2a4\ud2b8>, <\ub9ac\uc2a4\ud2b8> ]
-IntersectionPaths=\uad50\uc120
-IntersectionPaths.Syntax=[ <\uae30\ud558 \uc9c1\uc120>, <\uae30\ud558 \ub2e4\uac01\ud615> ]\n[ <\uae30\ud558 \uc9c1\uc120>, <\uae30\ud558 \uc6d0\ubfd4\uace1\uc120(\uc774\ucc28\uace1\uc120)> ]
InverseBinomial=\uc5ed\uc774\ud56d\ubd84\ud3ec
InverseBinomial.Syntax=[ <\uc131\uacf5\ud69f\uc218>, <\uc131\uacf5\ud655\ub960>, <\ud655\ub960> ]
InverseCauchy=\uc5ed\ucf54\uc2dc\ubd84\ud3ec
@@ -396,11 +392,10 @@ Percentile=\ubc31\ubd84\uc704\uc218
Percentile.Syntax=[ <\uc218\uc758 \ub9ac\uc2a4\ud2b8>, <\ud37c\uc13c\ud2b8> ]
Perimeter=\ub458\ub808
Perimeter.Syntax=[ <\ub2e4\uac01\ud615> ]\n[ <\uc6d0\ubfd4\uace1\uc120(\uc774\ucc28\uace1\uc120)> ]\n[ <\uc790\ucde8> ]
-Plane=\ud3c9\uba74
PlaySound=\uc74c\uc545
PlaySound.Syntax=[ <\ud30c\uc77c> ]\n[ <\uc5f0\uc8fc \uc5ec\ubd80> ]\n[ <\uc74c\ud45c\uc5f4>, <\uc545\uae30> ]\n[ <\uc74c\ud45c>, <\uc2dc\uac04>, <\uae38\uc774> ]\n[ <\ud568\uc218>, <\ucd5c\uc19f\uac12>, <\ucd5c\ub313\uac12> ]\n[ <\ud568\uc218>, <\ucd5c\uc19f\uac12>, <\ucd5c\ub313\uac12>, <\ud45c\ubcf8 \ube44\uc728>, <\ud45c\ubcf8 \uae4a\uc774> ]
Point=\uc810
-Point.Syntax=[ <\ub300\uc0c1> ]\n[ <\uc810>, <\ub9e4\uac1c\ubcc0\uc218> ]\n[ <\uc810>, <\ubca1\ud130> ]
+Point.Syntax=[ <\ub300\uc0c1> ]\n[ <\ub9ac\uc2a4\ud2b8> ]\n[ <\uc810>, <\ub9e4\uac1c\ubcc0\uc218> ]\n[ <\uc810>, <\ubca1\ud130> ]
PointIn=\uc601\uc5ed\uc548\uc758\uc810
PointIn.Syntax=[ <\uc601\uc5ed> ]
PointList=\uc810\ub9ac\uc2a4\ud2b8
diff --git a/geogebra/properties/command_lt.properties b/geogebra/properties/command_lt.properties
index 5357ef2..c511c60 100644
--- a/geogebra/properties/command_lt.properties
+++ b/geogebra/properties/command_lt.properties
@@ -72,8 +72,6 @@ ColumnName=StulpelioPavadinimas
ColumnName.Syntax=[ <Skai\u010diuokl\u0117s langelis> ]
Command=Komanda
CommonDenominator=BendrasDaliklis
-CompetitionRank=Konkurencingumas
-CompetitionRank.Syntax=[ <S\u0105ra\u0161as> ]
CompleteSquare=PilnasKvadratas
CompleteSquare.Syntax=[ <Kvadratin\u0117 funkcija> ]
Conic=K\u016bgioPj\u016bvis
@@ -246,7 +244,6 @@ IntersectRegion=SukirstiRegion\u0105
IntersectRegion.Syntax=[ <Daugiakampis>, <Daugiakampis> ]
Intersection=Sankirta
Intersection.Syntax=[ <S\u0105ra\u0161as>, <S\u0105ra\u0161as> ]
-IntersectionPaths=SankirtosKeliai
InverseBinomial=Atvirk\u0161tinisBinominis
InverseBinomial.Syntax=[ <Number of Trials>, <S\u0117km\u0117s tikimyb\u0117>, <Tikimyb\u0117> ]
InverseCauchy=Atvirk\u0161tinisKo\u0161i
@@ -390,7 +387,6 @@ Percentile=Procentilis
Percentile.Syntax=[ <Skai\u010di\u0173 s\u0105ra\u0161as>, <Procentai> ]
Perimeter=Perimetras
Perimeter.Syntax=[ <Daugiakampis> ]\n[ <K\u016bgis> ]
-Plane=Plok\u0161tuma
PlaySound=GrotiGars\u0105
PlaySound.Syntax=[ <Dokumentas> ]\n[ <\u017eymi\u0173 seka>, <Instrumentas> ]\n[ <\u017eymë>, <Trukm\u0117>, <Instrumentas> ]\n[ <Funkcija>, <Minimali vert\u0117>, <Maksimali vert\u0117> ]\n[ <Funkcija>, <Minimali vert\u0117>, <Maksimali vert\u0117>, <Pavyzd\u017eio da\u017enis>, <Pavyzd\u017eio gylis> ]
Point=Ta\u0161kas
diff --git a/geogebra/properties/command_mk.properties b/geogebra/properties/command_mk.properties
index aa7da9e..fd05d6c 100644
--- a/geogebra/properties/command_mk.properties
+++ b/geogebra/properties/command_mk.properties
@@ -73,8 +73,6 @@ ColumnName=\u0418\u043c\u0435\u041d\u0430\u041a\u043e\u043b\u043e\u043d\u0430
ColumnName.Syntax=[ <\u045c\u0435\u043b\u0438\u0458\u0430 \u043d\u0430 \u0442\u0430\u0431\u0435\u043b\u0430> ]
Command=\u041d\u0430\u0440\u0435\u0434\u0431\u0430
CommonDenominator=\u0417\u0430\u0435\u0434\u043d\u0438\u0447\u043a\u0438\u0418\u043c\u0435\u043d\u0438\u0442\u0435\u043b
-CompetitionRank=\u041d\u0430\u0442\u043f\u0440\u0435\u0432\u0430\u0440\u0443\u0432\u0430\u0447\u043a\u0438\u0420\u0430\u043d\u0433
-CompetitionRank.Syntax=[ <\u043b\u0438\u0441\u0442\u0430> ]
CompleteSquare=\u041f\u043e\u043b\u043d\u041a\u0432\u0430\u0434\u0440\u0430\u0442
CompleteSquare.Syntax=[ <\u041a\u0432\u0430\u0434\u0440\u0430\u0442\u043d\u0430 \u0424\u0443\u043d\u043a\u0446\u0438\u0458\u0430> ]
Conic=\u041a\u043e\u043d\u0443\u0441\u0435\u043d\u041f\u0440\u0435\u0441\u0435\u043a
@@ -252,8 +250,6 @@ IntersectRegion=\u041f\u0440\u0435\u0441\u0447\u043d\u0430\u041e\u0431\u043b\u04
IntersectRegion.Syntax=[ <\u041c\u043d\u043e\u0433\u0443\u0430\u0433\u043e\u043b\u043d\u0438\u043a>, <\u041c\u043d\u043e\u0433\u0443\u0430\u0433\u043e\u043b\u043d\u0438\u043a> ]
Intersection=\u041f\u0440\u0435\u0441\u0435\u043a\u041d\u0430
Intersection.Syntax=[ <\u043b\u0438\u0441\u0442\u0430>, <\u043b\u0438\u0441\u0442\u0430> ]
-IntersectionPaths=\u041f\u0440\u0435\u0441\u0435\u043a\u041d\u0430\u041f\u0430\u0442\u0435\u043a\u0438
-IntersectionPaths.Syntax=\n[ <\u0433\u0435\u043e\u043f\u0440\u0430\u0432\u0430>, <\u0433\u0435\u043e\u043c\u043d\u043e\u0433\u0443\u0430\u0433\u043e\u043b\u043d\u0438\u043a> ]\n[ <\u0433\u0435\u043e\u043f\u0440\u0430\u0432\u0430>, <\u0433\u0435\u043e\u043a\u043e\u043d\u0443\u0441> ]
InverseBinomial=\u0418\u043d\u0432\u0435\u0440\u0437\u0435\u043d\u0411\u0438\u043d\u043e\u043c
InverseBinomial.Syntax=[ <\u0411\u0440\u043e\u0458 \u043d\u0430 \u043e\u0431\u0438\u0434\u0438>, <\u041f\u043e\u0432\u043e\u043b\u043d\u0438 \u043d\u0430\u0441\u0442\u0430\u043d\u0438>, <\u0412\u0435\u0440\u043e\u0458\u0430\u0442\u043d\u043e\u0441\u0442> ]
InverseCauchy=\u0418\u043d\u0432\u0435\u0440\u0437\u043d\u043e\u041a\u043e\u0448\u0438
@@ -401,7 +397,6 @@ Percentile=\u041f\u0435\u0440\u0446\u0435\u043d\u0442\u0438\u043b\u0435\u043d\u0
Percentile.Syntax=[ <\u041b\u0438\u0441\u0442\u0430 \u043e\u0434 \u0431\u0440\u043e\u0435\u0432\u0438>, <\u041f\u0440\u043e\u0446\u0435\u043d\u0442> ]
Perimeter=\u041f\u0435\u0440\u0438\u043c\u0435\u0442\u0430\u0440
Perimeter.Syntax=[ <\u043c\u043d\u043e\u0433\u0443\u0430\u0433\u043e\u043b\u043d\u0438\u043a> ]\n[ <\u043a\u043e\u043d\u0443\u0441\u0435\u043d \u043f\u0440\u0435\u0441\u0435\u043a> ]
-Plane=\u0420\u0430\u043c\u043d\u0438\u043d\u0430
PlaySound=\u041f\u0443\u0448\u0442\u0438\u0417\u0432\u0443\u043a
PlaySound.Syntax=[ <\u0424\u0430\u0458\u043b> ]\n[ <\u0417\u0430\u0431\u0435\u043b\u0435\u0436\u0430\u043d\u0430 \u0441\u0435\u0440\u0438\u0458\u0430>, <\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442> ]\n[ <\u0417\u0430\u0431\u0435\u043b\u0435\u0448\u043a\u0430>, <\u0412\u0440\u0435\u043c\u0435\u0442\u0440\u0430\u0435\u045a\u0435>, <\u0414\u043e\u043b\u0436\u0438\u043d\u0430> ]
Point=\u0422\u043e\u0447\u043a\u0430
diff --git a/geogebra/properties/command_mn.properties b/geogebra/properties/command_mn.properties
index 55c20e9..ee8237b 100644
--- a/geogebra/properties/command_mn.properties
+++ b/geogebra/properties/command_mn.properties
@@ -19,4 +19,8 @@ Axes=\u0422\u044d\u043d\u0445\u043b\u044d\u0433\u04af\u04af\u0434
Axes.Syntax=[ <\u041a\u043e\u043d\u0443\u0441> ]
AxisStepX=X_\u0442\u044d\u043d\u0445\u043b\u044d\u0433_\u0430\u043b\u0445\u0430\u043c
AxisStepY=Y_\u0442\u044d\u043d\u0445\u043b\u044d\u0433_\u0430\u043b\u0445\u0430\u043c
-BarChart=\u0414\u0438\u0430\u0433\u0440\u0430\u043c\u041c\u04e9\u0440
\ No newline at end of file
+BarChart=\u0414\u0438\u0430\u0433\u0440\u0430\u043c\u041c\u04e9\u0440
+Bernoulli=\u0411\u0435\u0440\u043d\u0443\u043b\u044c
+Binomial.Syntax=[ <n \u0442\u043e\u043e>, <r \u0442\u043e\u043e> ]
+Button=\u0442\u043e\u0432\u0427
+Button.Syntax=[ ]\n[ <\u0413\u0430\u0440\u0447\u0438\u0433> ]
\ No newline at end of file
diff --git a/geogebra/properties/command_ms.properties b/geogebra/properties/command_ms.properties
index 1f93f50..b3d4623 100644
--- a/geogebra/properties/command_ms.properties
+++ b/geogebra/properties/command_ms.properties
@@ -70,8 +70,6 @@ ColumnName=NamaLajur
ColumnName.Syntax=[ <Sel Hamparan Kerja> ]
Command=Perintah
CommonDenominator=PenyebutSepunya
-CompetitionRank=PangkatPertandingan
-CompetitionRank.Syntax=[ <Senarai> ]
CompleteSquare=PenyempurnaanKuasadua
CompleteSquare.Syntax=[ <Fungsi Kuadratik> ]
Conic=KeratanKon
@@ -245,8 +243,6 @@ IntersectRegion=SilangRantau
IntersectRegion.Syntax=[ <Poligon>, <Poligon> ]
Intersection=Persilangan
Intersection.Syntax=[ <Senarai>, <Senarai> ]
-IntersectionPaths=LaluanPersilangan
-IntersectionPaths.Syntax=\n[ <GarisGeo>, <PoligonGeo> ]\n[ <GarisGeo>, <KeratanKonGeo> ]
InverseBinomial=BinomialSongsang
InverseBinomial.Syntax=[ <Bilangan Percubaan>, <Kebarangkalian Kejayaan>, <Kebarangkalian> ]
InverseCauchy=CauchySongsang
@@ -383,7 +379,6 @@ PathParameter.Syntax=[ <Titik Atas Laluan> ]
Percentile=Persentil
Percentile.Syntax=[ <Senarai Nombor>, <Peratus> ]
Perimeter.Syntax=[ <Poligon> ]\n[ <Keratan Kon> ]\n[ <Lokus> ]
-Plane=Satah
PlaySound=MainBunyi
PlaySound.Syntax=[ <Fail> ]\n[ <Main Boolean> ]\n[ <Jujukan Not>, <Instrumen> ]\n[ <Not>, <Tempoh>, <Instrumen> ]\n[ <Fungsi>, <Nilai Minimum>, <Nilai Maks> ]\n[ <Fungsi>, <Nilai Minimum>, <Nilai Maks>, <Kadar Sampel>, <Dalam Sampel> ]
Point=Titik
diff --git a/geogebra/properties/command_nl.properties b/geogebra/properties/command_nl.properties
index 860747a..48b7606 100644
--- a/geogebra/properties/command_nl.properties
+++ b/geogebra/properties/command_nl.properties
@@ -58,7 +58,6 @@ Column.Syntax=[ <Cel> ]
ColumnName=CelKolomNaam
ColumnName.Syntax=[ <Cel> ]
Command=Commando
-CompetitionRank.Syntax=[ <Lijst> ]
CompleteSquare=Kwadraat_aanvullen
ComplexRoot=ComplexeWortels
ComplexRoot.Syntax=[ <Veelterm> ]
@@ -265,6 +264,7 @@ Mode.Syntax=[ <Lijst van getallen> ]
Name=Naam
Normal=Normaal
Normal.Syntax=[ <Gemiddelde>, <Standardafwijking>, <Variabele> ]
+NormalQuantilePlot=Kwantielplot
Numerator=Teller
Numerator.Syntax=[ <Functie> ]
Numeric=Numeriek
@@ -284,12 +284,12 @@ Parabola.Syntax=[ <Punt>, <Rechte> ]
Parameter.Syntax=[ <Kegelsnede> ]
PartialFractions=Partiëelbreuken
PartialFractions.Syntax=[ <Functie> ]
+PathParameter=PadParameter
PathParameter.Syntax=[ <Punt Op Pad> ]
Percentile=Percentiel
Percentile.Syntax=[ <Lijst met getallen>, <Procent> ]
Perimeter=Omtrek
Perimeter.Syntax=[ <Veelhoek> ]\n[ <Kegelsnede> ]
-Plane=Vlak
Point=Punt
Point.Syntax=[ <Rechte> ]\n[ <Veelhoek> ]\n[ <Kegelsnede> ]\n[ <Functie> ]\n[ <Vector> ]\n[ <Punt>, <Vector> ]
PointIn=Puntbinnen
@@ -341,6 +341,7 @@ Root=Nulpunten
Root.Syntax=[ <Veelterm> ]\n[ <Functie>, <Getal> ]\n[ <Functie>, <Getal>, <Getal> ]
RootList=Wortellijst
RootList.Syntax=[ <Lijst> ]
+RootMeanSquare=KwadratischGemiddelde
RootMeanSquare.Syntax=[ <Lijst met getallen> ]
Roots=Wortels
Roots.Syntax=[ <Functie>, <Start x-Waarde>, <Eind x-Waarde> ]
@@ -358,7 +359,10 @@ SXY.Syntax=[ <Lijst met punten> ]\n[ <Lijst met getallen>, <Lijst met getallen>
SYY.Syntax=[ <List met punten> ]
Sample=Steekproef
SampleSD.Syntax=[ <Lijst met getallen> ]
+SampleSDX=SX
+SampleSDY=SY
SampleSDY.Syntax=[ <Lijst met punten> ]
+SampleVariance=Variantie
SampleVariance.Syntax=[ <Lijst met getallen> ]
SecondAxis=Nevenas
SecondAxis.Syntax=[ <Kegelsnede> ]
@@ -382,6 +386,7 @@ ShortestDistance.Syntax=[ <Lijst met lijnstukken>, <Startpunt>, <Eindpunt>, <Boo
ShowLabel=ToonLabel
ShowLayer=ToonLaag
ShowLayer.Syntax=[ <Getal> ]
+Shuffle=Schudden
Shuffle.Syntax=[ <Lijst> ]
SigmaXX.Syntax=[ <Lijst met getallen> ]\n[ <Lijst met punten> ]
SigmaXY.Syntax=[ <Lijst met punten> ]\n[ <Lijst met x-Coordinaten>, <Lijst met y-Coordinaten> ]
@@ -403,6 +408,7 @@ StemPlot.Syntax=[ <Lijst> ]\n[ <Lijst>, <Adjustment -1|0|1> ]
Substitute=Vervangen
Sum=Som
Sum.Syntax=[ <Lijst> ]\n[ <Lijst>, <Aantal elementen> ]
+SumSquaredErrors=ResidueleVariantie
TableText=TabeLT
TableText.Syntax=[ <Lijst>, <Lijst>, ... ]\n[ <Lijst>, <Lijst>, ..., <Alignment of Text> ]
Take=Neem
@@ -415,7 +421,7 @@ Text=Tekst
Text.Syntax=[ <Object> ]
TextToUnicode=TekstNaarUnicode
TextToUnicode.Syntax=[ <Tekst> ]
-Textfield=Tekstveld
+Textfield=Invulvak
TiedRank.Syntax=[ <Lijst> ]
ToPolar=Poolvorm
ToolImage.Syntax=[ <Getal> ]
diff --git a/geogebra/properties/command_no_NO.properties b/geogebra/properties/command_no_NO.properties
index bb2c772..44b1f2b 100644
--- a/geogebra/properties/command_no_NO.properties
+++ b/geogebra/properties/command_no_NO.properties
@@ -71,8 +71,6 @@ ColumnName=Kolonnenavn
ColumnName.Syntax=[ <Cellenavn> ]
Command=Kommando
CommonDenominator=Fellesnevner
-CompetitionRank=KonkurranseRangering
-CompetitionRank.Syntax=[ <Liste> ]
CompleteSquare=FullstendigKvadrat
CompleteSquare.Syntax=[ <Andregradsfunksjon> ]
ComplexRoot=KompleksRot
@@ -112,7 +110,7 @@ Delete.Syntax=[ <Objekt> ]
Denominator=Nevner
Denominator.Syntax=[ <Funksjon> ]
Derivative=Derivert
-Derivative.Syntax=[ <Funksjon> ]\n[ <Kurve> ]\n[ <Funksjon>, <Tall> ]\n[ <Kurve>, <Tall> ]
+Derivative.Syntax=[ <Funksjon> ]\n[ <Kurve> ]\n[ <Funksjon>, <Tall> ]\n[ <Funksjon>, <Variabel> ]\n[ <Kurve>, <Tall> ]\n[ <Funksjon>, <Variabel>, <Tall> ]
Determinant.Syntax=[ <Matrise> ]
Diameter=KonjugatDiameter
Diameter.Syntax=[ <Vektor>, <Kjeglesnitt> ]\n[ <Linje>, <Kjeglesnitt> ]
@@ -245,8 +243,6 @@ IntersectRegion=Overlapp
IntersectRegion.Syntax=[ <Mangekant>, <Mangekant> ]
Intersection=Snitt
Intersection.Syntax=[ <Liste>, <Liste> ]
-IntersectionPaths=SkjæringBaner
-IntersectionPaths.Syntax=\n[ <GeoLinje>, <GeoMangekant> ]\n[ <GeoLinje>, <GeoKjeglesnitt> ]
InverseBinomial=InversBinomial
InverseBinomial.Syntax=[ <Antall forsøk>, <Sannsynlighet for treff>, <Sannsynlighet> ]
InverseCauchy=InversCauchy
@@ -388,11 +384,10 @@ Percentile=Persentil
Percentile.Syntax=[ <Liste med tall>, <Prosent> ]
Perimeter=Omkrets
Perimeter.Syntax=[ <Mangekant> ]\n[ <Kjeglesnitt> ]\n[ <Geometrisk sted> ]
-Plane=Plan
PlaySound=SpillLyd
PlaySound.Syntax=[ <Fil> ]\n[ <Boolsk Spill> ]\n[ <Notesekvens>, <Instrument> ]\n[ <Note>, <Varighet>, <Instrument> ]\n[ <Funksjon>, <Minimumsverdi>, <Maksimumsverdi> ]\n[ <Funksjon>, <Minimumsverdi>, <Maksimumsverdi>, <Samplingsfrekvens>, <Bits 8 eller 16> ]
Point=Punkt
-Point.Syntax=[ <Objekt> ]\n[ <Objekt>, <Parameter> ]\n[ <Punkt>, <Vektor> ]
+Point.Syntax=[ <Objekt> ]\n[ <Liste> ]\n[ <Objekt>, <Parameter> ]\n[ <Punkt>, <Vektor> ]
PointIn=PunktI
PointIn.Syntax=[ <Område> ]
PointList=Punktliste
diff --git a/geogebra/properties/command_no_NO_NY.properties b/geogebra/properties/command_no_NO_NY.properties
index a184def..9fea79d 100644
--- a/geogebra/properties/command_no_NO_NY.properties
+++ b/geogebra/properties/command_no_NO_NY.properties
@@ -32,7 +32,7 @@ Curvature=Krumming
CurvatureVector=Krummingsvektor
CurveCartesian.Syntax=[ <Uttrykk>, <Uttrykk>, <Parametervariabel>, <Frå>, <Til> ]
Denominator=Nemnar
-Derivative.Syntax=[ <Funksjon> ]\n[ <Kurve> ]\n[ <Funksjon>, <Tal> ]\n[ <Kurve>, <Tal> ]
+Derivative.Syntax=[ <Funksjon> ]\n[ <Kurve> ]\n[ <Funksjon>, <Tal> ]\n[ <Funksjon>, <Variabel> ]\n[ <Kurve>, <Tal> ]\n[ <Funksjon>, <Variabel>, <Tal> ]
Dilate.Syntax=[ <Objekt>, <Forstørr med faktoren> ]\n[ <Objekt>, <Forstørr med faktoren>, <Forstørr frå punktet> ]
Div.Syntax=[ <Dividend Tal>, <Divisor Tal> ]\n[ <Dividend Polynom>, <Divisor Polynom> ]
Divisors=Divisorar
@@ -67,7 +67,6 @@ Integral.Syntax=[ <Funksjon> ]\n[ <Funksjon>, <Startverdi for x>, <Sluttverdi fo
IntegralBetween.Syntax=[ <Funksjon>, <Funksjon>, <Startverdi for x>, <Sluttverdi for x> ]\n[ <Funksjon>, <Funksjon>, <Startverdi for x>, <Sluttverdi for x>, <Boolsk ReknUt> ]
Intersect=Skjering
Intersect.Syntax=[ <Objekt>, <Objekt> ]\n[ <Objekt>, <Objekt>, <Tal på skjeringspunkt> ]\n[ <Objekt>, <Objekt>, <Startpunkt> ]\n[ <Funksjon>, <Funksjon>, <Startverdi for x>, <Sluttverdi for x> ]
-IntersectionPaths=SkjeringBaner
InverseBinomial.Syntax=[ <Tal på forsøk>, <Sannsyn for treff>, <Sannsyn> ]
InverseCauchy.Syntax=[ <Median>, <Skala>, <Sannsyn> ]
InverseChiSquared.Syntax=[ <Fridomsgrader>, <Sannsyn> ]
diff --git a/geogebra/properties/command_pl.properties b/geogebra/properties/command_pl.properties
index 7602d2c..d875afb 100644
--- a/geogebra/properties/command_pl.properties
+++ b/geogebra/properties/command_pl.properties
@@ -73,8 +73,6 @@ ColumnName=NazwaKolumny
ColumnName.Syntax=[ <Komórka Arkusza> ]
Command=Polecenie
CommonDenominator=WspolnyMianownik
-CompetitionRank=Rz\u0105dCompetition
-CompetitionRank.Syntax=[ <Lista> ]
CompleteSquare=Posta\u0107Kanoniczna
CompleteSquare.Syntax=[ <FunkcjaKwadratowa> ]
Conic=KrzywaSto\u017ckowa
@@ -395,7 +393,6 @@ Percentile=Percentyl
Percentile.Syntax=[ <Lista Liczb>, <Procent> ]
Perimeter=Obwód
Perimeter.Syntax=[ <Wielok\u0105t> ]\n[ <Sto\u017ckowa> ]\n[ <Miejsce Geometryczne> ]
-Plane=P\u0142aszczyzna
PlaySound=ZagrajD\u017awi\u0119k
PlaySound.Syntax=[ <Plik> ]\n[ <Czy gra\u0107> ]\n[ <Ci\u0105g Tonów>, <Instrument> ]\n[ <Ton>, <Czas Trwania>, <Instrument> ]\n[ <Funkcja>, <Min>, <Max> ]\n[ <Funkcja>, <Min>, <Max>, <Warto\u015b\u0107 próbki>, <G\u0142eboko\u015b\u0107 próbki> ]
Point=Punkt
diff --git a/geogebra/properties/command_pt.properties b/geogebra/properties/command_pt.properties
index f7a1834..eda5193 100644
--- a/geogebra/properties/command_pt.properties
+++ b/geogebra/properties/command_pt.properties
@@ -70,8 +70,6 @@ ColumnName=NomeDaColuna
ColumnName.Syntax=[ <Célula da Planilha> ]
Command=Comando
CommonDenominator=DenominadorComum
-CompetitionRank=ClassificaçãoDeCompetência
-CompetitionRank.Syntax=[ <Lista> ]
CompleteSquare=CompletarQuadrados
CompleteSquare.Syntax=[ <Função Quadrática> ]
ComplexRoot=RaízesComplexas
@@ -249,8 +247,6 @@ IntersectRegion=Interse
IntersectRegion.Syntax=[ <Polígono>, <Polígono> ]
Intersection=InterseçãoDeListas
Intersection.Syntax=[ <Lista>, <Lista> ]
-IntersectionPaths=InterseçãoDeCaminhos
-IntersectionPaths.Syntax=\n[ <Reta>, <Polígono> ]\n[ <Reta>, <Cônica> ]
InverseBinomial=DistribuiçãoBinomialInversa
InverseBinomial.Syntax=[ <Número de Tentativas>, <Probabilidade de Sucesso>, <Probabilidade> ]
InverseCauchy=DistribuiçãoDeCauchyInversa
@@ -397,7 +393,6 @@ Percentile=Percentil
Percentile.Syntax=[ <Lista de Números>, <Percentagem> ]
Perimeter=Perímetro
Perimeter.Syntax=[ <Polígono> ]\n[ <Cônica> ]\n[ <Lugar Geométrico> ]
-Plane=Plano
PlaySound=TocarSom
PlaySound.Syntax=[ <Arquivo> ]\n[ <Tocar (true | false)> ]\n[ <Sequência de Notas>, <Instrumento> ]\n[ <Nota>, <Duração>, <Instrumento> ]\n[ <Função>, <Valor Mínimo>, <Valor Máximo> ]\n[ <Função>, <Valor Mínimo>, <Valor Máximo>, <Taxa de Amostragem>, <Profundidade de Amostragem> ]
Point=Ponto
diff --git a/geogebra/properties/command_pt_PT.properties b/geogebra/properties/command_pt_PT.properties
index 92630e3..de0b59f 100644
--- a/geogebra/properties/command_pt_PT.properties
+++ b/geogebra/properties/command_pt_PT.properties
@@ -1,41 +1,38 @@
Angle.Syntax=[ <Objeto> ]\n[ <Vetor>, <Vetor> ]\n[ <Reta>, <Reta> ]\n[ <Ponto>, <Vértice>, <Ponto> ]\n[ <Ponto>, <Vértice>, <Ângulo> ]
Append=Juntar
Arc.Syntax=[ <Circunferência>, <Ponto>, <Ponto> ]\n[ <Elipse>, <Ponto>, <Ponto> ]\n[ <Circunferência>, <Parâmetro>, <Parâmetro> ]\n[ <Elipse>, <Parâmetro>, <Parâmetro> ]
-Area.Syntax=[ <Círculo> ]\n[ <Elipse> ]\n[ <Ponto>, ..., <Ponto> ]
+Area.Syntax=[ <Cónica> ]\n[ <Polígono> ]\n[ <Ponto>, ..., <Ponto> ]
Asymptote=Assintota
-Asymptote.Syntax=[ <Hipérbole> ]\n[ <Função> ]\n[ <Curva Implícita> ]
+Asymptote.Syntax=[ <Cónica> ]\n[ <Função> ]\n[ <Curva Implícita> ]
Axes.Syntax=[ <Cónica> ]
AxisStepX=PassoEixoX
AxisStepY=PassoEixoY
-BarChart=DiagramaBarras
+BarChart=DiagramadeBarras
BarChart.Syntax=[ <Lista dos Dados Classificados>, <Lista de Frequências> ]\n[ <Lista dos Dados Não Classificados>, <Largura das Barras> ]\n[ <Lista dos Dados Classificados>, <Lista de Frequências>, <Largura das Barras> ]\n[ <Início>, <Fim>, <Lista das Alturas> ]\n[ <Início>, <Fim>, <Expressão>, <Variável>, <De>, <Até> ]\n[ <Início>, <Fim>, <Expressão>, <Variável>, <De>, <Até>, <Incremento da Largura> ]
Bernoulli=Bernoulli
-Binomial=Combinações
BinomialDist=Binomial
BinomialDist.Syntax=[ <Número de Provas>, <Probabilidade do Sucesso> ]\n[ <Número de Provas>, <Probabilidade do Sucesso>, <Acumulada (true | false>) ]\n[ <Número de Provas>, <Probabilidade do Sucesso>, <Valor da Variável>, <Acumulada (true | false)> ]
-BoxPlot=DiagramaExtremosQuartis
+BoxPlot=DiagramadeExtremoseQuartis
BoxPlot.Syntax=[ <Ordenada>, <Semialtura>, <Lista de Dados Não Classificados> ]\n[ <Ordenada>, <Semialtura>, <Mínimo>, <Q1>, <Mediana>, <Q3>, <Máximo> ]
-CFactor=CFator
+CFactor=CFatorizar
CSolutions=CSoluções
CSolve=CResolver
Cauchy=Cauchy
-CellRange=BlocoCélulas
+CellRange=BlocodeCélulas
Center.Syntax=[ <Cónica> ]
Checkbox=CaixadeControlo
ChiSquared=QuiQuadrado
ChiSquared.Syntax=[ <Graus de Liberdade>, x ]\n[ <Graus de Liberdade>, <Valor da Variável> ]\n[ <Graus de Liberdade>, x, <Acumulada (True | false)> ]
Circle=Circunferência
-Circle.Syntax=[ <Ponto>, <Raio(número)> ]\n[ <Ponto>, <Segmento> ]\n[ <Ponto>, <Ponto> ]\n[ <Ponto>, <Ponto>, <Ponto> ]
-CircleArc.Syntax=[ <PontoMédio>, <Ponto>, <Ponto> ]
-CircleSector.Syntax=[ <PontoMédio>, <Ponto>, <Ponto> ]
+Circle.Syntax=[ <Ponto>, <Raio> ]\n[ <Ponto>, <Segmento> ]\n[ <Ponto>, <Ponto> ]\n[ <Ponto>, <Ponto>, <Ponto> ]
+CircleArc.Syntax=[ <Ponto Médio>, <Ponto>, <Ponto> ]
+CircleSector.Syntax=[ <Ponto Médio>, <Ponto>, <Ponto> ]
CircumcircleSector=SetorCircunCircular
Circumference.Syntax=[ <Cónica> ]
-Classes=LimitesClasses
Classes.Syntax=[ <Lista de Dados>, <Número de Classes> ]\n[ <Lista de Dados>, <Início>, <Amplitude das Classes> ]
Coefficients.Syntax=[ <Polinómio> ]\n[ <Cónica> ]
Column.Syntax=[ <Célula> ]
ColumnName.Syntax=[ <Célula> ]
-CompetitionRank=Classificação
CompleteSquare=CompletarQuadrado
ComplexRoot=RaizComplexa
ComplexRoot.Syntax=[ <Polinómio> ]
@@ -43,14 +40,14 @@ Conic=C
Conic.Syntax=[ <Ponto>, <Ponto>, <Ponto>, <Ponto>, <Ponto> ]\n[ <Número>, <Número>, <Número>, <Número>, <Número> ]
ConvexHull=EnvolventeConvexa
CopyFreeObject=CopiarObjetosLivres
-Corner.Syntax=[ <Número de Canto> ]\n[ <Imagem>, <Número do canto> ]\n[ <Texto>, <Número do Canto> ]\n[ <Folha Gráfica>, <Número do Canto> ]
+Corner.Syntax=[ <Número do Canto> ]\n[ <Imagem>, <Número do Canto> ]\n[ <Texto>, <Número do Canto> ]\n[ <Folha Gráfica>, <Número do Canto> ]
Cross=Cruzada
CurveCartesian.Syntax=[ <Expressão>, <Expressão>, <Parâmetro Variável>, <Valor Inicial>, <Valor Final> ]
Degree.Syntax=[ <Polinómio> ]
DelauneyTriangulation=TriangulaçãoDelaunay
+Derivative.Syntax=[ <Função> ]\n[ <Curva> ]\n[ <Função>, <Número> ]\n[ <Função>, <Variável> ]\n[ <Curva>, <Número> ]\n[ <Função>, <Variável>, <Número> ]
Diameter=Diametral
Diameter.Syntax=[ <Vetor>, <Cónica> ]\n[ <Reta>, <Cónica> ]
-Dilate.Syntax=[ <Objeto>, <Fator> ]\n[ <Objeto>, <Fator>, <Centro> ]
Direction.Syntax=[ <Reta> ]
Directrix.Syntax=[ <Cónica> ]
Distance.Syntax=[ <Ponto>, <Objeto> ]
@@ -74,14 +71,14 @@ Exponential.Syntax=[ <Lambda>, x ]\n[ <Lambda>, <Valor da Vari
Extremum.Syntax=[ <Polinómio> ]\n[ <Função>, <x Inicial>, <x Final> ]
FDistribution=FDistribuição
FDistribution.Syntax=[ <Graus de Liberdade do Numerador>, <Graus de Liberdade do Denominador>, x ]\n[ <Graus de Liberdade do Numerador>, <Graus de Liberdade do Denominador>, <Valor da Variável> ]\n[ <Graus de Liberdade do Numerador>, <Graus de Liberdade do Denominador>, x, <Acumulada (true | false) ]
-Factor=Fator
+Factor=Fatorizar
Factor.Syntax=[ <Polinómio> ]
Factors.Syntax=[ <Polinómio> ]\n[ <Número> ]
FillCells=PrencherCélulas
FillCells.Syntax=[ <Intervalo>, <Objeto> ]\n[ <Célula>, <Lista> ]\n[ <Célula>, <Matriz> ]
First.Syntax=[ <Lista> ]\n[ <Texto> ]\n[ <Lista>, <Número de Elementos> ]\n[ <Texto>, <Número de Elementos> ]\n[ <Locus>, <Número de Elementos> ]
FirstAxis.Syntax=[ <Cónica> ]
-FirstAxisLength=ComprimentoSemiEixcoMaiorX
+FirstAxisLength=ComprimentoSemiEixoMaiorX
FirstAxisLength.Syntax=[ <Cónica> ]
FitGrowth=RegressãoExponencialGeral
FitPoly.Syntax=[ <Lista de Pontos>, <Grau do Polinómio> ]
@@ -113,8 +110,6 @@ Intersect=Intersetar
Intersect.Syntax=[ <Objeto>, <Objeto> ]\n[ <Objeto>, <Objeto>, <Índice do Ponto de Interseção> ]\n[ <Objeto>, <Objeto>, <Ponto Inicial> ]\n[ <Função>, <Função>, <x Inicial>, <x Final> ]
IntersectRegion=IntersetarRegiões
Intersection=Interseção
-IntersectionPaths=InterseçãoGeométrica
-IntersectionPaths.Syntax=\n[ <Reta>, <Polígono> ]\n[ <Reta>, <Cónica> ]
InverseBinomial=BinomialInversa
InverseBinomial.Syntax=[ <Número de Provas>, <Probabilidade do Sucesso>, <Probabilidade> ]
InverseCauchy=CauchyInversa
@@ -124,6 +119,7 @@ InverseFDistribution=FInversa
InverseFDistribution.Syntax=[ <Graus de Liberdade do Numerador>, <Graus de Liberdade do Denominador>, <Probabilidade> ]
InverseGamma=GamaInversa
InverseHyperGeometric=HiperGeométricaInversa
+InverseHyperGeometric.Syntax=[ <Dimensão da População>, <Número de Sucessos>, <Dimensão da Amostra>, <Probabilidade> ]
InverseNormal=NormalInversa
InversePascal=Pascalnversa
InversePascal.Syntax=[ <Número de Sucessos>, <Probabilidade do Sucesso>, <Probabilidade> ]
@@ -143,11 +139,9 @@ LeftSide=MembroEsquerdo
LeftSum=SomaEsquerda
LeftSum.Syntax=[ <Função>, <x Inicial>, <x Final>, <Número de Retângulos> ]
Length.Syntax=[ <Vetor> ]\n[ <Ponto> ]\n[ <Lista> ]\n[ <Texto> ]\n[ <Locus> ]\n[ <Segmento> ]\n[ <Função>, <x Inicial>, <x Final> ]\n[ <Função>, <Ponto Inicial>, <Ponto Final> ]\n[ <Curva>, <x Inicial>, <x Final> ]\n[ <Curva>, <Ponto Inicial>, <Ponto Final> ]
-LetterToUnicode.Syntax=[ <"Letra"> ]
Limit.Syntax=[ <Função>, <Valor> ]
LimitAbove=LimiteàDireita
LimitBelow=LimiteàEsquerda
-LineBisector.Syntax=[ <Segmento>, <Segmento> ]\n[ <Ponto>, <Ponto> ]
Locus=Locus
Locus.Syntax=[ <Ponto que cria o Locus>, <Ponto> ]\n[ <Ponto que cria o Locus>, <Seletor> ]
LogNormal=LogNormal
@@ -190,7 +184,7 @@ PathParameter.Syntax=[ <Ponto no Caminho> ]
Percentile.Syntax=[ <Lista de Números>, <Valor do Percentil> ]
Perimeter.Syntax=[ <Polígono> ]\n[ <Cónica> ]\n[ <Locus> ]
PlaySound.Syntax=[ <Ficheiro> ]\n[ <Booleano Play> ]\n[ <Nota Sequência>, <Instrumento> ]\n[ <Nota>, <Duração>, <Instrumento> ]\n[ <Função>, <Min Valor>, <Max Valor> ]\n[ <Função>, <Min Valor>, <Max Valor>, <Amostra Simples>, <Profundidade da Amostra> ]
-PointList=PontoLista
+PointList=PontodaLista
Poisson=Poisson
Polar.Syntax=[ <Ponto>, <Cónica> ]
PolyLine=LinhaPoligonal
@@ -211,15 +205,12 @@ Ray.Syntax=[ <Ponto Origem>, <Ponto> ]\n[ <Ponto Origem>, <Vetor Diretor> ]
RectangleSum.Syntax=[ <Função>, <x Inicial>, <x Final>, <Número de Retângulos>, <Posição do Retângulo Inicial> ]
ReducedRowEchelonForm=CanónicaReduzida
ResidualPlot=PontosResiduais
-Root.Syntax=[ <Polinomial> ]\n[ <Função>, <x Inicial> ]\n[ <Função>, <x Inicial>, <x Final> ]
+Root.Syntax=[ <Polinómio> ]\n[ <Função>, <x Inicial> ]\n[ <Função>, <x Inicial>, <x Final> ]
RootList=ListaRaízes
Roots.Syntax=[ <Função>, <x Inicial>, <x Final> ]
Rotate=Rotação
RotateText=RodarTexto
Row.Syntax=[ <Célula> ]
-SXX=SXX
-SXY=SXY
-SYY=SYY
Sample.Syntax=[ <Lista>, <Dimensão> ]\n[ <Lista>, <Dimensão>, <Com Substituição> ]
SampleSD=DesvioPadrãoAmostra
SampleSDX=DesvioPadrãoAmostraX
@@ -234,7 +225,7 @@ SelectedElement=SelecionarElemento
SelectedIndex=SelecionarPosição
Semicircle=Semicircunferência
SetActiveView=AtivarFolhaGráfica
-SetActiveView.Syntax=[ <Número da Folha Gráfica (1 | 2)> ]
+SetActiveView.Syntax=[ <Número da Folha Gráfica 1|2> ]
SetAxesRatio=RazãoEntreEixos
SetAxesRatio.Syntax=[ <Número (eixoX)>, <Número (eixoY)> ]
SetBackgroundColor=CorDoFundo
@@ -277,7 +268,7 @@ Spearman=Correla
StartAnimation.Syntax=[ ]\n[ <true | false> ]\n[ <Seletor ou Ponto>, <Seletor ou Ponto>, ... ]\n[ <Seletor ou Ponto>, <Seletor ou Ponto>, ..., <true | false> ]
StemPlot=DiagramaCauleFolhas
StemPlot.Syntax=[ <Lista> ]\n[ <Lista>, <Ajustamento (-1 | 0 | 1)> ]
-Stretch=Trecho
+Stretch=EsticamentoPerpendicular
SumSquaredErrors=SomaErrosQuadráticos
SumSquaredErrors.Syntax=[ <Lista de Pontos>, <Expressão> ]
TDistribution=TDistribuição
@@ -289,7 +280,7 @@ TTest2.Syntax=[ <Amostra1 (Lista)>, <Amostra2 (Lista)>, <Cauda>, <Agregada (true
TTestPaired.Syntax=[ <Amostra1 (Lista)>, <Amostra2 (Lista)>, <Cauda> ]
TableText=Tabela
Take.Syntax=[ <Lista>, <Posição Inicial>, <Posição Final> ]\n[ <Texto>, <Posição Inicial>, <Posição Final> ]
-Tangent.Syntax=[ <Ponto>, <Função> ]\n[ <Valor de x>, <Função> ]\n[ <Ponto>, <Cónica> ]\n[ <Ponto>, <Curva> ]\n[ <Reta>, <Cónica> ]\n[ <Circunferência>, <Circunferência> ]
+Tangent.Syntax=[ <Ponto>, <Cónica> ]\n[ <Ponto>, <Função> ]\n[ <Ponto na Curva>, <Curva> ]\n[ <x_valor>, <Função> ]\n[ <Reta>, <Cónica> ]\n[ <Circunferência>, <Circunferência> ]
TaylorSeries=PolinómioTaylor
TaylorSeries.Syntax=[ <Função>, <Valor de x>, <Ordem> ]
Text.Syntax=[ <Objeto> ]\n[ <Objeto>, <Booleano para Substituição de Variáveis> ]\n[ <Objeto>, <Ponto> ]\n[ <Objeto>, <Ponto> ]Booleano para Substituição de Variáveis> ]\n[ <Objeto>, <Ponto> ]Booleano para Substituição de Variáveis>, <Booleano para fórmula LaTeX> ]
@@ -310,7 +301,7 @@ TrigSimplify=Simplifica
TurningPoint=PontodeInflexão
TurningPoint.Syntax=[ <Polinómio> ]
UnicodeToLetter.Syntax=[ Número ]
-UnicodeToText.Syntax=[ Lista de números ]
+UnicodeToText.Syntax=[ <Lista de números> ]
Uniform=Uniforme
Uniform.Syntax=[ <Limite Inferior>, <Limite Superior>, x ]\n[ <Limite Inferior>, <Limite Superior>, x, <Acumulada (true | false)> ]\n[ <Limite Inferior>, <Limite Superior>, x, <Valor da Variável)> ]
Union=Reunião
diff --git a/geogebra/properties/command_ru.properties b/geogebra/properties/command_ru.properties
index fdfc241..7efc06d 100644
--- a/geogebra/properties/command_ru.properties
+++ b/geogebra/properties/command_ru.properties
@@ -98,7 +98,7 @@ Delete.Syntax=[ <\u041e\u0431\u044a\u0435\u043a\u0442> ]
Denominator=\u0417\u043d\u0430\u043c\u0435\u043d\u0430\u0442\u0435\u043b\u044c
Denominator.Syntax=[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f> ]
Derivative=\u041f\u0440\u043e\u0438\u0437\u0432\u043e\u0434\u043d\u0430\u044f
-Derivative.Syntax=[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f> ]\n[ <\u041a\u0440\u0438\u0432\u0430\u044f> ]\n[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u0427\u0438\u0441\u043b\u043e> ]\n[ <\u041a\u0440\u0438\u0432\u0430\u044f>, <\u0427\u0438\u0441\u043b\u043e> ]
+Derivative.Syntax=[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f> ]\n[ <\u041a\u0440\u0438\u0432\u0430\u044f> ]\n[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u0427\u0438\u0441\u043b\u043e> ]\n[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u041f\u0435\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f> ]\n[ <\u041a\u0440\u0438\u0432\u0430\u044f>, <\u0427\u0438\u0441\u043b\u043e> ]\n[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u041f\u0435\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f>, <\u0427\u0438\u0441\u043b\u043e> ]
Determinant=\u041e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u0435\u043b\u044c
Determinant.Syntax=[ <\u041c\u0430\u0442\u0440\u0438\u0446\u0430> ]
Diameter=\u0414\u0438\u0430\u043c\u0435\u0442\u0440
@@ -186,6 +186,7 @@ HarmonicMean=\u0421\u0440\u0435\u0434\u043d\u0435\u0435\u0413\u0430\u0440\u043c\
HarmonicMean.Syntax=[ <\u0421\u043f\u0438\u0441\u043e\u043a \u0447\u0438\u0441\u0435\u043b> ]
HideLayer=\u0421\u043f\u0440\u044f\u0442\u0430\u0442\u044c\u0421\u043b\u043e\u0439
HideLayer.Syntax=[ <\u0427\u0438\u0441\u043b\u043e> ]
+Hull.Syntax=[ <\u0421\u043f\u0438\u0441\u043e\u043a \u0442\u043e\u0447\u0435\u043a>, <\u041f\u0440\u043e\u0446\u0435\u043d\u0442> ]
Hyperbola=\u0413\u0438\u043f\u0435\u0440\u0431\u043e\u043b\u0430
Hyperbola.Syntax=[ <\u0424\u043e\u043a\u0443\u0441>, <\u0424\u043e\u043a\u0443\u0441>, <\u0414\u043b\u0438\u043d\u0430 \u0431\u043e\u043b\u044c\u0448\u043e\u0439 \u043f\u043e\u043b\u0443\u043e\u0441\u0438> ]\n[ <\u0424\u043e\u043a\u0443\u0441>, <\u0424\u043e\u043a\u0443\u0441>, <\u041e\u0442\u0440\u0435\u0437\u043e\u043a> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]
Identity=\u0415\u0434\u0438\u043d\u0438\u0447\u043d\u0430\u044f\u041c\u0430\u0442\u0440\u0438\u0446\u0430
@@ -195,8 +196,10 @@ If.Syntax=[ <\u0423\u0441\u043b\u043e\u0432\u0438\u0435>, <\u0422\u043e> ]\n[ <\
Imaginary=\u041c\u043d\u0438\u043c\u0430\u044f\u0427\u0430\u0441\u0442\u044c
ImplicitCurve=\u041d\u0435\u044f\u0432\u043d\u0430\u044f\u041a\u0440\u0438\u0432\u0430\u044f
ImplicitCurve.Syntax=[ <C\u043f\u0438\u0441\u043e\u043a \u0442\u043e\u0447\u0435\u043a> ]\n[ <f(x, y)> ]
-Incircle=\u0418\u043d\u0446\u0435\u043d\u0442\u0440
+Incircle=\u0412\u043f\u0438\u0441\u0430\u043d\u043d\u0430\u044f\u041e\u043a\u0440\u0443\u0436\u043d\u043e\u0441\u0442\u044c
Incircle.Syntax=[ <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430>, <\u0422\u043e\u0447\u043a\u0430> ]
+IndexOf=\u041f\u043e\u0437\u0438\u0446\u0438\u044f
+IndexOf.Syntax=[ <\u041e\u0431\u044a\u0435\u043a\u0442>, <\u0421\u043f\u0438\u0441\u043e\u043a> ]\n[ <\u0422\u0435\u043a\u0441\u0442>, <\u0422\u0435\u043a\u0441\u0442> ]\n[ <\u041e\u0431\u044a\u0435\u043a\u0442>, <\u0421\u043f\u0438\u0441\u043e\u043a>, <\u041d\u0430\u0447\u0438\u043d\u0430\u044f \u0441> ]\n[ <\u0422\u0435\u043a\u0441\u0442>, <\u0422\u0435\u043a\u0441\u0442>, <\u041d\u0430\u0447\u0438\u043d\u0430\u044f \u0441> ]
Insert=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c
Insert.Syntax=[ <\u0421\u043f\u0438\u0441\u043e\u043a>, <\u0421\u043f\u0438\u0441\u043e\u043a>, <\u041f\u043e\u0437\u0438\u0446\u0438\u044f> ]\n[ <\u041e\u0431\u044a\u0435\u043a\u0442>, <\u0421\u043f\u0438\u0441\u043e\u043a>, <\u041f\u043e\u0437\u0438\u0446\u0438\u044f> ]
IntegerPart=\u0426\u0435\u043b\u0430\u044f\u0427\u0430\u0441\u0442\u044c
@@ -304,7 +307,6 @@ Percentile=\u041f\u0440\u043e\u0446\u0435\u043d\u0442\u0438\u043b\u044c
Percentile.Syntax=[ <\u0421\u043f\u0438\u0441\u043e\u043a \u0447\u0438\u0441\u0435\u043b>, <\u041f\u0440\u043e\u0446\u0435\u043d\u0442> ]
Perimeter=\u041f\u0435\u0440\u0438\u043c\u0435\u0442\u0440
Perimeter.Syntax=[ <\u041c\u043d\u043e\u0433\u043e\u0443\u0433\u043e\u043b\u044c\u043d\u0438\u043a> ]\n[ <\u041a\u043e\u043d\u0438\u043a\u0430> ]
-Plane=\u041f\u043b\u043e\u0441\u043a\u043e\u0441\u0442\u044c
PlaySound.Syntax=[ <\u0424\u0430\u0439\u043b> ]\n[ <Boolean Play> ]\n[ <Note Sequence>, <\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442> ]\n[ <\u041d\u043e\u0442\u0430>, <\u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c>, <\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442> ]\n[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u041c\u0438\u043d\u0438\u043c\u0430\u043b\u044c\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435>, <\u041c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435> ]\n[ <\u0424\u0443\u043d\u043a\u0446\u0438\u044f>, <\u041c\u0438\u043d\u0438\u043c\u0430\u043b\u044c\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435>, <\u041c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435>, <Sample Rate>, <Sample Depth> ]
Point=\u0422\u043e\u0447\u043a\u0430
Point.Syntax=[ <\u041e\u0431\u044a\u0435\u043a\u0442> ]\n[ <\u0422\u043e\u0447\u043a\u0430>, <\u0412\u0435\u043a\u0442\u043e\u0440> ]
@@ -408,6 +410,7 @@ Sequence=\u041f\u043e\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u0435\u043
Sequence.Syntax=[ <\u0412\u044b\u0440\u0430\u0436\u0435\u043d\u0438\u0435>, <\u041f\u0435\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f>, <\u041d\u0430\u0447\u0430\u043b\u044c\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435>, <\u041a\u043e\u043d\u0435\u0447\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435> ]\n[ <\u0412\u044b\u0440\u0430\u0436\u0435\u043d\u0438\u0435>, <\u041f\u0435\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f>, <\u041d\u0430\u0447\u0430\u043b\u044c\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435>, <\u041a\u043e\u043d\u0435\u0447\u043d\u043e\u0435 \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435>, <\u0427\u0438\u0441\u043b\u043e \u0448\u0430\u0433\u043e\u0432> ]
SetActiveView=\u0412\u044b\u0431\u0440\u0430\u0442\u044c\u0410\u043a\u0442\u0438\u0432\u043d\u044b\u0439\u0412\u0438\u0434
SetActiveView.Syntax=[ <\u0427\u0438\u0441\u043b\u043e (1/2)> ]
+SetAxesRatio=\u041e\u0442\u043d\u043e\u0448\u0435\u043d\u0438\u0435\u041e\u0441\u0435\u0439
SetBackgroundColor=\u0412\u044b\u0431\u0440\u0430\u0442\u044c\u0426\u0432\u0435\u0442\u0424\u043e\u043d\u0430
SetBackgroundColor.Syntax=[ <\u041e\u0431\u044a\u0435\u043a\u0442>, "\u0446\u0432\u0435\u0442" ]\n[ <\u041e\u0431\u044a\u0435\u043a\u0442>, <\u041a\u0440\u0430\u0441\u043d\u044b\u0439>, <\u0417\u0435\u043b\u0451\u043d\u044b\u0439>, <\u0421\u0438\u043d\u0438\u0439> ]
SetCaption=\u0412\u044b\u0431\u0440\u0430\u0442\u044c\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a
@@ -424,6 +427,8 @@ SetFilling=\u0412\u044b\u0431\u0440\u0430\u0442\u044c\u0417\u0430\u043b\u0438\u0
SetFilling.Syntax=[ <\u041e\u0431\u044a\u0435\u043a\u0442>, <\u0427\u0438\u0441\u043b\u043e> ]
SetFixed=\u0417\u0430\u0444\u0438\u043a\u0441\u0438\u0440\u043e\u0432\u0430\u0442\u044c
SetFixed.Syntax=[ <\u041e\u0431\u044a\u0435\u043a\u0442>, <true | false> ]
+SetLabelMode=\u0412\u0438\u0434\u041e\u0431\u043e\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f
+SetLabelMode.Syntax=[ <\u041e\u0431\u044a\u0435\u043a\u0442>, <\u0427\u0438\u0441\u043b\u043e> ]
SetLayer=\u0412\u044b\u0431\u0440\u0430\u0442\u044c\u0421\u043b\u043e\u0439
SetLayer.Syntax=[ <\u041e\u0431\u044a\u0435\u043a\u0442>, <\u0421\u043b\u043e\u0439> ]
SetLineStyle=\u0412\u044b\u0431\u0440\u0430\u0442\u044c\u0422\u0438\u043f\u041b\u0438\u043d\u0438\u0438
diff --git a/geogebra/properties/command_sk.properties b/geogebra/properties/command_sk.properties
index e24e719..911027f 100644
--- a/geogebra/properties/command_sk.properties
+++ b/geogebra/properties/command_sk.properties
@@ -71,8 +71,6 @@ ColumnName=N
ColumnName.Syntax=[ <Tabu\u013eka> ]
Command=Príkaz
CommonDenominator=Spolo\u010dnýMenovate\u013e
-CompetitionRank=PoradieSú\u0165a\u017ee
-CompetitionRank.Syntax=[ <Zoznam> ]
CompleteSquare=Úplný\u0160tvorec
CompleteSquare.Syntax=[ <Kvadratická funkciaj> ]
ComplexRoot=KomplexnýKore\u0148
@@ -112,7 +110,7 @@ Delete.Syntax=[ <Objekt> ]
Denominator=Menovate\u013e
Denominator.Syntax=[ <Funkcia> ]
Derivative=Derivácia
-Derivative.Syntax=[ <Funkcia> ]\n[ <Krivka> ]\n[ <Funkcia>, <\u010císlo> ]\n[ <Krivka>, <\u010císlo> ]
+Derivative.Syntax=[ <Funkcia> ]\n[ <Krivka> ]\n[ <Funkcia>, <\u010císlo> ]\n[ <Funkcia>, <Premenná> ]\n[ <Krivka>, <\u010císlo> ]\n[ <Funkcia>, <Premenná>, <\u010císlo> ]
Determinant.Syntax=[ <Matica> ]
Diameter=PriemerKu\u017eelose\u010dky
Diameter.Syntax=[ <Vektor>, <Ku\u017ee\u013eose\u010dka> ]\n[ <Priamka>, <Ku\u017ee\u013eose\u010dka> ]
@@ -246,8 +244,6 @@ Intersect.Syntax=[ <Objekt>, <Objekt> ]\n[ <Objekt>, <Objekt>, <\u010c
IntersectRegion=Priese\u010dnáOblas\u0165
Intersection=Prienik
Intersection.Syntax=[ <Zoznam>, <Zoznam> ]
-IntersectionPaths=PrienikGeo
-IntersectionPaths.Syntax=\n[ <GeoPriamka>, <GeoMnohouholník> ]\n[ <GeoPriamka>, <GeoKu\u017ee\u013eose\u010dka> ]
InverseBinomial=InverznéBinomiálne
InverseBinomial.Syntax=[ <Po\u010det pokusov>, <Pravdepodobnos\u0165 úspechu>, <Pravdepodobnos\u0165> ]
InverseCauchy=InverznéCauchy
@@ -389,7 +385,6 @@ Percentile=Percentil
Percentile.Syntax=[ <Zoznam \u010dísel>, <Percento> ]
Perimeter=Obvod
Perimeter.Syntax=[ <Mnohouholnik> ]\n[ <Ku\u017ee\u013eose\u010dka> ]\n[ <Mno\u017eina bodov> ]
-Plane=Rovina
PlaySound=Prehra\u0165Vzuk
PlaySound.Syntax=[ <Súbor> ]\n[ <Logicky prehrávanie> ]\n[ <Note Sequence>, <Instrument> ]\n[ <Note>, <Duration>, <Length> ]\n[ <Funkcia>, <Min hodnota>, <Max hodnota> ]\n[ <Funkcia>, <Min hodnota>, <Max hodnota>, <rozsah vzorky>, <h\u013abka vzorky> ]
Point=Bod
@@ -401,7 +396,7 @@ PointList.Syntax=[ <Zoznam> ]
Poisson.Syntax=[ <Priemer> ]\n[ <Priemer>, <Logicky kumulatívne> ]\n[ <Priemer>, <Premenná>, <Logicky kumulatívne> ]
Polar=Polára
Polar.Syntax=[ <Bod>, <Ku\u017ee\u013eose\u010dka> ]
-PolyLine=Zalomená\u010ciara
+PolyLine=Lomená\u010ciara
PolyLine.Syntax=[ <Zoznam bodov> ]\n[ <Bod>, ..., <Bod> ]
Polygon=Mnohouholník
Polygon.Syntax=[ <Zoznam bodov> ]\n[ <Bod>, ..., <Bod> ]\n[ <Point>, <Point>, <Po\u010det vrcholov> ]
@@ -572,6 +567,7 @@ Sort.Syntax=[ <Zoznam> ]
Spearman.Syntax=[ <Zoznam bodov> ]\n[ <Zoznam \u010dísel>, <Zoznam \u010dísel> ]
StartAnimation=Za\u010da\u0165Animáciu
StartAnimation.Syntax=[ ]\n[ <Logická premenná> ]\n[ <Posuvník alebo bod>, <Posuvník alebo bod>, ... ]\n[ <Slider or Point>, <Slider or Point>, ..., <Logická premenná> ]
+StemPlot=ListVetvaDiagram
StemPlot.Syntax=[ <Zoznam> ]\n[ <Zoznam>, <Upravi\u0165 -1|0|1> ]
Stretch=Roztiahnú\u0165
Stretch.Syntax=[ <Objekt>, <Vektor> ]\n[ <Objekt>, <Priamka>, <Pomer> ]
diff --git a/geogebra/properties/command_sl.properties b/geogebra/properties/command_sl.properties
index 4676f7a..c66eedf 100644
--- a/geogebra/properties/command_sl.properties
+++ b/geogebra/properties/command_sl.properties
@@ -72,8 +72,6 @@ ColumnName=ImeStolpca
ColumnName.Syntax=[ <celica tabele> ]
Command=Ukaz
CommonDenominator=SkupniImenovalec
-CompetitionRank=Ran\u017eirnaVrsta
-CompetitionRank.Syntax=[ <seznam> ]
CompleteSquare=PopolniKvadrat
CompleteSquare.Syntax=[ <Kvadratna funkcija> ]
ComplexRoot=KompleksniKoren
@@ -249,8 +247,6 @@ IntersectRegion=PresekMnogokotnikov
IntersectRegion.Syntax=[ <mnogokotnik>, <mnogokotnik> ]
Intersection=Presek
Intersection.Syntax=[ <seznam>, <seznam> ]
-IntersectionPaths=Prese\u010di\u0161\u010dePoti
-IntersectionPaths.Syntax=\n[ <\u010drta>, <mnogokotnik> ]\n[ <\u010drta>, <sto\u017enica> ]
InverseBinomial=InverznaBinomskaPorazdelitev
InverseBinomial.Syntax=[ <\u0161tevilo poskusov>, <verjetnost dogodka>, <verjetnost> ]
InverseCauchy=InverznaCauchyjevaPorazdelitev
@@ -395,7 +391,6 @@ Percentile=Centil
Percentile.Syntax=[ <seznam \u0161tevil>, <odstotek> ]
Perimeter=Obseg
Perimeter.Syntax=[ <mnogokotnik> ]\n[ <sto\u017enica> ]\n[ <sled> ]
-Plane=Ravnina
PlaySound=Zvok
PlaySound.Syntax=[ <datoteka> ]\n[ <zaporedje>, <glasbilo> ]\n[ <ton>, <trajanje>, <glasbilo> ]\n[ <funkcija>, <od>, <do> ]\n[ <funkcija>, <od>, <do>, <frekvenca vzorca>, <globina vzorca> ]
Point=To\u010dka
diff --git a/geogebra/properties/command_sr.properties b/geogebra/properties/command_sr.properties
index e5f3e9d..3293a3f 100644
--- a/geogebra/properties/command_sr.properties
+++ b/geogebra/properties/command_sr.properties
@@ -254,7 +254,6 @@ Parameter=Parametar
Parameter.Syntax=[ <konusni presek> ]
Perimeter=Obim
Perimeter.Syntax=[ <poligon> ]\n[ <konusni presek> ]
-Plane=Ravan
PlaySound=Sviraj
PlaySound.Syntax=[ <datoteka> ]\n[ <logi\u010dki sviraj> ]\n[ <niz nota>, <instrument> ]\n[ <funkcija> <min vrednost>, <max vrednost> ]\n[ <nota>, <trajanje>, <instrument> ]\n[ <funkcija> <min vrednost>, <max vrednost>, <frekvencija uzorkovanja>, <dubina uzorka> ]
Point=Ta\u010dka
diff --git a/geogebra/properties/command_sv.properties b/geogebra/properties/command_sv.properties
index d89e640..96b06fa 100644
--- a/geogebra/properties/command_sv.properties
+++ b/geogebra/properties/command_sv.properties
@@ -1,3 +1,4 @@
+ANOVA.Syntax=[ <Lista>, <Lista>, ... ]
AffineRatio=Delningsförhållande
AffineRatio.Syntax=[ <Punkt>, <Punkt>, <Punkt> ]
Angle=Vinkel
@@ -6,6 +7,8 @@ AngularBisector=Bisektris
AngularBisector.Syntax=[ <Linje>, <Linje> ]\n[ <Punkt>, <Punkt>, <Punkt> ]
Append=LäggTill
Append.Syntax=[ <Lista>, <Objekt> ]\n[ <Objekt>, <Lista> ]
+ApplyMatrix=TillämpaMatris
+ApplyMatrix.Syntax=[ <Matris>, <Objekt> ]
Arc=Båge
Arc.Syntax=[ <Kägelsnitt>, <Punkt>, <Punkt> ]\n[ <Kägelsnitt>, <Tal>, <Tal> ]
Area.Syntax=[ <Kägelsnitt> ]\n[ <Punkt>, ..., <Punkt> ]
@@ -17,37 +20,73 @@ AxisStepX=AxlarStegX
AxisStepY=AxlarStegY
BarChart=Stapeldiagram
BarChart.Syntax=[ <Lista med data>, <Lista med frekvenser> ]\n[ <Lista med rådata>, <Stapelbredd> ]\n[ <Lista med data>, <Lista med frekvenser>, <Stapelbredd> ]\n[ <Starvärde>, <Sluttvärde>, <Lista med höjder> ]\n[ <Startvärde>, <Sluttvärde>, <Uttryck>, <Variabel>, <Från värde>, <Till värde> ]\n[ <Startvärde>, <Sluttvärde>, <Uttryck>, <Variabel>, <Från värde>, <Till värde>, <Bredd> ]
+Bernoulli=Bernoullifördelning
+Bernoulli.Syntax=[ <Sannolikhet>, <sant | falskt (kumulativt eller ej)> ]
Binomial=BinomialKoefficient
Binomial.Syntax=[ <Tal>, <Tal> ]
+BinomialDist=Binomialfördelning
+BinomialDist.Syntax=[ <Antal försök>, <Sannolikhet att lyckas> ]\n[ <Antal försök>, <Sannolikhet att lyckas>, <sant | falskt (kumulativt eller ej)> ]\n[ <Antal försök>, <Sannolikhet att lyckas>, <Variabelvärde>, <sant | falskt (kumulativt eller ej)> ]
BoxPlot.Syntax=[ <yVärde>, <ySkala>, <Lista med rådata> ]\n[ <yVärde>, <ySkala>, <Startvärde>, <Q1>, <Median>, <Q3>, <Sluttvärde> ]
+Button=Knapp
+Button.Syntax=[ ]\n[ <Rubrik> ]
+CFactor=FaktoriseraKomplext
+CSolutions=LösningarKomplexa
+CSolve=LösKomplext
+Cauchy=Cauchyfördelning
+Cauchy.Syntax=[ <Median>, <Skala>, x ]\n[ <Median>, <Skala>, <Variabelvärde> ]\n[ <Median>, <Skala>, x, <sant | falskt (kumulativ eller ej)> ]
+Cell.Syntax=[ <Kolumn>, <Rad> ]
CellRange=CellOmråde
CellRange.Syntax=[ <Startcell>, <Sluttcell> ]
Center=Medelpunkt
Center.Syntax=[ <Kägelsnitt> ]
Centroid=Tyngdpunkt
+Checkbox=KryssRuta
+Checkbox.Syntax=[ ]\n[ <Rubrik> ]\n[ <Lista> ]\n[ <Rubrik>, <Lista> ]
+ChiSquared=ChiKadratfördelning
+ChiSquared.Syntax=[ <Frihetsgrader>, x ]\n[ <Frihetsgrader>, <Variabelvärde> ]\n[ <Frihetsgrader>, x, <sant | falskt (kumulativ eller ej)> ]
Circle=Cirkel
Circle.Syntax=[ <Punkt>, <Tal> ]\n[ <Punkt>, <Sträcka> ]\n[ <Punkt>, <Punkt> ]\n[ <Punkt>, <Punkt>, <Punkt> ]
CircleArc=Cirkelbåge
CircleArc.Syntax=[ <Punkt>, <Punkt>, <Punkt> ]
+CircleSector=Cirkelsektor
+CircleSector.Syntax=[ <Mittpunkt>, <Punkt>, <Punkt> ]
CircumcircleArc=Båge
CircumcircleArc.Syntax=[ <Punkt>, <Punkt>, <Punkt> ]
+CircumcircleSector=CirkelSektorFrånTreRandpunkter
+CircumcircleSector.Syntax=[ <Punkt>, <Punkt>, <Punkt> ]
Circumference=Omkrets
Circumference.Syntax=[ <Kägelsnitt> ]
+Classes=Klasser
+Classes.Syntax=[ <Datalista>, <Antal klasser> ]\n[ <Datalista>, <Start>, <Klassbredd> ]
+ClosestPoint=NärmastePunkt
+ClosestPoint.Syntax=[ <Kurva>, <Point> ]
+Coefficients=Koefficienter
+Coefficients.Syntax=[ <Polynom> ]\n[ <Kägelsnitt> ]
Column=Kolumn
Column.Syntax=[ <kalkylcell> ]
-ColumnName=KulumnNamn
+ColumnName=KolumnNamn
ColumnName.Syntax=[ <Kalkylcell> ]
Command=Kommando
+CommonDenominator=GemensamNämnare
+CompleteSquare=KvadratKomplettera
+CompleteSquare.Syntax=[ <Kvadratisk funktion> ]
+ComplexRoot=KomplexRot
+ComplexRoot.Syntax=[ <Polynom> ]
Conic=Kägelsnitt
Conic.Syntax=[ <Punkt>, <Punkt>, <Punkt>, <Punkt>, <Punkt> ]
ConstructionStep=Konstruktionssteg
ConstructionStep.Syntax=[ ]\n[ <Objekt> ]
+ConvexHull=KonvextSkal
+ConvexHull.Syntax=[ <Punktlista> ]
+CopyFreeObject=KopieraFrittObjekt
+CopyFreeObject.Syntax=[ <Objekt> ]
Corner=Hörn
-Corner.Syntax=[ <Bild>, <Tal> ]
+Corner.Syntax=[ <Hörnnummer> ]\n[ <Bild>, <Hörnnummer> ]\n[ <Text>, <Hörnnummer> ]\n[ <Ritområde 1 | 2>, <Hörnnummer> ]
CountIf=RäknaOm
CountIf.Syntax=[ <Villkor>, <Lista> ]
Covariance=Kovarians
Covariance.Syntax=[ <Lista med punkter> ]\n[ <Lista med tal>, <Lista med tal> ]
+Cross=Kryssprodukt
CrossRatio=Kryssförhållande
CrossRatio.Syntax=[ <Punkt>, <Punkt>, <Punkt>, <Punkt> ]
Curvature=Krökning
@@ -56,17 +95,24 @@ CurvatureVector=Kr
CurvatureVector.Syntax=[ <Punkt>, <Funktion> ]\n[ <Punkt>, <Kurva> ]
CurveCartesian=Kurva
CurveCartesian.Syntax=[ <uttryck>, <uttryck>, <var>, <från>, <till> ]
-Defined=Definierad
+Decimal=DecimalForm
+Defined=ÄrDefinierad
Defined.Syntax=[ <Objekt> ]
+Degree=Grad
+Degree.Syntax=[ <Polynom> ]
+DelauneyTriangulation=DelaunayTriangulering
+DelauneyTriangulation.Syntax=[ <Lista med Punkter> ]
Delete=Radera
Delete.Syntax=[ <Objekt> ]
+Denominator=Nämnare
+Denominator.Syntax=[ <Funktion> ]
Derivative=Derivera
-Derivative.Syntax=[ <Funktion> ]\n[ <Kurva> ]\n[ <Funktion>, <Tal> ]\n[ <Kurva>, <Tal> ]
+Derivative.Syntax=[ <Funktion> ]\n[ <Kurva> ]\n[ <Funktion>, <Tal> ]\n[ <Funktion>, <Variabel> ]\n[ <Kurva>, <Tal> ]\n[ <Funktion>, <Variabel>, <Tal> ]
Determinant.Syntax=[ <Matris> ]
Diameter=Diameter
Diameter.Syntax=[ <Vektor>, <Kägelsnitt> ]\n[ <Linje>, <Kägelsnitt> ]
Dilate=Utvidga
-Dilate.Syntax=[ <Punkt>, <Tal>, <Punkt> ]\n[ <Linje>, <Tal>, <Punkt> ]\n[ <Kägelsnitt>, <Tal>, <Punkt> ]\n[ <Polygon>, <Tal>, <Punkt> ]\n[ <Bild>, <Tal>, <Punkt> ]
+Dilate.Syntax=[ <Objekt>, <Uttänjningsfaktor> ]\n[ <Objekt>, <Uttänjningsfaktor>, <Punkt> ]
Direction=Riktning
Direction.Syntax=[ <Linje> ]
Directrix=Styrlinje
@@ -74,28 +120,58 @@ Directrix.Syntax=[ <K
Distance=Avstånd
Distance.Syntax=[ <Punkt>, <Punkt> ]
Div.Syntax=[ <Tal>, <Tal> ]
+Divisors=Delare
+DivisorsList=ListaMedDelare
+DivisorsSum=SummaAvDelare
+Dot=SkalärProdukt
+DotPlot=Punktdiagram
+DotPlot.Syntax=[ <Lista med rådata> ]
+DynamicCoordinates=DynamiskaKoordinater
+DynamicCoordinates.Syntax=[ <Punkt>, <Tal>, <Tal> ]
+Eccentricity=Eccentricitet
+Eccentricity.Syntax=[ <Kägelsnitt> ]
Element.Syntax=[ <Lista>, <Tal> ]
Ellipse=Ellips
Ellipse.Syntax=[ <Punkt>, <Punkt>, <Tal> ]\n[ <Punkt>, <Punkt>, <Sträcka> ]
+Erlang=Erlangfördelning
+Erlang.Syntax=[ <Form>, <Hastighet>, x ]\n[ <Form>, <Hastighet>, <Variabelvärde> ]\n[ <Form>, <Hastighet>, x, <sant | falskt (kumulativt eller ej)> ]
Excentricity=Excentricitet
Excentricity.Syntax=[ <Kägelsnitt> ]
+Execute=UtförKommando
+Execute.Syntax=[ <Lista med texter> ]\n[ <Lista med texter>, <Parameter>, <Parameter>, ... ]
Expand=Expandera
Expand.Syntax=[ <Funktion> ]
+Exponential=Exponentialfördelning
+Exponential.Syntax=[ <Lambda>, x ]\n[ <Lambda>, <Variabelvärde> ]\n[ <Lambda>, x, <sant | falskt (kumulativt eller ej)> ]
Extremum=Extrempunkt
Extremum.Syntax=[ <Polynom> ]
+FDistribution=F_fördelning
+FDistribution.Syntax=[ <Antal frihetsgrader>, <Nämnarens frihetsgrader>, x ]\n[ <Antal frihetsgrader>, <Nämnarens frihetsgrader>, <Variabelvärde> ]\n[ <Antal frihetsgrader>, <Nämnarens frihetsgrader>, x, <sant | falskt (kumulativt eller ej)> ]
Factor=Faktorisera
Factor.Syntax=[ <Polynom> ]
+Factors=Faktorer
+Factors.Syntax=[ <Polynom> ]\n[ <Tal> ]
+FillCells=FyllCeller
+FillCells.Syntax=[ <Cellområde>, <Objekt> ]\n[ <Cell>, <Lista> ]\n[ <Cell>, <Matris> ]
+FillColumn=FyllKolumn
+FillColumn.Syntax=[ <Kolumn>, <Lista> ]
+FillRow=FyllRad
+FillRow.Syntax=[ <Rad>, <Lista> ]
First=Första
-First.Syntax=[ <Lista> ]\n[ <Lista>, <Antal element> ]
+First.Syntax=[ <Lista> ]\n[ <Text> ]\n[ <Lista>, <Antal element> ]\n[ <Text>, <Antal element> ]\n[ <Geometrisk ort>, <Antal element> ]
FirstAxis=HalvStoraxel
FirstAxis.Syntax=[ <Kägelsnitt> ]
FirstAxisLength=HalvStoraxelLängd
FirstAxisLength.Syntax=[ <Kägelsnitt> ]
-FitExp=RegressionExp
+Fit=Regression
+Fit.Syntax=[ <Lista med Punkter>, <Lista med funktioner> ]\n[ <Lista med Punkter>, <Funktion> ]
+FitExp=RegressionExpBasE
FitExp.Syntax=[ <Lista med punkter> ]
+FitGrowth=RegressionExp
+FitGrowth.Syntax=[ <Lista med Punkter> ]
FitLineX=RegressionLinX
FitLineX.Syntax=[ <Lista med punkter> ]
-FitLineY=RegressionLinY
+FitLineY=RegressionLin
FitLineY.Syntax=[ <Lista med punkter> ]
FitLog=RegressionLog
FitLog.Syntax=[ <Lista med punkter> ]
@@ -111,29 +187,92 @@ Focus=Fokus
Focus.Syntax=[ <Kägelsnitt> ]
FractionText=RationellaTalText
FractionText.Syntax=[ <Tal> ]
+FractionalPart=DecimalDel
+Frequency=Frekvens
+Frequency.Syntax=[ <Lista med rådata> ]\n[ <sant | falskt (kumulativt eller ej)>, <Lista med rådata> ]\n[ <Lista med klassgränser>, <Lista med rådata> ]\n[ <sant | falskt (kumulativt eller ej)>, <Lista med klassgränser>, <Lista med rådata> ]\n[ <Lista med klassgränser>, <Lista med rådata>, <sant | falskt (använd densitet eller ej)>, <Densitetsskalfaktor (optional)> ]\n[ <sant | falskt (kumulativt)>, <Lista med klassgränser>, <Lista med rådata>, <sant | falskt (använd densitet)>, <Densitetsskalfaktor (optional)> ]
+FrequencyPolygon=FrekvensPolygon
+FrequencyPolygon.Syntax=[ <Lista med klassgränser>, <Lista med höjder> ]\n[ <Lista med klassgränser>, <Lista med rådata>, <sant | falskt (använd densitet eller ej)>, <Densitetsskalfaktor (optional)> ]\n[ <sant | falskt (kumulativt eller ej)>, <Lista med klassgränser>, <Lista med rådata>, <sant | falskt (använd densitet eller ej)>, <Densitetsskalfaktor (optional)> ]
+FrequencyTable=Frekvenstabell
+FrequencyTable.Syntax=[ <Lista med rådata> ]\n[ <sant | falskt (kumulativt eller ej)>, <Lista med rådata> ]\n[ <Lista med klassgränser>, <Lista med rådata> ]\n[ <sant | falskt (kumulativt eller ej)>, <Lista med klassgränser>, <Lista med rådata> ]\n[ <Lista med klassgränser>, <Lista med rådata>, <sant | falskt (använd densitet eller ej)>, <Densitetsskalfaktor (optional)> ]\n[ <sant | falskt (kumulativt)>, <Lista med klassgränser>, <Lista med rådata>, <sant | falskt (använd densitet eller ej)>, <Densitetsskalfaktor (optional)> ]
Function=Funktion
-Function.Syntax=[ <Funktion>, <Tal>, <Tal> ]
+Function.Syntax=[ <Funktion>, <Från>, <Till> ]
GCD=SGD
GCD.Syntax=[ <Lista med punkter> ]\n[ <Tal>, <Tal> ]
-Histogram.Syntax=[ <Lista med klassgränser>, <Lista med höjder> ]\n[ <Lista med klassgränser>, <Lista med rådata> ]
+Gamma=Gammafördelning
+Gamma.Syntax=[ <Alpha>, <Beta>, x ]\n[ <Alpha>, <Beta>, <Variabelvärde> ]\n[ <Alpha>, <Beta>, x, <sant | falskt (kumulativt eller ej)> ]
+GeometricMean=GeometrisktMedel
+GeometricMean.Syntax=[ <Lista med Tal> ]
+GetTime=Tid
+HarmonicMean=HarmonisktMedelvärde
+HarmonicMean.Syntax=[ <Lista med Tal> ]
+HideLayer=DöljLager
+HideLayer.Syntax=[ <Lagernummer> ]
+Histogram.Syntax=[ <Lista med klassgränser>, <Lista med höjder> ]\n[ <Lista med klassgränser>, <Lista med rådata>, <sant | falskt (använd densitet)>, <Densitetsskalfaktor (optional)> ]\n[ <sant | falskt (kumulativt eller ej)>, <Lista med klassgränser>, <Lista med rådata>, <sant | falskt (använd densitet)>, <Densitetsskalfaktor (optional)> ]
+HistogramRight=HistogramHöger
+HistogramRight.Syntax=[ <Lista med klassgränser>, <Lista med höjder> ]\n[ <Lista med klassgränser>, <Lista med rådata>, <sant | falskt (använd densitet eller ej)>, <Densitetsskalfaktor (optional)> ]\n[ <sant | falskt (kumulativt eller ej)>, <Lista med klassgränser>, <Lista med rådata>, <sant | falskt (använd densitet eller ej)>, <Densitetsskalfaktor (optional)> ]
+Hull=Hölje
+Hull.Syntax=[ <Lista med punkter>, <Procentuell andel> ]
+HyperGeometric=HyperGeometriskFördelning
+HyperGeometric.Syntax=[ <Polulationsstorlek>, <Antal lyckade utfall>, <Urvalsstorlek> ]\n[ <Polulationsstorlek>, <Antal lyckade utfall>, <Urvalsstorlek>, <sant | falskt (kumulativt eller ej)> ]\n[ <Polulationsstorlek>, <Antal lyckade utfall>, <Urvalsstorlek>, <Variabelvärde>, <sant | falskt (kumulativt eller ej)> ]
Hyperbola=Hyperbel
Hyperbola.Syntax=[ <Punkt>, <Punkt>, <Tal> ]\n[ <Punkt>, <Punkt>, <Sträcka> ]
+Identity=IdentitetsMatris
+Identity.Syntax=[ <Matrisstorlek> ]
If=Om
If.Syntax=[ <Villkor>, <Då> ]\n[ <Villkor>, <Då>, <Annars> ]
+Imaginary=ImaginärDel
+ImplicitCurve=ImplicitKurva
+ImplicitCurve.Syntax=[ <Lista med Punkter> ]\n[ <f(x;y)> ]
+ImplicitDerivative=ImplicitDerivata
+Incircle=InskrivenCirkel
+Incircle.Syntax=[ <Punkt>, <Punkt>, <Punkt> ]
+IndexOf=Hitta
+IndexOf.Syntax=[ <Objekt>, <Lista> ]\n[ <Text att hitta>, <Textmassa> ]\n[ <Objekt>, <Lista>, <Position att börja leta> ]\n[ <Text att hitta>, <Textmassa>, <Position att börja leta> ]
Insert=MataIn
Insert.Syntax=[ <Lista>, <Lista>, <Position> ]\n[ <Objekt>, <Lista>, <Position> ]
-Integral.Syntax=[ <Funktion> ]\n[ <Funktion>, <Tal>, <Tal> ]\n[ <Funktion>, <Funktion>, <Tal>, <Tal> ]
+IntegerPart=HeltalsDel
+Integral.Syntax=[ <Funktion> ]\n[ <Funktion>, <Från>, <Till> ]\n[ <Funktion>, <Funktion>, <Från>, <Till> ]
+IntegralBetween=IntegralMellan
+IntegralBetween.Syntax=[ <Funktion>, <Funktion>, <Från>, <Till> ]\n[ <Funktion>, <Funktion>, <Från>, <Till>, <sant | falskt (beräkna värde eller ej)> ]
Intersect=Skärning
Intersect.Syntax=[ <Objekt>, <Objekt> ]\n[ <Objekt>, <Objekt>, <Antal skärningspunkter> ]\n[ <Objekt>, <Objekt>, <Startpunkt> ]
+IntersectRegion=SkärningsOmråde
Intersection=Skärningspunkt
Intersection.Syntax=[ <Lista>, <Lista> ]
+InverseBinomial=InversBinomialFördelning
+InverseBinomial.Syntax=[ <Antal försök>, <Sannolikhet att lyckas>, <Sannolikhet> ]
+InverseCauchy=InversCauchyFördelning
+InverseCauchy.Syntax=[ <Median>, <Skala>, <Sannolikhet> ]
+InverseChiSquared=InversChiKvadratFördelning
+InverseChiSquared.Syntax=[ <Antal frihetsgrader>, <Sannolikhet> ]
+InverseExponential=InversExponentialFördelning
+InverseExponential.Syntax=[ <Lambda>, <Sannolikhet> ]
+InverseFDistribution=InversFFördelning
+InverseFDistribution.Syntax=[ <Antal frihetsgrader>, <Antal frihetsgrader för nämnaren>, <Sannolikhet> ]
+InverseGamma=InversGammaFördelning
+InverseGamma.Syntax=[ <Alpha>, <Beta>, <Sannolikhet> ]
+InverseHyperGeometric=InversHyperGeometriskFördelning
+InverseHyperGeometric.Syntax=[ <Populationsstorlek>, <Antal lyckade utfall>, <Urvalsstorlek>, <Sannolikhet> ]
InverseNormal=InversNormalfördelning
InverseNormal.Syntax=[ <Medelvärde>, <Standardavvikelse>, <Sannolikhet> ]
+InversePascal=InversPascalFördelning
+InversePascal.Syntax=[ <Antal lyckade utfall>, <Sannolikhet att lyckas>, <Sannolikhet> ]
+InversePoisson=InversPoissonFördelning
+InversePoisson.Syntax=[ <Medel>, <Sannolikhet> ]
+InverseTDistribution=InversTFördelning
+InverseTDistribution.Syntax=[ <Antal frihetsgrader>, <Sannolikhet> ]
+InverseWeibull=InversWeibullFördelning
+InverseWeibull.Syntax=[ <Form>, <Skala>, <Sannolikhet> ]
+InverseZipf=InversZipfFördelning
+InverseZipf.Syntax=[ <Antal Element>, <Exponent>, <Sannolikhet> ]
Invert=Invers
Invert.Syntax=[ <Matris> ]
+IsInRegion=ÄrIOmråde
+IsInRegion.Syntax=[ <Punkt>, <Region> ]
IsInteger=ÄrHeltal
IsInteger.Syntax=[ <Tal> ]
-Iteration.Syntax=[ <Funktion>, <start-värde>, <Tal n> ]
+IsPrime=ÄrPrimtal
+Iteration.Syntax=[ <Funktion i x>, <start-värde för x>, <Antal iterationer> ]
IterationList=Iterationslista
IterationList.Syntax=[ <Funktion>, <Startvärde>, <Antal iterationer> ]
Join=Kombinera
@@ -142,25 +281,39 @@ KeepIf=Beh
KeepIf.Syntax=[ <Villkor>,>Lista> ]
LCM=MGM
LCM.Syntax=[ <Lista med tal> ]\n[ <Tal>, <Tal> ]
-LaTeX=LaTeX
+LaTeX=FormelText
LaTeX.Syntax=[ <Objekt> ]\n[ <Objekt>, <Boolskt värde för substitution av variabler> ]
Last=Sista
-Last.Syntax=[ <Lista> ]\n[ <Lista>, <Antal element> ]
+Last.Syntax=[ <Lista> ]\n[ <Text> ]\n[ <Lista>, <Antal element> ]\n[ <Text>, <Antal element> ]
+LeftSide=VänsterLed
+LeftSum=VänsterSumma
+LeftSum.Syntax=[ <Funktion>, <Från x>, <Till x>, <Antal rektanglar> ]
Length=Längd
Length.Syntax=[ <Vektor> ]\n[ <Punkt> ]\n[ <Lista> ]\n[ <Funktion>, <Tal>, <Tal> ]\n[ <Funktion>, <Punkt>, <Punkt> ]\n[ <Kurva>, <Tal>, <Tal> ]\n[ <Kurva>, <Punkt>, <Punkt> ]
LetterToUnicode=BokstavTillUnicode
LetterToUnicode.Syntax=[ <Text> ]
Limit=Gränsvärde
-Limit.Syntax=[ <Funktion>, <Tal> ]
+Limit.Syntax=[ <Funktion>, <Värde> ]
+LimitAbove=GränsvärdeTillHöger
+LimitAbove.Syntax=[ <Funktion>, <Värde> ]
+LimitBelow=GränsvärdeTillVänster
+LimitBelow.Syntax=[ <Funktion>, <Värde> ]
Line=Linje
Line.Syntax=[ <Punkt>, <Punkt> ]\n[ <Punkt>, <Linje> ]\n[ <Punkt>, <Vektor> ]
LineBisector=Mittpunktsnormal
LineBisector.Syntax=[ <Segment> ]\n[ <Punkt>, <Punkt> ]
Locus=GeometriskOrt
Locus.Syntax=[ <Punkt>, <Punkt> ]
+LogNormal=LogaritmiskNormalFördelning
+LogNormal.Syntax=[ <Medel>, <Standardavvikelse>, x ]\n[ <Medel>, <Standardavvikelse>, <Variabelvärde> ]\n[ <Medel>, <Standardavvikelse>, x, <sant | falskt (kumulativ eller ej)> ]
+Logistic=LogisticFördelning
+Logistic.Syntax=[ <Medel>, <Skala>, x ]\n[ <Medel>, <Skala>, <Variabelvärde> ]\n[ <Medel>, <Skala>, x, <sant | falskt (kumulativ eller ej)> ]
LowerSum=Undersumma
LowerSum.Syntax=[ <Funktion>, <Tal>, <Tal>, <Tal> ]
+MatrixRank=MatrisRang
Max.Syntax=[ <Lista> ]\n[ <Tal>, <Tal> ]
+Maximize=Maximera
+Maximize.Syntax=[ <Beroende variabel>, <Oberoende variabel> ]
Mean=Medelvärde
Mean.Syntax=[ <Lista med tal> ]
MeanX=MedelvärdeX
@@ -171,17 +324,35 @@ Median.Syntax=[ <Lista med punkter> ]
Midpoint=Mittpunkt
Midpoint.Syntax=[ <Sträcka> ]\n[ <Kägelsnitt> ]\n[ <Punkt>, <Punkt> ]
Min.Syntax=[ <Lista> ]\n[ <Tal>, <Tal> ]
+Minimize=Minimera
+Minimize.Syntax=[ <Beroende variabel>, <Oberoende variabel> ]
+MinimumSpanningTree=MinimaltUppspännandeTräd
+MinimumSpanningTree.Syntax=[ <Lista med Punkter> ]
Mirror=Spegla
Mirror.Syntax=[ <Punkt>, <Punkt> ]\n[ <Linje>, <Punkt> ]\n[ <Kägelsnitt>, <Punkt> ]\n[ <Polygon>, <Punkt> ]\n[ <Bild>, <Punkt> ]\n[ <Punkt>, <Linje> ]\n[ <Linje>, <Linje> ]\n[ <Kägelsnitt>, <Linje> ]\n[ <Polygon>, <Linje> ]\n[ <Bild>, <Linje> ]\n[ <Punkt>, <Cirkel> ]
+MixedNumber=BlandadForm
Mod.Syntax=[ <Tal>, <Tal> ]
Mode=Typtal
Mode.Syntax=[ <Lista med tal> ]
+NRoot=NRot
+NSolutions=NLösningar
+NSolve=NLös
Name=Namn
Name.Syntax=[ <Objekt> ]
+NextPrime=NästaPrimtal
Normal=Normalfördelning
-Normal.Syntax=[ <Medelvärde>, <Standardavvikelse>, <Variabelvärde> ]
+Normal.Syntax=[ <Medelvärde>, <Standardavvikelse>, x ]\n[ <Medelvärde>, <Standardavvikelse>, <Variabelvärde> ]\n[ <Medelvärde>, <Standardavvikelse>, x, <sant | falskt (kumulativ eller ej)> ]
+NormalQuantilePlot=NormalKvantileDiagram
+NormalQuantilePlot.Syntax=[ <Lista med rådata> ]
+Numerator=Täljare
+Numerator.Syntax=[ <Funktion> ]
+Numeric=Numerisk
Object=Objekt
Object.Syntax=[ <Namn på objektet som text> ]
+Ordinal=Ordningstal
+Ordinal.Syntax=[ <Heltal> ]
+OrdinalRank=OrdningstalsRang
+OrdinalRank.Syntax=[ <Lista> ]
OrthogonalLine=Normal
OrthogonalLine.Syntax=[ <Punkt>, <Linje> ]\n[ <Punkt>, <Vektor> ]
OrthogonalVector=Normalvektor
@@ -190,54 +361,119 @@ OsculatingCircle=OskulerandeCirkel
OsculatingCircle.Syntax=[ <Punkt>, <Funktion> ]\n[ <Punkt>, <Kurva> ]
PMCC=Korrelation
PMCC.Syntax=[ <Lista med punkter> ]\n[ <Lista med x-koordinater>, <Lista med y-koordinater> ]
+Pan=Panorera
Parabola=Parabel
Parabola.Syntax=[ <Punkt>, <Linje> ]
Parameter.Syntax=[ <Kägelsnitt> ]
+ParseToFunction=TextTillFunktion
+ParseToFunction.Syntax=[ <Funktion>, <Textsträng> ]
+ParseToNumber=TextTillTal
+ParseToNumber.Syntax=[ <Tal>, <Textsträng> ]
+PartialFractions=PartialBråk
+PartialFractions.Syntax=[ <Funktion> ]
+Pascal=PascalFördelning
+Pascal.Syntax=[ <Antal lyckade utfall>, <Sannolikhet att lyckas> ]\n[ <Antal lyckade utfall>, <Sannolikhet att lyckas>, <sant | falskt (kumulativt eller ej)> ]\n[ <Antal lyckade utfall>, <Sannolikhet att lyckas>, <Variabelvärde>, <sant | falskt (kumulativt eller ej)> ]
+PathParameter=GlidarParameter
+PathParameter.Syntax=[ <Punkt på kurva eller rand> ]
+Percentile=Percentil
+Percentile.Syntax=[ <Lista med tal>, <Procent> ]
Perimeter=Omkrets
Perimeter.Syntax=[ <Polygon> ]\n[ <Kägelsnitt> ]
+PlaySound=SpelaLjud
+PlaySound.Syntax=[ <Fil> ]\n[ <Sant | falskt (Spela eller ej)> ]\n[ <Notsekvens>, <Instrument> ]\n[ <Not>, <Längd>, <Instrument> ]\n[ <Funktion>, <Min>, <Max> ]\n[ <Funktion>, <Min>, <Max>, <Samplingshastighet>, <Samplinggsdjup> ]
Point=Punkt
-Point.Syntax=[ <Linje> ]\n[ <Polygon> ]\n[ <Kägelsnitt> ]\n[ <Funktion> ]\n[ <Vektor> ]\n[ <Punkt>, <Vektor> ]
+Point.Syntax=[ <Objekt> ]\n[ <Lista> ]\n[ <Objekt>, <Parameter> ]\n[ <Punkt>, <Vektor> ]
+PointIn=PunktI
+PointList=PunktLista
+PointList.Syntax=[ <Lista> ]
+Poisson=PoissonFördelning
+Poisson.Syntax=[ <Medel> ]\n[ <Medel>, <sant | falskt (kumulativ eller ej)> ]\n[ <Medel>, <Variabelvärde>, <sant | falskt (kumulativ eller ej)> ]
Polar=PolärLinje
Polar.Syntax=[ <Punkt>, <Kägelsnitt> ]
PolyLine=Polygontåg
PolyLine.Syntax=[ <Punkt>, ..., <Punkt> ]
-Polygon.Syntax=[ <Punkt>, ..., <Punkt> ]\n[ <Punkt>, <Punkt>, <Tal> ]
+Polygon.Syntax=[ <Lista med punkter> ]\n[ <Punkt>, ..., <Punkt> ]\n[ <Punkt>, <Punkt>, <Antal hörn> ]
Polynomial=Polynom
Polynomial.Syntax=[ <Funktion> ]\n[ <Lista med punkter> ]
+PreviousPrime=FöregåendePrimtal
+PrimeFactors=Primfaktorer
+PrimeFactors.Syntax=[ <Heltal> ]
Product=Produkt
Product.Syntax=[ <Lista> ]
Q1.Syntax=[ <Lista med tal> ]
Q3.Syntax=[ <Lista med tal> ]
+RSquare=RKvadrat
+RSquare.Syntax=[ <Lista med Punkter>, <Funktion> ]
Radius=Radie
Radius.Syntax=[ <Kägelsnitt> ]
Random=SlumptalMellan
Random.Syntax=[ <Minsta heltal>, <Största heltal> ]
-RandomBinomial=SlumptalBinomial
+RandomBinomial=SlumptalBinomialfördelat
RandomBinomial.Syntax=[ <Antal forsök>, <Sannolikhet> ]
-RandomNormal=SlumptalNormalfördelning
+RandomElement=SlumpElement
+RandomElement.Syntax=[ <Lista> ]
+RandomNormal=SlumptalNormalfördelat
RandomNormal.Syntax=[ <Medelvärde>, <Standardavvikelse> ]
-RandomPoisson=SlumptalPoisson
+RandomPoisson=SlumptalPoissonfördelat
RandomPoisson.Syntax=[ <Medelvärde> ]
+RandomPolynomial=SlumpPolynom
+RandomUniform=SlumpFördelning
+Rationalize=BråkForm
Ray=Stråle
Ray.Syntax=[ <Punkt>, <Punkt> ]\n[ <Punkt>, <Vektor> ]
+Real=Reellt
+RectangleSum=RektangelSumma
+RectangleSum.Syntax=[ <Funktion>, <Från x>, <Till x>, <Antal Rektanglar>, <Startposition för rektangel> ]
+ReducedRowEchelonForm=RadReduceradTrappstegsForm
+ReducedRowEchelonForm.Syntax=[ <Matris> ]
Relation.Syntax=[ <Objekt>, <Objekt> ]
RemoveUndefined=TaBortOdefinierat
RemoveUndefined.Syntax=[ <Lista> ]
+Rename=BytNamn
+Rename.Syntax=[ <Objekt>, <Namn> ]
+ResidualPlot=ResidualDiagram
+ResidualPlot.Syntax=[ <Lista med punkter>, <Funktion> ]
Reverse=Omvänd
Reverse.Syntax=[ <Lista> ]
+RightSide=HögerLed
+RigidPolygon=StelPolygon
+RigidPolygon.Syntax=[ <Fri Punkt>, ..., <Fri Punkt> ]
Root=Rot
-Root.Syntax=[ <Polynom> ]\n[ <Funktion>, <Tal> ]\n[ <Funktion>, <Tal>, <Tal> ]
+Root.Syntax=[ <Polynom> ]\n[ <Funktion>, <Gissning> ]\n[ <Funktion>, <Från>, <Till> ]
+RootList=RotLista
+RootList.Syntax=[ <Lista> ]
+RootMeanSquare=RMS
+RootMeanSquare.Syntax=[ <Lista med tal> ]
+Roots=Rötter
+Roots.Syntax=[ <Funktion>, <Från>, <Till> ]
Rotate=Rotera
Rotate.Syntax=[ <Punkt>, <Vinkel> ]\n[ <Vektor>, <Vinkel> ]\n[ <Linje>, <Vinkel> ]\n[ <Kägelsnitt>, <Vinkel> ]\n[ <Polygon>, <Vinkel> ]\n[ <Bild>, <Vinkel> ]\n[ <Punkt>, <Vinkel>, <Punkt> ]\n[ <Vektor>, <Vinkel>, <Punkt> ]\n[ <Linje>, <Vinkel>, <Punkt> ]\n[ <Kägelsnitt>, <Vinkel>, <Punkt> ]\n[ <Polygon>, <Vinkel>, <Punkt> ]\n[ <Bild>, <Vinkel>, <Punkt> ]
+RotateText=RoteraText
+RotateText.Syntax=[ <Text>, <Vinkel> ]
Row=Rad
Row.Syntax=[ <Kalkylbladsceller> ]
+SD=StandardAvvikelse
SD.Syntax=[ <Lista med tal> ]
+SDX=StandardAvvikelseX
+SDX.Syntax=[ <Lista med Punkter> ]
+SDY=StandardAvvikelseY
+SDY.Syntax=[ <Lista med Punkter> ]
SXX=SXX
SXX.Syntax=[ <Lista med punkter> ]\n[ <Lista med tal>, <Lista med tal> ]
SXY=SXY
SXY.Syntax=[ <Lista med punkter> ]\n[ <Lista med tal>, <Lista med tal> ]
SYY=SYY
-SYY.Syntax=[ <Lista med punkter> ]\n[ <Lista med tal>, <Lista med tal> ]
+SYY.Syntax=[ <Lista med punkter> ]
+Sample=Urval
+Sample.Syntax=[ <Lista>, <Storlek> ]\n[ <Lista>, <Storlek>, <sant | falskt (med återläggning eller ej)> ]
+SampleSD=StandardAvvikelseFörUrval
+SampleSD.Syntax=[ <Lista med tal> ]
+SampleSDX=StandardAvvikelseFörUrvalX
+SampleSDX.Syntax=[ <Lista med punkter> ]
+SampleSDY=StandardAvvikelseFörUrvalY
+SampleSDY.Syntax=[ <Lista med punkter> ]
+SampleVariance=VariansFörUrval
+SampleVariance.Syntax=[ <Lista med tal> ]
SecondAxis=HalvLillaxel
SecondAxis.Syntax=[ <Kägelsnitt> ]
SecondAxisLength=HalvLillaxelLängd
@@ -245,21 +481,104 @@ SecondAxisLength.Syntax=[ <K
Sector=Sektor
Sector.Syntax=[ <Kägelsnitt>, <Punkt>, <Punkt> ]\n[ <Kägelsnitt>, <Tal>, <Tal> ]
Segment.Syntax=[ <Punkt>, <Punkt> ]\n[ <Punkt>, <Tal> ]
+SelectObjects=VäljObjekt
+SelectObjects.Syntax=[ ]\n[ <Objekt>, <Objekt>, ... ]
+SelectedElement=ValtElement
+SelectedElement.Syntax=[ <Lista> ]
+SelectedIndex=ValtIndex
+SelectedIndex.Syntax=[ <Lista> ]
Semicircle=Halvcirkel
Semicircle.Syntax=[ <Punkt>, <Punkt> ]
Sequence=Talföljd
-Sequence.Syntax=[ <Uttryck>, <Variabel>, <Från>, <Till> ]\n[ <Uttryck>, <Variabel>, <Från>, <Till>, <Antal steg> ]
+Sequence.Syntax=[ <Slutvärde> ]\n[ <Uttryck>, <Variabel>, <Från>, <Till> ]\n[ <Uttryck>, <Variabel>, <Från>, <Till>, <Antal steg> ]
+SetActiveView=SättAktivtRitområde
+SetActiveView.Syntax=[ <Visa ritområde 1|2> ]
+SetAxesRatio=SättAxelFörhållande
+SetAxesRatio.Syntax=[ <tal>, <tal> ]
+SetBackgroundColor=SättBakgrundsFärg
+SetBackgroundColor.Syntax=[ <Objekt>, "<Färg>" ]\n[ <Objekt>, <R>, <G>, <B> ]
+SetCaption=SättFörklaring
+SetCaption.Syntax=[ <Objekt>, <Text> ]
+SetColor=SättFärg
+SetColor.Syntax=[ <Objekt>, "<Färg>" ]\n[ <Objekt>, <R>, <G>, <B> ]
+SetConditionToShowObject=SättVillkorAttVisaObjekt
+SetConditionToShowObject.Syntax=[ <Objekt>, <Villkor> ]
+SetCoords=SättKoordinater
+SetCoords.Syntax=[ <Punkt>, <x>, <y> ]
+SetDynamicColor=SättDynamiskFärg
+SetDynamicColor.Syntax=[ <Objekt>, <R>, <G>, <B> ]\n[ <Objekt>, <R>, <G>, <B>, <Opacitet> ]
+SetFilling=SättFigurFyllnad
+SetFilling.Syntax=[ <Objekt>, <Tal> ]
+SetFixed=SättLåsLäge
+SetFixed.Syntax=[ <Objekt>, <sant | falskt (låst eller ej> ]
+SetLabelMode=SättEtikettLäge
+SetLabelMode.Syntax=[ <Objekt>, <Tal> ]
+SetLayer=SättLager
+SetLayer.Syntax=[ <Objekt>, <Lager> ]
+SetLineStyle=SättLinjeStil
+SetLineStyle.Syntax=[ <Linje>, <Tal> ]
+SetLineThickness=SättLinjeTjocklek
+SetLineThickness.Syntax=[ <Linje>, <Tal> ]
+SetPointSize=SättPunktStorlek
+SetPointSize.Syntax=[ <Punkt>, <Tal> ]
+SetPointStyle=SättPunktStil
+SetPointStyle.Syntax=[ <Punkt>, <Tal> ]
+SetTooltipMode=SättTipsLäge
+SetTooltipMode.Syntax=[ <Objekt>, <Tal> ]
+SetValue=SättVärde
+SetValue.Syntax=[ <Boolskt>, <0|1> ]\n[ <Objekt>, <Objekt> ]\n[ <Lista>, <Tal>, <Objekt> ]
+SetVisibleInView=SättSynligIRitområde
+SetVisibleInView.Syntax=[ <Objekt>, <Ritområde 1|2>, <Synligt=Sant Osynligt=Falskt> ]
+Shear=Skjuva
+Shear.Syntax=[ <Objekt>, <Linje>, <Förhållande> ]
+ShortestDistance=KortasteAvstånd
+ShortestDistance.Syntax=[ <Lista med segment>, <Startpunkt>, <Slutpunkt>, <sant | falskt (vägt eller ej)> ]
+ShowLabel=VisaEtikett
+ShowLabel.Syntax=[ <Objekt>, <sant | falskt (visa etikett eller ej> ]
+ShowLayer=VisaLager
+ShowLayer.Syntax=[ <Tal> ]
+Shuffle=Blanda
+Shuffle.Syntax=[ <Lista> ]
SigmaXX.Syntax=[ <Lista med tal> ]\n[ <Lista med punkter> ]
SigmaXY.Syntax=[ <Lista med punkter> ]\n[ <Lista med x-koordinater>, <Lista med y-koordinater> ]
SigmaYY.Syntax=[ <Lista med punkter> ]
Simplify=Förenkla
Simplify.Syntax=[ <Funktion> ]
+Slider=Glidare
+Slider.Syntax=[ <Min>, <Max>, <Steg>, <Fart>, <Bredd>, <sant | falskt (är vinkel eller ej)>, <sant | falskt (Horisontell eller ej)>, <sant | falskt (animeras eller ej)>, <sant | falskt (slumpmässig eller ej)> ]
Slope=Riktningskoefficient
Slope.Syntax=[ <Linje> ]\n[ <Funktion> ]
+SlowPlot=RitaLångsamt
+SlowPlot.Syntax=[ <Funktion> ]
+Solutions=Lösningar
+Solve=Lös
+SolveODE=LösODE
+SolveODE.Syntax=[ <f'(x y)>, <Från x>, <Från y>, <Till x>, <Steglängd> ]\n[ <y'>, <x'>, <Från x>, <Från y>, <Till t>, <Steglängd> ]\n[ <b(x)>, <c(x)>, <f(x)>, <Från x>, <Från y>, <Från y'>, <Till x>, <Steglängd> ]
Sort=Sortera
Sort.Syntax=[ <Lista> ]
+Spearman=SpearmanFördelning
+Spearman.Syntax=[ <Lista med Punkter> ]\n[ <Lista med tal>, <Lista med tal> ]
+StartAnimation=StartaAnimering
+StartAnimation.Syntax=[ ]\n[ <sant | falskt (animering på eller ej)> ]\n[ <Glidare eller punkt>, <Glidare eller punkt>, ... ]\n[ <Glidare eller punkt>, <Glidare eller punkt>, ..., <sant | falskt (animering på eller ej)> ]
+StemPlot=StamBladDiagram
+StemPlot.Syntax=[ <Lista> ]\n[ <Lista>, <-1|0|1 (justering)> ]
+Stretch=Tänj
+Stretch.Syntax=[ <Objekt>, <Vektor> ]\n[ <Objekt>, <Linje>, <Förhållande> ]
+Substitute=Substituera
Sum=Summa
Sum.Syntax=[ <Lista> ]\n[ <Lista>, <Antal element> ]
+SumSquaredErrors=FelensKvadratSumma
+SumSquaredErrors.Syntax=[ <Lista med punkter>, <Funktion> ]
+TDistribution=TFördelning
+TDistribution.Syntax=[ <Antal frihetsgrader>, x ]\n[ <Antal frihetsgrader>, <Variabelvärde> ]\n[ <Antal frihetsgrader>, x, <sant | falskt (kumulativ eller ej)> ]
+TMean2Estimate=TMedel2Väntevärde
+TMean2Estimate.Syntax=[ <Lista med urvalsdata1>, <Lista med urvalsdata2>, <Nivå>, <sant | falskt (poolat eller ej)> ]\n[ <Medel för urval1>, <Standardavvikelse för urval1>, <Urvalsstorlek1>, <Medel för urval2>, <Standardavvikelse för urval2>, <Urvalsstorlek2>, <Nivå>, <sant | falskt (poolat eller ej)> ]
+TMeanEstimate=TMedelVäntevärde
+TMeanEstimate.Syntax=[ <Lista med urvalsdata>, <Nivå> ]\n[ <Medel för urval>, <Standardavvikelse för urval>, <Urvalsstorlek>, <Nivå> ]
+TTest.Syntax=[ <Lista med urvalsdata>, <Hypotetiskt medelvärde>, <"<" | "=" | ">"> ]\n[ <Urvalets medel>, <Urvalets standardavvikelse>, <Urvalsstorlek>, <Hypotesens medelvärde>, <"<" | "=" | ">"> ]
+TTest2.Syntax=[ <Lista med urvalsdata1>, <Lista med urvalsdata2>, <"<" | "=" | ">">, <sant | falskt (poolat eller ej)> ]\n[ <Medel för urval1>, <Standardavvikelse för urval1>, <Urvalsstorlek1>, <Medel för urval2>, <Standardavvikelse för urval2>, <Urvalsstorlek2>, <"<" | "=" | ">">, <sant | falskt (poolat eller ej)> ]
+TTestPaired=TTestParvis
+TTestPaired.Syntax=[ <Lista med urvalsdata1>, <Lista med urvalsdata2>, <"<" | "=" | ">"> ]
TableText=TabellText
TableText.Syntax=[ <Lista>, <Lista>, ... ]\n[ <Lista>, <Lista>, ..., <Justering av text> ]
Take=Välj
@@ -270,28 +589,63 @@ TaylorSeries.Syntax=[ <Funktion>, <x-v
Text.Syntax=[ <Objekt> ]\n[ <Objekt>, <Boolskt värde för substitution av variabler> ]\n[ <Objekt>, <Punkt> ]\n[ <Objekt>, <Punkt>, <Boolskt värde för substitution av variabler> ]
TextToUnicode=TextTilUnicode
TextToUnicode.Syntax=[ <Text> ]
+Textfield=Inmatningsfält
+Textfield.Syntax=[ ]\n[ <Länkat objekt> ]
+TiedRank=OavgjordRankingLista
+TiedRank.Syntax=[ <Lista> ]
+ToComplex=TillRektangulärForm
+ToExponential=TillExponentiellForm
+ToPoint=TillPunktForm
+ToPolar=TillPolärForm
+ToolImage=Ikon
+ToolImage.Syntax=[ <Tal> ]
Translate=Flytta
Translate.Syntax=[ <Punkt>, <Vektor> ]\n[ <Linje>, <Vektor> ]\n[ <Kägelsnitt>, <Vektor> ]\n[ <Funktion>, <Vektor> ]\n[ <Polygon>, <Vektor> ]\n[ <Bild>, <Vektor> ]\n[ <Vektor>, <Vektor> ]
Transpose=Transponera
Transpose.Syntax=[ <Matris> ]
TrapezoidalSum=TrapetsSumma
-TrapezoidalSum.Syntax=[ <Funktion>, <Startvärde för x>, <Sluttvärde för x>, <Antal trapetser> ]
+TrapezoidalSum.Syntax=[ <Funktion>, <Från x>, <Till x>, <Antal trapetser> ]
+TravelingSalesman=HandelsResande
+TravelingSalesman.Syntax=[ <Lista med punkter> ]
+Triangular=TriangulärFördelning
+Triangular.Syntax=[ <Undre gräns>, <Övre gräns>, <Mod>, x ]\n[ <Undre gräns>, <Övre gräns>, <Mod>, <Variabelvärde> ]\n[ <Undre gräns>, <Övre gräns>, <Mod>, x, <sant | falskt (kumulativ eller ej> ]
+TrigCombine=TrigKombinera
+TrigExpand=TrigExpandera
+TrigSimplify=TrigFörenkla
TurningPoint=Inflexionspunkt
TurningPoint.Syntax=[ <Polynom> ]
UnicodeToLetter=UnicodeTillBokstav
UnicodeToLetter.Syntax=[ <Heltal> ]
UnicodeToText=UnicodeTillText
UnicodeToText.Syntax=[ <Lista med heltal> ]
+Uniform=JämnFördelning
+Uniform.Syntax=[ <Undre gräns>, <Övre gräns>, <Mod>, x ]\n[ <Undre gräns>, <Övre gräns>, <Mod>, <Variabelvärde> ]\n[ <Undre gräns>, <Övre gräns>, <Mod>, x, <sant | falskt (kumulativ eller ej> ]
Union.Syntax=[ <Lista>, <Lista> ]
+Unique=UnikaElement
+Unique.Syntax=[ <Lista> ]
UnitOrthogonalVector=EnhetsNormalvektor
-UnitOrthogonalVector.Syntax=[ <Linje> ]\n[ <Vector> ]
+UnitOrthogonalVector.Syntax=[ <Linje> ]\n[ <Segment> ]\n[ <Vektor> ]
UnitVector=Enhetsvektor
UnitVector.Syntax=[ <Vektor> ]\n[ <Linje> ]
+UpdateConstruction=UppdateraKonstruktion
UpperSum=Översumma
UpperSum.Syntax=[ <Funktion>, <Tal>, <Tal>, <Tal> ]
Variance=Varians
Variance.Syntax=[ <Lista med tal> ]
Vector=Vektor
Vector.Syntax=[ <Punkt> ]\n[ <Punkt>, <Punkt> ]
-Vertex=Hörn
-Vertex.Syntax=[ <Kägelsnitt> ]
\ No newline at end of file
+Vertex=VertexPunkter
+Vertex.Syntax=[ <Kägelsnitt> ]\n[ <Polygon> ]\n[ <Polygon>, <Ordningsnummer> ]
+VerticalText=VertikalText
+Voronoi=VoronoiDiagram
+Voronoi.Syntax=[ <Lista med punkter> ]
+Weibull=WeibullFördelning
+Weibull.Syntax=[ <Form>, <Skala>, x ]\n[ <Form>, <Skala>, <Variabelvärde> ]\n[ <Form>, <Skala>, x, <sant | falskt (kumulativ eller ej)> ]
+Zip=KombineraLista
+Zip.Syntax=[ <Uttryck>, <Variabel1>, <Lista1>, <Variabel2>, <Lista2>, ... ]
+Zipf=ZipfFördelning
+Zipf.Syntax=[ <Antal element>, <Exponent> ]\n[ <Antal element>, <Exponent>, <sant | falskt (kumulativ eller ej)> ]\n[ <Antal element>, <Exponent>, <Variabelvärde>, <sant | falskt (kumulativ eller ej)> ]
+ZoomIn=ZoomaIn
+ZoomIn.Syntax=[ <Skalfaktor> ]\n[ <Skalfaktor>, <Centrumpunkt> ]\n[ <Min x>, <Min y>, <Max x>, <Max y> ]
+ZoomOut=ZoomaUt
+ZoomOut.Syntax=[ <Skalfaktor> ]\n[ <Skalfaktor>, <Centrumpunkt> ]
\ No newline at end of file
diff --git a/geogebra/properties/command_tg.properties b/geogebra/properties/command_tg.properties
index e69de29..d024720 100644
--- a/geogebra/properties/command_tg.properties
+++ b/geogebra/properties/command_tg.properties
@@ -0,0 +1,35 @@
+ANOVA.Syntax=[ <\u0422\u0430\u0431\u043b\u0438\u0441\u0430>, <\u0422\u0430\u0431\u043b\u0438\u0441\u0430>, ... ]
+AffineRatio.Syntax=[ <\u041d\u0443\u049b\u0442\u0430>, <\u041d\u0443\u049b\u0442\u0430>, <\u041d\u0443\u049b\u0442\u0430> ]
+Angle=\u041a\u0443\u043d\u04b7
+Angle.Syntax=[ <\u041e\u0431\u044a\u0435\u0447\u0442> ]\n[ <\u0412\u0435\u043a\u0442\u043e\u0440>, <\u0412\u0435\u043a\u0442\u043e\u0440> ]\n[ <\u04b2\u0430\u0442>, <\u04b2\u0430\u0442> ]\n[ <\u041d\u0443\u049b\u0442\u0430>, <Apex>, <\u041d\u0443\u049b\u0442\u0430> ]\n[ <\u041d\u0443\u049b\u0442\u0430>, <Apex>, <\u041a\u0443\u043d\u04b7> ]
+AngularBisector=\u0411\u0438\u0441\u0441\u0435\u043a\u0442\u0440\u0438\u0441\u0430\u0438_\u041a\u0443\u043d\u04b7
+AngularBisector.Syntax=[ <\u0425\u0430\u0442>, <\u0425\u0430\u0442> ]\n[ <\u041d\u0443\u049b\u0442\u0430>, <\u041d\u0443\u049b\u0442\u0430>, <\u041d\u0443\u049b\u0442\u0430> ]
+Append=\u0418\u043b\u043e\u0432\u0430\u0433\u0438
+Append.Syntax=[ <\u0422\u0430\u0431\u043b\u0438\u0441\u0430>, <\u0422\u0430\u0431\u043b\u0438\u0441\u0430> ]\n[ <\u041e\u0431\u044a\u0435\u043a\u0442>, <\u0422\u0430\u0431\u043b\u0438\u0441\u0430> ]
+ApplyMatrix=Apply\u041c\u0430\u0442\u0440\u0438\u0441\u0430
+ApplyMatrix.Syntax=[ <\u041c\u0430\u0442\u0440\u0438\u0441\u0430>, <\u041e\u0431\u044a\u0435\u043a\u0442> ]
+Arc=\u041a\u0430\u043c\u043e\u043d
+Arc.Syntax=[ <\u0414\u0430\u0432\u0440\u0430>, <\u041d\u0443\u049b\u0442\u0430>, <\u041d\u0443\u049b\u0442\u0430> ]\n[ <\u042d\u043b\u043b\u0438\u043f\u0441\u0430>, <\u041d\u0443\u049b\u0442\u0430>, <\u041d\u0443\u049b\u0442\u0430> ]\n[ <\u0414\u0430\u0432\u0440\u0430>, <\u041a\u0438\u043c\u0430\u0442\u0438 \u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438\u043a\u0438>, <\u041a\u0438\u043c\u0430\u0442\u0438 \u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438\u043a\u0438> ]\n[ <\u042d\u043b\u043b\u0438\u043f\u0441\u0430>, <\u041a\u0438\u043c\u0430\u0442\u0438 \u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438\u043a\u0438>, <\u041a\u0438\u043c\u0430\u0442\u0438 \u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438\u043a\u0438> ]
+Area=\u041c\u0430\u0441\u043e\u04b3\u0430\u0442
+Area.Syntax=[ <\u041a\u043e\u043d\u0443\u0441\u0438> ]\n[ <\u0411\u0438\u0441\u0451\u0440\u043a\u0443\u043d\u04b7\u0430> ]\n[ <\u041d\u0443\u049b\u0442\u0430>, ..., <\u041d\u0443\u049b\u0442\u0430> ]
+Asymptote=\u0410\u0441\u0438\u043c\u0442\u043e\u0442
+Asymptote.Syntax=[ <\u041a\u043e\u043d\u0438\u043a> ]\n[ <\u0424\u0443\u043d\u043a\u0441\u0438\u044f> ]\n[ <\u0424\u0443\u043d\u043a\u0441\u0438\u044f\u0438 \u041d\u043e\u043e\u0448\u043a\u0430\u0440> ]
+Binomial=\u041a\u043e\u044d\u0444\u0444\u0438\u0442\u0441\u0435\u043d\u0442\u0438\u0411\u0438\u043d\u043e\u043c
+Binomial.Syntax=[ <\u0410\u0434\u0430\u0434 n>, <\u0410\u0434\u0430\u0434 r> ]
+Cell=\u04b2\u0443\u04b7\u0440\u0430
+Circle=\u0414\u0430\u0432\u0440\u0430
+Circle.Syntax=[ <\u041d\u0443\u049b\u0442\u0430>, <\u0420\u0430\u0434\u0438\u0443\u0441 \u0420\u0430\u043a\u0430\u043c> ]\n[ <\u041d\u0443\u049b\u0442\u0430>, <Segment> ]\n[ <\u041d\u0443\u049b\u0442\u0430>, <\u041d\u0443\u049b\u0442\u0430> ]\n[ <\u041d\u0443\u049b\u0442\u0430>, <\u041d\u0443\u049b\u0442\u0430>, <\u041d\u0443\u049b\u0442\u0430> ]
+CircleArc.Syntax=[ <\u041d\u0443\u049b\u0442\u0430\u0438 \u041c\u043e\u0431\u0430\u0439\u043d\u0438>, <\u041d\u0443\u049b\u0442\u0430>, <\u041d\u0443\u049b\u0442\u0430> ]
+CircleSector.Syntax=[ <\u041d\u0443\u049b\u0442\u0430\u0438 \u041c\u043e\u0431\u0430\u0439\u043d\u0438>, <\u041d\u0443\u049b\u0442\u0430>, <\u041d\u0443\u049b\u0442\u0430> ]
+Coefficients=\u041a\u043e\u044d\u0444\u0444\u0438\u0442\u0441\u0435\u043d\u0442
+Coefficients.Syntax=[ <\u0411\u0438\u0441\u0451\u0440\u0430\u0437\u0430\u0433\u0438> ]\n[ <\u041a\u043e\u043d\u0438\u043a> ]
+Column=\u0421\u0443\u0442\u0443\u043d
+ColumnName=\u041d\u0430\u043c\u0438\u0421\u0443\u0442\u0443\u043d
+ComplexRoot=\u0420\u0435\u0448\u0430\u0438\u041a\u043e\u043c\u043f\u043b\u0435\u043a\u0441\u0438
+ComplexRoot.Syntax=[ <\u0411\u0438\u0441\u0451\u0440\u0430\u0437\u0430\u0433\u0438> ]
+CurveCartesian=\u0425\u0430\u0442\u0438\u041a\u0430\u04b7
+Degree=\u0414\u0430\u0440\u0430\u04b7\u0430
+Delete=\u04b2\u0430\u0442\u0417\u0430\u0434\u0430\u043d
+Denominator=\u041c\u0430\u04b3\u0440\u0430\u04b7
+Denominator.Syntax=[ <\u0424\u0443\u043d\u043a\u0441\u0438\u044f> ]
+Derivative.Syntax=[ <\u0424\u0443\u043d\u043a\u0441\u0438\u044f> ]\n[ <\u04b2\u0430\u0442\u0442\u0438 \u041a\u0430\u04b7\u0430\u043b\u0430> ]\n[ <\u0424\u0443\u043d\u043a\u0441\u0438\u044f>, <\u0410\u0434\u0430\u0434> ]\n[ <\u0424\u0443\u043d\u043a\u0441\u0438\u044f>, <\u0422\u0430\u0433\u0438\u0440\u0451\u0431\u0430\u043d\u0434\u0430> ]\n[ <\u0425\u0430\u0440\u0442\u0442\u0438 \u041a\u0430\u04b7\u0430\u043b\u0430>, <\u0410\u0434\u0430\u0434> ]\n[ <\u0432\u0424\u0443\u043d\u043a\u0441\u0438\u044f>, <\u0430\u0433\u0438\u0440\u0451\u0431\u0430\u043d\u0434\u0430>, <Number> ]
\ No newline at end of file
diff --git a/geogebra/properties/colors_cy.properties b/geogebra/properties/command_tl.properties
similarity index 100%
copy from geogebra/properties/colors_cy.properties
copy to geogebra/properties/command_tl.properties
diff --git a/geogebra/properties/command_tr.properties b/geogebra/properties/command_tr.properties
index b7243f9..a5d1dfe 100644
--- a/geogebra/properties/command_tr.properties
+++ b/geogebra/properties/command_tr.properties
@@ -71,8 +71,6 @@ ColumnName=S
ColumnName.Syntax=[ <Hücre> ]
Command=Komut
CommonDenominator=OrtakPayda
-CompetitionRank=Rank
-CompetitionRank.Syntax=[ <Liste> ]
CompleteSquare=TamKare
CompleteSquare.Syntax=[ <\u0130kinci Derece Fonksiyon> ]
Conic=Konik
@@ -242,8 +240,6 @@ IntersectRegion=B
IntersectRegion.Syntax=[ <Çokgen>, <Çokgen> ]
Intersection=Kesi\u015fim
Intersection.Syntax=[ <Liste>, <Liste> ]
-IntersectionPaths=Kesi\u015fimYollar\u0131
-IntersectionPaths.Syntax=[ <Do\u011fru>, <Çokgen> ]\n[ <Do\u011fru>, <Konik> ]
InverseBinomial=TersBinom
InverseBinomial.Syntax=[ <Deneme Say\u0131s\u0131>, <Olas\u0131l\u0131k Ba\u015far\u0131s\u0131>, <Olas\u0131l\u0131k> ]
InverseCauchy=TersCauchy
@@ -387,7 +383,6 @@ Percentile=Y
Percentile.Syntax=[ <Say\u0131 Listesi>, <Yüzde> ]
Perimeter=Çevre
Perimeter.Syntax=[ <Çokgen> ]\n[ <Konik> ]
-Plane=Düzlem
PlaySound=SesÇal
PlaySound.Syntax=[ <Dosya> ]\n[ <Mant\u0131ksal Çal> ] ]\n[ <Note Sequence>, <Çalg\u0131> ]\n[ <Note>, <Süre>, <Çalg\u0131> ]\n[ <\u0130\u015flev>, <Min De\u011fer>, <Max De\u011fer> ]\n[ <\u0130\u015flev>, <Min De\u011fer>, <Max De\u011fer>, <Örnek H\u0131z>, <Örnek Derinlik> ]
Point=Nokta
diff --git a/geogebra/properties/command_vi.properties b/geogebra/properties/command_vi.properties
index 6722efd..29904dc 100644
--- a/geogebra/properties/command_vi.properties
+++ b/geogebra/properties/command_vi.properties
@@ -72,8 +72,6 @@ ColumnName=TenCot
ColumnName.Syntax=[ <ô b\u1ea3ng tính> ]
Command=CauLenh
CommonDenominator=MauSoChung
-CompetitionRank=Hang
-CompetitionRank.Syntax=[ <danh sách> ]
CompleteSquare=DangToanPhuong
CompleteSquare.Syntax=[ <hàm s\u1ed1 b\u1eadc hai> ]
ComplexRoot=NghiemPhuc
@@ -252,8 +250,6 @@ IntersectRegion=VungGiao
IntersectRegion.Syntax=[ <\u0111a giác>, <\u0111a giác> ]
Intersection=Giao
Intersection.Syntax=[ <danh sách>, <danh sách> ]
-IntersectionPaths=PhanGiao
-IntersectionPaths.Syntax=\n[ <\u0111\u01b0\u1eddng th\u1eb3ng>, <\u0111a giác> ]\n[ <\u0111\u01b0\u1eddng th\u1eb3ng>, <côníc> ]
InverseBinomial=NhiThucDao
InverseBinomial.Syntax=[ <s\u1ed1 phép th\u1eed>, <xác su\u1ea5t thành công>, <xác su\u1ea5t> ]
InverseCauchy=CoSiDao
@@ -401,7 +397,6 @@ Percentile=PhanTram
Percentile.Syntax=[ <danh sách các s\u1ed1>, <ph\u1ea7n tr\u0103m> ]
Perimeter=ChuViDaGiac
Perimeter.Syntax=[ <\u0111a giác> ]\n[ <côníc> ]\n[ <qu\u1ef9 tích> ]
-Plane=MatPhang
PlaySound=AmThanh
PlaySound.Syntax=[ <t\u1eadp tin> ]\n[ <bi\u1ebfn boolean> ]\n[ <dãy n\u1ed1t nh\u1ea1c>, <nh\u1ea1c c\u1ee5> ]\n[ <n\u1ed1t nh\u1ea1c>, <th\u1eddi gian>, <nh\u1ea1c c\u1ee5> ]\n[ <hàm s\u1ed1>, <giá tr\u1ecb nh\u1ecf nh\u1ea5t>, <giá tr\u1ecb l\u1edbn nh\u1ea5t> ]\n[ <hàm s\u1ed1>, <giá tr\u1ecb nh\u1ecf nh\u1ea5t>, <giá tr\u1ecb l\u1edbn nh\u1ea5t>, <t\u1ec9 l\u1ec7 m\u1eabu>, <chi\u1ec1u sâu c\u1ee7a m\u1eabu> ]
Point=Diem
diff --git a/geogebra/properties/error_bg.properties b/geogebra/properties/error_bg.properties
index 5f2a378..bb21d9e 100644
--- a/geogebra/properties/error_bg.properties
+++ b/geogebra/properties/error_bg.properties
@@ -1,12 +1,12 @@
AngleMustBeConstant=\u0412\u0441\u0435\u043a\u0438 \u044a\u0433\u044a\u043b \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0431\u044a\u0434\u0435 \u043a\u043e\u043d\u0441\u0442\u0430\u043d\u0442\u0430.
-AppletWindowClosing=\u041c\u043e\u043b\u044f, \u0437\u0430\u0442\u0432\u043e\u0440\u0435\u0442\u0435 \u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446\u0430 \u0437\u0430 \u0434\u0430 \u0437\u0430\u0442\u0432\u043e\u0440\u0438\u0442\u0435 GeoGebra
-AssignmentDependentToFree=\u0421\u0432\u043e\u0431\u043e\u0434\u043d\u0438\u0442\u0435 \u043e\u0431\u0435\u043a\u0442\u0438 \u043d\u0435 \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0431\u044a\u0434\u0430 \u043f\u0440\u0435\u0437\u0430\u043f\u0438\u0441\u0432\u0430\u043d\u0438 \u0441\u044a\u0441 \u0437\u0430\u0432\u0438\u0441\u0438\u043c\u0438
-AssignmentToDependent=\u0417\u0430\u0432\u0438\u0441\u0438\u043c\u0438\u0442\u0435 \u043e\u0431\u0435\u043a\u0442\u0438 \u043d\u0435 \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0431\u044a\u0434\u0435 \u043f\u0440\u0435\u0437\u0430\u043f\u0438\u0441\u0432\u0430\u043d\u0438
-AssignmentToFixed=\u0424\u0438\u043a\u0441\u0438\u0440\u0430\u043d\u0438\u0442\u0435 \u043e\u0431\u0435\u043a\u0442\u0438 \u043d\u0435 \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0431\u044a\u0434\u0430\u0442 \u043f\u0440\u043e\u043c\u0435\u043d\u044f\u043d\u0438
-CAS.GeneralErrorMessage=\u0421\u044a\u0436\u0430\u043b\u044f\u0432\u0430\u043c, \u0432\u0445\u043e\u0434\u0430 \u043d\u0435 \u0435 \u043f\u0440\u0438\u0435\u043c\u043b\u0438\u0432.
+AppletWindowClosing=\u041c\u043e\u043b\u044f, \u0437\u0430\u0442\u0432\u043e\u0440\u0435\u0442\u0435 \u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446\u0430, \u0437\u0430 \u0434\u0430 \u0437\u0430\u0442\u0432\u043e\u0440\u0438\u0442\u0435 GeoGebra.
+AssignmentDependentToFree=\u0421\u0432\u043e\u0431\u043e\u0434\u043d\u0438\u0442\u0435 \u043e\u0431\u0435\u043a\u0442\u0438 \u043d\u0435 \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0431\u044a\u0434\u0430 \u043f\u0440\u0435\u0437\u0430\u043f\u0438\u0441\u0432\u0430\u043d\u0438 \u0441\u044a\u0441 \u0437\u0430\u0432\u0438\u0441\u0438\u043c\u0438.
+AssignmentToDependent=\u0417\u0430\u0432\u0438\u0441\u0438\u043c\u0438\u0442\u0435 \u043e\u0431\u0435\u043a\u0442\u0438 \u043d\u0435 \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0431\u044a\u0434\u0435 \u043f\u0440\u0435\u0437\u0430\u043f\u0438\u0441\u0432\u0430\u043d\u0438.
+AssignmentToFixed=\u0424\u0438\u043a\u0441\u0438\u0440\u0430\u043d\u0438\u0442\u0435 \u043e\u0431\u0435\u043a\u0442\u0438 \u043d\u0435 \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0431\u044a\u0434\u0430\u0442 \u043f\u0440\u043e\u043c\u0435\u043d\u044f\u043d\u0438.
+CAS.GeneralErrorMessage=\u0421\u044a\u0436\u0430\u043b\u044f\u0432\u0430\u043c, \u0432\u0445\u043e\u0434\u0430 \u043d\u0435 \u0435 \u043f\u0440\u0438\u0435\u043c\u043b\u0438\u0432. \u041c\u043e\u043b\u044f, \u043f\u0440\u043e\u0432\u0435\u0440\u0435\u0442\u0435 \u043f\u0440\u0438 \u0432\u044a\u0432\u0435\u0436\u0434\u0430\u043d\u0435 \u043e\u0442\u043d\u043e\u0432\u043e.
CAS.SelectionStructureError=\u041c\u043e\u043b\u044f, \u043f\u0440\u043e\u0432\u0435\u0440\u0435\u0442\u0435 \u0441\u0440\u0443\u043a\u0442\u0443\u0440\u0430\u0442\u0430 \u043d\u0430 \u0412\u0430\u0448\u0430\u0442\u0430 \u0441\u0435\u043b\u0435\u043a\u0446\u0438\u044f.
-CAS.TimeoutError=\u041a\u0430\u043b\u043a\u0443\u043b\u0430\u0437\u0438\u044f\u0442\u0430 \u043f\u0440\u043e\u0434\u044a\u043b\u0436\u0438 \u0442\u0432\u044a\u0440\u0434\u0435 \u0434\u044a\u043b\u0433\u043e \u0438 \u0431\u0435\u0448\u0435 \u043f\u0440\u0435\u043a\u0440\u0430\u0442\u0435\u043d\u0430.
-ChangeDependent=\u0417\u0430\u0432\u0438\u0441\u0438\u043c\u0438\u0442\u0435 \u043e\u0431\u0435\u043a\u0442\u0438 \u043d\u0435 \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0431\u044a\u0434\u0430\u0442 \u043f\u0440\u043e\u043c\u0435\u043d\u044f\u043d\u0438
+CAS.TimeoutError=\u041f\u0440\u0435\u0441\u043c\u044f\u0442\u0430\u043d\u0435\u0442\u043e \u043f\u0440\u043e\u0434\u044a\u043b\u0436\u0438 \u0442\u0432\u044a\u0440\u0434\u0435 \u0434\u044a\u043b\u0433\u043e \u0438 \u0431\u0435\u0448\u0435 \u043f\u0440\u0435\u043a\u0440\u0430\u0442\u0435\u043d\u0430.
+ChangeDependent=\u0417\u0430\u0432\u0438\u0441\u0438\u043c\u0438\u0442\u0435 \u043e\u0431\u0435\u043a\u0442\u0438 \u043d\u0435 \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0431\u044a\u0434\u0430\u0442 \u043f\u0440\u043e\u043c\u0435\u043d\u044f\u043d\u0438.
CircularDefinition=\u0414\u0435\u0444\u0438\u043d\u0438\u0446\u0438\u044f \u0437\u0430 \u043e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442
CoordinatesMustBeConstant=\u041a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u0438\u0442\u0435 \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0431\u044a\u0434\u0430\u0442 \u043a\u043e\u043d\u0441\u0442\u0430\u043d\u0442\u0438
DivisorMustBeConstant=\u0412\u0441\u0435\u043a\u0438 \u0440\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u0435\u043b \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0431\u044a\u0434\u0435 \u043a\u043e\u043d\u0441\u0442\u0430\u043d\u0442\u0430
@@ -14,7 +14,7 @@ Error=\u0413\u0440\u0435\u0448\u043a\u0430
ExponentMustBeConstant=\u0412\u0441\u044f\u043a\u0430 \u0435\u043a\u0441\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0431\u044a\u0434\u0435 \u043a\u043e\u043d\u0441\u0442\u0430\u043d\u0442\u0430
ExponentMustBeInteger=\u0412\u0441\u044f\u043a\u0430 \u0435\u043a\u0441\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0431\u044a\u0434\u0435 \u0446\u044f\u043b\u043e \u0447\u0438\u0441\u043b\u043e
ExportJarMissing=\u0421\u044a\u0436\u0430\u043b\u044f\u0432\u0430\u043c, geogebra_export.jar \u043b\u0438\u043f\u0441\u0432\u0430 \u0438\u043b\u0438 \u0435 \u043f\u043e\u0432\u0440\u0435\u0434\u0435\u043d.
-FileFormatNewer=\u041c\u043e\u043b\u044f \u0438\u043d\u0441\u0442\u0430\u043b\u0438\u0440\u0430\u0439\u0442\u0435 \u0441\u0438 \u043d\u043e\u0432\u0430\u0442\u0430 \u0432\u0435\u0440\u0441\u0438\u044f \u043d\u0430 GeoGebra
+FileFormatNewer=\u041c\u043e\u043b\u044f \u0438\u043d\u0441\u0442\u0430\u043b\u0438\u0440\u0430\u0439\u0442\u0435 \u0441\u0438 \u043d\u043e\u0432\u0430\u0442\u0430 \u0432\u0435\u0440\u0441\u0438\u044f \u043d\u0430 GeoGebra.\n\u0422\u043e\u0437\u0438 \u0444\u043e\u0440\u043c\u0430\u0442 \u043d\u0435 \u0441\u0435 \u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430.
FileFormatUnknown=\u041d\u0435\u043f\u043e\u0437\u043d\u0430\u0442 \u0444\u0430\u0439\u043b\u043e\u0432 \u0444\u043e\u0440\u043c\u0430\u0442
FileIsTooLarge=\u0424\u0430\u0439\u043b\u044a\u0442 \u0441 \u0434\u0430\u043d\u043d\u0438 \u0435 \u0442\u0432\u044a\u0440\u0434\u0435 \u0433\u043e\u043b\u044f\u043c.
FileNotFound=\u0424\u0430\u0439\u043b\u044a\u0442 \u043d\u0435 \u0435 \u043e\u0442\u043a\u0440\u0438\u0442
diff --git a/geogebra/properties/error_bs.properties b/geogebra/properties/error_bs.properties
index 7a9fc99..b75cd8f 100644
--- a/geogebra/properties/error_bs.properties
+++ b/geogebra/properties/error_bs.properties
@@ -1,41 +1,42 @@
AngleMustBeConstant=Svaka vrijednost veli\u010dine ugla mora biti konstanta.
-AppletWindowClosing=Zatvorite prozor, ukoliko \u017eelite iza\u0107i iz programa.
+AppletWindowClosing=Molimo zatvorite prozor, ukoliko \u017eelite iza\u0107i iz programa.
AssignmentDependentToFree=Nezavisne figure nije mogu\u0107e zamijeniti zavisnim figurama.
AssignmentToDependent=Zavisne figure nije mogu\u0107e zamijeniti.
AssignmentToFixed=Fiksirane figure nije mogu\u0107e mijenjati.
CAS.GeneralErrorMessage=\u017dao nam je, ne\u0161to nije u redu. Molimo provjerite va\u0161 unos.
CAS.SelectionStructureError=Molimo provjerite strukturu va\u0161eg odabira.
+CAS.TimeoutError=Izra\u010dunavanje je predugo i zato je prekinutu
ChangeDependent=Zavisne figure nije mogu\u0107e mijenjati.
-CircularDefinition=Definicija " u krug "
+CircularDefinition=Definicija "u krug"
CoordinatesMustBeConstant=Vrijednosti koordinata moraju biti konstante.
DivisorMustBeConstant=Vrijednost svakog djelitelja mora biti konstanta.
Error=Gre\u0161ka
ExponentMustBeConstant=Vrijednost svakog eksponenta mora biti konstanta.
-ExponentMustBeInteger=Vrijednost svakog eksponenta mora biti prirodan broj.
+ExponentMustBeInteger=Vrijednost svakog eksponenta mora biti cijeli broj.
ExportJarMissing=\u017dao nam je, geogebra_export.jar datoteka ili nedostaje ili korumpirana.
-FileFormatNewer=Instalirajte novu verziju programa GeoGebra.\nOvaj format datoteke vi\u0161e nije podr\u017ean.
+FileFormatNewer=Molimo instalirajte novu verziju programa GeoGebra.\nOvaj format datoteke vi\u0161e nije podr\u017ean.
FileFormatUnknown=Nepoznati format datoteke
FileIsTooLarge=Datoteka je prevelika.
FileNotFound=Datoteku nije mogu\u0107e na\u0107i
-FunctionExpected=Unesite funkciju
+FunctionExpected=Molimo unesite funkciju
HelpNotFound=Datoteku pomo\u0107i nije mogu\u0107e na\u0107i.
IllegalAddition=Nedozvoljeno sabiranje
IllegalArgument=Nedozvoljen argument
IllegalArgumentNumber=Nedozvoljen broj argumenata
IllegalAssignment=Nedozvoljeno prebacivanje
-IllegalBoolean=Nedozvoljene Boolean-ove opeacije
+IllegalBoolean=Nedozvoljene logi\u010dke opeacije
IllegalComparison=Nedozvoljeno pore\u0111enje
-IllegalComplexMultiplication=Nedozvoljeno kompleksno mno\u017eenje
+IllegalComplexMultiplication=Nedozvoljeno mno\u017eenje kompleksnih brojeva
IllegalDivision=Nedozvoljeno dijeljenje
IllegalExponent=Nedozvoljen eksponent
IllegalListOperation=Nedozvoljena lista operacija
IllegalMultiplication=Nedozvoljeno mno\u017eenje
IllegalSubtraction=Nedozvoljeno oduzimanje
IllegalVariable=Nedozvoljena promjenljiva
-IncompleteEquation=Nepotpuna jedna\u010dina:\nUnesite obje strane jedna\u010dine.
-InvalidEquation=Pogre\u0161an unos:\nUnesite linearnu ili kvadratnu jedna\u010dinu po x i y .
-InvalidFunction=Pogre\u0161an unos:\nUnesite eksplicitno zadanu funkciju po x.
-InvalidInequality=Nedozvoljena nejednakost:\nMolimo unesite linearne nejednakosti po x i y.
+IncompleteEquation=Nepotpuna jedna\u010dina:\nMolimo unesite obje strane jedna\u010dine.
+InvalidEquation=Pogre\u0161an unos:\nMolimo unesite polinomnu jedna\u010dinu s x i y .
+InvalidFunction=Pogre\u0161an unos:\nMolimo unesite eksplicitno zadanu funkciju po x.
+InvalidInequality=Nedozvoljena nejednakost:\nMolimo unesite linearne nejedna\u010dine s x i y.
InvalidInput=Pogre\u0161an unos
LengthMustBeConstant=Vrijednost svake du\u017eine mora biti konstanta.
LoadFileFailed=Otvaranje datoteke nije uspjelo.
@@ -43,7 +44,7 @@ NameUsed=Ova oznaka se ve\u0107 koristi .
NumberExpected=Unesite broj
PasteImageFailed=\u017dao nam je, nije mogu\u0107e kopirati iz radne memorije.
RenameFailed=Neuspje\u0161no preimenovanje.
-ReplaceFailed=Neuspje\u0161no redefinisanje.
+ReplaceFailed=Neuspje\u0161no redefiniranje.
SaveFileFailed=Neuspje\u0161no snimanje datoteke.
Tool.CommandNameTaken=Ime naredbe se ve\u0107 koristi za drugi alat .
Tool.CreationFailed=Alat ne mo\u017ee biti kreiran.
@@ -51,7 +52,7 @@ Tool.DeleteUsed=Alat je kori\u0161ten u konstrukciji i ne mo\u017ee biti obrisan
Tool.InputNotNeeded=Ulazna figura nije potrebna.
Tool.OutputNotDependent=Izlazna figura ne zavisi od ulaznih figura.
URLnotFound=Otvaranje URL-a nije uspjelo.
-UndefinedVariable=Nedefinisana promjenljiva
+UndefinedVariable=Nedefinirana promjenljiva
UnknownCommand=Nepoznata naredba
-UnsupportedLAF=Izabrani izgled na va\u0161em ra\u010dunaru nije mogu\u0107.
+UnsupportedLAF=Izabrani izgled na va\u0161em kompjuteru nije mogu\u0107.
VectorExpected=Unesite ta\u010dku ili vektor
\ No newline at end of file
diff --git a/geogebra/properties/error_ca.properties b/geogebra/properties/error_ca.properties
index 77d2765..e096537 100644
--- a/geogebra/properties/error_ca.properties
+++ b/geogebra/properties/error_ca.properties
@@ -5,6 +5,7 @@ AssignmentToDependent=Els objectes dependents no es poden sobreescriure
AssignmentToFixed=Els objectes fixos no es poden modificar
CAS.GeneralErrorMessage=Ho sento, l'entrada no és correcta
CAS.SelectionStructureError=Si us plau, comproveu l'estructura de la vostra selecció.
+CAS.TimeoutError=Els càlculs estan trigant massa i s'han abandonat
ChangeDependent=Els objectes dependents no es poden modificar
CircularDefinition=Definició circular
CoordinatesMustBeConstant=Les coordenades han de ser constants
@@ -34,7 +35,7 @@ IllegalVariable=Variable il
IncompleteEquation=Equació il·legal:\nEntreu el segon membre
InvalidEquation=Equació il·legal:\nEntreu una equació lineal o quadràtica
InvalidFunction=Equació il·legal:\nEntreu una funció explícita en x
-InvalidInequality=Desigualtat no vàlida: si us plau, introduïu una desigualtat lineal en x i y
+InvalidInequality=Desigualtat no vàlida:\nsi us plau, introduïu una desigualtat lineal en x i y
InvalidInput=Entrada no vàlida
LengthMustBeConstant=Les longituds han de ser constants
LoadFileFailed=Error en obrir el fitxer
@@ -43,7 +44,7 @@ NumberExpected=S'esperava un nombre
PasteImageFailed=Ho lamentem, no s'ha pogut enganxar la imatge des del porta-retalls.
RenameFailed=Error en el canvi de nom
ReplaceFailed=Error en la redifinició
-SaveFileFailed=Error al desar el fitxer
+SaveFileFailed=Error en desar el fitxer
Tool.CommandNameTaken=El nom del comandament s'està utilitzant per una altra eina
Tool.CreationFailed=No es pot crear l'eina
Tool.DeleteUsed=S'està fent servir l'eina i no pot ser eliminada
diff --git a/geogebra/properties/error_cs.properties b/geogebra/properties/error_cs.properties
index ae0f8ea..e2f8f5a 100644
--- a/geogebra/properties/error_cs.properties
+++ b/geogebra/properties/error_cs.properties
@@ -5,6 +5,7 @@ AssignmentToDependent=Z
AssignmentToFixed=Upevn\u011bné objekty nesmí být m\u011bn\u011bny
CAS.GeneralErrorMessage=Lituji, vstup není akceptovatelný
CAS.SelectionStructureError=Prosím zkontrolujte strukturu Va\u0161eho výb\u011bru.
+CAS.TimeoutError=Výpo\u010det trval p\u0159íli\u0161 dlouho a byl ukon\u010den
ChangeDependent=Závislé objekty nesmí být m\u011bn\u011bny.
CircularDefinition=Cyklická definice
CoordinatesMustBeConstant=Sou\u0159adnice musí být konstantní.
diff --git a/geogebra/properties/error_el.properties b/geogebra/properties/error_el.properties
index bd52293..38dff79 100644
--- a/geogebra/properties/error_el.properties
+++ b/geogebra/properties/error_el.properties
@@ -1,5 +1,5 @@
AngleMustBeConstant=\u039a\u03ac\u03b8\u03b5 \u03b3\u03c9\u03bd\u03af\u03b1 \u03c0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03b5\u03af\u03bd\u03b1\u03b9 \u03c3\u03c4\u03b1\u03b8\u03b5\u03c1\u03ae
-AppletWindowClosing=\u039a\u03bb\u03b5\u03af\u03c3\u03c4\u03b5 \u03c4\u03bf \u03c0\u03b1\u03c1\u03ac\u03b8\u03c5\u03c1\u03bf \u03c4\u03bf\u03c5 browser \u03b3\u03b9\u03b1 \u03ad\u03be\u03bf\u03b4\u03bf \u03b1\u03c0\u03cc \u03c4\u03b7\u03bd \u03b5\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae GeoGebra
+AppletWindowClosing=\u039a\u03bb\u03b5\u03af\u03c3\u03c4\u03b5 \u03c4\u03bf \u03c0\u03b1\u03c1\u03ac\u03b8\u03c5\u03c1\u03bf \u03c4\u03bf\u03c5 \u03c6\u03c5\u03bb\u03bb\u03bf\u03bc\u03b5\u03c4\u03c1\u03b7\u03c4\u03ae \u03b3\u03b9\u03b1 \u03ad\u03be\u03bf\u03b4\u03bf \u03b1\u03c0\u03cc \u03c4\u03b7\u03bd \u03b5\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae GeoGebra
AssignmentDependentToFree=\u03a4\u03b1 \u03b5\u03bb\u03b5\u03cd\u03b8\u03b5\u03c1\u03b1 \u03b1\u03bd\u03c4\u03b9\u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03b1 \u03b4\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03bf\u03cd\u03bd \u03bd\u03b1 \u03be\u03b1\u03bd\u03b1\u03b3\u03c1\u03b1\u03c6\u03c4\u03bf\u03cd\u03bd \u03c9\u03c2 \u03b5\u03be\u03b1\u03c1\u03c4\u03ce\u03bc\u03b5\u03bd\u03b1
AssignmentToDependent=\u03a4\u03b1 \u03b5\u03be\u03b1\u03c1\u03c4\u03ce\u03bc\u03b5\u03bd\u03b1 \u03b1\u03bd\u03c4\u03b9\u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03b1 \u03b4\u03b5\u03bd \u03be\u03b1\u03bd\u03b1\u03b3\u03c1\u03ac\u03c6\u03bf\u03bd\u03c4\u03b1\u03b9
AssignmentToFixed=\u03a4\u03b1 \u03c3\u03c4\u03b1\u03b8\u03b5\u03c1\u03ac \u03b1\u03bd\u03c4\u03b9\u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03b1 \u03b4\u03b5\u03bd \u03b1\u03bb\u03bb\u03ac\u03b6\u03bf\u03c5\u03bd
diff --git a/geogebra/properties/error_fr.properties b/geogebra/properties/error_fr.properties
index 9d0b3f1..8857e2e 100644
--- a/geogebra/properties/error_fr.properties
+++ b/geogebra/properties/error_fr.properties
@@ -5,6 +5,7 @@ AssignmentToDependent=Les objets d
AssignmentToFixed=Les objets fixes ne peuvent être changés.
CAS.GeneralErrorMessage=Désolé, la saisie n'est pas valide.
CAS.SelectionStructureError=Vérifiez s'il vous plaît la structure de votre sélection
+CAS.TimeoutError=Calcul trop long, a été abandonné
ChangeDependent=Les objets dépendants ne peuvent être changés.
CircularDefinition=Définition circulaire
CoordinatesMustBeConstant=Les coordonnées doivent être constantes.
diff --git a/geogebra/properties/error_gl.properties b/geogebra/properties/error_gl.properties
index 3cd6c66..2cc787b 100644
--- a/geogebra/properties/error_gl.properties
+++ b/geogebra/properties/error_gl.properties
@@ -1,22 +1,25 @@
-AngleMustBeConstant=Todo ángulo debe ser constante.
-AppletWindowClosing=Por favor, peche a xanela do navegador para saír de GeoGebra.
-AssignmentDependentToFree=Os obxectos independentes non poden ser sobrescritos polos obxectos dependentes.
-AssignmentToDependent=Os obxectos dependentes non poden ser sobrescritos.
-AssignmentToFixed=Os obxectos fixos non poder ser modificados.
-CAS.GeneralErrorMessage=Síntoo, a entrada é inadmisible.
-ChangeDependent=Os obxectos dependentes non poden ser modificados.
+AngleMustBeConstant=Os ángulos deben ser constantes
+AppletWindowClosing=Por favor, peche a xanela do navegador para saír de GeoGebra
+AssignmentDependentToFree=Os obxectos libres non poden ser sobrescritos polos obxectos dependentes
+AssignmentToDependent=Os obxectos dependentes non poden ser sobrescritos
+AssignmentToFixed=Os obxectos fixos non poder ser modificados
+CAS.GeneralErrorMessage=Síntoo, a entrada non é válida
+CAS.SelectionStructureError=Por favor, comprobe a estrutura da súa seleción
+CAS.TimeoutError=O cálculo levou demasiado tempo e cancelouse
+ChangeDependent=Os obxectos dependentes non poden ser modificados
CircularDefinition=Definición circular
-CoordinatesMustBeConstant=As coordenadas teñen que ser constantes.
-DivisorMustBeConstant=Todo divisor debe ser constante.
+CoordinatesMustBeConstant=As coordenadas teñen que ser constantes
+DivisorMustBeConstant=Os divisores deben ser constantes
Error=Erro
-ExponentMustBeConstant=Todo expoñente debe ser constante.
-ExponentMustBeInteger=Cada expoñente ten que ser un enteiro.
-ExportJarMissing=Síntoo, o ficheiro geogebra_export.jar está perdido ou é corrupto.
-FileFormatNewer=Por favor, actualice á unha nova versión de GeoGebra.\nEste formato de ficheiro non está soportado.
+ExponentMustBeConstant=Os expoñentes deben ser constantes
+ExponentMustBeInteger=Os expoñentes ten que ser enteiros
+ExportJarMissing=Síntoo, o ficheiro geogebra_export.jar perdeuse ou está corrupto
+FileFormatNewer=Por favor, actualice á unha versión máis nova de GeoGebra\nEste formato de ficheiro non está soportado
FileFormatUnknown=Formato de ficheiro descoñecido
+FileIsTooLarge=O ficheiro de datos é demasiado grande
FileNotFound=Ficheiro non atopado
FunctionExpected=Agardábase unha función
-HelpNotFound=Non se atopou a axuda en liña.
+HelpNotFound=Non se atopou a axuda en liña
IllegalAddition=Adición non admisible
IllegalArgument=Argumento non admisible
IllegalArgumentNumber=Número de argumentos non admisible
@@ -26,28 +29,30 @@ IllegalComparison=Comparaci
IllegalComplexMultiplication=Multiplicación de complexos non admisible
IllegalDivision=División non admisible
IllegalExponent=Expoñente non admisible
+IllegalListOperation=Operación con lista non admisible
IllegalMultiplication=Multiplicación non admisible
-IllegalSubtraction=Subtracción non admisible
+IllegalSubtraction=Substracción non admisible
IllegalVariable=Variable non admisible
-IncompleteEquation=Ecuación incompleta:\nPor favor, introduza ambos termos da ecuación.
-InvalidEquation=Ecuación non válida:\nPor favor, introduza unha ecuación lineal ou cuadrática en x e y.
-InvalidFunction=Función non válida:\nPor favor, introduza unha función explícita en x.
+IncompleteEquation=Ecuación incompleta:\nPor favor, introduza ambos termos da ecuación
+InvalidEquation=Ecuación non válida:\nPor favor, introduza unha ecuación polinomial en x e y.
+InvalidFunction=Función non válida:\nPor favor, introduza unha función explícita en x
+InvalidInequality=Desigualdade non válida:\nPor favor, introduza unha desigualdade lineal en x e y
InvalidInput=Entrada non válida
-LengthMustBeConstant=Toda lonxitud debe ser constante.
+LengthMustBeConstant=As lonxitudes deben ser constantes
LoadFileFailed=Erro ao abrir o ficheiro
-NameUsed=A etiqueta está a ser usada.
+NameUsed=A etiqueta xa está a ser usada
NumberExpected=Agardábase un número
-PasteImageFailed=Síntoo - non é posible pegar o mapa de bits dende o portapapeis.
+PasteImageFailed=Síntoo - non é posible pegar o mapa de bits dende o portapapeis
RenameFailed=Erro ao renomear
ReplaceFailed=Erro ao redefinir
SaveFileFailed=Erro ao gardar o ficheiro
-Tool.CommandNameTaken=O nome do comando está a ser usado por outra ferramenta.
-Tool.CreationFailed=A ferramenta non pode ser creada.
-Tool.DeleteUsed=A ferramenta está a ser empregrada na construción e non se pode eliminar.
-Tool.InputNotNeeded=O obxecto de entrada non é necesario.
-Tool.OutputNotDependent=O obxecto de saída non depende dos obxectos de entrada.
-URLnotFound=Erro ao abrir a URL.
+Tool.CommandNameTaken=O nome do comando xa está a ser usado por outra ferramenta
+Tool.CreationFailed=A ferramenta non pode ser creada
+Tool.DeleteUsed=A ferramenta está a ser empregrada na construción e non se pode eliminar
+Tool.InputNotNeeded=O obxecto de entrada non é necesario
+Tool.OutputNotDependent=O obxecto de saída non depende dos obxectos de entrada
+URLnotFound=Erro ao abrir a URL
UndefinedVariable=Variable indefinida
UnknownCommand=Comando descoñecido
-UnsupportedLAF=A aparencia escollida non está dispoñible no seu ordenador.
-VectorExpected=Agardábase un punto ou un vector.
\ No newline at end of file
+UnsupportedLAF=A aparencia escollida non está dispoñible no seu ordenador
+VectorExpected=Agardábase un punto ou un vector
\ No newline at end of file
diff --git a/geogebra/properties/error_hy.properties b/geogebra/properties/error_hy.properties
new file mode 100644
index 0000000..4f94e88
--- /dev/null
+++ b/geogebra/properties/error_hy.properties
@@ -0,0 +1,58 @@
+AngleMustBeConstant=\u0531\u0576\u056f\u0575\u0578\u0582\u0576\u0568 \u057a\u0565\u057f\u0584 \u0567 \u056c\u056b\u0576\u056b \u0570\u0561\u057d\u057f\u0561\u057f\u0578\u0582\u0576
+AppletWindowClosing=\u0553\u0561\u056f\u0565\u0584 \u056d\u0576\u0564\u0580\u0565\u0574 \u0562\u0580\u0578\u0578\u0582\u0566\u0565\u0580\u056b \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576\u0568, \u0578\u0580\u057a\u056b\u057d\u0566\u056b \u0564\u0578\u0582\u0580\u057d \u0563\u0561\u0584 \u0533\u0565\u0578\u0533\u0565\u0562\u0580\u0561\u0575\u056b\u0581
+AssignmentDependentToFree=\u0531\u0566\u0561\u057f \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u0568 \u0579\u0565\u0576 \u056f\u0561\u0580\u0578\u0572 \u057e\u0565\u0580\u0561\u057d\u0561\u0570\u0574\u0561\u0576\u057e\u0565\u056c \u056f\u0561\u056d\u0575\u0561\u056c\u0576\u0565\u0580\u056b \u0574\u056b\u057b\u0578\u0581\u0578\u057e
+AssignmentToDependent=\u053f\u0561\u056d\u0575\u0561\u056c \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u0568 \u0579\u0565\u0576 \u056f\u0561\u0580\u0578\u0572 \u057e\u0565\u0580\u0561\u057d\u0561\u0570\u0574\u0561\u0576\u057e\u0565\u056c
+AssignmentToFixed=\u0531\u0574\u0580\u0561\u0581\u057e\u0561\u056e \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u0568 \u0579\u0565\u0576 \u056f\u0561\u0580\u0578\u0572 \u0583\u0578\u0583\u0578\u056d\u057e\u0565\u056c
+CAS.GeneralErrorMessage=\u053f\u0576\u0565\u0580\u0565\u0584, \u0574\u0578\u0582\u057f\u0584\u0561\u0563\u0580\u057e\u0561\u056e \u0570\u0580\u0561\u0574\u0561\u0576\u0568 \u0579\u056b \u056f\u0561\u0580\u0578\u0572 \u056f\u0561\u057f\u0561\u0580\u057e\u0565\u056c: \u054d\u0563\u0578\u0582\u0563\u0565\u0584 \u0541\u0565\u0580 \u0574\u0578\u0582\u057f\u0584\u0561\u0563\u0580\u0578\u0582\u0574\u0568
+CAS.SelectionStructureError=\u054d\u057f\u0578\u0582\u0563\u0565\u0584, \u056d\u0576\u0564\u0580\u0565\u0574, \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u056b \u0568\u0576\u057f\u0580\u0574\u0561\u0576 \u056f\u0561\u0580\u0563\u0568
+CAS.TimeoutError=\u0540\u0561\u0577\u057e\u0561\u0580\u056f\u0576\u0565\u0580\u0568 \u0577\u0561\u057f \u0565\u0580\u056f\u0561\u0580 \u056a\u0561\u0574\u0561\u0576\u0561\u056f \u0567\u056b\u0576 \u057a\u0561\u0570\u0561\u0576\u057b\u0578\u0582\u0574 \u0587 \u0568\u0576\u0564\u0570\u0561\u057f\u057e\u0565\u0581\u056b\u0576
+ChangeDependent=\u053f\u0561\u056d\u0575\u0561\u056c \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u0568 \u0579\u0565\u0576 \u056f\u0561\u0580\u0578\u0572 \u0583\u0578\u0583\u0578\u056d\u057e\u0565\u056c
+CircularDefinition=\u0546\u0565\u0580\u0583\u0561\u056f\u057e\u0561\u056e \u057d\u0561\u0570\u0574\u0561\u0576\u0578\u0582\u0574
+CoordinatesMustBeConstant=\u053f\u0578\u0578\u0580\u0564\u056b\u0576\u0561\u057f\u0576\u0565\u0580\u0568 \u057a\u0565\u057f\u0584 \u0567 \u056c\u056b\u0576\u0565\u0576 \u0570\u0561\u057d\u057f\u0561\u057f\u0578\u0582\u0576\u0576\u0565\u0580
+DivisorMustBeConstant=\u0532\u0561\u056a\u0561\u0576\u0561\u0580\u0561\u0580\u0568 \u057a\u0565\u057f\u0584 \u0567 \u056c\u056b\u0576\u056b \u0570\u0561\u057d\u057f\u0561\u057f\u0578\u0582\u0576
+Error=\u054d\u056d\u0561\u056c
+ExponentMustBeConstant=\u0531\u057d\u057f\u056b\u0573\u0561\u0576\u056b \u0581\u0578\u0582\u0581\u056b\u0579\u0568 \u057a\u0565\u057f\u0584 \u0567 \u056c\u056b\u0576\u056b \u0570\u0561\u057d\u057f\u0561\u057f\u0578\u0582\u0576
+ExponentMustBeInteger=\u0531\u057d\u057f\u056b\u0573\u0561\u0576\u056b \u0581\u0578\u0582\u0581\u056b\u0579\u0568 \u057a\u0565\u057f\u0584 \u0567 \u056c\u056b\u0576\u056b \u0561\u0574\u0562\u0578\u0572\u057b
+ExportJarMissing=geogebra_exportjar \u0586\u0561\u0575\u056c\u0568 \u0562\u0561\u0581\u0561\u056f\u0561\u0575\u0578\u0582\u0574 \u0567 \u056f\u0561\u0574 \u057e\u0576\u0561\u057d\u057e\u0561\u056e \u0567
+FileFormatNewer=\u0539\u0561\u0580\u0574\u0561\u0581\u0580\u0565\u0584 \u0533\u0565\u0578\u0533\u0565\u0562\u0580\u0561\u0576 \u0561\u0574\u0565\u0576\u0561\u057e\u0565\u0580\u057b\u056b\u0576 \u057e\u0565\u0580\u057d\u056b\u0561\u0575\u0578\u057e.\n\u054f\u057e\u0575\u0561\u056c \u0586\u0561\u0575\u056c\u056b \u0586\u0578\u0580\u0574\u0561\u057f\u0568 \u0561\u0575\u057d \u057e\u0565\u0580\u057d\u056b\u0561\u0575\u056b \u0570\u0561\u0574\u0561\u0580 \u0579\u0567
+FileFormatUnknown=\u0556\u0561\u0575\u056c\u056b \u0561\u0576\u0570\u0561\u0575\u057f \u0586\u0578\u0580\u0574\u0561\u057f
+FileIsTooLarge=\u054f\u057e\u0575\u0561\u056c\u0576\u0565\u0580\u056b \u0586\u0561\u0575\u056c\u0568 \u0577\u0561\u057f \u0574\u0565\u056e \u0567
+FileNotFound=\u0556\u0561\u0575\u056c\u0568 \u0579\u056b \u0563\u057f\u0576\u057e\u0561\u056e
+FunctionExpected=\u054a\u0561\u0570\u0561\u0576\u057b\u057e\u0578\u0582\u0574 \u0567 \u0586\u0578\u0582\u0576\u056f\u0581\u056b\u0561
+HelpNotFound=\u0549\u0570\u0561\u057b\u0578\u0572\u057e\u0565\u0581 \u0563\u057f\u0576\u0565\u056c online help-\u0568
+IllegalAddition=\u0548\u0579 \u056f\u0578\u057c\u0565\u056f\u057f \u0563\u0578\u0582\u0574\u0561\u0580\u0578\u0582\u0574
+IllegalArgument=\u0548\u0579 \u056f\u0578\u057c\u0565\u056f\u057f \u0561\u0580\u0563\u0578\u0582\u0574\u0565\u0576\u057f
+IllegalArgumentNumber=\u0531\u0580\u0563\u0578\u0582\u0574\u0565\u0576\u057f\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568 \u057d\u056d\u0561\u056c \u0567
+IllegalAssignment=\u0548\u0579 \u056f\u0578\u057c\u0565\u056f\u057f \u057e\u0565\u0580\u0561\u0563\u0580\u0578\u0582\u0574
+IllegalBoolean=\u0548\u0579 \u056f\u0578\u057c\u0565\u056f\u057f \u057f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0563\u0578\u0580\u056e\u0578\u0572\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+IllegalComparison=\u0548\u0579 \u056f\u0578\u057c\u0565\u056f\u057f \u0570\u0561\u0574\u0565\u0574\u0561\u057f\u0578\u0582\u0574
+IllegalComplexMultiplication=\u0548\u0579 \u056f\u0578\u057c\u0565\u056f\u057f \u056f\u0578\u0574\u057a\u056c\u0565\u0584\u057d \u0562\u0561\u0566\u0574\u0561\u057a\u0561\u057f\u056f\u0578\u0582\u0574
+IllegalDivision=\u0548\u0579 \u056f\u0578\u057c\u0565\u056f\u057f \u0562\u0561\u056a\u0561\u0576\u0578\u0582\u0574
+IllegalExponent=\u0548\u0579 \u056f\u0578\u057c\u0565\u056f\u057f \u0561\u057d\u057f\u056b\u0573\u0561\u0576
+IllegalListOperation=\u0533\u0578\u0580\u056e\u0578\u0572\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u056b \u056f\u0561\u0580\u0563\u0568 \u057d\u056d\u0561\u056c \u0567
+IllegalMultiplication=\u0548\u0579 \u056f\u0578\u057c\u0565\u056f\u057f \u0562\u0561\u0566\u0574\u0561\u057a\u0561\u057f\u056f\u0578\u0582\u0574
+IllegalSubtraction=\u0548\u0579 \u056f\u0578\u057c\u0565\u056f\u057f \u0570\u0561\u0576\u0578\u0582\u0574
+IllegalVariable=\u0548\u0579 \u056f\u0578\u057c\u0565\u056f\u057f \u0583\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576
+IncompleteEquation=\u0540\u0561\u057e\u0561\u057d\u0561\u0580\u0578\u0582\u0574\u0568 \u0569\u0565\u0580\u056b \u0567.\n\u0544\u0578\u057f\u0584\u0561\u0563\u0580\u0565\u0584 \u0570\u0561\u057e\u0561\u057d\u0561\u0580\u0574\u0561\u0576 \u0565\u0580\u056f\u0578\u0582 \u056f\u0578\u0572\u0574\u0565\u0580\u0568
+InvalidEquation=\u0548\u0579 \u056f\u0578\u057c\u0565\u056f\u057f \u0570\u0561\u057e\u0561\u057d\u0561\u0580\u0578\u0582\u0574.\n\u0544\u0578\u0582\u057f\u0584\u0561\u0563\u0580\u0565\u0584 \u0562\u0561\u0566\u0574\u0561\u0576\u0564\u0561\u0574\u0561\u0575\u056b\u0576 \u0570\u0561\u057e\u0561\u057d\u0561\u0580\u0578\u0582\u0574 \u056f\u0561\u056d\u057e\u0561\u056e x-\u056b\u0581 \u0578\u0582 y-\u056b\u0581
+InvalidFunction=\u0548\u0579 \u056f\u0578\u057c\u0565\u056f\u057f \u0586\u0578\u0582\u0576\u056f\u0581\u056b\u0561.\n\u0544\u0578\u0582\u057f\u0584\u0561\u0563\u0580\u0565\u0584 x-\u056b\u0581 \u056f\u0561\u056d\u057e\u0561\u056e \u0562\u0561\u0581\u0561\u0570\u0561\u0575\u057f \u0586\u0578\u0582\u0576\u056f\u0581\u056b\u0561
+InvalidInequality=\u0548\u0579 \u056f\u0578\u057c\u0565\u056f\u057f \u0561\u0576\u0570\u0561\u057e\u0561\u057d\u0561\u0580\u0578\u0582\u0574.\n\u0544\u0578\u0582\u057f\u0584\u0561\u0563\u0580\u0565\u0584 x-\u056b\u0581 \u0578\u0582 y-\u056b\u0581 \u056f\u0561\u056d\u057e\u0561\u056e \u0563\u056e\u0561\u0575\u056b\u0576 \u0561\u0576\u0570\u0561\u057e\u0561\u057d\u0561\u0580\u0578\u0582\u0574
+InvalidInput=\u054d\u056d\u0561\u056c \u0574\u0578\u0582\u057f\u0584\u0561\u0563\u0580\u0578\u0582\u0574
+LengthMustBeConstant=\u0535\u0580\u056f\u0561\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568 \u057a\u0565\u057f\u0584 \u0567 \u056c\u056b\u0576\u056b \u0570\u0561\u057d\u057f\u0561\u057f\u0578\u0582\u0576
+LoadFileFailed=\u0549\u0570\u0561\u057b\u0578\u0572\u057e\u0565\u0581 \u0562\u0561\u0581\u0565\u056c \u0586\u0561\u0575\u056c\u0568
+NameUsed=\u0531\u0575\u0564 \u0576\u0577\u0561\u0576\u0561\u056f\u0578\u0582\u0574\u0568 \u0561\u0580\u0564\u0565\u0576 \u0585\u0563\u057f\u0561\u0563\u0578\u0580\u056e\u057e\u0565\u056c \u0567
+NumberExpected=\u054a\u0561\u0570\u0561\u0576\u057b\u057e\u0578\u0582\u0574 \u0567 \u0569\u056b\u057e
+PasteImageFailed=\u0553\u0578\u056d\u0561\u0576\u0561\u056f\u0574\u0561\u0576 \u0562\u0578\u0582\u0586\u0565\u0580\u056b\u0581 \u0576\u056f\u0561\u0580\u0568 \u0576\u0565\u0580\u0574\u0578\u0582\u056e\u0565\u056c \u0579\u0570\u0561\u057b\u0578\u0572\u057e\u0565\u0581
+RenameFailed=\u0549\u057e\u0565\u0580\u0561\u0576\u057e\u0561\u0576\u057e\u0565\u0581
+ReplaceFailed=\u0549\u057e\u0565\u0580\u0561\u057d\u0561\u0570\u0574\u0561\u0576\u057e\u0565\u0581
+SaveFileFailed=\u0556\u0561\u0575\u056c\u0568 \u0579\u057a\u0561\u0570\u057e\u0565\u0581
+Tool.CommandNameTaken=\u0540\u0580\u0561\u0574\u0561\u0576\u056b \u0561\u0576\u0578\u0582\u0576\u0568 \u0561\u0580\u0564\u0565\u0576 \u0585\u0563\u057f\u0561\u0563\u0578\u0580\u056e\u057e\u0578\u0582\u0574 \u0567 \u0578\u0582\u0580\u056b\u0577 \u0563\u0578\u0580\u056e\u056b\u0584\u056b \u0570\u0561\u0574\u0561\u0580
+Tool.CreationFailed=\u0533\u0578\u0580\u056e\u056b\u0584 \u0579\u057d\u057f\u0565\u0572\u056e\u057e\u0565\u0581
+Tool.DeleteUsed=\u0533\u0578\u0580\u056e\u056b\u0584\u0568 \u0585\u0563\u057f\u0561\u0563\u0578\u0580\u056e\u057e\u0578\u0582\u0574 \u0567 \u0563\u056e\u0561\u0563\u0580\u0578\u0582\u0574 \u0587 \u0579\u056b \u056f\u0561\u0580\u0578\u0572 \u057b\u0576\u057b\u057e\u0565\u056c
+Tool.InputNotNeeded=\u0544\u0578\u0582\u057f\u0584\u0561\u0575\u056b\u0576 \u0585\u0562\u0575\u0565\u056f\u057f \u0579\u056b \u057a\u0561\u0570\u0561\u0576\u057b\u057e\u0578\u0582\u0574
+Tool.OutputNotDependent=\u0535\u056c\u0584\u0561\u0575\u056b\u0576 \u0585\u0562\u0575\u0565\u056f\u057f\u0568 \u056f\u0561\u056d\u057e\u0561\u056e \u0579\u0567 \u0574\u0578\u0582\u057f\u0584\u0561\u0575\u056b\u0576\u0576\u0565\u0580\u056b\u0581
+URLnotFound=\u0549\u0570\u0561\u057b\u0578\u0572\u057e\u0565\u0581 \u0562\u0561\u0581\u0565\u056c URL-\u0568
+UndefinedVariable=\u0549\u057d\u0561\u0570\u0574\u0561\u0576\u057e\u0561\u056e \u0583\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576
+UnknownCommand=\u0531\u0576\u0570\u0561\u0575\u057f \u0570\u0580\u0561\u0574\u0561\u0576
+UnsupportedLAF=\u0538\u0576\u057f\u0580\u057e\u0561\u056e \u056b\u0576\u057f\u0565\u0580\u0586\u0565\u0575\u057d\u0568 \u057f\u057e\u0575\u0561\u056c \u0570\u0561\u0574\u0561\u056f\u0561\u0580\u0563\u056b\u0579\u0578\u0582\u0574 \u0570\u0561\u057d\u0561\u0576\u0565\u056c\u056b \u0579\u0567
+VectorExpected=\u0531\u0576\u0570\u0580\u0561\u056a\u0565\u0577\u057f \u0567 \u056f\u0565\u057f \u056f\u0561\u0574 \u057e\u0565\u056f\u057f\u0578\u0580
\ No newline at end of file
diff --git a/geogebra/properties/error_ja.properties b/geogebra/properties/error_ja.properties
index 64f1199..562caf0 100644
--- a/geogebra/properties/error_ja.properties
+++ b/geogebra/properties/error_ja.properties
@@ -1,12 +1,12 @@
AngleMustBeConstant=\u89d2\u5ea6\u306f\u5b9a\u6570\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093
AppletWindowClosing=Geogebra\u3092\u7d42\u4e86\u3059\u308b\u306b\u306f\u30d6\u30e9\u30a6\u30b6\u30a6\u30a3\u30f3\u30c9\u30a6\u3092\u9589\u3058\u3066\u4e0b\u3055\u3044
-AssignmentDependentToFree=\u81ea\u7531\u306a\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306f\u5f93\u5c5e\u6027\u306e\u3042\u308b\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3067\u4e0a\u66f8\u304d\u3067\u304d\u307e\u305b\u3093
-AssignmentToDependent=\u5f93\u5c5e\u6027\u306e\u3042\u308b\u30aa\u30af\u30b8\u30a7\u30af\u30c8\u306f\u4e0a\u66f8\u304d\u3067\u304d\u307e\u305b\u3093
+AssignmentDependentToFree=\u81ea\u7531\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306f\u5f93\u5c5e\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3067\u4e0a\u66f8\u304d\u3067\u304d\u307e\u305b\u3093
+AssignmentToDependent=\u5f93\u5c5e\u30aa\u30af\u30b8\u30a7\u30af\u30c8\u306f\u4e0a\u66f8\u304d\u3067\u304d\u307e\u305b\u3093
AssignmentToFixed=\u56fa\u5b9a\u3055\u308c\u305f\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306f\u5909\u66f4\u3067\u304d\u307e\u305b\u3093
CAS.GeneralErrorMessage=\u3053\u306e\u5165\u529b\u306f\u53d7\u3051\u4ed8\u3051\u3089\u308c\u307e\u305b\u3093
CAS.SelectionStructureError=\u9078\u629e\u7bc4\u56f2\u306e\u69cb\u9020\u3092\u78ba\u8a8d\u3057\u3066\u4e0b\u3055\u3044
CAS.TimeoutError=\u8a08\u7b97\u306b\u6642\u9593\u304c\u304b\u304b\u308a\u3059\u304e\u305f\u305f\u3081\u4e2d\u65ad\u3057\u307e\u3057\u305f
-ChangeDependent=\u5f93\u5c5e\u6027\u306e\u3042\u308b\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306f\u5909\u66f4\u3067\u304d\u307e\u305b\u3093
+ChangeDependent=\u5f93\u5c5e\u6027\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306f\u5909\u66f4\u3067\u304d\u307e\u305b\u3093
CircularDefinition=\u5b9a\u7fa9\u306b\u5faa\u74b0\u304c\u3042\u308a\u307e\u3059
CoordinatesMustBeConstant=\u5ea7\u6a19\u306f\u5b9a\u6570\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093
DivisorMustBeConstant=\u5272\u308b\u6570\u306f\u5b9a\u6570\u3067\u306a\u304f\u3066\u306f\u306a\u308a\u307e\u305b\u3093
diff --git a/geogebra/properties/error_ne.properties b/geogebra/properties/error_ne.properties
index cd5c6f2..acd9b8d 100644
--- a/geogebra/properties/error_ne.properties
+++ b/geogebra/properties/error_ne.properties
@@ -4,8 +4,8 @@ AssignmentDependentToFree=\u0938\u094d\u0935\u0924\u0928\u094d\u0924\u094d\u0930
AssignmentToDependent=\u0906\u0936\u094d\u0930\u0940\u0924 \u0935\u0938\u094d\u0924\u0941\u0939\u0930\u0941\u0926\u094d\u0926\u093e\u0930 \u0913\u092d\u0930\u0930\u093f\u091f\u0928 \u0928\u0939\u0941\u0928\u0938\u0915\u094d\u091b
AssignmentToFixed=\u0928\u093f\u0936\u094d\u091a\u093f\u0924 \u0935\u0938\u094d\u0924\u0941\u0939\u0930\u0941 \u0928\u092c\u0926\u0932\u093f\u0928\u094d \u0938\u0915\u094d\u091b\u0928\u094d
CAS.GeneralErrorMessage=\u0938\u0930\u0940, \u0908\u0928\u092a\u0941\u091f \u0938\u094d\u0935\u0940\u0915\u093e\u0930 \u092d\u090f\u0928
-CAS.SelectionStructureError=Please check the structure of your selection\n\u0915\u0943\u092a\u092f\u093e \u0924\u092a\u093e\u0908\u0915\u094b \u0938\u0902\u0930\u091a\u0928\u093e\u0915\u094b \u091b\u0928\u094b\u091f \u092c\u0926\u0932\u094d\u0928\u0941\u0939\u094b\u0938
-CAS.TimeoutError=Calculation took too long and was aborted\n\u0917\u0923\u0928\u093e \u0905\u0924\u0940 \u0932\u093e\u092e\u094b \u0938\u092e\u092f \u0932\u093e\u0917\u0947\u0915\u094b \u0939\u0941\u0928\u093e\u0932\u0947 \u0930\u0926\u094d\u0926 \u0917\u0930\u093f\u092f\u094b\u0964
+CAS.SelectionStructureError=\u0915\u0943\u092a\u092f\u093e \u0924\u092a\u093e\u0908\u0915\u094b \u0938\u0902\u0930\u091a\u0928\u093e\u0915\u094b \u091b\u0928\u094b\u091f \u092c\u0926\u0932\u094d\u0928\u0941\u0939\u094b\u0938
+CAS.TimeoutError=\u0917\u0923\u0928\u093e \u0905\u0924\u0940 \u0932\u093e\u092e\u094b \u0938\u092e\u092f \u0932\u093e\u0917\u0947\u0915\u094b \u0939\u0941\u0928\u093e\u0932\u0947 \u0930\u0926\u094d\u0926 \u0917\u0930\u093f\u092f\u094b\u0964
ChangeDependent=\u0906\u0936\u094d\u0930\u0940\u0924 \u0935\u0938\u094d\u0924\u0941\u0939\u0930\u0941\u0926\u094d\u0926\u093e\u0930 \u0928\u092c\u0926\u0932\u093f\u0928\u0938\u0915\u094d\u091b\u0928\u094d
CircularDefinition=\u0935\u0943\u0924\u093f\u092f \u092a\u0930\u093f\u092d\u093e\u0937\u093e
CoordinatesMustBeConstant=\u0928\u093f\u0930\u094d\u0926\u0936\u093e\u0902\u0915 \u0928\u093f\u0936\u094d\u091a\u093f\u0924 \u0939\u0941\u0928\u0941\u092a\u0930\u094d\u091b
@@ -16,7 +16,7 @@ ExponentMustBeInteger=\u092a\u094d\u0930\u0924\u094d\u092f\u0947\u0915 \u090f\u0
ExportJarMissing=\u0938\u0930\u093f, \u091c\u093f\u092f\u094b\u091c\u094d\u0930\u0947\u092c\u093e \u0928\u093f\u0930\u094d\u092f\u093e\u0924\u093f\u0924 \u091c\u093e\u0930 \u092b\u093e\u0907\u0932 \u0939\u0930\u093e\u090f \u0935\u093e \u092c\u093f\u0917\u094d\u0930\u0940\u090f
FileFormatNewer=\u0915\u0943\u092a\u092f\u093e \u091c\u093f\u092f\u094b\u091c\u094d\u0930\u0947\u092c\u093e\u0915\u094b \u0928\u092f\u093e\u0902 \u0938\u0902\u0938\u094d\u0915\u0930\u0923 \u0930\u093e\u0916\u094d\u0928\u0942\u0939\u094b\u0938
FileFormatUnknown=\u0905\u091c\u094d\u091e\u093e\u0924 \u0928\u0924\u094d\u0925\u093f \u092b\u0930\u092e\u094d\u092f\u093e\u091f
-FileIsTooLarge=Data file is too large\n\u0921\u093e\u091f\u093e \u092b\u093e\u092f\u0932 \u0927\u0947\u0930\u0948 \u0920\u0941\u0932\u094b \u092d\u092f\u094b
+FileIsTooLarge=\u0921\u093e\u091f\u093e \u092b\u093e\u092f\u0932 \u0927\u0947\u0930\u0948 \u0920\u0941\u0932\u094b \u092d\u092f\u094b
FileNotFound=\u092b\u093e\u0907\u0932 \u092d\u0947\u091f\u093f\u090f\u0928
FunctionExpected=\u0906\u0936\u0924\u093f\u0924 \u092b\u0932\u0928
HelpNotFound=\u0905\u0928\u0932\u093e\u0907\u0928 \u092e\u0926\u094d\u0924 \u092a\u093e\u0909\u0928\u0938\u0915\u093f\u090f\u0928
@@ -29,14 +29,14 @@ IllegalComparison=\u0905\u092c\u0948\u0927\u093e\u0928\u093f\u0915 \u0924\u0941\
IllegalComplexMultiplication=\u0905\u092c\u0948\u0927\u093e\u0928\u093f\u0915 \u092e\u093f\u0936\u094d\u0930\u093f\u0924 \u0917\u0941\u0923\u0928
IllegalDivision=\u0905\u092c\u0948\u0927\u093e\u0928\u093f\u0915 \u092d\u093e\u0917\u093e
IllegalExponent=\u0905\u092c\u0948\u0927\u093e\u0928\u093f\u0915 \u090f\u0915\u094d\u0938\u092a\u094b\u0928\u0947\u0928\u094d\u091f
-IllegalListOperation=Illegal list operation\n\u0905\u092c\u0948\u0927\u093e\u0928\u093f\u0915 \u0938\u0941\u091a\u0940 \u0915\u093e\u092e
+IllegalListOperation=\u0905\u092c\u0948\u0927\u093e\u0928\u093f\u0915 \u0938\u0941\u091a\u0940 \u0915\u093e\u092e
IllegalMultiplication=\u0905\u092c\u0948\u0927\u093e\u0928\u093f\u0915 \u0917\u0941\u0923\u0928
IllegalSubtraction=\u0905\u092c\u0948\u0927\u093e\u0928\u093f\u0915 \u0918\u091f\u093e\u0909
IllegalVariable=x.
IncompleteEquation=\u0905\u092a\u0941\u0930\u094d\u0923 \u0938\u092e\u0940\u0915\u0930\u0923\n\u0915\u0943\u092a\u092f\u093e \u0938\u092e\u0940\u0915\u0930\u0923 \u0926\u0941\u0935\u0948\u0924\u093f\u0930 \u0930\u093e\u0916\u094d\u0928\u0942\u0939\u094b\u0938
InvalidEquation=\u0905\u092c\u0948\u0927\u093e\u0928\u093f\u0915 \u0938\u092e\u0940\u0915\u0930\u0923\n\u0915\u0943\u092a\u092f\u093e x and y \u092e\u093e \u090f\u0915\u092a\u0926\u093f\u092f \u0935\u093e \u0926\u094d\u0935\u093f\u092a\u0926\u093f\u092f.\u0938\u092e\u0940\u0915\u0930\u0923 \u0930\u093e\u0916\u094d\u0928\u0942\u0939\u094b\u0938
InvalidFunction=\u0905\u092c\u0948\u0927\u093e\u0928\u093f\u0915 \u092a\u0932\u0928\n\u0915\u0943\u092a\u092f\u093e x-\u092e\u093e \u090f\u0915\u094d\u0938\u092a\u094d\u0932\u093f\u0938\u093f\u091f \u092b\u0932\u0928 \u0930\u093e\u0916\u094d\u0928\u0939\u094b\u0938
-InvalidInequality=Invalid inequality:\nPlease enter a linear inequality in x and y\n\u0905\u092c\u0948\u0927\u093e\u0928\u093f\u0915 \u0905\u0938\u092e\u0928\u093e\u0924\u093e\n\u0915\u0943\u092a\u092f\u093e x \u0930 y \u0915\u094b \u090f\u0915\u093f\u092f \u0905\u0938\u092e\u093e\u0928\u0924\u093e \u0930\u093e\u0916\u094d\u0928\u0941\u0939\u094b\u0938
+InvalidInequality=\u0905\u092c\u0948\u0927\u093e\u0928\u093f\u0915 \u0905\u0938\u092e\u0928\u093e\u0924\u093e\n\u0915\u0943\u092a\u092f\u093e x \u0930 y \u0915\u094b \u090f\u0915\u093f\u092f \u0905\u0938\u092e\u093e\u0928\u0924\u093e \u0930\u093e\u0916\u094d\u0928\u0941\u0939\u094b\u0938
InvalidInput=\u0905\u092c\u0948\u0927\u093e\u0928\u093f\u0915 \u0908\u0928\u092a\u0941\u091f
LengthMustBeConstant=\u092a\u094d\u0930\u0924\u094d\u092f\u0947\u0915 \u0932\u092e\u094d\u092c\u093e\u0907 \u0928\u093f\u0936\u094d\u091a\u093f\u0924 \u0939\u0928\u0941\u092a\u0930\u094d\u0926\u091b
LoadFileFailed=\u092b\u093e\u0907\u0932 \u0916\u0942\u0932\u094d\u0928\u0938\u0915\u0947\u0928\u094d
diff --git a/geogebra/properties/error_nl.properties b/geogebra/properties/error_nl.properties
index 77b7a81..0012599 100644
--- a/geogebra/properties/error_nl.properties
+++ b/geogebra/properties/error_nl.properties
@@ -4,7 +4,8 @@ AssignmentDependentToFree=Vrije objecten mogen niet worden overschreven door afh
AssignmentToDependent=Afhankelijke objecten mogen niet worden overschreven
AssignmentToFixed=Vaste objecten mogen niet gewijzigd worden
CAS.GeneralErrorMessage=Sorry, de input wordt niet aanvaard
-CAS.SelectionStructureError=Controleer struktuur van selectie
+CAS.SelectionStructureError=Controleer structuur van selectie
+CAS.TimeoutError=Berekening duurde te lang en werd onderbroken
ChangeDependent=Afhankelijke objecten mogen niet gewijzigd worden
CircularDefinition=Cirkeldefinitie
CoordinatesMustBeConstant=De coördinaten moeten constant zijn
diff --git a/geogebra/properties/error_no_NO.properties b/geogebra/properties/error_no_NO.properties
index be170f7..59c1043 100644
--- a/geogebra/properties/error_no_NO.properties
+++ b/geogebra/properties/error_no_NO.properties
@@ -5,6 +5,7 @@ AssignmentToDependent=Avhengige objekt kan ikke overskrives.
AssignmentToFixed=Låste objekt kan ikke forandres.
CAS.GeneralErrorMessage=Det du satte inn ble ikke akseptert.
CAS.SelectionStructureError=Vennligst kontroller oppbyggingen du har valgt.
+CAS.TimeoutError=Utregningen tok for lang tid, og ble avbrutt.
ChangeDependent=Avhengige objekt kan ikke forandres.
CircularDefinition=Definisjonen går i ring.
CoordinatesMustBeConstant=Koordinatene må være konstanter.
diff --git a/geogebra/properties/error_no_NO_NY.properties b/geogebra/properties/error_no_NO_NY.properties
index ee82f28..4fa2e26 100644
--- a/geogebra/properties/error_no_NO_NY.properties
+++ b/geogebra/properties/error_no_NO_NY.properties
@@ -5,6 +5,7 @@ AssignmentToDependent=Avhengige objekt kan ikkje overskrivast.
AssignmentToFixed=Låste objekt kan ikkje endrast.
CAS.GeneralErrorMessage=Det du sette inn blei ikkje akseptert.
CAS.SelectionStructureError=Ver vennleg og kontroller oppbygginga du har valt.
+CAS.TimeoutError=Utrekninga tok for lang tid, og blei avslutta.
ChangeDependent=Avhengige objekt kan ikkje endrast.
CoordinatesMustBeConstant=Koordinatane må vere konstantar.
DivisorMustBeConstant=Divisoren må vere ein konstant.
diff --git a/geogebra/properties/error_pt_PT.properties b/geogebra/properties/error_pt_PT.properties
index b603b49..7be2f3c 100644
--- a/geogebra/properties/error_pt_PT.properties
+++ b/geogebra/properties/error_pt_PT.properties
@@ -15,7 +15,6 @@ FileFormatNewer=Por favor, atualize a sua vers
FileFormatUnknown=O formato deste ficheiro é desconhecido.
FileIsTooLarge=Este ficheiro é muito grande.
FileNotFound=Ficheiro não encontrado.
-FunctionExpected=Entre com uma função.
HelpNotFound=O ficheiro de ajuda online não foi encontrado.
IllegalAddition=Adição inválida.
IllegalArgumentNumber=Número de argumentos inválido.
@@ -28,20 +27,18 @@ IllegalExponent=Expoente inv
IllegalListOperation=Operação com listas inválida.
IllegalSubtraction=Subtração inválida.
IllegalVariable=Variável inválida.
-IncompleteEquation=Equação incompleta:\nPor favor, especifique os dois membros da equação.
-InvalidEquation=Equação inválida:\nPor favor, especifique uma função afim ou quadrática em x e y.
+IncompleteEquation=Equação incompleta:\nPor favor, especifique os dois membros da equação
+InvalidEquation=Equação inválida:\nPor favor, especifique uma função afim ou quadrática em x e y
InvalidFunction=Função inválida:\nPor favor, especifique uma função explícita em x.
-InvalidInequality=Inequação inválida:\nPor favor, especifique uma inequação linear em x e y.
+InvalidInequality=Inequação inválida:\nPor favor, especifique uma inequação linear em x e y
InvalidInput=Entrada inválida.
-LoadFileFailed=Não foi possível abrir o ficheiro.
-NameUsed=Este rótulo já está a ser utilizado.
-NumberExpected=Entre com um número.
-PasteImageFailed=Não pode colar imagens bitmap oriundas da área de transferência.
-RenameFailed=Não foi possível renomear.
-ReplaceFailed=Não foi possível redefinir.
-SaveFileFailed=Não foi possível gravar.
-Tool.CommandNameTaken=O nome do comando está a ser utilizado por outra ferramenta.
-Tool.DeleteUsed=A ferramenta não pode ser apagada porque está a ser utilizada na construção.
+LengthMustBeConstant=Todo comprimento deve ser constante
+LoadFileFailed=Não foi possível abrir o ficheiro
+NameUsed=Este rótulo já está a ser utilizado
+PasteImageFailed=Não pode colar imagens bitmap oriundas da área de transferência
+Tool.CommandNameTaken=O nome do comando está a ser utilizado por outra ferramenta
+Tool.CreationFailed=Não foi possível criar a ferramenta
+Tool.DeleteUsed=A ferramenta não pode ser apagada porque está a ser utilizada na construção
Tool.InputNotNeeded=O objeto inicial não é necessário para criar a ferramenta
Tool.OutputNotDependent=O objeto final não depende dos objetos iniciais
URLnotFound=Não foi possível abrir este endereço URL
diff --git a/geogebra/properties/error_sk.properties b/geogebra/properties/error_sk.properties
index 7844c74..2b0f69e 100644
--- a/geogebra/properties/error_sk.properties
+++ b/geogebra/properties/error_sk.properties
@@ -1,18 +1,18 @@
-AngleMustBeConstant=Ka\u017edý uhol musíby\u0165 kon\u0161tantou
+AngleMustBeConstant=Ka\u017edý uhol musí by\u0165 kon\u0161tantou
AppletWindowClosing=Pre ukon\u010denie programu GeoGebra zavrite okno prehliada\u010da
AssignmentDependentToFree=Volné objekty nie je mo\u017ené prepísa\u0165 závislými
AssignmentToDependent=Závislé objekty nie je mo\u017ené prepísa\u0165
AssignmentToFixed=Fixované objekty nie je mo\u017ené zmeni\u0165
-CAS.GeneralErrorMessage=Prepá\u010dte, vstupné údaje nie sú akceptovatelné.
-CAS.SelectionStructureError=Skontrolujte prosím \u0161truktúru Vá\u0161ho výberu.
+CAS.GeneralErrorMessage=Prepá\u010dte, vstupné údaje nie sú akceptovatelné!
+CAS.SelectionStructureError=Skontrolujte prosím \u0161truktúru Vá\u0161ho výberu!
CAS.TimeoutError=Výpo\u010det trval prílis dlho a preto bol zru\u0161ený
ChangeDependent=Závislé objekty nie je mo\u017ené zmeni\u0165
CircularDefinition=Cyklická definícia
CoordinatesMustBeConstant=Súradnice musia by\u0165 kon\u0161tantné hodnoty
DivisorMustBeConstant=Ka\u017edý delitel musí by\u0165 kon\u0161tantou
Error=Chyba
-ExponentMustBeConstant=Ka\u017edý mocnite\u013e musíby\u0165 konstantný
-ExponentMustBeInteger=Ka\u017edý mocnite\u013e musíby\u0165 prírodzené \u010díslo
+ExponentMustBeConstant=Ka\u017edý mocnite\u013e musí by\u0165 konstantný
+ExponentMustBeInteger=Ka\u017edý mocnite\u013e musí by\u0165 prírodzené \u010díslo
ExportJarMissing=Prepá\u010dte, súbor geogebra_export.jar chýba alebo je po\u0161kodený.
FileFormatNewer=Aktualizujte GeoGebru nov\u0161ou verziou.\nTento formát súboru nie je podporovaný.
FileFormatUnknown=Neznámy formát súboru
@@ -24,9 +24,9 @@ IllegalAddition=Nepr
IllegalArgument=Neprípustný argument
IllegalArgumentNumber=Neprípustný po\u010det argumentov
IllegalAssignment=Neprípustné priradenie
-IllegalBoolean=Neprípustný boolovská operácia
+IllegalBoolean=Neprípustná boolovská operácia
IllegalComparison=Neprípustné porovnanie
-IllegalComplexMultiplication=Illegálna komplexné násobenie
+IllegalComplexMultiplication=Illegálne komplexné násobenie
IllegalDivision=Neprístupné delenie
IllegalExponent=Neprístupný mocnite\u013e
IllegalListOperation=Nelegálne zoznamová operácia
diff --git a/geogebra/properties/error_sv.properties b/geogebra/properties/error_sv.properties
index 576ecc4..3fe3d54 100644
--- a/geogebra/properties/error_sv.properties
+++ b/geogebra/properties/error_sv.properties
@@ -4,6 +4,8 @@ AssignmentDependentToFree=Fria objekt kan inte skrivas
AssignmentToDependent=Beroende objekt kan inte skrivas över
AssignmentToFixed=Fixerat objekt kan inte ändras
CAS.GeneralErrorMessage=Beklagar, men inmatningen är inte godkänd
+CAS.SelectionStructureError=Kontrollera strukturen för ditt urval
+CAS.TimeoutError=Beräkningen tog för lång tid och avbröts
ChangeDependent=Beroende objekt kan inte ändras
CircularDefinition=Cirkulär definition
CoordinatesMustBeConstant=Koordinaterna måste vara konstanta
@@ -14,6 +16,7 @@ ExponentMustBeInteger=Varje exponent m
ExportJarMissing=Beklagar, men filen geogebra_export.jar saknas eller är felaktig
FileFormatNewer=Var god och uppgradera GeoGebra till en nyare version\nDetta filformat stöds ej
FileFormatUnknown=Okänt filformat
+FileIsTooLarge=Datafilen är för stor
FileNotFound=Filen kunde inte hittas
FunctionExpected=En funktion förväntades
HelpNotFound=Kunde inte hitta hjälp på nätet
@@ -21,17 +24,19 @@ IllegalAddition=Otill
IllegalArgument=Otillåtet argument
IllegalArgumentNumber=Otillåtet antal argument
IllegalAssignment=Otillåten tilldelning
-IllegalBoolean=Otillåtet booleskt uttryck
+IllegalBoolean=Otillåtet logiskt (booleskt) uttryck
IllegalComparison=Otillåten jämförelse
IllegalComplexMultiplication=Otillåten komplex multiplikation
IllegalDivision=Otillåten division
IllegalExponent=Otillåten exponent
+IllegalListOperation=Otillåten operation för listor
IllegalMultiplication=Otillåten multiplikation
IllegalSubtraction=Otillåten subtraktion
IllegalVariable=Otillåten variabel
IncompleteEquation=Ekvationen är inte fullständig:\nVar god och ange båda sidorna av ekvationen
InvalidEquation=Ogiltig ekvation:\nVar god och ange en linjär eller kvadratisk ekvation i x och y
InvalidFunction=Ogiltig funktion:\nVar god och ange en explicit funktion av x
+InvalidInequality=Otillåten olikhet:\nMata in en linjär olikhet uttryckt i x och y
InvalidInput=Ogiltiga indata
LengthMustBeConstant=Varje längd måste vara konstant
LoadFileFailed=Kunde inte öppna filen
diff --git a/geogebra/properties/colors_cy.properties b/geogebra/properties/error_tl.properties
similarity index 100%
copy from geogebra/properties/colors_cy.properties
copy to geogebra/properties/error_tl.properties
diff --git a/geogebra/properties/javaui_bs.properties b/geogebra/properties/javaui_bs.properties
index 4d22625..23efde4 100644
--- a/geogebra/properties/javaui_bs.properties
+++ b/geogebra/properties/javaui_bs.properties
@@ -3,7 +3,7 @@ FileChooser.acceptAllFileFilterText=Sve datoteke
FileChooser.cancelButtonText=Poni\u0161ti
FileChooser.cancelButtonToolTipText=Poni\u0161ti
FileChooser.deleteFileButtonText=Obri\u0161i
-FileChooser.deleteFileButtonToolTipText=Obri\u0161i ozna\u010denu datoteku
+FileChooser.deleteFileButtonToolTipText=Obri\u0161i ozna\u010dene datoteke
FileChooser.detailsViewActionLabelText=Detalji
FileChooser.detailsViewButtonAccessibleName=Detalji
FileChooser.detailsViewButtonToolTipText=Detalji
@@ -13,7 +13,7 @@ FileChooser.directoryOpenButtonToolTipText=Otvori ozna\u010denu datoteku.
FileChooser.directorysavebuttonText=Sa\u010duvaj
FileChooser.directorysavebuttonToolTipText=Sa\u010duvaj direktorij
FileChooser.enterFilenameLabelText=Ime datoteke:
-FileChooser.fileAttrHeaderText=Atributi
+FileChooser.fileAttrHeaderText=Osobine
FileChooser.fileDateHeaderText=Modifikovano
FileChooser.fileNameHeaderText=Ime
FileChooser.fileNameLabelText=Ime datoteke:
@@ -30,11 +30,11 @@ FileChooser.listViewActionLabelText=Lista
FileChooser.listViewButtonAccessibleName=Lista
FileChooser.listViewButtonToolTipText=Lista
FileChooser.lookInLabelText=Vidjeti u:
-FileChooser.newFolderActionLabelText=Nova Mapa
-FileChooser.newFolderButtonText=Nova Mapa
+FileChooser.newFolderActionLabelText=Nova mapa
+FileChooser.newFolderButtonText=Nova mapa
FileChooser.newFolderButtonToolTipText=Kreiraj novu mapu
-FileChooser.newFolderDialogText=Nova Mapa
-FileChooser.newFolderToolTipText=Kreiraj novu Mapu
+FileChooser.newFolderDialogText=Nova mapa
+FileChooser.newFolderToolTipText=Kreiraj novu mapu
FileChooser.openButtonText=Otvori
FileChooser.openButtonToolTipText=Otvori
FileChooser.openDialogTitleText=Otvori
@@ -47,7 +47,7 @@ FileChooser.saveButtonText=Sa\u010duvaj
FileChooser.saveButtonToolTipText=Sa\u010duvaj
FileChooser.saveDialogTitleText=Sa\u010duvaj
FileChooser.saveInLabelText=Sa\u010duvaj u:
-FileChooser.sortMenuLabelText=Uredi Ikone
+FileChooser.sortMenuLabelText=Uredi ikone
FileChooser.upFolderAccessibleName=Gore
FileChooser.upFolderToolTipText=Gore
FileChooser.updateButtonText=Nadogradi
diff --git a/geogebra/properties/javaui_es.properties b/geogebra/properties/javaui_es.properties
index 838d766..de5c7e4 100644
--- a/geogebra/properties/javaui_es.properties
+++ b/geogebra/properties/javaui_es.properties
@@ -16,12 +16,12 @@ FileChooser.enterFilenameLabelText=Nombre del archivo:
FileChooser.fileAttrHeaderText=Atributos
FileChooser.fileDateHeaderText=Modificado
FileChooser.fileNameHeaderText=Nombre
-FileChooser.fileNameLabelText=Nombre del archivo
+FileChooser.fileNameLabelText=Nombre del archivo:
FileChooser.fileSizeHeaderText=Tamaño
FileChooser.fileTypeHeaderText=Tipo
-FileChooser.filesLabelText=Archivos
-FileChooser.filesOfTypeLabelText=Tipos de Archivo
-FileChooser.filterLabelText=Filtro
+FileChooser.filesLabelText=Archivos:
+FileChooser.filesOfTypeLabelText=Tipos de Archivo:
+FileChooser.filterLabelText=Filtro:
FileChooser.foldersLabelText=Carpeta:
FileChooser.helpButtonText=Ayuda
FileChooser.helpButtonToolTipText=Ayuda
@@ -39,7 +39,7 @@ FileChooser.newFolderToolTipText=Crea una Carpeta Nueva
FileChooser.openButtonText=Abre
FileChooser.openButtonToolTipText=Abre
FileChooser.openDialogTitleText=Abre
-FileChooser.pathLabelText=Paso
+FileChooser.pathLabelText=Paso:
FileChooser.refreshActionLabelText=Actualiza
FileChooser.renameFileButtonText=Renombra
FileChooser.renameFileButtonToolTipText=Renombra
diff --git a/geogebra/properties/javaui_gl.properties b/geogebra/properties/javaui_gl.properties
index e69de29..e73ae08 100644
--- a/geogebra/properties/javaui_gl.properties
+++ b/geogebra/properties/javaui_gl.properties
@@ -0,0 +1,56 @@
+FileChooser.FileChooserDetailsText=Detalles
+FileChooser.acceptAllFileFilterText=Todos os arquivos
+FileChooser.cancelButtonText=Cancela
+FileChooser.cancelButtonToolTipText=Cancela
+FileChooser.deleteFileButtonText=Elimina
+FileChooser.deleteFileButtonToolTipText=Elimina o arquivo seleccionado
+FileChooser.detailsViewActionLabelText=Detalles
+FileChooser.detailsViewButtonAccessibleName=Detalles
+FileChooser.detailsViewButtonToolTipText=Detalles
+FileChooser.directoryDescriptionText=Cartafol
+FileChooser.directoryOpenButtonText=Abre
+FileChooser.directoryOpenButtonToolTipText=Abre o arquivo seleccionado
+FileChooser.directorysavebuttonText=Garda
+FileChooser.directorysavebuttonToolTipText=Garda o arquivo
+FileChooser.enterFilenameLabelText=Nome do arquivo:
+FileChooser.fileAttrHeaderText=Atributos
+FileChooser.fileDateHeaderText=Modificado
+FileChooser.fileNameHeaderText=Nome
+FileChooser.fileNameLabelText=Nome do arquivo:
+FileChooser.fileSizeHeaderText=Tamaño
+FileChooser.fileTypeHeaderText=Tipo
+FileChooser.filesLabelText=Arquivos:
+FileChooser.filesOfTypeLabelText=Arquivos do tipo:
+FileChooser.filterLabelText=Filtro:
+FileChooser.foldersLabelText=Cartafol:
+FileChooser.helpButtonText=Axuda
+FileChooser.helpButtonToolTipText=Axuda
+FileChooser.homeFolderAccessibleName=Inicio
+FileChooser.homeFolderToolTipText=Inicio
+FileChooser.listViewActionLabelText=Lista
+FileChooser.listViewButtonAccessibleName=Lista
+FileChooser.listViewButtonToolTipText=Lista
+FileChooser.lookInLabelText=Busca en:
+FileChooser.newFolderActionLabelText=Cartafol novo
+FileChooser.newFolderButtonText=Cartafol novo
+FileChooser.newFolderButtonToolTipText=Crea un cartafol novo
+FileChooser.newFolderDialogText=Cartafol novo
+FileChooser.newFolderToolTipText=Crea un cartafol novo
+FileChooser.openButtonText=Abre
+FileChooser.openButtonToolTipText=Abre
+FileChooser.openDialogTitleText=Abre
+FileChooser.pathLabelText=Ruta:
+FileChooser.refreshActionLabelText=Actualiza
+FileChooser.renameFileButtonText=Renomea
+FileChooser.renameFileButtonToolTipText=Renomea
+FileChooser.renameFileDialogText=Renomea
+FileChooser.saveButtonText=Garda
+FileChooser.saveButtonToolTipText=Garda
+FileChooser.saveDialogTitleText=Garda
+FileChooser.saveInLabelText=Garda en:
+FileChooser.sortMenuLabelText=Ordena íconas por
+FileChooser.upFolderAccessibleName=Ascende
+FileChooser.upFolderToolTipText=Ascende
+FileChooser.updateButtonText=Actualiza
+FileChooser.updateButtonToolTipText=Actualiza
+FileChooser.viewMenuLabelText=Vista
\ No newline at end of file
diff --git a/geogebra/properties/javaui_hy.properties b/geogebra/properties/javaui_hy.properties
new file mode 100644
index 0000000..7ebe07a
--- /dev/null
+++ b/geogebra/properties/javaui_hy.properties
@@ -0,0 +1,56 @@
+FileChooser.FileChooserDetailsText=\u0531\u0572\u0575\u0578\u0582\u057d\u0561\u056f
+FileChooser.acceptAllFileFilterText=\u0532\u0578\u056c\u0578\u0580 \u0586\u0561\u0575\u056c\u0565\u0580\u0568
+FileChooser.cancelButtonText=\u0532\u0561\u0576 \u0579\u0561\u0576\u0565\u0574
+FileChooser.cancelButtonToolTipText=\u0532\u0561\u0576 \u0579\u0561\u0576\u0565\u0574
+FileChooser.deleteFileButtonText=\u054b\u0576\u057b\u0565\u0574
+FileChooser.deleteFileButtonToolTipText=\u054b\u0576\u057b\u0565\u0574 \u0568\u0576\u057f\u0580\u057e\u0561\u056e\u0568
+FileChooser.detailsViewActionLabelText=\u0531\u0572\u0575\u0578\u0582\u057d\u0561\u056f
+FileChooser.detailsViewButtonAccessibleName=\u0531\u0572\u0575\u0578\u0582\u057d\u0561\u056f
+FileChooser.detailsViewButtonToolTipText=\u0531\u0572\u0575\u0578\u0582\u057d\u0561\u056f
+FileChooser.directoryDescriptionText=\u0539\u0572\u0569\u0561\u057a\u0561\u0576\u0561\u056f
+FileChooser.directoryOpenButtonText=\u0532\u0561\u0581\u0565\u0574
+FileChooser.directoryOpenButtonToolTipText=\u0532\u0561\u0581\u0565\u0574 \u0568\u0576\u057f\u0580\u057e\u0561\u056e \u0586\u0561\u0575\u056c\u0568
+FileChooser.directorysavebuttonText=\u054a\u0561\u0570\u0565\u0574
+FileChooser.directorysavebuttonToolTipText=\u054a\u0561\u0570\u0565\u0576\u0574 \u0569\u0572\u0569\u0561\u057a\u0561\u0576\u0561\u056f\u0578\u0582\u0574
+FileChooser.enterFilenameLabelText=\u0556\u0561\u0575\u056c\u056b \u0561\u0576\u0578\u0582\u0576\u0568.
+FileChooser.fileAttrHeaderText=\u0531\u057f\u0580\u056b\u0562\u0578\u0582\u057f\u0576\u0565\u0580
+FileChooser.fileDateHeaderText=\u0553\u0578\u0583\u0578\u056d\u057e\u0561\u056e \u0567
+FileChooser.fileNameHeaderText=\u0531\u0576\u0578\u0582\u0576
+FileChooser.fileNameLabelText=\u0556\u0561\u0575\u056c\u056b \u0561\u0576\u0578\u0582\u0576\u0568.
+FileChooser.fileSizeHeaderText=\u0549\u0561\u0583\u0568
+FileChooser.fileTypeHeaderText=\u054f\u0565\u057d\u0561\u056f\u0568
+FileChooser.filesLabelText=\u0556\u0561\u0575\u056c\u0565\u0580.
+FileChooser.filesOfTypeLabelText=\u0556\u0561\u0575\u056c\u056b \u057f\u0565\u057d\u0561\u056f\u0568.
+FileChooser.filterLabelText=\u0556\u056b\u056c\u057f\u0580.
+FileChooser.foldersLabelText=\u0539\u0572\u0569\u0561\u057a\u0561\u0576\u0561\u056f.
+FileChooser.helpButtonText=\u0555\u0563\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+FileChooser.helpButtonToolTipText=\u0555\u0563\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+FileChooser.homeFolderAccessibleName=\u054f\u0578\u0582\u0576
+FileChooser.homeFolderToolTipText=\u054f\u0578\u0582\u0576
+FileChooser.listViewActionLabelText=\u0551\u0578\u0582\u0581\u0561\u056f
+FileChooser.listViewButtonAccessibleName=\u0551\u0578\u0582\u0581\u0561\u056f
+FileChooser.listViewButtonToolTipText=\u0551\u0578\u0582\u0581\u0561\u056f
+FileChooser.lookInLabelText=\u0546\u0561\u0575\u0565\u0574 \u0569\u0572\u0569\u0561\u057a\u0561\u0576\u0561\u056f\u0578\u0582\u0574
+FileChooser.newFolderActionLabelText=\u0546\u0578\u0580 \u0569\u0572\u0569\u0561\u057a\u0561\u0576\u0561\u056f
+FileChooser.newFolderButtonText=\u0546\u0578\u0580 \u0569\u0572\u0569\u0561\u057a\u0561\u0576\u0561\u056f
+FileChooser.newFolderButtonToolTipText=\u054d\u057f\u0565\u0572\u056e\u0565\u0574 \u0576\u0578\u0580 \u0569\u0572\u0569\u0561\u057a\u0561\u0576\u0561\u056f
+FileChooser.newFolderDialogText=\u0546\u0578\u0580 \u0569\u0572\u0569\u0561\u057a\u0561\u0576\u0561\u056f
+FileChooser.newFolderToolTipText=\u054d\u057f\u0565\u0572\u056e\u0565\u0574 \u0576\u0578\u0580 \u0569\u0572\u0569\u0561\u057a\u0561\u0576\u0561\u056f
+FileChooser.openButtonText=\u0532\u0561\u0581\u0565\u0574
+FileChooser.openButtonToolTipText=\u0532\u0561\u0581\u0565\u0574
+FileChooser.openDialogTitleText=\u0532\u0561\u0581\u0565\u0574
+FileChooser.pathLabelText=\u0540\u0565\u057f\u0561\u0563\u056b\u056e
+FileChooser.refreshActionLabelText=\u0539\u0561\u0580\u0574\u0561\u0581\u0576\u0565\u0574
+FileChooser.renameFileButtonText=\u054e\u0565\u0561\u0576\u057e\u0561\u0576\u0565\u0574
+FileChooser.renameFileButtonToolTipText=\u054e\u0565\u0561\u0576\u057e\u0561\u0576\u0565\u0574
+FileChooser.renameFileDialogText=\u054e\u0565\u0580\u0561\u0576\u057e\u0561\u0576\u0565\u0574
+FileChooser.saveButtonText=\u054a\u0561\u0570\u0565\u0574
+FileChooser.saveButtonToolTipText=\u054a\u0561\u0570\u0565\u0574
+FileChooser.saveDialogTitleText=\u054a\u0561\u0570\u0565\u0574
+FileChooser.saveInLabelText=\u054a\u0561\u0570\u0565\u0574 \u0569\u0572\u0569\u0561\u057a\u0561\u0576\u0561\u056f\u0578\u0582\u0574
+FileChooser.sortMenuLabelText=\u054f\u0565\u057d\u0561\u056f\u0561\u057e\u0578\u0580\u0565\u0574 \u0568\u057d\u057f
+FileChooser.upFolderAccessibleName=\u054e\u0565\u0580\u0587
+FileChooser.upFolderToolTipText=\u054e\u0565\u0580\u0587
+FileChooser.updateButtonText=\u0539\u0561\u0580\u0574\u0561\u0581\u0576\u0565\u0574
+FileChooser.updateButtonToolTipText=\u0539\u0561\u0580\u0574\u0561\u0581\u0576\u0565\u0574
+FileChooser.viewMenuLabelText=\u054f\u0565\u057d\u0584
\ No newline at end of file
diff --git a/geogebra/properties/javaui_ji.properties b/geogebra/properties/javaui_ji.properties
index 87d0cea..2d70b27 100644
--- a/geogebra/properties/javaui_ji.properties
+++ b/geogebra/properties/javaui_ji.properties
@@ -3,13 +3,13 @@ FileChooser.acceptAllFileFilterText=\u05d0\u05b7\u05dc\u05e2 \u05d8\u05e2\u05e7\
FileChooser.cancelButtonText=\u05d0\u05b8\u05e4\u05bc\u05e8\u05d5\u05e4\u05bf\u05df
FileChooser.cancelButtonToolTipText=\u05d0\u05b8\u05e4\u05bc\u05e8\u05d5\u05e4\u05bf\u05df
FileChooser.deleteFileButtonText=\u05d0\u05d5\u05d9\u05e1\u05de\u05e2\u05e7\u05df
-FileChooser.deleteFileButtonToolTipText=\u05d0\u05d5\u05d9\u05e1\u05de\u05e2\u05e7\u05df \u05d3\u05d9 \u05d0\u05b8\u05e0\u05d2\u05e2\u05d5\u05d5\u05d9\u05d6\u05e2\u05e0\u05e2 \u05d8\u05e2\u05e7\u05e2
+FileChooser.deleteFileButtonToolTipText=\u05d0\u05d5\u05d9\u05e1\u05de\u05e2\u05e7\u05df \u05d3\u05d9 \u05d0\u05d5\u05d9\u05e1\u05d2\u05e2\u05d8\u05d9\u05d9\u05dc\u05d8\u05e2 \u05d8\u05e2\u05e7\u05e2
FileChooser.detailsViewActionLabelText=\u05e4\u05bc\u05e8\u05d8\u05d9\u05dd
FileChooser.detailsViewButtonAccessibleName=\u05e4\u05bc\u05e8\u05d8\u05d9\u05dd
FileChooser.detailsViewButtonToolTipText=\u05e4\u05bc\u05e8\u05d8\u05d9\u05dd
FileChooser.directoryDescriptionText=\u05e4\u05bc\u05d0\u05b7\u05e4\u05bc\u05e7\u05e2
FileChooser.directoryOpenButtonText=\u05e2\u05e4\u05bf\u05e2\u05e0\u05e2\u05df
-FileChooser.directoryOpenButtonToolTipText=\u05e2\u05e4\u05bf\u05e2\u05e0\u05e2\u05df \u05d3\u05d9 \u05d0\u05b8\u05e0\u05d2\u05e2\u05d5\u05d5\u05d9\u05d6\u05e2\u05e0\u05e2 \u05d8\u05e2\u05e7\u05e2
+FileChooser.directoryOpenButtonToolTipText=\u05e2\u05e4\u05bf\u05e2\u05e0\u05e2\u05df \u05d3\u05d9 \u05d0\u05d5\u05d9\u05e1\u05d2\u05e2\u05d8\u05d9\u05d9\u05dc\u05d8\u05e2 \u05d8\u05e2\u05e7\u05e2
FileChooser.directorysavebuttonText=\u05d0\u05f2\u05b7\u05e0\u05d4\u05d9\u05d8\u05df
FileChooser.directorysavebuttonToolTipText=\u05d0\u05f2\u05b7\u05e0\u05d4\u05d9\u05d8\u05df \u05d3\u05d9 \u05e4\u05bc\u05d0\u05b7\u05e4\u05bc\u05e7\u05e2
FileChooser.enterFilenameLabelText=\u05d8\u05e2\u05e7\u05e2\u05be\u05e0\u05d0\u05b8\u05de\u05e2\u05df:
diff --git a/geogebra/properties/javaui_ko.properties b/geogebra/properties/javaui_ko.properties
index e69de29..3c44d59 100644
--- a/geogebra/properties/javaui_ko.properties
+++ b/geogebra/properties/javaui_ko.properties
@@ -0,0 +1,55 @@
+FileChooser.FileChooserDetailsText=\uc138\ubd80\uc0ac\ud56d
+FileChooser.acceptAllFileFilterText=\ubaa8\ub4e0 \ud30c\uc77c
+FileChooser.cancelButtonText=\ucde8\uc18c
+FileChooser.cancelButtonToolTipText=\ucde8\uc18c
+FileChooser.deleteFileButtonText=\uc0ad\uc81c
+FileChooser.deleteFileButtonToolTipText=\uc120\ud0dd\ud55c \ud30c\uc77c \uc0ad\uc81c
+FileChooser.detailsViewActionLabelText=\uc138\ubd80\uc0ac\ud56d
+FileChooser.detailsViewButtonAccessibleName=\uc138\ubd80\uc0ac\ud56d
+FileChooser.detailsViewButtonToolTipText=\uc138\ubd80\uc0ac\ud56d
+FileChooser.directoryDescriptionText=\ud3f4\ub354
+FileChooser.directoryOpenButtonText=\uc5f4\uae30
+FileChooser.directoryOpenButtonToolTipText=\uc120\ud0dd\ud55c \ud30c\uc77c \uc5f4\uae30
+FileChooser.directorysavebuttonText=\uc800\uc7a5
+FileChooser.directorysavebuttonToolTipText=\ud3f4\ub354 \uc800\uc7a5
+FileChooser.enterFilenameLabelText=\ud30c\uc77c \uc774\ub984:
+FileChooser.fileAttrHeaderText=\uc18d\uc131
+FileChooser.fileDateHeaderText=\uc218\uc815
+FileChooser.fileNameHeaderText=\uc774\ub984
+FileChooser.fileNameLabelText=\ud30c\uc77c \uc774\ub984:
+FileChooser.fileSizeHeaderText=\ud06c\uae30
+FileChooser.fileTypeHeaderText=\ud0c0\uc785
+FileChooser.filesLabelText=\ud30c\uc77c:
+FileChooser.filesOfTypeLabelText=\ud30c\uc77c \ud0c0\uc785:
+FileChooser.filterLabelText=\ud544\ud130:
+FileChooser.foldersLabelText=\ud3f4\ub354:
+FileChooser.helpButtonText=\ub3c4\uc6c0\ub9d0
+FileChooser.helpButtonToolTipText=\ub3c4\uc6c0\ub9d0
+FileChooser.homeFolderAccessibleName=\ud648
+FileChooser.homeFolderToolTipText=\ud648
+FileChooser.listViewActionLabelText=\ub9ac\uc2a4\ud2b8
+FileChooser.listViewButtonAccessibleName=\ub9ac\uc2a4\ud2b8
+FileChooser.listViewButtonToolTipText=\ub9ac\uc2a4\ud2b8
+FileChooser.newFolderActionLabelText=\uc0c8 \ud3f4\ub354
+FileChooser.newFolderButtonText=\uc0c8 \ud3f4\ub354
+FileChooser.newFolderButtonToolTipText=\uc0c8 \ud3f4\ub354 \ub9cc\ub4e4\uae30
+FileChooser.newFolderDialogText=\uc0c8 \ud3f4\ub354
+FileChooser.newFolderToolTipText=\uc0c8 \ud3f4\ub354 \ub9cc\ub4e4\uae30
+FileChooser.openButtonText=\uc5f4\uae30
+FileChooser.openButtonToolTipText=\uc5f4\uae30
+FileChooser.openDialogTitleText=\uc5f4\uae30
+FileChooser.pathLabelText=\uacbd\ub85c:
+FileChooser.refreshActionLabelText=\uc0c8\ub85c\uace0\uce68
+FileChooser.renameFileButtonText=\ub2e4\ub978 \uc774\ub984\uc73c\ub85c \uc800\uc7a5
+FileChooser.renameFileButtonToolTipText=\ub2e4\ub978 \uc774\ub984\uc73c\ub85c \uc800\uc7a5
+FileChooser.renameFileDialogText=\ub2e4\ub978 \uc774\ub984\uc73c\ub85c \uc800\uc7a5
+FileChooser.saveButtonText=\uc800\uc7a5
+FileChooser.saveButtonToolTipText=\uc800\uc7a5
+FileChooser.saveDialogTitleText=\uc800\uc7a5
+FileChooser.saveInLabelText=\uc800\uc7a5 \uc704\uce58:
+FileChooser.sortMenuLabelText=\uc544\uc774\ucf58 \uc815\ub82c
+FileChooser.upFolderAccessibleName=\uc704
+FileChooser.upFolderToolTipText=\uc704
+FileChooser.updateButtonText=\uc5c5\ub370\uc774\ud2b8
+FileChooser.updateButtonToolTipText=\uc5c5\ub370\uc774\ud2b8
+FileChooser.viewMenuLabelText=\ubcf4\uae30
\ No newline at end of file
diff --git a/geogebra/properties/javaui_nl.properties b/geogebra/properties/javaui_nl.properties
index bfdc49d..1fd1e4f 100644
--- a/geogebra/properties/javaui_nl.properties
+++ b/geogebra/properties/javaui_nl.properties
@@ -3,22 +3,27 @@ FileChooser.cancelButtonText=Annuleer
FileChooser.cancelButtonToolTipText=Annuleer
FileChooser.deleteFileButtonText=Wis
FileChooser.deleteFileButtonToolTipText=Wis het gekozen bestand
+FileChooser.directoryDescriptionText=Map
+FileChooser.directoryOpenButtonToolTipText=Open gekozen bestand
FileChooser.directorysavebuttonText=Opslaan
FileChooser.enterFilenameLabelText=Bestandsnaam:
FileChooser.fileAttrHeaderText=Attributen
FileChooser.fileDateHeaderText=Gewijzigd
FileChooser.fileNameHeaderText=Naam
FileChooser.fileNameLabelText=Bestandsnaam:
+FileChooser.fileSizeHeaderText=Afmeting
FileChooser.filesLabelText=Bestanden:
FileChooser.filesOfTypeLabelText=Bestanden van het type:
FileChooser.listViewActionLabelText=Lijst
FileChooser.listViewButtonAccessibleName=Lijst
FileChooser.listViewButtonToolTipText=Lijst
+FileChooser.lookInLabelText=Zoek in:
FileChooser.newFolderActionLabelText=Nieuwe map
FileChooser.newFolderButtonText=Nieuwe map
FileChooser.newFolderButtonToolTipText=Maak een nieuwe map
FileChooser.newFolderDialogText=Nieuwe map
FileChooser.newFolderToolTipText=Maak een nieuwe map
+FileChooser.pathLabelText=Pad:
FileChooser.refreshActionLabelText=Vernieuw
FileChooser.renameFileButtonText=Hernoem
FileChooser.renameFileButtonToolTipText=Hernoem
@@ -26,4 +31,6 @@ FileChooser.renameFileDialogText=Hernoem
FileChooser.saveButtonText=Opslaan
FileChooser.saveButtonToolTipText=Opslaan
FileChooser.saveDialogTitleText=Opslaan
-FileChooser.saveInLabelText=Opslaan in:
\ No newline at end of file
+FileChooser.saveInLabelText=Opslaan in:
+FileChooser.upFolderAccessibleName=Omhoog
+FileChooser.upFolderToolTipText=Omhoog
\ No newline at end of file
diff --git a/geogebra/properties/javaui_no_NO.properties b/geogebra/properties/javaui_no_NO.properties
index bf31383..04db6f4 100644
--- a/geogebra/properties/javaui_no_NO.properties
+++ b/geogebra/properties/javaui_no_NO.properties
@@ -1,4 +1,4 @@
-FileChooser.FileChooserDetailsText=Detaljar
+FileChooser.FileChooserDetailsText=Detaljer
FileChooser.acceptAllFileFilterText=Alle filer
FileChooser.cancelButtonText=Avbryt
FileChooser.cancelButtonToolTipText=Avbryt
diff --git a/geogebra/properties/javaui_no_NO_NY.properties b/geogebra/properties/javaui_no_NO_NY.properties
index 1396dc9..b963f0f 100644
--- a/geogebra/properties/javaui_no_NO_NY.properties
+++ b/geogebra/properties/javaui_no_NO_NY.properties
@@ -1,3 +1,4 @@
+FileChooser.FileChooserDetailsText=Detaljar
FileChooser.deleteFileButtonToolTipText=Slett den valde fila
FileChooser.detailsViewActionLabelText=Detaljar
FileChooser.detailsViewButtonAccessibleName=Detaljar
diff --git a/geogebra/properties/javaui_pt_PT.properties b/geogebra/properties/javaui_pt_PT.properties
index ad94cfa..7866df8 100644
--- a/geogebra/properties/javaui_pt_PT.properties
+++ b/geogebra/properties/javaui_pt_PT.properties
@@ -1,8 +1,6 @@
FileChooser.acceptAllFileFilterText=Todos os Ficheiros
FileChooser.deleteFileButtonToolTipText=Apagar os ficheiros selecionados
-FileChooser.directoryDescriptionText=Diretório
FileChooser.directoryOpenButtonToolTipText=Abrir o ficheiro selecionado
-FileChooser.directorysavebuttonToolTipText=Gravar diretório
FileChooser.enterFilenameLabelText=Nome do ficheiro:
FileChooser.fileNameLabelText=Nome do ficheiro:
FileChooser.filesLabelText=Ficheiros:
diff --git a/geogebra/properties/javaui_sv.properties b/geogebra/properties/javaui_sv.properties
index e69de29..e3453f5 100644
--- a/geogebra/properties/javaui_sv.properties
+++ b/geogebra/properties/javaui_sv.properties
@@ -0,0 +1,55 @@
+FileChooser.FileChooserDetailsText=Detaljerad lista
+FileChooser.acceptAllFileFilterText=Alla filer
+FileChooser.cancelButtonText=Avbryt
+FileChooser.cancelButtonToolTipText=Avbryt
+FileChooser.deleteFileButtonText=Radera
+FileChooser.deleteFileButtonToolTipText=Radera markerad fil
+FileChooser.detailsViewActionLabelText=Detaljerad lista
+FileChooser.detailsViewButtonAccessibleName=Detaljerad lista
+FileChooser.detailsViewButtonToolTipText=Detaljerad lista
+FileChooser.directoryDescriptionText=Mapp
+FileChooser.directoryOpenButtonText=Öppna
+FileChooser.directoryOpenButtonToolTipText=Öppna markerad fil
+FileChooser.directorysavebuttonText=Spara
+FileChooser.directorysavebuttonToolTipText=Spara mapp
+FileChooser.enterFilenameLabelText=Filnamn:
+FileChooser.fileAttrHeaderText=Egenskaper
+FileChooser.fileDateHeaderText=Ändrad
+FileChooser.fileNameHeaderText=Namn
+FileChooser.fileNameLabelText=Filnamn:
+FileChooser.fileSizeHeaderText=Storlek
+FileChooser.fileTypeHeaderText=Filtyp
+FileChooser.filesLabelText=Filer:
+FileChooser.filesOfTypeLabelText=Filer av typen:
+FileChooser.foldersLabelText=Mapp:
+FileChooser.helpButtonText=Hjälp
+FileChooser.helpButtonToolTipText=Hjälp
+FileChooser.homeFolderAccessibleName=Startkatalog
+FileChooser.homeFolderToolTipText=Startkatalog
+FileChooser.listViewActionLabelText=Lista
+FileChooser.listViewButtonAccessibleName=Lista
+FileChooser.listViewButtonToolTipText=Lista
+FileChooser.lookInLabelText=Leta i:
+FileChooser.newFolderActionLabelText=Ny mapp
+FileChooser.newFolderButtonText=Ny mapp
+FileChooser.newFolderButtonToolTipText=Skapa ny mapp
+FileChooser.newFolderDialogText=Ny mapp
+FileChooser.newFolderToolTipText=Skapa ny mapp
+FileChooser.openButtonText=Öppna
+FileChooser.openButtonToolTipText=Öppna
+FileChooser.openDialogTitleText=Öppna
+FileChooser.pathLabelText=Sökväg:
+FileChooser.refreshActionLabelText=Uppdatera
+FileChooser.renameFileButtonText=Byt namn
+FileChooser.renameFileButtonToolTipText=Byt namn
+FileChooser.renameFileDialogText=Byt namn
+FileChooser.saveButtonText=Spara
+FileChooser.saveButtonToolTipText=Spara
+FileChooser.saveDialogTitleText=Spara
+FileChooser.saveInLabelText=Spara i:
+FileChooser.sortMenuLabelText=Ändra visning
+FileChooser.upFolderAccessibleName=Upp en nivå
+FileChooser.upFolderToolTipText=Upp en nivå
+FileChooser.updateButtonText=Uppdatera
+FileChooser.updateButtonToolTipText=Uppdatera
+FileChooser.viewMenuLabelText=Visa
\ No newline at end of file
diff --git a/geogebra/properties/colors_cy.properties b/geogebra/properties/javaui_tl.properties
similarity index 100%
copy from geogebra/properties/colors_cy.properties
copy to geogebra/properties/javaui_tl.properties
diff --git a/geogebra/properties/menu.properties b/geogebra/properties/menu.properties
index babc34d..5aec233 100644
--- a/geogebra/properties/menu.properties
+++ b/geogebra/properties/menu.properties
@@ -423,8 +423,6 @@ OperationTable=Operation Table
Options=Options
Orthogonal=Perpendicular Line
Orthogonal.Help=Select point and perpendicular line
-OrthogonalPlane=Perpendicular Plane
-OrthogonalPlane.Help=Select point and perpendicular line
Other=Other
OutputObjects=Output Objects
Overlay=Overlay
@@ -437,8 +435,6 @@ Parabola=Parabola
Parabola.Help=Select point and directrix
Parallel=Parallel Line
Parallel.Help=Select point and parallel line
-ParallelPlane=Parallel Plane
-ParallelPlane.Help=Select point and parallel plane
Paste=Paste
PasteDataFromClipboard=Paste Data from Clipboard
PasteSpecial=Paste Special
@@ -452,10 +448,6 @@ Perspective.Primary=Primary
Perspective.TableAndGraphics=Spreadsheet & Graphics
Perspective.Whiteboard=Whiteboard
Perspectives=Perspectives
-PlanePointLine=Plane through a point and a line
-PlanePointLine.Help=Select point and line
-PlaneThreePoint=Plane through three points
-PlaneThreePoint.Help=Select three points
Point=New Point
Point.Help=Click on the Graphics View or on line, function, or curve
PointCapturing=Point Capturing
@@ -479,8 +471,6 @@ Power=Power
Preview=Preview
Print=Print
PrintPreview=Print Preview
-Prism=Prism
-Prism.Help=Select polygon (or points) and first point of the second parallel face
Probability=Probability
ProbabilityCalculator=Probability Calculator
ProbabilityCalculator.Help=Dialog to compute probabilities
@@ -525,8 +515,6 @@ Result=Result
ReturnAngleInverseTrig=Return angle from inverse trigonometric functions
RightAngleStyle=Right Angle Style
RightClassRule=< x \u2264
-RightPrism=Right prism
-RightPrism.Help=Drag polygon, or select polygon and enter altitude
RightProb=Right Sided
RigidPolygon=Rigid Polygon
RigidPolygon.Help=Select all vertices, then click first vertex again
@@ -766,8 +754,6 @@ VectorPolygon=Vector Polygon
VectorPolygon.Help=Select all vertices, then click first vertex again
VerticalScrollbars=Vertical Scrollbars
View=View
-ViewInFrontOf=View in front of
-ViewInFrontOf.Help=Change the view in front of the object clicked
Views=Views
VisualStyle=Visual Style
VisualStyle.Help=Click on objects or drag a rectangle to change their properties
diff --git a/geogebra/properties/menu_ar.properties b/geogebra/properties/menu_ar.properties
index 74a9de2..26d0827 100644
--- a/geogebra/properties/menu_ar.properties
+++ b/geogebra/properties/menu_ar.properties
@@ -383,8 +383,6 @@ OperationTable=\u062c\u062f\u0648\u0644 \u0627\u0644\u0639\u0645\u0644\u064a\u06
Options=\u062e\u064a\u0627\u0631\u0627\u062a
Orthogonal=\u0645\u0633\u062a\u0642\u064a\u0645 \u0639\u0645\u0648\u062f\u064a
Orthogonal.Help=\u0623\u0646\u0642\u0631 \u0639\u0644\u0649 \u0646\u0642\u0637\u0629 \u062b\u0645 \u0639\u0644\u0649 \u0627\u0644\u0645\u0633\u062a\u0642\u064a\u0645 \u0627\u0644\u0639\u0645\u0648\u062f\u064a \u0639\u0644\u064a\u0647
-OrthogonalPlane=\u0645\u0633\u062a\u0648\u064a \u0639\u0645\u0648\u062f\u064a
-OrthogonalPlane.Help=\u0646\u0642\u0637\u0629 \u0648 \u0645\u0633\u062a\u0642\u064a\u0645 \u0639\u0645\u0648\u062f\u064a
Other=\u0622\u062e\u0631
OutputObjects=\u0627\u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u0646\u0627\u062a\u062c\u0629
Overlay=\u064a\u0636\u0639 \u0641\u0648\u0642
@@ -396,8 +394,6 @@ Parabola=\u0642\u0637\u0639 \u0645\u0643\u0627\u0641\u0626
Parabola.Help=\u062d\u062f\u062f \u0646\u0642\u0637\u0629 \u062b\u0645 \u062f\u0644\u064a\u0644
Parallel=\u0645\u0633\u062a\u0642\u064a\u0645 \u0645\u0648\u0627\u0632\u064a
Parallel.Help=\u0623\u0646\u0642\u0631 \u0639\u0644\u0649 \u0646\u0642\u0637\u0629 \u062b\u0645 \u0639\u0644\u0649 \u0627\u0644\u0645\u0633\u062a\u0642\u064a\u0645 \u0627\u0644\u0645\u0648\u0627\u0632\u064a \u0644\u0647
-ParallelPlane=\u0645\u0633\u062a\u0648\u0649 \u0645\u0648\u0627\u0632\u064a
-ParallelPlane.Help=\u062d\u062f\u062f \u0646\u0642\u0637\u0629 \u062b\u0645 \u0645\u0633\u062a\u0648\u064a
Paste=\u0644\u0635\u0642
PasteDataFromClipboard=\u0644\u0635\u0642 \u0645\u0639\u0637\u064a\u0627\u062a \u0645\u0646 \u0627\u0644\u062d\u0627\u0641\u0638\u0629
PasteSpecial=\u0644\u0635\u0642 \u062e\u0627\u0635
@@ -411,10 +407,6 @@ Perspective.Primary=\u0623\u0633\u0627\u0633\u064a
Perspective.TableAndGraphics=\u0627\u0644\u062c\u062f\u0648\u0644 \u0648 \u0627\u0644\u0631\u0633\u0645 \u0627\u0644\u0628\u064a\u0627\u0646\u064a
Perspective.Whiteboard=\u0627\u0644\u0633\u0628\u0648\u0631\u0629 \u0627\u0644\u0628\u0636\u0627\u0621
Perspectives=\u0627\u0644\u0645\u0646\u0638\u0648\u0631\u0627\u062a
-PlanePointLine=\u0645\u0633\u062a\u0648\u0649 \u0645\u062d\u062f\u062f \u0628\u0646\u0642\u0637\u0629 \u0648\u0645\u0633\u062a\u0642\u064a\u0645
-PlanePointLine.Help=\u062d\u062f\u062f \u0646\u0642\u0637\u0629 \u0648 \u0645\u0633\u062a\u0642\u064a\u0645
-PlaneThreePoint=\u0645\u0633\u062a\u0648\u0649 \u0645\u062d\u062f\u062f \u0628\u062b\u0644\u0627\u062b\u0629 \u0646\u0642\u0627\u0637
-PlaneThreePoint.Help=\u062d\u062f\u062f \u062b\u0644\u0627\u062b\u0629 \u0646\u0642\u0627\u0637
Point=\u0646\u0642\u0637\u0629 \u062c\u062f\u064a\u062f\u0629
Point.Help=\u0623\u0646\u0642\u0631 \u0644\u062a\u062d\u062f\u064a\u062f \u0645\u0643\u0627\u0646 \u0627\u0644\u0646\u0642\u0637\u0629
PointCapturing=\u0645\u0633\u0643 \u0646\u0642\u0637\u0629
@@ -438,8 +430,6 @@ Power=\u0642\u0648\u0651\u0629
Preview=\u0639\u0631\u0636 \u0623\u0648\u0644\u064a
Print=\u0637\u0628\u0627\u0639\u0629
PrintPreview=\u0645\u0639\u0627\u064a\u0646\u0629 \u0642\u0628\u0644 \u0627\u0644\u0637\u0628\u0627\u0639\u0629
-Prism=\u0645\u0648\u0634\u0648\u0631
-Prism.Help=\u062d\u062f\u0651\u062f \u0645\u0636\u0644\u0639 \u0623\u0648 \u0645\u062c\u0645\u0648\u0639\u0629 \u0646\u0642\u0627\u0637 \u062b\u0645 \u0627\u0644\u0646\u0642\u0637\u0629 \u0627\u0644\u0623\u0648\u0644\u0649 \u0645\u0646 \u0627\u0644\u0648\u062c\u0647 \u0627\u0644\u0645\u0648\u0627\u0632\u064a \u0627\u0644\u062b\u0627\u0646\u064a
Probability=\u0627\u062d\u062a\u0645\u0627\u0644
ProbabilityCalculator=\u062d\u0633\u0627\u0628 \u0627\u0644\u0625\u062d\u062a\u0645\u0627\u0644\u0627\u062a
ProbabilityCalculator.Help=\u062d\u0648\u0627\u0631 \u0644\u062d\u0633\u0627\u0628 \u0627\u0644\u0625\u062d\u062a\u0645\u0627\u0644\u0627\u062a
@@ -480,8 +470,6 @@ ResidualPlot=\u0628\u0642\u0627\u064a\u0627
Result=\u0627\u0644\u0646\u062a\u064a\u062c\u0629
ReturnAngleInverseTrig=\u064a\u062d\u062f\u062f \u0627\u0644\u0632\u0627\u0648\u064a\u0629 \u0628\u0627\u0644\u0646\u0633\u0628\u0629 \u0644\u0644\u062f\u0644\u0627\u062a \u0627\u0644\u0645\u062b\u0644\u062b\u064a\u0629 \u0627\u0644\u0639\u0643\u0633\u064a\u0629
RightAngleStyle=\u0631\u0645\u0632 \u0627\u0644\u0632\u0627\u0648\u064a\u0629 \u0627\u0644\u0642\u0627\u0626\u0645\u0629
-RightPrism=\u0645\u0648\u0634\u0648\u0631 \u0642\u0627\u0626\u0645
-RightPrism.Help=\u062d\u062f\u062f \u0645\u0636\u0644\u0639 \u062b\u0645 \u0627\u0644\u0625\u0631\u062a\u0641\u0627\u0639
RightProb=\u0639\u0644\u0649 \u0627\u0644\u064a\u0645\u064a\u0646
RigidPolygon=\u0645\u0636\u0644\u0639 \u0644\u0627 \u0645\u062a\u063a\u064a\u0631
RigidPolygon.Help=\u062d\u062f\u062f \u0643\u0644 \u0627\u0644\u0642\u0645\u0645 \u062b\u0645 \u0639\u062f \u0627\u0644\u0649 \u0627\u0644\u0642\u0645\u0629 \u0627\u0644\u0623\u0648\u0644\u0649
@@ -704,8 +692,6 @@ VectorPolygon=\u0645\u0648\u062c\u0647 \u0645\u0636\u0644\u0639
VectorPolygon.Help=\u062d\u062f\u062f \u0643\u0644 \u0627\u0644\u0642\u0645\u0645 \u062b\u0645 \u0639\u064f\u062f \u0644\u0644\u0642\u0645\u0629 \u0627\u0644\u0623\u0648\u0644\u0649
VerticalScrollbars=\u0623\u0634\u0631\u0637\u0629 \u0627\u0644\u062a\u0645\u0631\u064a\u0631 \u0627\u0644\u0639\u0645\u0648\u062f\u064a
View=\u0639\u0631\u0636
-ViewInFrontOf=\u0627\u0644\u0648\u062c\u0647 \u0627\u0644\u0623\u0645\u0627\u0645\u064a
-ViewInFrontOf.Help=\u0627\u0644\u0648\u062c\u0647 \u0627\u0644\u0623\u0645\u0627\u0645\u064a \u0644\u0644\u0639\u0646\u0635\u0631 \u0627\u0644\u0630\u064a \u062a\u0645 \u0627\u062e\u062a\u064a\u0627\u0631\u0647
Views=\u0648\u062c\u0647\u0627\u062a \u0627\u0644\u0646\u0638\u0631
VisualStyle=\u0646\u0645\u0637 \u0627\u0644\u0631\u0633\u0645 \u0627\u0644\u0628\u064a\u0627\u0646\u064a
VisualStyle.Help=\u062d\u062f\u062f \u0627\u0644\u0639\u0646\u0627\u0635\u0631 \u0627\u0644\u062a\u064a \u062a\u0631\u064a\u062f \u062a\u063a\u064a\u064a\u0631 \u062e\u0627\u0635\u064a\u062a\u0647\u0627
diff --git a/geogebra/properties/menu_bg.properties b/geogebra/properties/menu_bg.properties
index e0759b5..13fb198 100644
--- a/geogebra/properties/menu_bg.properties
+++ b/geogebra/properties/menu_bg.properties
@@ -9,18 +9,19 @@ Angle=\u042a\u0433\u044a\u043b
Angle.Help=\u0422\u0440\u0438 \u0442\u043e\u0447\u043a\u0438 \u0438\u043b\u0438 \u0434\u0432\u0435 \u043f\u0440\u0430\u0432\u0438
AngleFixed=\u042a\u0433\u044a\u043b (\u0432\u044a\u0432\u0435\u0434\u0438 \u0433\u043e\u043b\u0435\u043c\u0438\u043d\u0430\u0442\u0430)
AngleFixed.Help=\u0422\u043e\u0447\u043a\u0430, \u043b\u0435\u0436\u0430\u0449\u0430 \u043d\u0430 \u043b\u044a\u0447\u0430, \u0432\u0440\u044a\u0445 \u0438 \u043c\u044f\u0440\u043a\u0430 \u043d\u0430 \u044a\u0433\u044a\u043b
-AngleUnit=\u041c\u044f\u0440\u043a\u0430\u0442\u0430 \u043d\u0430 \u044a\u0433\u044a\u043b\u0430
+AngleUnit=\u041c\u044f\u0440\u043a\u0430 \u043d\u0430 \u044a\u0433\u044a\u043b\u0430
AngularBisector=\u042a\u0433\u043b\u043e\u043f\u043e\u043b\u043e\u0432\u044f\u0449\u0430
AngularBisector.Help=\u0422\u0440\u0438 \u0442\u043e\u0447\u043a\u0438 \u0438\u043b\u0438 \u0434\u0432\u0435 \u043f\u0440\u0430\u0432\u0438
Area=\u041f\u043b\u043e\u0449 (\u043b\u0438\u0446\u0435)
Area.Help=\u041c\u043d\u043e\u0433\u043e\u044a\u0433\u044a\u043b\u043d\u0438\u043a, \u043e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442 \u0438\u043b\u0438 \u043a\u043e\u043d\u0438\u0447\u043d\u043e \u0441\u0435\u0447\u0435\u043d\u0438\u0435
Ascending=\u0412\u044a\u0437\u0445\u043e\u0434\u044f\u0449\u043e
-AttachDetachPoint=\u041f\u0440\u0438\u043a\u0440\u0435\u043f\u0438 / \u041e\u0442\u0434\u0435\u043b\u0438 \u0442\u043e\u0447\u043a\u0430
-AttachDetachPoint.Help=\u041a\u043b\u0438\u043a\u043d\u0435\u0442\u0435 \u0432\u044a\u0440\u0445\u0443 \u0442\u043e\u0447\u043a\u0430\u0442\u0430 ( \u0438 \u0432\u044a\u0440\u0445\u0443 \u043e\u0431\u0435\u043a\u0442\u0430 \u0437\u0430 \u043f\u0440\u0438\u043a\u0440\u0435\u043f\u0432\u0430\u043d\u0435)
+AttachDetachPoint=\u041f\u0440\u0438\u043a\u0440\u0435\u043f\u0438/\u041e\u0442\u0434\u0435\u043b\u0438 \u0442\u043e\u0447\u043a\u0430
+AttachDetachPoint.Help=\u041a\u043b\u0438\u043a\u043d\u0435\u0442\u0435 \u0432\u044a\u0440\u0445\u0443 \u0442\u043e\u0447\u043a\u0430\u0442\u0430 (\u0438 \u0432\u044a\u0440\u0445\u0443 \u043e\u0431\u0435\u043a\u0442\u0430 \u0437\u0430 \u043f\u0440\u0438\u043a\u0440\u0435\u043f\u0432\u0430\u043d\u0435)
Axes=\u041a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u043d\u0438 \u043e\u0441\u0438
Back=\u041d\u0430\u0437\u0430\u0434
BackgroundColor=\u0424\u043e\u043d
BasicLineTools=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043d\u0430 \u043f\u0440\u0430\u0432\u0430\u0442\u0430
+BetweenGroups=\u041c\u0435\u0436\u0434\u0443 \u0433\u0440\u0443\u043f\u0438\u0442\u0435
Blue=\u0421\u0438\u043d
Bold=\u0423\u0434\u0435\u0431\u0435\u043b\u0435\u043d
Brackets=\u0421\u043a\u043e\u0431\u0438
@@ -55,6 +56,7 @@ CircumcircleArc3=\u0414\u044a\u0433\u0430 \u043e\u0442 \u043e\u043a\u0440\u044a\
CircumcircleArc3.Help=\u0422\u0440\u0438 \u0442\u043e\u0447\u043a\u0438 \u043b\u0435\u0436\u0430\u0449\u0438 \u043d\u0430 \u0434\u044a\u0433\u0430
CircumcircleSector3=\u0421\u0435\u043a\u0442\u043e\u0440 \u043d\u0430 \u043e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442 \u043f\u0440\u0435\u0437 \u0442\u0440\u0438 \u0442\u043e\u0447\u043a\u0438
CircumcircleSector3.Help=\u0422\u0440\u0438 \u0442\u043e\u0447\u043a\u0438 \u043b\u0435\u0436\u0430\u0449\u0438 \u043d\u0430 \u0441\u0435\u043a\u0442\u043e\u0440
+Classes=\u041a\u043b\u0430\u0441\u043e\u0432\u0435
ClearColumn=\u0418\u0437\u0442\u0440\u0438\u0439 \u043a\u043e\u043b\u043e\u043d\u0430
ClearColumns=\u0418\u0437\u0442\u0440\u0438\u0439 \u043a\u043e\u043b\u043e\u043d\u0438
ClearRow=\u0418\u0437\u0442\u0440\u0438\u0439 \u0440\u0435\u0434
@@ -69,6 +71,7 @@ CloseFile=\u0417\u0430\u0442\u0432\u043e\u0440\u0438 \u0444\u0430\u0439\u043b\u0
CmdList=\u0421\u043f\u0438\u0441\u044a\u043a \u0441 \u043a\u043e\u043c\u0430\u043d\u0434\u0438\u0442\u0435
Coefficient=\u041a\u043e\u0435\u0444\u0438\u0446\u0438\u0435\u043d\u0442
CollapseAll=\u0417\u0430\u0442\u0432\u043e\u0440\u0438 \u0432\u0441\u0438\u0447\u043a\u043e
+ColumnHeader=\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 \u043a\u043e\u043b\u043e\u043d\u0430
Columns=\u041a\u043e\u043b\u043e\u043d\u0438
CommandName=\u0418\u043c\u0435 \u043d\u0430 \u043a\u043e\u043c\u0430\u043d\u0434\u0430\u0442\u0430
Compasses=\u041f\u0435\u0440\u0433\u0435\u043b
@@ -95,15 +98,21 @@ Count=\u0411\u0440\u043e\u0439
CountCells=\u0411\u0440\u043e\u0439 \u043a\u043b\u0435\u0442\u043a\u0438
CountCells.Help=\u0418\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u0433\u0440\u0443\u043f\u0430 \u043e\u0442 \u043a\u043b\u0435\u0442\u043a\u0438
Create=\u0421\u044a\u0437\u0434\u0430\u0439
+CreateCurveFit.Help=\u0418\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u043a\u043b\u0435\u0442\u043a\u0438\u0442\u0435 \u0437\u0430 \u0442\u043e\u0447\u043a\u0438 \u0441\u043b\u0435\u0434 \u0442\u043e\u0432\u0430 \u0449\u0440\u0430\u043a\u043d\u0435\u0442\u0435 \u0432\u044a\u0440\u0445\u0443 \u0431\u0443\u0442\u043e\u043d\u0430 \u0441 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438
CreateList=\u0421\u044a\u0437\u0434\u0430\u0439 \u0441\u043f\u0438\u0441\u044a\u043a
CreateList.Help=\u041f\u044a\u0440\u0432\u043e \u0438\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u043a\u043b\u0435\u0442\u043a\u0438, \u043f\u043e\u0441\u043b\u0435 \u0438\u0437\u043f\u0435\u0440\u0435\u0442\u0435 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430.
CreateListGraphicsView=\u0421\u044a\u0437\u0434\u0430\u0439 \u0441\u043f\u0438\u0441\u044a\u043a
+CreateListGraphicsView.Help=\u041f\u043b\u044a\u0437\u043d\u0435\u0442\u0435 \u043f\u0440\u0430\u0432\u043e\u044a\u0433\u044a\u043b\u043d\u0438\u043a \u043e\u043a\u043e\u043b\u043e \u043e\u0431\u0435\u043a\u0442\u0438\u0442\u0435
CreateListOfPoints=\u0421\u044a\u0437\u0434\u0430\u0439 \u0441\u043f\u0438\u0441\u044a\u043a \u043e\u0442 \u0442\u043e\u0447\u043a\u0438
+CreateListOfPoints.Help=\u0418\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u043a\u043b\u0435\u0442\u043a\u0438\u0442\u0435, \u0441\u043b\u0435\u0434 \u043a\u043e\u0435\u0442\u043e \u0449\u0440\u0430\u043a\u043d\u0435\u0442\u0435 \u0432\u044a\u0440\u0445\u0443 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430
CreateMatrix=\u0421\u044a\u0437\u0434\u0430\u0439 \u043c\u0430\u0442\u0440\u0438\u0446\u0430
CreateMatrix.Help=\u041f\u044a\u0440\u0432\u043e \u0438\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u043a\u043b\u0435\u0442\u043a\u0438, \u043f\u043e\u0441\u043b\u0435 \u0438\u0437\u043f\u0435\u0440\u0435\u0442\u0435 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430.
+CreatePolyLine.Help=\u0418\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u043a\u043b\u0435\u0442\u043a\u0438\u0442\u0435, \u0441\u043b\u0435\u0434 \u043a\u043e\u0435\u0442\u043e \u0449\u0440\u0430\u043a\u043d\u0435\u0442\u0435 \u0432\u044a\u0440\u0445\u0443 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430
CreateTable=\u0421\u044a\u0437\u0434\u0430\u0439 \u0442\u0430\u0431\u043b\u0438\u0446\u0430
+CreateTable.Help=\u0418\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u043a\u043b\u0435\u0442\u043a\u0438\u0442\u0435, \u0441\u043b\u0435\u0434 \u043a\u043e\u0435\u0442\u043e \u0449\u0440\u0430\u043a\u043d\u0435\u0442\u0435 \u0432\u044a\u0440\u0445\u0443 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430
CustomTools=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0437\u0430 \u0438\u0437\u0431\u0440\u0430\u043d\u0438 \u043f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u043d\u043e \u043e\u0431\u0435\u043a\u0442\u0438
Cut=\u041e\u0442\u0440\u0435\u0436\u0438
+Data=\u0414\u0430\u043d\u043d\u0438
DecimalPlaces=\u0411\u0440\u043e\u0439 \u043d\u0430 \u0446\u0438\u0444\u0440\u0438\u0442\u0435 \u0441\u043b\u0435\u0434 \u0434\u0435\u0441\u0435\u0442\u0438\u0447\u043d\u0430\u0442\u0430 \u0437\u0430\u043f\u0435\u0442\u0430\u044f
Default.Restore=\u0412\u044a\u0437\u0441\u0442\u0430\u043d\u043e\u0432\u0438 \u043f\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043d\u0435
Default.Set=\u0417\u0430\u0434\u0430\u0439 \u043f\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043d\u0435
@@ -134,6 +143,8 @@ Ellipse3.Help=\u0418\u0437\u0431\u0435\u0440\u0438 \u0434\u0432\u0430 \u0444\u04
EnableLabelDrags=\u0412\u044a\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442 \u0437\u0430 \u043c\u0435\u0441\u0442\u0435\u043d\u0435 \u043d\u0430 \u0438\u043c\u0435\u043d\u0430\u0442\u0430
EnableRightClick=\u0414\u044f\u0441\u043d\u043e \u043d\u0430\u0442\u0438\u0441\u043a\u0430\u043d\u0435 \u043d\u0430 \u0431\u0443\u0442\u043e\u043d\u0430 \u043d\u0430 \u043c\u0438\u0448\u043a\u0430\u0442\u0430 - \u043f\u043e\u0437\u0432\u043e\u043b\u0435\u043d\u043e
English=\u0410\u043d\u0433\u043b\u0438\u0439\u0441\u043a\u0438
+EnterAppletAddress=\u0412\u044a\u0432\u0435\u0434\u0438 Web \u0410\u0434\u0440\u0435\u0441 \u043d\u0430 GeoGebra Applet
+EnterWebAddress=\u0412\u044a\u0432\u0435\u0434\u0438 Web \u0410\u0434\u0440\u0435\u0441
Equation=\u0423\u0440\u0430\u0432\u043d\u0435\u043d\u0438\u0435
Evaluate=\u041f\u0440\u0435\u0441\u043c\u0435\u043d\u0442\u0438 / \u0418\u0437\u0447\u0438\u0441\u043b\u0438
Evaluate.Help=\u041f\u0440\u0435\u0441\u043c\u0435\u0442\u043d\u0438 \u043a\u043e\u0440\u0435\u043a\u0442\u043e
@@ -142,6 +153,7 @@ Expand=\u0418\u0437\u0432\u0435\u0436\u0434\u0430\u043c ( \u0444\u043e\u0440\u04
Expand.Help=\u0418\u0437\u0432\u044a\u043d \u0441\u043a\u043e\u0431\u0438
ExpandAll=\u041f\u043e\u043a\u0430\u0436\u0438 \u0432\u0441\u0438\u0447\u043a\u0438
Export=\u0415\u043a\u0441\u043f\u043e\u0440\u0442\u0438\u0440\u0430\u0439
+ExportAllWorksheets=\u0415\u043a\u0441\u043f\u043e\u0440\u0442\u0438\u0440\u0430\u0439 \u0432\u0441\u0438\u0447\u043a\u0438 \u043e\u0442\u0432\u043e\u0440\u0435\u043d\u0438 \u0440\u0430\u0431\u043e\u0442\u043d\u0438 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430
FastHelp=\u0411\u044a\u0440\u0437 \u043f\u043e\u043c\u043e\u0449\u043d\u0438\u043a
File=\u0424\u0430\u0439\u043b
FileBrowser=\u0422\u044a\u0440\u0441\u0435\u043d\u0435 \u043d\u0430 \u0444\u0430\u0439\u043b
@@ -176,6 +188,8 @@ Green=\u0417\u0435\u043b\u0435\u043d
Grid=\u041a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u043d\u0430 \u043c\u0440\u0435\u0436\u0430
Gridlines=\u041b\u0438\u043d\u0438\u0438 \u043d\u0430 \u043c\u0440\u0435\u0436\u0430
GroupObjects=\u0413\u0440\u0443\u043f\u0430 \u043e\u0431\u0435\u043a\u0442\u0438
+HTML5Only=\u0415\u043a\u0441\u043f\u043e\u0440\u0442\u0438\u0440\u0430\u0439 \u0441\u0430\u043c\u043e \u0432 HTML5
+HTML5WithJava=\u0415\u043a\u0441\u043f\u043e\u0440\u0442\u0438\u0440\u0430\u0439 \u0432 HTML5 (\u0441 Java fallback)
Help=\u041f\u043e\u043c\u043e\u0449
Hidden.Dashed=\u041f\u0443\u043d\u043a\u0442\u0438\u0440\u0430\u043d
Hidden.Invisible=\u041d\u0435\u0432\u0438\u0434\u0438\u043c
@@ -206,6 +220,7 @@ Intercept=\u041e\u0442\u0440\u044f\u0437\u044a\u043a/ \u041e\u0442\u0441\u0438\u
Intersect=\u0421\u0435\u0447\u0435\u043d\u0438\u0435 \u043d\u0430 \u0434\u0432\u0430 \u043e\u0431\u0435\u043a\u0442\u0430
Intersect.Help=\u0418\u0437\u0431\u0435\u0440\u0438 \u0434\u0432\u0435 \u043f\u0440\u0430\u0432\u0438 \u043f\u043e\u043e\u0442\u0434\u0435\u043b\u043d\u043e \u0438\u043b\u0438 \u0438\u0437\u0431\u0435\u0440\u0438 \u043f\u0440\u0435\u0441\u0435\u0447\u043d\u0430\u0442\u0430 \u0438\u043c \u0442\u043e\u0447\u043a\u0430
Interval=\u0418\u043d\u0442\u0435\u0440\u0432\u0430\u043b
+JavaWithHTML5=\u0415\u043a\u0441\u043f\u043e\u0440\u0442\u0438\u0440\u0430\u0439 \u0432 Java (\u0441 HTML5 fallback)
Join=\u041f\u0440\u0430\u0432\u0430 \u043f\u0440\u0435\u0437 \u0434\u0432\u0435 \u0442\u043e\u0447\u043a\u0438
Join.Help=\u0414\u0432\u0435 \u0442\u043e\u0447\u043a\u0438
LabelColumn=\u0415\u0442\u0438\u043a\u0435\u0442 \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430
@@ -270,6 +285,8 @@ Next=\u0421\u043b\u0435\u0434\u0432\u0430\u0449
NullHypothesis=\u041d\u0443\u043b\u0435\u0432\u0430 \u0445\u0438\u043f\u043e\u0442\u0435\u0437\u0430
NullHypothesis.short=\u041d\u0443\u043b\u0430
Objects=\u041e\u0431\u0435\u043a\u0442\u0438
+OneVarStats.Help=\u0410\u043d\u0430\u043b\u0438\u0437\u0438\u0440\u0430\u0439\u0442\u0435 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442\u0438\u0442\u0435 \u043e\u0442 \u0438\u0437\u0431\u0440\u0430\u043d\u0438 \u043a\u043b\u0435\u0442\u043a\u0438
+OneVariable=\u0415\u0434\u043d\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442
OnlyOpaqueFills=\u0421\u0430\u043c\u043e \u043d\u0435\u043f\u0440\u043e\u0437\u0440\u0430\u0447\u043d\u0438 \u0437\u0430\u043f\u044a\u043b\u0432\u0430\u043d\u0438\u044f
Opacity=\u041f\u0440\u043e\u0437\u0440\u0430\u0447\u043d\u043e\u0441\u0442
OpenFileFolder=\u041e\u0442\u0432\u043e\u0440\u0438 \u043f\u0430\u043f\u043a\u0430\u0442\u0430 \u043d\u0430 \u0444\u0430\u0439\u043b\u0430
@@ -280,8 +297,6 @@ OperationTable=\u041e\u043f\u0435\u0440\u0430\u0446\u0438\u0438 \u0441 \u0442\u0
Options=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
Orthogonal=\u041f\u0435\u0440\u043f\u0435\u043d\u0434\u0438\u043a\u0443\u043b\u044f\u0440\u043d\u0430 \u043f\u0440\u0430\u0432\u0430
Orthogonal.Help=\u0422\u043e\u0447\u043a\u0430 \u0438 \u043f\u0435\u0440\u043f\u0435\u043d\u0434\u0438\u043a\u0443\u043b\u044f\u0440\u043d\u0430 \u043f\u0440\u0430\u0432\u0430
-OrthogonalPlane=\u041f\u0435\u0440\u043f\u0435\u043d\u0434\u0438\u043a\u0443\u043b\u044f\u0440\u043d\u0430 \u0440\u0430\u0432\u043d\u0438\u043d\u0430
-OrthogonalPlane.Help=\u0422\u043e\u0447\u043a\u0430 \u0438 \u043f\u0435\u0440\u043f\u0435\u043d\u0434\u0438\u043a\u0443\u043b\u044f\u0440\u043d\u0430 \u0440\u0430\u0432\u043d\u0438\u043d\u0430
Other=\u0414\u0440\u0443\u0433\u0438
OutputObjects=\u041f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438 \u043e\u0431\u0435\u043a\u0442\u0438
Overwrite=\u041f\u0440\u0435\u0437\u0430\u043f\u0438\u0448\u0438
@@ -289,8 +304,6 @@ Parabola=\u041f\u0430\u0440\u0430\u0431\u043e\u043b\u0430
Parabola.Help=\u0418\u0437\u0431\u0435\u0440\u0438 \u0442\u043e\u0447\u043a\u0430 \u0438 \u0434\u0438\u0440\u0435\u043a\u0442\u0440\u0438\u0441\u0430
Parallel=\u0423\u0441\u043f\u043e\u0440\u0435\u0434\u043d\u0430 \u043f\u0440\u0430\u0432\u0430
Parallel.Help=\u0422\u043e\u0447\u043a\u0430 \u0438 \u0443\u0441\u043f\u043e\u0440\u0435\u0434\u043d\u0430 \u043f\u0440\u0430\u0432\u0430
-ParallelPlane=\u0423\u0441\u043f\u043e\u0440\u0435\u0434\u043d\u0430 \u0440\u0430\u0432\u043d\u0438\u043d\u0430
-ParallelPlane.Help=\u0422\u043e\u0447\u043a\u0430 \u0438 \u0443\u0441\u043f\u043e\u0440\u0435\u0434\u043d\u0430 \u0440\u0430\u0432\u043d\u0438\u043d\u0430
Paste=\u041f\u043e\u0441\u0442\u0430\u0432\u0438
PasteDataFromClipboard=\u041f\u043e\u0441\u0442\u0430\u0432\u0438 \u0434\u0430\u043d\u043d\u0438 \u043e\u0442 \u041a\u043b\u0438\u043f\u0431\u043e\u0440\u0434\u0430
Pen=\u041c\u043e\u043b\u0438\u0432
@@ -303,10 +316,6 @@ Perspective.Primary=\u041e\u0441\u043d\u043e\u0432\u043d\u0438
Perspective.TableAndGraphics=\u0422\u0430\u0431\u043b\u0438\u0446\u0438 \u0438 \u0413\u0440\u0430\u0444\u0438\u043a\u0438
Perspective.Whiteboard=\u0418\u043d\u0442\u0435\u0440\u043a\u0430\u0442\u0438\u0432\u043d\u0430 \u0431\u044f\u043b\u0430 \u0434\u044a\u0441\u043a\u0430
Perspectives=\u041f\u0435\u0440\u0441\u043f\u0435\u043a\u0442\u0438\u0432\u0438
-PlanePointLine=\u0420\u0430\u0432\u043d\u0438\u043d\u0430 \u043f\u0440\u0435\u0437 \u0442\u043e\u0447\u043a\u0430 \u0438 \u043f\u0440\u0430\u0432\u0430
-PlanePointLine.Help=\u0418\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u0442\u043e\u0447\u043a\u0430 \u0438 \u043f\u0440\u0430\u0432\u0430
-PlaneThreePoint=\u0420\u0430\u0432\u043d\u0438\u043d\u0430 \u043f\u0440\u0435\u0437 \u0442\u0440\u0438 \u0442\u043e\u0447\u043a\u0438
-PlaneThreePoint.Help=\u0418\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u0442\u0440\u0438 \u0442\u043e\u0447\u043a\u0438
Point=\u0422\u043e\u0447\u043a\u0430
Point.Help=\u041a\u043b\u0438\u043a\u043d\u0438 \u0432\u044a\u0440\u0445\u0443 \u0447\u0435\u0440\u0442\u043e\u0436\u043d\u0430\u0442\u0430 \u043f\u043e\u0432\u044a\u0440\u0445\u043d\u043e\u0441\u0442 \u0438\u043b\u0438 \u0432\u044a\u0440\u0445\u0443 \u043f\u0440\u0430\u0432\u0430
PointCapturing=\u041f\u0440\u0438\u043a\u0440\u0435\u043f\u0438 \u0442\u043e\u0447\u043a\u0438\u0442\u0435 \u043a\u044a\u043c \u043a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u043d\u0430\u0442\u0430 \u043c\u0440\u0435\u0436\u0430
@@ -327,7 +336,6 @@ Portrait=\u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u043d\u043e
Preview=\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u0435\u043d \u0438\u0437\u0433\u043b\u0435\u0434
Print=\u041e\u0442\u043f\u0435\u0447\u0430\u0442\u0430\u0439
PrintPreview=\u0418\u0437\u0433\u043b\u0435\u0434 \u043f\u0440\u0435\u0434\u0438 \u043f\u0435\u0447\u0430\u0442
-Prism=\u041f\u0440\u0438\u0437\u043c\u0430
Probability=\u0412\u0435\u0440\u043e\u044f\u0442\u043d\u043e\u0441\u0442\u0438
ProbabilityCalculator=\u041a\u0430\u043b\u043a\u0443\u043b\u0430\u0442\u043e\u0440 \u0437\u0430 \u0432\u0435\u0440\u043e\u044f\u0442\u043d\u043e\u0441\u0442\u0438
ProbabilityCalculator.Help=\u041f\u0440\u043e\u0437\u043e\u0440\u0435\u0446 \u0437\u0430 \u043f\u0440\u0435\u0441\u043c\u044f\u0442\u0430\u043d\u0435 \u043d\u0430 \u0432\u0435\u0440\u0438\u044f\u0442\u043d\u043e\u0441\u0442\u0438
@@ -502,6 +510,7 @@ TranslateByVector=\u0422\u0440\u0430\u043d\u0441\u043b\u0438\u0440\u0430\u0439 \
TranslateByVector.Help=\u041e\u0431\u0435\u043a\u0442, \u043a\u043e\u0439\u0442\u043e \u0438\u0441\u043a\u0430\u0448 \u0434\u0430 \u0442\u0440\u0430\u043d\u0441\u043b\u0438\u0440\u0430\u0448 \u0438 \u0441\u043b\u0435\u0434 \u0442\u043e\u0432\u0430 \u0432\u0435\u043a\u0442\u043e\u0440
TranslateView=\u041f\u0440\u0435\u043c\u0435\u0441\u0442\u0438 \u0447\u0435\u0440\u0442\u043e\u0436\u043d\u0430\u0442\u0430 \u043f\u043e\u0432\u044a\u0440\u0445\u043d\u043e\u0441\u0442
TranslateView.Help=\u0418\u0437\u0434\u044a\u0440\u043f\u0430\u0439 \u0447\u0435\u0442\u0440\u043e\u0436\u043d\u0430\u0442\u0430 \u043f\u043e\u0432\u044a\u0440\u0445\u043d\u043e\u0441\u0442 \u0438\u043b\u0438 \u043a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u043d\u0438\u0442\u0435 \u043e\u0441\u0438 (Shift + \u0418\u0437\u0434\u044a\u0440\u043f\u0432\u0430\u043d\u0435)
+TwoVariable=\u0414\u0432\u0435 \u043f\u0440\u043e\u043c\u0435\u043d\u043b\u0438\u0432\u0438
Type.Algebra=\u0410\u043b\u0433\u0435\u0431\u0440\u0430
Type.CAS=CAS \u0421\u043f\u0435\u0446\u0438\u0430\u043b\u043d\u0438 \u043a\u043e\u043c\u0430\u043d\u0434\u0438
Type.Chart=\u0414\u0438\u0430\u0433\u0440\u0430\u043c\u0430
@@ -516,7 +525,14 @@ Type.Probability=\u0412\u0435\u0440\u043e\u044f\u0442\u043d\u043e\u0441\u0442\u0
Type.Spreadsheet=\u0415\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430
Type.Statistics=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430
Type.Text=\u0422\u0435\u043a\u0441\u0442
+Type.VectorAndMatrix=\u0412\u0435\u043a\u0442\u043e\u0440 & \u041c\u0430\u0442\u0440\u0438\u0446\u0430
Undo=\u041d\u0430\u0437\u0430\u0434
+UngroupObjectes=\u041d\u0435\u0433\u0440\u0443\u043f\u0438\u0440\u0430\u043d\u0438 \u043e\u0431\u0435\u043a\u0442\u0438
+Untitled=\u0411\u0435\u0437 \u0437\u0430\u0433\u043b\u0430\u0432\u0438\u0435
+UploadGeoGebraTube=\u041a\u0430\u0447\u0438 \u0432 GeoGebraTube
+UpperLimit=\u0413\u043e\u0440\u043d\u0430 \u0433\u0440\u0430\u043d\u0438\u0446\u0430
+UseBrowserForJS=\u0418\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0439 Browser \u0437\u0430 JavaScript scripts
+UseButtonsAndCheckboxes=\u0418\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0439 \u0431\u0443\u0442\u043e\u043d\u0438\u0442\u0435 \u0438 \u0427\u0435\u043a \u0431\u043e\u043a\u0441\u0430.
UserInterface=\u041f\u043e\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043b\u0441\u043a\u0438 \u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441
Value=\u0412\u0435\u043b\u0438\u0447\u0438\u043d\u0430
Values=\u0412\u0435\u043b\u0438\u0447\u0438\u043d\u0438
@@ -529,8 +545,6 @@ VectorPolygon=\u0412\u0435\u043a\u0442\u043e\u0440\u0435\u043d \u043c\u043d\u043
VectorPolygon.Help=\u0418\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u0432\u0441\u0438\u0447\u043a\u0438 \u0432\u044a\u0440\u0445\u043e\u0432\u0435, \u0430 \u0441\u043b\u0435\u0434 \u0442\u043e\u0432\u0430 \u043a\u043b\u0438\u043a\u043d\u0435\u0442\u0435 \u0432\u044a\u0440\u0445\u0443 \u043f\u044a\u0440\u0432\u0438\u044f\u0442 \u0432\u0440\u044a\u0445
VerticalScrollbars=\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u043d\u0438 \u0441\u043a\u0440\u043e\u043b\u0435\u0440\u0438
View=\u0418\u0437\u0433\u043b\u0435\u0434
-ViewInFrontOf=\u0418\u0437\u0433\u043b\u0435\u0434 \u043e\u0442\u043f\u0440\u0435\u0434
-ViewInFrontOf.Help=\u041f\u0440\u043e\u043c\u044f\u043d\u0430 \u043d\u0430 \u0438\u0437\u0433\u043b\u0435\u0434\u0430 \u0432 \u043f\u0440\u0435\u0434\u043d\u0430\u0442\u0430 \u0447\u0430\u0441\u0442 \u043d\u0430 \u043e\u0431\u0435\u043a\u0442\u0430 \u0441 \u043a\u043b\u0438\u043a\u0432\u0430\u043d\u0435
Views=\u0418\u0437\u0433\u043b\u0435\u0434\u0438
Width=\u0428\u0438\u0440\u0438\u043d\u0430
Window=\u041f\u0440\u043e\u0437\u043e\u0440\u0435\u0446
diff --git a/geogebra/properties/menu_bs.properties b/geogebra/properties/menu_bs.properties
index 01a6fa7..e14feee 100644
--- a/geogebra/properties/menu_bs.properties
+++ b/geogebra/properties/menu_bs.properties
@@ -5,66 +5,68 @@ ActionObjectTools=Specijalni alati
AddTrace=Dodaj figuru na trag listu
Adjustment=Podesi
Advanced=Napredne postavke
-AlgebraDescriptions=Algebarski Opis
-AllCommands=Sve Naredbe
-AllowRescaling=Omogu\u0107i Reskaliranje
-AllowTooltips=Omogu\u0107i Kratke opise
-AlternativeHypothesis=Alternativna Hipoteza
+AlgebraDescriptions=Algebarski opisi
+AllCommands=Sve naredbe
+AllowRescaling=Omogu\u0107i reskaliranje
+AllowTooltips=Omogu\u0107i kratke opise
+AlternativeHypothesis=Alternativna hipoteza
AlternativeHypothesis.short=Alternativa
Angle=Ugao
Angle.Help=Ozna\u010dite/Kreirajte tri ta\u010dke ili dvije prave
AngleFixed=Ugao zadane veli\u010dine
-AngleFixed.Help=Ozna\u010dite/Kreirajte ta\u010dku na kraku ugla, zatim ta\u010dku - tjeme ugla i unesite veli\u010dinu ugla
-AngleUnit=Ugaona mjera
+AngleFixed.Help=Ozna\u010dite/Kreirajte ta\u010dku na kraku ugla, zatim ta\u010dku-tjeme ugla i unesite veli\u010dinu ugla
+AngleUnit=Mjera ugla
AngularBisector=Simetrala ugla
AngularBisector.Help=Ozna\u010dite/Kreirajte tri ta\u010dke ili dvije prave
-ApplyDefaults=Primjeni zadane postavke
+ApplyDefaults=Primjeni osnovne postavke
Area=Povr\u0161ina
Area.Help=Ozna\u010dite mnogougao, krug ili koniku
Ascending=Rastu\u0107i
-AttachDetachPoint=Spoji/Odvoji Ta\u010dku
-AttachDetachPoint.Help=Kliknite na ta\u010dku ( i na figuru da ih spojite)
-AutoDimension=Automatske Dimenzije
+AttachDetachPoint=Spoji/Odvoji ta\u010dku
+AttachDetachPoint.Help=Kliknite na ta\u010dku(i na figuru da ih spojite)
+AutoDimension=Auto-Dimenzije
Axes=Koordinatne ose
Back=Nazad
-BackgroundColor=Boja Pozadine
-BasicLineTools=Prava- Alati
-BetweenGroups=Izme\u0111u Grupa podataka
+BackgroundColor=Boja pozadine
+BasicLineTools=Prava-Alati
+BetweenGroups=Izme\u0111u grupa podataka
+BlackboardLetters=Blackboard
Blue=Plava
-Boxplot=PravougaoniDijagram
+Boxplot=Pravougaoni dijagram
Brackets=Zagrade
Browser=Pretra\u017eiva\u010d
Button.Caption=Naslov
-ButtonAction=UbaciDugme
-ButtonAction.Help=Kliknite na Radnu povr\u0161 da ubacite dugme
-ByLayering=Slojevito
+ButtonAction=Ubaci dugme
+ButtonAction.Help=Kliknite na radnu povr\u0161 da ubacite dugme
+ByLayering=Po slojevima
Calculate=Izra\u010dunaj
+CalligraphicLetters=Calligraphic
Cancel=Poni\u0161ti
-Cartesian=Descartes
+Cartesian=Descartes-ova mre\u017ea
CheckboxSize=Veli\u010dina kontrolnog okvira
CheckboxSize.Large=Velik
CheckboxSize.Regular=Regularan
-ChooseFromFile=Izaberi iz Datoteke
+ChooseFromFile=Izaberi iz datoteke
Circle2=Kru\u017enica odre\u0111ena centrom i ta\u010dkom
-Circle2.Help=Ozna\u010dite/Kreirajte ta\u010dku-centar, zatim ta\u010dku na kru\u017enici
-Circle3=Kru\u017enica odre\u0111ena sa tri ta\u010dke
+Circle2.Help=Ozna\u010dite/Kreirajte ta\u010dku-centar kru\u017enice, zatim ta\u010dku na kru\u017enici
+Circle3=Kru\u017enica odre\u0111ena s tri ta\u010dke
Circle3.Help=Ozna\u010dite/Kreirajte tri ta\u010dke kru\u017enice
CircleArc3=Kru\u017eni luk odre\u0111en centrom i dvije ta\u010dke
-CircleArc3.Help=Ozna\u010dite/Kreirajte ta\u010dku- centar i dvije ta\u010dke na kru\u017enom luku
-CircleArcTools=Kru\u017enica & Kru\u017eni luk - Alati
+CircleArc3.Help=Ozna\u010dite/Kreirajte ta\u010dku-centar i dvije ta\u010dke na kru\u017enom luku
+CircleArcTools=Kru\u017enica&Kru\u017eni luk-Alati
CircleAxisPoint=Kru\u017enica odre\u0111ena osom i ta\u010dkom
CircleAxisPoint.Help=Ozna\u010dite/Kreirajte pravu-osu, zatim ta\u010dku na kru\u017enici
CirclePointRadius=Kru\u017enica odre\u0111ena centrom i polupre\u010dnikom
-CirclePointRadius.Help=Ozna\u010dite/Kreirajte ta\u010dku- centar kru\u017enice i unesite du\u017einu polupre\u010dnika
+CirclePointRadius.Help=Ozna\u010dite/Kreirajte ta\u010dku-centar kru\u017enice i unesite du\u017einu polupre\u010dnika
CirclePointRadiusDirection=Kru\u017enica odre\u0111ena centrom, polupre\u010dnikom i smjerom
-CirclePointRadiusDirection.Help=Ozna\u010dite/Kreirajte ta\u010dku- centar kru\u017enice, smjer i unesite du\u017einu polupre\u010dnika
+CirclePointRadiusDirection.Help=Ozna\u010dite/Kreirajte ta\u010dku-centar kru\u017enice, smjer i unesite du\u017einu polupre\u010dnika
CircleSector3=Kru\u017eni isje\u010dak odre\u0111en centrom i dvije ta\u010dke
CircleSector3.Help=Ozna\u010dite/Kreirajte ta\u010dku-centar i dvije ta\u010dke-krajeve kru\u017enog isje\u010dka
CircumcircleArc3=Kru\u017eni luk odre\u0111en s tri ta\u010dke
CircumcircleArc3.Help=Ozna\u010dite/Kreirajte tri ta\u010dke na kru\u017enom luku
CircumcircleSector3=Isje\u010dak opisanog kru\u017enog luka odre\u0111en s tri ta\u010dke
CircumcircleSector3.Help=Ozna\u010dite/Kreirajte tri ta\u010dke isje\u010dka
-ClassRule=Klasa Pravila
+ClassRule=Klasa-Pravila
Classes=Klase
ClearColumn=O\u010disti kolonu
ClearColumns=O\u010disti kolone
@@ -77,21 +79,21 @@ ClipboardMessage=Prenos u radnu memoriju uspje\u0161an.\nSada uklju\u010dite HTM
Close=Zatvori
CloseAll=Zatvori sve
CloseFile=Zatvori datoteku
-CmdList=Lista naredbi
+CmdList=Pomo\u0107 za unos
Coefficient=Koeficijent
-CollapseAll=Poni\u0161ti Sve
-ColumnHeader=Zaglavlje Kolone
-ColumnOrder=Sortiraj Kolonu
-ColumnReset=Vrati po\u010detno stanje u Koloni
+CollapseAll=Poni\u0161ti sve
+ColumnHeader=Zaglavlje kolone
+ColumnOrder=Sortiraj kolonu
+ColumnReset=Vrati po\u010detno stanje u koloni
Columns=Kolone
Comma=Zarez
CommandName=Ime naredbe
Compasses=\u0160estar
-Compasses.Help=Ozna\u010dite/Kreirajte du\u017e ili dvije ta\u010dke - polupre\u010dnik kru\u017enice, zatim ta\u010dku-centar kru\u017enice
-ComplexNumber=Kompleksan Broj
-ComplexNumber.Help=Kliknite na Radnu povr\u0161 da kreirate kompleksni broj
-ConciseCode=Koncizni Kod
-ConciseUsingCSE5=Koncizni Kod pomo\u0107u cse5
+Compasses.Help=Ozna\u010dite/Kreirajte du\u017e ili dvije ta\u010dke-polupre\u010dnik kru\u017enice, zatim ta\u010dku-centar kru\u017enice
+ComplexNumber=Kompleksan broj
+ComplexNumber.Help=Kliknite na radnu povr\u0161 da kreirate kompleksni broj
+ConciseCode=KoncizniKod
+ConciseUsingCSE5=KoncizniKod pomo\u0107u CSE5
Condition.ShowObject=Uvjet za prikaz figure
Conditions=Uvjeti
ConfidenceInterval=Interval pouzdanosti
@@ -100,12 +102,12 @@ Conic=Konika
Conic5=Konika odre\u0111ena s pet ta\u010daka
Conic5.Help=Ozna\u010dite/Kreirajte pet ta\u010daka konike
ConicMenu=Konika
-ConicSectionTools=Konike -Alati
+ConicSectionTools=Konike-Alati
Continuity=Neprekidnost
Continuous=Neprekidno
Copy=Kopiraj
CopyToClipboard=Kopiraj u radnu memoriju
-CopyToGraphics=Kopiraj u Radnu povr\u0161
+CopyToGraphics=Kopiraj na radnu povr\u0161
CopyToInputBar=Kopiraj u traku za unos
CopyToSpreadsheet=Kopiraj u tabelu
CopyVisualStyle=Kopiraj izgled figure
@@ -114,33 +116,34 @@ Count=Prebroj
CountCells=Broj numeri\u010dkih vrijednosti u skupu \u0107elija
CountCells.Help=Ozna\u010di skup \u0107elija
Create=Kreiraj
-CreateCurveFit=NajboljaKrivaRegresije
+CreateCurveFit=Najbolja Kriva Regresije
CreateCurveFit.Help=Ozna\u010dite \u0107elije s ta\u010dkama i kliknite na alat
-CreateList=Kreiraj Listu
+CreateList=Kreiraj listu
CreateList.Help=Ozna\u010dite \u0107elije i kliknite na alat
-CreateListGraphicsView=Kreiraj Listu
+CreateListGraphicsView=Kreiraj listu
CreateListGraphicsView.Help=Ozna\u010dite pravougaonu povr\u0161 oko figure
-CreateListOfPoints=Kreiraj Listu ta\u010daka
+CreateListOfPoints=Kreiraj listu ta\u010daka
CreateListOfPoints.Help=Ozna\u010dite \u0107elije i kliknite na alat
-CreateMatrix=Kreiraj Matricu
+CreateMatrix=Kreiraj matricu
CreateMatrix.Help=Ozna\u010dite \u0107elije i kliknite na alat
-CreateOperationTable=Kreiraj Tabelu operacija
+CreateOperationTable=Kreiraj tabelu operacija
CreateOperationTable.Help=Ozna\u010dite blok \u0107elija, zatim kliknite na alat
-CreatePolyLine=Kreiraj Mnogougaonu Liniju
+CreatePolyLine=Kreiraj mnogougaonu liniju
CreatePolyLine.Help=Ozna\u010dite \u0107elije s ta\u010dkama i kliknite na alat
-CreateTable=Kreiraj Tabelu
+CreateTable=Kreiraj tabelu
CreateTable.Help=Ozna\u010dite \u0107elije i kliknite na alat
Cumulative=Kumulativno
-CustomTools=Korisni\u010dki Alati
+CursiveLetters=Cursive
+CustomTools=Korisni\u010dki alati
Cut=Rez
Data=Podatak
-DataColumn=Kolona Podataka
+DataColumn=Kolona podataka
DataColumnName=Ime kolone podataka
-DataTitle=Podaci Naslov
-DecimalPlaces=Decimalna mjesta
+DataTitle=Naziv podataka
+DecimalPlaces=Decimalna/ih mjesta
Default.Restore=Povratak na osnovne postavke
Default.Set=Osnovne postavke
-Degree=Stepen
+Degree=stepeni
DegreesOfFreedom.short=ss
DegreesOfFreedom1.short=ss1
DegreesOfFreedom2.short=ss2
@@ -148,41 +151,41 @@ Delete=Obri\u0161i figuru
Delete.Help=Ozna\u010dite figuru koju \u017eelite da obri\u0161ete
DeleteObjects=Obri\u0161i figure
DeleteTool=Obri\u0161i-Alat
-Delimiter=Znak razdvajanja
+Delimiter=Grani\u010dnik
Derivative=Izvod
Derivative.Help=Izra\u010dunava prvi izvod
Descending=Opadaju\u0107i
-DifferenceofMeansT=Razlika srednjih vrijednosti T
+DifferenceofMeansT=Razlika srednjih vrijednosti
Differences=Razlike
DilateFromPoint=Homotetija figure iz ta\u010dke za faktor
DilateFromPoint.Help=Ozna\u010dite figuru koju \u017eelite homoteti\u010dno da preslikate, zatim ta\u010dku-centar homotetije i unesite vrijednost koeficijenta homotetije
-Discrete=Diskretan
+Discrete=Diskretna
Distance=Udaljenost ili Du\u017eina
Distance.Help=Ozna\u010dite dvije ta\u010dke, du\u017e ili kru\u017enicu
Distribution=Distribucija
Distribution.Binomial=BinomnaDist
Distribution.Cauchy=CauchyDist
-Distribution.ChiSquare=HiKvadrat
+Distribution.ChiSquare=Hi-Kvadrat
Distribution.Exponential=EksponencijalnaDist
Distribution.F=FDist
Distribution.Gamma=GammaDist
-Distribution.Hypergeometric=HiperGeometrijskaDist
+Distribution.Hypergeometric=HipergeometrijskaDist
Distribution.Logistic=Logisti\u010dkaDist
Distribution.Lognormal=Log-NormalDist
Distribution.Normal=NormalnaDist
Distribution.Pascal=PascalDist
Distribution.Poisson=PoissonDist
-Distribution.Scale=skala
-Distribution.Shape=oblik
+Distribution.Scale=Skala
+Distribution.Shape=Oblik
Distribution.StudentT=StudentDist
Distribution.Weibull=WeibullDist
-DoYouWantToSaveYourChanges=Da li \u017eelite da sa\u010duvate izmjene ?
+DoYouWantToSaveYourChanges=Da li \u017eelite da sa\u010duvate izmjene?
DontDeleteTool=Ne
DontOverwrite=Ne
DontSave=Ne
-DotPlot=Ta\u010dkasti Dijagram
+DotPlot=Ta\u010dkasti dijagram
DrawingPadToClipboard=Radna povr\u0161 u radnu memoriju
-DynamicColors=Dinami\u010dne boje
+DynamicColors=Dinami\u010dke boje
Edit=Ure\u0111enje
Ellipse3=Elipsa
Ellipse3.Help=Ozna\u010dite/Kreirajte dvije ta\u010dke-fokuse elipse i ta\u010dku na elipsi
@@ -193,67 +196,68 @@ EnterAppletAddress=Unesi Web-adresu GeoGebra apleta
EnterWebAddress=Unesi Web-adresu
EqualVariance=Jednaka varijanca
Equation=Jedna\u010dina
-EstimatedValue=Procjena vrijednosti
+EstimatedValue=O\u010dekivana vrijednost
Evaluate=Procjena
-Evaluate.Help=Egzaktna procjena
+Evaluate.Help=Egzaktna vrijednost
Exit=Izlaz
Expand=Uprosti
Expand.Help=Osloba\u0111a od zagrada
-ExpandAll=Uprosti Sve
-Exponential=Eksponencijalan
+ExpandAll=Uprosti sve
+Exponential=Eksponencijalna
Export=Prenos
ExportAllWorksheets=Prenos svih otvorenih radnih listova
-Factor=Faktor
+Factor=Faktorizacija
Factor.Help=Nalazi faktore
FastHelp=Brza pomo\u0107
File=Datoteka
-FileBrowser=Pretra\u017eiva\u010d Datoteka
-FileSystem=Sistem Datoteka
+FileBrowser=Pretra\u017eiva\u010d datoteka
+FileSystem=Sistem datoteka
Files=Datoteke
-FillType=Tip Datoteke
+FillType=Tip ispune
Filling=Ispuna
Filling.Hatch=Sjen\u010denje
Filling.Image=Slika
-FitCurve=NajboljaRegresija Krive
+FitCurve=Najbolja Kriva Regresije
FitCurve.Help=Ozna\u010dite ta\u010dke ozna\u010davaju\u0107i pravougaono podru\u010dje na radnoj povr\u0161i ili liste ta\u010daka
-FitLine=NajboljaLinearnaRegresija
+FitLine=Najbolja Linearna Regresija
FitLine.Help=Ozna\u010dite ta\u010dke ozna\u010davaju\u0107i pravougaono podru\u010dje na radnoj povr\u0161i ili listu ta\u010daka
-Fix=Fiksiranje uklju\u010deno / isklju\u010deno
-Fix.Help=Ozna\u010dite figuru da je fiksirate / oslobodite
-FixedToGrid=Fiksiraj koordinatnu mre\u017eu
+Fix=Fiksiranje uklju\u010deno/isklju\u010deno
+Fix.Help=Ozna\u010dite figuru da je fiksirate/oslobodite
+FixedToGrid=Fiksiraj za mre\u017eu
FontSize=Veli\u010dina fonta
ForegroundColor=Boja prednje strane
Formulas=Formule
+FrakturLetters=Fraktur
Frequency=Frekvencija
-FrequencyPolygon=Dijagram Frekvencije
-FrequencyTable=Tabela Frekvencije
-FrequencyType=Tip Frekvencije
-FunctionInspector=Inspektor Funkcija
+FrequencyPolygon=Dijagram frekvencije
+FrequencyTable=Tabela frekvencije
+FrequencyType=Tip frekvencije
+FunctionInspector=Inspektor/Ispitiva\u010d funkcija
FunctionInspector.Help=Ozna\u010dite funkciju
-Functionality=Funkcionalan
-GUIFontSize=Izbornik Veli\u010dina fonta
+Functionality=Funkcionalnost
+GUIFontSize=Veli\u010dina fonta
General=Op\u0107e postavke
-GeneralTools=Op\u0107i Alati
+GeneralTools=Op\u0107i alati
GenerateCode=Generi\u0161i Kod
-GeogebraToAsymptoteExport=GeoGebra - Asymptote prenos
+GeogebraToAsymptoteExport=Prenos GeoGebra-Asymptote
Geometry=Geometrija
German=Njema\u010dki
Graph=Graf
GraphicsQuality=Grafike
Green=Zelena
Grid=Koordinatna mre\u017ea
-Gridlines=Koordinatna mre\u017ea
-GroupObjects=Grupa Figura
-HTML5Only=Prenos u HTML5
-HTML5WithJava=Prenos u HTML5 (s Java prenosom)
+Gridlines=Mre\u017ea
+GroupObjects=Grupa figura
+HTML5Only=Prenos u HTML5(isklju\u010divo)
+HTML5WithJava=Prenos u HTML5(s Java podr\u0161kom)
Help=Pomo\u0107
Hidden.Dashed=Isprekidano
Hidden.Invisible=Nevidljivo
Hidden.Unchanged=Nepromijenjeno
HiddenLineStyle=Skriveni izgled linije
HighQuality=Visoki kvalitet
-HomeDirectory=Po\u010detni Direktorij
-HorizontalScrollbars=Horizontalni Kliza\u010d
+HomeDirectory=Po\u010detni direktorij
+HorizontalScrollbars=Horizontalni kliza\u010d
Hue=Nijansa
Hyperbola3=Hiperbola
Hyperbola3.Help=Ozna\u010dite/Kreirajte dvije ta\u010dke-fokuse hiperbole i ta\u010dku na hiperboli
@@ -261,14 +265,14 @@ Hypergeometric.population=populacija
Hypergeometric.sample=uzorak
Icon=Ikona
Image=Ubacivanje slike
-Image.Help=Kliknite na Radnu povr\u0161 ili na ta\u010dku da specificirate poziciju slike
+Image.Help=Kliknite na radnu povr\u0161 ili na ta\u010dku da specificirate poziciju slike
Images=Slike
-ImportDataFile=Unos Podataka Datoteke
+ImportDataFile=Unos podataka
IncludeHTML5=Uklju\u010di HTML5
InputField=Traka za unos
InputField.Help=Ozna\u010dite figuru da kopirate njeno ime u traku za unos
-InputHelp=Unos Pomo\u0107
-InputObjects=Unos Figura
+InputHelp=Pomo\u0107 za unos
+InputObjects=Unos figura
InsertAbove=Ubaci iznad
InsertBelow=Ubaci ispod
InsertLeft=Ubaci lijevo
@@ -280,37 +284,37 @@ Intersect=Presjek dvije figure
Intersect.Help=Ozna\u010dite dvije figure ili kliknite direktno na njihov presjek
IntersectionCurve=Presjek dvije povr\u0161i
IntersectionCurve.Help=Kreira krivu kao presjek dvije povr\u0161i
-IntervalType=Tip Intervala
+IntervalType=Tip intervala
InvertSelection=Sve osim odabranog
-Isometric=Izometrija
-JavaOnly=Prenos u Java
-JavaWithHTML5=Prenos u Java (s HTML5 prenosom)
+Isometric=Izometrijska mre\u017ea
+JavaOnly=Prenos u Java(isklju\u010divo)
+JavaWithHTML5=Prenos u Java(s HTML5 podr\u0161kom)
Join=Prava odre\u0111ena s dvije ta\u010dke
Join.Help=Ozna\u010dite/Kreirajte dvije ta\u010dke
-KeepDotColors=Zadr\u017ei Boje Ta\u010daka
-KeepInput=Zadr\u017ei Unos
+KeepDotColors=Zadr\u017ei boje ta\u010daka
+KeepInput=Zadr\u017ei unos
KeepInput.Help=Zadr\u017ei i provjeri unos
-LabelColumn=Oznaka Kolone
-LabelColumnName=Ime oznaka Kolone
+LabelColumn=Oznaka kolone
+LabelColumnName=Naziv oznake kolone
Labeling=Ozna\u010davanje
Labeling.automatic=Automatsko
Labeling.off=Ne novih figura
Labeling.on=Svih novih figura
Labeling.pointsOnly=Samo novih ta\u010daka
Labeling.propertiesDefault=Koristi osnovne postavke
-Labels=Poka\u017ei / Sakrij oznake
+Labels=Poka\u017ei/Sakrij oznake
Landscape=Horizontalni A4
Language=Jezik
-Layout=Plan
-LeftProb=Lijeva Strana
+Layout=Raspored
+LeftProb=Jednostrani lijevi
License=Licenca
Lightness=Svjetlost
LineBisector=Simetrala du\u017ei
LineBisector.Help=Ozna\u010dite dvije ta\u010dke ili du\u017e
-LineGraph=Linijski Dijagram
+LineGraph=Linijski dijagram
LineMenu=Prava
Linear=Linearno
-LinkedFiles=Povezane Datoteke
+LinkedFiles=Povezane datoteke
List=Lista
ListOfPoints=Lista ta\u010daka
Load=U\u010ditaj
@@ -320,11 +324,11 @@ Locus.Help=Ozna\u010dite prvo ta\u010dku lokusa, zatim ta\u010dku na pravoj
Logistic=Logisti\u010dka
LookAndFeel=Izgled
LowQuality=Niski kvalitet
-LowerLimit=Donja Granica
+LowerLimit=Donja granica
ManagePerspectives=Perspektive
MarginOfError=Dopu\u0161tena pogre\u0161ka
MarginOfError.short=DP
-MathematicalFunctions=Matemati\u010dke Funkcije
+MathematicalFunctions=Matemati\u010dke funkcije
Matrices=Matrice
Matrix=Matrica
MaxCells=Maksimum
@@ -332,7 +336,7 @@ MaxCells.Help=Ozna\u010dite skup \u0107elija
Mean=Srednja vrijednost
MeanCells=Srednja vrijednost
MeanCells.Help=Ozna\u010dite skup \u0107elija
-MeanDifference=Razlika Srednjih vrijednosti
+MeanDifference=Razlika srednjih vrijednosti
MeanSquare.short=KSV
MeanX=Srednja vrijednost X
MeanY=Srednja vrijednost Y
@@ -341,7 +345,7 @@ Median=Medijan
Midpoint=Sredi\u0161te ili Centar
Midpoint.Help=Ozna\u010dite dvije ta\u010dke, du\u017e, kru\u017enicu ili koniku
MinCells.Help=Ozna\u010dite skup \u0107elija
-MirrorAtCircle=Inverzija
+MirrorAtCircle=Inverzija figure na kru\u017enici
MirrorAtCircle.Help=Ozna\u010dite ta\u010dku, zatim kru\u017enicu
MirrorAtLine=Osna simetrija
MirrorAtLine.Help=Ozna\u010dite figuru koju \u017eelite simetri\u010dno preslikati, zatim pravu-osu simetrije
@@ -350,87 +354,80 @@ MirrorAtPoint.Help=Ozna\u010dite figuru koju \u017eelite simetri\u010dno preslik
Mode=Na\u010din
Motif=Motiv
Move=Pomjeranje
-Move.Help=Pomjeranje ozna\u010denih figura (Esc)
+Move.Help=Pomjeranje ili ozna\u010davanje figura(Esc)
MoveRotate=Rotacija oko ta\u010dke
MoveRotate.Help=Ozna\u010dite ta\u010dku-centar rotacije, zatim ozna\u010dite figuru koju \u017eelite rotirati
-MovementTools=Dinami\u010dni Alati
-MultiVarStats=Multivarijantna Analiza
+MovementTools=Dinami\u010dki Alati
+MultiVarStats=Multivarijabilna analiza
MultiVarStats.Help=Analiza dva ili vi\u0161e skupova podataka iz ozna\u010denih kolona
-MultiVariableStatistics=Multivarijantna Statistika
+MultiVariableStatistics=Multivarijabilna statistika
Name=Ime
-NameAndDraw=Ime i Reprezentacija
-NameAndDraw.Help=Imena i reprezentacije teku\u0107eg reda
-NameIcon=Ime & Ikona
+NameAndDraw=Ime i Crte\u017e
+NameAndDraw.Help=Imenuje i crta trenutni red
+NameIcon=Ime&Ikona
New=Nova
NewWindow=Novi prozor
Next=Sljede\u0107a
None=Nijedan
NormalCurve=Kriva NormalneDist
NormalQuantilePlot=Normalni QQ Dijagram
-Normalized=Normalizirani
-NullHypothesis=Null Hipoteza
-Numeric=Numeri\u010dka
-Numeric.Help=Numeri\u010dka procjena
+Normalized=Normirano
+NullHypothesis=Nulta Hipoteza
+NullHypothesis.short=Nulta
+Numeric=Numeri\u010dka vrijednost
+Numeric.Help=Numeri\u010dka pribli\u017ena vrijednost
Objects=Figure
-OneVarStats=Jednosmjerna Analiza
+OneVarStats=Jednovarijabilna analiza
OneVarStats.Help=Analizira numeri\u010dke vrijednosti iz ozna\u010denih \u0107elija
-OneVariable=Jedna Promjenljiva
-OneVariableInference=Zaklju\u010dak jednosmjerne analize
-OneVariableStatistics=Statistika jednosmjerne analize
+OneVariable=Jedna promjenljiva
+OneVariableInference=Jednovarijabilna inferencija
+OneVariableStatistics=Jednovarijabilna statistika
OnlyOpaqueFills=Samo neprovidne ispune
Opacity=Neprovidnost
-OpenFileFolder=Otvori Mapu Datoteke
+OpenFileFolder=Otvori mapu datoteke
OpenFromWebpage=Otvori s Web-stranice
OpenWebpage=Otvori Web-stranicu
Operation=Operacija
-OperationTable=Tabela Operacija
+OperationTable=Tabela operacija
Options=Opcije
Orthogonal=Normala
Orthogonal.Help=Ozna\u010dite ta\u010dku kroz koju \u017eelite konstruisati normalu, zatim pravu na koju \u017eelite konstruisati normalu
-OrthogonalPlane=Normalna Ravan
-OrthogonalPlane.Help=Ozna\u010dite ta\u010dku kroz koju \u017eelite konstruisati normalnu ravan, zatim pravu na koju \u017eelite konstruisati normalnu ravan
-Other=Ostale
+Other=Ostalo
OutputObjects=Izlazne figure
Overlay=Prekrij
-OverlayFrequencyPolygon=Prekrij Dijagram Frekvencija
-OverlayNormalCurve=Prekrij Krivu NormalneDist
+OverlayFrequencyPolygon=Prekrij dijagram frekvencija
+OverlayNormalCurve=Prekrij krivu NormalneDist
Overwrite=Da
PairedT=Dvosmjerno T
Parabola.Help=Ozna\u010dite ta\u010dku i direktrisu
Parallel=Paralela
Parallel.Help=Ozna\u010dite ta\u010dku kroz koju \u017eelite konstruisati paralelu, zatim pravu kojoj \u017eelite konstruisati paralelu
-ParallelPlane=Paralelna Ravan
-ParallelPlane.Help=Ozna\u010dite ta\u010dku kroz koju \u017eelite konstruisati paralelnu ravan, zatim pravu kojoj \u017eelite konstruisati paralelnu ravan
Paste=Zalijepi
PasteDataFromClipboard=Zalijepi podatke iz radne memorije
PasteSpecial=Posebno ljepljenje
Pen=Olovka-Alat
-Pen.Help=Crtanje na Radnoj povr\u0161i. Odaberite razli\u010dite alate da zavr\u0161ite crte\u017e
-Perspective.AlgebraAndGraphics=Algebra & Grafika
-Perspective.BasicGeometry=Elementarna Geometrija
-Perspective.CASAndGraphics=CAS & Grafika
+Pen.Help=Crtanje na radnoj povr\u0161i. Odaberite drugi alat da zavr\u0161ite crte\u017e
+Perspective.AlgebraAndGraphics=Algebra&Grafika
+Perspective.BasicGeometry=Elementarna geometrija
+Perspective.CASAndGraphics=CAS&Grafika
Perspective.Geometry=Geometrija
-Perspective.Primary=Po\u010detna
-Perspective.TableAndGraphics=Tabela & Grafika
-Perspective.Whiteboard=Bijela radna povr\u0161
+Perspective.Primary=Po\u010detna perspektiva
+Perspective.TableAndGraphics=Tabela&Grafika
+Perspective.Whiteboard=Radna povr\u0161
Perspectives=Perspektive
-PlanePointLine=Ravan odre\u0111ena ta\u010dkom i pravom
-PlanePointLine.Help=Ozna\u010dite ta\u010dku i pravu
-PlaneThreePoint=Ravan odre\u0111ena s tri nekolinearne ta\u010dke
-PlaneThreePoint.Help=Ozna\u010dite tri ta\u010dke
Point=Nova ta\u010dka
-Point.Help=Kliknite na Radnu povr\u0161 ili pravu ili krivu da kreirate novu ta\u010dku
+Point.Help=Kliknite na radnu povr\u0161 ili pravu ili krivu da kreirate novu ta\u010dku
PointCapturing=Vezivanje ta\u010dke na mre\u017eu
-PointInside=Ta\u010dka u Regionu
+PointInside=Ta\u010dka u regionu
PointMenu=Ta\u010dka
-PointOnObject=Ta\u010dka na Figuri
+PointOnObject=Ta\u010dka na figuri
PointOnObject.Help=Kliknite na unutra\u0161nju oblast figure ili na njenu povr\u0161inu da kreirate ta\u010dku
PointStyle=Oblik ta\u010dke
PointTools=Ta\u010dka-Alati
-Polar=Polara
+Polar=Polarna mre\u017ea
PolarDiameter=Polara ili konjugirani pre\u010dnik
PolarDiameter.Help=Ozna\u010dite ta\u010dku ili pravu, zatim kru\u017enicu ili koniku
-PolyLine=Mnogougaona Linija
+PolyLine=Mnogougaona linija
PolyLine.Help=Ozna\u010dite/kreirajte sve ta\u010dke-tjemena i kliknite na prvu ta\u010dku-tjeme ponovo
Polygon=Mnogougao
Polygon.Help=Ozna\u010dite/kreirajte sve ta\u010dke-tjemena i kliknite na prvu ta\u010dku-tjeme ponovo
@@ -441,15 +438,14 @@ Power=Stepen
Preview=Pregled
Print=\u0160tampanje
PrintPreview=Pregled prije \u0161tampanja
-Prism=Prizma
-Prism.Help=Ozna\u010dite/Kreirajte mnogougao ili ta\u010dke i ta\u010dku u ravni parelnoj s datom
Probability=Vjerovatno\u0107a
-ProbabilityCalculator=Kalkulator Vjerovatno\u0107e
-ProbabilityCalculator.Help=Dijalog za izra\u010dunavanje vjerovatno\u0107e
-Properties.Basic=Elementarna
+ProbabilityCalculator=Kalkulator vjerovatno\u0107e
+ProbabilityCalculator.Help=Dijalo\u0161ki okvir za izra\u010dunavanje vjerovatno\u0107e
+ProbabilityOf=V(
+Properties.Basic=Osnovne
Properties.Position=Polo\u017eaj
Properties.Style=Stil
-Radiant=Radijani
+Radiant=radijani
Ray=Poluprava odre\u0111ena s dvije ta\u010dke
Ray.Help=Ozna\u010dite/Kreirajte po\u010detnu, zatim ta\u010dku na polupravoj
Recent=Otvori nedavno kori\u0161teno
@@ -465,7 +461,7 @@ RecoveryTitle=Nemogu\u0107a obnova
Red=Crvena
Redo=Ponovi
Refresh=Osvje\u017ei
-RegressionAnalysis=Regresijska Analiza
+RegressionAnalysis=Regresijska analiza
RegressionInference=Zaklju\u010dak regresije
RegressionModel=Model regresije
RegularPolygon=Pravilni mnogougao
@@ -477,35 +473,33 @@ RemoveLineBreaks=Ukloni prekide redaka
RemoveTrace=Ukloni figuru iz trag liste
Rename=Preimenovanje
ReplaceAll=Zamijeni sve \u0107elije
-RequireEquals=Zahtijeva znak "=" prije naredbe
+RequireEquals=Zahtjeva znak "=" prije naredbe
ResidualPlot=Dijagram disperzije
Result=Rezultat
-ReturnAngleInverseTrig=Izrazi ugao iz inverzne trigonometrijske funkcije
+ReturnAngleInverseTrig=Vrati ugao iz inverznih trigonometrijskih funkcija
RightAngleStyle=Oznaka pravog ugla
-RightPrism=Prava Prizma
-RightPrism.Help=Ozna\u010dite/Kreirajte mnogougao i unesite visinu
-RightProb=Desna strana
-RigidPolygon=FiksniMnogougao
+RightProb=Jednostrani desni
+RigidPolygon=Fiksni mnogougao
RigidPolygon.Help=Ozna\u010dite/kreirajte sve ta\u010dke-tjemena i kliknite na prvu ta\u010dku-tjeme ponovo
RootsAndFractions=Nule i Razlomci
RotateByAngle=Rotacija figure oko ta\u010dke za ugao
RotateByAngle.Help=Ozna\u010dite figuru koju \u017eelite rotirati, zatim ta\u010dku-centar rotacije i ugao-ugao rotacije
-RotateView=Rotacija 3D Radne povr\u0161i
-RotateView.Help=Pomjerajte 3D Radnu povr\u0161
+RotateView=Rotacija 3D-radne povr\u0161i
+RotateView.Help=Pomjerajte 3D-radnu povr\u0161
Rounding=Zaokru\u017eivanje
RowHeader=Zaglavlje reda
RowLimit=Granica reda
RowOrder=Sortiranje reda
Sample1=Uzorak 1
Sample2=Uzorak 2
-Saturation=Saturacija
+Saturation=Zasi\u0107enje
Save=Sa\u010duvaj
SaveAs=Sa\u010duvaj kao
SaveCurrentFileQuestion=\u017delite li sa\u010duvati trenutnu datoteku?
SaveCurrentPerspective=Da
SavePrintUndo=Omogu\u0107i Sa\u010duvaj, \u0160tampaj i Poni\u0161ti
SaveToXML=Sa\u010duvaj kao XML
-Scatterplot=Raspr\u0161eni Dijagram
+Scatterplot=Raspr\u0161eni dijagram
Segment=Du\u017e odre\u0111ena s dvije ta\u010dke
Segment.Help=Ozna\u010dite/Kreirajte dvije ta\u010dke
SegmentFixed=Du\u017e zadane du\u017eine iz ta\u010dke
@@ -513,7 +507,7 @@ SegmentFixed.Help=Ozna\u010dite/Kreirajte ta\u010dku i unesite du\u017einu du\u0
Select=Ozna\u010di figuru
Select.Help=Kliknite na figuru da je ozna\u010dite
SelectACurve=Ozna\u010di krivu
-SelectAll=Ozna\u010di Sve
+SelectAll=Ozna\u010di sve
SelectAnObjectToTrace=Ozna\u010dite figuru za trag
SelectAncestors=Ozna\u010di prethodne figure
SelectCurrentLayer=Ozna\u010di trenutne figure
@@ -521,7 +515,7 @@ SelectDescendants=Ozna\u010di naredne figure
Semicircle=Polukru\u017enica odre\u0111ena s dvije ta\u010dke
Semicircle.Help=Ozna\u010dite dvije ta\u010dke polukru\u017enice
Semicolon=Ta\u010dka-zarez
-SetClasssesManually=Manualno postavljanje Klasa
+SetClasssesManually=Manualno postavljanje klasa
SetToCurrentLocation=Postavi na trenutnu poziciju
Settings=Postavke
Settings.ResetDefault=Vrati na osnovne postavke
@@ -530,8 +524,8 @@ Share=Dijeli
Show=Prika\u017ei
ShowAtTop=Vrh
ShowAxesGrid=Prika\u017ei ose/mre\u017eu
-ShowCheckBox=Okvir za izbor Prika\u017ei/ Sakrij figuru
-ShowCheckBox.Help=Kliknite na Radnu povr\u0161 da specificirate poziciju okvira za izbor
+ShowCheckBox=Okvir za izbor prika\u017ei/sakrij figuru
+ShowCheckBox.Help=Kliknite na radnu povr\u0161 da specificirate poziciju okvira za izbor
ShowColumnHeader=Prika\u017ei zaglavlje kolone
ShowCornerCoordinates=Prika\u017ei ugaone koordinate
ShowData=Prika\u017ei podatake
@@ -543,22 +537,22 @@ ShowHideLabel.Help=Ozna\u010dite figuru
ShowHideLabels=Prika\u017ei/Sakrij oznake
ShowHideObject=Prika\u017ei/Sakrij figuru
ShowHideObject.Help=Ozna\u010dite figure da ih skrijete, zatim izaberite drugi alat
-ShowHorizontalScrollbars=Prika\u017ei Horizontalni kliza\u010d
+ShowHorizontalScrollbars=Prika\u017ei horizontalni kliza\u010d
ShowInToolBar=Prika\u017ei u alatnoj traci
-ShowInputField=Prika\u017ei polje za unos
-ShowMenuBar=Prika\u017ei Izbornik
-ShowMouseCoordinates=Prika\u017ei koordinate kursora
+ShowInputField=Prika\u017ei traku za unos
+ShowMenuBar=Prika\u017ei traku izbornika
+ShowMouseCoordinates=Prika\u017ei koordinate kursora mi\u0161a
ShowPlot2=Prika\u017ei drugi dijagram
-ShowResetIcon=Poka\u017ei ikonu za resetiranje konstrukcije
+ShowResetIcon=Prika\u017ei ikonu za reset konstrukcije
ShowRowHeader=Prika\u017ei zaglavlje reda
-ShowStatistics=Prika\u017ei Statistiku
+ShowStatistics=Prika\u017ei statistiku
ShowToolBar=Prika\u017ei Alatnu traku
-ShowToolBarHelp=Prika\u017ei Alatnu traku - Pomo\u0107
-ShowVerticalScrollbars=Prika\u017ei Vertikalni kliza\u010d
-SingleFile=Pojedina\u010dna Datoteka
-SingleFileTabs=Pojedina\u010dna Datoteka ( Tabs)
+ShowToolBarHelp=Prika\u017ei Alatnu traku-Pomo\u0107
+ShowVerticalScrollbars=Prika\u017ei vertikalni kliza\u010d
+SingleFile=Pojedina\u010dna datoteka
+SingleFileTabs=Pojedina\u010dna datoteka(Kartice)
Slider=Kliza\u010d
-Slider.Help=Kliknite na Radnu povr\u0161 da specificirate poziciju kliza\u010da
+Slider.Help=Kliknite na radnu povr\u0161 da specificirate poziciju kliza\u010da
Slope=Nagib
Slope.Help=Ozna\u010dite pravu
SnapToGrid=Poravnanje s mre\u017eom
@@ -573,7 +567,7 @@ Sort.Help=Ozna\u010dite \u0107elije za sortiranje
SortBy=Sortiraj po
Space=Razmak
SpaceBetweenThousands=Razmak izme\u0111u hiljada
-Spacing=Razmicanje
+Spacing=Prore\u0111ivanje
SpecialLineTools=Prava-Specijalni alati
SpecialObjectTools=Figura-Specijalni alati
Sphere2=Sfera odre\u0111ena centrom i ta\u010dkom
@@ -589,9 +583,9 @@ StackedBoxPlots=Superponirani dijagrami
StandardError=Standardna gre\u0161ka
StandardError.short=SG
StartRow=Po\u010detni red
-Statistics=Statistike
-Statistics2=Statistike2
-StemPlot=Dijagram stabla i lista
+Statistics=Statistika
+Statistics2=Statistika2
+StemPlot=Dijagram drvo-list
Step=Korak
Substitute=Zamijeni
Substitute.Help=Ozna\u010dite dio izraza za zamjenu
@@ -604,7 +598,7 @@ SumsAndIntegrals=Suma i Integrali
Symbol.And=i
Symbol.Angle=Ugao
Symbol.AngleMeasure=Ugaona mjera
-Symbol.BooleanEqual=Booelan jednak
+Symbol.BooleanEqual=Logi\u010dki jednak
Symbol.Cube=Kub
Symbol.Degree=Stepen
Symbol.GreaterThanEqualTo=Ve\u0107i od ili jednak s
@@ -617,7 +611,7 @@ Symbol.Or=Ili
Symbol.Parallel=Paralelno
Symbol.Perpendicular=Normalno
Symbol.Square=Kvadrat
-Symbol.StrictSubset=Pravi Podskup
+Symbol.StrictSubset=Pravi podskup
Symbol.Subset=Podskup
Symbol.VectorProduct=Vektorski proizvod
Symbols=Simboli
@@ -627,69 +621,70 @@ TMeanInterval=T Procjena srednje vrijednosti
TMeanTest=T Test srednje vrijednosti
TTestDifferenceOfMeans=T Test, Razlika srednjih vrijednosti
TTestPairedDifferences=T Test, Spregnuta razlika
+Tab=Kartica
Table=Tabela
Tangent=Tangente
Tangent.Help=Ozna\u010dite ta\u010dku ili pravu, zatim kru\u017enicu, koniku ili graf funkcije
-Text=Ubacivanje teksta
-Text.Help=Kliknite na Radnu povr\u0161 ili ta\u010dku da specificirate poziciju
-TextFieldAction=Ubaci TekstPolje
-TextFieldAction.Help=Kliknite na Radnu povr\u0161da ubacite tekstualno polje
+Text=Ubaci tekst
+Text.Help=Kliknite na radnu povr\u0161 ili ta\u010dku da specificirate poziciju
+TextFieldAction=Ubaci tekst polje
+TextFieldAction.Help=Kliknite na radnu povr\u0161da ubacite tekst polje
ThenBy=Tada
Tool=Alat
Tool.CreateNew=Kreiranje novog alata
-Tool.CreationSuccess=Novi alat je uspje\u0161no kreiran !
+Tool.CreationSuccess=Novi alat je uspje\u0161no kreiran!
Tool.DeleteQuestion=Da li \u017eelite da obri\u0161ete ozna\u010deni alat?
Tool.Manage=Alatni menad\u017eer
Tool.SelectObjects=Ozna\u010dite figure u konstrukciji ili izaberite s liste
-ToolHelp=Alat-pomo\u0107
+ToolHelp=Alat-Pomo\u0107
ToolName=Ime alata
Toolbar=Alatna traka
Toolbar.Customize=Prilago\u0111avanje izgleda alatne trake
Toolbar.ResetDefault=Vrati na osnovne postavke alatne trake
Tools=Alati
Tooltip=Kratke bilje\u0161ke
-Trace=Trag Uklju\u010den / Isklju\u010den
+Trace=Trag uklju\u010den/isklju\u010den
Trace.Help=Ozna\u010dite figuru kojoj \u017eelite prikazati trag
TraceCopy=Kopiraj trag
TraceToList=Trag do liste
TraceToSpreadsheet=Trag u tabelu
TraceToSpreadsheet.Help=Dijalog za unos traga figure u tabelu
-TransformationTools=Transformacije -Alati
+TransformationTools=Transformacije-Alati
TranslateByVector=Translacija figure za vektor
TranslateByVector.Help=Ozna\u010dite figuru koju \u017eelite preslikati translacijom, zatim vektor translacije
TranslateView=Pomjeranje radne povr\u0161i
-TranslateView.Help=Pomjeranje Radne povr\u0161i ili koordinatnih osa (Shift + pomjeranje)
+TranslateView.Help=Pomjeranje radne povr\u0161i ili koordinatnih osa(Shift + pomjeranje)
Transparent=Prozirnost
Transpose=Transponirana
Tutorials=Tutorijali
-TwoVarStats=Dvosmjerna analiza
+TwoVarStats=Dvovarijabilna regresijska analiza
TwoVarStats.Help=Analizira spregnute numeri\u010dke vrijednosti iz ozna\u010denih \u0107elija
TwoVariable=Dvije promjenljive
-TwoVariableInference=Zaklju\u010dak dvosmjerne analize
-Type.CAS=CAS- Specifi\u010dne naredbe
+TwoVariableInference=Dvovarijabilna inferencija
+Type.CAS=CAS-Specifi\u010dne naredbe
Type.Chart=Dijagram
Type.Conic=Konika
Type.DiscreteMath=Diskretna matematika
-Type.FunctionsAndCalculus=Funkcije & Analiza
+Type.FunctionsAndCalculus=Funkcije&Analiza
Type.Geometry=Geometrija
Type.List=Lista
-Type.Logic=Logika
-Type.OptimizationCommands=Optimizacija Naredbi
+Type.Logic=Logi\u010dke naredbe
+Type.OptimizationCommands=Naredbe optimiranja
Type.Probability=Vjerovatno\u0107a
Type.Scripting=Skriptiranje
Type.Spreadsheet=Tabela
-Type.Statistics=Statistike
+Type.Statistics=Statistika
Type.Text=Tekst
-Type.Transformation=Transformacije
-Type.VectorAndMatrix=Vektor & Matrica
+Type.Transformation=Transformacija
+Type.VectorAndMatrix=Vektor&Matrica
Undo=Poni\u0161ti
UngroupObjectes=Negrupirane figure
-Untitled=BezImena
-UploadGeoGebraTube=Nadogradi GeoGebraTube
+Untitled=Bez imena
+UploadGeoGebraTube=Postavi na GeoGebraTube
UpperLimit=Gornja granica
UseBrowserForJS=Koristi preglednik za JavaScript
-UseButtonsAndCheckboxes=Koristi Dugme i Okvir za izbor
-UseHeaderRow=Koristi Zaglavlje reda
+UseButtonsAndCheckboxes=Koristi dugme i okvir za izbor
+UseHeaderRow=Koristi zaglavlje reda
UserInterface=Korisni\u010dko su\u010delje
Value=Vrijednost
Values=Vrijednosti
@@ -700,23 +695,21 @@ VectorFromPoint.Help=Ozna\u010dite/Kreirajte po\u010detnu ta\u010dku i vektor
VectorMenu=Vektor
VectorPolygon=Vektorski mnogougao
VectorPolygon.Help=Ozna\u010dite/Kreirajte sva tjemena i ponovo kliknite na prvo tjeme
-VerticalScrollbars=Vertikalni kliza\u010di
+VerticalScrollbars=Vertikalni traka za pomjeranje
View=Prikaz
-ViewInFrontOf=Prikaz ispred
-ViewInFrontOf.Help=Promijenite klikom pogled na figuru
Views=Prikazi
-VisualStyle=VIzualni stil
+VisualStyle=Vizuelni stil
VisualStyle.Help=Klikom na figuru ili ozna\u010davanjem s pravougaonom povr\u0161i mijenjate njene osobine
Width=\u0160irina
Window=Prozor
Windows=Prozori
WithOpacityPen=S neprovidnom olovkom
-WithinGroups=Unutar Grupa
-ZMeanInterval=Z Procjena srednje vrijednosti
-ZMeanTest=Z Test srednje vrijednosti
+WithinGroups=Unutar grupa
+ZMeanInterval=Z procjena srednje vrijednosti
+ZMeanTest=Z test srednje vrijednosti
ZoomIn=Uve\u0107anje
-ZoomIn.Help=Kliknite na Radnu povr\u0161 da je uve\u0107ate (kota\u010di\u0107 mi\u0161a)
+ZoomIn.Help=Kliknite na radnu povr\u0161 da je uve\u0107ate ili okre\u0107ite kota\u010di\u0107 mi\u0161a
ZoomOut=Umanjenje
-ZoomOut.Help=Kliknite na Radnu povr\u0161 da je umanjite (kota\u010di\u0107 mi\u0161a)
-off=Isklju\u010deno
-on=Uklju\u010deno
\ No newline at end of file
+ZoomOut.Help=Kliknite na radnu povr\u0161 da je umanjite ili okre\u0107ite kota\u010di\u0107 mi\u0161a
+off=isklju\u010deno
+on=uklju\u010deno
\ No newline at end of file
diff --git a/geogebra/properties/menu_ca.properties b/geogebra/properties/menu_ca.properties
index 26cb454..8e5a1d7 100644
--- a/geogebra/properties/menu_ca.properties
+++ b/geogebra/properties/menu_ca.properties
@@ -1,6 +1,6 @@
About=Quant a GeoGebra
AccentsExt=Accents estesos
-ActionObjectTools=Eines d\u2019acció de l\u2019objecte
+ActionObjectTools=Eines d\u2019objectes d'acció
AddTrace=Afegeix a la llista de traces
Adjustment=Ajust
Advanced=Avançat
@@ -10,17 +10,17 @@ AllowRescaling=Permet el reescalat
AllowTooltips=Permet la informació contextual
AlternativeHypothesis=Hipòtesi alternativa
AlternativeHypothesis.short=Alternativa
-Angle.Help=Tres punts o dues rectes
+Angle.Help=Seleccioneu tres punts o dues rectes o dos segments
AngleFixed=Angle amb amplitud donada
-AngleFixed.Help=Un punt d'un costat, vèrtex, angle
+AngleFixed.Help=Seleccioneu un punt d'un costat, el vèrtex i entreu la mesura de l'angle
AngleUnit=Unitat angular
AngularBisector=Bisectriu
-AngularBisector.Help=Tres punts o dues rectes
+AngularBisector.Help=Seleccioneu tres punts o dues rectes
ApplyDefaults=Aplica els valors per defecte
Area=Àrea
-Area.Help=Polígon, cercle o cònica
+Area.Help=Seleccioneu un polígon, un cercle o una cònica
Ascending=Ascendent
-AttachDetachPoint=Posa punt en un objecte / Separa
+AttachDetachPoint=Posa punt en un objecte / separa'l
AttachDetachPoint.Help=Cliqueu a un punt i a un objecte per adjuntar-lo
AutoDimension=Dimensiona automàticament
Axes=Eixos
@@ -28,47 +28,48 @@ Back=Torna
BackgroundColor=Color de fons
BasicLineTools=Eines de rectes
BetweenGroups=Entre els grups
+BlackboardLetters=Lletres Blackboard
Blue=Blau
Bold=Negreta
Boxplot=Diagrama de caixa
Brackets=Parèntesis
Browser=Explorador
Button.Caption=Llegenda
-ButtonAction=Insereix botó
+ButtonAction=Botó
ButtonAction.Help=Feu clic a la zona gràfica per inserir un botó
ByLayering=Per capes
Calculate=Calcula
CalligraphicLetters=Lletres cal·ligràfiques
Cancel=Cancel·la
Cartesian=Cartesià
-CheckboxSize=Mida de la casella de verificació
+CheckboxSize=Mida de la casella de control per mostrar/amagar objectes
CheckboxSize.Large=Gran
CheckboxSize.Regular=Normal
ChooseFromFile=Escull des d\u2019un arxiu
Circle2=Circumferència donats el seu centre i un punt per on passa
-Circle2.Help=Centre, punt de la circumferència
+Circle2.Help=Seleccioneu el centre i punt de la circumferència
Circle3=Circumferència que passa per tres punts
-Circle3.Help=Tres punts de la circumferència
+Circle3.Help=Seleccioneu tres punts de la circumferència
CircleArc3=Arc de circumferència donats el centre i els dos extrems
-CircleArc3.Help=El centre i dos punts de l'arc
+CircleArc3.Help=Seleccioneu el centre i dos punts (el primer ha de ser de l'arc, l'altre no cal)
CircleArcTools=Eines de cercles i arcs
CircleAxisPoint=Circumferència amb l'eix que passa per un punt
-CircleAxisPoint.Help=Seleccioneu l'eix, després el punt de la circumferència
+CircleAxisPoint.Help=Seleccioneu l'eix i després un punt de la circumferència
CirclePointRadius=Circumferència donats el centre i el radi
-CirclePointRadius.Help=Centre i radi
+CirclePointRadius.Help=Seleccioneu el centre i entreu el valor del radi
CirclePointRadiusDirection=Circumferència donats el centre, el radi i la direcció
-CirclePointRadiusDirection.Help=Seleccioneu el centre, la direcció i introduiïu el radi
+CirclePointRadiusDirection.Help=Seleccioneu el centre, la direcció i introduïu el radi
CircleSector3=Sector circular donats el centre i els dos extrems
-CircleSector3.Help=Centre i dos punts del sector circular
+CircleSector3.Help=Seleccioneu el centre i dos punts (el primer ha de ser de l'arc, el segon no cal)
CircumcircleArc3=Arc de circumferència que passa per tres punts
-CircumcircleArc3.Help=Tres punts de l'arc de circumferència
+CircumcircleArc3.Help=Seleccioneu tres punts de l'arc de circumferència
CircumcircleSector3=Sector circular donats tres punts
-CircumcircleSector3.Help=Tres punts del sector circular
+CircumcircleSector3.Help=Seleccioneu tres punts del sector circular
ClassRule=Regles de la classe
-ClearColumn=Esborra Columna
+ClearColumn=Esborra columna
ClearColumns=Esborra Columnes
ClearRow=Esborra Fila
-ClearRows=Esborra Files
+ClearRows=Esborra files
ClearSelection=Esborra Selecció
ClearTrace=Esborra totes les traces
Clipboard=Porta-retalls
@@ -76,19 +77,19 @@ ClipboardMessage=El porta-retalls s\u2019ha exportat correctament. Pots enganxar
Close=Tanca
CloseAll=Tanca tot
CloseFile=Tanca el fitxer
-CmdList=Llista de comandes
+CmdList=Llista de comandaments
Coefficient=Coeficient
CollapseAll=Plega-ho tot
-ColumnHeader=Capçalera de la columna
+ColumnHeader=Nom de la columna
ColumnOrder=Ordre de la columna
ColumnReset=Reinicia la columna
Columns=Columnes
Comma=Coma
CommandName=Nom del comandament
Compasses=Compàs
-Compasses.Help=Selecciona un segment o dos punts per determinar el radi, després el centre.
+Compasses.Help=Seleccioneu un segment o dos punts per determinar el radi i després el centre
ComplexNumber=Nombre complex
-ComplexNumber.Help=Cliqueu a la zona gràfica per crear un nombre complex
+ComplexNumber.Help=Feu clic en una finestra gràfica o en un objecte adequat
ConciseCode=Codi concís
ConciseUsingCSE5=Concís utilitzant CSE5
Condition.ShowObject=Condició per mostrar l'objecte
@@ -97,7 +98,7 @@ ConfidenceInterval=Interval de confian
ConfidenceLevel=Nivell de confiança
Conic=Cònica
Conic5=Cònica que passa per cinc punts
-Conic5.Help=Cinc punts de la cónica
+Conic5.Help=Seleccioneu cinc punts de la cònica
ConicMenu=Cònica
ConicSectionTools=Eines de còniques
Continuity=Continuïtat
@@ -108,15 +109,15 @@ CopyToGraphics=Copia a la zona gr
CopyToInputBar=Copia a la Línia d'Entrada
CopyToSpreadsheet=Copia al full de càlcul
CopyVisualStyle=Copia l'estil visual
-CopyVisualStyle.Help=Seleccioneu un objecte i feu clic a sobre d'altres per copiar-ne l'estil
-Count=Compta
+CopyVisualStyle.Help=Seleccioneu un objecte i feu clic a sobre d'altres per copiar-hi l'estil
+Count=Absolutes
CountCells=Compta
CountCells.Help=Seleccioneu un conjunt de cel·les
Create=Crea
CreateCurveFit=Crea una corba d\u2019ajust
-CreateCurveFit.Help=Seleccioneu les cel·les dels punts i clica l\u2019eina
+CreateCurveFit.Help=Seleccioneu les cel·les dels punts i clique l\u2019eina
CreateList=Crea Llista
-CreateList.Help=Seleccioneu les cel·les i clica l\u2019eina
+CreateList.Help=Seleccioneu les cel·les i clique l\u2019eina
CreateListGraphicsView=Crea una llista
CreateListGraphicsView.Help=Seleccioneu els objectes mitjançant el rectangle de selecció
CreateListOfPoints=Crea una llista de punts
@@ -144,7 +145,7 @@ Degree=Graus
DegreesOfFreedom.short=gl
DegreesOfFreedom1.short=gl1
DegreesOfFreedom2.short=gl2
-Delete=Esborra objecte
+Delete=Esborra l'objecte
Delete.Help=Seleccioneu un objecte per esborrar-lo
DeleteObjects=Esborra els objectes
DeleteTool=Esborra l\u2019eina
@@ -157,16 +158,18 @@ Differences=Difer
DilateFromPoint=Homotècia
DilateFromPoint.Help=Objecte, centre d'homotècia i raó d'homotècia
Discrete=Discreta
-Distance=Distància
-Distance.Help=Punts, segment o circumferència
+Distance=Longitud, perímetre o distància
+Distance.Help=Seleccioneu un objecte o dos objectes
Distribution=Distribució
Distribution.ChiSquare=Khi Quadrat
Distribution.Exponential=Exponencial
Distribution.F=Distribució F
Distribution.Hypergeometric=Hipergeomètrica
Distribution.Logistic=Logístic
+Distribution.Lognormal=Logarítmica Normal
Distribution.Scale=Escala
Distribution.Shape=Forma
+Distribution.StudentT=TStudent
DoYouWantToSaveYourChanges=Vols desar els canvis?
DontDeleteTool=No esborris l'eina
DontOverwrite=No sobrescriguis
@@ -190,7 +193,7 @@ Evaluate.Help=Avaluaci
Exit=Surt
Expand=Desenvolupa
Expand.Help=Desenvolupa els parèntesis
-ExpandAll=Desplega tot
+ExpandAll=Desplega-ho tot
Exponential=Exponencial
Export=Exporta
ExportAllWorksheets=Exporta tots els fulls de càlcul oberts
@@ -212,7 +215,7 @@ FitLine=Recta de regressi
FitLine.Help=Seleccioneu un conjunt de punts mitjançant el rectangle de selecció o bé una llista de punts
Fix=Fixat activat/desactivat
Fix.Help=Seleccioneu un objecte per fixar-lo/alliberar-lo
-FixedToGrid=Fixat a la graella
+FixedToGrid=Fixats a la quadrícula
FontSize=Mida de la lletra
ForegroundColor=Color de primer pla
Formulas=Fórmules
@@ -249,7 +252,7 @@ Hue=Tonalitat
Hyperbola3=Hipèrbola
Hyperbola3.Help=Seleccioneu els dos focus i un punt de la hipèrbola
Hypergeometric.population=Població
-Hypergeometric.sample=Mostra
+Hypergeometric.sample=Mida de la mostra
Icon=Icona
Image=Insereix imatge
Image.Help=Feu clic a la zona gràfica o a un punt per determinar el vèrtex inferior esquerre de la imatge
@@ -257,14 +260,14 @@ Images=Imatges
ImportDataFile=Importa fitxer de dades
IncludeHTML5=Inclou HTML5
InputField=Entrada
-InputField.Help=Seleccioneu un objecte per copiar el seu nom al camp d'entrada
+InputField.Help=Seleccioneu un objecte per copiar el seu nom a la línia d'entrada
InputHelp=Ajuda dels comandaments
InputObjects=Objectes d'entrada
InsertAbove=Insereix a sobre
InsertBelow=Insereix a sota
InsertLeft=Insereix a l'esquerra
InsertRight=Insereix a la dreta
-Integral.Help=Troba la integral indefinida
+Integral.Help=Trobeu la integral indefinida
Intercept=Intercepta
InternalCAS=CAS interna
Intersect=Intersecció de dos objectes
@@ -276,10 +279,10 @@ InvertSelection=Inverteix selecci
Isometric=Isomètrica
JavaOnly=Exporta només a Java
Join=Recta que passa per dos punts
-Join.Help=Dos punts
+Join.Help=Seleccioneu dos punts
KeepDotColors=Manté el color dels punts
KeepInput=Manté l'entrada
-KeepInput.Help=Manté i verifica l\u2019entrada
+KeepInput.Help=Manteniu i verifiqueu l\u2019entrada
LabelColumn=Columna d\u2019etiquetes
LabelColumnName=Nom de la columna d\u2019etiquetes
Labeling=Etiquetes
@@ -306,7 +309,7 @@ ListOfPoints=Llista de punts
Load=Obre
Location=Ubicació
Locus=Lloc geomètric
-Locus.Help=Seleccioneu un punt del lloc geomètric i el punt generador, definit sobre una línia
+Locus.Help=Seleccioneu el punt del lloc geomètric i un punt en una línia o un punt lliscant
Logistic=Logística
LookAndFeel=Aparença
LowQuality=Qualitat baixa
@@ -334,16 +337,16 @@ MinCells=M
MinCells.Help=Seleccioneu un conjunt de cel·les
Minimum.short=Mín
MirrorAtCircle=Inversió
-MirrorAtCircle.Help=Seleccioneu el punt i la circumferència d'autoinversió
+MirrorAtCircle.Help=Seleccioneu l'objete a transformar i la circumferència d'autoinversió
MirrorAtLine=Simetria axial
MirrorAtLine.Help=Seleccioneu l'objecte i l'eix de simetria
MirrorAtPoint=Simetria central
-MirrorAtPoint.Help=Seleccioneu l'objecte i el punt de simetria
+MirrorAtPoint.Help=Seleccioneu l'objecte i el centre de simetria
Motif=Motiu
Move=Mou
-Move.Help=Arrossegueu o seleccioneu els objectes
+Move.Help=Arrossegueu o seleccioneu els objectes (amb Shift Desplaça zona gràfica)
MoveRotate=Gira al voltant d'un punt
-MoveRotate.Help=Primer seleccioneu el punt de rotació i després l'objecte per girar
+MoveRotate.Help=Primer seleccioneu el centre de rotació i després el punt a girar
MovementTools=Eines de moviment
MultiVarStats=Anàlisi multivariant
MultiVarStats.Help=Analitza dos o més conjunts de dades de les columnes seleccionades
@@ -358,7 +361,7 @@ Next=Seg
None=Cap
NormalCurve=Corba normal
NormalQuantilePlot=Diagrama Q-Q Normal
-Normalized=Normalitzat
+Normalized=Normalitzades
NullHypothesis=Hipòtesi nul·la
NullHypothesis.short=Nul·la
Numeric=Valor numèric
@@ -378,24 +381,20 @@ Operation=Operaci
OperationTable=Taula d\u2019operacions
Options=Opcions
Orthogonal=Recta perpendicular
-Orthogonal.Help=Punt i recta perpendicular
-OrthogonalPlane=Punt i recta perpendicular
-OrthogonalPlane.Help=Seleccioneu un punt i una recta perpendicular
+Orthogonal.Help=Seleccioneu un punt i la recta perpendicular
Other=Altres
OutputObjects=Objectes de sortida
Overlay=Superposició
OverlayFrequencyPolygon=Polígon de superposició de freqüències
-OverlayNormalCurve=Superposició amb la corba normal
+OverlayNormalCurve=Superposa la corba normal
Overwrite=Sobreescriu
PairedT=Prova T per a dades aparellades
Parabola=Paràbola
-Parabola.Help=Seleccioneu un punt i la directriu
+Parabola.Help=Seleccioneu el focus i la directriu
Parallel=Recta paral·lela
-Parallel.Help=Punt i recta paral·lela
-ParallelPlane=Pla paral·lel
-ParallelPlane.Help=Seleccioneu un punt i un pla paral·lel
+Parallel.Help=Seleccioneu un punt i la recta paral·lela
Paste=Enganxa
-PasteDataFromClipboard=Enganxa Dades del Porta-retalls
+PasteDataFromClipboard=Enganxa dades del Porta-retalls
PasteSpecial=Enganxament especial
Pen=Eina retolador
Pen.Help=Seleccioneu una zona rectangular de la zona gràfica. Podreu\ndibuixar-hi lliurement. Seleccioneu una eina diferent per finalitzar
@@ -404,26 +403,22 @@ Perspective.BasicGeometry=Geometria B
Perspective.CASAndGraphics=CAS i gràfics
Perspective.Geometry=Geometria
Perspective.Primary=Primària
-Perspective.TableAndGraphics=Taules i Gràfics
+Perspective.TableAndGraphics=Full de càlcul i Gràfics
Perspective.Whiteboard=Pissara
Perspectives=Escenaris
-PlanePointLine=Pla que passa per un punt i una recta
-PlanePointLine.Help=Seleccioneu un punt i una recta
-PlaneThreePoint=Pla que passa per tres punts
-PlaneThreePoint.Help=Seleccioneu tres punts
Point=Punt nou
-Point.Help=Feu clic a la zona gràfica o a una recta
-PointCapturing=Ajustat a la quadrícula
+Point.Help=Feu clic en una finestra gràfica o en un objecte adequat
+PointCapturing=Captura de punts
PointInside=Punt en una regió
PointMenu=Punt
PointOnObject=Punt en un objecte
-PointOnObject.Help=Cliqueu dins d\u2019un objecte o en el seu perímetre per crear un punt
+PointOnObject.Help=Cliqueu dins d\u2019un objecte o en el seu perímetre per crear-hi un punt
PointStyle=Estil de punt
PointTools=Eines de punts
PolarDiameter=Polar o diàmetre
-PolarDiameter.Help=Primer el punt o la recta, després la circumferència o la cònica
+PolarDiameter.Help=Seleccioneu primer el punt o la recta i després la circumferència o la cònica
PolyLine=Línia poligonal
-PolyLine.Help=Seleccioneu tots els vèrtexs, després cliqueu al primer vèrtex
+PolyLine.Help=Seleccioneu tots els vèrtexs i acabeu clicant sobre el primer vèrtex
Polygon=Polígon
Polygon.Help=Seleccioneu tots el vèrtexs i torneu a seleccionar el primer punt
PolygonTools=Eines de polígons
@@ -433,8 +428,6 @@ Power=Pot
Preview=Vista prèvia
Print=Imprimeix
PrintPreview=Previsualitza
-Prism=Prisma
-Prism.Help=Seleccioneu un polígon (o punts) i el primer punt de la segona cara paral·lela
Probability=Probabilitat
ProbabilityCalculator=Calculadora de probabilitats
ProbabilityCalculator.Help=Diàleg per a calcular probabilitats
@@ -443,17 +436,17 @@ Properties.Basic=B
Properties.Position=Posició
Properties.Style=Estil
Ray=Semirecta que passa per dos punts
-Ray.Help=Dos punts
+Ray.Help=Seleccioneu primer l'origen i després un punt de la semirecta
Recent=Obre recent
RecomputeAllViews=Torna a calcular tots els objectes
RecordToSpreadsheet=Registra al full de càlcul
-RecordToSpreadsheet.Help=Selecciona l'objecte a rastrejar, després canvia la construcció
+RecordToSpreadsheet.Help=Seleccioneu l'objecte a registrar i després canvieu la construcció
RecoveryCancel=Anul·la
RecoveryCancelQuestion=Esteu segur que voleu cancel·lar la recuperació? Els fitxers no desats es perdran
RecoveryOpen=Obre
RecoverySave=Desa
RecoveryText=Els següents fitxers de GeoGebra poden ser recuperats
-RecoveryTitle=Recuperar després d\u2019un error del GeoGebra
+RecoveryTitle=Recuperació després d\u2019un error del GeoGebra
Red=Vermell
Redo=Refés
Refresh=Actualitza
@@ -461,31 +454,29 @@ RegressionAnalysis=An
RegressionInference=Inferència de regressió
RegressionModel=Model de regressió
RegularPolygon=Polígon regular
-RegularPolygon.Help=Dos punts i un nombre
+RegularPolygon.Help=Seleccioneu dos punts, que seran els vèrtexs d'un costat, i introduïu el nombre de costats
Relation=Relació entre dos objectes
-Relation.Help=Dos objectes
-Relative=Relatiu
+Relation.Help=Seleccioneu dos objectes
+Relative=Relatives
RemoveLineBreaks=Elimina salts de línia
-RemoveTrace=Eliminar objecte de la llistas seleccionada
+RemoveTrace=Elimina objecte de la llistas seleccionada
Rename=Canvia de nom
-ReplaceAll=Substituir totes les cel·les
-RequireEquals=Requereix \u201c=\u201d abans dels comandaments
+ReplaceAll=Substitueix totes les cel·les
+RequireEquals=Cal el signe = abans dels comandaments
ResidualPlot=Gràfic de residus
Result=Resultat
ReturnAngleInverseTrig=Retorna l'angle en graus a partir d'una funció trigonomètrica inversa
RightAngleStyle=Estil d'angle recte
-RightPrism=Prisma recte
-RightPrism.Help=Arrossegueu un polígon, o seleccioneu un polígon i introduïu-ne l\u2019altura
RightProb=Cua de la dreta
RigidPolygon=Polígon rígid
RigidPolygon.Help=Seleccioneu tots els vèrtexs i torneu a seleccionar el primer punt
RootsAndFractions=Arrels i fraccions
RotateByAngle=Rotació al voltant d'un punt
-RotateByAngle.Help=Seleccioneu l'objecte per girar, el centre de gir i introduïu angle
+RotateByAngle.Help=Seleccioneu l'objecte per girar, el centre de gir i introduïu l'angle
RotateView=Gira la finestra 3D
RotateView.Help=Arrossegueu la finestra 3D
Rounding=Arrodoniment
-RowHeader=Encapçalament de la fila
+RowHeader=Número de la fila
RowLimit=Límit de files
RowOrder=Ordena les files
Sample1=1a Mostra
@@ -499,11 +490,11 @@ SavePrintUndo=Activa desa, imprimeix, desf
SaveToXML=Desa en format XML
Scatterplot=Diagrama de dispersió
Segment=Segment entre dos punts
-Segment.Help=Dos punts
+Segment.Help=Seleccioneu dos punts
SegmentFixed=Segment amb longitud donada des d'un punt
-SegmentFixed.Help=Un punt i la longitud del segment
+SegmentFixed.Help=Seleccioneu un punt i introduïu la longitud del segment
Select=Selecciona objecte
-Select.Help=Clica a un objecte per seleccionar-lo
+Select.Help=Cliqueu a un objecte per seleccionar-lo
SelectACurve=Selecciona una corba
SelectAll=Selecciona-ho tot
SelectAnObjectToTrace=Selecciona un objecte per a traçar
@@ -511,7 +502,7 @@ SelectAncestors=Selecciona Pares
SelectCurrentLayer=Selecciona Capa Actual
SelectDescendants=Selecciona Fills
Semicircle=Semicircunferència donats els extrems del diàmetre
-Semicircle.Help=Dos punts
+Semicircle.Help=Seleccioneu dos punts que seran els extrems del diàmetre
Semicolon=Punt i coma
Separator=Separador
SetClasssesManually=Defineix les classes manualment
@@ -525,7 +516,7 @@ ShowAtTop=Mostra a la part superior
ShowAxesGrid=Mostra Eixos/Graella
ShowCheckBox=Casella de control per mostrar/amagar els objectes
ShowCheckBox.Help=Feu clic a la zona gràfica per crear una casella de control
-ShowColumnHeader=Mostra l\u2019encapçalament de la columna
+ShowColumnHeader=Mostra els noms de les columna
ShowCornerCoordinates=Mostra les coordenades de les cantonades
ShowData=Mostra les dades
ShowFileBrowser=Mostra l\u2019explorador d\u2019arxius
@@ -533,9 +524,9 @@ ShowGridlines=Mostra les l
ShowHide=Mostra / Amaga l\u2019objecte
ShowHideLabel=Mostra / amaga etiqueta
ShowHideLabel.Help=Seleccioneu un objecte per mostrar/amagar la seva etiqueta
-ShowHideLabels=Mostra / Amaga les etiquetes
+ShowHideLabels=Mostra / amaga les etiquetes
ShowHideObject=Mostra / amaga objecte
-ShowHideObject.Help=Seleccioneu els objectes per amagar-los, després canvieu d'eina perquè tingui efecte el canvi
+ShowHideObject.Help=Seleccioneu els objectes per amagar-los/tornar-los a mostrar, i canvieu d'eina perquè tingui efecte
ShowHorizontalScrollbars=Mostra les barres de desplaçament horitzontals
ShowInToolBar=Mostra a la barra d'eines
ShowInputField=Mostra la línia d'entrada
@@ -543,7 +534,7 @@ ShowMenuBar=Mostra la barra del men
ShowMouseCoordinates=Mostra les coordenades del ratolí
ShowPlot2=Mostra la segona finestra gràfica
ShowResetIcon=Mostra icona de reinici de la construcció
-ShowRowHeader=Mostra la capçalera de les files
+ShowRowHeader=Mostra els números de les files
ShowStatistics=Mostra les estadístiques
ShowToolBar=Mostra la barra d'eines
ShowToolBarHelp=Mostra l'ajuda de la barra d'eines
@@ -554,7 +545,7 @@ Slider=Punt lliscant
Slider.Help=Feu clic a la zona gràfica per especificar la posició del punt lliscant
Slope=Pendent
Slope.Help=Una recta
-SnapToGrid=Ajusta a la quadrícula
+SnapToGrid=Ajustats a la quadrícula
SnapToObjects=Ajusta a objectes
SnapToPoints=Ajusta a punts
Solution=Solució
@@ -570,9 +561,9 @@ Spacing=Espaiament
SpecialLineTools=Eines de construcció de rectes especials
SpecialObjectTools=Eines per a objectes especials
Sphere2=Esfera amb centre a un punt
-Sphere2.Help=Seleccioneu el centre, a continuació, un punt sobre l'esfera
+Sphere2.Help=Seleccioneu el centre i, a continuació, un punt sobre l'esfera
SpherePointRadius=Esfera amb centre i radi
-SpherePointRadius.Help=Seleccioneu el centre introduïu el radi
+SpherePointRadius.Help=Seleccioneu el centre i introduïu el radi
Split=Divideix les cel·les en columnes
Split.Help=Seleccioneu les columnes a dividir
SpreadsheetOptions=Opcions del full de càlcul
@@ -581,7 +572,7 @@ Stack.Help=Seleccioneu les columnes a apilar
StackedBoxPlots=Apila els diagrames de caixa
StandardError=Error estàndard
Start=Inicia
-StartRow=Inicia a la fila
+StartRow=Inicia la fila
Statistics=Paràmetres estadístics
Statistics2=Paràmetres estadístics2
StemPlot=Diagrama de tija i fulles
@@ -623,8 +614,8 @@ Table=Taula
Tangent.Help=Seleccioneu un punt i una circumferència, una cònica o una funció
Text=Insereix text
Text.Help=Feu clic a la zona gràfica o a un punt per inserir un text
-TextFieldAction=Insereix camp de text
-TextFieldAction.Help=Cliqueu en la zona gràfica per inserir un camp de text
+TextFieldAction=Casella d'entrada/sortida
+TextFieldAction.Help=Feu clic a la zona gràfica per inserir una casella d'entrada/sortida
ThenBy=Després per
Tool=Eina
Tool.CreateNew=Crea una eina nova
@@ -647,9 +638,9 @@ TraceToSpreadsheet=Rastreja el full de c
TraceToSpreadsheet.Help=Quadre de diàleg per fer el seguiment d\u2019objectes al full de càlcul
TransformationTools=Eines de Transformacions geomètriques
TranslateByVector=Translació segons un vector
-TranslateByVector.Help=Seleccioneu l'objecte per traslladar i el vector de translació
+TranslateByVector.Help=Seleccioneu l'objecte a traslladar i el vector de translació
TranslateView=Desplaça la zona gràfica
-TranslateView.Help=Arrossegueu la zona gràfica o els eixos ( premeu Shift i arrossegueu)
+TranslateView.Help=Arrossegueu la zona gràfica o un eix
Transpose=Transposa
TwoVarStats=Anàlisi de regressió bivariant
TwoVarStats.Help=Analitza valors numèrics aparellats de les cel·les seleccionades
@@ -666,7 +657,7 @@ Type.List=Llistes
Type.Logic=Lògica
Type.OptimizationCommands=Comandaments d\u2019optimització
Type.Probability=Probabilitat
-Type.Scripting=Seqüència d\u2019ordres
+Type.Scripting=Seqüència de comandaments
Type.Spreadsheet=Full de càlcul
Type.Statistics=Estadística
Type.Text=Textos
@@ -678,21 +669,19 @@ Untitled=Sense t
UploadGeoGebraTube=Puja a GeoGebraTube
UpperLimit=Límit superior
UseBrowserForJS=Utilitza el navegador per a seqüències de comandaments de Javascript
-UseButtonsAndCheckboxes=Utilitza els botons i les caselles de control per mostrar/amagar els objectes
-UseHeaderRow=Utilitza la fila de la capçalera
+UseButtonsAndCheckboxes=Permet l'ús de botons i de caselles de control per mostrar/amagar objectes
+UseHeaderRow=Utilitza el número de la fila
UserInterface=Interfície d'usuari
Value=Valor
Values=Valors
Vector=Vector entre dos punts
-Vector.Help=Dos punts
+Vector.Help=Seleccioneu l'origen i després l'extrem
VectorFromPoint=Vector des d'un punt (equipol·lent a un altre)
-VectorFromPoint.Help=Punt d'origen i vector
+VectorFromPoint.Help=Seleccioneu l'origen i el vector
VectorPolygon=Polígon vectorial
VectorPolygon.Help=Seleccioneu tots els vèrtexs i torneu a seleccionar el primer punt
VerticalScrollbars=Barres de desplaçament vertical
View=Visualitza
-ViewInFrontOf=Vista per davant de
-ViewInFrontOf.Help=Canvia la vista per davant de l\u2019objecte seleccionat
Views=Vistes
VisualStyle=Estil visual
VisualStyle.Help=Cliqueu a sobre dels objectes o arrossegueu un rectangle per canviar les seves propietats
diff --git a/geogebra/properties/menu_cs.properties b/geogebra/properties/menu_cs.properties
index 4653d39..59c89c6 100644
--- a/geogebra/properties/menu_cs.properties
+++ b/geogebra/properties/menu_cs.properties
@@ -161,7 +161,7 @@ DilateFromPoint.Help=Objekt-vzor, st\u0159ed stejnolehlosti a koeficient
Discrete=Diskrétní
Distance=Vzdálenost
Distance.Help=Dva body, úse\u010dka nebo kru\u017enice
-Distribution=Distribu\u010dní
+Distribution=Rozd\u011blení
Distribution.Binomial=Binomický
Distribution.ChiSquare=x^2
Distribution.Exponential=Exponenciální
@@ -222,6 +222,7 @@ FontSize=Velikost p
ForegroundColor=Barva pop\u0159edí
Formulas=Vzorce
FrakturLetters=Fraktura (písmo)
+Frequency=\u010cetnost
FrequencyPolygon=Frekvence mnohoúhelníku
FrequencyTable=Kmito\u010dtové tabulky
FrequencyType=Frekvence typu
@@ -386,8 +387,6 @@ OperationTable=Tabulka operace
Options=Nastavení
Orthogonal=Kolmice
Orthogonal.Help=Bod a kolmá p\u0159ímka
-OrthogonalPlane=Kolmá rovina
-OrthogonalPlane.Help=Bod a kolmici
Other=Dal\u0161í
OutputObjects=Výstupní objekty
Overlay=P\u0159ekrýt
@@ -398,8 +397,6 @@ PairedT=P
Parabola.Help=bod a \u0159ídící p\u0159ímka
Parallel=Rovnob\u011b\u017eka
Parallel.Help=Bod a rovnob\u011b\u017eka
-ParallelPlane=Paralelní rovina
-ParallelPlane.Help=Vybrat bod a paralelní rovinu
Paste=Vlo\u017eit
PasteDataFromClipboard=Vlo\u017e data ze schránky
PasteSpecial=Vlo\u017eit speciáln\u011b
@@ -413,10 +410,6 @@ Perspective.Primary=Z
Perspective.TableAndGraphics=Tabulka & Nákresna
Perspective.Whiteboard=Tabule
Perspectives=Perspektivy
-PlanePointLine=Rovina procházející bodem a p\u0159ímkou
-PlanePointLine.Help=Bod a p\u0159ímka
-PlaneThreePoint=Rovina procházející t\u0159emi body
-PlaneThreePoint.Help=T\u0159i body
Point=Nový bod
Point.Help=Kliknout na nákresnu nebo p\u0159ímku
PointCapturing=P\u0159ichytnout body
@@ -426,7 +419,7 @@ PointOnObject=Bod na objektu
PointOnObject.Help=Pro vytvo\u0159ení bodu klepn\u011bte na tla\u010dítko uvnit\u0159 objektu nebo na jeho obvodu
PointStyle=Vzhled bodu
PointTools=Bod
-Polar=Polára
+Polar=Polární
PolarDiameter=Polára
PolarDiameter.Help=Bod nebo p\u0159ímka, kru\u017enice nebo ku\u017eelose\u010dka
PolyLine=Lomená \u010dára
@@ -440,8 +433,6 @@ Power=Mocnost
Preview=Náhled
Print=Tisk
PrintPreview=Náhled
-Prism=Hranol
-Prism.Help=Vybrat mnohoúhelník (nebo body) a první bod druhé paralelní plochy
Probability=Pravd\u011bpodobnost
ProbabilityCalculator=Pravd\u011bpodobnostní kalkula\u010dka
ProbabilityCalculator.Help=Dialog výpo\u010dtu pravd\u011bpodobnosti
@@ -481,8 +472,6 @@ ResidualPlot=Zbytkov
Result=Výsledek
ReturnAngleInverseTrig=Navrátit úhel z inverzních goniometrických funkcí
RightAngleStyle=Vzhled pravého úhlu
-RightPrism=Kolmý hranol
-RightPrism.Help=Tahnout polynom nebo vybrat polynom a zadat vý\u0161ku
RightProb=Pravé strany
RigidPolygon=Nem\u011bnný mnohoúhelník
RigidPolygon.Help=V\u0161echny vrcholy a pak znovu první vrchol
@@ -528,7 +517,7 @@ Settings.ResetDefault=Obnovit p\u016fvodn
Settings.Save=Ulo\u017eit nastavení
Share=Sdílet
Show=Zobrazit
-ShowAtTop=Zobrazit horní \u010dást
+ShowAtTop=Zobrazit naho\u0159e
ShowAxesGrid=Zobrazit osy/m\u0159í\u017eku
ShowCheckBox=Za\u0161krtávací polí\u010dko pro zobrazení / skrytí objektu
ShowCheckBox.Help=Kliknutím na nákresnu vytvo\u0159it za\u0161krtávací polí\u010dko
@@ -546,7 +535,7 @@ ShowHideObject.Help=Vybrat objekty, kter
ShowHorizontalScrollbars=Zobrazit horizontální posuvník
ShowInToolBar=Zobrazit v nástrojovém pruhu
ShowInputField=Zobrazit vstupní pole
-ShowMenuBar=Zobrazit panel nástroj\u016f
+ShowMenuBar=Zobrazit panel p\u0159íkaz\u016f
ShowMouseCoordinates=Zobrazit sou\u0159adnice kurzoru
ShowPlot2=Zobrazit druhý diagram
ShowResetIcon=Zobrazit ikonu pro resetování konstrukce
@@ -590,8 +579,8 @@ StandardError=Standardn
StandardError.short=SCh
Start=Za\u010dátek
StartRow=Za\u010dátek \u0159ádku
-Statistics=Statistiky
-Statistics2=Statistiky2
+Statistics=Statistika
+Statistics2=Statistika2
StemPlot=S-L Graf
Step=Krok
Substitute=Substituce
@@ -648,7 +637,7 @@ Toolbar.Customize=Nastavit panel n
Toolbar.ResetDefault=Obnovit p\u0159edvolené nastavení nástrojového panelu
Tools=Nástroje
Total=Celkem
-Trace=Stopa zapnuta / vypnuta
+Trace=Stopa zapnuta -> Stopa vypnuta
Trace.Help=Objekt upevnit / uvolnit
TraceCopy=Kopie trasy
TraceToList=Trasa seznamu
@@ -670,15 +659,15 @@ Type.CAS=CAS Specifick
Type.Chart=Graf
Type.Conic=Ku\u017eel
Type.DiscreteMath=Diskrétní matematika
-Type.FunctionsAndCalculus=Funkce & Po\u010det
+Type.FunctionsAndCalculus=Funkce & Kalkulus
Type.Geometry=Geometrie
Type.List=Seznam
-Type.Logic=Logický
+Type.Logic=Logické
Type.OptimizationCommands=Optimalizace p\u0159íkaz\u016f
Type.Probability=Pravd\u011bpodobnost
Type.Scripting=Skriptování
Type.Spreadsheet=Tabulkový procesor
-Type.Statistics=Statistiky
+Type.Statistics=Statistika
Type.Transformation=Transformace
Type.VectorAndMatrix=Vektor & Matice
Undo=Zp\u011bt
@@ -701,8 +690,6 @@ VectorPolygon=Vektorov
VectorPolygon.Help=Vyberte vrcholy, pak znovu klikn\u011bte na první vrchol
VerticalScrollbars=Svislý posuvník
View=Zobrazit
-ViewInFrontOf=Pohled zep\u0159edu
-ViewInFrontOf.Help=Kliknutím zm\u011bnit zobrazení v p\u0159ední \u010dásti objektu
Views=Náhledy
VisualStyle=Vizuální styl
VisualStyle.Help=Pro zm\u011bnu vlastností klikn\u011bte na objekty nebo vyberte ta\u017eením
diff --git a/geogebra/properties/menu_da.properties b/geogebra/properties/menu_da.properties
index 721e0b4..2b496fe 100644
--- a/geogebra/properties/menu_da.properties
+++ b/geogebra/properties/menu_da.properties
@@ -150,6 +150,7 @@ Delimiter=Adskiller
Derivative=Afledede
Derivative.Help=Find den første afledede
Descending=Aftagende
+DifferenceofMeansT=Forskel i gennemsnit T
Differences=Forskelle
DilateFromPoint=Multiplicer objekt om punkt med faktor
DilateFromPoint.Help=Klik på det obejkt som skal forstørres, og klik så på punktet det skal forstørres ud fra og angiv forstørrelsesfaktoren
@@ -159,7 +160,9 @@ Distance.Help=Klik p
Distribution=Fordeling
Distribution.ChiSquare=Chi i anden
Distribution.Exponential=Eksponentiel
+Distribution.F=F-fordelt
Distribution.Hypergeometric=Hypergeometrisk
+Distribution.Logistic=Logistisk
DoYouWantToSaveYourChanges=Vil du gemme dine forandringer?
DontDeleteTool=Slet ikke værktøj
DontOverwrite=Overskriv ikke
@@ -367,8 +370,6 @@ OperationTable=Operationstabel
Options=Indstillinger
Orthogonal=Vinkelret linje
Orthogonal.Help=Klik på et punkt og en vinkelret linje
-OrthogonalPlane=Retvinklet plan
-OrthogonalPlane.Help=Vælg punkt og vinkelret linje
Other=Andre
OutputObjects=Output Objekter
OverlayFrequencyPolygon=Frekvenspolygon
@@ -378,8 +379,6 @@ Parabola=Parabel
Parabola.Help=Punkt og ledelinje
Parallel=Parallel linje
Parallel.Help=Klik på et punkt og en parallel linje
-ParallelPlane=Parallel flade
-ParallelPlane.Help=Vælge et punkt og en flade
Paste=Indsæt
PasteDataFromClipboard=Indsæt data fra
PasteSpecial=Indsæt speciel
@@ -391,11 +390,8 @@ Perspective.CASAndGraphics=cas og grafik
Perspective.Geometry=Geometri
Perspective.Primary=Primært
Perspective.TableAndGraphics=Tabel og tegning
+Perspective.Whiteboard=IWB
Perspectives=Perspektiv
-PlanePointLine=Flade gennem punkt og linje
-PlanePointLine.Help=Vælg punkt og linje
-PlaneThreePoint=Flade gennem 3 punkter
-PlaneThreePoint.Help=Vælg 3 punkter
Point=Nyt punkt
Point.Help=Klik på tegnefladen eller en linje
PointCapturing=Fang punkt
@@ -418,8 +414,6 @@ Power=Potens
Preview=Vis
Print=Udskriv
PrintPreview=Vis udskrift
-Prism=Prisme
-Prism.Help=Vælg en polygon (eller nogle punkter) og det første punkt på den anden parallelle flade.
Probability=Sandsynlighed
ProbabilityCalculator=Sandsynlighedslommeregner
ProbabilityCalculator.Help=Dialog til at beregne sandsynligheder
@@ -457,8 +451,6 @@ RequireEquals=Kr
Result=Resultat
ReturnAngleInverseTrig=Vinkel via arcus trigonometriske funktioner
RightAngleStyle=Stil for rette vinkler
-RightPrism=Retvinklet prisme
-RightPrism.Help=Træk i en polygon, eller vælg en polygon og indtast højde
RightProb=Højresidet
RigidPolygon=Stiv polygon
RigidPolygon.Help=Vælg alle hjørner og slut med at vælge første hjørne igen
@@ -665,10 +657,9 @@ Vector.Help=Klik p
VectorFromPoint=Vektor fra punkt
VectorFromPoint.Help=Klik på udgangspunktet og vektoren
VectorMenu=Vektor
+VectorPolygon=Vektor Polygon
VerticalScrollbars=Lodrette paneler
View=Vis
-ViewInFrontOf=Vis foran
-ViewInFrontOf.Help=Forandrer visning foran det valgte objekt
Views=Visning
VisualStyle=Visuel stil
VisualStyle.Help=Vælg objekter for at lave om på deres egenskaber
diff --git a/geogebra/properties/menu_de.properties b/geogebra/properties/menu_de.properties
index 77ecf8f..78c5bf3 100644
--- a/geogebra/properties/menu_de.properties
+++ b/geogebra/properties/menu_de.properties
@@ -10,6 +10,7 @@ AllCommands=Alle Befehle
AllowRescaling=Neuskalierung erlaubt
AllowTooltips=Tooltipps erlaubt
AlternativeHypothesis=Alternativhypothese
+AlternativeHypothesis.short=Alternativ
Angle=Winkel
Angle.Help=Wähle drei Punkte oder zwei Geraden
AngleFixed=Winkel mit fester Größe
@@ -121,6 +122,7 @@ CreateListOfPoints=Liste von Punkten erzeugen
CreateListOfPoints.Help=Wähle Zellen und klicke dann auf die Werkzeug-Schaltfläche
CreateMatrix=Matrix erzeugen
CreateMatrix.Help=Wähle Zellen und klicke dann auf die Werkzeug-Schaltfläche
+CreateOperationTable=Funktionstabelle erzeugen
CreateOperationTable.Help=Wähle einen Bereich von Zelle und klicke dann auf die Werkzeug-Schaltfläche
CreatePolyLine=Polygonzug erzeugen
CreatePolyLine.Help=Wähle Zellen für die Punkte, klicke dann auf die Werkzeug-Schaltfläche
@@ -138,6 +140,9 @@ DecimalPlaces=Dezimalstellen
Default.Restore=Standardeinstellungen wiederherstellen
Default.Set=Als Standard setzen
Degree=Grad
+DegreesOfFreedom.short=Freiheitsgrade
+DegreesOfFreedom1.short=Freiheitsgrade1
+DegreesOfFreedom2.short=Freiheitsgrade2
Delete=Lösche Objekt
Delete.Help=Wähle ein Objekt
DeleteObjects=Objekte löschen
@@ -146,6 +151,8 @@ Delimiter=Trennelement
Derivative=Ableitung
Derivative.Help=Findet die erste Ableitung
Descending=Absteigend
+DifferenceofMeansT=Differenz der Mittelwerte T
+Differences=Differenzen
DilateFromPoint=Strecke Objekt zentrisch von Punkt aus
DilateFromPoint.Help=Wähle zu streckendes Objekt, dann einen Punkt und gib den Streckungsfaktor ein
Discrete=Diskret
@@ -155,6 +162,7 @@ Distribution=Verteilung
Distribution.ChiSquare=Chi-Quadrat
Distribution.F=F-Verteilung
Distribution.Hypergeometric=Hypergeometrisch
+Distribution.Logistic=Logistisch
Distribution.Scale=Skalierungsparameter
Distribution.Shape=Formparameter
DoYouWantToSaveYourChanges=Möchten Sie Ihre Änderungen speichern?
@@ -202,12 +210,14 @@ FontSize=Schriftgr
ForegroundColor=Vordergrundfarbe
Formulas=Formeln
FrakturLetters=Fraktur
+Frequency=Häufigkeit
FrequencyPolygon=Häufigkeitsvieleck
FrequencyTable=Häufigkeitstabelle
FrequencyType=Häufigkeiten
FunctionInspector=Funktionsinspektor
FunctionInspector.Help=Wähle eine Funktion
Functionality=Funktionalität
+GUIFontSize=Menü Schriftgröße
General=Allgemein
GeneralTools=Allgemeine Werkzeuge
GenerateCode=Erzeuge Code
@@ -218,6 +228,8 @@ Green=Gr
Grid=Koordinatengitter
Gridlines=Gitterlinien
GroupObjects=Objekte gruppieren
+HTML5Only=Nur als HTML5 exportieren
+HTML5WithJava=
Help=Hilfe
Hidden.Dashed=Gestrichelt
Hidden.Invisible=Unsichtbar
@@ -258,6 +270,8 @@ IntervalProb=Zweiseitig
IntervalType=Intervalltyp
InvertSelection=Auswahl umkehren
Isometric=Isometrisch
+JavaOnly=Nur als Javadatei exportieren
+JavaWithHTML5=
Join=Gerade durch zwei Punkte
Join.Help=Wähle zwei Punkte
KeepDotColors=Farbe der Punkte behalten
@@ -332,6 +346,7 @@ NewWindow=Neues Fenster
Next=Nächstes
None=Keines
NormalCurve=Gauß'sche Glockenkurve
+NormalQuantilePlot=Normal-Quantil-Plot
Normalized=Normalisiert
NullHypothesis=Nullhypothese
Numeric=Numerisch
@@ -346,11 +361,11 @@ Opacity=Deckkraft
OpenFileFolder=Ordner öffnen
OpenFromWebpage=Von Webseite öffnen
OpenWebpage=Webseite öffnen
+Operation=Funktion
+OperationTable=Funktionstabelle
Options=Einstellungen
Orthogonal=Senkrechte Gerade
Orthogonal.Help=Wähle einen Punkt und eine senkrechte Gerade
-OrthogonalPlane=Senkrechte Ebene
-OrthogonalPlane.Help=Wähle Punkt und senkrechte Gerade
Other=Andere
OutputObjects=Ausgabe Objekte
Overlay=Überlagerung
@@ -362,8 +377,6 @@ Parabola=Parabel
Parabola.Help=Wähle den Brennpunkt und die Leitlinie
Parallel=Parallele Gerade
Parallel.Help=Wähle einen Punkt und eine parallele Gerade
-ParallelPlane=Parallele Ebene
-ParallelPlane.Help=Wähle Punkt und parallele Ebene
Paste=Einfügen
PasteDataFromClipboard=Daten aus Zwischenablage einfügen
PasteSpecial=Spezielles einfügen
@@ -376,10 +389,6 @@ Perspective.Geometry=Geometrie
Perspective.Primary=Grundschule
Perspective.TableAndGraphics=Tabelle & Grafik
Perspectives=Perspektiven
-PlanePointLine=Ebene durch Punkt und Gerade
-PlanePointLine.Help=Wähle Punkt und Gerade
-PlaneThreePoint=Ebene durch drei Punkte
-PlaneThreePoint.Help=Wähle drei Punkte
Point=Neuer Punkt
Point.Help=Klicke auf das Zeichenblatt oder auf eine Linie, Funktion oder Kurve
PointCapturing=Punktfang
@@ -403,8 +412,6 @@ Power=Potenz
Preview=Vorschau
Print=Drucken
PrintPreview=Druckvorschau
-Prism=Prisma
-Prism.Help=Wähle Vieleck (oder Punkte) und ersten Punkt der gegenüberligenden parallelen Fläche
Probability=Wahrscheinlichkeit
ProbabilityCalculator=Wahrscheinlichkeitsrechner
ProbabilityCalculator.Help=Dialog zur Berechnung von Wahrscheinlichkeiten
@@ -433,7 +440,7 @@ RegularPolygon.Help=W
Relation=Beziehung zweier Objekte
Relation.Help=Wähle zwei Objekte
Relative=Relativ
-RemoveLineBreaks=Entfernt Zeilenumbrüche
+RemoveLineBreaks=Zeilenumbrüche entfernen
RemoveTrace=Entfernt Objekt von Spurliste
Rename=Umbenennen
ReplaceAll=Ersetze alle Zellen
@@ -441,8 +448,6 @@ RequireEquals=Verlangt "=" vor Befehlen
Result=Ergebnis
ReturnAngleInverseTrig=Gibt Wert der Arcusfunktionen als Winkel zurück
RightAngleStyle=Darstellung des rechten Winkels
-RightPrism=Gerades Prisma
-RightPrism.Help=Wähle oder ziehe ein Polygon und gib eine Höhe ein
RightProb=rechtsseitig
RigidPolygon=Formfestes Polygon
RigidPolygon.Help=Wähle alle Eckpunkte und klicke nochmals auf den ersten Eckpunkt
@@ -514,8 +519,8 @@ ShowStatistics=Statistik anzeigen
ShowToolBar=Werkzeugleiste anzeigen
ShowToolBarHelp=Hilfe für die Werkzeugleiste anzeigen
ShowVerticalScrollbars=Vertikale Bildllaufleiste anzeigen
-SingleFile=Als eine Datei
-SingleFileTabs=Als eine Datei (Tabs)
+SingleFile=Eine Datei
+SingleFileTabs=Eine Datei (Tabs)
Slider=Schieberegler
Slider.Help=Klicke auf das Zeichenblatt um die Position des Schiebereglers festzulegen
Slope=Steigung
@@ -532,13 +537,18 @@ Sort.Help=W
SortBy=Sortieren nach
Space=Abstand
SpaceBetweenThousands=Abstand bei Tausenderschritten
+Spacing=Intervall
SpecialLineTools=Werkzeuge für spezielle Geraden
SpecialObjectTools=Werkzeuge für spezielle Objekte
Sphere2=Kugel mit Mittelpunkt durch Punkt
Sphere2.Help=Wähle den Mittelpunkt, dann einen Punkt auf der Kugel
SpherePointRadius=Kugel mit Mittelpunkt und Radius
SpherePointRadius.Help=Wähle den Kugelmittelpunkt und gibt den Radius ein
+Split=Tabellenspalten aufteilen
+Split.Help=Wähle die zu teilenden Spalten
SpreadsheetOptions=Tabellenoptionen
+Stack=Tabellenspalten vereinen
+Stack.Help=Wähle die zu vereinigenden Spalten
StackedBoxPlots=Gestapelter BoxPlot
StandardError=Standardfehler
StartRow=Startzeile
diff --git a/geogebra/properties/menu_el.properties b/geogebra/properties/menu_el.properties
index 0c753b7..a830fe5 100644
--- a/geogebra/properties/menu_el.properties
+++ b/geogebra/properties/menu_el.properties
@@ -391,8 +391,6 @@ OperationTable=\u03a0\u03af\u03bd\u03b1\u03ba\u03b1\u03c2 \u03a0\u03c1\u03ac\u03
Options=\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ad\u03c2
Orthogonal=\u039a\u03ac\u03b8\u03b5\u03c4\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae
Orthogonal.Help=\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03c3\u03b7\u03bc\u03b5\u03af\u03bf \u03ba\u03b1\u03b9 \u03ba\u03ac\u03b8\u03b5\u03c4\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae
-OrthogonalPlane=\u039a\u03ac\u03b8\u03b5\u03c4\u03bf \u0395\u03c0\u03af\u03c0\u03b5\u03b4\u03bf
-OrthogonalPlane.Help=\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03c3\u03b7\u03bc\u03b5\u03af\u03bf \u03ba\u03b1\u03b9 \u03ba\u03ac\u03b8\u03b5\u03c4\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae
Other=\u0386\u03bb\u03bb\u03bf
OutputObjects=\u0391\u03bd\u03c4\u03b9\u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03b1 \u03b5\u03be\u03b1\u03b3\u03c9\u03b3\u03ae\u03c2
Overlay=\u0395\u03c0\u03b9\u03ba\u03ac\u03bb\u03c5\u03c8\u03b7
@@ -404,8 +402,6 @@ Parabola=\u03a0\u03b1\u03c1\u03b1\u03b2\u03bf\u03bb\u03ae
Parabola.Help=\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03c3\u03b7\u03bc\u03b5\u03af\u03bf \u03ba\u03b1\u03b9 \u03b4\u03b9\u03b5\u03c5\u03b8\u03b5\u03c4\u03bf\u03cd\u03c3\u03b1
Parallel=\u03a0\u03b1\u03c1\u03ac\u03bb\u03bb\u03b7\u03bb\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae
Parallel.Help=\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03c3\u03b7\u03bc\u03b5\u03af\u03bf \u03ba\u03b1\u03b9 \u03c0\u03b1\u03c1\u03ac\u03bb\u03bb\u03b7\u03bb\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae
-ParallelPlane=\u03a0\u03b1\u03c1\u03ac\u03bb\u03bb\u03b7\u03bb\u03bf \u0395\u03c0\u03af\u03c0\u03b5\u03b4\u03bf
-ParallelPlane.Help=\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03c3\u03b7\u03bc\u03b5\u03af\u03bf \u03ba\u03b1\u03b9 \u03c0\u03b1\u03c1\u03ac\u03bb\u03bb\u03b7\u03bb\u03bf \u03b5\u03c0\u03af\u03c0\u03b5\u03b4\u03bf
Paste=\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7
PasteDataFromClipboard=\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u0394\u03b5\u03b4\u03bf\u03bc\u03ad\u03bd\u03c9\u03bd \u03b1\u03c0\u03cc \u03c4\u03b7 \u039c\u03bd\u03ae\u03bc\u03b7
PasteSpecial=\u0395\u03b9\u03b4\u03b9\u03ba\u03ae \u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7
@@ -419,10 +415,6 @@ Perspective.Primary=\u0392\u03b1\u03c3\u03b9\u03ba\u03ac
Perspective.TableAndGraphics=\u03a0\u03af\u03bd\u03b1\u03ba\u03b5\u03c2 \u03ba\u03b1\u03b9 \u0393\u03c1\u03b1\u03c6\u03b9\u03ba\u03ac
Perspective.Whiteboard=\u03a0\u03af\u03bd\u03b1\u03ba\u03b1
Perspectives=\u038c\u03c8\u03b5\u03b9\u03c2
-PlanePointLine=\u0395\u03c0\u03af\u03c0\u03b5\u03b4\u03bf \u03c0\u03bf\u03c5 \u03bf\u03c1\u03af\u03b6\u03b5\u03c4\u03b1\u03b9 \u03b1\u03c0\u03cc \u03ad\u03bd\u03b1 \u03c3\u03b7\u03bc\u03b5\u03af\u03bf \u03ba\u03b1\u03b9 \u03bc\u03b9\u03b1 \u03b5\u03c5\u03b8\u03b5\u03af\u03b1
-PlanePointLine.Help=\u0395\u03c0\u03af\u03bb\u03ad\u03be\u03c4\u03b5 \u03c3\u03b7\u03bc\u03b5\u03af\u03bf \u03ba\u03b1\u03b9 \u03b5\u03c5\u03b8\u03b5\u03af\u03b1
-PlaneThreePoint=\u0395\u03c0\u03af\u03c0\u03b5\u03b4\u03bf \u03c0\u03bf\u03c5 \u03bf\u03c1\u03af\u03b6\u03b5\u03c4\u03b1\u03b9 \u03b1\u03c0\u03cc \u03c4\u03c1\u03af\u03b1 \u03c3\u03b7\u03bc\u03b5\u03af\u03b1
-PlaneThreePoint.Help=\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03c4\u03c1\u03af\u03b1 \u03c3\u03b7\u03bc\u03b5\u03af\u03b1
Point=\u039d\u03ad\u03bf \u03a3\u03b7\u03bc\u03b5\u03af\u03bf
Point.Help=\u039a\u03bb\u03b9\u03ba \u03c3\u03c4\u03b7\u03bd \u03c0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u03b3\u03c1\u03b1\u03c6\u03b9\u03ba\u03ce\u03bd \u03ae \u03c3\u03c4\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae, \u03c3\u03c5\u03bd\u03ac\u03c1\u03c4\u03b7\u03c3\u03b7 \u03ae \u03ba\u03b1\u03bc\u03c0\u03cd\u03bb\u03b7
PointCapturing=\u03a3\u03cd\u03bb\u03bb\u03b7\u03c8\u03b7 \u03c3\u03b7\u03bc\u03b5\u03af\u03bf\u03c5
@@ -446,8 +438,6 @@ Power=\u0394\u03cd\u03bd\u03b1\u03bc\u03b7
Preview=\u03a0\u03c1\u03bf\u03b5\u03c0\u03b9\u03c3\u03ba\u03cc\u03c0\u03b7\u03c3\u03b7
Print=\u0395\u03ba\u03c4\u03cd\u03c0\u03c9\u03c3\u03b7
PrintPreview=\u03a0\u03c1\u03bf\u03b5\u03c0\u03b9\u03c3\u03ba\u03cc\u03c0\u03b7\u03c3\u03b7 \u03b5\u03ba\u03c4\u03cd\u03c0\u03c9\u03c3\u03b7\u03c2
-Prism=\u03a0\u03c1\u03af\u03c3\u03bc\u03b1
-Prism.Help=\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03c0\u03bf\u03bb\u03cd\u03b3\u03c9\u03bd\u03bf (\u03ae \u03c3\u03b7\u03bc\u03b5\u03af\u03b1) \u03ba\u03b1\u03b9 \u03c4\u03bf \u03c0\u03c1\u03ce\u03c4\u03bf \u03c3\u03b7\u03bc\u03b5\u03af\u03bf \u03c4\u03b7\u03c2 \u03b4\u03b5\u03cd\u03c4\u03b5\u03c1\u03b7\u03c2 \u03c0\u03b1\u03c1\u03ac\u03bb\u03bb\u03b7\u03bb\u03b7\u03c2 \u03c0\u03bb\u03b5\u03c5\u03c1\u03ac\u03c2
Probability=\u03a0\u03b9\u03b8\u03b1\u03bd\u03cc\u03c4\u03b7\u03c4\u03b1
ProbabilityCalculator=\u03a5\u03c0\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03c4\u03ae\u03c2 \u03a0\u03b9\u03b8\u03b1\u03bd\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2
ProbabilityCalculator.Help=\u0394\u03b9\u03ac\u03bb\u03bf\u03b3\u03bf\u03c2 \u03b3\u03b9\u03b1 \u03c5\u03c0\u03bf\u03bb\u03bf\u03b3\u03b9\u03c3\u03bc\u03cc \u03c0\u03b9\u03b8\u03b1\u03bd\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2
@@ -488,8 +478,6 @@ ResidualPlot=\u03a5\u03c0\u03bf\u03bb\u03bf\u03b9\u03c0\u03cc\u03bc\u03b5\u03bd\
Result=\u0391\u03c0\u03bf\u03c4\u03ad\u03bb\u03b5\u03c3\u03bc\u03b1
ReturnAngleInverseTrig=\u0395\u03c0\u03b9\u03c3\u03c4\u03c1\u03ad\u03c6\u03b5\u03b9 \u03b3\u03c9\u03bd\u03af\u03b1 \u03b1\u03c0\u03cc \u03c4\u03b9\u03c2 \u03b1\u03bd\u03c4\u03af\u03c3\u03c4\u03c1\u03bf\u03c6\u03b5\u03c2 \u03c4\u03c1\u03b9\u03b3\u03c9\u03bd\u03bf\u03bc\u03b5\u03c4\u03c1\u03b9\u03ba\u03ad\u03c2 \u03c3\u03c5\u03bd\u03b1\u03c1\u03c4\u03ae\u03c3\u03b5\u03b9\u03c2
RightAngleStyle=\u03a3\u03c4\u03c5\u03bb \u03bf\u03c1\u03b8\u03ae\u03c2 \u03b3\u03c9\u03bd\u03af\u03b1\u03c2
-RightPrism=\u039f\u03c1\u03b8\u03cc \u03a0\u03c1\u03af\u03c3\u03bc\u03b1
-RightPrism.Help=\u03a3\u03cd\u03c1\u03b5\u03c4\u03b5 \u03c0\u03bf\u03bb\u03cd\u03b3\u03c9\u03bd\u03bf \u03ae \u03b5\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03c0\u03bf\u03bb\u03cd\u03b3\u03c9\u03bd\u03bf \u03ba\u03b1\u03b9 \u03b4\u03ce\u03c3\u03c4\u03b5 \u03c4\u03bf \u03cd\u03c8\u03bf\u03c2
RightProb=\u0391\u03c0\u03cc \u0394\u03b5\u03be\u03b9\u03ac
RigidPolygon=\u03a3\u03c4\u03b1\u03b8\u03b5\u03c1\u03cc \u03a0\u03b5\u03c1\u03b9\u03c3\u03c4\u03c1\u03b5\u03c6\u03cc\u03bc\u03b5\u03bd\u03bf \u03a0\u03bf\u03bb\u03cd\u03b3\u03c9\u03bd\u03bf
RigidPolygon.Help=\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03cc\u03bb\u03b5\u03c2 \u03c4\u03b9\u03c2 \u03ba\u03bf\u03c1\u03c5\u03c6\u03ad\u03c2 \u03ba\u03b1\u03b9 \u03bc\u03b5\u03c4\u03ac \u03ba\u03ac\u03bd\u03c4\u03b5 \u03ba\u03bb\u03b9\u03ba \u03c3\u03c4\u03b7\u03bd \u03c0\u03c1\u03ce\u03c4\u03b7 \u03ba\u03bf\u03c1\u03c5\u03c6\u03ae
@@ -711,8 +699,6 @@ VectorPolygon=\u03a0\u03bf\u03bb\u03cd\u03b3\u03c9\u03bd\u03bf \u0394\u03b9\u03b
VectorPolygon.Help=\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03cc\u03bb\u03b5\u03c2 \u03c4\u03b9\u03c2 \u03ba\u03bf\u03c1\u03c5\u03c6\u03ad\u03c2 \u03ba\u03b1\u03b9 \u03bc\u03b5\u03c4\u03ac \u03ba\u03ac\u03bd\u03c4\u03b5 \u03ba\u03bb\u03b9\u03ba \u03c3\u03c4\u03b7\u03bd \u03c0\u03c1\u03ce\u03c4\u03b7 \u03ba\u03bf\u03c1\u03c5\u03c6\u03ae
VerticalScrollbars=\u039a\u03b1\u03c4\u03b1\u03ba\u03cc\u03c1\u03c5\u03c6\u03b5\u03c2 \u039c\u03c0\u03ac\u03c1\u03b5\u03c2
View=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae
-ViewInFrontOf=\u039c\u03c0\u03c1\u03bf\u03c3\u03c4\u03b9\u03bd\u03ae \u038c\u03c8\u03b7
-ViewInFrontOf.Help=\u0391\u03bd \u03ba\u03ac\u03bd\u03b5\u03c4\u03b5 \u03ba\u03bb\u03b9\u03ba \u03b2\u03bb\u03ad\u03c0\u03b5\u03c4\u03b5 \u03c4\u03b7\u03bd \u03bc\u03c0\u03c1\u03bf\u03c3\u03c4\u03b9\u03bd\u03ae \u03cc\u03c8\u03b7 \u03c4\u03bf\u03c5 \u03b1\u03bd\u03c4\u03b9\u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5
Views=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ad\u03c2
VisualStyle=\u039f\u03c0\u03c4\u03b9\u03ba\u03cc \u03a3\u03c4\u03c5\u03bb
VisualStyle.Help=\u039a\u03ac\u03bd\u03c4\u03b5 \u03ba\u03bb\u03b9\u03ba \u03c3\u03b5 \u03b1\u03bd\u03c4\u03b9\u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03b1 \u03ae \u03c0\u03b5\u03c1\u03b9\u03ba\u03bb\u03b5\u03af\u03c3\u03c4\u03b5 \u03c4\u03b1 \u03c3\u03b5 \u03ad\u03bd\u03b1 \u03bf\u03c1\u03b8\u03bf\u03b3\u03ce\u03bd\u03b9\u03bf \u03b3\u03b9\u03b1 \u03bd\u03b1 \u03b1\u03bb\u03bb\u03ac\u03be\u03b5\u03c4\u03b5 \u03c4\u03b9\u03c2 \u03b9\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03ad\u03c2 \u03c4\u03bf\u03c5\u03c2
diff --git a/geogebra/properties/menu_es.properties b/geogebra/properties/menu_es.properties
index 9c5da50..2ff598a 100644
--- a/geogebra/properties/menu_es.properties
+++ b/geogebra/properties/menu_es.properties
@@ -94,7 +94,7 @@ Compasses.Help=Segmento o Puntos Extremos del Radio; luego, Centro
ComplexNumber=Número Complejo
ComplexNumber.Help=Clic en la Vista Gráfica para crear un número complejo
ConciseCode=Código Conciso
-ConciseUsingCSE5=Conciso Usando cse5
+ConciseUsingCSE5=Resumen Usando cse5
Condition.ShowObject=Condición para Exponer el Objeto
Conditions=Condiciones
ConfidenceInterval=Intervalo de Confianza
@@ -385,8 +385,6 @@ OperationTable=Tabla de Operaci
Options=Opciones
Orthogonal=Recta Perpendicular
Orthogonal.Help=Punto y recta perpendicular
-OrthogonalPlane=Plano Perpendicular
-OrthogonalPlane.Help=Un punto y una recta perpendicular
Other=Otro
OutputObjects=Objetos de Salida
Overlay=Superposición
@@ -398,8 +396,6 @@ Parabola=Par
Parabola.Help=Foco y Directriz
Parallel=Recta Paralela
Parallel.Help=Punto y recta paralela
-ParallelPlane=Plano Paralelo
-ParallelPlane.Help=Un punto y un plano paralelo
Paste=Pega
PasteDataFromClipboard=Pega Datos del Portapapeles
PasteSpecial=Pegado Especial
@@ -413,10 +409,6 @@ Perspective.Primary=Primario
Perspective.TableAndGraphics=Hoja de Cálculo y Gráficos
Perspective.Whiteboard=Pizarra Digital
Perspectives=Apariencias
-PlanePointLine=Plano definido por un punto y una recta
-PlanePointLine.Help=Un punto y una recta
-PlaneThreePoint=Plano definido por tres puntos
-PlaneThreePoint.Help=Tres puntos
Point=Nuevo Punto
Point.Help=Clic en Vista Gráfica o sobre curva, recta, polígono o función
PointCapturing=Atracción de Punto a Cuadrícula
@@ -439,8 +431,6 @@ Power=Potencia
Preview=Vista Previa
Print=Imprime
PrintPreview=Previsualiza Impresión
-Prism=Prisma
-Prism.Help=Polígono (o puntos) y primer punto de segunda cara paralela
Probability=Probabilidad
ProbabilityCalculator=Cálculo de Probabilidades
ProbabilityCalculator.Help=Caja de Diálogo para cálculo de probabilidades
@@ -482,8 +472,6 @@ ResidualPlot=Gr
Result=Resultado
ReturnAngleInverseTrig=Angulo desde funciones trigonométricas inversas
RightAngleStyle=Estilo de Ángulo Recto
-RightPrism=Prisma Recto
-RightPrism.Help=Arrastrar o seleccionar polígono y anotar su altura
RightProb=Por Lado Derecho
RigidPolygon=Polígono Rígido
RigidPolygon.Help=Vértices uno a uno y finalmente reelegir el primero
@@ -670,7 +658,7 @@ TwoVarStats.Help=Analiza valores de a pares en celdas seleccionadas
TwoVariable=Dos Variables
TwoVariableInference=Inferencia de Dos Variables
Type.Algebra=Álgebra
-Type.CAS=Comandos Específicos CAS
+Type.CAS=Específico en CAS
Type.Chart=Diagrama
Type.Conic=Cónica
Type.DiscreteMath=Matemática Discreta
@@ -705,8 +693,6 @@ VectorPolygon=Pol
VectorPolygon.Help=Seleccionar todos los vértices y reiterar el primero
VerticalScrollbars=Barra de Deslizamiento Vertical
View=Vista
-ViewInFrontOf=Vista Frontal de
-ViewInFrontOf.Help=Cambia la vista frontal del objeto indicado por el clic
Views=Vistas
VisualStyle=Estilo Visual
VisualStyle.Help=Clic o enmarcado de los objetos a los que cambiarles propiedades
diff --git a/geogebra/properties/menu_et.properties b/geogebra/properties/menu_et.properties
index 5f842bd..c2c1c0f 100644
--- a/geogebra/properties/menu_et.properties
+++ b/geogebra/properties/menu_et.properties
@@ -382,8 +382,6 @@ OperationTable=Operatsioonide tabel
Options=Võimalused
Orthogonal=Ristsirge
Orthogonal.Help=Valige punkt ja sirge/lõik/kiir
-OrthogonalPlane=Risttasand
-OrthogonalPlane.Help=Vali punkt ja ristsirge
Other=Muu
OutputObjects=Väljundobjektid
Overlay=Ülekate
@@ -395,8 +393,6 @@ Parabola=Parabool
Parabola.Help=Klõpsake punktil ja juhtjoonel
Parallel=Paralleelne sirge
Parallel.Help=Klõpsake punktil ja sirgel
-ParallelPlane=Paralleeltasand
-ParallelPlane.Help=Vali punkt ja parallelne tasand
Paste=Kleebi
PasteDataFromClipboard=Kleebi andmed lõikepuhvrist
PasteSpecial=Kleebi eriliselt
@@ -409,10 +405,6 @@ Perspective.Primary=Esmaj
Perspective.TableAndGraphics=Tabel ja graafika
Perspective.Whiteboard=Tahvel
Perspectives=Perspektiivid
-PlanePointLine=Tasand läbi punkti ja sirge
-PlanePointLine.Help=Valige punkt ja sirge
-PlaneThreePoint=Tasand läbi kolme punkti
-PlaneThreePoint.Help=Valige kolm punkti
Point=Uus punkt
Point.Help=Klõpsake graafikavaatel või sirgel/lõigul/kiirel, funktsioonil või kõveral
PointCapturing=Punkti haaramine
@@ -436,8 +428,6 @@ Power=Astme
Preview=Eelvaade
Print=Prindi
PrintPreview=Prindi eelvaade
-Prism=Prisma
-Prism.Help=Valige hulknurk (või punktid) ning esimene punkt valitud hulknurgaga paralleelsel põhiküljel
Probability=Tõenäosus
ProbabilityCalculator=Tõenäosuskalkulaator
ProbabilityCalculator.Help=Dialoogiaken tõenäosuste arvutamiseks
@@ -477,8 +467,6 @@ ResidualPlot=J
Result=Tulemus
ReturnAngleInverseTrig=Pöördtrigonomeetriliste funktsioonide korral väljastatakse nurk
RightAngleStyle=Täisnurga stiil
-RightPrism=Püstprisma
-RightPrism.Help=Lohistage hulknurka vöi valige hulknurk ja sisestage kõrgus
RightProb=Parempoolne
RigidPolygon=Muutumatu hulknurk
RigidPolygon.Help=Valige kõik tipud, seejärel klõpsake uuesti alguspunktile
@@ -694,8 +682,6 @@ VectorFromPoint.Help=Valige punkt ja seej
VectorMenu=Vektor
VerticalScrollbars=Vertikaalsed kerimisribad
View=Vaade
-ViewInFrontOf=Eestvaade
-ViewInFrontOf.Help=Klõpsake objektile, mille eestvaadet soovite näha
Views=Vaated
VisualStyle=Visuaalne stiil
VisualStyle.Help=Klõpsake objektil või looge objektide valikuristkülik, mille omadusi soovite muuta
diff --git a/geogebra/properties/menu_eu.properties b/geogebra/properties/menu_eu.properties
index c1f508c..f1a06d7 100644
--- a/geogebra/properties/menu_eu.properties
+++ b/geogebra/properties/menu_eu.properties
@@ -393,8 +393,6 @@ OperationTable=Eragiketa-Taula
Options=Aukerak
Orthogonal=Zuzen perpendikularra
Orthogonal.Help=Puntua eta zuzen perpendikularra
-OrthogonalPlane=Plano Perpendikularra
-OrthogonalPlane.Help=Puntu bat eta zuzen perpendikular bat
Other=Beste bat
OutputObjects=Irteerako Objektuak
Overlay=Gainjartzea
@@ -405,8 +403,6 @@ PairedT=T Parekatzailea
Parabola.Help=Fokua eta zuzentzailea
Parallel=Zuzen paraleloa
Parallel.Help=Puntua eta zuzen paraleloa
-ParallelPlane=Plano Paraleloa
-ParallelPlane.Help=Puntu bat eta plano paralelo bat
Paste=Itsatsi
PasteDataFromClipboard=Itsatsi Datuak Arbeletik
PasteSpecial=Itsaste Berezia
@@ -420,10 +416,6 @@ Perspective.Primary=Oinarrizkoa
Perspective.TableAndGraphics=Taula eta Grafikoak
Perspective.Whiteboard=Arbel Birtuala
Perspectives=Antolaketak
-PlanePointLine=Planoa, puntu batek eta zuzen batek definitutakoa
-PlanePointLine.Help=Puntu bat eta zuzen bat
-PlaneThreePoint=Planoa, hiru puntuk definitutakoa
-PlaneThreePoint.Help=Hiru puntu
Point=Puntu berria
Point.Help=Egin klik Ikuspegi Grafikoan edo zuzen, funtzio edo kurba batean
PointCapturing=Puntu-kaptura
@@ -447,8 +439,6 @@ Power=Potentzia
Preview=Aurrebista
Print=Inprimatu
PrintPreview=Inprimatzeko aurrebista
-Prism=Prisma
-Prism.Help=Polgonoa (edo puntuak) eta bigarren aurpegi paraleloaren lehen puntua
Probability=Probabilitatea
ProbabilityCalculator=Probabilitateak Kalkulatzea
ProbabilityCalculator.Help=Elkarrizketa-koadroa probabilitateak kalkulatzeko
@@ -489,8 +479,6 @@ ResidualPlot=Hondar-Grafikoa
Result=Emaitza
ReturnAngleInverseTrig=Angelua alderantzizko funtzio trigonometrikoetatik
RightAngleStyle=Angelu Zuzenaren Estiloa
-RightPrism=Priosma Zuzena
-RightPrism.Help=Arrastatu poligonoa, edo hautatu poligonoa eta sartu altuera
RightProb=Eskuinaldetik
RigidPolygon=Poligono Zurruna
RigidPolygon.Help=Erpinak banan-banan eta, azkenik, hasierakoa
@@ -714,8 +702,6 @@ VectorPolygon=Bektore-Poligonoa
VectorPolygon.Help=Erpinak banan-banan eta, azkenik, hasierakoa
VerticalScrollbars=Korritze-Barra Bertikala
View=Ikuspegia
-ViewInFrontOf=Ikuspegia honen aurrean:
-ViewInFrontOf.Help=Aldatu ikuspegia hautatutako objektuaren aurrera
Views=Ikuspegiak
VisualStyle=Ikuste-Estiloa
VisualStyle.Help=Egin klik objektuetan edo arrastatu hautespen-laukizuzenak beren propietateak aldatzeko
diff --git a/geogebra/properties/menu_fa.properties b/geogebra/properties/menu_fa.properties
index 6594af2..48b49b2 100644
--- a/geogebra/properties/menu_fa.properties
+++ b/geogebra/properties/menu_fa.properties
@@ -44,7 +44,7 @@ ByLayering=\u0628\u0647 \u0648\u0633\u06cc\u0644\u0647 \u0644\u0627\u06cc\u0647
Calculate=\u0645\u062d\u0627\u0633\u0628\u0647
CalligraphicLetters=\u062d\u0631\u0648\u0641 \u062e\u0637\u0627\u0637\u06cc \u0634\u062f\u0647
Cancel=\u0644\u063a\u0648
-Cartesian=\u062f\u06a9\u0627\u062f\u062a\u06cc
+Cartesian=\u062f\u06a9\u0627\u0631\u062a\u06cc
CheckboxSize=\u0627\u0646\u062f\u0627\u0632\u0647 \u062c\u0639\u0628\u0647 \u06cc \u0627\u0646\u062a\u062e\u0627\u0628
CheckboxSize.Large=\u0628\u0632\u0631\u06af
CheckboxSize.Regular=\u0645\u0639\u0645\u0648\u0644\u06cc
@@ -116,7 +116,7 @@ CopyVisualStyle=\u0627\u0644\u06af\u0648 \u0628\u0631\u062f\u0627\u0631\u064a \u
CopyVisualStyle.Help=\u06cc\u06a9 \u0634\u06cc\u0621 \u0631\u0627 \u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0631\u062f\u0647, \u0633\u067e\u0633 \u0628\u0631\u0627\u06cc \u06a9\u067e\u06cc \u06a9\u0631\u062f\u0646 \u0633\u0628\u06a9 \u0628\u0631 \u0627\u0634\u06cc\u0627\u0621 \u062f\u06cc\u06af\u0631 \u06a9\u0644\u06cc\u06a9 \u06a9\u0646\u06cc\u062f
Count=\u0634\u0645\u0627\u0631\u0634
CountCells=\u0634\u0645\u0627\u0631\u0634
-CountCells.Help=\u0627\u0646\u062a\u062e\u0627\u0628 \u0645\u062c\u0645\u0648\u0639\u0647 \u0627\u06cc \u0627\u0632 \u0633\u0644\u0648\u0644\u200f \u0647\u0627
+CountCells.Help=\u0627\u0646\u062a\u062e\u0627\u0628 \u0645\u062c\u0645\u0648\u0639\u0647 \u0627\u06cc \u0627\u0632 \u0633\u0644\u0648\u0644 \u0647\u0627
Create=\u0627\u064a\u062c\u0627\u062f
CreateCurveFit=\u0628\u0647\u062a\u0631\u06cc\u0646 \u062e\u0645 \u0642\u0627\u0628\u0644 \u0627\u0646\u0637\u0628\u0627\u0642
CreateCurveFit.Help=\u0633\u0644\u0648\u0644 \u0647\u0627\u06cc\u06cc \u0628\u0631\u0627\u06cc \u0646\u0642\u0627\u0637 \u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0631\u062f\u0647 \u0633\u067e\u0633 \u0631\u0648\u06cc \u0627\u0628\u0632\u0627\u0631 \u062f\u06a9\u0645\u0647 \u06a9\u0644\u06cc\u06a9 \u06a9\u0646\u06cc\u062f
@@ -403,8 +403,6 @@ OperationTable=\u062c\u062f\u0648\u0644 \u0639\u0645\u0644\u06cc\u0627\u062a
Options=\u06af\u0632\u064a\u0646\u0647 \u0647\u0627
Orthogonal=\u062e\u0637 \u0639\u0645\u0648\u062f
Orthogonal.Help=\u0627\u0628\u062a\u062f\u0627 \u0646\u0642\u0637\u0647 \u0648 \u0633\u067e\u0633 \u062e\u0637 \u0631\u0627 \u06a9\u0647 \u0645\u06cc \u062e\u0648\u0627\u0647\u06cc\u062f \u0628\u0631 \u0622\u0646 \u0639\u0645\u0648\u062f \u0631\u0633\u0645 \u06a9\u0646\u06cc\u062f \u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0646\u06cc\u062f
-OrthogonalPlane=\u0635\u0641\u062d\u0647 \u0639\u0645\u0648\u062f\u06cc
-OrthogonalPlane.Help=\u0627\u0646\u062a\u062e\u0627\u0628 \u0646\u0642\u0637\u0647 \u0648 \u062e\u0637 \u0639\u0645\u0648\u062f
Other=\u062f\u06cc\u06af\u0631
OutputObjects=\u0627\u0634\u06cc\u0627\u0621 \u062e\u0631\u0648\u062c\u06cc
Overlay=\u0631\u0648\u06cc \u0647\u0645 \u0642\u0631\u0627\u0631 \u062f\u0627\u062f\u0646
@@ -416,25 +414,19 @@ Parabola=\u0633\u0647\u0645\u06cc
Parabola.Help=\u0646\u0642\u0637\u0647 \u0648 \u062e\u0637 \u0647\u0627\u062f\u06cc
Parallel=\u062e\u0637 \u0645\u0648\u0627\u0632\u064a
Parallel.Help=\u0627\u0628\u062a\u062f\u0627 \u0646\u0642\u0637\u0647 \u0648 \u0633\u067e\u0633 \u06cc\u06a9 \u062e\u0637 \u0631\u0627 \u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0646\u06cc\u062f
-ParallelPlane=\u0635\u0641\u062d\u0647 \u0645\u0648\u0627\u0632\u06cc
-ParallelPlane.Help=\u0627\u0646\u062a\u062e\u0627\u0628 \u0646\u0642\u0637\u0647 \u0648 \u0635\u0641\u062d\u0647 \u0645\u0648\u0627\u0632\u06cc
Paste=\u062c\u0627\u06cc \u06af\u0630\u0627\u0631\u06cc
PasteDataFromClipboard=\u062c\u0627\u06cc\u06af\u0630\u0627\u0631\u06cc \u062f\u0627\u062f\u0647 \u0647\u0627 \u0627\u0632 \u062a\u062e\u062a\u0647 \u0646\u06af\u0647\u062f\u0627\u0631\u0646\u062f\u0647
PasteSpecial=\u062c\u0627\u06cc\u06af\u0630\u0627\u0631\u06cc \u062e\u0627\u0635
Pen=\u0642\u0644\u0645
Pen.Help=\u062f\u0631 \u0646\u0645\u0627\u06cc \u06af\u0631\u0627\u0641\u06cc\u06a9\u06cc \u0628\u06a9\u0634\u06cc\u062f. \u0628\u0631\u0627\u06cc \u0627\u062a\u0645\u0627\u0645\u060c \u0627\u0628\u0632\u0627\u0631 \u062f\u06cc\u06af\u0631\u06cc \u0631\u0627 \u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0646\u06cc\u062f.
Perspective.AlgebraAndGraphics=\u06af\u0631\u0627\u0642\u06cc\u06a9\u06cc \u0648 \u062c\u0628\u0631\u06cc
-Perspective.BasicGeometry=\u0647\u0646\u062f\u0633\u0647 \u0645\u0642\u062f\u0645\u0627\u062a\u06cc
+Perspective.BasicGeometry=\u0647\u0646\u062f\u0633\u0647 \u0627\u0628\u062a\u062f\u0627\u06cc\u06cc
Perspective.CASAndGraphics=\u06af\u0631\u0627\u0641\u06cc\u06a9\u06cc \u0648 \u062c\u0628\u0631\u06cc
Perspective.Geometry=\u0647\u0646\u062f\u0633\u0647 \u067e\u06cc\u0634\u0631\u0641\u062a\u0647
Perspective.Primary=\u0645\u0642\u062f\u0645\u0627\u062a\u06cc
Perspective.TableAndGraphics=\u062c\u062f\u0648\u0644 \u0648 \u06af\u0631\u0627\u0641\u06cc\u06a9\u06cc
Perspective.Whiteboard=\u062a\u062e\u062a\u0647 \u0633\u0641\u06cc\u062f
Perspectives=\u0632\u0627\u0648\u06cc\u0647 \u062f\u06cc\u062f
-PlanePointLine=\u0635\u0641\u062d\u0647 \u06af\u0630\u0631\u0646\u062f\u0647 \u0627\u0632 \u0646\u0642\u0637\u0647 \u0648 \u062e\u0637
-PlanePointLine.Help=\u0627\u0646\u062a\u062e\u0627\u0628 \u06cc\u06a9 \u0646\u0642\u0637\u0647 \u0648 \u062e\u0637
-PlaneThreePoint=\u0635\u0641\u062d\u0647 \u06af\u0630\u0631\u0646\u062f\u0647 \u0627\u0632 \u0633\u0647 \u0646\u0642\u0637\u0647
-PlaneThreePoint.Help=\u0627\u0646\u062a\u062e\u0627\u0628 \u0633\u0647 \u0646\u0642\u0637\u0647
Point=\u0646\u0642\u0637\u0647 \u062c\u062f\u064a\u062f
Point.Help=\u062f\u0631 \u0635\u0641\u062d\u0647 \u062a\u0631\u0633\u06cc\u0645\u060c \u06cc\u06a9 \u062e\u0637\u060c \u062a\u0627\u0628\u0639 \u06cc\u0627 \u0645\u0646\u062d\u0646\u06cc \u06a9\u0644\u06cc\u06a9 \u06a9\u0646\u06cc\u062f
PointCapturing=\u06af\u0631\u0627\u0646\u0634 \u0646\u0642\u0627\u0637
@@ -458,8 +450,6 @@ Power=\u062a\u0648\u0627\u0646
Preview=\u067e\u06cc\u0634 \u0646\u0645\u0627\u06cc\u0634
Print=\u0686\u0627\u067e
PrintPreview=\u067e\u064a\u0634\u0646\u0645\u0627\u064a \u0686\u0627\u067e
-Prism=\u0645\u0646\u0634\u0648\u0631
-Prism.Help=\u06cc\u06a9 \u0686\u0646\u062f \u0636\u0644\u0639\u06cc \u0648 \u0627\u0648\u0644\u06cc\u0646 \u0646\u0642\u0637\u0647 \u0627\u0632 \u0635\u0641\u062d\u0647 \u0645\u0648\u0627\u0632\u06cc \u062f\u0648\u0645 \u0631\u0627 \u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0646\u06cc\u062f.
Probability=\u0627\u062d\u062a\u0645\u0627\u0644\u200c
ProbabilityCalculator=\u0645\u062d\u0627\u0633\u0628\u0647 \u0627\u062d\u062a\u0645\u0627\u0644\u0627\u062a
ProbabilityCalculator.Help=\u067e\u0646\u062c\u0631\u0647 \u0645\u062d\u0627\u0633\u0628\u0647 \u0627\u062d\u062a\u0645\u0627\u0644\u0627\u062a
@@ -501,8 +491,6 @@ ResidualPlot=\u062a\u0631\u0633\u06cc\u0645 \u0628\u0627\u0642\u06cc\u0645\u0627
Result=\u0646\u062a\u06cc\u062c\u0647
ReturnAngleInverseTrig=\u0628\u0627\u0632\u06af\u0634\u062a \u0632\u0627\u0648\u06cc\u0647 \u0627\u0632 \u062a\u0627\u0628\u0639 \u0645\u062b\u0644\u062b\u0627\u062a\u06cc \u0645\u0639\u06a9\u0648\u0633
RightAngleStyle=\u0634\u06a9\u0644 \u0646\u0645\u0627\u06cc\u0634 \u0632\u0627\u0648\u06cc\u0647 \u06cc \u0642\u0627\u0626\u0645\u0647
-RightPrism=\u0645\u0646\u0634\u0648\u0631 \u0642\u0627\u0626\u0645
-RightPrism.Help=\u0686\u0646\u062f \u0636\u0644\u0639\u06cc \u0631\u0627\u0628\u06a9\u0634\u06cc\u062f\u060c \u06cc\u0627\u0686\u0646\u062f \u0636\u0644\u0639\u06cc \u0631\u0627 \u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0646\u06cc\u062f \u0648 \u0627\u0646\u062f\u0627\u0632\u0647 \u06cc\u0627\u0644 \u0631\u0627 \u0648\u0627\u0631\u062f \u0646\u0645\u0627\u06cc\u06cc\u062f.
RightProb=\u062c\u0627\u0646\u0628 \u0631\u0627\u0633\u062a
RigidPolygon=\u0686\u0646\u062f \u0636\u0644\u0639\u06cc \u0635\u0644\u0628
RigidPolygon.Help=\u0647\u0645\u0647 \u0631\u0627\u0633 \u0647\u0627 \u0631\u0627 \u0627\u0646\u062a\u062e\u0627\u0628 \u0646\u0645\u0627\u06cc\u06cc\u062f\u060c \u0633\u067e\u0633 \u0631\u0648\u06cc \u0627\u0648\u0644\u06cc\u0646 \u0631\u0627\u0633 \u06a9\u0644\u06cc\u06a9 \u06a9\u0646\u06cc\u062f
@@ -729,8 +717,6 @@ VectorPolygon=\u0686\u0646\u062f \u0636\u0644\u0639\u06cc \u0628\u0631\u062f\u06
VectorPolygon.Help=\u0631\u0626\u0648\u0633 \u0631\u0627 \u0645\u0634\u062e\u0635 \u06a9\u0646\u06cc\u062f \u0633\u067e\u0633 \u0645\u062c\u062f\u062f \u0631\u0623\u0633 \u0627\u0648\u0644 \u0631\u0627 \u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0646\u06cc\u062f
VerticalScrollbars=\u0646\u0648\u0627\u0631 \u0644\u063a\u0632\u0646\u062f\u0647 \u0639\u0645\u0648\u062f\u06cc
View=\u0646\u0645\u0627
-ViewInFrontOf=\u0646\u0645\u0627\u06cc \u0627\u0632 \u062c\u0644\u0648
-ViewInFrontOf.Help=\u062a\u063a\u06cc\u06cc\u0631\u062f\u0627\u062f\u0646 \u067e\u06cc\u0634 \u0646\u0645\u0627 \u0627\u0632 \u0627\u0634\u06cc\u0627\u0621 \u06a9\u0644\u06cc\u06a9 \u0634\u062f\u0647
Views=\u0646\u0645\u0627\u0647\u0627
VisualStyle=\u0633\u0628\u06a9 \u062f\u06cc\u062f\u0627\u0631\u06cc
VisualStyle.Help=\u0628\u0631\u0627\u06cc \u062a\u063a\u06cc\u06cc\u0631 \u0645\u0634\u062e\u0635\u0627\u062a \u0627\u0634\u06cc\u0627\u0621 \u0631\u0648\u0633 \u0622\u0646 \u0647\u0627 \u06cc\u0627 \u06cc\u06a9 \u0645\u0633\u062a\u0637\u06cc\u0644 \u0627\u0646\u062a\u062e\u0627\u0628 \u06a9\u0644\u06cc\u06a9 \u0646\u0645\u0627\u06cc\u06cc\u062f
diff --git a/geogebra/properties/menu_fi.properties b/geogebra/properties/menu_fi.properties
index 4699140..b0342a7 100644
--- a/geogebra/properties/menu_fi.properties
+++ b/geogebra/properties/menu_fi.properties
@@ -340,8 +340,6 @@ OperationTable=Operaatio taulu
Options=Vaihtoehdot
Orthogonal=Normaali
Orthogonal.Help=Valitse piste ja suora, jota vastaan kohtisuora piirretään
-OrthogonalPlane=Kohtisuora taso
-OrthogonalPlane.Help=Valitse piste ja kohtisuora suora
Other=Muu
OutputObjects=Tulosobjektit
Overlay=Päällys
@@ -350,8 +348,6 @@ Parabola=Paraabeli
Parabola.Help=Valitse polttopiste ja johtosuora
Parallel=Yhdensuuntainen
Parallel.Help=Valitse piste ja sitten suora, jonka kanssa yhdensuuntainen piirretään
-ParallelPlane=Yhdensuuntainen taso
-ParallelPlane.Help=Valitse piste ja yhdensuuntainen taso
Paste=Liitä
PasteDataFromClipboard=Liitä leikepöydältä
PasteSpecial=Liitä määräten...
@@ -365,10 +361,6 @@ Perspective.Primary=Alkeisgeometria
Perspective.TableAndGraphics=Taulukko ja grafiikka
Perspective.Whiteboard=Valkotaulu
Perspectives=Näkymät
-PlanePointLine=Taso pisteen ja suoran kautta
-PlanePointLine.Help=Valitse piste ja suora
-PlaneThreePoint=Taso kolmen pisteen kautta
-PlaneThreePoint.Help=Valitse kolme pistettä
Point=Uusi piste
Point.Help=Näpäytä piirtoaluetta, suoraa, funktiota tai käyrää
PointCapturing=Pisteen sieppaus
@@ -392,8 +384,6 @@ Power=Aste
Preview=Esikatselu
Print=Tulosta
PrintPreview=Tulostuksen esikatselu
-Prism=Särmiö
-Prism.Help=Valitse pohjaksi monikulmio (tai pisteet) ja piste yhdensuuntaiselta tahkolta
Probability=Todennäköisyys
ProbabilityCalculator=Todennäiköisyyslaskuri
ProbabilityCalculator.Help=Ohjattu laskenta todennäköisyyksille
@@ -433,8 +423,6 @@ ResidualPlot=Jakoj
Result=Tulos
ReturnAngleInverseTrig=Anna kulma käänteisistä trigonometrisistä funktioista
RightAngleStyle=Suoran kulman tyyli
-RightPrism=Suora särmiö
-RightPrism.Help=Piirrä monikulmio tai valitse monikulmio ja syötä korkeus
RightProb=Oikeanpuoleinen
RigidPolygon=Jäykkä monikulmio
RigidPolygon.Help=Valitse kärkipisteet ja sitten ensimmäinen uudelleen
@@ -630,7 +618,6 @@ VectorPolygon=Vektori monikulmio
VectorPolygon.Help=Valitse ensin kaikki kärjet ja sitten ensimmäinen uudelleen
VerticalScrollbars=Vaakasuora vierityspalkki
View=Näytä
-ViewInFrontOf=Näytä objektin edessä
Width=Leveys
Window=Ikkuna
Windows=Ikkunat
diff --git a/geogebra/properties/menu_fr.properties b/geogebra/properties/menu_fr.properties
index 7d7d856..814da96 100644
--- a/geogebra/properties/menu_fr.properties
+++ b/geogebra/properties/menu_fr.properties
@@ -190,7 +190,7 @@ Exit=Quitter
Expand=Développer
Expand.Help=Développe
ExpandAll=Développer tout
-Exponential=Exponentielle
+Exponential=exponentiel
Export=Exporter
ExportAllWorksheets=Exporter toutes les feuilles ouvertes
Factor=Factoriser
@@ -300,7 +300,7 @@ LineBisector=M
LineBisector.Help=Deux points[créés ou non] ou un segment
LineGraph=Graphe affine
LineMenu=Droite
-Linear=Linéaire
+Linear=affine
LinkedFiles=Fichiers liés
List=Liste
ListOfPoints=Liste de points
@@ -374,8 +374,6 @@ Operation=Op
OperationTable=Tableau Calculs
Orthogonal=Perpendiculaire
Orthogonal.Help=Point[créé ou non] et segment,droite, demi-droite ou vecteur[créés]
-OrthogonalPlane=Plan perpendiculaire
-OrthogonalPlane.Help=Un point et une ligne perpendiculaire
Other=Autre
OutputObjects=Objets Finaux
Overlay=Superposer
@@ -387,8 +385,6 @@ Parabola=Parabole
Parabola.Help=Point[créé ou non] et directrice[créée]
Parallel=Parallèle
Parallel.Help=Point[créé ou non] et segment,droite, demi-droite ou vecteur[créés]
-ParallelPlane=Plan parallèle
-ParallelPlane.Help=Un point et un plan
Paste=Coller
PasteDataFromClipboard=Coller Données du Presse-papiers
PasteSpecial=Collage spécial
@@ -402,10 +398,6 @@ Perspective.Primary=Primaire
Perspective.TableAndGraphics=Tableur & Graphique
Perspective.Whiteboard=Tableau Blanc
Perspectives=Dispositions
-PlanePointLine=Plan défini par un point et une ligne
-PlanePointLine.Help=Un point et une ligne
-PlaneThreePoint=Plan passant par trois points
-PlaneThreePoint.Help=Trois points
Point=Nouveau point
Point.Help=Cliquer dans Graphique ou sur un objet[créé]
PointCapturing=Capture d'un point
@@ -423,12 +415,10 @@ Polygon=Polygone
Polygon.Help=Tous les sommets[créés ou non], et de nouveau le sommet de départ
PolygonTools=Polygones
Polynomial=Polynôme
-Power=Puissance
+Power=puissance
Preview=Aperçu
Print=Imprimer
PrintPreview=Aperçu avant impression
-Prism=Prisme
-Prism.Help=Sélectionner un polygone (ou des points) et le premier point de la face parallèle
Probability=Probabilités
ProbabilityCalculator=Calculs Probabilités
ProbabilityCalculator.Help=Dialogue pour calculer des probabilités
@@ -466,8 +456,6 @@ ResidualPlot=R
Result=Résultat
ReturnAngleInverseTrig=Retourne angle pour les fonctions trigonométriques inverses
RightAngleStyle=Codage angle droit
-RightPrism=Prisme droit
-RightPrism.Help=Déplacer un polygone, ou sélectionner un polygone et entrer la hauteur
RightProb=à droite
RigidPolygon=Polygone indéformable
RigidPolygon.Help=Tous les sommets[créés ou non], et de nouveau le sommet de départ
@@ -688,8 +676,6 @@ VectorPolygon=Polygone semi-d
VectorPolygon.Help=Tous les sommets[créés ou non], et de nouveau le sommet de départ
VerticalScrollbars=Ascenseur vertical
View=Affichage
-ViewInFrontOf=Vue de face
-ViewInFrontOf.Help=Vue de face de l'objet sélectionné
Views=Vues
VisualStyle=Style graphique
VisualStyle.Help=Sélectionner des objets par clic ou par rectangle de sélection pour changer leurs propriétés
diff --git a/geogebra/properties/menu_gl.properties b/geogebra/properties/menu_gl.properties
index acf75e0..eae4449 100644
--- a/geogebra/properties/menu_gl.properties
+++ b/geogebra/properties/menu_gl.properties
@@ -1,5 +1,16 @@
-About=Acerca de
+About=Acerca de GeoGebra
+Accents=Acentos
+AccentsExt=Acentos extendidos
+ActionObjectTools=Ferramentas de obxectos de acción
+AddTrace=Engade obxecto a lista de rastrexo
+Adjustment=Axuste
Advanced=Avanzado
+AlgebraDescriptions=Descricións de álxebra
+AllCommands=Todos os comandos
+AllowRescaling=Admite reescalado
+AllowTooltips=Admite apuntes
+AlternativeHypothesis=Hipótese alternativa
+AlternativeHypothesis.short=Alternativa
Angle=Ángulo
Angle.Help=Escoller tres puntos ou dúas rectas
AngleFixed=Ángulo de amplitude dada
@@ -7,17 +18,36 @@ AngleFixed.Help=Escoller o punto de apoio, despois o v
AngleUnit=Unidade angular
AngularBisector=Bisectriz
AngularBisector.Help=Escoller tres puntos ou dúas rectas
+ApplyDefaults=Aplica valores por omisión
Area=Área
Area.Help=Escoller polígono, círculo ou cónica
+Ascending=Ascendente
+AttachDetachPoint=Encosta / Libera Punto
+AttachDetachPoint.Help=Clic sobre un punto (e un obxecto a encostar)
+AutoDimension=Dimensións automáticas
Axes=Eixes
+Back=Previo
+BackgroundColor=Cor de fondo
BasicLineTools=Ferramentas para rectas
+BetweenGroups=Entre grupos
+BlackboardLetters=Letras murais
Blue=Azul
Bold=Negra
+Boxplot=Diagrama de caixa
+Brackets=Paréntese
+Browser=Explorador
Button.Caption=Subtítulo
+ButtonAction=Insire botón
+ButtonAction.Help=Clic en vista gráfica, insire un botón
+ByLayering=Por capas
+Calculate=Calcula
+CalligraphicLetters=Letras caligráficas
Cancel=Cancelar
+Cartesian=Cartesiano
CheckboxSize=Tamaño da caixa de verificación
CheckboxSize.Large=Grande
CheckboxSize.Regular=Normal
+ChooseFromFile=Selecciona dende arquivo
Circle2=Circunferencia con centro dado pasando por un punto
Circle2.Help=Escoller o centro, despois un punto da circunferencia
Circle3=Circunferencia pasando por tres puntos
@@ -25,45 +55,92 @@ Circle3.Help=Escoller tres puntos da circunferencia
CircleArc3=Arco de circunferencia con centro dado entre dous puntos
CircleArc3.Help=Escoller o centro e dous puntos
CircleArcTools=Ferramentas para circunferencias e arcos
+CircleAxisPoint=Circunferencia dados un eixe e un punto polo que cruza
+CircleAxisPoint.Help=Seleccionar eixe e logo punto da circunferencia
CirclePointRadius=Circunferencia con centro e raio dados
CirclePointRadius.Help=Escoller o centro e logo inserir o raio
+CirclePointRadiusDirection=Circunferencia dados centro, raio e dirección
+CirclePointRadiusDirection.Help=Seleccionar centro e dirección, e logo raio
CircleSector3=Sector circular con centro dado entre dous puntos
CircleSector3.Help=Escoller o centro e dous puntos do sector
CircumcircleArc3=Arco de circunferencia pasando por tres puntos
CircumcircleArc3.Help=Escoller tres puntos do arco
CircumcircleSector3=Sector circular pasando por tres puntos
CircumcircleSector3.Help=Escoller tres puntos do sector
+ClassRule=Tipo de intervalo
+Classes=Clases
ClearColumn=Eliminar columna
ClearColumns=Eliminar columnas
ClearRow=Eliminar fila
ClearRows=Eliminar filas
ClearSelection=Eliminar selección
+ClearTrace=Limpa todo rastro
Clipboard=Portapapeis
+ClipboardMessage=Bosquexo exportado axeitadamente.\nAbrindo o editor HTML, pode pegarse en Moodle (ou outro sistema de aprendizaxe en liña, LMS)
Close=Pechar
CloseAll=Pechar todo
CloseFile=Pechar ficheiro
CmdList=Lista de comandos
+Coefficient=Coeficiente
CollapseAll=Pregar todo
+ColumnHeader=Encabezado de columna
+ColumnOrder=Orde por columna
+ColumnReset=Axusta columna
+Columns=Columnas
+Comma=Coma
CommandName=Nome do comando
Compasses=Compás
Compasses.Help=Escoller un segmento ou dous puntos para o radio, despois o centro
+ComplexNumber=Número complexo
+ComplexNumber.Help=Clic na vista gráfica para crear un número complexo
+ConciseCode=Código conciso
+ConciseUsingCSE5=Conciso usando cse5
Condition.ShowObject=Condición para amosar o obxecto
Conditions=Condicións
+ConfidenceInterval=Intervalo de confianza
+ConfidenceLevel=Nivel de confianza
Conic=Cónica
Conic5=Cónica pasando por cinco puntos
Conic5.Help=Escoller cinco puntos da cónica
ConicMenu=Cónica
ConicSectionTools=Ferramentas para cónicas
Continuity=Continuidade
+Continuous=Continuo
Copy=Copiar
+CopyToClipboard=Copia ao portapapeis
+CopyToGraphics=Copia en vista gráfica
CopyToInputBar=Copiar na barra de entradas
+CopyToSpreadsheet=Copia á folla de cálculo
CopyVisualStyle=Copiar estilo visual
CopyVisualStyle.Help=Escoller un obxecto, despois premer noutros
+Count=Conta
+CountCells=Conta
+CountCells.Help=Selección de conxunto de celas
+Create=Crea
+CreateCurveFit=Curva de mellor axuste
+CreateCurveFit.Help=Selección de celas de puntos. Logo, clic no botón da ferramenta.
CreateList=Xerar lista
+CreateList.Help=Selección de celas; logo, clic no botón da ferramenta.
+CreateListGraphicsView=Crea lista
+CreateListGraphicsView.Help=Arrastre do encadre ao redor dos obxectos
CreateListOfPoints=Xerar lista de puntos
+CreateListOfPoints.Help=Selección de celas; logo, clic no botón da ferramenta.
CreateMatrix=Xerar matriz
+CreateMatrix.Help=Selección de celas; logo, clic no botón da ferramenta.
+CreateOperationTable=Crea táboa de operación
+CreateOperationTable.Help=Selección de bloque de celas. Logo, clic no botón da ferramenta.
+CreatePolyLine=Crea poligonal
+CreatePolyLine.Help=Selección de celas; logo, clic no botón da ferramenta.
+CreateTable=Crea táboa
+CreateTable.Help=Selección de celas; logo, clic no botón da ferramenta.
+Cumulative=Acumulado
+CursiveLetters=Letras cursivas
CustomTools=Ferramentas personalizadas
Cut=Cortar
+Data=Datos
+DataColumn=Datos da columna
+DataColumnName=Nome da columna de datos
+DataTitle=Título de datos
DecimalPlaces=Número de decimais
Default.Restore=Voltar á configuración orixinal
Default.Set=Establecer como predefinido
@@ -72,14 +149,30 @@ Delete=Eliminar obxecto
Delete.Help=Escoller o obxecto a borrar
DeleteObjects=Eliminar obxectos
DeleteTool=Eliminar ferramenta
+Delimiter=Delimitador
+Derivative=Derivada
+Derivative.Help=Acha a derivada primeira
+Descending=Descendente
+DifferenceofMeansT=Diferenza de T Medias
+Differences=Diferenzas
DilateFromPoint=Homotecia dun obxecto dende un punto por un factor
DilateFromPoint.Help=Escoller o obxecto a dilatar, despois o centro, e inserir o factor
+Discrete=Discreta
Distance=Distancia ou lonxitude
Distance.Help=Escoller dous puntos, segmento, polígono ou circunferencia
+Distribution=Distribución
+Distribution.ChiSquare=Chi Cadrado
+Distribution.Exponential=Exponencial
+Distribution.F=Distribución F
+Distribution.Hypergeometric=Hiperxeométrica
+Distribution.Logistic=Loxística
+Distribution.Scale=Escala
+Distribution.Shape=Forma
DoYouWantToSaveYourChanges=Desexa gardar os cambios?
DontDeleteTool=Non eliminar a ferramenta
DontOverwrite=Non sobrescribir
DontSave=Non gardar
+DotPlot=Diagrama de puntos
DrawingPadToClipboard=Copiar zona gráfica ao portapapeis
DynamicColors=Cores dinámicas
Edit=Editar
@@ -88,67 +181,164 @@ Ellipse3.Help=Escoller os dous focos e un punto da elipse
EnableLabelDrags=Permitir o desprazamento dos rótulos
EnableRightClick=Botón dereito permitido
English=Inglés
+EnterAppletAddress=Anotar enderezo Web da aplicación GeoGebra.
+EnterWebAddress=Ingreso da dirección Web
+EqualVariance=Varianza igual
+Equation=Ecuación
+EstimatedValue=Valor estimado
+Evaluate=Avalía
+Evaluate.Help=Cálculo exacto
Exit=Saír
+Expand=Desenvolve
+Expand.Help=Desenvolve parénteses
ExpandAll=Despregar todo
+Exponential=Exponencial
Export=Exportar
+ExportAllWorksheets=Exporta toda folla aberta
+Factor=Factoriza
+Factor.Help=Acha factores
FastHelp=Axuda rápida
File=Ficheiro
+FileBrowser=Explorador de arquivos
+FileSystem=Sistema de arquivos
Files=Ficheiros
+FillType=Tipo de sombreado
+Filling=Sombreado
+Filling.Hatch=Raiado
+Filling.Image=Imaxe
+Filling.Standard=Estándar
+FitCurve=Curva de mellor axuste
+FitCurve.Help=Selección da lista de puntos ou enmarcado directo.
FitLine=Regresión lineal
FitLine.Help=Escoller os puntos formando un rectángulo de selección, ou cunha lista de puntos
Fix=Fixar Si / Non
Fix.Help=Escoller o obxecto a fixar / ceibar
+FixedToGrid=Fixado á cuadrícula
FontSize=Tamaño de fonte
+ForegroundColor=Cor de primeiro plano
+Formulas=Fórmulas
+FrakturLetters=Letras Fraktur
+Frequency=Frecuencia
+FrequencyPolygon=Polígono de frecuencias
+FrequencyTable=Táboa de frecuencias
+FrequencyType=Tipo de frecuencia
+FunctionInspector=Inspección de función
+FunctionInspector.Help=Selección dunha función
Functionality=Funcionalidade
+GUIFontSize=Medida Letra-Menú
General=Xeral
GeneralTools=Ferramentas xerais
+GenerateCode=Desenvolve código
+GeogebraToAsymptoteExport=Exporta GeoGebra a Asymptote
Geometry=Xeometría
German=Alemán
+Graph=Gráfica
GraphicsQuality=Calidade gráfica
Green=Verde
-Grid=Grade
+Grid=Cuadrícula
+Gridlines=Cuadriculados
+GroupObjects=Agrupa obxectos
+HTML5Only=Exporta soamente a HTML5
+HTML5WithJava=Exporta a HTML5 (con respaldo-fallback Java)
Help=Axuda
+Hidden.Dashed=Punteado
+Hidden.Unchanged=Sen cambios
+HiddenLineStyle=Estilo de trazo oculto
HighQuality=Alta calidade
+Histogram=Histograma
+HomeDirectory=Directorio raíz
+HorizontalScrollbars=Barras de desprazamento horizontal
+Hue=Matiz
Hyperbola3=Hipérbole
Hyperbola3.Help=Escoller dous focos e un punto da hipérbole
+Hypergeometric.population=Poboación
+Hypergeometric.sample=mostra
Icon=Icona
Image=Inserir imaxe
Image.Help=Premer na zona gráfica ou nun punto para sinalar a posición
+Images=Imaxes
+ImportDataFile=Importa arquivo de datos
+IncludeHTML5=Inclúe HTML5
InputField=Barra de entradas
InputField.Help=Escoller o obxecto para copiar seu nome na barra de entradas
+InputHelp=Axuda de entrada
InputObjects=Obxectos de entrada
InsertAbove=Inserir enriba
InsertBelow=Inserir embaixo
InsertLeft=Inserir á esquerda
InsertRight=Inserir á dereita
+Integral.Help=Acha a integral indefinida
+Intercept=Intercepta
+InternalCAS=CAS interno (Cálculo Alxébrico Simbólico)
Intersect=Intersecar dous obxectos
Intersect.Help=Escoller dous obxectos ou premer na súa intersección directamente
+IntersectionCurve=Interseca dúas superficies
+IntersectionCurve.Help=Produce unha curva por intersección de dúas superficies
+Interval=Intervalo
+IntervalProb=Intervalo
+IntervalType=Tipo de intervalo
+InvertSelection=Inverter a selección
Isometric=Isométrico
+JavaOnly=Exporta soamente a Java
+JavaWithHTML5=Exporta a Java (con respaldo-fallback HTML5)
Join=Recta pasando por dous puntos
Join.Help=Escoller dous puntos
+KeepDotColors=Conserva cores de puntos
+KeepInput=Conserva entrada
+KeepInput.Help=Conserva e controla entrada
+LabelColumn=Rótulo de columna
+LabelColumnName=Rotula nome de columna
Labeling=Rotulaxe
Labeling.automatic=Automático
-Labeling.off=Agás novos obxectos
+Labeling.off=Ningún obxecto novo
Labeling.on=Tódolos novos obxectos
Labeling.pointsOnly=Só novos puntos
Labeling.propertiesDefault=Empregar propiedades predefinidas
Labels=Amosar ou agochar rótulos
Landscape=Apaisado
Language=Lingua
+Layout=Disposición
+LeftProb=Polo lado esquerdo
License=Licenza
+Lightness=Luminosidade
LineBisector=Mediatriz
LineBisector.Help=Escoller dous puntos ou un segmento
+LineGraph=Liña gráfica
LineMenu=Recta
+Linear=Lineal
+LinkedFiles=Arquivos vinculados
+List=Lista
+ListOfPoints=Lista de puntos
Load=Abrir
+Location=Situación
Locus=Lugar xeométrico
Locus.Help=Escoller o punto orixe, despois un punto do obxecto
+Logistic=Loxística
LookAndFeel=Aparencia
LowQuality=Baixa calidade
+LowerLimit=Límite Inferior
ManagePerspectives=Xestionar perspectivas
+MarginOfError=Marxe de erro
+MathematicalFunctions=Funcións matemáticas
+Matrix=Matriz
+MaxCells=Máximo
+MaxCells.Help=Selección de conxunto de celas
+Maximum.short=Máx
+Mean=Media
+MeanCells=Media
+MeanCells.Help=Selección dun conxunto de celas
+MeanDifference=Diferenza media
+MeanSquare.short=MC - Media cuadrática
+MeanX=MediaX
+MeanY=MediaY
MeasurementTools=Ferramentas de medida
+Median=Mediana
Midpoint=Punto medio ou centro
Midpoint.Help=Escoller dous puntos, un segmento, circunferencia ou cónica
-MirrorAtCircle=Reflectir punto respecto á circunferencia
+MinCells=Mínimo
+MinCells.Help=Selección dun conxunto de celas
+Minimum.short=Mín
+MirrorAtCircle=Inverter punto respecto á circunferencia
MirrorAtCircle.Help=Escoller o punto, despois a circunferencia
MirrorAtLine=Reflectir obxecto respecto á recta
MirrorAtLine.Help=Obxecto a reflectir, despois a recta de reflexión
@@ -157,108 +347,287 @@ MirrorAtPoint.Help=Escoller obxecto a reflectir, despois o punto de reflexi
Mode=Modo
Motif=Motivo
Move=Mover
-Move.Help=Arrastrar ou escoller obxectos[Esc]
+Move.Help=Arrastrar ou escoller obxectos [Esc]
MoveRotate=Rotar arredor dun punto
MoveRotate.Help=Escoller o centro de rotación, despois arrastrar o obxecto
MovementTools=Ferramentas de movemento
+MultiVarStats=Análise multivariable
+MultiVarStats.Help=Analiza dous ou máis conxuntos de datos de columnas seleccionadas
+MultiVariableStatistics=Estatísticas multivariables
+Name=Nome
+NameAndDraw=Nome e debuxo
+NameAndDraw.Help=Nomes e debuxos de fila activa
NameIcon=Nome e icona
New=Novo
NewWindow=Nova xanela
+Next=Seguinte
+None=Ningún
+NormalCurve=Curva normal
+NormalQuantilePlot=Gráfico Q-Q cuantil normal
+Normalized=Normalizado
+NullHypothesis=Hipótese nula
+NullHypothesis.short=Nulo
+Numeric=Valor numérico
+Numeric.Help=Aproxima numericamente
+Objects=Obxectos
+OneVarStats=Análise unha variable
+OneVarStats.Help=Analiza valores numéricos de celas seleccionadas
+OneVariable=Unha variable
+OneVariableInference=Inferencia dunha variable
+OneVariableStatistics=Estatísticas dunha variable
+OnlyOpaqueFills=Só sombreados opacos
+Opacity=Opacidade
+OpenFileFolder=Abre carpeta de arquivos
+OpenFromWebpage=Abre dende sitio Web
+OpenWebpage=Abre páxina WEB
+Operation=Operación
+OperationTable=Táboa de operación
Options=Opcións
Orthogonal=Recta perpendicular
Orthogonal.Help=Escoller o punto e a recta perpendicular
+Other=Outro
OutputObjects=Obxectos de saída
+Overlay=Superposición
+OverlayFrequencyPolygon=Superposición de polígono de frecuencias
+OverlayNormalCurve=Superposición de curva normal
Overwrite=Sobrescribir
+PairedT=Pareador T
Parabola=Parábola
Parabola.Help=Escoller o punto e a directriz
Parallel=Recta paralela
Parallel.Help=Escoller o punto e a recta paralela
Paste=Pegar
PasteDataFromClipboard=Pegar datos do portapapeis
+PasteSpecial=Pegado especial
+Pen=Lapis
+Pen.Help=Debuxar na vista gráfica. Para rematar, seleccionar unha ferramenta diferente.
Perspective.AlgebraAndGraphics=Álxebra e gráficos
Perspective.BasicGeometry=Xeometría básica
+Perspective.CASAndGraphics=CAS e gráficos
Perspective.Geometry=Xeometría
+Perspective.Primary=Primario
Perspective.TableAndGraphics=Táboa e gráficos
+Perspective.Whiteboard=Lousa virtual
+Perspectives=Disposicións
Point=Novo punto
Point.Help=Premer na zona gráfica ou nunha recta, función ou curva
PointCapturing=Captura de puntos
+PointInside=Punto nunha rexión
PointMenu=Punto
+PointOnObject=Punto en obxecto
+PointOnObject.Help=Clic dentro ou sobre o perímetro dun obxecto para situar o punto
PointStyle=Estilo de punto
PointTools=Ferramentas para puntos
PolarDiameter=Recta polar ou diametral
PolarDiameter.Help=Escoller o punto ou recta, despois a circunferencia ou cónica
+PolyLine=Poligonal
+PolyLine.Help=Escoller os vértices un a un e finalmente reelixir o primeiro
Polygon=Polígono
Polygon.Help=Escoller tódolos vértices, despois premer de novo no primeiro vértice
PolygonTools=Ferramentas para polígonos
+Polynomial=Polinomial
Portrait=Retrato
+Power=Potencia
Preview=Previsualización
Print=Imprimir
PrintPreview=Previsualización da impresión
+Prism=Prisma
+Probability=Probabilidade
+ProbabilityCalculator=Cálculo de probabilidades
+ProbabilityCalculator.Help=Caixa de diálogo para cálculo de probabilidades
Properties.Algebra=Álxebra
Properties.Basic=Básico
Properties.Position=Posición
Properties.Style=Estilo
+RGB=RGB (vermello verde azul)
Radiant=Radiáns
Ray=Semirrecta pasando por dous puntos
Ray.Help=Escoller o punto de comezo, despois un punto da semirrecta
+Recent=Aberto recente
RecomputeAllViews=Recalcular tódolos obxectos
RecordToSpreadsheet=Rexistrar na folla de cálculo
RecordToSpreadsheet.Help=Escoller o obxecto a rexistrar, despois facer cambios na construción
+RecoveryCancel=Suspende
+RecoveryCancelQuestion=Cancelar a recuperación aínda que se perdan os arquivos non gardados?
+RecoveryOpen=Abre
+RecoverySave=Garda
+RecoveryText=Non poden recuperarse os seguintes arquivos de GeoGebra:
+RecoveryTitle=Colapso da recuperación
Red=Vermello
Redo=Refacer
Refresh=Actualizar vistas
+RegressionAnalysis=Análise de regresión
+RegressionInference=Inferencia de regresión
+RegressionModel=Modelo de regresión
RegularPolygon=Polígono regular
RegularPolygon.Help=Escoller dous puntos e inserir o número de vértices
Relation=Relación entre dous obxectos
Relation.Help=Escoller dous obxectos
+Relative=Relativo
+RemoveLineBreaks=Suprime saltos de parágrafo
+RemoveTrace=Elimina obxecto da lista de rastrexo
Rename=Renomear
+ReplaceAll=Substitúe todas as celas
+RequireEquals=Requírese " = " antes dos comandos
+ResidualPlot=Gráfico residual
+Result=Resultado
+ReturnAngleInverseTrig=Devolve ángulo dende funcións trigonométricas inversas
RightAngleStyle=Estilo para o ángulo recto
+RightProb=Polo lado dereito
+RigidPolygon=Polígono ríxido
+RigidPolygon.Help=Escoller os vértices un a un e finalmente reelixir o primeiro
+RootsAndFractions=Raíces e fraccións
RotateByAngle=Rotar obxecto arredor dun punto segundo ángulo
RotateByAngle.Help=Escoller o obxecto a rotar, despois o centro, e inserir o ángulo
+RotateView=Rota vista gráfica 3D
+RotateView.Help=Arrastra a vista gráfica 3D
Rounding=Redondeo
+RowHeader=Encabezado de fila
+RowLimit=Límite de fila
+RowOrder=Orde por fila
+Sample1=Mostra 1
+Sample2=Mostra 2
+Saturation=Saturación
Save=Gardar
SaveAs=Gardar como
SaveCurrentFileQuestion=Desexa gardar o ficheiro actual?
SaveCurrentPerspective=Gardar a perspectiva actual
+SavePrintUndo=Habilita gardar, imprimir e desfacer
+SaveToXML=Garda como XML
+Scatterplot=Diagrama de dispersión
Segment=Segmento entre dous puntos
Segment.Help=Escoller dous puntos
SegmentFixed=Segmento con lonxitude dada dende un punto
SegmentFixed.Help=Escoller o punto e inserir a lonxitude do segmento
Select=Seleccionar obxecto
Select.Help=Premer no obxecto
+SelectACurve=Selección dunha curva
SelectAll=Seleccionar todo
+SelectAnObjectToTrace=Seleccionar obxecto a rastrexar
SelectAncestors=Seleccionar ascendentes
SelectCurrentLayer=Seleccionar capa actual
SelectDescendants=Seleccionar descendentes
Semicircle=Semicircunferencia pasando por dous puntos
Semicircle.Help=Escoller os dous puntos finais
+Semicolon=Punto e coma
Separator=Separador
+SetClasssesManually=Selección manual de clases
+SetToCurrentLocation=Fixa a posición actual
Settings=Configuración
Settings.ResetDefault=Voltar á configuración orixinal
Settings.Save=Gardar configuración
+Share=Comparte
+Show=Amosar
+ShowAtTop=Amosar en marxe superior
+ShowAxesGrid=Amosar eixes / cuadrícula
ShowCheckBox=Caixa de verificación para amosar / agochar obxectos
ShowCheckBox.Help=Premer na zona gráfica para sinalar a posición
+ShowColumnHeader=Amosar encabezado de columna
+ShowCornerCoordinates=Amosar coordenadas de esquina
+ShowData=Amosar os datos
+ShowFileBrowser=Amosar explorador de arquivos
+ShowGridlines=Amosar cuadriculados
+ShowHide=Amosar / Ocultar obxectos
ShowHideLabel=Amosar / Agochar rótulo
ShowHideLabel.Help=Escoller o obxecto
+ShowHideLabels=Amosar / Ocultar rótulos
ShowHideObject=Amosar / Agochar obxecto
ShowHideObject.Help=Escoller os obxectos a agochar, despois premer noutra ferramenta
+ShowHorizontalScrollbars=Amosar barra de deslizamento horizontal
ShowInToolBar=Amosar na barra de ferramentas
ShowInputField=Amosar barra de entradas
ShowMenuBar=Amosar barra de menús
+ShowMouseCoordinates=Amosar coordenadas do punteiro
+ShowPlot2=Amosar segundo gráfico
ShowResetIcon=Amosar icona para reinicializar a construción
+ShowRowHeader=Amosar encabezado de fila
+ShowStatistics=Mostra estatísticas
ShowToolBar=Amosar barra de ferramentas
ShowToolBarHelp=Amosar axuda da barra de ferramentas
+ShowVerticalScrollbars=Amosar barra de deslizamento vertical
+Sin=Sen
+SingleFile=Único arquivo
+SingleFileTabs=Único arquivo (pestanas)
Slider=Esvarador
Slider.Help=Prema na zona gráfica para sinalar a posición
Slope=Pendente
Slope.Help=Escoller recta
+SnapToGrid=Axusta á cuadrícula
+SnapToObjects=Axusta aos obxectos
+SnapToPoints=Axusta aos puntos
+Solution=Solución
+Solution.Help=Acha as solucións dunha ou máis ecuacións
+Solve=Resolve
+Solve.Help=Resolve unha ou máis ecuacións
+Sort=Ordena celas
+Sort.Help=Seleccionar celas a ordenar
+SortBy=Ordenar por
+Space=Espazo
+SpaceBetweenThousands=Espazo entre miles
+Spacing=Espaciado
SpecialLineTools=Ferramentas especiais para rectas
SpecialObjectTools=Ferramentas especiais para obxectos
+Sphere2=Esfera con centro pasando por punto
+Sphere2.Help=Seleccionar punto central; logo, punto da esfera
+SpherePointRadius=Esfera con centro e raio
+SpherePointRadius.Help=Seleccionar punto central da esfera e logo, valor do raio
+Split=Divide celas en columnas
+Split.Help=Selección de celas a dividir
+SpreadsheetOptions=Opcións de folla de cálculo
+Stack=Amorear celas en columnas
+Stack.Help=Seleccionar columnas a amorear
+StackedBoxPlots=Diagrama de caixas superpostas
+StandardError=Erro estándar
+StandardError.short=ES - Erro estandar
+Start=Inicio
+StartRow=Fila inicial
+Statistics=Estatísticas
+Statistics2=Estatísticas2
+StemPlot=Diagramas de talo e follas
+Step=Paso
+Substitute=Substitución
+Substitute.Help=Substitúe parte dunha expresión
SubstituteDialog=Caixa de diálogo de substitución
+SumCells=Suma
+SumCells.Help=Seleccionar o conxunto de celas
+SumSquaredErrors.short=SSE - Suma erros cadrados
+SumSquares.short=SS - Suma cadrados
+SumsAndIntegrals=Sumas e integrais
+Symbol.And=E
+Symbol.Angle=Ángulo
+Symbol.AngleMeasure=Medida do ángulo
+Symbol.BooleanEqual=Igualdade booleana
+Symbol.Cube=Cubo
+Symbol.Degree=Grao
+Symbol.ElementOf=Elemento
+Symbol.GreaterThanEqualTo=Maior que ou igual a
+Symbol.Infinity=Infinito
+Symbol.LessThanEqualTo=Menor que ou igual a
+Symbol.NBSP=Espazo de non-ruptura
+Symbol.Negation=Negación
+Symbol.NotEqual=Distinto a
+Symbol.Or=Ou
+Symbol.Parallel=Paralela
+Symbol.Square=Cadrado
+Symbol.StrictSubset=Subconxunto estrito
+Symbol.Subset=Subconxunto
+Symbol.VectorProduct=Produto vectorial
+Symbols=Símbolos
+TEstimateDifferenceOfMeans=Estimación T, diferenza de medias
+TEstimatePairedDifferences=Estimación T, diferenzas pareadas
+TMeanInterval=Estimación T dunha media
+TMeanTest=Test T dunha media
+TTestDifferenceOfMeans=Test T, diferenza de medias
+TTestPairedDifferences=Test T, diferenzas pareadas
+Tab=Pestana
+Table=Táboa
Tangent=Tanxentes
Tangent.Help=Escoller un punto, despois a circunferencia, cónica ou función
Text=Inserir texto
Text.Help=Prema na zona gráfica ou nun punto para sinalar a posición
+TextFieldAction=Inserir caixa de entrada
+TextFieldAction.Help=Clic en vista gráfica para situar unha caixa de entrada
+ThenBy=Logo por
Tool=Ferramenta
Tool.CreateNew=Crear nova ferramenta
Tool.CreationSuccess=A nova ferramenta creouse con éxito!
@@ -271,26 +640,75 @@ Toolbar=Barra de ferramentas
Toolbar.Customize=Personalizar barra de ferramentas
Toolbar.ResetDefault=Restablecer barra de ferramentas orixinal
Tools=Ferramentas
+Tooltip=Apuntamento
Trace=Activar rastro Si / Non
-Trace.Help=Escoller o obxecto para Amosar / Agochar o seu rastro
+Trace.Help=Escoller o obxecto para amosar / agochar o seu rastro
+TraceCopy=Copia rastro
+TraceToList=Rastro a lista
+TraceToSpreadsheet=Rastro a folla de cálculo
+TraceToSpreadsheet.Help=Cadro de diálogo para facer o seguimento de obxectos á folla de cálculo
TransformationTools=Ferramentas para transformaciones
TranslateByVector=Translación dun obxecto segundo un vector
TranslateByVector.Help=Escoller o obxecto, despois o vector de translación
TranslateView=Mover zona gráfica
TranslateView.Help=Desprazar a zona gráfica ou os eixes[Shift + Arrastrar]
+Transparent=Transparente
+Transpose=Transposición
+Tutorials=Titoriais
+TwoVarStats=Análise de regresión de dúas variables
+TwoVarStats.Help=Analiza valores de a pares en celas seleccionadas
+TwoVariable=Dúas variables
+TwoVariableInference=Inferencia de dúas variables
+Type.Algebra=Álxebra
+Type.CAS=Comandos específicos CAS
+Type.Chart=Diagrama
+Type.Conic=Cónica
+Type.DiscreteMath=Matemática discreta
+Type.FunctionsAndCalculus=Funcións e cálculo
+Type.Geometry=Xeometría
+Type.List=Lista
+Type.Logic=Lóxica
+Type.OptimizationCommands=Optimización
+Type.Probability=Probabilidade
+Type.Scripting=Guións - Scripting
+Type.Spreadsheet=Folla de cálculo
+Type.Statistics=Estatísticas
+Type.Text=Texto
+Type.Transformation=Transformación
+Type.VectorAndMatrix=Vector e matriz
Undo=Desfacer
+UngroupObjectes=Desagrupar obxectos
+Untitled=Sen título
+UploadGeoGebraTube=Sobe ao ámbito de GeoGebraTube
+UpperLimit=Límite superior
+UseBrowserForJS=Habilita JavaScripts do navegador
+UseButtonsAndCheckboxes=Emprego de botóns e caixas de control
+UseHeaderRow=Uso de encabezado de fila
UserInterface=Interface do usuario
+Value=Valor
+Values=Valores
Vector=Vector entre dous puntos
Vector.Help=Escoller o punto de orixe, despois o punto final
VectorFromPoint=Vector dende un punto
VectorFromPoint.Help=Escoller o punto de orixe e o vector
+VectorPolygon=Polígono vectorial
+VectorPolygon.Help=Escoller os vértices un a un e finalmente reelixir o primeiro
+VerticalScrollbars=Barra de deslizamento vertical
View=Ver
+Views=Vistas
+VisualStyle=Estilo visual
+VisualStyle.Help=Clic ou enmarcado dos obxectos aos que cambiarlles propiedades
+Width=Ancho
Window=Xanela
Windows=Xanelas
+WithOpacityPen=Trazo de tinguidura opaca
+WithinGroups=Dentro de grupos
+ZMeanInterval=Estimación de Z dunha media
+ZMeanTest=Test Z dunha media
Zoom=Lupa
ZoomIn=Achegar
-ZoomIn.Help=Premer na zona gráfica para ampliala[Roda do rato]
+ZoomIn.Help=Premer na zona gráfica para ampliala [roda do rato]
ZoomOut=Afastar
-ZoomOut.Help=Premer na zona gráfica para reducila[Roda do rato]
+ZoomOut.Help=Premer na zona gráfica para reducila [roda do rato]
off=Desactivado
on=Activado
\ No newline at end of file
diff --git a/geogebra/properties/menu_hr.properties b/geogebra/properties/menu_hr.properties
index 3341587..43413a1 100644
--- a/geogebra/properties/menu_hr.properties
+++ b/geogebra/properties/menu_hr.properties
@@ -396,8 +396,6 @@ OperationTable=Tablica operacija
Options=Postavke
Orthogonal=Okomica
Orthogonal.Help=Odaberite to\u010dku i okomit pravac
-OrthogonalPlane=Okomita ravnina
-OrthogonalPlane.Help=Odaberite to\u010dku i okomit pravac
Other=Ostalo
OutputObjects=Izlazni objekti
Overlay=Prekrivanje
@@ -408,8 +406,6 @@ PairedT=Sparen T
Parabola.Help=Odaberite to\u010dku i ravnalicu
Parallel=Usporednica
Parallel.Help=Odaberite to\u010dku i usporedan pravac
-ParallelPlane=Usporedna ravnina
-ParallelPlane.Help=Odaberite to\u010dku i paralelnu ravninu
Paste=Zalijepi
PasteDataFromClipboard=Unos podataka iz me\u0111uspremnika
PasteSpecial=Posebno ljepljenje
@@ -423,10 +419,6 @@ Perspective.Primary=Po\u010detni
Perspective.TableAndGraphics=Tabli\u010dni i grafi\u010dki
Perspective.Whiteboard=Interaktivna plo\u010da
Perspectives=Prikazi
-PlanePointLine=Ravnina odre\u0111ena to\u010dkom i pravcem
-PlanePointLine.Help=Odaberite to\u010dku i pravac
-PlaneThreePoint=Ravnina odre\u0111ena s tri to\u010dke
-PlaneThreePoint.Help=Odaberite tri to\u010dke
Point=Nova to\u010dka
Point.Help=Kliknite na grafi\u010dki prikaz ili na pravac, funkciju ili krivulju
PointCapturing=Hvatanje to\u010dke na mre\u017eu
@@ -450,8 +442,6 @@ Power=Potencijska
Preview=Pretpregled
Print=Ispis
PrintPreview=Pretpregled ispisa
-Prism=Prizma
-Prism.Help=Odaberite mnogokut (ili to\u010dke) i prvu to\u010dku druge usporedne strane
Probability=Vjerojatnost
ProbabilityCalculator=Kalkulator vjerojatnosti
ProbabilityCalculator.Help=Dijalo\u0161ki okvir za izra\u010dun vjerojatnosti
@@ -491,8 +481,6 @@ ResidualPlot=Rezidualni grafikon
Result=Rezultat
ReturnAngleInverseTrig=Uklju\u010di kutnu mjeru arkus funkcijama
RightAngleStyle=Oznaka pravog kuta
-RightPrism=Uspravna prizma
-RightPrism.Help=Povucite ili odaberite mnogokut i unesite visinu
RightProb=Jednostrani desni
RigidPolygon=Kruti mnogokut
RigidPolygon.Help=Odaberite sve vrhove i ponovo kliknite na prvi
@@ -716,8 +704,6 @@ VectorPolygon=Vektorski mnogokut
VectorPolygon.Help=Odaberite sve vrhove pa kliknite ponovo na prvi vrh
VerticalScrollbars=Vertikalna traka za pomicanje
View=Pogled
-ViewInFrontOf=Pogled ispred
-ViewInFrontOf.Help=Mijenjanje pogleda na odabrane objekte
Views=Pogledi
VisualStyle=Stil izgleda
VisualStyle.Help=Kliknite na objekte ili povla\u010dite pravokutnik za promjenu njihovih svojstava
diff --git a/geogebra/properties/menu_hu.properties b/geogebra/properties/menu_hu.properties
index d1afe03..a5683f2 100644
--- a/geogebra/properties/menu_hu.properties
+++ b/geogebra/properties/menu_hu.properties
@@ -30,8 +30,10 @@ Back=Vissza
BackgroundColor=Háttérszín
BasicLineTools=Egyenes eszközök
BetweenGroups=Csoportok között
+BlackboardLetters=Kontúros karakterek
Blue=Kék
Bold=Félkövér
+Boxplot=Boxplot (sodrófa-diagram)
Brackets=Zárójelek
Browser=Fájlkezelés
Button.Caption=Felirat
@@ -53,8 +55,12 @@ Circle3.Help=A k
CircleArc3=Körív középponttal és két pontjával
CircleArc3.Help=Középpont, majd körív végpontja, végül a határoló sugáregyenes pontja
CircleArcTools=Kör és ív eszközök
+CircleAxisPoint=Kör tengellyel. kerületi ponttal
+CircleAxisPoint.Help=Tengely, majd a kör egy pontjának megadása
CirclePointRadius=Kör középponttal és sugárral
CirclePointRadius.Help=Középpont, maj sugár megadása
+CirclePointRadiusDirection=Kör középponttal, sugár és irány
+CirclePointRadiusDirection.Help=Középpont és irány kijelölése, sugár megadása
CircleSector3=Körcikk középponttal és két pontjával
CircleSector3.Help=Középpont, majd köríven egyik pont, végül a határoló sugáregyenes pontja
CircumcircleArc3=Három pontra illesztked\u0151 körív
@@ -78,7 +84,7 @@ CmdList=Parancslista
Coefficient=Együttható
CollapseAll=Összes bezárása
ColumnHeader=Oszlop fejléc
-ColumnOrder=Oszlop sorrend
+ColumnOrder=Oszlop
ColumnReset=Oszlop visszaállítása
Columns=Oszlopok
Comma=Vessz\u0151
@@ -128,7 +134,7 @@ CreatePolyLine.Help=Pontokat meghat
CreateTable=Táblázat létrehozása
CreateTable.Help=Cellák kijelölése, majd kattintás az eszközön
Cumulative=Halmozott
-CursiveLetters=Kurzív
+CursiveLetters=Kurzív karakterek
CustomTools=Egyéni eszközök
Cut=Kivágás
Data=Adatok
@@ -139,6 +145,9 @@ DecimalPlaces=Tizedes hely
Default.Restore=Alapbeállítások visszaállítása
Default.Set=Alapértelmezettnek beállít
Degree=Fok
+DegreesOfFreedom.short=szf
+DegreesOfFreedom1.short=szf1
+DegreesOfFreedom2.short=szf2
Delete=Alakzatok törlése
Delete.Help=A törölni kívánt alakzat kijelölése
DeleteObjects=Objetumok törlése
@@ -147,6 +156,8 @@ Delimiter=Hat
Derivative=Derivál
Derivative.Help=Els\u0151 derivált meghatározása
Descending=Csökken\u0151
+DifferenceofMeansT=T átlagok eltérése
+Differences=Eltérések
DilateFromPoint=Centrális nyújtás
DilateFromPoint.Help=A nyújtandó alakzat, majd a középpont, végül az arány megadása
Discrete=Diszkrét
@@ -179,9 +190,10 @@ EnableLabelDrags=Feliratok mozgat
EnableRightClick=Használható jobb gomb
EnterAppletAddress=GeoGebra applet webcímének megadása
EnterWebAddress=Webcím megadása
+EqualVariance=Egyenl\u0151 variancia
Equation=Egyenlet
EstimatedValue=Becsült érték
-Evaluate=Kiértékel
+Evaluate=Érték kiszámolása
Evaluate.Help=Pontos kiértékelés
Exit=Kilépés
Expand=Kifejt
@@ -211,8 +223,9 @@ FixedToGrid=R
FontSize=Bet\u0171méret
ForegroundColor=El\u0151tér színe
Formulas=Formulák
+FrakturLetters=Gót karakterek
Frequency=Gyakoriság
-FrequencyPolygon=GyakoriságGrafikon
+FrequencyPolygon=Gyakoriság grafikon
FrequencyTable=Gyakoriság táblázat
FrequencyType=Gyakoríság típusa
FunctionInspector=Függvényvizsgálat
@@ -280,6 +293,7 @@ KeepDotColors=Pontok sz
KeepInput=Bemenetet megtart
KeepInput.Help=Bemenet megtartása és ellen\u0151rzése
LabelColumn=Oszlop címke
+LabelColumnName=Oszlopnév
Labeling=Feliratozás
Labeling.automatic=Automatikus
Labeling.off=Új alakzatokra nem
@@ -305,11 +319,13 @@ Load=Megnyit
Location=Hely
Locus=Mértani hely
Locus.Help=Pont amelynek mértani helyét keressük, majd egy alakzaton mozgó pont
+Log=Logaritmikus
Logistic=Logisztikus
LookAndFeel=Kinézet
LowQuality=Alacsony min\u0151ség
LowerLimit=Alsó korlát
ManagePerspectives=Egyéni munkaasztalok
+MarginOfError=Hibakorlát
MathematicalFunctions=Matematikai függvények
Matrices=Mátrixok
Matrix=Mátrix
@@ -317,6 +333,7 @@ MaxCells.Help=Cell
Mean=Átlag
MeanCells=Átlag
MeanCells.Help=Cellák kijelölése
+MeanDifference=Átlagos eltérés
MeanX=X átlag
MeanY=Y átlag
MeasurementTools=Mérési eszközök
@@ -338,9 +355,10 @@ MoveRotate=Pont k
MoveRotate.Help=Forgatás centrumának kiválasztása, majd alakzat mozgatása
MovementTools=Mozgatás eszközök
MultiVarStats=Többváltozós analízis
-MultiVarStats.Help=A kijelölt oszlopokban tszerepl\u0151 adatok analízise
+MultiVarStats.Help=A kijelölt oszlopokban szerepl\u0151 adatok analízise
MultiVariableStatistics=Többváltozós statisztika
Name=Név
+NameAndDraw=Név és ábra
NameIcon=Név és ikon
New=Új
NewWindow=Új ablak
@@ -367,16 +385,15 @@ OperationTable=M\u0171veleti t
Options=Beállítások
Orthogonal=Mer\u0151leges
Orthogonal.Help=Pont és egyenes
-OrthogonalPlane=Mer\u0151leges sík
-OrthogonalPlane.Help=Pont, majdmer\u0151leges egyenes
Other=Más
OutputObjects=Kimen\u0151 alakzatok
+Overlay=Átfedés
+OverlayFrequencyPolygon=Gyakoriság grafikon illesztése
Overwrite=Igen
+PairedT=Páros T próba
Parabola.Help=Fókuszpont és vezéregyenes
Parallel=Párhuzamos
Parallel.Help=Pont és egyenes
-ParallelPlane=Párhuzamos sík
-ParallelPlane.Help=Pont, majd párhuzamos sík
Paste=Beillesztés
PasteDataFromClipboard=Beillesztés a vágólapról
PasteSpecial=Speciális beillesztés
@@ -390,10 +407,6 @@ Perspective.Primary=
Perspective.TableAndGraphics=Táblázat és grafika
Perspective.Whiteboard=Fehér tábla
Perspectives=Munkaasztalok
-PlanePointLine=Sík adott ponton és egyenesen át
-PlanePointLine.Help=Pont, majd sík
-PlaneThreePoint=Sík három ponton át
-PlaneThreePoint.Help=Három pont
Point=Új pont
Point.Help=Kattintás a rajzlapon, függvényen vagy egy görbén
PointCapturing=Pont elfogás
@@ -417,8 +430,6 @@ Power=Hatv
Preview=El\u0151nézet
Print=Nyomtatás
PrintPreview=Nyomtatási kép
-Prism=Hasáb
-Prism.Help=Sokszög (vagy pontok) kijelölése, majd a párhuzamos sík els\u0151 pontja
Probability=Valószín\u0171ség
ProbabilityCalculator=Valószín\u0171ségszámítás
ProbabilityCalculator.Help=Párbeszédablak valószín\u0171ségszámításhoz
@@ -457,8 +468,6 @@ ResidualPlot=K
Result=Eredmény
ReturnAngleInverseTrig=Szögek meghatározása arcus függvényekkel
RightAngleStyle=Derékszög stílusa
-RightPrism=Egyenes hasáb
-RightPrism.Help=Poligon kiválasztása vagy kijelölése, majd magasság megadása
RightProb=Jobb oldali
RigidPolygon=Merev sokszög
RigidPolygon.Help=Csúcspontok, végül újból a kezd\u0151pont
@@ -480,6 +489,7 @@ SaveCurrentFileQuestion=Szeretn
SaveCurrentPerspective=Jelenlegi munkaasztal elmentése
SavePrintUndo=Mentés, Nyomtatás és Visszavonás engedélyezése
SaveToXML=Mentés XML-ként
+Scatterplot=Pontok
Segment=Szakasz
Segment.Help=Két pont
SegmentFixed=Szakasz pontból adott távolsággal
@@ -502,7 +512,7 @@ Settings=Be
Settings.ResetDefault=Alapbeállítások visszaállítása
Settings.Save=Beállítások mentése
Share=Publikálás
-Show=Mutat
+Show=Megjelenítés
ShowAtTop=Fent
ShowAxesGrid=Tengelyek / rács mutatása
ShowCheckBox=Jelöl\u0151négyzet alakzatok elrejtéséhez és megjelenítéséhez
@@ -530,6 +540,7 @@ ShowStatistics=Statisztik
ShowToolBar=Eszközkészlet megjelenítése
ShowToolBarHelp=Eszközkészlet súgó megjelenítése
ShowVerticalScrollbars=Függ\u0151leges görget\u0151sáv megjelenítése
+Sin=Szinusz
Slider=Csúszka
Slider.Help=Rajzlapon való kattintás a csúszka helyének meghatározásához
Slope=Meredekség
@@ -553,8 +564,11 @@ Sphere2=G
Sphere2.Help=Középpont, majd a gömb felszínén lév\u0151 pont kijelölése
SpherePointRadius=Gömb középponttal és sugárral
SpherePointRadius.Help=Középpont kijelölése, majd sugár megadása
+Split=Oszlopok felosztása
Split.Help=Oszlopok kijelölése felosztáshoz
SpreadsheetOptions=Táblázatkezel\u0151 beállítása
+Stack=Oszlopok egyesítése
+Stack.Help=Oszlopok kijelölése halmozáshoz
StackedBoxPlots=Halmozott BoxPlot
StandardError=Általános hiba
Start=Kezd
@@ -590,6 +604,12 @@ Symbol.StrictSubset=Val
Symbol.Subset=Rész
Symbol.VectorProduct=Vektor szorzás
Symbols=Szimbólumok
+TEstimateDifferenceOfMeans=T becslés, Átlagok eltérése
+TEstimatePairedDifferences=T becslés, Páros eltérések
+TMeanInterval=T próba, becslés
+TMeanTest=T próba
+TTestDifferenceOfMeans=T próba, Átlagok eltérése
+TTestPairedDifferences=T próba, Páros eltérések
Table=Táblázat
Tangent=Érint\u0151k
Tangent.Help=Pont vagy egyenes, majd kör, kúpszelet vagy függvény
@@ -625,9 +645,9 @@ TranslateView.Help=Rajzlap vagy egy tengely vonszol
Transparent=Átlátszó
Transpose=Transzponált
Tutorials=Bemutatók
-TwoVarStats=Két változós regresszió analízis
+TwoVarStats=Kétváltozós regresszió analízis
TwoVarStats.Help=A kijelölt cellákban szerepl\u0151 szám párok analízise
-TwoVariable=Két változós
+TwoVariable=Kétváltozós
TwoVariableInference=Két változós analízis
Type.CAS=CAS parancsok
Type.Chart=Diagram
@@ -649,7 +669,7 @@ Undo=Visszavon
UngroupObjectes=Alakzatok csoportjának bontása
Untitled=Névtelen
UploadGeoGebraTube=Feltöltés a GeoGebraTube-ra
-UpperLimit=Alsó korlát
+UpperLimit=Fels\u0151 korlát
UseBrowserForJS=Böngész\u0151 használata JavaScripthez
UseButtonsAndCheckboxes=Gombok és jelöl\u0151négyzetek használata
UseHeaderRow=Sor fejléc használata
@@ -665,8 +685,6 @@ VectorPolygon=Vektor poligon
VectorPolygon.Help=Az összes csúcs kijelölése, majd kattintás ismét az els\u0151re
VerticalScrollbars=Függ\u0151leges görget\u0151sáv
View=Nézet
-ViewInFrontOf=Nézet szemb\u0151l
-ViewInFrontOf.Help=A kijelölt objektummal szemközti nézetre vált
Views=Nézetek
VisualStyle=Vizuális stílus
VisualStyle.Help=Kattintás az objektumokon vagy kijelölés kerettel
@@ -675,6 +693,8 @@ Window=Ablak
Windows=Ablakok
WithOpacityPen=Átlátszatlan tollal
WithinGroups=Csoportokon belül
+ZMeanInterval=Z próba, becslés
+ZMeanTest=Z próba
Zoom=Nagyítás
ZoomIn=Nagyítás
ZoomIn.Help=Rajzlapon kattintás a nagyításhoz (egér görg\u0151)
diff --git a/geogebra/properties/menu_hy.properties b/geogebra/properties/menu_hy.properties
new file mode 100644
index 0000000..a525769
--- /dev/null
+++ b/geogebra/properties/menu_hy.properties
@@ -0,0 +1,703 @@
+ANOVA=\u0534\u056b\u057d\u057a\u0565\u0580\u057d\u056b\u0578\u0576 \u0561\u0576\u0561\u056c\u056b\u0566
+About=\u053e\u0580\u0561\u0563\u0580\u056b \u0574\u0561\u057d\u056b\u0576
+Accents=\u0533\u0578\u0580\u056e\u0578\u0572\u0578\u0582\u0569\u0575\u0578\u0582\u0576 \u0585\u0562\u0575\u0565\u056f\u057f\u056b \u0570\u0565\u057f
+AccentsExt=\u0546\u0578\u0580 \u0563\u0578\u0582\u0575\u0576 \u0561\u057e\u0565\u056c\u0561\u0581\u0576\u0565\u0574
+ActionObjectTools=\u0533\u0578\u0580\u056e\u0578\u0572\u0578\u0582\u0569\u0575\u0578\u0582\u0576 \u0585\u0562\u0575\u0565\u056f\u057f\u056b \u0570\u0565\u057f
+AddTrace=\u0555\u0562\u0575\u0565\u056f\u057f\u0576 \u0561\u057e\u0565\u056c\u0561\u0581\u0576\u0565\u0574 \u0578\u0582\u057d\u0578\u0582\u0574\u0576\u0561\u057d\u056b\u0580\u057e\u0578\u0572 \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f\u0578\u0582\u0574
+Adjustment=\u053f\u0561\u0580\u0563\u0561\u057e\u0578\u0580\u0578\u0582\u0574
+Advanced=\u053c\u0580\u0561\u0581\u0578\u0582\u0581\u056b\u0579
+AlgebraDescriptions=\u0555\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u056b \u0576\u056f\u0561\u0580\u0561\u0563\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580
+AllCommands=\u0532\u0578\u056c\u0578\u0580 \u0570\u0580\u0561\u0574\u0561\u0576\u0576\u0565\u0580\u0568
+AllowRescaling=\u0539\u0578\u0582\u0575\u056c\u0561\u057f\u0580\u0565\u0574 \u0574\u0561\u057d\u0577\u057f\u0561\u0562\u056b \u0583\u0578\u0583\u0578\u056d\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+AllowTooltips=\u0539\u0578\u0582\u0575\u056c\u0561\u057f\u0580\u0565\u0574 \u0570\u0578\u0582\u0577\u0578\u0582\u0574\u0576\u0565\u0580
+AlternativeHypothesis=\u0531\u0575\u056c\u0568\u0576\u057f\u0580\u0561\u0576\u0584\u0561\u0575\u056b\u0576 \u057e\u0561\u0580\u056f\u0561\u056e
+AlternativeHypothesis.short=\u0531\u0575\u056c\u0568\u0576\u057f\u0580\u0561\u0576\u0584
+Angle=\u0531\u0576\u056f\u0575\u0578\u0582\u0576
+Angle.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u0565\u0580\u0565\u0584 \u056f\u0565\u057f \u056f\u0561\u0574 \u0565\u0580\u056f\u0578\u0582 \u0578\u0582\u0572\u056b\u0572
+AngleFixed=\u054f\u0580\u057e\u0561\u056e \u0574\u0565\u056e\u0578\u0582\u0569\u0575\u0561\u0576 \u0561\u0576\u056f\u0575\u0578\u0582\u0576
+AngleFixed.Help=\u0546\u0577\u0565\u0584 \u0561\u0576\u056f\u0575\u0561\u0576 \u056f\u0578\u0572\u0574\u056b \u056f\u0565\u057f, \u0561\u057a\u0561 \u0561\u0576\u056f\u0575\u0561\u0576 \u0563\u0561\u0563\u0561\u0569\u0576 \u0578\u0582 \u0574\u0565\u056e\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+AngleUnit=\u0531\u0576\u056f\u0575\u0561\u0576 \u0579\u0561\u0583\u0574\u0561\u0576 \u0574\u056b\u0561\u057e\u0578\u0580\u0568
+AngularBisector=\u0531\u0576\u056f\u0575\u0561\u0576 \u056f\u056b\u057d\u0578\u0580\u0564
+AngularBisector.Help=\u0546\u0577\u0565\u0584 \u0565\u0580\u0565\u0584 \u056f\u0565\u057f \u056f\u0561\u0574 \u0565\u0580\u056f\u0578\u0582 \u0578\u0582\u0572\u056b\u0572
+ApplyDefaults=\u053f\u056b\u0580\u0561\u057c\u0565\u0574 \u0576\u0561\u056d\u0576\u0561\u056f\u0561\u0576 \u056f\u0561\u0580\u0563\u0561\u057e\u0578\u0580\u0578\u0582\u0574\u0576\u0565\u0580\u0568
+Area=\u0544\u0561\u056f\u0565\u0580\u0565\u057d
+Area.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u0562\u0561\u0566\u0574\u0561\u0576\u056f\u0575\u0578\u0582\u0576, \u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e \u056f\u0561\u0574 \u056f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569
+Ascending=\u0531\u0573\u0578\u0572
+AttachDetachPoint=\u0531\u0574\u0580\u0561\u0581\u0576\u0565\u0574/\u0531\u0566\u0561\u057f\u0565\u0574 \u056f\u0565\u057f\u0568
+AttachDetachPoint.Help=\u054d\u0565\u0572\u0574\u0565\u0584 \u056f\u0565\u057f\u056b, \u0570\u0565\u057f\u0578 \u0585\u0563\u0575\u0565\u056f\u057f\u056b \u057e\u0580\u0561
+AutoDimension=\u0531\u057e\u057f\u0578\u0574\u0561\u057f \u0579\u0561\u0583\u0578\u0582\u0574\u0576\u0565\u0580
+Axes=\u0531\u057c\u0561\u0576\u0581\u0584\u0576\u0565\u0580
+Back=\u0535\u057f
+BackgroundColor=\u0556\u0578\u0576\u056b \u0563\u0578\u0582\u0575\u0576\u0568
+BasicLineTools=\u0548\u0582\u0572\u056b\u0572 \u0563\u056e\u0565\u0580
+BetweenGroups=\u053d\u0574\u0562\u0565\u0580\u056b \u0574\u056b\u057b\u0587
+BlackboardLetters=\u0541\u0587\u0561\u057e\u0578\u0580 \u057f\u0561\u057c\u0565\u0580
+Blue=\u053f\u0561\u057a\u0578\u0582\u0575\u057f
+Bold=\u0539\u0561\u057e
+Boxplot=\u0531\u0580\u056f\u0572\u0561\u0575\u056b\u0576 \u0564\u056b\u0561\u0563\u0580\u0561\u0574
+Brackets=\u0553\u0561\u056f\u0561\u0563\u056e\u0565\u0580
+Browser=\u053e\u0561\u057c
+Button.Caption=\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580
+ButtonAction=\u053f\u0578\u0573\u0561\u056f
+ButtonAction.Help=\u053f\u0578\u0573\u0561\u056f \u057d\u057f\u0565\u0572\u056e\u0565\u056c\u0578\u0582 \u0570\u0561\u0574\u0561\u0580 \u057d\u0565\u0572\u0574\u0565\u0584 \u056f\u057f\u0561\u057e\u056b \u057e\u0580\u0561
+ByLayering=\u0538\u057d\u057f \u0577\u0565\u0580\u057f\u0565\u0580\u056b
+Calculate=\u0540\u0561\u0577\u057e\u0565\u0574
+CalligraphicLetters=\u0541\u0565\u057c\u0561\u0563\u056b\u0580 \u057f\u0561\u057c\u0565\u0580
+Cancel=\u0532\u0561\u0576 \u0579\u0561\u0576\u0565\u0574
+Cartesian=\u0534\u0565\u056f\u0561\u0580\u057f\u0575\u0561\u0576
+CheckboxSize=\u0534\u0580\u0578\u0577\u0561\u056f\u056b \u0579\u0561\u0583\u0568
+CheckboxSize.Large=\u0544\u0565\u056e
+CheckboxSize.Regular=\u054d\u0578\u057e\u0578\u0580\u0561\u056f\u0561\u0576
+ChooseFromFile=\u0538\u0576\u057f\u0580\u0565\u0574 \u0586\u0561\u0575\u056c\u056b\u0581
+Circle2=\u0547\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e \u0568\u057d\u057f \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u056b \u0587 \u056f\u0565\u057f\u056b
+Circle2.Help=\u0546\u0577\u0565\u0584 \u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056e\u056b \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u0576 \u0578\u0582 \u0574\u056b \u056f\u0565\u057f \u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056e\u056b \u057e\u0580\u0561
+Circle3=\u0547\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e \u0565\u0580\u0565\u0584 \u056f\u0565\u057f\u0578\u057e
+Circle3.Help=\u0547\u0580\u057b\u0561\u0576\u0561\u0563\u056e\u056b \u057e\u0580\u0561 \u0576\u0577\u0565\u0584 \u0565\u0580\u0565\u0584 \u056f\u0565\u057f
+CircleArc3=\u0531\u0572\u0565\u0572 \u0568\u057d\u057f \u0565\u0580\u056f\u0578\u0582 \u056f\u0565\u057f\u056b \u0578\u0582 \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u056b
+CircleArc3.Help=\u0546\u0577\u0565\u0584 \u0561\u0572\u0565\u0572\u056b \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u0568 \u0587 \u0565\u0580\u056f\u0578\u0582 \u056f\u0565\u057f \u0561\u0572\u0565\u0572\u056b \u057e\u0580\u0561
+CircleArcTools=\u0547\u0580\u057b\u0561\u0576\u0561\u0563\u056e\u0565\u0580 \u0578\u0582 \u0561\u0572\u0565\u0572\u0576\u0565\u0580
+CircleAxisPoint=\u0547\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e \u0568\u057d\u057f \u056f\u0565\u057f\u056b \u0578\u0582 \u0561\u057c\u0561\u0576\u0581\u0584\u056b
+CircleAxisPoint.Help=\u0546\u0577\u0565\u0584 \u0561\u057c\u0561\u0576\u0581\u0584, \u0561\u057a\u0561 \u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056e\u056b \u056f\u0565\u057f
+CirclePointRadius=\u0547\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e \u0568\u057d\u057f \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u056b \u0578\u0582 \u0577\u0561\u057c\u0561\u057e\u0572\u056b
+CirclePointRadius.Help=\u0546\u0577\u0565\u0584 \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u0568 \u0587 \u0574\u0578\u0582\u057f\u0584\u0561\u0563\u0580\u0565\u0584 \u0577\u0561\u057c\u0561\u057e\u056b\u0572\u0568
+CirclePointRadiusDirection=\u0547\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u0578\u057e, \u0577\u0561\u057c\u0561\u057e\u0572\u0578\u057e \u0578\u0582 \u0578\u0582\u0572\u0572\u0578\u0582\u0569\u0575\u0561\u0574\u0562
+CirclePointRadiusDirection.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u0576 \u0578\u0582 \u0578\u0582\u0572\u0572\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568 \u0587 \u057f\u057e\u0565\u0584 \u0577\u0561\u057c\u0561\u057e\u056b\u0572\u0568
+CircleSector3=\u054d\u0565\u056f\u057f\u0578\u0580 \u0568\u057d\u057f \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u056b \u0578\u0582 \u0565\u0580\u056f\u0578\u0582 \u056f\u0565\u057f\u056b
+CircleSector3.Help=\u0546\u0577\u0565\u0584 \u057d\u0565\u056f\u057f\u0578\u0580\u056b \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u0568 \u0587 \u0565\u0580\u056f\u0578\u0582 \u056f\u0565\u057f \u0576\u0580\u0561 \u0561\u0572\u0565\u0572\u056b \u057e\u0580\u0561
+CircumcircleArc3=\u0531\u0572\u0565\u0572 \u0568\u057d\u057f \u0565\u0580\u0565\u0584 \u056f\u0565\u057f\u056b
+CircumcircleArc3.Help=\u0531\u0572\u0565\u0572\u056b \u057e\u0580\u0561 \u0576\u0577\u0565\u0584 \u0565\u0580\u0565\u0584 \u056f\u0565\u057f
+CircumcircleSector3=\u054d\u0565\u056f\u057f\u0578\u0580 \u0565\u0580\u0565\u0584 \u056f\u0565\u057f\u0578\u057e
+CircumcircleSector3.Help=\u0546\u0577\u0565\u0584 \u0565\u0580\u0565\u0584 \u056f\u0565\u057f \u057d\u0565\u056f\u057f\u0578\u0580\u056b \u0561\u0572\u0565\u0572\u056b \u057e\u0580\u0561
+ClassRule=\u0534\u0561\u057d\u0565\u0580\u056b (\u056f\u056c\u0561\u057d\u0576\u0565\u0580\u056b) \u056f\u0561\u0576\u0578\u0576
+Classes=\u0534\u0561\u057d\u0565\u0580 (\u056f\u056c\u0561\u057d\u0576\u0565\u0580)
+ClearColumn=\u0544\u0561\u0584\u0580\u0565\u0574 \u057d\u0575\u0578\u0582\u0576\u0568
+ClearColumns=\u0544\u0561\u0584\u0580\u0565\u0574 \u057d\u0575\u0578\u0582\u0576\u0565\u0580\u0568
+ClearRow=\u0544\u0561\u0584\u0580\u0565\u0574 \u057f\u0578\u0572\u0568
+ClearRows=\u0544\u0561\u0584\u0580\u0565\u0574 \u057f\u0578\u0572\u0565\u0580\u0568
+ClearSelection=\u0540\u0561\u0576\u0565\u0574 \u0568\u0576\u057f\u0580\u057e\u0561\u056e\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+ClearTrace=\u0544\u0561\u0584\u0580\u0565\u0574 \u0562\u0578\u056c\u0578\u0580 \u0570\u0565\u057f\u0584\u0565\u0580\u0568
+Clipboard=\u0553\u0578\u056d\u0561\u0576\u0561\u056f\u0574\u0561\u0576 \u0562\u0578\u0582\u0586\u0565\u0580
+ClipboardMessage=\u0531\u0580\u057f\u0561\u0570\u0561\u0576\u0578\u0582\u0574\u0568 \u0583\u0578\u056d\u0561\u0576\u0561\u056f\u0574\u0561\u0576 \u0562\u0578\u0582\u0586\u0565\u0580 \u056b\u0580\u0561\u056f\u0561\u0576\u0561\u0581\u057e\u0565\u0581 \u0570\u0561\u057b\u0578\u0572\u0578\u0582\u0569\u0575\u0561\u0574\u0562\n\u0532\u0561\u0581\u0565\u0584 HTML \u056d\u0574\u0562\u0561\u0563\u0580\u0574\u0561\u0576 \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576\u0568 \u0587 \u0564\u0580\u0565\u0584 \u0541\u0565\u0580 LMS-\u0578\u0582\u0574 (\u0585\u0580\u056b\u0576\u0561\u056f, Moodle)
+Close=\u0553\u0561\u056f\u0565\u0574
+CloseAll=\u0553\u0561\u056f\u0565\u0574 \u0561\u0574\u0565\u0576 \u056b\u0576\u0579
+CloseFile=\u0553\u0561\u056f\u0565\u0574 \u0586\u0561\u0575\u056c\u0568
+CmdList=\u0540\u0580\u0561\u0574\u0561\u0576\u0576\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f
+Coefficient=\u0533\u0578\u0580\u056e\u0561\u056f\u056b\u0581
+CollapseAll=\u0553\u0561\u056f\u0565\u0574 \u0561\u0574\u0565\u0576 \u056b\u0576\u0579
+ColumnHeader=\u054d\u0575\u0561\u0576 \u057e\u0565\u0580\u0576\u0561\u0563\u056b\u0580
+ColumnOrder=\u054d\u0575\u0578\u0582\u0576\u0565\u0580\u056b \u0570\u0565\u0580\u0569\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+ColumnReset=\u054e\u0565\u0580\u0561\u056f\u0561\u0576\u0563\u0576\u0565\u0574 \u057d\u0575\u0578\u0582\u0576\u0565\u0580\u0568
+Columns=\u054d\u0575\u0578\u0582\u0576\u0565\u0580
+Comma=\u054d\u057f\u0578\u0580\u0561\u056f\u0565\u057f
+CommandName=\u0540\u0580\u0561\u0574\u0561\u0576\u056b \u0561\u0576\u0578\u0582\u0576\u0568
+Compasses=\u053f\u0561\u0580\u056f\u056b\u0576
+Compasses.Help=\u0546\u0577\u0565\u0584 \u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056e\u056b \u0577\u0561\u057c\u0561\u057e\u056b\u0572\u0568 \u0578\u0580\u0578\u0577\u0578\u0572 \u0570\u0561\u057f\u057e\u0561\u056e\u0568 \u056f\u0561\u0574 \u0565\u0580\u056f\u0578\u0582 \u056f\u0565\u057f, \u0570\u0565\u057f\u0578 \u0576\u0580\u0561 \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u0568
+ComplexNumber=\u053f\u0578\u0574\u057a\u056c\u0565\u0584\u057d \u0569\u056b\u057e
+ComplexNumber.Help=\u053f\u0578\u0574\u057a\u056c\u0565\u0584\u057d \u0569\u056b\u057e \u057d\u057f\u0565\u0572\u056e\u0565\u056c\u0578\u0582 \u0570\u0561\u0574\u0561\u0580 \u057d\u0565\u0572\u0574\u0565\u0584 \u056f\u057f\u0561\u057e\u056b \u057e\u0580\u0561
+ConciseCode=\u054d\u0565\u0572\u0574\u057e\u0561\u056e \u056f\u0578\u0564
+ConciseUsingCSE5=\u054d\u0565\u0572\u0574\u0565\u0574 CSE5-\u056b \u0574\u056b\u057b\u0578\u0581\u0578\u057e
+Condition.ShowObject=\u0555\u0562\u0575\u0565\u056f\u057f\u0568 \u0581\u0578\u0582\u0575\u0581 \u057f\u0561\u056c\u0578\u0582 \u057a\u0561\u0575\u0574\u0561\u0576\u0576\u0565\u0580\u0568
+Conditions=\u054a\u0561\u0575\u0574\u0561\u0576\u0576\u0565\u0580
+ConfidenceInterval=\u054e\u057d\u057f\u0561\u0570\u0565\u056c\u056b \u0574\u056b\u057b\u0561\u056f\u0561\u0575\u0584
+ConfidenceLevel=\u054e\u057d\u057f\u0561\u0570\u0565\u056c\u056b \u0574\u0561\u056f\u0561\u0580\u0564\u0561\u056f
+Conic=\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569
+Conic5=\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569 \u0568\u057d\u057f \u0570\u056b\u0576\u0563 \u056f\u0565\u057f\u056b
+Conic5.Help=\u0546\u0577\u0565\u0584 \u056f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569\u056b \u0570\u056b\u0576\u0563 \u056f\u0565\u057f
+ConicMenu=\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569
+ConicSectionTools=\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569
+Continuity=\u0531\u0576\u0568\u0576\u0564\u0570\u0561\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Continuous=\u054f\u0587\u0578\u0572\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Copy=\u053f\u0580\u056f\u0576\u0585\u0580\u056b\u0576\u0561\u056f\u0565\u0574
+CopyToClipboard=\u053f\u0580\u056f\u0576\u0585\u0580\u056b\u0576\u0561\u056f\u0568 \u057f\u0561\u0576\u0565\u0574 \u0583\u0578\u056d\u0561\u0576\u0561\u056f\u0574\u0561\u0576 \u0562\u0578\u0582\u0586\u0565\u0580
+CopyToGraphics=\u053f\u0580\u056f\u0576\u0585\u0580\u056b\u0576\u0561\u056f\u0565\u0574 \u056f\u057f\u0561\u057e\u056b \u057e\u0580\u0561
+CopyToInputBar=\u053f\u0580\u056f\u0576\u0585\u0580\u056b\u0576\u0561\u056f\u0565\u0574 \u0574\u0578\u0582\u057f\u0584\u0561\u0563\u0580\u0574\u0561\u0576 \u057f\u0578\u0572\u0578\u0582\u0574
+CopyToSpreadsheet=\u053f\u0580\u056f\u0576\u0585\u0580\u056b\u0576\u0561\u056f\u0565\u0574 \u0561\u0572\u0575\u0578\u0582\u057d\u0561\u056f\u0578\u0582\u0574
+CopyVisualStyle=\u053f\u0580\u056f\u0576\u0585\u0580\u056b\u0576\u0561\u056f\u0565\u0574 \u0578\u0573\u0568
+CopyVisualStyle.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u0585\u0562\u0575\u0565\u056f\u057f\u0568, \u0578\u0580\u056b \u0578\u0573\u0568 \u0578\u0582\u0566\u0578\u0582\u0574 \u0565\u0584 \u0583\u0578\u056d\u0561\u0564\u0580\u0565\u056c \u0561\u0575\u056c \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u056b \u057e\u0580\u0561, \u0570\u0565\u057f\u0578 \u0576\u0577\u0565\u0584 \u0561\u0575\u0564 \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u0568
+Count=\u0540\u0561\u0577\u057e\u0565\u0574
+CountCells=\u0540\u0561\u0577\u057e\u0565\u0574 \u057e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f\u0568
+CountCells.Help=\u0546\u0577\u0565\u0584 \u057e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580\u056b \u0570\u0561\u057e\u0561\u0584\u0561\u056e\u0578\u0582\u0576
+Create=\u054d\u057f\u0565\u0572\u056e\u0565\u0574
+CreateCurveFit=\u053f\u0565\u057f\u0565\u0580\u0578\u057e \u0561\u0576\u0581\u0576\u0578\u0572 \u056f\u0578\u0580
+CreateCurveFit.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u057e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580\u0568, \u0570\u0565\u057f\u0578 \u057d\u0565\u0572\u0574\u0565\u0584 \u0563\u0578\u0580\u056e\u056b\u0584\u056b \u056f\u0578\u0573\u0561\u056f\u056b \u057e\u0580\u0561
+CreateList=\u054d\u057f\u0565\u0572\u056e\u0565\u0574 \u0581\u0578\u0582\u0581\u0561\u056f
+CreateList.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u057e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580\u0568, \u0570\u0565\u057f\u0578 \u057d\u0565\u0572\u0574\u0565\u0584 \u0563\u0578\u0580\u056e\u056b\u0584\u056b \u056f\u0578\u0573\u0561\u056f\u056b \u057e\u0580\u0561
+CreateListGraphicsView=\u054d\u057f\u0565\u0572\u056e\u0565\u0574 \u0581\u0578\u0582\u0581\u0561\u056f
+CreateListGraphicsView.Help=\u0538\u0576\u057f\u0580\u0565\u0574 \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u0568
+CreateListOfPoints=\u054d\u057f\u0565\u0572\u056e\u0565\u0574 \u056f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f
+CreateListOfPoints.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u057e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580\u0568, \u0570\u0565\u057f\u0578 \u057d\u0565\u0572\u0574\u0565\u0584 \u0563\u0578\u0580\u056e\u056b\u0584\u056b \u056f\u0578\u0573\u0561\u056f\u056b \u057e\u0580\u0561
+CreateMatrix=\u054d\u057f\u0565\u0572\u056e\u0565\u0574 \u0574\u0561\u057f\u0580\u056b\u0581
+CreateMatrix.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u057e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580\u0568, \u0570\u0565\u057f\u0578 \u057d\u0565\u0572\u0574\u0565\u0584 \u0563\u0578\u0580\u056e\u056b\u0584\u056b \u056f\u0578\u0573\u0561\u056f\u056b \u057e\u0580\u0561
+CreateOperationTable=\u054d\u057f\u0565\u0572\u056e\u0565\u0574 \u0585\u057a\u0565\u0580\u0561\u0581\u056b\u0578\u0576 \u0561\u0572\u0575\u0578\u0582\u057d\u0561\u056f
+CreateOperationTable.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u057e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580\u056b \u0562\u056c\u0578\u056f\u0568, \u0570\u0565\u057f\u0578 \u057d\u0565\u0572\u0574\u0565\u0584 \u0563\u0578\u0580\u056e\u056b\u0584\u056b \u056f\u0578\u0573\u0561\u056f\u056b \u057e\u0580\u0561
+CreatePolyLine=\u054d\u057f\u0565\u0572\u056e\u0565\u0574 \u0562\u0565\u056f\u0575\u0561\u056c
+CreatePolyLine.Help=\u053f\u0565\u057f\u0565\u0580\u056b \u0570\u0561\u0574\u0561\u0580 \u057e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580 \u0568\u0576\u057f\u0580\u0565\u0584, \u0570\u0565\u057f\u0578 \u057d\u0565\u0572\u0574\u0565\u0584 \u0563\u0578\u0580\u056e\u056b\u0584\u056b \u056f\u0578\u0573\u0561\u056f\u056b \u057e\u0580\u0561
+CreateTable=\u054d\u057f\u0565\u0572\u056e\u0565\u0574 \u0561\u0572\u0575\u0578\u0582\u057d\u0561\u056f
+CreateTable.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u057e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580\u0568, \u0570\u0565\u057f\u0578 \u057d\u0565\u0572\u0574\u0565\u0584 \u0563\u0578\u0580\u056e\u056b\u0584\u056b \u056f\u0578\u0573\u0561\u056f\u056b \u057e\u0580\u0561
+Cumulative=\u0533\u0578\u0582\u0574\u0561\u0580 \u0570\u0561\u0573\u0561\u056d\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+CursiveLetters=\u0547\u0565\u0572\u0561\u057f\u0561\u057c
+CustomTools=\u0533\u0578\u0580\u056e\u0561\u056e\u0578\u0572\u056b \u0563\u0578\u0580\u056e\u056b\u0584\u0576\u0565\u0580
+Cut=\u053f\u057f\u0580\u0565\u0574
+Data=\u054f\u057e\u0575\u0561\u056c\u0576\u0565\u0580
+DataColumn=\u054f\u057e\u0575\u0561\u056c\u0576\u0565\u0580\u056b \u057d\u0575\u0578\u0582\u0576
+DataColumnName=\u054f\u057e\u0575\u0561\u056c\u0576\u0565\u0580\u056b \u057d\u0575\u0561\u0576 \u0561\u0576\u0578\u0582\u0576\u0568
+DataTitle=\u054f\u057e\u0575\u0561\u056c\u0576\u0565\u0580\u056b \u0561\u0576\u057e\u0561\u0576\u0578\u0582\u0574\u0568
+DecimalPlaces=\u0546\u056b\u0577 \u057d\u057f\u0578\u0580\u0561\u056f\u0565\u057f\u056b\u0581 \u0570\u0565\u057f\u0578
+Default.Restore=\u054e\u0565\u0580\u0561\u056f\u0561\u0576\u0563\u0576\u0565\u0574 \u0576\u0561\u056d\u0576\u0561\u056f\u0561\u0576 \u056f\u0561\u0580\u0563\u0561\u057e\u0578\u0580\u0578\u0582\u0574\u0576\u0565\u0580
+Default.Set=\u0546\u0561\u056d\u0576\u0561\u056f\u0561\u0576 \u056f\u0561\u0580\u0563\u0561\u057e\u0578\u0580\u0578\u0582\u0574\u0576\u0565\u0580
+Degree=\u0531\u057d\u057f\u056b\u0573\u0561\u0576
+DegreesOfFreedom.short=\u0531\u0566\u0561\u057f\u0578\u0582\u0569\u0575\u0561\u0576 \u0561\u057d\u057f\u056b\u0573\u0561\u0576\u0576\u0565\u0580
+DegreesOfFreedom1.short=\u0531\u0566\u0561\u057f\u0578\u0582\u0569\u0575\u0561\u0576 \u0561\u057d\u057f\u056b\u0573\u0561\u0576\u0576\u0565\u0580 1
+DegreesOfFreedom2.short=\u0531\u0566\u0561\u057f\u0578\u0582\u0569\u0575\u0561\u0576 \u0561\u057d\u057f\u056b\u0573\u0561\u0576\u0576\u0565\u0580 2
+Delete=\u054b\u0576\u057b\u0565\u0574 \u0585\u0562\u0575\u0565\u056f\u057f\u0568
+Delete.Help=\u0538\u0576\u057f\u0580\u0565\u0574 \u0585\u0562\u0575\u0565\u056f\u057f
+DeleteObjects=\u054b\u0576\u057b\u0565\u0574 \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u0568
+DeleteTool=\u054b\u0576\u057b\u0565\u0574 \u0563\u0578\u0580\u056e\u056b\u0584\u0568
+Delimiter=\u054d\u0561\u0570\u0574\u0561\u0576\u0561\u0566\u0561\u057f\u056b\u0579
+Derivative=\u0531\u056e\u0561\u0576\u0581\u056b\u0561\u056c
+Derivative.Help=\u0540\u0561\u0577\u057e\u0565\u0574 \u0561\u056e\u0561\u0576\u0581\u056b\u0561\u056c\u0568
+Descending=\u0546\u057e\u0561\u0566\u0578\u0572
+Differences=\u054f\u0561\u0580\u0562\u0565\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+DilateFromPoint=\u0540\u0578\u0574\u0578\u057f\u0565\u057f\u056b\u0561 \u056f\u0565\u057f\u056b \u0576\u056f\u0561\u057f\u0574\u0561\u0574\u0562
+DilateFromPoint.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u0571\u0587\u0561\u0583\u0578\u056d\u057e\u0578\u0572 \u0585\u0562\u0575\u0565\u056f\u057f\u0568, \u0570\u0565\u057f\u0578 \u0570\u0578\u0574\u0578\u057f\u0565\u057f\u056b\u0561\u0575\u056b \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u0576 \u0578\u0582 \u0563\u0578\u0580\u056e\u0561\u056f\u056b\u0581\u0568
+Discrete=\u0534\u056b\u057d\u056f\u0580\u0565\u057f
+Distance=\u0540\u0565\u057c\u0561\u057e\u0578\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576,\u0565\u0580\u056f\u0561\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576,\u057a\u0561\u0580\u0561\u0563\u056b\u056e
+Distance.Help=\u0546\u0577\u0565\u0584 \u0565\u0580\u056f\u0578\u0582 \u056f\u0565\u057f, \u0570\u0561\u057f\u057e\u0561\u056e, \u0562\u0561\u0566\u0574\u0561\u0576\u056f\u0575\u0578\u0582\u0576 \u056f\u0561\u0574 \u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e
+Distribution=\u0532\u0561\u0577\u056d\u0578\u0582\u0574
+Distribution.Binomial=\u0535\u0580\u056f\u0561\u0576\u0564\u0561\u0574\u0561\u0575\u056b\u0576 \u0562\u0561\u0577\u056d\u0578\u0582\u0574
+Distribution.Cauchy=\u053f\u0578\u0577\u0578\u0582 \u0562\u0561\u0577\u056d\u0578\u0582\u0574
+Distribution.ChiSquare=\u03c7² \u0562\u0561\u0577\u056d\u0578\u0582\u0574
+Distribution.Exponential=\u0537\u0584\u057d\u057a\u0578\u0576\u0565\u0576\u0581\u056b\u0561\u056c \u0562\u0561\u0577\u056d\u0578\u0582\u0574
+Distribution.F=F-\u0562\u0561\u0577\u056d\u0578\u0582\u0574
+Distribution.Gamma=\u0533\u0561\u0574\u0574\u0561
+Distribution.Hypergeometric=\u0540\u056b\u057a\u0565\u0580\u0565\u0580\u056f\u0580\u0561\u0579\u0561\u0583\u0561\u056f\u0561\u0576 \u0562\u0561\u0577\u056d\u0578\u0582\u0574
+Distribution.Logistic=\u053c\u0578\u0563\u056b\u057d\u057f\u056b\u056f \u0562\u0561\u0577\u056d\u0578\u0582\u0574
+Distribution.Lognormal=\u053c\u0578\u0563\u0578\u0576\u0578\u0580\u0574\u0561\u056c \u0562\u0561\u0577\u056d\u0578\u0582\u0574
+Distribution.Normal=\u0546\u0578\u0580\u0574\u0561\u056c \u0562\u0561\u0577\u056d\u0578\u0582\u0574
+Distribution.Pascal=\u054a\u0561\u057d\u056f\u0561\u056c\u056b \u0562\u0561\u0577\u056d\u0578\u0582\u0574
+Distribution.Poisson=\u054a\u0578\u0582\u0561\u057d\u0578\u0576\u056b \u0562\u0561\u0577\u056d\u0578\u0582\u0574
+Distribution.Scale=\u054d\u056f\u0561\u056c\u0575\u0561\u0580 \u057a\u0561\u0580\u0561\u0574\u0565\u057f\u0580
+Distribution.StudentT=\u054d\u057f\u0575\u0578\u0582\u0564\u0565\u0576\u057f\u056b_\u0532\u0561\u0577\u056d\u0578\u0582\u0574
+Distribution.Weibull=\u054e\u0565\u0575\u0562\u0578\u0582\u056c\u056b_\u0532\u0561\u0577\u056d\u0578\u0582\u0574
+DoYouWantToSaveYourChanges=\u054a\u0561\u0570\u0565\u055e\u0574 \u0583\u0578\u0583\u0578\u056d\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u0568
+DontDeleteTool=\u0549\u057b\u0576\u057b\u0565\u0574 \u0563\u0578\u0580\u056e\u056b\u0584\u0568
+DontOverwrite=\u0549\u057e\u0565\u0580\u0561\u0563\u0580\u0561\u0576\u0581\u0565\u0574
+DontSave=\u0549\u057a\u0561\u0570\u0565\u0574
+DotPlot=\u053f\u0565\u057f\u0561\u0575\u056b\u0576 \u0564\u056b\u0561\u0563\u0580\u0561\u0574
+DrawingPadToClipboard=\u053f\u0580\u056f\u0576\u0585\u0580\u056b\u0576\u0561\u056f\u0565\u0574 \u0562\u0578\u0582\u0586\u0565\u0580\u0578\u0582\u0574
+DynamicColors=\u0534\u056b\u0576\u0561\u0574\u056b\u056f \u0563\u0578\u0582\u0576\u0561\u057e\u0578\u0580\u0578\u0582\u0574
+Edit=\u053d\u0574\u0562\u0561\u0563\u0580\u0565\u0574
+Ellipse3=\u0537\u056c\u056b\u057a\u057d
+Ellipse3.Help=\u0546\u0577\u0565\u0584 \u0567\u056c\u056b\u057a\u057d\u056b \u0586\u0578\u056f\u0578\u0582\u057d\u0576\u0565\u0580\u0576 \u0578\u0582 \u0574\u056b \u056f\u0565\u057f \u0567\u056c\u056b\u057a\u057d\u056b \u057e\u0580\u0561
+EnableLabelDrags=\u0539\u0578\u0582\u0575\u056c \u057f\u0561\u0574 \u0576\u0577\u0561\u0576\u0561\u056f\u0578\u0582\u0574\u0576\u0565\u0580\u056b \u057f\u0565\u0572\u0561\u0577\u0561\u0580\u056a
+EnableRightClick=\u0539\u0578\u0582\u0575\u056c \u057f\u0561\u0574 \u0561\u057b \u0584\u056c\u056b\u056f
+English=\u0531\u0576\u0563\u056c\u0565\u0580\u0565\u0576
+EnterAppletAddress=\u0544\u0578\u0582\u057f\u0584\u0561\u0563\u0580\u0565\u0574 \u0533\u0565\u0578\u0533\u0565\u0562\u0580\u0561 \u0561\u057a\u056c\u0565\u057f\u056b \u057e\u0565\u0562 \u0570\u0561\u057d\u0581\u0565\u0576
+EnterWebAddress=\u0544\u0578\u0582\u057f\u0584\u0561\u0563\u0580\u0565\u0574 \u057e\u0565\u0562 \u0570\u0561\u057d\u0581\u0565\u0576
+Equation=\u0540\u0561\u057e\u0561\u057d\u0561\u0580\u0578\u0582\u0574
+EstimatedValue=\u0540\u0561\u0577\u057e\u0561\u0580\u056f\u0561\u0575\u056b\u0576 \u0561\u0580\u056a\u0565\u0584\u0568
+Evaluate=\u0540\u0561\u0577\u057e\u0565\u0574
+Evaluate.Help=\u0540\u0561\u0577\u057e\u0565\u0574 \u0561\u0580\u0564\u0575\u0578\u0582\u0576\u0584\u0568
+Exit=\u0535\u056c\u0584
+Expand=\u0532\u0561\u0581\u0565\u0574 \u0583\u0561\u056f\u0561\u0563\u056e\u0565\u0580\u0568
+Expand.Help=\u0532\u0561\u0581\u0565\u0574 \u0583\u0561\u056f\u0561\u0563\u056e\u0565\u0580\u0568
+ExpandAll=\u0553\u057c\u0565\u0574 \u0562\u0578\u056c\u0578\u0580\u0568
+Exponential=\u0551\u0578\u0582\u0581\u0579\u0561\u0575\u056b\u0576
+Export=\u0531\u0580\u057f\u0561\u0570\u0561\u0576\u0565\u0574
+ExportAllWorksheets=\u0532\u0578\u056c\u0578\u0580 \u0562\u0561\u0581 \u0561\u0577\u056d\u0561\u057f\u0561\u0576\u0584\u0561\u0575\u056b\u0576 \u0569\u0565\u0580\u0569\u0565\u0580\u056b \u0561\u0580\u057f\u0561\u0570\u0561\u0576\u0578\u0582\u0574
+Factor=\u054e\u0565\u0580\u056c\u0578\u0582\u056e\u0565\u0574
+Factor.Help=\u0533\u057f\u0576\u0565\u0574 \u0561\u0580\u057f\u0561\u0564\u0580\u056b\u0579\u0576\u0565\u0580\u0568
+FastHelp=\u0531\u0580\u0561\u0563 \u0585\u0563\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+File=\u0556\u0561\u0575\u056c
+FileBrowser=\u0532\u0580\u0578\u0578\u0582\u0566\u0565\u0580
+FileSystem=\u0556\u0561\u0575\u056c\u0565\u0580\u056b \u0570\u0561\u0574\u0561\u056f\u0561\u0580\u0563
+Files=\u0556\u0561\u0575\u056c\u0565\u0580
+FillType=\u053c\u0581\u0576\u0565\u056c\u0578\u0582, \u0576\u0565\u0580\u056f\u0565\u056c\u0578\u0582 \u057f\u0565\u057d\u0561\u056f
+Filling=\u053c\u0581\u0576\u0565\u0574, \u0576\u0565\u0580\u056f\u0565\u0574
+Filling.Hatch=\u0547\u0565\u0572\u0561\u0563\u056e\u0578\u0582\u0574
+Filling.Image=\u054a\u0561\u057f\u056f\u0565\u0580
+Filling.Standard=\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f
+FitCurve=\u053f\u0578\u0580 \u0568\u057d\u057f \u056f\u0565\u057f\u0565\u0580\u056b
+FitCurve.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u056f\u0565\u057f\u0565\u0580 \u056f\u057f\u0561\u057e\u056b \u057e\u0580\u0561 \u056f\u0561\u0574 \u056f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f
+FitLine=\u0544\u0578\u057f\u0561\u0580\u056f\u0578\u0582\u0574
+FitLine.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u0574\u056b \u0584\u0561\u0576\u056b \u056f\u0565\u057f \u056f\u0561\u0574 \u056f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f
+Fix=\u0531\u0574\u0580\u0561\u0581\u0578\u0582\u0574 \u0544\u056b\u0561\u0581\u0576\u0565\u0574/\u0561\u0576\u057b\u0561\u057f\u0565\u0574
+Fix.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u0585\u0562\u0575\u0565\u056f\u057f\u0568, \u0578\u0580\u0568 \u057a\u0565\u057f\u0584 \u0567 \u0561\u0574\u0580\u0561\u0581\u0576\u0565\u056c \u056f\u0561\u0574 \u0561\u0566\u0561\u057f\u0565\u056c
+FixedToGrid=\u053f\u0561\u057a\u0565\u0574 \u0581\u0561\u0576\u0581\u056b \u0570\u0561\u0576\u0563\u0578\u0582\u0575\u0581\u0576\u0565\u0580\u056b\u0576
+FontSize=\u054f\u0561\u057c\u0561\u0579\u0561\u0583
+ForegroundColor=\u054a\u0561\u057f\u056f\u0565\u0580\u056b \u0563\u0578\u0582\u0575\u0576\u0568
+Formulas=\u0532\u0561\u0576\u0561\u0571\u0587\u0565\u0580
+FrakturLetters=\u0533\u0578\u0569\u0561\u056f\u0561\u0576 \u057f\u0561\u057c\u0565\u0580
+Frequency=\u0540\u0561\u0573\u0561\u056d\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+FrequencyPolygon=\u0540\u0561\u0573\u0561\u056d\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u056b \u057a\u0578\u056c\u056b\u0563\u0578\u0576
+FrequencyTable=\u0540\u0561\u0573\u0561\u056d\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u056b \u0561\u0572\u0575\u0578\u0582\u057d\u0561\u056f
+FrequencyType=\u0540\u0561\u0573\u0561\u056d\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0561\u0576 \u057f\u0565\u057d\u0561\u056f\u0568
+FunctionInspector=\u0540\u0565\u057f\u0561\u0566\u0565\u057f\u0565\u0574 \u0586\u0578\u0582\u0576\u056f\u0581\u056b\u0561\u0576
+FunctionInspector.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u0586\u0578\u0582\u0576\u056f\u0581\u056b\u0561\u0576
+Functionality=\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0578\u0576\u0561\u056c\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+GUIFontSize=\u0544\u0565\u0576\u0575\u0578\u0582\u056b \u057f\u0561\u057c\u0561\u0579\u0561\u0583\u0568
+General=\u0538\u0576\u0564\u0570\u0561\u0576\u0578\u0582\u0580
+GeneralTools=\u0538\u0576\u0564\u0570\u0561\u0576\u0578\u0582\u0580 \u0563\u0578\u0580\u056e\u056b\u0584\u0576\u0565\u0580
+GenerateCode=\u0533\u0565\u0576\u0565\u0580\u0561\u0581\u0576\u0565\u0574 \u056f\u0578\u0564
+GeogebraToAsymptoteExport=\u0531\u0580\u057f\u0561\u0570\u0561\u0576\u0565\u0574 \u0578\u0580\u057a\u0565\u057d Asymptote
+Geometry=\u0535\u0580\u056f\u0580\u0561\u0579\u0561\u0583\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+German=\u0533\u0565\u0580\u0574\u0561\u0576\u0565\u0580\u0565\u0576
+Graph=\u0533\u0580\u0561\u0586\u056b\u056f
+GraphicsQuality=\u053f\u057f\u0561\u057e
+Green=\u053f\u0561\u0576\u0561\u0579
+Grid=\u0551\u0561\u0576\u0581
+Gridlines=\u0551\u0561\u0576\u0581\u056b \u0563\u056e\u0565\u0580
+GroupObjects=\u053d\u0574\u0562\u0561\u057e\u0578\u0580\u0565\u0574 \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u0568
+HTML5Only=\u0531\u0580\u057f\u0561\u0570\u0561\u0576\u0565\u0574 \u0574\u056b\u0561\u0575\u0576 \u0578\u0580\u057a\u0565\u057d HTML5
+HTML5WithJava=\u0531\u0580\u057f\u0561\u0570\u0561\u0576\u0565\u0574 HTML5 (Java \u0561\u0575\u056c\u0568\u0576\u057f\u0580\u0561\u0576\u0584\u0578\u057e)
+Help=\u0555\u0563\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Hidden.Dashed=\u053f\u0565\u057f\u0561\u0563\u056b\u056e
+Hidden.Invisible=\u0531\u0576\u057f\u0565\u057d\u0561\u0576\u0565\u056c\u056b
+Hidden.Unchanged=\u0549\u0583\u0578\u056d\u057e\u0578\u0572
+HiddenLineStyle=\u0539\u0561\u0584\u0581\u0580\u0561\u056e \u0563\u056e\u0565\u0580\u056b \u0578\u0573\u0568
+HighQuality=\u0532\u0561\u0580\u0571\u0580 \u0578\u0580\u0561\u056f\u056b
+Histogram=\u0540\u056b\u057d\u057f\u0578\u0563\u0580\u0561\u0574\u0561
+HomeDirectory=\u054f\u0578\u0582\u0576
+HorizontalScrollbars=\u0540\u0578\u0580\u056b\u0566\u0578\u0576\u0561\u056f\u0561\u0576 \u057d\u0578\u0572\u0576\u0561\u056f
+Hue=\u0535\u0580\u0561\u0576\u0563
+Hyperbola3=\u0540\u056b\u057a\u0565\u0580\u0562\u0578\u056c\u0561
+Hyperbola3.Help=\u0546\u0577\u0565\u0584 \u0570\u056b\u057a\u0565\u0580\u0562\u0578\u056c\u056b \u0586\u0578\u056f\u0578\u0582\u057d\u0576\u0565\u0580\u0568 \u0587 \u0574\u056b \u056f\u0565\u057f \u0576\u0580\u0561 \u057e\u0580\u0561
+Hypergeometric.population=\u054e\u0565\u0580\u057b\u0561\u057e\u0578\u0580 \u0570\u0561\u057e\u0561\u0584\u0561\u056e\u0578\u0582
+Hypergeometric.sample=\u0546\u0574\u0578\u0582\u0577
+Icon=\u053b\u056f\u0578\u0576(\u057a\u0561\u057f\u056f\u0565\u0580\u0561\u056f)
+Image=\u0546\u0565\u0580\u0574\u0578\u0582\u056e\u0565\u0574 \u057a\u0561\u057f\u056f\u0565\u0580
+Image.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u056f\u0565\u057f\u0568, \u0578\u0580\u057f\u0565\u0572 \u057a\u0565\u057f\u0584 \u0567 \u0563\u057f\u0576\u057e\u056b \u057a\u0561\u057f\u056f\u0565\u0580\u056b \u0576\u0565\u0580\u0584\u0587\u056b \u0571\u0561\u056d \u0563\u0561\u0563\u0561\u0569\u0568
+Images=\u054a\u0561\u057f\u056f\u0565\u0580
+ImportDataFile=\u0546\u0565\u0580\u0574\u0578\u0582\u056e\u0565\u0574 \u057f\u057e\u0575\u0561\u056c\u0576\u0565\u0580\u056b \u0586\u0561\u0575\u056c\u0568
+IncludeHTML5=\u0546\u0565\u0580\u0561\u057c\u0565\u056c HTML5 \u0561\u057a\u056c\u0565\u057f\u0578\u0582\u0574
+InputField=\u0544\u0578\u0582\u057f\u0584\u056b \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576
+InputField.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u0585\u0562\u0575\u0565\u056f\u057f\u0568, \u0578\u0580\u057a\u0565\u057d\u0566\u056b \u0576\u0580\u0561 \u0561\u0576\u0578\u0582\u0576\u0568 \u056f\u0580\u056f\u0576\u0585\u0580\u056b\u0576\u0561\u056f\u057e\u056b \u0544\u0561\u0582\u057f\u0584\u0561\u0563\u0580\u0574\u0561\u0576 \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576\u0578\u0582\u0574
+InputHelp=\u0540\u0580\u0561\u0574\u0561\u0576\u0576\u0565\u0580
+InputObjects=\u0544\u0578\u0582\u057f\u0584\u0561\u0575\u056b\u0576 \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580
+InsertAbove=\u0531\u057e\u0565\u056c\u0561\u0581\u0576\u0565\u0574 \u057f\u0578\u0572 \u057e\u0565\u0580\u0587\u0578\u0582\u0574
+InsertBelow=\u0546\u0565\u0580\u0574\u0578\u0582\u056e\u0565\u0574 \u057f\u0578\u0572 \u0576\u0565\u0580\u0584\u0587\u0578\u0582\u0574
+InsertLeft=\u0541\u0561\u056d\u056b\u0581 \u057d\u0575\u0578\u0582\u0576 \u0561\u057e\u0565\u056c\u0561\u0581\u0576\u0565\u0574
+InsertRight=\u0531\u057e\u0565\u056c\u0561\u0581\u0576\u0565\u0574 \u057d\u0575\u0578\u0582\u0576 \u0561\u057b\u056b\u0581
+Integral=\u053b\u0576\u057f\u0565\u0563\u0580\u0561\u056c
+Integral.Help=\u0540\u0561\u0577\u057e\u0565\u0574 \u0561\u0576\u0578\u0580\u0578\u0577 \u056b\u0576\u057f\u0565\u0563\u0580\u0561\u056c
+Intercept=\u0531\u057c\u0561\u0576\u0571\u0576\u0561\u0581\u0576\u0565\u0574
+InternalCAS=\u0546\u0565\u0580\u0584\u056b\u0576 CAS
+Intersect=\u0535\u0580\u056f\u0578\u0582 \u0585\u0562\u0575\u0565\u056f\u057f\u056b \u0570\u0561\u057f\u0578\u0582\u0574\u0568
+Intersect.Help=\u0540\u0565\u0580\u0569\u0578\u057e \u0568\u0576\u057f\u0580\u0565\u0584 \u0565\u0580\u056f\u0578\u0582 \u0563\u056b\u056e \u056f\u0561\u0574 \u057d\u0565\u0572\u0574\u0565\u0584 \u0576\u0580\u0561\u0576\u0581 \u0570\u0561\u057f\u0574\u0561\u0576 \u056f\u0565\u057f\u0578\u0582\u0574
+IntersectionCurve=\u0535\u0580\u056f\u0578\u0582 \u0574\u0561\u056f\u0565\u0580\u0587\u0578\u0582\u0575\u0569\u056b \u0570\u0561\u057f\u0578\u0582\u0574\u0568
+IntersectionCurve.Help=\u0535\u0580\u056f\u0578\u0582 \u0570\u0561\u0580\u0569\u0578\u0582\u0569\u0575\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0574\u0568
+Interval=\u0544\u056b\u057b\u0561\u056f\u0561\u0575\u0584
+IntervalProb=\u053b\u0576\u057f\u0565\u0580\u057e\u0561\u056c
+InvertSelection=\u0547\u0580\u057b\u0565\u0574 \u0568\u0576\u057f\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+Isometric=\u053b\u0566\u0578\u0574\u0565\u057f\u0580\u056b\u056f
+JavaOnly=\u0531\u0580\u057f\u0561\u0570\u0561\u0576\u0565\u0574 \u0574\u056b\u0561\u0575\u0576 \u0578\u0580\u057a\u0565\u057d Java
+JavaWithHTML5=\u0531\u0580\u057f\u0561\u0570\u0561\u0576\u0565\u056c \u0578\u0580\u057a\u0565\u057d Java (HTML5 \u0561\u0575\u056c\u0568\u0576\u057f\u0580\u0561\u0576\u0584\u0578\u057e)
+Join=\u0535\u0580\u056f\u0578\u0582 \u056f\u0565\u057f\u0578\u057e \u0561\u0576\u0581\u0576\u0578\u0572 \u0578\u0582\u0572\u056b\u0572
+Join.Help=\u0546\u0577\u0565\u0584 \u0578\u0582\u0572\u0572\u056b \u0565\u0580\u056f\u0578\u0582 \u056f\u0565\u057f
+KeepInput=\u0531\u0574\u0580\u0561\u0581\u0576\u0565\u0574 \u0574\u0578\u0582\u057f\u0584\u0568
+KeepInput.Help=\u054a\u0561\u0570\u0565\u0574 \u0587 \u057d\u057f\u0578\u0582\u0563\u0565\u0574 \u0574\u0578\u0582\u057f\u0584\u0561\u0563\u0580\u0578\u0582\u0574\u0568
+LabelColumn=\u054d\u0575\u0561\u0576 \u057e\u0565\u0580\u0576\u0561\u0563\u056b\u0580
+Labeling=\u0546\u0577\u0561\u0576\u0561\u056f\u0578\u0582\u0574\u0576\u0565\u0580
+Labeling.automatic=\u0531\u057e\u057f\u0578\u0574\u0561\u057f
+Labeling.off=\u0546\u0578\u0580 \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u056b \u0570\u0561\u0574\u0561\u0580 \u0579\u056f\u056b\u0580\u0561\u057c\u0565\u0574
+Labeling.on=\u0532\u0578\u056c\u0578\u0580 \u0576\u0578\u0580 \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u056b \u0570\u0561\u0574\u0561\u0580
+Labeling.pointsOnly=\u0544\u056b\u0561\u0575\u0576 \u0576\u0578\u0580 \u056f\u0565\u057f\u0565\u0580\u056b \u0570\u0561\u0574\u0561\u0580
+Labeling.propertiesDefault=\u0555\u0563\u057f\u0561\u0563\u0578\u0580\u056e\u0565\u0574 \u0576\u0561\u056d\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u056f\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u0568
+Labels=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574/\u0539\u0561\u0584\u0581\u0576\u0565\u0574 \u0576\u0577\u0561\u0576\u0561\u056f\u0578\u0582\u0574\u0576\u0565\u0580\u0568
+Landscape=\u0531\u056c\u0562\u0578\u0574\u0561\u0575\u056b\u0576
+Language=\u0538\u0576\u057f\u0580\u0565\u0574 \u056c\u0565\u0566\u0578\u0582\u0576
+Layout=\u0546\u0561\u056d\u0561\u0563\u056b\u056e
+LeftProb=\u0541\u0561\u056d\u0561\u056f\u0578\u0572\u0574\u0575\u0561\u0576
+License=\u053c\u056b\u0581\u0565\u0576\u0566\u056b\u0561
+Lightness=\u0539\u0565\u0569\u0587, \u056c\u0578\u0582\u057d\u0561\u057e\u0578\u0580
+LineBisector=\u0544\u056b\u057b\u0576\u0578\u0582\u0572\u0572\u0561\u0570\u0561\u0575\u0561\u0581
+LineBisector.Help=\u0546\u0577\u0565\u0584 \u0565\u0580\u056f\u0578\u0582 \u056f\u0565\u057f \u056f\u0561\u0574 \u0570\u0561\u057f\u057e\u0561\u056e
+LineGraph=\u0534\u056b\u0561\u0563\u0580\u0561\u0574 \u0562\u0565\u056f\u0575\u0561\u056c\u056b \u057f\u0565\u057d\u0584\u0578\u057e
+LineMenu=\u0548\u0582\u0572\u056b\u0572
+Linear=\u0533\u056e\u0561\u0575\u056b\u0576
+LinkedFiles=\u053f\u0561\u057a\u057e\u0561\u056e \u0586\u0561\u0575\u056c\u0565\u0580
+List=\u0551\u0578\u0582\u0581\u0561\u056f
+ListOfPoints=\u053f\u0565\u057f\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f
+Load=\u0532\u0561\u0581\u0565\u0574
+Location=\u0534\u056b\u0580\u0584
+Locus=\u053f\u0565\u057f\u0565\u0580\u056b \u0565\u0580\u056f\u0580\u0561\u0579\u0561\u0583\u0561\u056f\u0561\u0576 \u057f\u0565\u0572\u0568
+Locus.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u056f\u0565\u057f\u0565\u0580\u056b \u0565\u0580\u056f\u0580\u0561\u0579\u0561\u0583\u0561\u056f\u0561\u0576 \u057f\u0565\u0572\u0568, \u0570\u0565\u057f\u0578 \u056f\u0565\u057f \u0585\u0562\u0575\u0565\u056f\u057f\u056b \u057e\u0580\u0561 \u056f\u0561\u0574 \u057d\u0578\u0572\u0576\u0561\u056f
+Log=\u053c\u0578\u0563\u0561\u0580\u056b\u0569\u0574\u0561\u056f\u0561\u0576
+Logistic=\u053c\u0578\u0563\u056b\u057d\u057f\u056b\u056f
+LowQuality=\u0551\u0561\u056e\u0580 \u0578\u0580\u0561\u056f
+LowerLimit=\u054d\u057f\u0578\u0580\u056b\u0576 \u057d\u0561\u0570\u0574\u0561\u0576
+LowerQuartile.short=\u054d\u057f\u0578\u0580\u056b\u0576_\u0554\u057e\u0561\u0580\u057f\u056b\u056c
+ManagePerspectives=\u0535\u0576\u0569\u0561\u0562\u0561\u056a\u056b\u0576\u0576\u0565\u0580\u056b \u056f\u0561\u0580\u0563\u0561\u057e\u0578\u0580\u0578\u0582\u0574
+MarginOfError=\u054d\u056d\u0561\u056c\u056b \u057d\u0561\u0570\u0574\u0561\u0576\u0568
+MathematicalFunctions=\u0544\u0561\u0569\u0565\u0574\u0561\u057f\u056b\u056f\u0561\u056f\u0561\u0576 \u0586\u0578\u0582\u0576\u056f\u0581\u056b\u0561\u0576\u0565\u0580
+Matrices=\u0544\u0561\u057f\u0580\u056b\u0581\u0576\u0565\u0580
+Matrix=\u0544\u0561\u057f\u0580\u056b\u0581
+MaxCells=\u0544\u0561\u0584\u057d\u056b\u0574\u0578\u0582\u0574
+MaxCells.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u057e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580\u056b \u0570\u0561\u057e\u0561\u0584\u0561\u056e\u0578\u0582\u0576
+Mean=\u0544\u0561\u0569\u057d\u057a\u0561\u057d\u0578\u0582\u0574
+MeanCells=\u0544\u056b\u057b\u056b\u0576 \u0569\u057e\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576
+MeanCells.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u057e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580\u056b \u0570\u0561\u057e\u0561\u0584\u0561\u056e\u0578\u0582\u0576
+MeanDifference=\u0544\u056b\u057b\u056b\u0576 \u057f\u0561\u0580\u0562\u0565\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+MeanX=X-\u056b \u0574\u056b\u057b\u056b\u0576 \u0561\u0580\u056a\u0565\u0584\u0568
+MeanY=Y-\u056b \u0574\u056b\u057b\u056b\u0576 \u0561\u0580\u056a\u0565\u0584\u0568
+MeasurementTools=\u0549\u0561\u0583\u0578\u0582\u0574\u0576\u0565\u0580
+Median=\u053f\u056b\u057d\u0578\u0572 (\u0574\u0565\u0564\u056b\u0561\u0576)
+Midpoint=\u0544\u056b\u057b\u0576\u0561\u056f\u0565\u057f \u056f\u0561\u0574 \u056f\u0565\u0576\u057f\u0580\u0578\u0576
+Midpoint.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u0565\u0580\u056f\u0578\u0582 \u056f\u0565\u057f, \u0570\u0561\u057f\u057e\u0561\u056e, \u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e \u056f\u0561\u0574 \u056f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569
+MinCells=\u0544\u056b\u0576\u056b\u0574\u0578\u0582\u0574
+MinCells.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u057e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580\u056b \u0570\u0561\u057e\u0561\u0584\u0561\u056e\u0578\u0582\u0576
+MirrorAtCircle=\u0540\u0561\u0574\u0561\u0579\u0561\u0583\u0568 \u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e \u0576\u056f\u0561\u057f\u0574\u0561\u0574\u0562
+MirrorAtCircle.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u056f\u0565\u057f\u0568, \u0570\u0565\u057f\u0578 \u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e\u0568
+MirrorAtLine=\u0540\u0561\u0574\u0561\u0579\u0561\u0583\u0568 \u0578\u0582\u0572\u0572\u056b \u0576\u056f\u0561\u057f\u0574\u0561\u0574\u0562
+MirrorAtLine.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u0585\u0562\u0575\u0565\u056f\u057f\u0568 \u0587 \u0570\u0561\u0574\u0561\u0579\u0561\u0583\u0578\u0582\u0569\u0575\u0561\u0576 \u0561\u057c\u0561\u0576\u0581\u0584\u0568
+MirrorAtPoint=\u0540\u0561\u0574\u0561\u0579\u0561\u0583\u0568 \u056f\u0565\u057f\u056b \u0576\u056f\u0561\u057f\u0574\u0561\u0574\u0562
+MirrorAtPoint.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0585\u0562\u0575\u0565\u056f\u057f\u0568 \u0587 \u0570\u0561\u0574\u0561\u0579\u0561\u0583\u0578\u0582\u0569\u0575\u0561\u0576 \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u0568
+Mode=\u0544\u0578\u0564
+Move=\u054f\u0565\u0572\u0561\u0577\u0561\u0580\u056a\u0565\u0574
+Move.Help=\u0538\u0576\u057f\u0580\u0565\u0574 \u056f\u0561\u0574 \u057f\u0565\u0572\u0561\u0577\u0561\u0580\u056a\u0565\u0574
+MoveRotate=\u054a\u057f\u057f\u0565\u0574 \u056f\u0565\u057f\u056b \u0577\u0578\u0582\u0580\u057b\u0568
+MoveRotate.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u0568 \u0587 \u0576\u0580\u0561 \u0577\u0578\u0582\u0580\u057b \u057a\u057f\u057f\u0565\u0584 \u0585\u0562\u0575\u0565\u056f\u057f\u0568
+MovementTools=\u054f\u0565\u0572\u0561\u0577\u0561\u0580\u056a\u0565\u0580
+MultiVarStats=\u0544\u056b \u0584\u0561\u0576\u056b \u0583\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u056b \u0561\u0576\u0561\u056c\u056b\u0566
+MultiVarStats.Help=\u0538\u0576\u057f\u0580\u057e\u0561\u056e \u057d\u0575\u0578\u0582\u0576\u0565\u0580\u056b \u0569\u057e\u0565\u0580\u056b \u0565\u0580\u056f\u0578\u0582 \u056f\u0561\u0574 \u0561\u057e\u0565\u056c \u0570\u0561\u057e\u0561\u0584\u0561\u056e\u0578\u0582\u0576\u0565\u0580\u056b \u0570\u0565\u057f\u0561\u0566\u0578\u057f\u0578\u0582\u0574
+MultiVariableStatistics=\u0544\u056b \u0584\u0561\u0576\u056b \u0583\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u056b \u057d\u057f\u0561\u057f\u056b\u057d\u057f\u056b\u056f\u0561
+Name=\u0531\u0576\u0578\u0582\u0576
+NameIcon=\u0531\u0576\u0578\u0582\u0576 \u0587 \u056b\u056f\u0578\u0576
+New=\u0546\u0578\u0580
+NewWindow=\u0546\u0578\u0580 \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576
+Next=\u0540\u0561\u057b\u0578\u0580\u0564\u0568
+None=\u0548\u0579 \u0574\u056b
+NormalCurve=\u0546\u0578\u0580\u0574\u0561\u056c \u0562\u0561\u0577\u056d\u0574\u0561\u0576 \u056f\u0578\u0580
+NormalQuantilePlot=\u0546\u0578\u0580\u0574\u0561\u056c \u0584\u057e\u0561\u0576\u057f\u056b\u056c\u0576\u0565\u0580\u056b \u0563\u0580\u0561\u0586\u056b\u056f
+Normalized=\u0546\u0578\u0580\u0574\u0561\u057e\u0578\u0580\u057e\u0561\u056e
+NullHypothesis=\u0536\u0580\u0578\u0575\u0561\u056f\u0561\u0576 \u057e\u0561\u0580\u056f\u0561\u056e
+NullHypothesis.short=\u0536\u0580\u0578\u0575\u0561\u056f\u0561\u0576 \u057e\u0561\u0580\u056f\u0561\u056e
+Numeric=\u054f\u0561\u057d\u0576\u0578\u0580\u0564\u0561\u056f\u0561\u0576 \u056f\u0578\u057f\u0578\u0580\u0561\u056f
+Numeric.Help=\u0546\u0565\u0580\u056f\u0561\u0575\u0561\u0581\u0576\u0565\u0574 \u057f\u0561\u057d\u0576\u0578\u0580\u0564\u0561\u056f\u0561\u0576 \u056f\u0578\u057f\u0578\u0580\u0561\u056f\u056b \u057f\u0565\u057d\u0584\u0578\u057e
+Objects=\u0555\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580
+OneVarStats=\u0544\u0565\u056f \u0583\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u056b \u0561\u0576\u0561\u056c\u056b\u0566
+OneVarStats.Help=\u0538\u0576\u057f\u0580\u057e\u0561\u056e \u057e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580\u056b \u0569\u057e\u0561\u0575\u056b\u0576 \u0561\u0580\u056a\u0565\u0584\u0576\u0565\u0580\u056b \u0561\u0576\u0561\u056c\u056b\u0566
+OneVariable=\u0544\u0565\u056f \u0583\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576
+OneVariableInference=\u0544\u056b \u0583\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u056b \u0561\u0580\u057f\u0561\u056e\u0578\u0582\u0574
+OneVariableStatistics=\u0544\u0565\u056f \u0583\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u056b \u057d\u057f\u0561\u057f\u056b\u057d\u057f\u056b\u056f\u0561
+OnlyOpaqueFills=\u0544\u056b\u0561\u0575\u0576 \u0561\u0576\u0569\u0561\u0583\u0561\u0576\u0581 \u0576\u0565\u0580\u056f\u0578\u0582\u0574
+Opacity=\u0540\u0561\u0563\u0565\u0581\u057e\u0561\u056e\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+OpenFileFolder=\u0532\u0561\u0581\u0565\u0574 \u0586\u0561\u0575\u056c\u0565\u0580\u056b \u0569\u0572\u0569\u0561\u057a\u0561\u0576\u0561\u056f\u0568
+OpenFromWebpage=\u0532\u0561\u0581\u0565\u0574 \u057e\u0565\u0562\u056f\u0561\u0575\u0584\u056b\u0581
+OpenWebpage=\u0532\u0561\u0581\u0565\u0574 \u057e\u0565\u0562\u0567\u057b\u0568
+Operation=\u0533\u0578\u0580\u056e\u0578\u0572\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Options=\u053f\u0561\u0580\u0563\u0561\u057e\u0578\u0580\u0578\u0582\u0574\u0576\u0565\u0580
+Orthogonal=\u0548\u0582\u0572\u0572\u0561\u0570\u0561\u0575\u0561\u0581 \u0578\u0582\u0572\u056b\u0572
+Orthogonal.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u056f\u0565\u057f\u0568 \u0587 \u0578\u0582\u0572\u056b\u0572\u0568
+Other=\u0531\u0575\u056c
+OutputObjects=\u0535\u056c\u0584\u0561\u0575\u056b\u0576 \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580
+Overlay=\u054e\u0565\u0580\u0561\u0564\u0580\u0578\u0582\u0574
+OverlayFrequencyPolygon=\u054e\u0565\u0580\u0561\u0564\u0580\u057e\u0578\u0572 \u0570\u0561\u0573\u0561\u056d\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u056b \u0562\u0561\u0566\u0574\u0561\u0576\u056f\u0575\u0578\u0582\u0576
+OverlayNormalCurve=\u054e\u0565\u0580\u0561\u0564\u0580\u057e\u0578\u0572 \u0576\u0578\u0580\u0574\u0561\u056c \u056f\u0578\u0580
+Overwrite=\u054e\u0565\u0580\u0561\u0563\u0580\u0565\u0574
+Parabola=\u054a\u0561\u0580\u0561\u0562\u0578\u056c\u0561
+Parabola.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u056f\u0565\u057f\u0568 \u0587 \u057a\u0561\u0580\u0561\u0562\u0578\u056c\u056b \u0564\u056b\u0580\u0565\u056f\u057f\u0580\u056b\u057d\u0561\u0576
+Parallel=\u0536\u0578\u0582\u0563\u0561\u0570\u0565\u057c \u0578\u0582\u0572\u056b\u0572
+Parallel.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u056f\u0565\u057f\u0568 \u0587 \u0578\u0582\u0572\u056b\u0572\u0568
+Paste=\u054f\u0561\u0576\u0565\u0574 \u0574\u0578\u0582\u057f\u0584\u056b \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576
+PasteDataFromClipboard=\u0553\u0578\u056d\u0561\u0576\u0561\u056f\u0574\u0561\u0576 \u0562\u0578\u0582\u0586\u0565\u0580\u056b\u0581 \u0562\u0565\u0580\u0565\u0574 \u057f\u057e\u0575\u0561\u056c\u0576\u0565\u0580\u0568
+PasteSpecial=\u0540\u0561\u057f\u0578\u0582\u056f \u057f\u0565\u0572\u0561\u0564\u0580\u0578\u0582\u0574
+Pen=\u0544\u0561\u057f\u056b\u057f
+Pen.Help=\u0546\u056f\u0561\u0580\u0565\u0584 \u056f\u057f\u0561\u057e\u056b \u057e\u0580\u0561: \u0538\u0576\u057f\u0580\u0565\u0584 \u0561\u0575\u056c \u0563\u0578\u0580\u056e\u056b\u0584` \u0561\u057e\u0561\u0580\u057f\u0565\u056c\u0578\u0582 \u0570\u0561\u0574\u0561\u0580:
+Perspective.AlgebraAndGraphics=\u0540\u0561\u0576\u0580\u0561\u0570\u0561\u0577\u056b\u057e \u0587 \u0563\u0580\u0561\u0586\u056b\u056f\u0576\u0565\u0580
+Perspective.BasicGeometry=\u054f\u0561\u0580\u0580\u0561\u056f\u0561\u0576 \u0565\u0580\u056f\u0580\u0561\u0579\u0561\u0583\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Perspective.CASAndGraphics=CAS \u0587 \u0563\u0580\u0561\u0586\u056b\u056f\u0576\u0565\u0580
+Perspective.Geometry=\u0535\u0580\u056f\u0580\u0561\u0579\u0561\u0583\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Perspective.Primary=\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576
+Perspective.TableAndGraphics=\u0531\u0572\u0575\u0578\u0582\u057d\u0561\u056f\u0576\u0565\u0580 \u0587 \u0563\u0580\u0561\u0586\u056b\u056f\u0576\u0565\u0580
+Perspective.Whiteboard=\u0533\u0580\u0561\u057f\u0561\u056d\u057f\u0561\u056f
+Perspectives=\u0535\u0576\u0569\u0561\u0562\u0561\u056a\u056b\u0576\u0576\u0565\u0580
+Point=\u0546\u0578\u0580 \u056f\u0565\u057f
+Point.Help=\u054d\u0565\u0572\u0574\u0565\u0584 \u056f\u057f\u0561\u057e\u056b \u056f\u0561\u0574 \u056f\u0578\u0580\u056b \u057e\u0580\u0561
+PointCapturing=\u053f\u0565\u057f\u0565\u0580\u056b \u056f\u0561\u057a\u0578\u0582\u0574\u0568
+PointInside=\u053f\u0565\u057f \u057f\u056b\u0580\u0578\u0582\u0575\u0569\u056b \u0576\u0565\u0580\u057d\u0578\u0582\u0574
+PointMenu=\u053f\u0565\u057f
+PointOnObject=\u053f\u0565\u057f \u0585\u0562\u0575\u0565\u056f\u057f\u056b \u057e\u0580\u0561
+PointOnObject.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u0585\u0562\u0575\u0565\u056f\u057f\u0568 \u056f\u0561\u0574 \u0576\u0580\u0561 \u057a\u0561\u0580\u0561\u0563\u056b\u056e\u0568, \u056f\u0565\u057f \u057d\u057f\u0565\u0572\u056e\u0565\u056c\u0578\u0582 \u0570\u0561\u0574\u0561\u0580
+PointStyle=\u053f\u0565\u057f\u056b \u0578\u0573\u0568
+PointTools=\u053f\u0565\u057f\u0565\u0580
+Polar=\u0532\u0587\u0565\u057c\u0561\u0575\u056b\u0576
+PolarDiameter=\u054a\u0578\u056c\u0575\u0561\u0580
+PolarDiameter.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u056f\u0565\u057f \u056f\u0561\u0574 \u0578\u0582\u0572\u056b\u0572, \u0570\u0565\u057f\u0578` \u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e \u056f\u0561\u0574 \u056f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569
+PolyLine=\u0532\u0565\u056f\u0575\u0561\u056c
+PolyLine.Help=\u0546\u0577\u0565\u0584 \u0562\u0578\u056c\u0578\u0580 \u0563\u0561\u0563\u0561\u0569\u0576\u0565\u0580\u0568, \u0570\u0565\u057f\u0578 \u0576\u0578\u0580\u056b\u0581 \u0561\u057c\u0561\u057b\u056b\u0576\u0568
+Polygon=\u0532\u0561\u0566\u0574\u0561\u0576\u056f\u0575\u0578\u0582\u0576
+Polygon.Help=\u0540\u0565\u0580\u0569\u0578\u057e \u0576\u0577\u0565\u0584 \u0562\u0578\u056c\u0578\u0580 \u0563\u0561\u0563\u0561\u0569\u0576\u0565\u0580\u0568, \u0570\u0565\u057f\u0578 \u0576\u0578\u0580\u056b\u0581 \u0561\u057c\u0561\u057b\u056b\u0576\u0568
+PolygonTools=\u0532\u0561\u0566\u0574\u0561\u0576\u056f\u0575\u0578\u0582\u0576\u0576\u0565\u0580
+Polynomial=\u0532\u0561\u0566\u0574\u0561\u0576\u0564\u0561\u0574\u0561\u0575\u056b\u0576
+Portrait=\u0533\u0580\u0584\u056b \u0576\u0574\u0561\u0576
+Power=\u0531\u057d\u057f\u056b\u0573\u0561\u0576\u0561\u0575\u056b\u0576
+Preview=\u0546\u0561\u056d\u0576\u0561\u056f\u0561\u0576 \u0564\u056b\u057f\u0578\u0582\u0574
+Print=\u054f\u057a\u0565\u0574
+PrintPreview=\u0546\u0561\u056d\u0576\u0561\u056f\u0561\u0576 \u0564\u056b\u057f\u0578\u0582\u0574
+Prism=\u0540\u0561\u057f\u057e\u0561\u056e\u0561\u056f\u0578\u0572\u0574
+Probability=\u0540\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+ProbabilityCalculator=\u0540\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u056b \u0570\u0561\u0577\u057e\u056b\u0579
+ProbabilityCalculator.Help=\u0540\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u0568 \u0570\u0561\u0577\u057e\u0565\u056c\u0578\u0582 \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576
+Properties.Algebra=\u0540\u0561\u0576\u0580\u0561\u0570\u0561\u0577\u056b\u057e
+Properties.Basic=\u0540\u056b\u0574\u0576\u0561\u056f\u0561\u0576
+Properties.Position=\u0534\u056b\u0580\u0584
+Properties.Style=\u0548\u0573
+Radiant=\u054c\u0561\u0564\u056b\u0561\u0576
+Ray=\u0543\u0561\u057c\u0561\u0563\u0561\u0575\u0569 \u0565\u0580\u056f\u0578\u0582 \u056f\u0565\u057f\u0578\u057e
+Ray.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u0573\u0561\u057c\u0561\u0563\u0561\u0575\u0569\u056b \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0565\u057f\u0576 \u0578\u0582 \u0574\u056b \u056f\u0565\u057f \u0576\u0580\u0561 \u057e\u0580\u0561
+Recent=\u054e\u0565\u0580\u057b\u0565\u0580\u057d \u0563\u0578\u0580\u056e\u0561\u0580\u056f\u057e\u0561\u056e\u0576\u0565\u0580\u0568
+RecomputeAllViews=\u0540\u0561\u0577\u057e\u0565\u0574 \u0576\u0578\u0580\u056b\u0581
+RecordToSpreadsheet=\u0533\u0580\u0565\u0574 \u0561\u0572\u0575\u0578\u0582\u057d\u0561\u056f\u0578\u0582\u0574
+RecordToSpreadsheet.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u0585\u0562\u0575\u0565\u056f\u057f, \u0570\u0565\u057f\u0578 \u0583\u0578\u0583\u0578\u056d\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580 \u0561\u0580\u0565\u0584
+RecoveryCancel=\u0538\u0576\u0564\u0570\u0561\u057f\u0565\u0574
+RecoveryCancelQuestion=\u054e\u057d\u057f\u0561\u055e\u0570 \u0565\u0584, \u0578\u0580 \u0578\u0582\u0566\u0578\u0582\u0574 \u0565\u0584 \u0564\u0561\u0564\u0561\u0580\u0565\u0581\u0576\u0565\u056c \u057e\u0565\u0580\u0561\u056f\u0561\u0576\u0563\u0576\u0574\u0561\u0576 \u057a\u0580\u0578\u0581\u0565\u057d\u0568: \u0549\u057a\u0561\u0570\u057e\u0561\u056e \u0586\u0561\u0575\u056c\u0565\u0580\u0568 \u056f\u056f\u0578\u0580\u0565\u0576:
+RecoveryOpen=\u0532\u0561\u0581\u0565\u0574
+RecoverySave=\u054a\u0561\u0570\u0565\u0574
+RecoveryText=\u0533\u0565\u0578\u0533\u0565\u0562\u0580\u0561\u0575\u056b \u0570\u0565\u057f\u0587\u0575\u0561\u056c \u0586\u0561\u0575\u056c\u0565\u0580\u0568 \u056f\u0561\u0580\u0578\u0572 \u0565\u0576 \u057e\u0565\u0580\u0561\u056f\u0561\u0576\u0563\u0576\u057e\u0565\u056c
+RecoveryTitle=\u054e\u0565\u0580\u0561\u056f\u0561\u0576\u0563\u0576\u0565\u0574 \u0570\u0561\u0574\u0561\u056f\u0561\u0580\u0563\u0568
+Red=\u053f\u0561\u0580\u0574\u056b\u0580
+Redo=\u0535\u057f \u0562\u0565\u0580\u0565\u0574
+Refresh=\u0539\u0561\u0580\u0574\u0561\u0581\u0576\u0565\u0574
+RegressionAnalysis=\u054c\u0565\u0563\u0580\u0565\u057d\u056b\u0578\u0576 \u0561\u0576\u0561\u056c\u056b\u0566
+RegressionInference=\u054c\u0565\u0563\u0580\u0565\u057d\u056b\u0578\u0576 \u0565\u056c\u0584
+RegressionModel=\u054c\u0565\u0563\u0580\u0565\u057d\u056b\u0578\u0576 \u0574\u0578\u0564\u0565\u056c
+RegularPolygon=\u053f\u0561\u0576\u0578\u0576\u0561\u057e\u0578\u0580 \u0562\u0561\u0566\u0574\u0561\u0576\u056f\u0575\u0578\u0582\u0576
+RegularPolygon.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u0565\u0580\u056f\u0578\u0582 \u0563\u0561\u0563\u0561\u0569\u0568 \u0587 \u057f\u057e\u0565\u0584 \u0562\u0578\u056c\u0578\u0580 \u0563\u0561\u0563\u0561\u0569\u0576\u0565\u0580\u056b \u0569\u056b\u057e\u0568
+Relation=\u0540\u0561\u0574\u0565\u0574\u0561\u057f\u0565\u0574
+Relation.Help=\u0546\u0577\u0565\u0584 \u0565\u0580\u056f\u0578\u0582 \u0585\u0562\u0575\u0565\u056f\u057f
+Relative=\u0540\u0561\u0580\u0561\u0562\u0565\u0580\u0561\u056f\u0561\u0576
+RemoveLineBreaks=\u054e\u0565\u0580\u0561\u0581\u0576\u0565\u0574 \u056d\u0566\u0578\u0582\u0574\u0576\u0565\u0580\u0568
+RemoveTrace=\u0548\u0582\u057d\u0578\u0582\u0574\u0576\u0561\u057d\u056b\u0580\u057e\u0578\u0572 \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f\u056b\u0581 \u0585\u0562\u0575\u0565\u056f\u057f \u057b\u0576\u057b\u0565\u0574
+Rename=\u054e\u0565\u0580\u0561\u0576\u057e\u0561\u0576\u0565\u0574
+ReplaceAll=\u054f\u0565\u0572\u0561\u0577\u0561\u0580\u056a\u0565\u0574 \u0562\u0578\u056c\u0578\u0580 \u057e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580\u0568
+RequireEquals=\u0534\u0580\u0565\u0584 "=" \u0576\u0577\u0561\u0576\u0568 \u0570\u0580\u0561\u0574\u0561\u0576\u0576\u0565\u0580\u056b\u0581 \u0561\u057c\u0561\u057b
+Result=\u0531\u0580\u0564\u0575\u0578\u0582\u0576\u0584
+ReturnAngleInverseTrig=\u0540\u0561\u056f\u0561\u0564\u0561\u0580\u0571 \u0565\u057c\u0561\u0576\u056f\u0575\u0578\u0582\u0576\u0561\u0579\u0561\u0583\u0561\u056f\u0561\u0576 \u0586\u0578\u0582\u0576\u056f\u0581\u056b\u0561\u0576\u0565\u0580\u056b\u0581 \u0561\u0576\u056f\u0575\u0578\u0582\u0576 \u057e\u0565\u0580\u0561\u0564\u0561\u0580\u0571\u0576\u0565\u0574
+RightAngleStyle=\u0548\u0582\u0572\u056b\u0572 \u0561\u0576\u056f\u0575\u0578\u0582\u0576
+RightProb=\u0531\u057b\u0561\u056f\u0578\u0572\u0574\u0575\u0561\u0576
+RigidPolygon=\u053f\u0578\u0577\u057f \u0562\u0561\u0566\u0574\u0561\u0576\u056f\u0575\u0578\u0582\u0576
+RigidPolygon.Help=\u0546\u0577\u0565\u0584 \u0562\u0578\u056c\u0578\u0580 \u0563\u0561\u0563\u0561\u0569\u0576\u0565\u0580\u0568, \u0570\u0565\u057f\u0578 \u0576\u0578\u0580\u056b\u0581 \u0561\u057c\u0561\u057b\u056b\u0576\u0568
+RootsAndFractions=\u0531\u0580\u0574\u0561\u057f\u0576\u0565\u0580 \u0587 \u056f\u0578\u057f\u0578\u0580\u0561\u056f\u0576\u0565\u0580
+RotateByAngle=\u053f\u0565\u057f\u056b \u0577\u0578\u0582\u0580\u057b \u057a\u057f\u0578\u0582\u0575\u0575\u057f \u0568\u057d\u057f \u0561\u0576\u056f\u0575\u0561\u0576
+RotateByAngle.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u0585\u0562\u0575\u0565\u056f\u057f\u0568, \u057a\u057f\u057f\u0574\u0561\u0576 \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u0576 \u0578\u0582 \u0574\u0578\u0582\u057f\u0584\u0561\u0563\u0580\u0565\u0584 \u057a\u057f\u057f\u0574\u0561\u0576 \u0561\u0576\u056f\u0575\u0578\u0582\u0576\u0568
+RotateView=\u054a\u057f\u057f\u0565\u0574 \u0563\u056e\u0561\u0563\u056b\u0580\u0568
+RotateView.Help=\u0547\u0561\u0580\u056a\u0565\u0584 \u0574\u056f\u0576\u056b\u056f\u0568` \u057d\u0565\u0572\u0574\u0561\u056e \u057a\u0561\u0570\u0565\u056c\u0578\u057e \u0571\u0561\u056d \u056f\u0578\u0573\u0561\u056f\u0568
+Rounding=\u053f\u056c\u0578\u0580\u0561\u0581\u0578\u0582\u0574
+RowHeader=\u054f\u0578\u0572\u056b \u057e\u0565\u0580\u0576\u0561\u0563\u056b\u0580
+RowLimit=\u054f\u0578\u0572\u0565\u0580\u056b \u057d\u0561\u0570\u0574\u0561\u0576\u0561\u0583\u0561\u056f\u0578\u0582\u0574
+RowOrder=\u054f\u0578\u0572\u056b \u056f\u0561\u0580\u0563
+Sample1=\u0555\u0580\u056b\u0576\u0561\u056f 1
+Sample2=\u0555\u0580\u056b\u0576\u0561\u056f 2
+Saturation=\u0540\u0561\u0563\u0565\u0581\u057e\u0561\u056e\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Save=\u054a\u0561\u0570\u0565\u0574
+SaveAs=\u054a\u0561\u0570\u0565\u0574 \u0578\u0580\u057a\u0565\u057d
+SaveCurrentFileQuestion=\u054a\u0561\u0570\u0565\u055e\u0574 \u0583\u0578\u0583\u0578\u056d\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u0568
+SaveCurrentPerspective=\u054a\u0561\u0570\u0565\u0574 \u0578\u0580\u057a\u0565\u057d \u0565\u0576\u0569\u0561\u0562\u0561\u056a\u056b\u0576
+SavePrintUndo=\u0539\u0578\u0582\u0575\u056c \u057f\u0561\u0574 \u057a\u0561\u0570\u0565\u056c, \u057f\u057a\u0565\u056c \u0587 \u0579\u0565\u0572\u0575\u0561\u056c \u0570\u0561\u0574\u0561\u0580\u0565\u056c
+SaveToXML=\u054a\u0561\u0570\u0565\u0574 \u0578\u0580\u057a\u0565\u057d XML
+Scatterplot=\u0551\u0580\u0574\u0561\u0576 \u0563\u0580\u0561\u0586\u056b\u056f
+Segment=\u0540\u0561\u057f\u057e\u0561\u056e \u0568\u057d\u057f \u0565\u0580\u056f\u0578\u0582 \u056f\u0565\u057f\u056b
+Segment.Help=\u0546\u0577\u0565\u0584 \u0570\u0561\u057f\u057e\u0561\u056e\u056b \u056e\u0561\u0575\u0580\u0561\u056f\u0565\u057f\u0565\u0580\u0568
+SegmentFixed=\u054f\u0580\u057e\u0561\u056e \u0565\u0580\u056f\u0561\u0580\u0578\u0582\u0569\u0575\u0561\u0576 \u0570\u0561\u057f\u057e\u0561\u056e
+SegmentFixed.Help=\u0546\u0577\u0565\u0584 \u0570\u0561\u057f\u057e\u0561\u056e\u056b \u056e\u0561\u0575\u0580\u0561\u056f\u0565\u057f\u0565\u0580\u056b\u0581 \u0574\u0565\u056f\u0568 \u0587 \u0574\u0578\u0582\u057f\u0584\u0561\u0563\u0580\u0565\u0584 \u0576\u0580\u0561 \u0565\u0580\u056f\u0561\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+Select=\u0538\u0576\u057f\u0580\u0565\u0584 \u0585\u0562\u0575\u0565\u056f\u057f\u0568
+Select.Help=\u054d\u0565\u0572\u0574\u0565\u0584 \u0585\u0562\u0575\u0565\u056f\u057f\u056b \u057e\u0580\u0561, \u0578\u0580\u057a\u0565\u057d\u0566\u056b \u0568\u0576\u057f\u0580\u0565\u0584 \u0561\u0575\u0576
+SelectACurve=\u0538\u0576\u057f\u0580\u0565\u0584 \u056f\u0578\u0580\u0568
+SelectAll=\u0538\u0576\u057f\u0580\u0565\u0574 \u0561\u0574\u0565\u0576 \u056b\u0576\u0579
+SelectAnObjectToTrace=\u0540\u0565\u057f\u0587\u0565\u056c\u0578\u0582 \u0570\u0561\u0574\u0561\u0580 \u0585\u0562\u0575\u0565\u056f\u057f \u0568\u0576\u057f\u0580\u0565\u0584
+SelectAncestors=\u0538\u0576\u057f\u0580\u0565\u0574 \u056e\u0576\u0578\u0572\u0576\u0565\u0580\u056b\u0576
+SelectCurrentLayer=\u0538\u0576\u057f\u0580\u0565\u0574 \u0568\u0576\u0569\u0561\u0581\u056b\u056f \u0577\u0565\u0580\u057f\u0568
+SelectDescendants=\u0538\u0576\u057f\u0580\u0565\u0574 \u056a\u0561\u057c\u0561\u0576\u0563\u0576\u0565\u0580\u056b\u0576
+Semicircle=\u053f\u056b\u057d\u0561\u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e \u0565\u0580\u056f\u0578\u0582 \u056f\u0565\u057f\u0578\u057e
+Semicircle.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u056f\u056b\u057d\u0561\u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056e\u056b \u057f\u0580\u0561\u0574\u0561\u0563\u056e\u056b \u056e\u0561\u0575\u0580\u0561\u056f\u0565\u057f\u0565\u0580\u0568
+Semicolon=\u053f\u0565\u057f-\u057d\u057f\u0578\u0580\u0561\u056f\u0565\u057f
+Separator=\u0532\u0561\u056a\u0561\u0576\u0561\u0580\u0561\u0580_\u0533\u056b\u056e
+SetToCurrentLocation=\u0531\u0576\u0581\u0576\u0565\u0574 \u0568\u0576\u0569\u0561\u0581\u056b\u056f \u056f\u0561\u057f\u0561\u056c\u0578\u0563
+Settings=\u053f\u0561\u0580\u0563\u0561\u057e\u0578\u0580\u0578\u0582\u0574\u0576\u0565\u0580
+Settings.ResetDefault=\u054e\u0565\u0580\u0561\u056f\u0561\u0576\u0563\u0576\u0565\u0574 \u0576\u0561\u056d\u0576\u0561\u056f\u0561\u0576 \u056f\u0561\u0580\u0563\u0561\u057e\u0578\u0580\u0578\u0582\u0574\u0576\u0565\u0580\u0568
+Settings.Save=\u054a\u0561\u0570\u0565\u0574 \u056f\u0561\u0580\u0563\u0561\u057e\u0578\u0580\u0578\u0582\u0574\u0576\u0565\u0580\u0568
+Share=\u054f\u0561\u0580\u0561\u056e\u0565\u0574
+Show=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574
+ShowAtTop=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u057e\u0565\u0580\u0587\u0578\u0582\u0574
+ShowAxesGrid=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0561\u057c\u0561\u0576\u0581\u0584\u0576\u0565\u0580\u0568/\u0551\u0561\u0576\u0581\u0568
+ShowCheckBox=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574/\u0569\u0561\u0584\u0581\u0576\u0565\u0574
+ShowCheckBox.Help=\u054d\u0565\u0572\u0574\u0565\u0584 \u056f\u057f\u0561\u057e\u056b \u057e\u0580\u0561 \u0564\u0580\u0578\u0577\u0561\u056f \u057d\u057f\u0565\u0572\u056e\u0565\u056c\u0578\u0582 \u0570\u0561\u0574\u0561\u0580
+ShowColumnHeader=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u057d\u0575\u0578\u0582\u0576\u0565\u0580\u056b \u057e\u0565\u0580\u0576\u0561\u0563\u0580\u0565\u0580\u0568
+ShowCornerCoordinates=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0561\u0576\u056f\u0575\u0578\u0582\u0576\u0561\u0575\u056b\u0576 \u056f\u0578\u0578\u0580\u0564\u056b\u0576\u0561\u057f\u0576\u0565\u0580\u0568
+ShowData=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u057f\u057e\u0575\u0561\u056c\u0576\u0565\u0580\u0568
+ShowFileBrowser=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u056e\u0561\u057c\u0568
+ShowGridlines=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0581\u0561\u0576\u0581\u0568
+ShowHide=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574/\u0569\u0561\u0584\u0581\u0576\u0565\u0574 \u0585\u0562\u0575\u0565\u056f\u057f\u0568
+ShowHideLabel=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574/\u0569\u0561\u0584\u0581\u0576\u0565\u0574 \u0576\u0577\u0561\u0576\u0561\u056f\u0578\u0582\u0574\u0568
+ShowHideLabel.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u0585\u0562\u0575\u0565\u056f\u057f\u0568
+ShowHideLabels=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574/\u0569\u0561\u0584\u0581\u0576\u0565\u0574 \u0576\u0577\u0561\u0576\u0561\u056f\u0578\u0582\u0574\u0576\u0565\u0580\u0568
+ShowHideObject=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574/\u0569\u0561\u0584\u0581\u0576\u0565\u0574 \u0585\u0562\u0575\u0565\u056f\u057f\u0568
+ShowHideObject.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u0568, \u0570\u0565\u057f\u0578 \u0583\u0578\u056d\u0565\u0584 \u0563\u0578\u0580\u056e\u056b\u0584\u0568 \u0578\u0580\u057a\u056b\u057d\u0566\u056b \u0569\u0561\u0584\u0581\u0576\u0565\u0584 \u0564\u0580\u0561\u0576\u0584
+ShowHorizontalScrollbars=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0570\u0578\u0580\u056b\u0566\u0578\u0576\u0561\u056f\u0561\u0576 \u057d\u0578\u0572\u0576\u0561\u056f\u0576\u0565\u0580\u0568
+ShowInToolBar=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0563\u0578\u0580\u056e\u056b\u0584\u0576\u0565\u0580\u056b \u057e\u0561\u0570\u0561\u0576\u0561\u056f\u0578\u0582\u0574
+ShowInputField=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0574\u0578\u0582\u057f\u0584\u056b \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576\u0568
+ShowMenuBar=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0574\u0565\u0576\u0575\u0578\u0582\u0576\u0565\u0580\u0568
+ShowMouseCoordinates=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0574\u056f\u0576\u056b\u056f\u056b \u0581\u0578\u0582\u0581\u056b\u0579\u056b \u056f\u0578\u0578\u0580\u0564\u056b\u0576\u0561\u057f\u0576\u0565\u0580\u0568
+ShowPlot2=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0565\u0580\u056f\u0580\u0578\u0580\u0564 \u0563\u0580\u0561\u0586\u056b\u056f\u0568
+ShowResetIcon=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0563\u056e\u0561\u0563\u056b\u0580\u0568 \u0576\u0561\u056d\u0576\u0561\u056f\u0561\u0576 \u057e\u056b\u0573\u0561\u056f\u056b \u057e\u0565\u0580\u0561\u0564\u0561\u0580\u0571\u0576\u0578\u0572 \u056f\u0578\u0573\u0561\u056f\u0568
+ShowRowHeader=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u057f\u0578\u0572\u0565\u0580\u056b \u057e\u0565\u0580\u0576\u0561\u0563\u0580\u0565\u0580\u0568
+ShowStatistics=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u057d\u057f\u0561\u057f\u056b\u057d\u057f\u056b\u056f \u057f\u057e\u0575\u0561\u056c\u0576\u0565\u0580\u0568
+ShowToolBar=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0563\u0578\u0580\u056e\u056b\u0584\u0576\u0565\u0580\u056b \u057e\u0561\u0570\u0561\u0576\u0561\u056f\u0568
+ShowToolBarHelp=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0585\u0563\u0576\u0578\u0582\u0569\u0575\u0561\u0576 \u057e\u0561\u0570\u0561\u0576\u0561\u056f\u0568
+ShowVerticalScrollbars=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0578\u0582\u0572\u0572\u0561\u0571\u056b\u0563 \u057d\u0578\u0572\u0576\u0561\u056f\u0576\u0565\u0580\u0568
+Sin=\u054d\u056b\u0576\u0578\u0582\u057d\u0578\u056b\u0564\u0561\u056c
+SingleFile=\u0544\u0565\u056f \u0586\u0561\u0575\u056c
+SingleFileTabs=\u0544\u0565\u056f \u0586\u0561\u0575\u056c (Tabs)
+Slider=\u054d\u0578\u0572\u0576\u0561\u056f
+Slider.Help=\u054d\u0578\u0572\u0576\u0561\u056f \u057d\u057f\u0565\u0572\u056e\u0565\u056c\u0578\u0582 \u0570\u0561\u0574\u0561\u0580 \u057d\u0565\u0572\u0574\u0565\u0584 \u056f\u057f\u0561\u057e\u056b \u057e\u0580\u0561
+Slope=\u0548\u0582\u0572\u0572\u056b \u0569\u0565\u0584\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Slope.Help=\u0548\u0582\u0572\u056b\u0572
+SnapToGrid=\u053f\u0561\u057a\u0565\u0574 \u0581\u0561\u0576\u0581\u056b\u0576
+SnapToObjects=\u053f\u0561\u057a\u0565\u056c \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u056b\u0576
+SnapToPoints=\u053f\u0561\u057a\u0565\u0574 \u056f\u0565\u057f\u0565\u0580\u056b\u0576
+Solution=\u053c\u0578\u0582\u056e\u0578\u0582\u0574
+Solution.Help=\u0533\u057f\u0576\u0565\u0574 \u0574\u0565\u056f \u056f\u0561\u0574 \u0574\u056b \u0584\u0561\u0576\u056b \u0570\u0561\u057e\u0561\u057d\u0561\u0580\u0578\u0582\u0574\u0576\u0565\u0580\u056b \u056c\u0578\u0582\u056e\u0578\u0582\u0574\u0568
+Solve=\u053c\u0578\u0582\u056e\u0565\u0574
+Solve.Help=\u0533\u057f\u0576\u0565\u0574 \u0570\u0561\u057e\u0561\u057d\u0561\u0580\u0574\u0561\u0576 \u0574\u0565\u056f \u056f\u0561\u0574 \u0574\u056b \u0584\u0561\u0576\u056b \u056c\u0578\u0582\u056e\u0578\u0582\u0574
+Sort=\u054f\u0565\u057d\u0561\u056f\u0561\u057e\u0578\u0580\u0565\u0574 \u057e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580\u0568
+Sort.Help=\u054f\u0565\u057d\u0561\u056f\u0561\u057e\u0578\u0580\u0574\u0561\u0576 \u0570\u0561\u0574\u0561\u0580 \u0568\u0576\u057f\u0580\u0565\u0584 \u057e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580\u0568
+SortBy=\u054f\u0565\u057d\u0561\u056f\u0561\u057e\u0578\u0580\u0565\u0574 \u0568\u057d\u057f
+Space=\u0532\u0561\u0581\u0561\u056f(\u054a\u0580\u0578\u0562\u0565\u056c)
+SpaceBetweenThousands=\u054a\u0580\u0578\u0562\u0565\u056c (\u0562\u0561\u0581\u0561\u0580\u056f)\u0570\u0561\u0566\u0561\u0580\u0575\u0561\u056f\u0576\u0565\u0580\u056b \u0574\u056b\u057b\u0587
+Spacing=\u0547\u057f\u0580\u056b\u056d\u0561\u057e\u0578\u0580\u0574\u0561\u0576 \u0584\u0561\u0575\u056c\u0568
+SpecialLineTools=\u0540\u0561\u057f\u0578\u0582\u056f \u0563\u056e\u0565\u0580
+SpecialObjectTools=\u0540\u0561\u057f\u0578\u0582\u056f \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580 \u056f\u0561\u0574 \u0570\u0580\u0561\u0574\u0561\u0576\u0576\u0565\u0580
+Sphere2=\u0533\u0576\u0564\u0561\u0575\u056b\u0576 \u0574\u0561\u056f\u0565\u0580\u0587\u0578\u0582\u0575\u0569 \u0568\u057d\u057f \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u056b \u0578\u0582 \u056f\u0565\u057f\u056b
+Sphere2.Help=\u0546\u0577\u0565\u0584 \u0563\u0576\u0564\u0561\u0575\u056b\u0576 \u0574\u0561\u056f\u0565\u0580\u0587\u0578\u0582\u0575\u0569\u056b \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u0568, \u0570\u0565\u057f\u0578 \u056f\u0565\u057f \u0576\u0580\u0561 \u057e\u0580\u0561
+SpherePointRadius=\u0533\u0576\u0564\u0561\u0575\u056b\u0576 \u0574\u0561\u056f\u0565\u0580\u0587\u0578\u0582\u0575\u0569 \u0568\u057d\u057f \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u056b \u0578\u0582 \u0577\u0561\u057c\u0561\u057e\u0572\u056b
+SpherePointRadius.Help=\u0546\u0577\u0565\u0584 \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u0576 \u0578\u0582 \u0574\u0578\u0582\u057f\u0584\u0561\u0563\u0580\u0565\u0584 \u0577\u0561\u057c\u0561\u057e\u0572\u0568
+Split=\u0531\u0576\u057b\u0561\u057f\u0565\u0574 \u057d\u0575\u0578\u0582\u0576\u0565\u0580\u056b \u057e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580\u0568
+Split.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u0562\u0561\u056a\u0561\u0576\u0565\u056c\u0578\u0582 \u057d\u0575\u0578\u0582\u0576\u0565\u0580\u0568
+SpreadsheetOptions=\u0531\u0572\u0575\u0578\u0582\u057d\u0561\u056f\u056b \u056f\u0561\u0580\u0563\u0561\u057e\u0578\u0580\u0578\u0582\u0574\u0576\u0565\u0580
+Stack=\u054d\u0575\u0578\u0582\u0576\u0565\u0580\u056b \u057e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580\u056b \u056d\u0578\u0582\u0580\u0571
+Stack.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u057d\u0575\u0578\u0582\u0576\u0565\u0580 \u056d\u0580\u0571\u056b \u0570\u0561\u0574\u0561\u0580
+StandardError=\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f \u057d\u056d\u0561\u056c
+Start=\u0544\u0565\u056f\u0576\u0561\u0580\u056f
+StartRow=\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u057f\u0578\u0572
+Statistics=\u054d\u057f\u0561\u057f\u056b\u057d\u057f\u056b\u056f \u057f\u057e\u0575\u0561\u056c\u0576\u0565\u0580
+Statistics2=\u054d\u057f\u0561\u057f\u056b\u057d\u057f\u056b\u056f \u057f\u057e\u0575\u0561\u056c\u0576\u0565\u0580 2
+Step=\u0554\u0561\u0575\u056c
+Substitute=\u0553\u0578\u056d\u0561\u0580\u056b\u0576\u0578\u0582\u0574
+Substitute.Help=\u0553\u0578\u056d\u0561\u0580\u056b\u0576\u0578\u0582\u0574 \u0567 \u0561\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0561\u0576 \u0574\u0561\u057d\u0568
+SubstituteDialog=\u0553\u0578\u056d\u0561\u0580\u056b\u0576\u0574\u0561\u0576 \u0564\u056b\u0561\u056c\u0578\u0563\u0561\u0575\u056b\u0576 \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576
+SumCells=\u0533\u0578\u0582\u0574\u0561\u0580
+SumCells.Help=\u0546\u0577\u0565\u0584 \u057e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580\u056b \u056d\u0578\u0582\u0574\u0562\u0568
+SumsAndIntegrals=\u0533\u0578\u0582\u0574\u0561\u0580\u0576\u0565\u0580 \u0587 \u056b\u0576\u057f\u0565\u0563\u0580\u0561\u056c\u0576\u0565\u0580
+Symbol.And=\u0535\u057e
+Symbol.Angle=\u0531\u0576\u056f\u0575\u0578\u0582\u0576
+Symbol.AngleMeasure=\u0531\u0576\u056f\u0575\u0561\u0576 \u0579\u0561\u0583\u0568
+Symbol.BooleanEqual=\u054d\u057f\u0578\u0582\u0563\u0565\u0574 \u0570\u0561\u057e\u0561\u057d\u0561\u0580 \u056c\u056b\u0576\u0565\u056c\u0568
+Symbol.Cube=\u053d\u0578\u0580\u0561\u0576\u0561\u0580\u0564
+Symbol.Degree=\u0531\u057d\u057f\u056b\u0573\u0561\u0576
+Symbol.ElementOf=\u054a\u0561\u057f\u056f\u0561\u0576\u0578\u0582\u0574 \u0567
+Symbol.GreaterThanEqualTo=\u0544\u0565\u056e \u0567 \u056f\u0561\u0574 \u0570\u0561\u057e\u0561\u057d\u0561\u0580
+Symbol.Infinity=\u0531\u0576\u057e\u0565\u0580\u057b\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Symbol.LessThanEqualTo=\u0553\u0578\u0584\u0580 \u0567 \u056f\u0561\u0574 \u0570\u0561\u057e\u0561\u057d\u0561\u0580
+Symbol.NBSP=\u0549\u0568\u0576\u0564\u0570\u0561\u057f\u057e\u0578\u0572 \u057a\u0580\u0578\u0562\u0565\u056c (\u0562\u0561\u0581\u0561\u056f)
+Symbol.Negation=\u053a\u056d\u057f\u0578\u0582\u0574
+Symbol.NotEqual=\u0540\u0561\u057e\u0561\u057d\u0561\u0580 \u0579\u0567
+Symbol.Or=\u053f\u0561\u0574
+Symbol.Parallel=\u0536\u0578\u0582\u0563\u0561\u0570\u0565\u057c\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Symbol.Perpendicular=\u0548\u0582\u0572\u0572\u0561\u0570\u0561\u0575\u0581\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Symbol.Square=\u0554\u0561\u057c\u0561\u056f\u0578\u0582\u057d\u056b
+Symbol.StrictSubset=\u053d\u056b\u057d\u057f \u0565\u0576\u0569\u0561\u0562\u0561\u0566\u0574\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Symbol.Subset=\u0535\u0576\u0569\u0561\u0562\u0561\u0566\u0574\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Symbol.VectorProduct=\u054e\u0565\u056f\u057f\u0578\u0580\u0561\u056f\u0561\u0576 \u0561\u0580\u057f\u0561\u0564\u0580\u0575\u0561\u056c
+Symbols=\u054d\u056b\u0574\u057e\u0578\u056c\u0576\u0565\u0580
+TMeanInterval=\u0544\u056b\u057b\u056b\u0576 \u0561\u0580\u056a\u0565\u0584\u056b T \u0563\u0576\u0570\u0561\u057f\u0561\u056f\u0561\u0576
+Table=\u0531\u0572\u0575\u0578\u0582\u057d\u0561\u056f
+Tangent=\u0547\u0578\u0577\u0561\u0583\u0578\u0572
+Tangent.Help=\u0538\u0576\u057f\u0580\u0565\u0584 \u056f\u0565\u057f \u056f\u0561\u0574 \u0578\u0582\u0572\u056b\u0572, \u0570\u0565\u057f\u0578 \u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e, \u056f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569 \u056f\u0561\u0574 \u0586\u0578\u0582\u0576\u056f\u0581\u056b\u0561\u0575\u056b \u0563\u0580\u0561\u0586\u056b\u056f
+Text=\u0533\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Text.Help=\u054d\u0565\u0572\u0574\u0565\u0584 \u056f\u057f\u0561\u057e\u056b \u056f\u0561\u0574 \u056f\u0565\u057f\u056b \u057e\u0580\u0561 \u0563\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576 \u057d\u057f\u0565\u0572\u056e\u0565\u056c\u0578\u0582 \u0570\u0561\u0574\u0561\u0580
+TextFieldAction=\u0544\u0578\u0582\u057f\u0584\u0561\u0563\u0580\u0574\u0561\u0576 \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576
+TextFieldAction.Help=\u054d\u0565\u0572\u0574\u0565\u0584 \u056f\u057f\u0561\u057e\u056b \u057e\u0580\u0561 \u0574\u0578\u0582\u057f\u0584\u0561\u0563\u0580\u0574\u0561\u0576 \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576 \u0564\u0576\u0565\u056c\u0578\u0582 \u0570\u0561\u0574\u0561\u0580
+ThenBy=\u0531\u057a\u0561
+Tool=\u0533\u0578\u0580\u056e\u056b\u0584
+Tool.CreateNew=\u054d\u057f\u0565\u0572\u056e\u0565\u0574 \u0576\u0578\u0580 \u0563\u0578\u0580\u056e\u056b\u0584
+Tool.CreationSuccess=\u0533\u0578\u0580\u056e\u056b\u0584\u0568 \u0562\u0561\u0580\u0565\u0570\u0561\u057b\u0578\u0572 \u057d\u057f\u0565\u0572\u056e\u057e\u0565\u0581
+Tool.DeleteQuestion=\u053b\u0580\u0578\u055e\u0584 \u0578\u0582\u0566\u0578\u0582\u0574 \u0565\u0584 \u057b\u0576\u057b\u0565\u056c \u0568\u0576\u057f\u0580\u057e\u0561\u056e \u0563\u0578\u0580\u056e\u056b\u0584\u0568
+Tool.Manage=\u0533\u0578\u0580\u056e\u056b\u0584\u0576\u0565\u0580\u056b \u0572\u0565\u056f\u0561\u057e\u0561\u0580\u0578\u0582\u0574
+Tool.SelectObjects=\u0538\u0576\u057f\u0580\u0565\u0584 \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580 \u056f\u057f\u0561\u057e\u056b \u057e\u0580\u0561 \u056f\u0561\u0574 \u0581\u0578\u0582\u0581\u0561\u056f\u0578\u0582\u0574
+ToolHelp=\u0533\u0578\u0580\u056e\u056b\u0584\u056b \u0576\u056f\u0561\u0580\u0561\u0563\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+ToolName=\u0533\u0578\u0580\u056e\u056b\u0584\u056b \u0561\u0576\u0578\u0582\u0576\u0568
+Toolbar=\u0533\u0578\u0580\u056e\u056b\u0584\u0576\u0565\u0580\u056b \u057e\u0561\u0570\u0561\u0576\u0561\u056f
+Toolbar.Customize=\u0533\u0578\u0580\u056e\u056b\u0584\u0576\u0565\u0580\u056b \u057e\u0561\u0570\u0561\u0576\u0561\u056f\u056b \u056f\u0561\u0580\u0563\u0561\u057e\u0578\u0580\u0578\u0582\u0574
+Toolbar.ResetDefault=\u054e\u0565\u0580\u0561\u056f\u0561\u0576\u0563\u0576\u0565\u0574 \u0576\u0561\u056d\u0576\u0561\u056f\u0561\u0576 \u056f\u0561\u0580\u0563\u0561\u057e\u0578\u0580\u0578\u0582\u0574\u0576\u0565\u0580\u0568
+Tools=\u0533\u0578\u0580\u056e\u056b\u0584\u0576\u0565\u0580
+Tooltip=\u0540\u0561\u0575\u057f\u0576\u057e\u0578\u0572 \u0570\u0578\u0582\u0577\u0578\u0582\u0574
+Total=\u0540\u0561\u0574\u0568\u0576\u0564\u0570\u0561\u0576\u0578\u0582\u0580
+Trace=\u0544\u056b\u0561\u0581\u0576\u0565\u0574/\u0561\u0576\u057b\u0561\u057f\u0565\u0574 \u0570\u0565\u057f\u0584\u0568
+Trace.Help=\u0546\u0577\u0565\u0584 \u0585\u0562\u0575\u0565\u056f\u057f\u0568, \u0578\u0580\u057a\u0565\u057d\u0566\u056b \u0581\u0578\u0582\u0575\u0581 \u057f\u0580\u057e\u056b \u056f\u0561\u0574 \u0569\u0561\u0584\u0581\u057e\u056b \u0576\u0580\u0561 \u0570\u0565\u057f\u0584\u0568
+TraceCopy=\u053f\u0580\u056f\u0576\u0585\u0580\u056b\u0576\u0561\u056f\u0565\u0574 \u0570\u0565\u057f\u0584\u0568
+TraceToList=\u0533\u0580\u0561\u0576\u0581\u0565\u0574 \u0570\u0565\u057f\u0584\u0568
+TransformationTools=\u0541\u0587\u0561\u0583\u0578\u056d\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+TranslateByVector=\u0536\u0578\u0582\u0563\u0561\u0570\u0565\u057c \u057f\u0565\u0572\u0561\u0583\u0578\u056d\u0578\u0582\u0569\u0575\u0578\u0582\u0576 \u0568\u057d\u057f \u057e\u0565\u056f\u057f\u0578\u0580\u056b
+TranslateByVector.Help=\u0546\u0577\u0565\u0584 \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0585\u0562\u0575\u0565\u056f\u057f\u0568 \u0587 \u057f\u0565\u0572\u0561\u0583\u0578\u056d\u0574\u0561\u0576 \u057e\u0565\u056f\u057f\u0578\u0580\u0568
+TranslateView=\u054f\u0565\u0572\u0561\u0577\u0561\u0580\u056a\u0565\u0574 \u0563\u056e\u0561\u0563\u056b\u0580\u0568
+TranslateView.Help=\u054f\u0565\u0572\u0561\u0577\u0561\u0580\u056a\u0565\u0574 \u0563\u056e\u0561\u0563\u056b\u0580\u0568 \u056f\u0561\u0574 \u0561\u057c\u0561\u0576\u0581\u0584\u0568
+Transparent=\u0539\u0561\u0583\u0561\u0576\u0581\u056b\u056f\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Transpose=\u054f\u0580\u0561\u0576\u057d\u057a\u0578\u0576\u0561\u0581\u056b\u0561
+Tutorials=\u0534\u0561\u057d\u0565\u0580
+TwoVarStats=\u0535\u0580\u056f\u0578\u0582 \u0583\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u056b \u057c\u0565\u0563\u0580\u0565\u057d\u056b\u0578\u0576 \u0561\u0576\u0561\u056c\u056b\u0566
+TwoVariable=\u0535\u0580\u056f\u0578\u0582 \u0583\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576
+TwoVariableInference=\u0535\u0580\u056f\u0578\u0582 \u0583\u0578\u0583\u0578\u056d\u0561\u056f\u0561\u0576\u056b \u0561\u0580\u057f\u0561\u056e\u0578\u0582\u0574
+Type.Algebra=\u0540\u0561\u0576\u0580\u0561\u0570\u0561\u0577\u056b\u057e
+Type.CAS=CAS-\u0578\u0582\u0574 \u0585\u0563\u057f\u0561\u0563\u0578\u0580\u056e\u057e\u0578\u0572 \u0570\u0580\u0561\u0574\u0561\u0576\u0576\u0565\u0580
+Type.Chart=\u0534\u056b\u0561\u0563\u0580\u0561\u0574\u0561\u0576\u0565\u0580
+Type.Conic=\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569
+Type.DiscreteMath=\u0534\u056b\u057d\u056f\u0580\u0565\u057f \u0574\u0561\u0569\u0565\u0574\u0561\u057f\u056b\u056f\u0561
+Type.FunctionsAndCalculus=\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561\u0576\u0565\u0580 \u0587 \u0570\u0561\u0577\u057e\u0561\u0580\u056f\u0576\u0565\u0580
+Type.GeoGebra=\u0533\u0565\u0578\u0533\u0565\u0562\u0580\u0561
+Type.Geometry=\u0535\u0580\u056f\u0580\u0561\u0579\u0561\u0583\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Type.List=\u0551\u0578\u0582\u0581\u0561\u056f\u0576\u0565\u0580
+Type.Logic=\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Type.OptimizationCommands=\u0555\u057a\u057f\u056b\u0574\u056b\u0566\u0561\u0581\u056b\u0561\u0575\u056b \u0570\u0580\u0561\u0574\u0561\u0576\u0576\u0565\u0580
+Type.Probability=\u0540\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Type.Scripting=\u054d\u0581\u0565\u0576\u0561\u0580\u0576\u0565\u0580
+Type.Spreadsheet=\u0531\u0572\u0575\u0578\u0582\u057d\u0561\u056f\u0576\u0565\u0580
+Type.Statistics=\u054d\u057f\u0561\u057f\u056b\u057d\u057f\u056b\u056f\u0561
+Type.Text=\u054f\u0565\u0584\u057d\u057f
+Type.Transformation=\u0541\u0587\u0561\u0583\u0578\u056d\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Type.VectorAndMatrix=\u054e\u0565\u056f\u057f\u0578\u0580\u0576\u0565\u0580 \u0587 \u0574\u0561\u057f\u0580\u056b\u0581\u0576\u0565\u0580
+Undo=\u0549\u0565\u0572\u0575\u0561\u056c \u0570\u0561\u0574\u0561\u0580\u0565\u0574
+UngroupObjectes=\u0531\u057c\u0561\u0576\u0571\u0576\u0561\u0581\u0576\u0565\u056c \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u0568
+Untitled=\u0531\u0576\u0561\u0576\u0578\u0582\u0576
+UploadGeoGebraTube=\u054e\u0565\u0580\u0562\u0565\u057c\u0576\u0565\u0574 GeoGebraTube
+UpperLimit=\u054e\u0565\u0580\u056b\u0576 \u057d\u0561\u0570\u0574\u0561\u0576
+UpperQuartile.short=\u054e\u0565\u0580\u056b\u0576_\u0554\u057e\u0561\u0580\u057f\u056b\u056c
+UseBrowserForJS=\u0555\u0563\u057f\u0561\u0563\u0578\u0580\u056e\u0565\u0574 \u0562\u0580\u0578\u0578\u0582\u0566\u0565\u0580\u0568 JavaScript \u057d\u0581\u0565\u0576\u0561\u0580\u0576\u0565\u0580\u056b \u0570\u0561\u0574\u0561\u0580
+UseButtonsAndCheckboxes=\u0555\u0563\u057f\u0561\u0563\u0578\u0580\u056e\u0565\u0574 \u056f\u0578\u0573\u0561\u056f\u0576\u0565\u0580, \u0564\u0580\u0578\u0577\u0561\u056f\u0576\u0565\u0580
+UseHeaderRow=\u0555\u0563\u057f\u0561\u0563\u0578\u0580\u056e\u0565\u056c \u057e\u0565\u0580\u0576\u0561\u0563\u0580\u056b \u057f\u0578\u0572\u0568
+UserInterface=\u0533\u0578\u0580\u056e\u0561\u056e\u0578\u0572\u056b \u056b\u0576\u057f\u0565\u0580\u0586\u0565\u0575\u057d (\u0574\u056b\u057b\u0565\u0580\u0565\u057d)
+Value=\u0531\u0580\u056a\u0565\u0584
+Values=\u0531\u0580\u056a\u0565\u0584\u0576\u0565\u0580
+Vector=\u054e\u0565\u056f\u057f\u0578\u0580 \u0568\u057d\u057f \u0565\u0580\u056f\u0578\u0582 \u056f\u0565\u057f\u056b
+Vector.Help=\u0546\u0577\u0565\u0584 \u057e\u0565\u056f\u057f\u0578\u0580\u056b \u057d\u056f\u056b\u0566\u0562\u0576 \u0578\u0582 \u057e\u0565\u0580\u057b\u0568
+VectorFromPoint=\u053f\u0565\u057f\u056b\u0581 \u057e\u0565\u056f\u057f\u0578\u0580 \u057f\u0565\u0572\u0561\u0564\u0580\u0565\u0574
+VectorFromPoint.Help=\u0546\u0577\u0565\u0584 \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0565\u057f\u0576 \u0578\u0582 \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u057e\u0565\u056f\u057f\u0578\u0580\u0568
+VectorMenu=\u054e\u0565\u056f\u057f\u0578\u0580
+VectorPolygon=\u054e\u0565\u056f\u057f\u0578\u0580\u0561\u056f\u0561\u0576 \u0562\u0561\u0566\u0574\u0561\u0576\u056f\u0575\u0578\u0582\u0576
+VectorPolygon.Help=\u0546\u0577\u0565\u0584 \u0562\u0578\u056c\u0578\u0580 \u0563\u0561\u0563\u0561\u0569\u0576\u0565\u0580\u0568, \u0570\u0565\u057f\u0578 \u0576\u0578\u0580\u056b\u0581 \u0561\u057c\u0561\u057b\u056b\u0576\u0568
+VerticalScrollbars=\u0548\u0582\u0572\u0572\u0561\u0571\u056b\u0563 \u057d\u0578\u0572\u0576\u0561\u056f\u0576\u0565\u0580
+View=\u054f\u0565\u057d\u0584
+Views=\u0546\u0565\u0580\u056f\u0561\u0575\u0561\u0581\u0578\u0582\u0574\u0576\u0565\u0580
+VisualStyle=\u054e\u056b\u0566\u0578\u0582\u0561\u056c \u0578\u0573
+VisualStyle.Help=\u0555\u0562\u0575\u0565\u056f\u057f\u056b \u0570\u0561\u057f\u056f\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u0568 \u0583\u0578\u056d\u0565\u056c\u0578\u0582 \u0570\u0561\u0574\u0561\u0580 \u057d\u0565\u0572\u0574\u0565\u0584 \u0585\u0562\u0575\u0565\u056f\u057f\u056b \u057e\u0580\u0561 \u056f\u0561\u0574 \u0574\u056f\u0576\u056b\u056f\u056b \u056f\u0578\u0573\u0561\u056f\u0568 \u057d\u0565\u0572\u0574\u0561\u056e \u057a\u0561\u0570\u0565\u056c\u0578\u057e \u0576\u0580\u0561\u0576 \u056e\u0561\u056e\u056f\u0578\u0572 \u0578\u0582\u0572\u0572\u0561\u0576\u056f\u0575\u0578\u0582\u0576 \u057d\u057f\u0565\u0572\u056e\u0565\u0584
+Width=\u053c\u0561\u0575\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Window=\u054a\u0561\u057f\u0578\u0582\u0570\u0561\u0576
+Windows=\u054a\u0561\u057f\u0578\u0582\u0570\u0561\u0576\u0576\u0565\u0580
+WithOpacityPen=\u053f\u056b\u057d\u0561\u0569\u0561\u0583\u0561\u0576\u0581\u056b\u056f \u0563\u0578\u0582\u0575\u0576\u0565\u0580
+Zoom=\u0544\u0561\u057d\u0577\u057f\u0561\u0562
+ZoomIn=\u0544\u0565\u056e\u0561\u0581\u0576\u0565\u0574
+ZoomIn.Help=\u054d\u0565\u0572\u0574\u0565\u0584 \u0563\u056e\u0561\u0563\u0580\u056b \u0570\u0561\u0574\u0561\u057a\u0561\u057f\u0561\u057d\u056d\u0561\u0576 \u057f\u0565\u0572\u0578\u0582\u0574 \u056f\u0561\u0574 \u057a\u057f\u057f\u0565\u0584 \u0574\u056f\u0576\u056b\u056f\u056b \u0561\u0576\u057e\u056b\u056f\u0568
+ZoomOut=\u0553\u0578\u0584\u0580\u0561\u0581\u0576\u0565\u0574
+ZoomOut.Help=\u054d\u0565\u0572\u0574\u0565\u0584 \u0563\u056e\u0561\u0563\u0580\u056b \u0570\u0561\u0574\u0561\u057a\u0561\u057f\u0561\u057d\u056d\u0561\u0576 \u057f\u0565\u0572\u0578\u0582\u0574 \u056f\u0561\u0574 \u057a\u057f\u057f\u0565\u0584 \u0574\u056f\u0576\u056b\u056f\u056b \u0561\u0576\u057e\u056b\u056f\u0568
+off=\u0531\u0576\u057b\u0561\u057f\u0565\u0574
+on=\u0544\u056b\u0561\u0581\u0576\u0565\u0574
\ No newline at end of file
diff --git a/geogebra/properties/menu_is.properties b/geogebra/properties/menu_is.properties
index c0eab0b..46660af 100644
--- a/geogebra/properties/menu_is.properties
+++ b/geogebra/properties/menu_is.properties
@@ -378,8 +378,6 @@ OperationTable=A
Options=Valkostir
Orthogonal=Hornrétt lína
Orthogonal.Help=Veljið punkt og línu sem teiknuð lína á að vera hornrétt á
-OrthogonalPlane=Hornrétt plan
-OrthogonalPlane.Help=Veljið punkt og línu sem teiknað plan á að vera hornrétt á
Other=Annað
OutputObjects=Úttakshlutir
Overlay=Yfirlögn
@@ -391,8 +389,6 @@ Parabola=Fleygbogi
Parabola.Help=Veljið punkt og stýrilínu
Parallel=Samsíða lína
Parallel.Help=Veljið punkt og línu sem teiknuð lína á að vera samsíða á
-ParallelPlane=Samsíða plan
-ParallelPlane.Help=Veljið punkt og samsíða plan
Paste=Líma
PasteDataFromClipboard=Líma gögn af klemmuspjaldi
PasteSpecial=Líma gildi
@@ -404,10 +400,6 @@ Perspective.CASAndGraphics=CAS og myndagluggi
Perspective.Geometry=Rúmfræði
Perspective.TableAndGraphics=Tafla og mynd
Perspectives=Sýn
-PlanePointLine=Plan gegnum punkt og línu
-PlanePointLine.Help=Veljið punkt og línu
-PlaneThreePoint=Plan gegnum þrjá punkta
-PlaneThreePoint.Help=Veljið þrjá punkta
Point=Nýr punktur
Point.Help=Smellið á teikniborð eða á línu, fall eða feril
PointCapturing=Föngun punkts
@@ -431,8 +423,6 @@ Power=Veldi
Preview=Forsýning
Print=Prenta
PrintPreview=Forsýna útprentun
-Prism=Strendingur
-Prism.Help=Veljið marghyrning (eða punkta) og punkt á öðrum hliðarfleti
Probability=Líkur
ProbabilityCalculator=Líkindareiknivél
ProbabilityCalculator.Help=Svargluggi til að reikna líkindi
@@ -472,8 +462,6 @@ ResidualPlot=Leifarit
Result=Niðurstaða
ReturnAngleInverseTrig=Reikna horn út frá andhverfum hornaföllum
RightAngleStyle=Tákn fyrir rétt horn
-RightPrism=Réttstæður strendingur
-RightPrism.Help=Dragið marghyrning eða veljið marghyrning og sláið inn hæð
RightProb=Frá hægri
RigidPolygon=Stjarfur marghyrningur
RigidPolygon.Help=Veljið alla hornpunkta og smellið því næst á fyrsta punktinn aftur
@@ -694,8 +682,6 @@ VectorPolygon=VigraMarghyrningur
VectorPolygon.Help=Veljið alla hornpunkta og smellið síðan á fyrsta punktinn aftur
VerticalScrollbars=Lóðréttar skrunbrautir
View=Skoða
-ViewInFrontOf=Skoða fyrir framan
-ViewInFrontOf.Help=Velur sýn fyrir framan hlutinn sem smellt er á
Views=Sýnir
VisualStyle=Útlit
VisualStyle.Help=Veljið hluti eða dragið valrétthyrning til að breyta eiginleikum hluta
diff --git a/geogebra/properties/menu_it.properties b/geogebra/properties/menu_it.properties
index 0497a6c..c92e1ef 100644
--- a/geogebra/properties/menu_it.properties
+++ b/geogebra/properties/menu_it.properties
@@ -388,8 +388,6 @@ OperationTable=Tabella delle operazioni
Options=Opzioni
Orthogonal=Retta perpendicolare
Orthogonal.Help=Selezionare un punto, quindi la perpendicolare
-OrthogonalPlane=Piano perpendicolare
-OrthogonalPlane.Help=Selezionare un punto e la retta perpendicolare
Other=Altro
OutputObjects=Oggetti finali
Overlay=Sovrapponi
@@ -400,8 +398,6 @@ PairedT=T appaiati
Parabola.Help=Selezionare il fuoco, quindi la direttrice
Parallel=Retta parallela
Parallel.Help=Selezionare un punto, quindi la retta parallela
-ParallelPlane=Piano parallelo
-ParallelPlane.Help=Selezionare un punto e il piano parallelo
Paste=Incolla
PasteDataFromClipboard=Incolla i dati dagli Appunti
PasteSpecial=Incolla speciale
@@ -415,10 +411,6 @@ Perspective.Primary=Primaria
Perspective.TableAndGraphics=Tabella e grafici
Perspective.Whiteboard=Lavagna multimediale (LIM)
Perspectives=Raccolte strumenti
-PlanePointLine=Piano - passante per un punto e una retta
-PlanePointLine.Help=Selezionare un punto e una retta
-PlaneThreePoint=Piano - per tre punti
-PlaneThreePoint.Help=Selezionare tre punti
Point=Nuovo punto
Point.Help=Fare clic sulla Vista Grafica o su una retta, una funzione o una curva
PointCapturing=Cattura punto
@@ -442,8 +434,6 @@ Power=Potenza
Preview=Anteprima
Print=Stampa
PrintPreview=Anteprima di stampa
-Prism=Prisma
-Prism.Help=Selezionare un poligono (o dei punti) e il primo punto della seconda faccia parallela
Probability=Probabilità
ProbabilityCalculator=Calcolatore di Probabilità
ProbabilityCalculator.Help=Finestra di dialogo per il calcolo delle probabilità
@@ -483,8 +473,6 @@ ResidualPlot=Grafico dei residui
Result=Risultato
ReturnAngleInverseTrig=Restituisci l'angolo dalle funzioni trigonometriche inverse
RightAngleStyle=Stile dell'angolo retto
-RightPrism=Prisma retto
-RightPrism.Help=Trascinare un poligono, oppure selezionare un poligono e inserire l'altezza
RightProb=Destra
RigidPolygon=Poligono rigido
RigidPolygon.Help=Selezionare tutti i vertici, quindi fare clic nuovamente sul primo vertice
@@ -704,8 +692,6 @@ VectorPolygon=Poligono vettore
VectorPolygon.Help=Selezionare tutti i vertici, quindi fare clic nuovamente sul primo vertice
VerticalScrollbars=Barre di scorrimento verticali
View=Visualizza
-ViewInFrontOf=Vista frontale
-ViewInFrontOf.Help=Sposta la vista di fronte all'oggetto selezionato
Views=Viste
VisualStyle=Stile visuale
VisualStyle.Help=Fare clic sugli oggetti o tracciare un rettangolo di selezione per modificarne le proprietà
diff --git a/geogebra/properties/menu_iw.properties b/geogebra/properties/menu_iw.properties
index 020c9f9..95132c0 100644
--- a/geogebra/properties/menu_iw.properties
+++ b/geogebra/properties/menu_iw.properties
@@ -394,8 +394,6 @@ OperationTable=\u05dc\u05d5\u05d7 \u05e4\u05e2\u05d5\u05dc\u05d4
Options=\u05d0\u05e4\u05e9\u05e8\u05d5\u05d9\u05d5\u05ea
Orthogonal=\u05d0\u05e0\u05da \u05d3\u05e8\u05da \u05e0\u05e7\u05d5\u05d3\u05d4
Orthogonal.Help=\u05e0\u05e7\u05d5\u05d3\u05d4 \u05d5\u05d9\u05e9\u05e8
-OrthogonalPlane=\u05de\u05d9\u05e9\u05d5\u05e8 \u05e0\u05d9\u05e6\u05d1
-OrthogonalPlane.Help=\u05d1\u05d7\u05e8\u05d9 \u05e0\u05e7\u05d5\u05d3\u05d4 \u05d5\u05d9\u05e9\u05e8 \u05e0\u05d9\u05e6\u05d1
Other=\u05d0\u05d7\u05e8
OutputObjects=\u05e2\u05e6\u05de\u05d9 \u05e4\u05dc\u05d8
Overlay=\u05e8\u05d5\u05d1\u05d3
@@ -407,8 +405,6 @@ Parabola=\u05e4\u05e8\u05d1\u05d5\u05dc\u05d4
Parabola.Help=\u05e0\u05e7\u05d5\u05d3\u05d4 \u05d5\u05d9\u05e9\u05e8 \u05de\u05e0\u05d7\u05d4
Parallel=\u05de\u05e7\u05d1\u05d9\u05dc \u05d3\u05e8\u05da \u05e0\u05e7\u05d5\u05d3\u05d4
Parallel.Help=\u05e0\u05e7\u05d5\u05d3\u05d4 \u05d5\u05d9\u05e9\u05e8
-ParallelPlane=\u05de\u05d9\u05e9\u05d5\u05e8 \u05de\u05e7\u05d1\u05d9\u05dc
-ParallelPlane.Help=\u05d1\u05d7\u05e8\u05d9 \u05e0\u05e7\u05d5\u05d3\u05d4 \u05d5\u05de\u05d9\u05e9\u05d5\u05e8 \u05de\u05e7\u05d1\u05d9\u05dc
Paste=\u05d4\u05d3\u05d1\u05e7\u05d4
PasteDataFromClipboard=\u05d4\u05d3\u05d1\u05e7\u05ea \u05e0\u05ea\u05d5\u05e0\u05d9\u05dd \u05de\u05dc\u05d5\u05d7 \u05d2\u05d6\u05d9\u05e8\u05d9\u05dd
PasteSpecial=\u05d4\u05d3\u05d1\u05e7\u05d4 \u05de\u05d9\u05d5\u05d7\u05d3\u05ea
@@ -422,12 +418,8 @@ Perspective.Primary=\u05e2\u05d9\u05e7\u05e8\u05d9\u05ea
Perspective.TableAndGraphics=\u05d8\u05d1\u05dc\u05d4 \u05d5\u05d2\u05e8\u05e4\u05d9\u05e7\u05d4
Perspective.Whiteboard=\u05dc\u05d5\u05d7
Perspectives=\u05ea\u05e6\u05d5\u05e8\u05d5\u05ea
-PlanePointLine=\u05de\u05d9\u05e9\u05d5\u05e8 \u05d3\u05e8\u05da \u05e0\u05e7\u05d5\u05d3\u05d4 \u05d5\u05d9\u05e9\u05e8
-PlanePointLine.Help=\u05d1\u05d7\u05e8\u05d9 \u05e0\u05e7\u05d5\u05d3\u05d4 \u05d5\u05d9\u05e9\u05e8
-PlaneThreePoint=\u05de\u05d9\u05e9\u05d5\u05e8 \u05d3\u05e8\u05da \u05e9\u05dc\u05d5\u05e9 \u05e0\u05e7\u05d5\u05d3\u05d5\u05ea
-PlaneThreePoint.Help=\u05d1\u05d7\u05e8\u05d9 \u05e9\u05dc\u05d5\u05e9 \u05e0\u05e7\u05d5\u05d3\u05d5\u05ea
Point=\u05e0\u05e7\u05d5\u05d3\u05d4 \u05d7\u05d3\u05e9\u05d4
-Point.Help=\u05dc\u05d7\u05e6\u05d9\u05d9 \u05e2\u05dc \u05dc\u05d5\u05d7 \u05d4\u05e1\u05e8\u05d8\u05d5\u05d8 \u05d0\u05d5 \u05e2\u05dc \u05e7\u05d5, \u05e4\u05d5\u05e0\u05e7\u05e6\u05d9\u05d4 \u05d0\u05d5 \u05e2\u05e7\u05d5\u05de\u05d4
+Point.Help=\u05dc\u05d7\u05e6\u05d9 \u05e2\u05dc \u05dc\u05d5\u05d7 \u05d4\u05e1\u05e8\u05d8\u05d5\u05d8 \u05d0\u05d5 \u05e2\u05dc \u05e7\u05d5, \u05e4\u05d5\u05e0\u05e7\u05e6\u05d9\u05d4 \u05d0\u05d5 \u05e2\u05e7\u05d5\u05de\u05d4
PointCapturing=\u05dc\u05db\u05d9\u05d3\u05ea \u05e0\u05e7\u05d5\u05d3\u05d4
PointInside=\u05e0\u05e7\u05d5\u05d3\u05d4 \u05d1\u05d0\u05d6\u05d5\u05e8
PointMenu=\u05e0\u05e7\u05d5\u05d3\u05d4
@@ -449,8 +441,6 @@ Power=\u05d7\u05d6\u05e7\u05d4
Preview=\u05ea\u05e6\u05d5\u05d2\u05d4 \u05de\u05e7\u05d3\u05d9\u05de\u05d4
Print=\u05d4\u05d3\u05e4\u05e1\u05d4
PrintPreview=\u05ea\u05e6\u05d5\u05d2\u05d4 \u05de\u05e7\u05d3\u05d9\u05de\u05d4 \u05dc\u05d4\u05d3\u05e4\u05e1\u05d4
-Prism=\u05de\u05e0\u05e1\u05e8\u05d4
-Prism.Help=\u05d1\u05d7\u05e8\u05d9 \u05de\u05e6\u05d5\u05dc\u05e2 (\u05d0\u05d5 \u05e0\u05e7\u05d5\u05d3\u05d4) \u05d5\u05e0\u05e7\u05d5\u05d3\u05d4 \u05e8\u05d0\u05e9\u05d5\u05e0\u05d4 \u05e9\u05dc \u05d4\u05d3\u05d5\u05e4\u05df \u05d4\u05de\u05e7\u05d1\u05d9\u05dc\u05d4
Probability=\u05d4\u05e1\u05ea\u05d1\u05e8\u05d5\u05ea
ProbabilityCalculator=\u05de\u05d7\u05e9\u05d1\u05d5\u05df \u05d4\u05e1\u05ea\u05d1\u05e8\u05d5\u05ea
ProbabilityCalculator.Help=\u05ea\u05d9\u05d1\u05ea \u05d3\u05d5-\u05e9\u05d9\u05d7 \u05dc\u05d7\u05d9\u05e9\u05d5\u05d1 \u05d4\u05e1\u05ea\u05d1\u05e8\u05d5\u05ea
@@ -491,8 +481,6 @@ ResidualPlot=\u05d2\u05e8\u05e3 \u05e9\u05b4\u05d9\u05d5\u05bc\u05e8\u05d9
Result=\u05ea\u05d5\u05e6\u05d0\u05d4
ReturnAngleInverseTrig=\u05d4\u05d7\u05d6\u05e8 \u05d6\u05d5\u05d5\u05d9\u05ea \u05de\u05e4\u05d5\u05e0\u05e7\u05e6\u05d9\u05d5\u05ea \u05d8\u05e8\u05d9\u05d2\u05d5\u05e0\u05d5\u05de\u05d8\u05e8\u05d9\u05d5\u05ea \u05d4\u05e4\u05d5\u05db\u05d5\u05ea
RightAngleStyle=\u05e1\u05d2\u05e0\u05d5\u05df \u05d6\u05d5\u05d9\u05ea \u05d9\u05e9\u05e8\u05d4
-RightPrism=\u05de\u05e0\u05e1\u05e8\u05d4 \u05d9\u05e9\u05e8\u05ea \u05d6\u05d5\u05d5\u05d9\u05ea
-RightPrism.Help=\u05d2\u05e8\u05e8\u05d9 \u05de\u05e6\u05d5\u05dc\u05e2, \u05d0\u05d5 \u05d1\u05d7\u05e8\u05d9 \u05de\u05e6\u05d5\u05dc\u05e2 \u05d5\u05d4\u05e7\u05dc\u05d9\u05d3\u05d9 \u05d2\u05d5\u05d1\u05d4
RightProb=\u05ea\u05d7\u05d5\u05dd \u05de\u05d9\u05de\u05d9\u05df
RigidPolygon=\u05de\u05e6\u05d5\u05dc\u05e2 \u05e7\u05e9\u05d9\u05d7
RigidPolygon.Help=\u05d1\u05d7\u05e8\u05d9 \u05d0\u05ea \u05db\u05dc \u05d4\u05e7\u05d3\u05e7\u05d3\u05d9\u05dd \u05d5\u05d0\u05d6 \u05e9\u05d5\u05d1 \u05d0\u05ea \u05d4\u05e7\u05d5\u05d3\u05e7\u05d5\u05d3 \u05d4\u05e8\u05d0\u05e9\u05d5\u05df
@@ -716,8 +704,6 @@ VectorPolygon=\u05de\u05e6\u05d5\u05dc\u05e2 \u05d5\u05e7\u05d8\u05d5\u05e8\u05d
VectorPolygon.Help=\u05d1\u05d7\u05e8\u05d9 \u05d0\u05ea \u05db\u05dc \u05d4\u05e7\u05d5\u05d3\u05e7\u05d5\u05d3\u05d9\u05dd, \u05d5\u05d0\u05d6 \u05d4\u05e7\u05d9\u05e9\u05d9 \u05e9\u05d5\u05d1 \u05e2\u05dc \u05d4\u05e7\u05d5\u05d3\u05e7\u05d5\u05d3 \u05d4\u05e8\u05d0\u05e9\u05d5\u05df
VerticalScrollbars=\u05e4\u05e1\u05d9 \u05d2\u05dc\u05d9\u05dc\u05d4 \u05d0\u05e0\u05db\u05d9\u05d9\u05dd
View=\u05ea\u05e6\u05d5\u05d2\u05d4
-ViewInFrontOf=\u05ea\u05e6\u05d5\u05d2\u05d4 \u05de\u05e2\u05dc
-ViewInFrontOf.Help=\u05e9\u05e0\u05d4 \u05d0\u05ea \u05d4\u05ea\u05e6\u05d5\u05d2\u05d4 \u05de\u05e2\u05dc \u05d4\u05e2\u05e6\u05dd \u05d4\u05e0\u05d1\u05d7\u05e8
Views=\u05ea\u05e6\u05d5\u05d2\u05d5\u05ea
VisualStyle=\u05e1\u05d2\u05e0\u05d5\u05df \u05d7\u05d6\u05d5\u05ea\u05d9
VisualStyle.Help=\u05d4\u05e7\u05d9\u05e9\u05d9 \u05e2\u05dc \u05e2\u05e6\u05de\u05d9\u05dd \u05d0\u05d5 \u05d2\u05e8\u05e8\u05d9 \u05de\u05dc\u05d1\u05df \u05dc\u05e9\u05d9\u05e0\u05d5\u05d9 \u05d4\u05ea\u05db\u05d5\u05e0\u05d5\u05ea \u05e9\u05dc\u05d4\u05dd
diff --git a/geogebra/properties/menu_ja.properties b/geogebra/properties/menu_ja.properties
index cd62ae9..ac80580 100644
--- a/geogebra/properties/menu_ja.properties
+++ b/geogebra/properties/menu_ja.properties
@@ -1,3 +1,4 @@
+ANOVA=\u5206\u6563\u5206\u6790
About=\u3053\u306e\u30d7\u30ed\u30b0\u30e9\u30e0\u306b\u3064\u3044\u3066
AddTrace=\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u3092\u6b8b\u50cf\u306e\u30ea\u30b9\u30c8\u3078\u8ffd\u52a0
Adjustment=\u63c3\u3048
@@ -117,6 +118,7 @@ CreateListOfPoints=\u70b9\u306e\u30ea\u30b9\u30c8\u306e\u4f5c\u6210
CreateListOfPoints.Help=\u30bb\u30eb\u3092\u9078\u629e\u3057\u3066\u30c4\u30fc\u30eb\u30dc\u30bf\u30f3\u3092\u30af\u30ea\u30c3\u30af
CreateMatrix=\u884c\u5217\u306e\u4f5c\u6210
CreateMatrix.Help=\u30bb\u30eb\u3092\u9078\u629e\u3057\u3066\u30c4\u30fc\u30eb\u30dc\u30bf\u30f3\u3092\u30af\u30ea\u30c3\u30af
+CreateOperationTable=\u8868\u306e\u4f5c\u6210
CreateOperationTable.Help=\u30bb\u30eb\u306e\u30d6\u30ed\u30c3\u30af\u3092\u9078\u629e\u3057\u3066\u30c4\u30fc\u30eb\u30dc\u30bf\u30f3\u3092\u30af\u30ea\u30c3\u30af
CreatePolyLine=\u6298\u308c\u7dda\u306e\u4f5c\u6210
CreatePolyLine.Help=\u70b9\u306e\u30bb\u30eb\u3092\u9078\u629e\u3057\u3066\u30c4\u30fc\u30eb\u30dc\u30bf\u30f3\u3092\u30af\u30ea\u30c3\u30af
@@ -378,8 +380,6 @@ OpenWebpage=Web\u30da\u30fc\u30b8\u3092\u958b\u304f
Options=\u30aa\u30d7\u30b7\u30e7\u30f3
Orthogonal=\u5782\u7dda
Orthogonal.Help=\u70b9\u3068\u5782\u76f4\u306a\u76f4\u7dda\u3092\u9078\u629e
-OrthogonalPlane=\u76f4\u4ea4\u5e73\u9762
-OrthogonalPlane.Help=\u70b9\u3068\u5782\u76f4\u306a\u76f4\u7dda\u3092\u9078\u629e
Other=\u4ed6
OutputObjects=\u51fa\u529b\u30aa\u30d6\u30b8\u30a7\u30af\u30c8
Overlay=\u30aa\u30fc\u30d0\u30fc\u30ec\u30a4
@@ -390,8 +390,6 @@ Parabola=\u653e\u7269\u7dda
Parabola.Help=\u70b9\u3068\u6e96\u7dda\u3092\u9078\u629e
Parallel=\u5e73\u884c\u7dda
Parallel.Help=\u70b9\u3068\u5e73\u884c\u306a\u76f4\u7dda\u3092\u9078\u629e
-ParallelPlane=\u5e73\u884c\u5e73\u9762
-ParallelPlane.Help=\u70b9\u3068\u5e73\u884c\u306a\u5e73\u9762\u3092\u9078\u629e
Paste=\u8cbc\u308a\u4ed8\u3051
PasteDataFromClipboard=\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u304b\u3089\u30c7\u30fc\u30bf\u3092\u8cbc\u308a\u4ed8\u3051\u308b
Pen=\u30da\u30f3\u30c4\u30fc\u30eb
@@ -403,10 +401,6 @@ Perspective.Geometry=\u5e7e\u4f55
Perspective.TableAndGraphics=\u8868 & \u30b0\u30e9\u30d5\u30a3\u30af\u30b9
Perspective.Whiteboard=\u30db\u30ef\u30a4\u30c8\u30dc\u30fc\u30c9
Perspectives=\u30d1\u30fc\u30b9\u30da\u30af\u30c6\u30a3\u30d6
-PlanePointLine=\u70b9\u3068\u76f4\u7dda\u3092\u542b\u3080\u5e73\u9762
-PlanePointLine.Help=\u70b9\u3068\u76f4\u7dda\u3092\u9078\u629e
-PlaneThreePoint=\uff13\u70b9\u3092\u901a\u308b\u5e73\u9762
-PlaneThreePoint.Help=\uff13\u70b9\u3092\u9078\u629e
Point=\u65b0\u898f\u306e\u70b9
Point.Help=\u30b0\u30e9\u30d5\u30a3\u30c3\u30af\u30b9\u30d3\u30e5\u30fc\u3001\u76f4\u7dda\u3001\u95a2\u6570\u306e\u30b0\u30e9\u30d5\u307e\u305f\u306f\u66f2\u7dda\u4e0a\u3067\u30af\u30ea\u30c3\u30af\u3059\u308b
PointCapturing=\u70b9\u3092\u3064\u304b\u3080
@@ -430,7 +424,6 @@ Preview=\u30d7\u30ec\u30d3\u30e5\u30fc
Print=\u5370\u5237
PrintPreview=\u5370\u5237\u30d7\u30ec\u30d3\u30e5\u30fc
Prism=\u89d2\u67f1
-Prism.Help=\u5e95\u9762\u306e\u591a\u89d2\u5f62\uff08\u3042\u308b\u3044\u306f\u9802\u70b9\uff09\u3068\u3001\u4e0a\u9762\u306e\u6700\u521d\u306e\u70b9\u3092\u9078\u629e
Probability=\u78ba\u7387
ProbabilityCalculator=\u78ba\u7387\u8a08\u7b97\u5668
ProbabilityCalculator.Help=\u78ba\u7387\u8a08\u7b97\u306e\u30c0\u30a4\u30a2\u30ed\u30b0
@@ -471,8 +464,6 @@ ResidualPlot=\u6b8b\u5dee\u30d7\u30ed\u30c3\u30c8
Result=\u7d50\u679c
ReturnAngleInverseTrig=\u9006\u4e09\u89d2\u95a2\u6570\u304b\u3089\u89d2\u5ea6\u3092\u8fd4\u3059
RightAngleStyle=\u76f4\u89d2\u306e\u30b9\u30bf\u30a4\u30eb
-RightPrism=\u76f4\u89d2\u67f1
-RightPrism.Help=\u591a\u89d2\u5f62\u3092\u30c9\u30e9\u30c3\u30b0\u3059\u308b\u304b\u3001\u591a\u89d2\u5f62\u3092\u9078\u629e\u3057\u3066\u9ad8\u3055\u3092\u5165\u529b
RightProb=\u53f3\u5bc4\u305b
RigidPolygon=\u525b\u4f53\u591a\u89d2\u5f62
RigidPolygon.Help=\u5168\u3066\u306e\u9802\u70b9\u3092\u30af\u30ea\u30c3\u30af\u3057\u3066\u304b\u3089\u3001\u518d\u3073\u6700\u521d\u306e\u9802\u70b9\u3092\u30af\u30ea\u30c3\u30af
diff --git a/geogebra/properties/menu_ji.properties b/geogebra/properties/menu_ji.properties
index 3251ec6..4fed859 100644
--- a/geogebra/properties/menu_ji.properties
+++ b/geogebra/properties/menu_ji.properties
@@ -2,13 +2,14 @@ ANOVA=\u05d5\u05d5\u05d0\u05b7\u05e8\u05d9\u05d0\u05b7\u05e0\u05e5\u05be\u05d0\u
About=\u05d5\u05d5\u05e2\u05d2\u05df
Accents=\u05d0\u05b7\u05e7\u05e6\u05e2\u05e0\u05d8\u05df
AccentsExt=\u05d0\u05d5\u05d9\u05e1\u05d2\u05e2\u05d1\u05e8\u05d9\u05d9\u05d8\u05e2\u05e8\u05d8\u05e2 \u05d0\u05b7\u05e7\u05e6\u05e2\u05e0\u05d8\u05df
+ActionObjectTools=\u05d5\u05d5\u05d9\u05e8\u05e7\u05d5\u05e0\u05d2\u05be\u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df
AddTrace=\u05e6\u05d5\u05d2\u05e2\u05d1\u05df \u05d0\u05b7\u05df \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8 \u05e6\u05d5 \u05d3\u05e2\u05e8 \u05e9\u05e4\u05bc\u05d5\u05e8\u05df\u05be\u05dc\u05d9\u05e1\u05d8\u05e2
Adjustment=\u05e6\u05d5\u05e4\u05bc\u05d0\u05b7\u05e1\u05d5\u05e0\u05d2
Advanced=\u05d0\u05b7\u05d5\u05d5\u05d0\u05b7\u05e0\u05e1\u05d9\u05e8\u05d8
AlgebraDescriptions=\u05d1\u05d0\u05b7\u05e9\u05e8\u05f2\u05b7\u05d1\u05d5\u05e0\u05d2\u05e2\u05df
AllCommands=\u05d0\u05b7\u05dc\u05e2 \u05e7\u05d0\u05b8\u05de\u05d0\u05b7\u05e0\u05d3\u05e2\u05e1
AllowRescaling=\u05d3\u05e2\u05e8\u05dc\u05d5\u05d9\u05d1\u05df \u05d0\u05d9\u05d1\u05e2\u05e8\u05e6\u05d5\u05e1\u05e7\u05d0\u05b7\u05dc\u05d9\u05e8\u05df
-AllowTooltips=\u05d3\u05e2\u05e8\u05dc\u05d5\u05d9\u05d1\u05df \u05d3\u05d9 \u05de\u05db\u05e9\u05d9\u05e8\u05be\u05e2\u05e6\u05d5\u05ea
+AllowTooltips=\u05d3\u05e2\u05e8\u05dc\u05d5\u05d9\u05d1\u05df \u05d3\u05d9 \u05d4\u05d9\u05dc\u05e3\u05be\u05e8\u05de\u05d6\u05d9\u05dd
AlternativeHypothesis=\u05d1\u05e8\u05d9\u05e8\u05d4\u05d3\u05d9\u05e7\u05e2\u05e8 \u05d4\u05d9\u05e4\u05bc\u05d0\u05b8\u05d8\u05e2\u05d6
AlternativeHypothesis.short=\u05d0\u05b7\u05dc\u05d8\u05e2\u05e8\u05e0\u05d0\u05b7\u05d8\u05d9\u05d5\u05d5
Angle=\u05d5\u05d5\u05d9\u05e0\u05e7\u05dc
@@ -28,11 +29,12 @@ AutoDimension=\u05d0\u05d5\u05d9\u05d8\u05d0\u05b8\u05de\u05d0\u05b7\u05d8\u05d9
Axes=\u05d0\u05b7\u05e7\u05e1\u05df
Back=\u05e6\u05d5\u05e8\u05d9\u05e7
BackgroundColor=\u05d4\u05d9\u05e0\u05d8\u05e2\u05e8\u05d2\u05e8\u05d5\u05e0\u05d3\u05be\u05e7\u05d0\u05b8\u05dc\u05d9\u05e8
-BasicLineTools=\u05db\u05bc\u05dc\u05d9\u05dd \u2013 \u05d2\u05e8\u05d0\u05b8\u05d3\u05e2 \u05dc\u05d9\u05e0\u05d9\u05e2\u05e1
+BasicLineTools=\u05d2\u05e8\u05d0\u05b8\u05d3\u05e2 \u05dc\u05d9\u05e0\u05d9\u05e2\u05e1
BetweenGroups=\u05e6\u05d5\u05d5\u05d9\u05e9\u05df \u05d2\u05e8\u05d5\u05e4\u05bc\u05e2\u05e1
BlackboardLetters=\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc\u05be\u05d0\u05d5\u05ea\u05d9\u05d5\u05ea
Blue=\u05d1\u05dc\u05d5\u05d9
Bold=\u05e4\u05bf\u05e2\u05d8
+Boxplot=\u05e7\u05e2\u05e1\u05d8\u05dc\u05be\u05d3\u05d9\u05d0\u05b7\u05d2\u05e8\u05d0\u05b7\u05dd
Brackets=\u05e7\u05dc\u05d0\u05b7\u05de\u05e2\u05e8\u05df
Browser=\u05d1\u05dc\u05e2\u05d8\u05e2\u05e8\u05e2\u05e8
Button.Caption=\u05e6\u05d5\u05e9\u05e8\u05d9\u05e4\u05bf\u05d8
@@ -53,7 +55,7 @@ Circle3=\u05e7\u05e8\u05f2\u05b7\u05d6 \u05d3\u05d5\u05e8\u05da \u05d3\u05e8\u05
Circle3.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d3\u05e8\u05f2\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df \u05e4\u05bf\u05d5\u05e0\u05e2\u05dd \u05e7\u05e8\u05f2\u05b7\u05d6
CircleArc3=\u05e7\u05e8\u05f2\u05b7\u05d6\u05d1\u05d5\u05d9\u05d2\u05df (\u05e6\u05e2\u05e0\u05d8\u05e2\u05e8 \u2013 \u05e6\u05d5\u05d5\u05d9\u05d9 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df)
CircleArc3.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d3\u05e2\u05dd \u05e6\u05e2\u05e0\u05d8\u05e2\u05e8 \u05d0\u05d5\u05df \u05e6\u05d5\u05d5\u05d9\u05d9 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df
-CircleArcTools=\u05db\u05bc\u05dc\u05d9\u05dd \u2013 \u05e7\u05e8\u05f2\u05b7\u05d6\u05df \u05d0\u05d5\u05df \u05d1\u05d5\u05d9\u05d2\u05e0\u05e1
+CircleArcTools=\u05e7\u05e8\u05f2\u05b7\u05d6\u05df \u05d0\u05d5\u05df \u05d1\u05d5\u05d9\u05d2\u05e0\u05e1
CircleAxisPoint=\u05e7\u05e8\u05f2\u05b7\u05d6 \u05de\u05d9\u05d8 \u05d0\u05b7 \u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8\u05df \u05d0\u05b7\u05e7\u05e1, \u05d3\u05d5\u05e8\u05da \u05d0\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8
CircleAxisPoint.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d3\u05e2\u05dd \u05d0\u05b7\u05e7\u05e1 \u05d0\u05d5\u05df \u05d0\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05e4\u05bf\u05d5\u05e0\u05e2\u05dd \u05e7\u05e8\u05f2\u05b7\u05d6
CirclePointRadius=\u05e7\u05e8\u05f2\u05b7\u05d6 (\u05e6\u05e2\u05e0\u05d8\u05e2\u05e8 \u2013 \u05e8\u05d0\u05b7\u05d3\u05d9\u05d5\u05e1)
@@ -90,6 +92,7 @@ Compasses=\u05e6\u05d9\u05e8\u05e7\u05dc
Compasses.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d0\u05b7 \u05e1\u05e2\u05d2\u05de\u05e2\u05e0\u05d8 \u05d0\u05b8\u05d3\u05e2\u05e8 \u05e6\u05d5\u05d5\u05d9\u05d9 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df \u05e4\u05bf\u05d0\u05b7\u05e8 \u05d0\u05b7 \u05e8\u05d0\u05b7\u05d3\u05d9\u05d5\u05e1, \u05d0\u05d5\u05df \u05d0\u05b7 \u05e6\u05e2\u05e0\u05d8\u05e2\u05e8
ComplexNumber=\u05e7\u05d0\u05b8\u05de\u05e4\u05bc\u05dc\u05e2\u05e7\u05e1\u05e6\u05d0\u05b8\u05dc
ComplexNumber.Help=\u05d2\u05d9\u05d8 \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d9\u05df \u05d3\u05e2\u05dd \u05e6\u05d9\u05d9\u05db\u05df\u05be\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc \u05db\u05bc\u05d3\u05d9 \u05e6\u05d5 \u05e9\u05d0\u05b7\u05e4\u05bf\u05df \u05d0\u05b7 \u05e7\u05d0\u05b8\u05de\u05e4\u05bc\u05dc\u05e2\u05e7\u05e1\u05e6\u05d0\u05b8\u05dc
+ConciseUsingCSE5=\u05e7\u05d9\u05e8\u05e6\u05df \u05d3\u05d5\u05e8\u05da cse5
Condition.ShowObject=\u05d1\u05d0\u05b7\u05d3\u05d9\u05e0\u05d2 \u05e6\u05d5 \u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05e2\u05dd \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8
Conditions=\u05d1\u05d0\u05b7\u05d3\u05d9\u05e0\u05d2\u05e2\u05df
ConfidenceInterval=\u05e6\u05d5\u05d8\u05e8\u05d5\u05d9\u05be\u05d0\u05d9\u05e0\u05d8\u05e2\u05e8\u05d5\u05d5\u05d0\u05b7\u05dc
@@ -98,24 +101,39 @@ Conic=\u05e7\u05d0\u05b8\u05e0\u05d9\u05e9\u05e2 \u05e1\u05e2\u05e7\u05e6\u05d9\
Conic5=\u05e7\u05d0\u05b8\u05e0\u05d9\u05e9\u05e2 \u05e1\u05e2\u05e7\u05e6\u05d9\u05e2 \u05d3\u05d5\u05e8\u05da \u05e4\u05bf\u05d9\u05e0\u05e3 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df
Conic5.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05e4\u05bf\u05d9\u05e0\u05e3 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df \u05e4\u05bf\u05d5\u05df \u05d3\u05e2\u05e8 \u05e7\u05d0\u05b8\u05e0\u05d9\u05e9\u05e2\u05e8 \u05e1\u05e2\u05e7\u05e6\u05d9\u05e2
ConicMenu=\u05e7\u05d0\u05b8\u05e0\u05d9\u05e9\u05e2 \u05e1\u05e2\u05e7\u05e6\u05d9\u05e2
-ConicSectionTools=\u05db\u05bc\u05dc\u05d9\u05dd \u2013 \u05e7\u05d0\u05b8\u05e0\u05d9\u05e9\u05e2 \u05e1\u05e2\u05e7\u05e6\u05d9\u05e2\u05e1
+ConicSectionTools=\u05e7\u05d0\u05b8\u05e0\u05d9\u05e9\u05e2 \u05e1\u05e2\u05e7\u05e6\u05d9\u05e2\u05e1
Continuity=\u05e0\u05d0\u05b8\u05db\u05d0\u05b7\u05e0\u05d0\u05b7\u05e0\u05d3\u05d9\u05e7\u05d9\u05d9\u05d8
Continuous=\u05e0\u05d0\u05b8\u05db\u05d0\u05b7\u05e0\u05d0\u05b7\u05e0\u05d3\u05d9\u05e7
Copy=\u05e7\u05d0\u05b8\u05e4\u05bc\u05d9\u05e8\u05df
CopyToClipboard=\u05d0\u05d9\u05d1\u05e2\u05e8\u05e7\u05d0\u05b8\u05e4\u05bc\u05d9\u05e8\u05df \u05d0\u05d9\u05df \u05e7\u05dc\u05e2\u05e4\u05bc\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc
CopyToGraphics=\u05d0\u05d9\u05d1\u05e2\u05e8\u05e7\u05d0\u05b8\u05e4\u05bc\u05d9\u05e8\u05df \u05d0\u05d9\u05df \u05e6\u05d9\u05d9\u05db\u05df\u05be\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc
-CopyToInputBar=\u05d0\u05d9\u05d1\u05e2\u05e8\u05e7\u05d0\u05b8\u05e4\u05bc\u05d9\u05e8\u05df \u05e6\u05d5 \u05d3\u05e2\u05e8 \u05d0\u05b7\u05e8\u05f2\u05b7\u05e0\u05e9\u05e8\u05f2\u05b7\u05d1\u05be\u05e9\u05d5\u05e8\u05d4
-CopyToSpreadsheet=\u05d0\u05d9\u05d1\u05e2\u05e8\u05e7\u05d0\u05b8\u05e4\u05bc\u05d9\u05e8\u05df \u05d0\u05d9\u05df \u05d3\u05e2\u05e8 \u05d8\u05d0\u05b7\u05d1\u05e2\u05dc\u05e2
+CopyToInputBar=\u05d0\u05d9\u05d1\u05e2\u05e8\u05e7\u05d0\u05b8\u05e4\u05bc\u05d9\u05e8\u05df \u05d0\u05d9\u05df \u05d3\u05e2\u05e8 \u05d0\u05b7\u05e8\u05f2\u05b7\u05e0\u05e9\u05e8\u05f2\u05b7\u05d1\u05be\u05e9\u05d5\u05e8\u05d4
+CopyToSpreadsheet=\u05d0\u05d9\u05d1\u05e2\u05e8\u05e7\u05d0\u05b8\u05e4\u05bc\u05d9\u05e8\u05df \u05d0\u05d9\u05df \u05d3\u05e2\u05dd \u05d8\u05d0\u05b7\u05d1\u05e2\u05dc\u05e2\u05be\u05d1\u05d5\u05d9\u05d2\u05df
CopyVisualStyle=\u05e7\u05d0\u05b8\u05e4\u05bc\u05d9\u05e8\u05df \u05d3\u05e2\u05dd \u05d2\u05e8\u05d0\u05b7\u05e4\u05bf\u05d9\u05e9\u05df \u05e1\u05d8\u05d9\u05dc
CopyVisualStyle.Help=\u05d8\u05d9\u05d9\u05dc\u05d8 \u05d0\u05d5\u05d9\u05e1 \u05e6\u05d5 \u05e2\u05e8\u05e9\u05d8 \u05d0\u05d9\u05d9\u05df \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8, \u05d0\u05d5\u05df \u05d3\u05d0\u05b7\u05df \u05d2\u05d9\u05d8 \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d5\u05d9\u05e3 \u05d0\u05b7\u05e0\u05d3\u05e2\u05e8\u05e2 \u05db\u05bc\u05d3\u05d9 \u05d6\u05d9\u05d9 \u05d0\u05d9\u05d1\u05e2\u05e8\u05e6\u05d5\u05d2\u05e2\u05d1\u05df \u05d6\u05f2\u05b7\u05df \u05e1\u05d8\u05d9\u05dc
+Count=\u05db\u05bc\u05de\u05d5\u05ea\u05df
+CountCells=\u05d5\u05d5\u05d9\u05e4\u05bf\u05dc
CountCells.Help=\u05d8\u05d9\u05d9\u05dc\u05d8 \u05d0\u05d5\u05d9\u05e1 \u05d0\u05b7 \u05e1\u05db\u05d5\u05dd \u05e7\u05e2\u05de\u05e2\u05e8\u05dc\u05e2\u05da
Create=\u05e9\u05d0\u05b7\u05e4\u05bf\u05df
+CreateCurveFit=\u05e6\u05d5\u05d2\u05e2\u05e4\u05bc\u05d0\u05b7\u05e1\u05d8\u05e2 \u05e7\u05e8\u05d5\u05de\u05e2
+CreateCurveFit.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05e7\u05e2\u05de\u05e2\u05e8\u05dc\u05e2\u05da \u05e6\u05d5 \u05e9\u05d0\u05b7\u05e4\u05bf\u05df \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df \u05d0\u05d5\u05df \u05d2\u05d9\u05d8 \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d5\u05d9\u05e4\u05bf\u05df \u05de\u05db\u05e9\u05d9\u05e8
CreateList=\u05e9\u05d0\u05b7\u05e4\u05bf\u05df \u05d0\u05b7 \u05dc\u05d9\u05e1\u05d8\u05e2
+CreateList.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05e7\u05e2\u05de\u05e2\u05e8\u05dc\u05e2\u05da \u05d0\u05d5\u05df \u05d2\u05d9\u05d8 \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d5\u05d9\u05e4\u05bf\u05df \u05de\u05db\u05e9\u05d9\u05e8
+CreateListGraphicsView=\u05e9\u05d0\u05b7\u05e4\u05bf\u05df \u05d0\u05b7 \u05dc\u05d9\u05e1\u05d8\u05e2
+CreateListGraphicsView.Help=\u05d0\u05d5\u05d9\u05e1\u05e9\u05d8\u05e8\u05e2\u05e7\u05df \u05d0\u05b7 \u05d2\u05e8\u05d0\u05b8\u05d3\u05e2\u05e7 \u05d0\u05b7\u05e8\u05d5\u05dd \u05d3\u05d9 \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df
CreateListOfPoints=\u05e9\u05d0\u05b7\u05e4\u05bf\u05df \u05d0\u05b7 \u05dc\u05d9\u05e1\u05d8\u05e2 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df
+CreateListOfPoints.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05e7\u05e2\u05de\u05e2\u05e8\u05dc\u05e2\u05da \u05d0\u05d5\u05df \u05d2\u05d9\u05d8 \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d5\u05d9\u05e4\u05bf\u05df \u05de\u05db\u05e9\u05d9\u05e8
CreateMatrix=\u05e9\u05d0\u05b7\u05e4\u05bf\u05df \u05d0\u05b7 \u05de\u05d0\u05b7\u05d8\u05e8\u05d9\u05e6\u05e2
+CreateMatrix.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05e7\u05e2\u05de\u05e2\u05e8\u05dc\u05e2\u05da \u05d0\u05d5\u05df \u05d2\u05d9\u05d8 \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d5\u05d9\u05e4\u05bf\u05df \u05de\u05db\u05e9\u05d9\u05e8
+CreateOperationTable=\u05e9\u05d0\u05b7\u05e4\u05bf\u05df \u05d0\u05b7\u05df \u05d0\u05b8\u05e4\u05bc\u05e2\u05e8\u05d0\u05b7\u05e6\u05d9\u05e2\u05be\u05d8\u05d0\u05b7\u05d1\u05e2\u05dc\u05e2
+CreateOperationTable.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d0\u05b7 \u05d1\u05dc\u05d0\u05b8\u05e7 \u05e7\u05e2\u05de\u05e2\u05e8\u05dc\u05e2\u05da \u05d0\u05d5\u05df \u05d2\u05d9\u05d8 \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d5\u05d9\u05e4\u05bf\u05df \u05de\u05db\u05e9\u05d9\u05e8
+CreatePolyLine=\u05e9\u05d0\u05b7\u05e4\u05bf\u05df \u05d0\u05b7 \u05d2\u05e2\u05d1\u05e8\u05d0\u05b8\u05db\u05e2\u05e0\u05e2 \u05dc\u05d9\u05e0\u05d9\u05e2
+CreatePolyLine.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05e7\u05e2\u05de\u05e2\u05e8\u05dc\u05e2\u05da \u05e6\u05d5 \u05e9\u05d0\u05b7\u05e4\u05bf\u05df \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df \u05d0\u05d5\u05df \u05d2\u05d9\u05d8 \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d5\u05d9\u05e4\u05bf\u05df \u05de\u05db\u05e9\u05d9\u05e8
CreateTable=\u05e9\u05d0\u05b7\u05e4\u05bf\u05df \u05d0\u05b7 \u05d8\u05d0\u05b7\u05d1\u05e2\u05dc\u05e2
+CreateTable.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05e7\u05e2\u05de\u05e2\u05e8\u05dc\u05e2\u05da \u05d0\u05d5\u05df \u05d2\u05d9\u05d8 \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d5\u05d9\u05e4\u05bf\u05df \u05de\u05db\u05e9\u05d9\u05e8
+Cumulative=\u05e7\u05d5\u05de\u05d5\u05dc\u05d9\u05e8\u05d8\u05e2
CursiveLetters=\u05d4\u05d0\u05b7\u05e0\u05d8\u05e9\u05e8\u05d9\u05e4\u05bf\u05d8\u05be\u05d0\u05d5\u05ea\u05d9\u05d5\u05ea
-CustomTools=\u05db\u05bc\u05dc\u05d9\u05dd \u2013 \u05d1\u05d0\u05b7\u05e0\u05d9\u05e6\u05e2\u05e8
+CustomTools=\u05d3\u05e2\u05dd \u05d1\u05d0\u05b7\u05e0\u05d9\u05e6\u05e2\u05e8\u05e1
Cut=\u05d0\u05d5\u05d9\u05e1\u05e9\u05e0\u05f2\u05b7\u05d3\u05df
Data=\u05d2\u05e2\u05d2\u05e2\u05d1\u05e2\u05e0\u05e2
DataColumn=\u05e1\u05dc\u05d5\u05e4\u05bc\u05d9\u05e7 \u05d2\u05e2\u05d2\u05e2\u05d1\u05e2\u05e0\u05e2
@@ -123,24 +141,43 @@ DataColumnName=\u05e0\u05d0\u05b8\u05de\u05e2\u05df \u05e4\u05bf\u05d5\u05e0\u05
DataTitle=\u05d8\u05d9\u05d8\u05dc \u05e4\u05bf\u05d0\u05b7\u05e8 \u05d3\u05d9 \u05d2\u05e2\u05d2\u05e2\u05d1\u05e2\u05e0\u05e2
DecimalPlaces=\u05e6\u05d0\u05b8\u05dc \u05d3\u05e2\u05e6\u05d9\u05de\u05d0\u05b7\u05dc\u05df
Default.Restore=\u05e6\u05d5\u05e8\u05d9\u05e7 \u05e6\u05d5 \u05d3\u05e2\u05dd \u05d0\u05f2\u05b7\u05e0\u05e9\u05d8\u05e2\u05dc \u05d3\u05d5\u05e8\u05da \u05e4\u05bf\u05e2\u05dc\u05d9\u05e7\u05d9\u05d9\u05d8
-Default.Set=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05e2\u05df \u05e4\u05bf\u05d0\u05b7\u05e8 \u05d0\u05b7\u05df \u05de\u05e6\u05d1\u05bf \u05d3\u05d5\u05e8\u05da \u05e4\u05bf\u05e2\u05dc\u05d9\u05e7\u05d9\u05d9\u05d8
+Default.Set=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05e2\u05df \u05e4\u05bf\u05d0\u05b7\u05e8 \u05d0\u05b7 \u05de\u05e6\u05d1\u05bf \u05d3\u05d5\u05e8\u05da \u05e4\u05bf\u05e2\u05dc\u05d9\u05e7\u05d9\u05d9\u05d8
Degree=\u05d2\u05e8\u05d0\u05b7\u05d3
+DegreesOfFreedom.short=\u05d2"\u05e4\u05bf
+DegreesOfFreedom1.short=\u05d2"\u05e4\u05bf1
+DegreesOfFreedom2.short=\u05d2"\u05e4\u05bf2
Delete=\u05d0\u05b8\u05e4\u05bc\u05e9\u05d0\u05b7\u05e4\u05bf\u05df \u05d3\u05e2\u05dd \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8
Delete.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d3\u05e2\u05dd \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8 \u05d0\u05b8\u05e4\u05bc\u05e6\u05d5\u05de\u05e2\u05e7\u05df
DeleteObjects=\u05d0\u05b8\u05e4\u05bc\u05e9\u05d0\u05b7\u05e4\u05bf\u05df \u05d3\u05d9 \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df
DeleteTool=\u05d0\u05b8\u05e4\u05bc\u05e9\u05d0\u05b7\u05e4\u05bf\u05df \u05d3\u05d9 \u05de\u05db\u05e9\u05d9\u05e8\u05d9\u05dd
+Delimiter=\u05de\u05d7\u05d9\u05e6\u05d4
+Derivative=\u05d3\u05e2\u05e8\u05d9\u05d5\u05d5\u05d0\u05b7\u05d8\u05d9\u05d5\u05d5
+Derivative.Help=\u05e8\u05e2\u05db\u05e0\u05d8 \u05d0\u05d5\u05d9\u05e1 \u05d3\u05e2\u05dd \u05e2\u05e8\u05e9\u05d8\u05df \u05d3\u05e2\u05e8\u05d9\u05d5\u05d5\u05d0\u05b7\u05d8\u05d9\u05d5\u05d5
+Descending=\u05e4\u05bf\u05d0\u05b7\u05dc\u05e0\u05d3\u05d9\u05e7
+DifferenceofMeansT=\u05d3\u05d5\u05e8\u05db\u05e9\u05e0\u05d9\u05d8\u05df\u05be\u05d0\u05d5\u05e0\u05d8\u05e2\u05e8\u05e9\u05d9\u05d9\u05d3 T
+Differences=\u05d0\u05d5\u05e0\u05d8\u05e2\u05e8\u05e9\u05d9\u05d9\u05d3\u05df
DilateFromPoint=\u05d4\u05d0\u05b8\u05de\u05d0\u05b8\u05d8\u05e2\u05d8\u05d9\u05e9\u05e2 \u05d0\u05d5\u05d9\u05e1\u05e6\u05d9\u05b4\u05d5\u05e0\u05d2
DilateFromPoint.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d0\u05b7\u05df \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8, \u05d0\u05b7 \u05e6\u05e2\u05e0\u05d8\u05e2\u05e8, \u05d0\u05d5\u05df \u05d2\u05d9\u05d8 \u05d0\u05b8\u05df \u05d0\u05b7 \u05e4\u05bf\u05d0\u05b7\u05e7\u05d8\u05d0\u05b8\u05e8
+Discrete=\u05d3\u05d9\u05e1\u05e7\u05e8\u05e2\u05d8\u05e2
Distance=\u05d3\u05d9\u05e1\u05d8\u05d0\u05b7\u05e0\u05e5 \u05d0\u05b8\u05d3\u05e2\u05e8 \u05dc\u05e2\u05e0\u05d2
Distance.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05e6\u05d5\u05d5\u05d9\u05d9 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df, \u05d0\u05b7 \u05e1\u05e2\u05d2\u05de\u05e2\u05e0\u05d8, \u05d0\u05b7 \u05e4\u05bc\u05d0\u05b8\u05dc\u05d9\u05d2\u05d0\u05b8\u05df \u05e6\u05d9 \u05d0\u05b7 \u05e7\u05e8\u05f2\u05b7\u05d6
+Distribution=\u05e4\u05bf\u05d0\u05b7\u05e8\u05d8\u05d9\u05d9\u05dc\u05d5\u05e0\u05d2
+Distribution.Binomial=\u05d1\u05d9\u05e0\u05d0\u05b8\u05de\u05d9\u05e9\u05e2
Distribution.Cauchy=\u05e7\u05d0\u05b8\u05e9\u05d9
Distribution.ChiSquare=\u05db\u05d9\u05be\u05e7\u05d5\u05d5\u05d0\u05b7\u05d3\u05e8\u05d0\u05b7\u05d8
+Distribution.Exponential=\u05e2\u05e7\u05e1\u05e4\u05bc\u05d0\u05b8\u05e0\u05e2\u05e0\u05d8\u05d0\u05b7\u05dc\u05e2
+Distribution.F=F\u05be\u05e4\u05bf\u05d0\u05b7\u05e8\u05d8\u05d9\u05d9\u05dc\u05d5\u05e0\u05d2
Distribution.Gamma=\u05d2\u05d0\u05b7\u05de\u05d0\u05b7
+Distribution.Hypergeometric=\u05d4\u05d9\u05e4\u05bc\u05e2\u05e8\u05d2\u05e2\u05d0\u05b8\u05de\u05e2\u05d8\u05e8\u05d9\u05e9\u05e2
+Distribution.Logistic=\u05dc\u05d0\u05b8\u05d2\u05d9\u05e1\u05d8\u05d9\u05e9\u05e2
+Distribution.Lognormal=\u05dc\u05d0\u05b8\u05d2\u05be\u05e0\u05d0\u05b8\u05e8\u05de\u05d0\u05b7\u05dc\u05e2
+Distribution.Normal=\u05e0\u05d0\u05b8\u05e8\u05de\u05d0\u05b7\u05dc\u05e2
Distribution.Pascal=\u05e4\u05bc\u05d0\u05b7\u05e1\u05e7\u05d0\u05b7\u05dc
Distribution.Poisson=\u05e4\u05bc\u05d5\u05d0\u05b7\u05e1\u05d0\u05b8\u05df
Distribution.Scale=\u05e1\u05e7\u05d0\u05b7\u05dc\u05e2
Distribution.Shape=\u05e4\u05bf\u05d0\u05b8\u05e8\u05e2\u05dd
Distribution.StudentT=\u05e1\u05d8\u05d5\u05d3\u05e2\u05e0\u05d8
+Distribution.Weibull=\u05d5\u05d5\u05d9\u05d9\u05d1\u05d5\u05dc
DoYouWantToSaveYourChanges=\u05e6\u05d9 \u05d5\u05d5\u05d9\u05dc\u05d8 \u05d0\u05d9\u05e8 \u05d0\u05f2\u05b7\u05e0\u05d4\u05d9\u05d8\u05df \u05d0\u05f2\u05b7\u05e2\u05e8\u05e2 \u05e9\u05d9\u05e0\u05d5\u05d9\u05d9\u05dd?
DontDeleteTool=\u05e0\u05d9\u05e9\u05d8 \u05d0\u05b8\u05e4\u05bc\u05e9\u05d0\u05b7\u05e4\u05bf\u05df
DontOverwrite=\u05e0\u05d9\u05e9\u05d8 \u05d0\u05d9\u05d1\u05e2\u05e8\u05e9\u05e8\u05f2\u05b7\u05d1\u05df
@@ -154,23 +191,30 @@ Ellipse3.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d1\u05d9\u05d
EnableLabelDrags=\u05d1\u05d0\u05b7\u05d5\u05d5\u05e2\u05d2\u05dc\u05e2\u05db\u05e2 \u05e6\u05e2\u05d8\u05dc\u05e2\u05da
EnableRightClick=\u05d3\u05e2\u05e8\u05dc\u05d5\u05d9\u05d1\u05df \u05d3\u05e2\u05dd \u05e8\u05e2\u05db\u05d8\u05df \u05e7\u05dc\u05d9\u05e7
English=\u05e2\u05e0\u05d2\u05dc\u05d9\u05e9
+EnterAppletAddress=\u05e9\u05e8\u05f2\u05b7\u05d1\u05d8 \u05d0\u05b7\u05e8\u05f2\u05b7\u05df \u05d3\u05e2\u05dd \u05d5\u05d5\u05e2\u05d1\u05d0\u05b7\u05d3\u05e8\u05e2\u05e1 \u05e4\u05bf\u05d5\u05df \u05d3\u05e2\u05e8 GeoGebra\u05be\u05e4\u05bc\u05e8\u05d0\u05b8\u05d2\u05e8\u05d0\u05b7\u05de\u05e7\u05e2
+EnterWebAddress=\u05e9\u05e8\u05f2\u05b7\u05d1\u05d8 \u05d0\u05b7\u05e8\u05f2\u05b7\u05df \u05d3\u05e2\u05dd \u05d5\u05d5\u05e2\u05d1\u05d0\u05b7\u05d3\u05e8\u05e2\u05e1
EqualVariance=\u05d5\u05d5\u05d0\u05b7\u05e8\u05d9\u05d0\u05b7\u05e0\u05e5
Equation=\u05d2\u05dc\u05f2\u05b7\u05db\u05d5\u05e0\u05d2
EstimatedValue=\u05d0\u05b8\u05e4\u05bc\u05d2\u05e2\u05e9\u05d0\u05b7\u05e6\u05d8\u05e2 \u05d5\u05d5\u05e2\u05e8\u05d8
Evaluate=\u05d0\u05b8\u05e4\u05bc\u05e9\u05d0\u05b7\u05e6\u05df
Evaluate.Help=\u05d2\u05e2\u05e0\u05d5\u05d9\u05e2\u05e8 \u05d7\u05e9\u05d1\u05d5\u05df
Exit=\u05d0\u05b7\u05e8\u05d5\u05d9\u05e1
+Expand=\u05e4\u05bf\u05d5\u05e0\u05d0\u05b7\u05e0\u05d3\u05e2\u05e8\u05dc\u05d9\u05d9\u05d2\u05df
+Expand.Help=\u05dc\u05d9\u05d9\u05d2\u05d8 \u05e4\u05bf\u05d5\u05e0\u05d0\u05b7\u05e0\u05d3\u05e2\u05e8 \u05de\u05d7\u05d5\u05e5 \u05d3\u05d9 \u05e7\u05dc\u05d0\u05b7\u05de\u05e2\u05e8\u05df
ExpandAll=\u05d0\u05b7\u05dc\u05e5 \u05e4\u05bf\u05d5\u05e0\u05d0\u05b7\u05e0\u05d3\u05e2\u05e8\u05dc\u05d9\u05d9\u05d2\u05df
+Exponential=\u05e2\u05e7\u05e1\u05e4\u05bc\u05d0\u05b8\u05e0\u05e2\u05d8\u05d0\u05b7\u05dc
Export=\u05e2\u05e7\u05e1\u05e4\u05bc\u05d0\u05b8\u05e8\u05d8\u05d9\u05e8\u05df
+ExportAllWorksheets=\u05e2\u05e7\u05e1\u05e4\u05bc\u05d0\u05b8\u05e8\u05d8\u05d9\u05e8\u05df \u05d0\u05b7\u05dc\u05e2 \u05d0\u05b8\u05e4\u05bf\u05e2\u05e0\u05e2 \u05d1\u05d5\u05d9\u05d2\u05e0\u05e1
Factor=\u05e4\u05bf\u05d0\u05b7\u05e7\u05d8\u05d0\u05b8\u05e8\u05d9\u05d6\u05d9\u05e8\u05df
Factor.Help=\u05d6\u05d5\u05db\u05df \u05e4\u05bf\u05d0\u05b7\u05e7\u05d8\u05d0\u05b8\u05e8\u05df
FastHelp=\u05d2\u05d9\u05db\u05e2 \u05d4\u05d9\u05dc\u05e3
File=\u05d8\u05e2\u05e7\u05e2
+FileBrowser=\u05e4\u05bc\u05d0\u05b7\u05e4\u05bc\u05e7\u05e2\u05e1\u05be\u05d0\u05d9\u05d1\u05e2\u05e8\u05d1\u05dc\u05d9\u05e7
FileSystem=\u05e1\u05d9\u05e1\u05d8\u05e2\u05dd\u05be\u05d8\u05e2\u05e7\u05e2
Files=\u05d8\u05e2\u05e7\u05e2\u05e1
FillType=\u05e4\u05bf\u05d9\u05dc\u05e2\u05db\u05e5
Filling=\u05d0\u05d5\u05d9\u05e1\u05e4\u05bf\u05d9\u05dc\u05df
-Filling.Hatch=\u05e9\u05d8\u05e8\u05d9\u05db\u05d9\u05e8
+Filling.Hatch=\u05e9\u05d8\u05e8\u05d9\u05db\u05d9\u05e8\u05d8
Filling.Image=\u05d1\u05d9\u05dc\u05d3
Filling.Standard=\u05e1\u05d8\u05d0\u05b7\u05e0\u05d3\u05d0\u05b7\u05e8\u05d3
FitCurve=\u05e1\u05d0\u05b7\u05de\u05e2 \u05e6\u05d5\u05d2\u05e2\u05e4\u05bc\u05d0\u05b7\u05e1\u05d8\u05e2 \u05e7\u05e8\u05d5\u05de\u05e2
@@ -183,18 +227,25 @@ FontSize=\u05e9\u05e8\u05d9\u05e4\u05bf\u05d8\u05d2\u05e8\u05d9\u05d9\u05e1
ForegroundColor=\u05e4\u05bf\u05d0\u05b8\u05d3\u05e2\u05e8\u05d2\u05e8\u05d5\u05e0\u05d8\u05be\u05e7\u05d0\u05b8\u05dc\u05d9\u05e8
Formulas=\u05e4\u05bf\u05d0\u05b8\u05e8\u05de\u05dc\u05e2\u05df
FrakturLetters=\u05e4\u05bf\u05e8\u05d0\u05b7\u05e7\u05d8\u05d5\u05e8\u05be\u05d0\u05d5\u05ea\u05d9\u05d5\u05ea
+Frequency=\u05e4\u05bf\u05e8\u05e2\u05e7\u05d5\u05d5\u05e2\u05e0\u05e5
+FrequencyPolygon=\u05e4\u05bf\u05e8\u05e2\u05e7\u05d5\u05d5\u05e2\u05e0\u05e6\u05df\u05be\u05e4\u05bc\u05d0\u05b8\u05dc\u05d9\u05d2\u05d0\u05b8\u05df
+FrequencyTable=\u05e4\u05bf\u05e8\u05e2\u05e7\u05d5\u05d5\u05e2\u05e0\u05e6\u05df\u05be\u05d8\u05d0\u05b7\u05d1\u05e2\u05dc\u05e2
+FrequencyType=\u05e4\u05bf\u05e8\u05e2\u05e7\u05d5\u05d5\u05e2\u05e0\u05e5\u05be\u05d8\u05d9\u05e4\u05bc
FunctionInspector=\u05e4\u05bf\u05d5\u05e0\u05e7\u05e6\u05d9\u05e2\u05be\u05d0\u05d9\u05e0\u05e1\u05e4\u05bc\u05e2\u05e7\u05d8\u05d0\u05b8\u05e8
FunctionInspector.Help=\u05d8\u05d9\u05d9\u05dc\u05d8 \u05d0\u05d5\u05d9\u05e1 \u05d0\u05b7 \u05e4\u05bf\u05d5\u05e0\u05e7\u05e6\u05d9\u05e2
Functionality=\u05e4\u05bf\u05d5\u05e0\u05e7\u05e6\u05d9\u05d0\u05b8\u05e0\u05d0\u05b7\u05dc\u05d9\u05d8\u05e2\u05d8
GUIFontSize=\u05de\u05e2\u05e0\u05d9\u05d5\u05be\u05e9\u05e8\u05d9\u05e4\u05bf\u05d8\u05d2\u05e8\u05d9\u05d9\u05e1
General=\u05d0\u05b7\u05dc\u05d2\u05e2\u05de\u05d9\u05d9\u05df
-GeneralTools=\u05db\u05bc\u05dc\u05d9\u05dd \u2013 \u05d0\u05b7\u05dc\u05d2\u05e2\u05de\u05d9\u05d9\u05e0\u05e2
+GeneralTools=\u05d0\u05b7\u05dc\u05d2\u05e2\u05de\u05d9\u05d9\u05e0\u05e2
GenerateCode=\u05e9\u05d0\u05b7\u05e4\u05bf\u05df \u05d3\u05e2\u05dd \u05e7\u05d0\u05b8\u05d3
+GeogebraToAsymptoteExport=\u05e2\u05e7\u05e1\u05e4\u05bc\u05d0\u05b8\u05e8\u05d8 \u05e4\u05bf\u05d5\u05df GeoGebra \u05e6\u05d5 Asymptote
Geometry=\u05d2\u05e2\u05d0\u05b8\u05de\u05e2\u05d8\u05e8\u05d9\u05e2
German=\u05d3\u05f2\u05b7\u05d8\u05e9\u05d9\u05e9
+Graph=\u05d2\u05e8\u05d0\u05b7\u05e4\u05bf\u05d9\u05e7
GraphicsQuality=\u05d2\u05e8\u05d0\u05b7\u05e4\u05bf\u05d9\u05e7\u05df
Green=\u05d2\u05e8\u05d9\u05df
Grid=\u05e8\u05e2\u05e9\u05d0\u05b8\u05d8\u05e7\u05e2
+Gridlines=\u05e8\u05e2\u05e9\u05d0\u05b8\u05d8\u05e7\u05e2
GroupObjects=\u05d2\u05e8\u05d5\u05e4\u05bc\u05d9\u05e8\u05d8\u05e2 \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df
Help=\u05d4\u05d9\u05dc\u05e3
Hidden.Dashed=\u05d2\u05e2\u05e4\u05bc\u05d9\u05e0\u05d8\u05dc\u05d8
@@ -208,6 +259,8 @@ HorizontalScrollbars=\u05d4\u05d0\u05b8\u05e8\u05d9\u05d6\u05d0\u05b8\u05e0\u05d
Hue=\u05e9\u05d0\u05b7\u05d8\u05d9\u05e8\u05d5\u05e0\u05d2
Hyperbola3=\u05d4\u05d9\u05e4\u05bc\u05e2\u05e8\u05d1\u05d0\u05b8\u05dc\u05e2
Hyperbola3.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05e6\u05d5\u05d5\u05d9\u05d9 \u05e4\u05bf\u05d0\u05b8\u05e7\u05d5\u05e1\u05df \u05d0\u05d5\u05df \u05d0\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05e4\u05bf\u05d5\u05df \u05d3\u05e2\u05e8 \u05d4\u05d9\u05e4\u05bc\u05e2\u05e8\u05d1\u05d0\u05b8\u05dc\u05e2
+Hypergeometric.population=\u05d1\u05d0\u05b7\u05e4\u05bf\u05e2\u05dc\u05e7\u05e2\u05e8\u05d5\u05e0\u05d2
+Hypergeometric.sample=\u05de\u05d5\u05e1\u05d8\u05e2\u05e8
Icon=\u05d0\u05d9\u05e7\u05d0\u05b8\u05e0\u05d3\u05dc
Image=\u05d0\u05b7\u05e8\u05f2\u05b7\u05e0\u05e9\u05d8\u05e2\u05dc\u05df \u05d0\u05b7 \u05d1\u05d9\u05dc\u05d3
Image.Help=\u05d2\u05d9\u05d8 \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d9\u05e0\u05e2\u05dd \u05e6\u05d9\u05d9\u05db\u05df\u05be\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc \u05d0\u05b8\u05d3\u05e2\u05e8 \u05d0\u05d5\u05d9\u05e3 \u05d0\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8, \u05db\u05bc\u05d3\u05d9 \u05e6\u05d5 \u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05e2\u05df \u05d3\u05d0\u05b8\u05e1 \u05d0\u05b8\u05e8\u05d8 \u05e4\u05bf\u05d0\u05b7\u05e8\u05df \u05d1\u05d9\u05dc\u05d3
@@ -221,6 +274,7 @@ InsertBelow=\u05d0\u05b7\u05e8\u05f2\u05b7\u05e0\u05e9\u05d8\u05e2\u05dc\u05df \
InsertLeft=\u05d0\u05b7\u05e8\u05f2\u05b7\u05e0\u05e9\u05d8\u05e2\u05dc\u05df \u05dc\u05d9\u05e0\u05e7\u05e1
InsertRight=\u05d0\u05b7\u05e8\u05f2\u05b7\u05e0\u05e9\u05d8\u05e2\u05dc\u05df \u05e8\u05e2\u05db\u05d8\u05e1
Integral=\u05d0\u05d9\u05e0\u05d8\u05e2\u05d2\u05e8\u05d0\u05b7\u05dc
+InternalCAS=\u05d0\u05d9\u05e0\u05e2\u05d5\u05d5\u05d9\u05d9\u05e0\u05d9\u05e7\u05e1\u05d8\u05e2 \u05e7\u05d0\u05b7"\u05e1 (\u05e7\u05d0\u05b8\u05de\u05e4\u05bc\u05d9\u05d5\u05d8\u05e2\u05e8\u05d9\u05d6\u05d9\u05e8\u05d8\u05e2 \u05d0\u05b7\u05dc\u05d2\u05e2\u05d1\u05e8\u05e2\u05be\u05e1\u05d9\u05e1\u05d8\u05e2\u05dd)
Intersect=\u05d0\u05d9\u05d1\u05e2\u05e8\u05e9\u05e0\u05f2\u05b7\u05d3\u05df \u05e6\u05d5\u05d5\u05d9\u05d9 \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df
Intersect.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05e6\u05d5\u05d5\u05d9\u05d9 \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df \u05d0\u05b8\u05d3\u05e2\u05e8 \u05d2\u05d9\u05d8 \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d5\u05d9\u05e3 \u05d6\u05d9\u05d9\u05e2\u05e8 \u05d0\u05d9\u05d1\u05e2\u05e8\u05e9\u05e0\u05d9\u05d8
InvertSelection=\u05d0\u05d9\u05d1\u05e2\u05e8\u05e7\u05e2\u05e8\u05df \u05d3\u05e2\u05dd \u05d0\u05d5\u05d9\u05e1\u05d8\u05d9\u05d9\u05dc
@@ -236,23 +290,31 @@ Labeling.propertiesDefault=\u05e0\u05d9\u05e6\u05df \u05d3\u05d9 \u05d0\u05d9\u0
Labels=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05e6\u05d9 \u05d1\u05d0\u05b7\u05d4\u05d0\u05b7\u05dc\u05d8\u05df \u05d3\u05d9 \u05e6\u05e2\u05d8\u05dc\u05e2\u05da
Landscape=\u05d0\u05d9\u05df \u05d3\u05e2\u05e8 \u05d1\u05e8\u05d9\u05d9\u05d8
Language=\u05e9\u05e4\u05bc\u05e8\u05d0\u05b7\u05da
+LeftProb=\u05dc\u05d9\u05e0\u05e7\u05e1
License=\u05dc\u05d9\u05e6\u05e2\u05e0\u05e5
+Lightness=\u05dc\u05d9\u05db\u05d8\u05d9\u05e7\u05d9\u05d9\u05d8
LineBisector=\u05de\u05e2\u05d3\u05d9\u05d0\u05b7\u05d8\u05e8\u05d9\u05e1\u05e2
LineBisector.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05e6\u05d5\u05d5\u05d9\u05d9 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df \u05d0\u05b8\u05d3\u05e2\u05e8 \u05d0\u05b7 \u05e1\u05e2\u05d2\u05de\u05e2\u05e0\u05d8
LineMenu=\u05d2\u05e8\u05d0\u05b8\u05d3\u05e2
+List=\u05dc\u05d9\u05e1\u05d8\u05e2
Load=\u05e2\u05e4\u05bf\u05e2\u05e0\u05e2\u05df
Locus=\u05dc\u05d0\u05b8\u05e7\u05d5\u05e1
Locus.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d0\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05e4\u05bf\u05d5\u05df \u05d3\u05e2\u05dd \u05dc\u05d0\u05b8\u05e7\u05d5\u05e1, \u05d0\u05d5\u05df \u05d0\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05d0\u05b8\u05d3\u05e2\u05e8 \u05dc\u05d5\u05d9\u05e4\u05bf\u05d5\u05d5\u05f2\u05b7\u05d6\u05e2\u05e8 \u05e4\u05bf\u05d5\u05df \u05d5\u05d5\u05e2\u05dc\u05db\u05df \u05e2\u05e8 \u05d4\u05e2\u05e0\u05d2\u05d8 \u05d0\u05b8\u05e4\u05bc
LookAndFeel=\u05d0\u05d5\u05d9\u05e1\u05d6\u05e2\u05df
LowQuality=\u05e9\u05d5\u05d5\u05d0\u05b7\u05db\u05e2 \u05e7\u05d5\u05d5\u05d0\u05b7\u05dc\u05d9\u05d8\u05e2\u05d8
+LowerLimit=\u05d0\u05d5\u05e0\u05d8\u05e2\u05e8\u05e9\u05d8\u05e2\u05e8 \u05dc\u05d9\u05de\u05d9\u05d8
ManagePerspectives=\u05d0\u05d5\u05d9\u05e1\u05e9\u05d8\u05e2\u05dc\u05be\u05e7\u05d0\u05b8\u05e0\u05d8\u05e8\u05d0\u05b8\u05dc
MathematicalFunctions=\u05de\u05d0\u05b7\u05d8\u05e2\u05de\u05d0\u05b7\u05d8\u05d9\u05e9\u05e2 \u05e4\u05bf\u05d5\u05e0\u05e7\u05e6\u05d9\u05e2\u05e1
+Matrices=\u05de\u05d0\u05b7\u05d8\u05e8\u05d9\u05e6\u05e2\u05e1
+Matrix=\u05de\u05d0\u05b7\u05d8\u05e8\u05d9\u05e6\u05e2
MaxCells=\u05de\u05d0\u05b7\u05e7\u05e1\u05d9\u05de\u05d5\u05dd
MaxCells.Help=\u05d8\u05d9\u05d9\u05dc\u05d8 \u05d0\u05d5\u05d9\u05e1 \u05d0\u05b7 \u05e1\u05db\u05d5\u05dd \u05e7\u05e2\u05de\u05e2\u05e8\u05dc\u05e2\u05da
Maximum.short=\u05de\u05d0\u05b7\u05e7\u05e1
Mean=\u05d3\u05d5\u05e8\u05db\u05e9\u05e0\u05d9\u05d8
MeanCells=\u05d3\u05d5\u05e8\u05db\u05e9\u05e0\u05d9\u05d8
-MeasurementTools=\u05db\u05bc\u05dc\u05d9\u05dd \u2013 \u05de\u05d0\u05b8\u05e1\u05df
+MeanDifference=\u05d0\u05d5\u05e0\u05d8\u05e2\u05e8\u05e9\u05d9\u05d9\u05d3\u05df\u05be\u05d3\u05d5\u05e8\u05db\u05e9\u05e0\u05d9\u05d8
+MeasurementTools=\u05de\u05d0\u05b8\u05e1\u05df
+Median=\u05de\u05d9\u05d8\u05dc\u05e6\u05d0\u05b8\u05dc
Metal=\u05de\u05e2\u05d8\u05d0\u05b7\u05dc
Midpoint=\u05de\u05d9\u05d8\u05dc\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05d0\u05b8\u05d3\u05e2\u05e8 \u05e6\u05e2\u05e0\u05d8\u05e2\u05e8
Midpoint.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05e6\u05d5\u05d5\u05d9\u05d9 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df, \u05e6\u05d9 \u05d0\u05b7 \u05e1\u05e2\u05d2\u05de\u05e2\u05e0\u05d8, \u05e7\u05e8\u05f2\u05b7\u05d6, \u05d0\u05b8\u05d3\u05e2\u05e8 \u05e7\u05d0\u05b8\u05e0\u05d9\u05e9\u05e2 \u05e1\u05e2\u05e7\u05e6\u05d9\u05e2
@@ -270,7 +332,7 @@ Move=\u05d1\u05d0\u05b7\u05d5\u05d5\u05e2\u05d2\u05df
Move.Help=\u05d1\u05d0\u05b7\u05d5\u05d5\u05e2\u05d2\u05df \u05d0\u05b8\u05d3\u05e2\u05e8 \u05d0\u05d5\u05d9\u05e1\u05d8\u05d9\u05d9\u05dc\u05df \u05d0\u05b7\u05df \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8, \u05e6\u05d9 \u05de\u05e2\u05e8\u05e2\u05e8\u05e2 \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df (Ctrl) (\u05e7\u05d9\u05e6\u05d5\u05e8=Esc)
MoveRotate=\u05d3\u05e8\u05d9\u05d9\u05e2\u05df \u05d0\u05b7\u05e8\u05d5\u05dd \u05d0\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8
MoveRotate.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05e4\u05bf\u05e8\u05d9\u05b4\u05e2\u05e8 \u05d0\u05b7 \u05d3\u05e8\u05d9\u05d9\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8, \u05d0\u05d5\u05df \u05d1\u05d0\u05b7\u05d5\u05d5\u05e2\u05d2\u05d8 \u05d3\u05d0\u05b7\u05df \u05d0\u05b7\u05df \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8
-MovementTools=\u05db\u05bc\u05dc\u05d9\u05dd \u2013 \u05d1\u05d0\u05b7\u05d5\u05d5\u05e2\u05d2\u05d5\u05e0\u05d2
+MovementTools=\u05d1\u05d0\u05b7\u05d5\u05d5\u05e2\u05d2\u05d5\u05e0\u05d2\u05e2\u05df
NameIcon=\u05e0\u05d0\u05b8\u05de\u05e2\u05df \u05d0\u05d5\u05df \u05d0\u05d9\u05e7\u05d0\u05b8\u05e0\u05d3\u05dc
New=\u05e0\u05f2\u05b7
NewWindow=\u05e0\u05f2\u05b7 \u05e4\u05bf\u05e2\u05e0\u05e6\u05d8\u05e2\u05e8
@@ -283,6 +345,7 @@ Numeric.Help=\u05e0\u05d5\u05de\u05e2\u05e8\u05d9\u05e9\u05e2 \u05d0\u05d5\u05d9
Objects=\u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df
OneVariable=\u05d0\u05d9\u05d9\u05df \u05d5\u05d5\u05d0\u05b7\u05e8\u05d9\u05d0\u05b7\u05d1\u05dc
OneVariableStatistics=\u05e1\u05d8\u05d0\u05b7\u05d8\u05d9\u05e1\u05d8\u05d9\u05e7 \u05de\u05d9\u05d8 \u05d0\u05d9\u05d9\u05df \u05d5\u05d5\u05d0\u05b7\u05e8\u05d9\u05d0\u05b7\u05d1\u05dc
+Opacity=\u05d0\u05b8\u05e4\u05bc\u05d0\u05b7\u05e6\u05d9\u05d8\u05e2\u05d8
OpenFileFolder=\u05e2\u05e4\u05bf\u05e2\u05e0\u05e2\u05df \u05d0\u05b7 \u05e4\u05bc\u05d0\u05b7\u05e4\u05bc\u05e7\u05e2
OpenFromWebpage=\u05e2\u05e4\u05bf\u05e2\u05e0\u05e2\u05df \u05e4\u05bf\u05d5\u05df \u05d0\u05b7 \u05d5\u05d5\u05e2\u05d1\u05d6\u05f2\u05b7\u05d8\u05dc
OpenWebpage=\u05e2\u05e4\u05bf\u05e2\u05e0\u05e2\u05df \u05d0\u05b7 \u05d5\u05d5\u05e2\u05d1\u05d6\u05f2\u05b7\u05d8\u05dc
@@ -291,8 +354,6 @@ OperationTable=\u05e8\u05e2\u05db\u05df\u05be\u05d8\u05d0\u05b7\u05d1\u05e2\u05d
Options=\u05d1\u05e8\u05d9\u05e8\u05d5\u05ea
Orthogonal=\u05e4\u05bc\u05e2\u05e8\u05e4\u05bc\u05e2\u05e0\u05d3\u05d9\u05e7\u05d5\u05dc\u05d0\u05b7\u05e8
Orthogonal.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d0\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05d0\u05d5\u05df \u05d0\u05b7 \u05e8\u05d9\u05db\u05d8\u05d5\u05e0\u05d2 [\u05e1\u05e2\u05d2\u05de\u05e2\u05e0\u05d8, \u05e9\u05d8\u05e8\u05d0\u05b7\u05dc, \u05d2\u05e8\u05d0\u05b8\u05d3\u05e2 \u05e6\u05d9 \u05d5\u05d5\u05e2\u05e7\u05d8\u05d0\u05b8\u05e8]
-OrthogonalPlane=\u05e4\u05bc\u05e2\u05e8\u05e4\u05bc\u05e2\u05e0\u05d3\u05d9\u05e7\u05d5\u05dc\u05d0\u05b7\u05e8\u05e2 \u05e4\u05bf\u05dc\u05d0\u05b7\u05da
-OrthogonalPlane.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d0\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05d0\u05d5\u05df \u05d0\u05b7 \u05e4\u05bc\u05e2\u05e8\u05e4\u05bc\u05e2\u05e0\u05d3\u05d9\u05e7\u05d5\u05dc\u05e2\u05e8\u05e2 \u05dc\u05d9\u05e0\u05d9\u05e2
Other=\u05d0\u05b7\u05e0\u05d3\u05e2\u05e8\u05e9
OutputObjects=\u05d0\u05b7\u05e8\u05d5\u05d9\u05e1\u05e7\u05d5\u05dd\u05be\u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df
Overlay=\u05d0\u05d9\u05d1\u05e2\u05e8\u05d3\u05e2\u05e7\u05df
@@ -303,8 +364,6 @@ Parabola=\u05e4\u05bc\u05d0\u05b7\u05e8\u05d0\u05b7\u05d1\u05d0\u05b8\u05dc\u05e
Parabola.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d0\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05d0\u05d5\u05df \u05d0\u05b7 \u05d3\u05d9\u05e8\u05e2\u05e7\u05d8\u05e8\u05d9\u05e1\u05e2 [\u05e1\u05e2\u05d2\u05de\u05e2\u05e0\u05d8, \u05e9\u05d8\u05e8\u05d0\u05b7\u05dc, \u05d2\u05e8\u05d0\u05b8\u05d3\u05e2 \u05e6\u05d9 \u05d5\u05d5\u05e2\u05e7\u05d8\u05d0\u05b8\u05e8]
Parallel=\u05e4\u05bc\u05d0\u05b7\u05e8\u05d0\u05b7\u05dc\u05e2\u05dc\u05e2 \u05d2\u05e8\u05d0\u05b8\u05d3\u05e2
Parallel.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d0\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05d0\u05d5\u05df \u05d0\u05b7 \u05e1\u05e2\u05d2\u05de\u05e2\u05e0\u05d8, \u05e9\u05d8\u05e8\u05d0\u05b7\u05dc, \u05d2\u05e8\u05d0\u05b8\u05d3\u05e2 \u05e6\u05d9 \u05d5\u05d5\u05e2\u05e7\u05d8\u05d0\u05b8\u05e8
-ParallelPlane=\u05e4\u05bc\u05d0\u05b7\u05e8\u05d0\u05b7\u05dc\u05e2\u05dc\u05e2 \u05e4\u05bf\u05dc\u05d0\u05b7\u05da
-ParallelPlane.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d0\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05d0\u05d5\u05df \u05d0\u05b7 \u05e4\u05bc\u05d0\u05b7\u05e8\u05d0\u05b7\u05dc\u05e2\u05dc\u05e2 \u05e4\u05bf\u05dc\u05d0\u05b7\u05da
Paste=\u05e7\u05dc\u05e2\u05e4\u05bc\u05df
PasteDataFromClipboard=\u05d0\u05b7\u05e8\u05f2\u05b7\u05e0\u05e7\u05dc\u05e2\u05e4\u05bc\u05df \u05e4\u05bf\u05d5\u05e0\u05e2\u05dd \u05e7\u05dc\u05e2\u05e4\u05bc\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc
PasteSpecial=\u05d1\u05d0\u05b7\u05d6\u05d5\u05e0\u05d3\u05e2\u05e8\u05e2\u05e8 \u05d0\u05b7\u05e8\u05f2\u05b7\u05e0\u05e7\u05dc\u05e2\u05e4\u05bc
@@ -312,15 +371,12 @@ Pen=\u05e4\u05bc\u05e2\u05df
Pen.Help=\u05e6\u05d9\u05d9\u05db\u05e0\u05d8 \u05d0\u05d5\u05d9\u05e4\u05bf\u05df \u05e6\u05d9\u05d9\u05db\u05df\u05be\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc. \u05e6\u05d5\u05dd \u05e1\u05d5\u05e3, \u05e7\u05dc\u05f2\u05b7\u05d1\u05d8 \u05d0\u05d5\u05d9\u05e1 \u05d0\u05b7\u05df \u05d0\u05b7\u05e0\u05d3\u05e2\u05e8 \u05de\u05db\u05e9\u05d9\u05e8
Perspective.AlgebraAndGraphics=\u05d0\u05b7\u05dc\u05d2\u05e2\u05d1\u05e8\u05e2 \u05d0\u05d5\u05df \u05e6\u05d9\u05d9\u05db\u05df\u05be\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc
Perspective.BasicGeometry=\u05d2\u05e8\u05d5\u05e0\u05d8\u05be\u05d2\u05e2\u05d0\u05b8\u05de\u05e2\u05d8\u05e8\u05d9\u05e2
+Perspective.CASAndGraphics=\u05e7\u05d0\u05b7"\u05e1 \u05d0\u05d5\u05df \u05d2\u05e8\u05d0\u05b7\u05e4\u05bf\u05d9\u05e7
Perspective.Geometry=\u05d2\u05e2\u05d0\u05b8\u05de\u05e2\u05d8\u05e8\u05d9\u05e2
Perspective.Primary=\u05e4\u05bc\u05e8\u05d9\u05de\u05d0\u05b7\u05e8
Perspective.TableAndGraphics=\u05d8\u05d0\u05b7\u05d1\u05e2\u05dc\u05e2 \u05d0\u05d5\u05df \u05e6\u05d9\u05d9\u05db\u05df\u05be\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc
Perspective.Whiteboard=\u05d5\u05d5\u05f2\u05b7\u05e1\u05e2\u05e8 \u05d8\u05d0\u05b8\u05d5\u05d5\u05dc
Perspectives=\u05d0\u05d5\u05d9\u05e1\u05e9\u05d8\u05e2\u05dc
-PlanePointLine=\u05e4\u05bf\u05dc\u05d0\u05b7\u05da \u05d3\u05e2\u05e4\u05bf\u05d9\u05e0\u05d9\u05e8\u05d8 \u05d3\u05d5\u05e8\u05da \u05d0\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05d0\u05d5\u05df \u05d0\u05b7 \u05dc\u05d9\u05e0\u05d9\u05e2
-PlanePointLine.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d0\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05d0\u05d5\u05df \u05d0\u05b7 \u05dc\u05d9\u05e0\u05d9\u05e2
-PlaneThreePoint=\u05e4\u05bf\u05dc\u05d0\u05b7\u05da \u05d3\u05e2\u05e4\u05bf\u05d9\u05e0\u05d9\u05e8\u05d8 \u05d3\u05d5\u05e8\u05da \u05d3\u05e8\u05f2\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df
-PlaneThreePoint.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d3\u05e8\u05f2\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df
Point=\u05e0\u05f2\u05b7\u05e2\u05e8 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8
Point.Help=\u05d2\u05d9\u05d8 \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d9\u05e0\u05e2\u05dd \u05e6\u05d9\u05d9\u05db\u05df\u05be\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc \u05d0\u05b8\u05d3\u05e2\u05e8 \u05d0\u05d5\u05d9\u05e3 \u05d0\u05b7\u05df \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8
PointCapturing=\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df\u05be\u05d1\u05d0\u05b7\u05e9\u05d8\u05d0\u05b7\u05d8\u05d5\u05e0\u05d2
@@ -329,7 +385,7 @@ PointMenu=\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8
PointOnObject=\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05d0\u05d5\u05d9\u05e3 \u05d0\u05b7\u05df \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8
PointOnObject.Help=\u05d2\u05d9\u05d8 \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d9\u05e0\u05e2\u05d5\u05d5\u05d9\u05d9\u05e0\u05d9\u05e7 \u05e6\u05d9 \u05d0\u05d5\u05d9\u05e3 \u05d3\u05e2\u05e8 \u05d2\u05e8\u05e2\u05e0\u05e2\u05e5 \u05e4\u05bf\u05d5\u05df \u05d0\u05b7\u05df \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8 \u05db\u05bc\u05d3\u05d9 \u05e6\u05d5 \u05e9\u05d0\u05b7\u05e4\u05bf\u05df \u05d3\u05d0\u05b8\u05e8\u05d8 \u05d0\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8
PointStyle=\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df\u05be\u05e1\u05d8\u05d9\u05dc
-PointTools=\u05db\u05bc\u05dc\u05d9\u05dd \u2013 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df
+PointTools=\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df
Polar=\u05e4\u05bc\u05d0\u05b8\u05dc\u05d0\u05b7\u05e8
PolarDiameter=\u05e4\u05bc\u05d0\u05b8\u05dc\u05d0\u05b7\u05e8 \u05e6\u05d9 \u05d3\u05d9\u05d0\u05b7\u05de\u05e2\u05d8\u05e2\u05e8
PolarDiameter.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d0\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05d0\u05b8\u05d3\u05e2\u05e8 \u05d0\u05b7 \u05e8\u05d9\u05db\u05d8\u05d5\u05e0\u05d2 [\u05e1\u05e2\u05d2\u05de\u05e2\u05e0\u05d8, \u05e9\u05d8\u05e8\u05d0\u05b7\u05dc, \u05d2\u05e8\u05d0\u05b8\u05d3\u05e2 \u05e6\u05d9 \u05d5\u05d5\u05e2\u05e7\u05d8\u05d0\u05b8\u05e8], \u05d0\u05d5\u05df \u05d3\u05d0\u05b7\u05df \u05d0\u05b7 \u05e7\u05e8\u05f2\u05b7\u05d6 \u05d0\u05b8\u05d3\u05e2\u05e8 \u05e7\u05d0\u05b8\u05e0\u05d9\u05e9\u05e2 \u05e1\u05e2\u05e7\u05e6\u05d9\u05e2
@@ -337,7 +393,7 @@ PolyLine=\u05d2\u05e2\u05d1\u05e8\u05d0\u05b8\u05db\u05e2\u05e0\u05e2 \u05dc\u05
PolyLine.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d0\u05b7\u05dc\u05e2 \u05e2\u05e7\u05df \u05dc\u05d5\u05d9\u05d8\u05df \u05e1\u05d3\u05e8 \u05d0\u05d5\u05df \u05d2\u05d9\u05d8 \u05d5\u05d5\u05d9\u05d3\u05e2\u05e8 \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d5\u05d9\u05e4\u05bf\u05df \u05e2\u05e8\u05e9\u05d8\u05df \u05e2\u05e7
Polygon=\u05e4\u05bc\u05d0\u05b8\u05dc\u05d9\u05d2\u05d0\u05b8\u05df
Polygon.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d0\u05b7\u05dc\u05e2 \u05e2\u05e7\u05df, \u05d0\u05d5\u05df \u05d2\u05d9\u05d8 \u05d5\u05d5\u05d9\u05d3\u05e2\u05e8 \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d5\u05d9\u05e4\u05bf\u05df \u05e2\u05e8\u05e9\u05d8\u05df \u05e2\u05e7
-PolygonTools=\u05db\u05bc\u05dc\u05d9\u05dd \u2013 \u05e4\u05bc\u05d0\u05b8\u05dc\u05d9\u05d2\u05d0\u05b8\u05e0\u05e2\u05df
+PolygonTools=\u05e4\u05bc\u05d0\u05b8\u05dc\u05d9\u05d2\u05d0\u05b8\u05e0\u05e2\u05df
Polynomial=\u05e4\u05bc\u05d0\u05b8\u05dc\u05d9\u05e0\u05d0\u05b8\u05dd
Portrait=\u05d0\u05d9\u05df \u05d3\u05e2\u05e8 \u05d4\u05d9\u05d9\u05da
Power=\u05e4\u05bc\u05d0\u05b8\u05d8\u05e2\u05e0\u05e5
@@ -346,7 +402,7 @@ Print=\u05d0\u05b8\u05e4\u05bc\u05d3\u05e8\u05d5\u05e7\u05df
PrintPreview=\u05d0\u05d9\u05d1\u05e2\u05e8\u05d1\u05dc\u05d9\u05e7 \u05e4\u05bf\u05d0\u05b7\u05e8\u05df \u05d3\u05e8\u05d5\u05e7\u05df
Prism=\u05e4\u05bc\u05e8\u05d9\u05d6\u05de\u05e2
Properties.Algebra=\u05d0\u05b7\u05dc\u05d2\u05e2\u05d1\u05e8\u05e2
-Properties.Basic=\u05d1\u05d0\u05b7\u05d6\u05d9\u05e9
+Properties.Basic=\u05d2\u05e8\u05d5\u05e0\u05d8\u05d9\u05e7\u05e2
Properties.Position=\u05e4\u05bc\u05d0\u05b8\u05d6\u05d9\u05e6\u05d9\u05e2
Properties.Style=\u05e1\u05d8\u05d9\u05dc
Radiant=\u05e8\u05d0\u05b7\u05d3\u05d9\u05d0\u05b7\u05df
@@ -354,7 +410,7 @@ Ray=\u05e9\u05d8\u05e8\u05d0\u05b7\u05dc \u05d3\u05d5\u05e8\u05da \u05e6\u05d5\u
Ray.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d3\u05e2\u05dd \u05d0\u05d5\u05d9\u05e1\u05d2\u05d0\u05b7\u05e0\u05d2\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05d0\u05d5\u05df \u05e0\u05d0\u05b8\u05da \u05d0\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8
Recent=\u05dc\u05e2\u05e6\u05d8\u05e0\u05e1 \u05d2\u05e2\u05e2\u05e4\u05bf\u05e0\u05d8
RecomputeAllViews=\u05d0\u05b7\u05dc\u05e5 \u05d0\u05d9\u05d1\u05e2\u05e8\u05e8\u05e2\u05db\u05e2\u05e0\u05e2\u05df
-RecordToSpreadsheet=\u05e4\u05bf\u05d0\u05b7\u05e8\u05e6\u05d9\u05d9\u05db\u05e2\u05e0\u05e2\u05df \u05d0\u05d9\u05df \u05d8\u05d0\u05b7\u05d1\u05e2\u05dc\u05e2
+RecordToSpreadsheet=\u05e4\u05bf\u05d0\u05b7\u05e8\u05e6\u05d9\u05d9\u05db\u05e2\u05e0\u05e2\u05df \u05d0\u05d9\u05df \u05d3\u05e2\u05dd \u05d8\u05d0\u05b7\u05d1\u05e2\u05dc\u05e2\u05be\u05d1\u05d5\u05d9\u05d2\u05df
RecordToSpreadsheet.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d3\u05e2\u05dd \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8 \u05e0\u05d0\u05b8\u05db\u05e6\u05d5\u05e9\u05e4\u05bc\u05d9\u05e8\u05df, \u05d0\u05d5\u05df \u05d3\u05d0\u05b7\u05df \u05d1\u05f2\u05b7\u05d8 \u05d3\u05d9 \u05e7\u05d0\u05b8\u05e0\u05e1\u05d8\u05e8\u05d5\u05e7\u05e6\u05d9\u05e2
RecoveryCancel=\u05d0\u05b8\u05e4\u05bc\u05e9\u05d8\u05e2\u05dc\u05df
RecoveryCancelQuestion=\u05d0\u05d9\u05e8 \u05d6\u05e2\u05e0\u05d8 \u05d6\u05d9\u05db\u05e2\u05e8 \u05d0\u05b7\u05d6 \u05d0\u05d9\u05e8 \u05d5\u05d5\u05d9\u05dc\u05d8 \u05d0\u05b8\u05e4\u05bc\u05e9\u05d8\u05e2\u05dc\u05df \u05d3\u05d9 \u05e8\u05e2\u05e1\u05d8\u05d0\u05b7\u05d5\u05d5\u05e8\u05d9\u05e8\u05d5\u05e0\u05d2? \u05d3\u05d9 \u05e0\u05d9\u05e9\u05d8\u05be\u05d0\u05f2\u05b7\u05e0\u05d2\u05e2\u05d4\u05d9\u05d8\u05e2 \u05d8\u05e2\u05e7\u05e2\u05e1 \u05d5\u05d5\u05e2\u05dc\u05df \u05d2\u05d9\u05d9\u05df \u05e4\u05bf\u05d0\u05b7\u05e8\u05dc\u05d5\u05d9\u05e8\u05df
@@ -369,23 +425,38 @@ RegularPolygon=\u05e8\u05e2\u05d2\u05d5\u05dc\u05e2\u05e8\u05e2\u05e8 \u05e4\u05
RegularPolygon.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05e6\u05d5\u05d5\u05d9\u05d9 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df \u05d0\u05d5\u05df \u05d2\u05d9\u05d8 \u05d0\u05b8\u05df \u05d3\u05d9 \u05e6\u05d0\u05b8\u05dc \u05e2\u05e7\u05df
Relation=\u05e9\u05f2\u05b7\u05db\u05d5\u05ea \u05e6\u05d5\u05d5\u05d9\u05e9\u05df \u05e6\u05d5\u05d5\u05d9\u05d9 \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df
Relation.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05e6\u05d5\u05d5\u05d9\u05d9 [\u05e4\u05bf\u05d0\u05b7\u05e8\u05d0\u05b7\u05e0\u05e2\u05e0\u05e2] \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df
+Relative=\u05e8\u05e2\u05dc\u05d0\u05b7\u05d8\u05d9\u05d5\u05d5\u05e2
RemoveLineBreaks=\u05d0\u05b8\u05e4\u05bc\u05e9\u05d0\u05b7\u05e4\u05bf\u05df \u05d3\u05d9 \u05d0\u05b8\u05e4\u05bc\u05e9\u05d8\u05e2\u05dc\u05be\u05dc\u05d9\u05e0\u05d9\u05e2\u05e1
RemoveTrace=\u05d0\u05b7\u05e8\u05d0\u05b8\u05e4\u05bc\u05e0\u05e2\u05de\u05e2\u05df \u05d3\u05e2\u05dd \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8 \u05e4\u05bf\u05d5\u05df \u05d3\u05e2\u05e8 \u05e0\u05d0\u05b8\u05db\u05e9\u05e4\u05bc\u05d9\u05e8\u05be\u05dc\u05d9\u05e1\u05d8\u05e2
Rename=\u05d1\u05f2\u05b7\u05d8\u05df \u05d3\u05e2\u05dd \u05e0\u05d0\u05b8\u05de\u05e2\u05df
ReplaceAll=\u05e4\u05bf\u05d0\u05b7\u05e8\u05d8\u05e8\u05e2\u05d8\u05df \u05d0\u05b7\u05dc\u05e2 \u05e7\u05e2\u05de\u05e2\u05e8\u05dc\u05e2\u05da
+RequireEquals=\u05e2\u05e1 \u05d0\u05d9\u05d6 \u05e0\u05d9\u05d9\u05d8\u05d9\u05e7 "=" \u05e4\u05bf\u05d0\u05b7\u05e8 \u05d0\u05b7 \u05d1\u05d0\u05b7\u05e4\u05bf\u05e2\u05dc
+ResidualPlot=\u05e8\u05e2\u05e9\u05d8\u05df\u05be\u05d3\u05d9\u05d0\u05b7\u05d2\u05e8\u05d0\u05b7\u05dd
Result=\u05e8\u05e2\u05d6\u05d5\u05dc\u05d8\u05d0\u05b7\u05d8
+ReturnAngleInverseTrig=\u05d2\u05d9\u05d8 \u05d0\u05b7\u05e8\u05d5\u05d9\u05e1 \u05d0\u05b7 \u05d5\u05d5\u05d9\u05e0\u05e7\u05dc \u05e4\u05bf\u05d0\u05b7\u05e8 \u05d3\u05d9 \u05e4\u05bf\u05d0\u05b7\u05e8\u05e7\u05e2\u05e8\u05d8\u05e2 \u05d8\u05e8\u05d9\u05d2\u05d0\u05b8\u05e0\u05d0\u05b8\u05de\u05e2\u05d8\u05e8\u05d9\u05e9\u05e2 \u05e4\u05bf\u05d5\u05e0\u05e7\u05e6\u05d9\u05e2\u05e1
RightAngleStyle=\u05e1\u05d8\u05d9\u05dc \u05e4\u05bf\u05d0\u05b7\u05e8 \u05d0\u05b7 \u05d2\u05e8\u05d0\u05b8\u05d3\u05df \u05d5\u05d5\u05d9\u05e0\u05e7\u05dc
-RightPrism=\u05d2\u05e8\u05d0\u05b8\u05d3\u05e2 \u05e4\u05bc\u05e8\u05d9\u05d6\u05de\u05e2
-RightPrism.Help=\u05d1\u05d0\u05b7\u05d5\u05d5\u05e2\u05d2\u05d8 \u05d0\u05b7 \u05e4\u05bc\u05d0\u05b8\u05dc\u05d9\u05d2\u05d0\u05b8\u05df, \u05d0\u05b8\u05d3\u05e2\u05e8 \u05d8\u05d9\u05d9\u05dc\u05d8 \u05d0\u05d5\u05d9\u05e1 \u05d0\u05b7 \u05e4\u05bc\u05d0\u05b8\u05dc\u05d9\u05d2\u05d0\u05b8\u05df \u05d0\u05d5\u05df \u05d2\u05d9\u05d8 \u05d0\u05b8\u05df \u05d3\u05d9 \u05d4\u05d9\u05d9\u05da
RightProb=\u05e8\u05e2\u05db\u05d8\u05e1
RigidPolygon=\u05e9\u05d8\u05f2\u05b7\u05e4\u05bf\u05e2\u05e8 \u05e4\u05bc\u05d0\u05b8\u05dc\u05d9\u05d2\u05d0\u05b8\u05df
+RigidPolygon.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d0\u05b7\u05dc\u05e2 \u05e2\u05e7\u05df \u05dc\u05d5\u05d9\u05d8\u05df \u05e1\u05d3\u05e8, \u05d0\u05d5\u05df \u05d2\u05d9\u05d8 \u05d5\u05d5\u05d9\u05d3\u05e2\u05e8 \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d5\u05d9\u05e4\u05bf\u05df \u05e2\u05e8\u05e9\u05d8\u05df \u05e2\u05e7
+RootsAndFractions=\u05d5\u05d5\u05d0\u05b8\u05e8\u05e6\u05dc\u05e2\u05df \u05d0\u05d5\u05df \u05d1\u05e8\u05d0\u05b8\u05db\u05e6\u05d0\u05b8\u05dc\u05df
RotateByAngle=\u05e8\u05d0\u05b8\u05d8\u05d0\u05b7\u05e6\u05d9\u05e2
RotateByAngle.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d0\u05b7\u05df \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8, \u05d3\u05e2\u05dd \u05e8\u05d0\u05b8\u05d8\u05d0\u05b7\u05e6\u05d9\u05e2\u05be\u05e6\u05e2\u05e0\u05d8\u05e2\u05e8, \u05d0\u05d5\u05df \u05d2\u05d9\u05d8 \u05d0\u05b8\u05df \u05d0\u05b7 \u05d5\u05d5\u05d9\u05e0\u05e7\u05dc
+RotateView=\u05d0\u05b7 \u05d3\u05e8\u05d9\u05d9 \u05d8\u05d0\u05b8\u05df \u05d3\u05e2\u05dd 3\u05be\u05d0\u05d5\u05d9\u05e1\u05de\u05e2\u05e1\u05d8\u05d9\u05e7\u05df \u05d0\u05d5\u05d9\u05e1\u05d1\u05dc\u05d9\u05e7
+RotateView.Help=\u05e0\u05e2\u05de\u05d8 \u05d0\u05d5\u05df \u05d3\u05e8\u05d9\u05d9\u05d8 \u05d3\u05e2\u05dd 3\u05be\u05d0\u05d5\u05d9\u05e1\u05de\u05e2\u05e1\u05d8\u05d9\u05e7\u05df \u05d0\u05d5\u05d9\u05e1\u05d1\u05dc\u05d9\u05e7
Rounding=\u05e4\u05bf\u05d0\u05b7\u05e8\u05e7\u05f2\u05b7\u05dc\u05e2\u05db\u05d9\u05e7\u05d5\u05e0\u05d2
+RowHeader=\u05e9\u05d5\u05e8\u05d4\u05be\u05e7\u05e2\u05e4\u05bc\u05dc
+RowLimit=\u05e6\u05d0\u05b8\u05dc \u05e9\u05d5\u05e8\u05d5\u05ea
+RowOrder=\u05e9\u05d5\u05e8\u05d4\u05be\u05e1\u05d3\u05e8
+Sample1=\u05de\u05d5\u05e1\u05d8\u05e2\u05e8 1
+Sample2=\u05de\u05d5\u05e1\u05d8\u05e2\u05e8 2
+Saturation=\u05d0\u05b8\u05e0\u05d6\u05e2\u05d8\u05d9\u05e7\u05d5\u05e0\u05d2
Save=\u05d0\u05f2\u05b7\u05e0\u05d4\u05d9\u05d8\u05df
SaveAs=\u05d0\u05f2\u05b7\u05e0\u05d4\u05d9\u05d8\u05df \u05d0\u05d5\u05e0\u05d8\u05e2\u05e8\u05df \u05d8\u05d9\u05d8\u05dc
SaveCurrentFileQuestion=\u05e6\u05d9 \u05d5\u05d5\u05d9\u05dc\u05d8 \u05d0\u05d9\u05e8 \u05d0\u05f2\u05b7\u05e0\u05d4\u05d9\u05d8\u05df \u05d3\u05d9 \u05d0\u05d9\u05e6\u05d8\u05d9\u05e7\u05e2 \u05d8\u05e2\u05e7\u05e2?
SaveCurrentPerspective=\u05d0\u05f2\u05b7\u05e0\u05d4\u05d9\u05d8\u05df \u05d3\u05e2\u05dd \u05d0\u05d9\u05e6\u05d8\u05d9\u05e7\u05df \u05d0\u05d5\u05d9\u05e1\u05e9\u05d8\u05e2\u05dc
+SavePrintUndo=\u05d3\u05e2\u05e8\u05dc\u05d5\u05d9\u05d1\u05df \u05d0\u05f2\u05b7\u05e0\u05d4\u05d9\u05d8\u05df, \u05d0\u05b8\u05e4\u05bc\u05d3\u05e8\u05d5\u05e7\u05df \u05d0\u05d5\u05df \u05d7\u05e8\u05d8\u05d4 \u05d4\u05d0\u05b8\u05d1\u05df
+SaveToXML=\u05d0\u05f2\u05b7\u05e0\u05d4\u05d9\u05d8\u05df \u05d5\u05d5\u05d9 XML
+Scatterplot=\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df\u05be\u05d3\u05d9\u05d0\u05b7\u05d2\u05e8\u05d0\u05b7\u05dd
Segment=\u05e1\u05e2\u05d2\u05de\u05e2\u05e0\u05d8 \u05e6\u05d5\u05d5\u05d9\u05e9\u05df \u05e6\u05d5\u05d5\u05d9\u05d9 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df
Segment.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05e6\u05d5\u05d5\u05d9\u05d9 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df
SegmentFixed=\u05e1\u05e2\u05d2\u05de\u05e2\u05e0\u05d8 \u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d3\u05d5\u05e8\u05da \u05d0\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05d0\u05d5\u05df \u05d0\u05b7 \u05dc\u05e2\u05e0\u05d2
@@ -400,29 +471,52 @@ SelectCurrentLayer=\u05d0\u05d5\u05d9\u05e1\u05d8\u05d9\u05d9\u05dc\u05df \u05d3
SelectDescendants=\u05d0\u05d5\u05d9\u05e1\u05d8\u05d9\u05d9\u05dc\u05df \u05d3\u05d9 \u05e0\u05d0\u05b8\u05db\u05e7\u05d5\u05de\u05e2\u05e8\u05e1
Semicircle=\u05d4\u05d0\u05b7\u05dc\u05d1\u05e7\u05e8\u05f2\u05b7\u05d6 \u05d3\u05d5\u05e8\u05da \u05e6\u05d5\u05d5\u05d9\u05d9 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df
Semicircle.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05e6\u05d5\u05d5\u05d9\u05d9 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df
+Semicolon=\u05e4\u05bc\u05d9\u05e0\u05d8\u05dc\u05be\u05e7\u05d0\u05b8\u05de\u05e2
Separator=\u05d0\u05b8\u05e4\u05bc\u05d8\u05d9\u05d9\u05dc\u05e2\u05e8
+SetClasssesManually=\u05d0\u05b7\u05dc\u05d9\u05d9\u05df \u05d3\u05e2\u05e4\u05bf\u05d9\u05e0\u05d9\u05e8\u05df \u05d3\u05d9 \u05e7\u05dc\u05d0\u05b7\u05e1\u05df
+SetToCurrentLocation=\u05d0\u05d9\u05df \u05d3\u05e2\u05e8 \u05d0\u05d9\u05e6\u05d8\u05d9\u05e7\u05e2\u05e8 \u05e4\u05bc\u05d0\u05b7\u05e4\u05bc\u05e7\u05e2
Settings=\u05d0\u05f2\u05b7\u05e0\u05e9\u05d8\u05e2\u05dc\u05d5\u05e0\u05d2\u05e2\u05df
Settings.ResetDefault=\u05d0\u05f2\u05b7\u05e0\u05e9\u05d8\u05e2\u05dc\u05d5\u05e0\u05d2\u05e2\u05df \u05d3\u05d5\u05e8\u05da \u05e4\u05bf\u05e2\u05dc\u05d9\u05e7\u05d9\u05d9\u05d8
Settings.Save=\u05d0\u05f2\u05b7\u05e0\u05d4\u05d9\u05d8\u05df \u05d3\u05d9 \u05d0\u05f2\u05b7\u05e0\u05e9\u05d8\u05e2\u05dc\u05d5\u05e0\u05d2\u05e2\u05df
-Show=\u05d1\u05d0\u05b7\u05d5\u05d5\u05f2\u05b7\u05d6\u05df
+Share=\u05e9\u05d8\u05e2\u05dc\u05df \u05d0\u05d9\u05df \u05e9\u05d5\u05ea\u05bc\u05e4\u05bf\u05d5\u05ea
+Show=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df
+ShowAtTop=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05e4\u05bf\u05d5\u05df \u05d0\u05d5\u05d9\u05d1\u05df
+ShowAxesGrid=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d0\u05b7\u05e7\u05e1\u05df/\u05e8\u05e2\u05e9\u05d0\u05b8\u05d8\u05e7\u05e2
ShowCheckBox=\u05d1\u05e8\u05d9\u05e8\u05d4\u05be\u05e7\u05e2\u05e1\u05d8\u05dc \u05e6\u05d5 \u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05e6\u05d9 \u05d1\u05d0\u05b7\u05d4\u05d0\u05b7\u05dc\u05d8\u05df \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df
ShowCheckBox.Help=\u05d2\u05d9\u05d8 \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d9\u05e0\u05e2\u05dd \u05e6\u05d9\u05d9\u05db\u05df\u05be\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc \u05db\u05bc\u05d3\u05d9 \u05d0\u05b7\u05e8\u05f2\u05b7\u05e0\u05e6\u05d5\u05e9\u05d8\u05e2\u05dc\u05df \u05d0\u05b7 \u05d1\u05e8\u05d9\u05e8\u05d4\u05be\u05e7\u05e2\u05e1\u05d8\u05dc
-ShowHideLabel=\u05d1\u05d0\u05b7\u05d5\u05d5\u05f2\u05b7\u05d6\u05df / \u05d1\u05d0\u05b7\u05d4\u05d0\u05b7\u05dc\u05d8\u05df \u05d3\u05d0\u05b8\u05e1 \u05e6\u05e2\u05d8\u05dc
+ShowColumnHeader=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05d9 \u05e7\u05e2\u05e4\u05bc\u05dc\u05e2\u05da \u05e4\u05bf\u05d5\u05df \u05d3\u05d9 \u05e1\u05dc\u05d5\u05e4\u05bc\u05d9\u05e7\u05e2\u05e1
+ShowCornerCoordinates=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05d9 \u05e7\u05d0\u05b8\u05d0\u05b8\u05e8\u05d3\u05d9\u05e0\u05d0\u05b7\u05d8\u05df \u05e4\u05bf\u05d5\u05df \u05d3\u05d9 \u05d5\u05d5\u05d9\u05e0\u05e7\u05dc\u05e2\u05df
+ShowData=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05d9 \u05d2\u05e2\u05d2\u05e2\u05d1\u05e2\u05e0\u05e2
+ShowFileBrowser=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05e2\u05dd \u05e4\u05bc\u05d0\u05b7\u05e4\u05bc\u05e7\u05e2\u05e1\u05be\u05d0\u05d9\u05d1\u05e2\u05e8\u05d1\u05dc\u05d9\u05e7
+ShowGridlines=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05d9 \u05e8\u05e2\u05e9\u05d0\u05b8\u05d8\u05e7\u05e2
+ShowHide=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df / \u05d1\u05d0\u05b7\u05d4\u05d0\u05b7\u05dc\u05d8\u05df \u05d3\u05d9 \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df
+ShowHideLabel=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df / \u05d1\u05d0\u05b7\u05d4\u05d0\u05b7\u05dc\u05d8\u05df \u05d3\u05d0\u05b8\u05e1 \u05e6\u05e2\u05d8\u05dc
ShowHideLabel.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d0\u05b7\u05df \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8 \u05db\u05bc\u05d3\u05d9 \u05e6\u05d5 \u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05e6\u05d9 \u05d1\u05d0\u05b7\u05d4\u05d0\u05b7\u05dc\u05d8\u05df \u05d6\u05f2\u05b7\u05df \u05e6\u05e2\u05d8\u05dc
+ShowHideLabels=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df / \u05d1\u05d0\u05b7\u05d4\u05d0\u05b7\u05dc\u05d8\u05df \u05d3\u05d9 \u05e6\u05e2\u05d8\u05dc\u05e2\u05da
ShowHideObject=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df / \u05d1\u05d0\u05b7\u05d4\u05d0\u05b7\u05dc\u05d8\u05df \u05d3\u05e2\u05dd \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8
ShowHideObject.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d5\u05d5\u05e2\u05dc\u05db\u05e2 \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df \u05e6\u05d5 \u05d1\u05d0\u05b7\u05d4\u05d0\u05b7\u05dc\u05d8\u05df, \u05d0\u05d5\u05df \u05d2\u05d9\u05d9\u05d8 \u05d0\u05b7\u05e8\u05d9\u05d1\u05e2\u05e8 \u05e6\u05d5 \u05d0\u05b7\u05df \u05d0\u05b7\u05e0\u05d3\u05e2\u05e8 \u05de\u05db\u05e9\u05d9\u05e8
-ShowInToolBar=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d0\u05d9\u05df \u05d3\u05e2\u05e8 \u05db\u05bc\u05dc\u05d9\u05dd\u05be\u05e9\u05d5\u05e8\u05d4
+ShowHorizontalScrollbars=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05d9 \u05d4\u05d0\u05b8\u05e8\u05d9\u05d6\u05d0\u05b8\u05e0\u05d8\u05d0\u05b7\u05dc\u05e2 \u05d5\u05d5\u05d9\u05e0\u05d3\u05e2\u05e1
+ShowInToolBar=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d0\u05d9\u05df \u05d3\u05e2\u05e8 \u05de\u05db\u05e9\u05d9\u05e8\u05d9\u05dd\u05be\u05e9\u05d5\u05e8\u05d4
ShowInputField=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05d9 \u05d0\u05b7\u05e8\u05f2\u05b7\u05e0\u05e9\u05e8\u05f2\u05b7\u05d1\u05be\u05e9\u05d5\u05e8\u05d4
ShowMenuBar=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05d9 \u05de\u05e2\u05e0\u05d9\u05d5\u05be\u05e9\u05d5\u05e8\u05d4
+ShowMouseCoordinates=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05d9 \u05e7\u05d0\u05b8\u05d0\u05b8\u05e8\u05d3\u05d9\u05e0\u05d0\u05b7\u05d8\u05df \u05e4\u05bf\u05d5\u05e0\u05e2\u05dd \u05de\u05f2\u05b7\u05d6\u05dc
+ShowPlot2=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05e2\u05dd 2\u05d8\u05df \u05e6\u05d9\u05d9\u05db\u05df\u05be\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc
ShowResetIcon=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05d0\u05b8\u05e1 \u05d0\u05d9\u05e7\u05d0\u05b8\u05e0\u05d3\u05dc "\u05e6\u05d5\u05e8\u05d9\u05e7 \u05e6\u05d5\u05dd \u05d0\u05b8\u05e0\u05d4\u05d9\u05d9\u05d1\u05be\u05de\u05e6\u05d1\u05bf"
-ShowToolBar=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05d9 \u05db\u05bc\u05dc\u05d9\u05dd\u05be\u05e9\u05d5\u05e8\u05d4
+ShowRowHeader=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05d9 \u05e7\u05e2\u05e4\u05bc\u05dc\u05e2\u05da \u05e4\u05bf\u05d5\u05df \u05d3\u05d9 \u05e9\u05d5\u05e8\u05d5\u05ea
+ShowStatistics=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05d9 \u05e1\u05d8\u05d0\u05b7\u05d8\u05d9\u05e1\u05d8\u05d9\u05e7
+ShowToolBar=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05d9 \u05de\u05db\u05e9\u05d9\u05e8\u05d9\u05dd\u05be\u05e9\u05d5\u05e8\u05d4
ShowToolBarHelp=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05d9 \u05d3\u05e2\u05e8\u05e7\u05dc\u05e2\u05e8\u05d5\u05e0\u05d2 \u05e6\u05d5 \u05d9\u05e2\u05d3\u05df \u05de\u05db\u05e9\u05d9\u05e8
+ShowVerticalScrollbars=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05d9 \u05d5\u05d5\u05e2\u05e8\u05d8\u05d9\u05e7\u05d0\u05b7\u05dc\u05e2 \u05d5\u05d5\u05d9\u05e0\u05d3\u05e2\u05e1
Sin=\u05e1\u05d9\u05e0\u05d5\u05e1
SingleFile=\u05d0\u05d9\u05d9\u05e0\u05e6\u05d9\u05e7\u05e2 \u05d8\u05e2\u05e7\u05e2
+SingleFileTabs=\u05d0\u05d9\u05d9\u05e0\u05e6\u05d9\u05e7\u05e2 \u05d8\u05e2\u05e7\u05e2 (\u05e6\u05e2\u05d8\u05dc\u05e2\u05da)
Slider=\u05dc\u05d5\u05d9\u05e4\u05bf\u05d5\u05d5\u05f2\u05b7\u05d6\u05e2\u05e8
Slider.Help=\u05d2\u05d9\u05d8 \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d9\u05e0\u05e2\u05dd \u05e6\u05d9\u05d9\u05db\u05df\u05be\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc \u05db\u05bc\u05d3\u05d9 \u05e6\u05d5 \u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05e2\u05df \u05d3\u05d0\u05b8\u05e1 \u05d0\u05b8\u05e8\u05d8 \u05e4\u05bf\u05d0\u05b7\u05e8 \u05d3\u05e2\u05dd \u05dc\u05d5\u05d9\u05e4\u05bf\u05d5\u05d5\u05f2\u05b7\u05d6\u05e2\u05e8
Slope=\u05d0\u05b8\u05e0\u05d1\u05d9\u05d9\u05d2
Slope.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d0\u05b7 \u05dc\u05d9\u05e0\u05d9\u05e2
+SnapToGrid=\u05d4\u05d0\u05b7\u05dc\u05d8\u05df \u05d1\u05f2\u05b7 \u05d3\u05e2\u05e8 \u05e8\u05e2\u05e9\u05d0\u05b8\u05d8\u05e7\u05e2
+SnapToObjects=\u05e7\u05dc\u05e2\u05e4\u05bc\u05e0\u05d3\u05d9\u05e7 \u05e6\u05d5 \u05d3\u05d9 \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df
+SnapToPoints=\u05e7\u05dc\u05e2\u05e4\u05bc\u05e0\u05d3\u05d9\u05e7 \u05e6\u05d5 \u05d3\u05d9 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df
Solution=\u05dc\u05d9\u05d9\u05d6\u05d5\u05e0\u05d2
Solution.Help=\u05d6\u05d5\u05db\u05d8 \u05dc\u05d9\u05d9\u05d6\u05d5\u05e0\u05d2\u05e2\u05df \u05e6\u05d5 \u05d0\u05d9\u05d9\u05df \u05d0\u05b8\u05d3\u05e2\u05e8 \u05de\u05e2\u05e8 \u05d2\u05dc\u05f2\u05b7\u05db\u05d5\u05e0\u05d2\u05e2\u05df
Solve=\u05dc\u05d9\u05d9\u05d6\u05df
@@ -430,12 +524,27 @@ Solve.Help=\u05dc\u05d9\u05d9\u05d6\u05d8 \u05d0\u05d9\u05d9\u05df \u05d0\u05b8\
Sort=\u05e1\u05d0\u05b8\u05e8\u05d8\u05d9\u05e8\u05df \u05d3\u05d9 \u05e7\u05e2\u05de\u05e2\u05e8\u05dc\u05e2\u05da
Sort.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d3\u05d9 \u05e7\u05e2\u05e0\u05e2\u05e8\u05dc\u05e2\u05da \u05d0\u05d5\u05d9\u05e1\u05e6\u05d5\u05e1\u05d0\u05b8\u05e8\u05d8\u05d9\u05e8\u05df
SortBy=\u05e1\u05d0\u05b8\u05e8\u05d8\u05d9\u05e8\u05df \u05dc\u05d5\u05d9\u05d8
-SpecialLineTools=\u05db\u05bc\u05dc\u05d9\u05dd \u2013 \u05e1\u05e4\u05bc\u05e2\u05e6\u05d9\u05e2\u05dc\u05e2 \u05dc\u05d9\u05e0\u05d9\u05e2\u05e1
-SpecialObjectTools=\u05db\u05bc\u05dc\u05d9\u05dd \u2013 \u05e1\u05e4\u05bc\u05e2\u05e6\u05d9\u05e2\u05dc\u05e2 \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df
+Space=\u05e9\u05e4\u05bc\u05d0\u05b7\u05e5
+SpaceBetweenThousands=\u05e9\u05e4\u05bc\u05d0\u05b7\u05e5 \u05e6\u05d5\u05d5\u05d9\u05e9\u05df \u05d8\u05d5\u05d9\u05d6\u05e0\u05d8\u05e2\u05e8
+Spacing=\u05e9\u05e4\u05bc\u05d0\u05b7\u05e6\u05d9\u05e8\u05d5\u05e0\u05d2
+SpecialLineTools=\u05e1\u05e4\u05bc\u05e2\u05e6\u05d9\u05e2\u05dc\u05e2 \u05dc\u05d9\u05e0\u05d9\u05e2\u05e1
+SpecialObjectTools=\u05e1\u05e4\u05bc\u05e2\u05e6\u05d9\u05e2\u05dc\u05e2 \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df
Sphere2=\u05e1\u05e4\u05bf\u05e2\u05e8\u05e2 (\u05e6\u05e2\u05e0\u05d8\u05e2\u05e8 \u2013 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8)
Sphere2.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d0\u05b7 \u05e6\u05e2\u05e0\u05d8\u05e2\u05e8 \u05d0\u05d5\u05df \u05d0\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05e4\u05bf\u05d5\u05df \u05d3\u05e2\u05e8 \u05e1\u05e4\u05bf\u05e2\u05e8\u05e2
+SpherePointRadius=\u05e1\u05e4\u05bf\u05e2\u05e8\u05e2 \u05de\u05d9\u05d8 \u05e6\u05e2\u05e0\u05d8\u05e2\u05e8 \u05d0\u05d5\u05df \u05e8\u05d0\u05b7\u05d3\u05d9\u05d5\u05e1
+SpherePointRadius.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d3\u05e2\u05dd \u05e6\u05e2\u05e0\u05d8\u05e2\u05e8 \u05d0\u05d5\u05df \u05d2\u05d9\u05d8 \u05d0\u05b8\u05df \u05d3\u05e2\u05dd \u05e8\u05d0\u05b7\u05d3\u05d9\u05d5\u05e1
+Split=\u05e9\u05e4\u05bc\u05d0\u05b7\u05dc\u05d8\u05df \u05e1\u05dc\u05d5\u05e4\u05bc\u05d9\u05e7\u05e2\u05e1
+Split.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d3\u05d9 \u05e1\u05dc\u05d5\u05e4\u05bc\u05d9\u05e7\u05e2\u05e1 \u05e6\u05d5 \u05e9\u05e4\u05bc\u05d0\u05b7\u05dc\u05d8\u05df
+SpreadsheetOptions=\u05d8\u05d0\u05b7\u05d1\u05e2\u05dc\u05e2\u05be\u05d1\u05e8\u05d9\u05e8\u05d5\u05ea
+Stack=\u05e6\u05d5\u05e0\u05d5\u05d9\u05e4\u05bf\u05e0\u05e2\u05de\u05e2\u05df \u05d3\u05d9 \u05e1\u05dc\u05d5\u05e4\u05bc\u05d9\u05e7\u05e2\u05e1
+Stack.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d3\u05d9 \u05e1\u05dc\u05d5\u05e4\u05bc\u05d9\u05e7\u05e2\u05e1 \u05e6\u05d5\u05e0\u05d5\u05d9\u05e4\u05bf\u05e6\u05d5\u05e0\u05e2\u05de\u05e2\u05df
+StackedBoxPlots=\u05d4\u05d5\u05d9\u05e4\u05bf\u05df \u05e7\u05e2\u05e1\u05d8\u05dc\u05e2\u05da
+StandardError=\u05e1\u05d8\u05d0\u05b7\u05e0\u05d3\u05d0\u05b7\u05e8\u05d3\u05be\u05d8\u05e2\u05d5\u05ea
+Start=\u05d0\u05b8\u05e0\u05d4\u05d9\u05d9\u05d1
+StartRow=\u05d0\u05b8\u05e0\u05d4\u05d9\u05d9\u05d1\u05be\u05e9\u05d5\u05e8\u05d4
Statistics=\u05e1\u05d8\u05d0\u05b7\u05d8\u05d9\u05e1\u05d8\u05d9\u05e7\u05e2\u05e1
Statistics2=\u05e1\u05d8\u05d0\u05b7\u05d8\u05d9\u05e1\u05d8\u05d9\u05e7\u05e2\u05e12
+StemPlot=\u05e9\u05d8\u05e2\u05e0\u05d2\u05dc\u05be\u05d3\u05d9\u05d0\u05b7\u05d2\u05e8\u05d0\u05b7\u05dd
Step=\u05e9\u05e4\u05bc\u05d0\u05b7\u05df
Substitute=\u05e1\u05d5\u05d1\u05e1\u05d8\u05d9\u05d8\u05d5\u05d9\u05b4\u05e8\u05df
Substitute.Help=\u05e4\u05bf\u05d0\u05b7\u05e8\u05d1\u05f2\u05b7\u05d8 \u05d0\u05b7 \u05d8\u05d9\u05d9\u05dc \u05e4\u05bf\u05d5\u05e0\u05e2\u05dd \u05d0\u05d5\u05d9\u05e1\u05d3\u05e8\u05d5\u05e7
@@ -464,49 +573,99 @@ Symbol.StrictSubset=\u05e9\u05d8\u05e8\u05e2\u05e0\u05d2\u05e2\u05e8 \u05d0\u05d
Symbol.Subset=\u05d0\u05d5\u05e0\u05d8\u05e2\u05e8\u05e1\u05db\u05d5\u05dd \u05e4\u05bf\u05d5\u05df
Symbol.VectorProduct=\u05d5\u05d5\u05e2\u05e7\u05d8\u05d0\u05b8\u05e8\u05df\u05be\u05e4\u05bc\u05e8\u05d0\u05b8\u05d3\u05d5\u05e7\u05d8
Symbols=\u05e1\u05d9\u05de\u05d1\u05d0\u05b8\u05dc\u05df
+TEstimateDifferenceOfMeans=T\u05be\u05e9\u05d0\u05b7\u05e6\u05d5\u05e0\u05d2, \u05d3\u05d5\u05e8\u05db\u05e9\u05e0\u05d9\u05d8\u05df\u05be\u05d0\u05d5\u05e0\u05d8\u05e2\u05e8\u05e9\u05d9\u05d9\u05d3
+TEstimatePairedDifferences=T\u05be\u05e9\u05d0\u05b7\u05e6\u05d5\u05e0\u05d2, \u05d2\u05e2\u05e4\u05bc\u05d0\u05b8\u05e8\u05d8\u05e2 \u05d0\u05d5\u05e0\u05d8\u05e2\u05e8\u05e9\u05d9\u05d9\u05d3\u05df
+TMeanInterval=T\u05be\u05e9\u05d0\u05b7\u05e6\u05d5\u05e0\u05d2 \u05e4\u05bf\u05d5\u05df \u05d0\u05b7 \u05d3\u05d5\u05e8\u05db\u05e9\u05e0\u05d9\u05d8
+TMeanTest=T\u05be\u05d8\u05e2\u05e1\u05d8 \u05e4\u05bf\u05d5\u05df \u05d0\u05b7 \u05d3\u05d5\u05e8\u05db\u05e9\u05e0\u05d9\u05d8
+TTestDifferenceOfMeans=T\u05be\u05d8\u05e2\u05e1\u05d8, \u05d3\u05d5\u05e8\u05db\u05e9\u05e0\u05d9\u05d8\u05df\u05be\u05d0\u05d5\u05e0\u05d8\u05e2\u05e8\u05e9\u05d9\u05d9\u05d3
+TTestPairedDifferences=T\u05be\u05d8\u05e2\u05e1\u05d8, \u05d2\u05e2\u05e4\u05bc\u05d0\u05b8\u05e8\u05d8\u05e2 \u05d0\u05d5\u05e0\u05d8\u05e2\u05e8\u05e9\u05d9\u05d9\u05d3\u05df
+Tab=\u05e6\u05e2\u05d8\u05dc
Table=\u05d8\u05d0\u05b7\u05d1\u05e2\u05dc\u05e2
Tangent=\u05d8\u05d0\u05b7\u05e0\u05d2\u05e2\u05e0\u05d8\u05df
Tangent.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d0\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05e6\u05d9 \u05d0\u05b7 \u05dc\u05d9\u05e0\u05d9\u05e2, \u05d0\u05d5\u05df \u05d3\u05d0\u05b7\u05df \u05d0\u05b7 \u05e7\u05e8\u05f2\u05b7\u05d6, \u05e7\u05d0\u05b8\u05e0\u05d9\u05e9\u05e2 \u05e1\u05e2\u05e7\u05e6\u05d9\u05e2 \u05e6\u05d9 \u05e4\u05bf\u05d5\u05e0\u05e7\u05e6\u05d9\u05e2
Text=\u05d0\u05b7\u05e8\u05f2\u05b7\u05e0\u05e9\u05d8\u05e2\u05dc\u05df \u05d0\u05b7 \u05d8\u05e2\u05e7\u05e1\u05d8
Text.Help=\u05d2\u05d9\u05d8 \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d9\u05e0\u05e2\u05dd \u05e6\u05d9\u05d9\u05db\u05df\u05be\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc \u05d0\u05b8\u05d3\u05e2\u05e8 \u05d0\u05d5\u05d9\u05e3 \u05d0\u05b7 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8, \u05db\u05bc\u05d3\u05d9 \u05e6\u05d5 \u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05e2\u05df \u05d3\u05d0\u05b8\u05e1 \u05d0\u05b8\u05e8\u05d8 \u05e4\u05bf\u05d0\u05b7\u05e8\u05df \u05d8\u05e2\u05e7\u05e1\u05d8
+TextFieldAction=\u05d0\u05b7\u05e8\u05f2\u05b7\u05e0\u05e9\u05d8\u05e2\u05dc\u05df \u05d0\u05b7 \u05d8\u05e2\u05e7\u05e1\u05d8\u05be\u05e9\u05d8\u05d7
+TextFieldAction.Help=\u05d2\u05d9\u05d8 \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d9\u05e0\u05e2\u05dd \u05e6\u05d9\u05d9\u05db\u05df\u05be\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc \u05db\u05bc\u05d3\u05d9 \u05d0\u05b7\u05e8\u05f2\u05b7\u05e0\u05e6\u05d5\u05e9\u05d8\u05e2\u05dc\u05df \u05d0\u05b7 \u05d8\u05e2\u05e7\u05e1\u05d8\u05be\u05e9\u05d8\u05d7
+ThenBy=\u05d0\u05d5\u05df \u05d5\u05d5\u05f2\u05b7\u05d8\u05e2\u05e8 \u05dc\u05d5\u05d9\u05d8
Tool=\u05de\u05db\u05e9\u05d9\u05e8
Tool.CreateNew=\u05e9\u05d0\u05b7\u05e4\u05bf\u05df \u05d0\u05b7 \u05e0\u05f2\u05b7\u05e2\u05dd \u05de\u05db\u05e9\u05d9\u05e8
Tool.CreationSuccess=\u05d3\u05e2\u05e8 \u05e0\u05f2\u05b7\u05e2\u05e8 \u05de\u05db\u05e9\u05d9\u05e8 \u05d4\u05d0\u05b8\u05d8 \u05d6\u05d9\u05da \u05d2\u05d5\u05d8 \u05d0\u05f2\u05b7\u05e0\u05d2\u05e2\u05d2\u05e2\u05d1\u05df!
-Tool.DeleteQuestion=\u05e6\u05d9 \u05d5\u05d5\u05d9\u05dc\u05e1\u05d8\u05d5 \u05d8\u05d0\u05b7\u05e7\u05e2 \u05d0\u05b8\u05e4\u05bc\u05e9\u05d0\u05b7\u05e4\u05bf\u05df \u05d3\u05d9 \u05d0\u05b8\u05e0\u05d2\u05e2\u05d5\u05d5\u05d9\u05d6\u05e2\u05e0\u05e2 \u05db\u05bc\u05dc\u05d9\u05dd?
-Tool.Manage=\u05db\u05bc\u05dc\u05d9\u05dd\u05be\u05e4\u05bf\u05d0\u05b7\u05e8\u05d5\u05d5\u05d0\u05b7\u05dc\u05d8\u05d5\u05e0\u05d2
+Tool.DeleteQuestion=\u05e6\u05d9 \u05d5\u05d5\u05d9\u05dc\u05d8 \u05d0\u05d9\u05e8 \u05d8\u05d0\u05b7\u05e7\u05e2 \u05d0\u05b8\u05e4\u05bc\u05e9\u05d0\u05b7\u05e4\u05bf\u05df \u05d3\u05d9 \u05d0\u05d5\u05d9\u05e1\u05d2\u05e2\u05d8\u05d9\u05d9\u05dc\u05d8\u05e2 \u05de\u05db\u05e9\u05d9\u05e8\u05d9\u05dd?
+Tool.Manage=\u05de\u05db\u05e9\u05d9\u05e8\u05d9\u05dd\u05be\u05e4\u05bf\u05d0\u05b7\u05e8\u05d5\u05d5\u05d0\u05b7\u05dc\u05d8\u05d5\u05e0\u05d2
Tool.SelectObjects=\u05d8\u05d9\u05d9\u05dc\u05d8 \u05d0\u05d5\u05d9\u05e1 \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df \u05e4\u05bf\u05d5\u05df \u05d3\u05e2\u05e8 \u05e7\u05d0\u05b8\u05e0\u05e1\u05d8\u05e8\u05d5\u05e7\u05e6\u05d9\u05e2 \u05d0\u05b8\u05d3\u05e2\u05e8 \u05e4\u05bf\u05d5\u05df \u05d3\u05e2\u05e8 \u05e8\u05e9\u05d9\u05de\u05d4
ToolHelp=\u05d4\u05d9\u05dc\u05e3 \u05e4\u05bf\u05d0\u05b7\u05e8\u05df \u05de\u05db\u05e9\u05d9\u05e8
ToolName=\u05e0\u05d0\u05b8\u05de\u05e2\u05df \u05e4\u05bf\u05d5\u05e0\u05e2\u05dd \u05de\u05db\u05e9\u05d9\u05e8
-Toolbar=\u05db\u05bc\u05dc\u05d9\u05dd\u05be\u05e9\u05d5\u05e8\u05d4
-Toolbar.Customize=\u05e6\u05d5\u05e4\u05bc\u05d0\u05b7\u05e1\u05df \u05d3\u05d9 \u05db\u05bc\u05dc\u05d9\u05dd\u05be\u05e9\u05d5\u05e8\u05d4
-Toolbar.ResetDefault=\u05e6\u05d5\u05e8\u05d9\u05e7 \u05e6\u05d5 \u05d3\u05e2\u05e8 \u05db\u05bc\u05dc\u05d9\u05dd\u05be\u05e9\u05d5\u05e8\u05d4 \u05d3\u05d5\u05e8\u05da \u05e4\u05bf\u05e2\u05dc\u05d9\u05e7\u05d9\u05d9\u05d8
-Tools=\u05db\u05bc\u05dc\u05d9\u05dd
+Toolbar=\u05de\u05db\u05e9\u05d9\u05e8\u05d9\u05dd\u05be\u05e9\u05d5\u05e8\u05d4
+Toolbar.Customize=\u05e6\u05d5\u05e4\u05bc\u05d0\u05b7\u05e1\u05df \u05d3\u05d9 \u05de\u05db\u05e9\u05d9\u05e8\u05d9\u05dd\u05be\u05e9\u05d5\u05e8\u05d4
+Toolbar.ResetDefault=\u05e6\u05d5\u05e8\u05d9\u05e7 \u05e6\u05d5 \u05d3\u05e2\u05e8 \u05d0\u05b8\u05e8\u05d9\u05d2\u05d9\u05e0\u05e2\u05dc\u05e2\u05e8 \u05de\u05db\u05e9\u05d9\u05e8\u05d9\u05dd\u05be\u05e9\u05d5\u05e8\u05d4
+Tools=\u05de\u05db\u05e9\u05d9\u05e8\u05d9\u05dd
+Tooltip=\u05d4\u05d9\u05dc\u05e3\u05be\u05e8\u05de\u05d6
+Total=\u05e1\u05da\u05be\u05d4\u05db\u05bc\u05dc
Trace=\u05e0\u05d0\u05b8\u05db\u05e9\u05e4\u05bc\u05d9\u05e8 \u2013 \u05d9\u05d0\u05b8 / \u05e0\u05d9\u05d9\u05df
Trace.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d0\u05b7\u05df \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8 (\u05d9\u05d0\u05b8 \u05d0\u05b8\u05d3\u05e2\u05e8 \u05e0\u05d9\u05e9\u05d8) \u05e0\u05d0\u05b8\u05db\u05e6\u05d5\u05e9\u05e4\u05bc\u05d9\u05e8\u05df
-TransformationTools=\u05db\u05bc\u05dc\u05d9\u05dd \u2013 \u05d8\u05e8\u05d0\u05b7\u05e0\u05e1\u05e4\u05bf\u05d0\u05b8\u05e8\u05de\u05d0\u05b7\u05e6\u05d9\u05e2\u05e1
+TraceCopy=\u05e7\u05d0\u05b8\u05e4\u05bc\u05d9\u05e8\u05df \u05d3\u05d9 \u05e9\u05e4\u05bc\u05d5\u05e8
+TraceToList=\u05e0\u05d0\u05b8\u05db\u05e9\u05e4\u05bc\u05d9\u05e8\u05df \u05d0\u05d9\u05df \u05d0\u05b7 \u05dc\u05d9\u05e1\u05d8\u05e2
+TraceToSpreadsheet=\u05e0\u05d0\u05b8\u05db\u05e9\u05e4\u05bc\u05d9\u05e8\u05df \u05d0\u05d9\u05df \u05d3\u05e2\u05dd \u05d8\u05d0\u05b7\u05d1\u05e2\u05dc\u05e2\u05be\u05d1\u05d5\u05d9\u05d2\u05df
+TraceToSpreadsheet.Help=\u05d3\u05d9\u05d0\u05b7\u05dc\u05d0\u05b8\u05d2 \u05e0\u05d0\u05b8\u05db\u05e6\u05d5\u05e9\u05e4\u05bc\u05d9\u05e8\u05df \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df \u05d0\u05d9\u05df \u05d3\u05e2\u05dd \u05d8\u05d0\u05b7\u05d1\u05e2\u05dc\u05e2\u05be\u05d1\u05d5\u05d9\u05d2\u05df
+TransformationTools=\u05d8\u05e8\u05d0\u05b7\u05e0\u05e1\u05e4\u05bf\u05d0\u05b8\u05e8\u05de\u05d0\u05b7\u05e6\u05d9\u05e2\u05e1
TranslateByVector=\u05d8\u05e8\u05d0\u05b7\u05e0\u05e1\u05dc\u05d0\u05b7\u05e6\u05d9\u05e2
TranslateByVector.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d0\u05b7\u05df \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8 \u05d0\u05d5\u05df \u05d0\u05b7 \u05d5\u05d5\u05e2\u05e7\u05d8\u05d0\u05b8\u05e8
TranslateView=\u05d1\u05d0\u05b7\u05d5\u05d5\u05e2\u05d2\u05df \u05d3\u05e2\u05dd \u05e6\u05d9\u05d9\u05db\u05df\u05be\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc
TranslateView.Help=\u05d1\u05d0\u05b7\u05d5\u05d5\u05e2\u05d2\u05df \u05d3\u05e2\u05dd \u05e6\u05d9\u05d9\u05db\u05df\u05be\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc \u05d0\u05b8\u05d3\u05e2\u05e8 \u05e2\u05e0\u05d3\u05e2\u05e8\u05df \u05d0\u05b7\u05df \u05d0\u05b7\u05e7\u05e1 (\u05d0\u05d5\u05d9\u05da \u05d3\u05d5\u05e8\u05da Shift + \u05de\u05f2\u05b7\u05d6\u05dc)
+Transparent=\u05d3\u05d5\u05e8\u05db\u05d6\u05d9\u05db\u05d8\u05d9\u05e7
+Transpose=\u05d8\u05e8\u05d0\u05b7\u05e0\u05e1\u05e4\u05bc\u05d0\u05b8\u05e0\u05d9\u05e8\u05df
+Tutorials=\u05d3\u05e2\u05e8\u05e7\u05dc\u05e2\u05e8\u05be\u05de\u05d0\u05b7\u05d8\u05e2\u05e8\u05d9\u05d0\u05b7\u05dc
+TwoVarStats=\u05e1\u05d8\u05d0\u05b7\u05d8\u05d9\u05e1\u05d8\u05d9\u05e7 \u05de\u05d9\u05d8 \u05e6\u05d5\u05d5\u05d9\u05d9 \u05d5\u05d5\u05d0\u05b7\u05e8\u05d9\u05d0\u05b7\u05d1\u05dc\u05e2\u05df
+TwoVarStats.Help=\u05d0\u05b7\u05e0\u05d0\u05b7\u05dc\u05d9\u05d6\u05d9\u05e8\u05d8 \u05e4\u05bc\u05d0\u05b8\u05e8\u05df \u05e6\u05d0\u05b8\u05dc\u05d5\u05d5\u05e2\u05e8\u05d8\u05df \u05e4\u05bf\u05d5\u05df \u05d3\u05d9 \u05d0\u05d5\u05d9\u05e1\u05d2\u05e2\u05d8\u05d9\u05d9\u05dc\u05d8\u05e2 \u05e7\u05e2\u05de\u05e2\u05e8\u05dc\u05e2\u05da
TwoVariable=\u05e6\u05d5\u05d5\u05d9\u05d9 \u05d5\u05d5\u05d0\u05b7\u05e8\u05d9\u05d0\u05b7\u05d1\u05dc\u05e2\u05df
+TwoVariableInference=\u05d0\u05d9\u05e0\u05e4\u05bf\u05e2\u05e8\u05e2\u05e0\u05e5 \u05de\u05d9\u05d8 \u05e6\u05d5\u05d5\u05d9\u05d9 \u05d5\u05d5\u05d0\u05b7\u05e8\u05d9\u05d0\u05b7\u05d1\u05dc\u05e2\u05df
Type.Algebra=\u05d0\u05b7\u05dc\u05d2\u05e2\u05d1\u05e8\u05e2
+Type.CAS=\u05e4\u05bf\u05d0\u05b8\u05e8\u05de\u05e2\u05dc\u05e2\u05e8 \u05d7\u05e9\u05d1\u05d5\u05df
+Type.Chart=\u05d3\u05d9\u05d0\u05b7\u05d2\u05e8\u05d0\u05b7\u05dd
Type.Conic=\u05e7\u05d0\u05b8\u05e0\u05d9\u05e9\u05e2 \u05e1\u05e2\u05e7\u05e6\u05d9\u05e2\u05e1
+Type.DiscreteMath=\u05d3\u05d9\u05e1\u05e7\u05e8\u05e2\u05d8\u05e2 \u05de\u05d0\u05b7\u05d8\u05e2\u05de\u05d0\u05b7\u05d8\u05d9\u05e7
+Type.FunctionsAndCalculus=\u05e4\u05bf\u05d5\u05e0\u05e7\u05e6\u05d9\u05e2\u05e1 \u05d0\u05d5\u05df \u05d0\u05b7\u05e0\u05d0\u05b7\u05dc\u05d9\u05d6
Type.Geometry=\u05d2\u05e2\u05d0\u05b8\u05de\u05e2\u05d8\u05e8\u05d9\u05e2
Type.List=\u05dc\u05d9\u05e1\u05d8\u05e2\u05e1
Type.Logic=\u05dc\u05d0\u05b8\u05d2\u05d9\u05e9
+Type.Probability=\u05de\u05e9\u05de\u05e2\u05d5\u05ea\u05d3\u05d9\u05e7\u05d9\u05d9\u05d8
+Type.Scripting=\u05e1\u05e7\u05e8\u05d9\u05e4\u05bc\u05d8
+Type.Spreadsheet=\u05d8\u05d0\u05b7\u05d1\u05e2\u05dc\u05e2\u05be\u05d1\u05d5\u05d9\u05d2\u05df
+Type.Statistics=\u05e1\u05d8\u05d0\u05b7\u05d8\u05d9\u05e1\u05d8\u05d9\u05e7
+Type.Text=\u05d8\u05e2\u05e7\u05e1\u05d8
+Type.Transformation=\u05d8\u05e8\u05d0\u05b7\u05e0\u05e1\u05e4\u05bf\u05d0\u05b8\u05e8\u05de\u05d0\u05b7\u05e6\u05d9\u05e2
+Type.VectorAndMatrix=\u05d5\u05d5\u05e2\u05e7\u05d8\u05d0\u05b8\u05e8 \u05d0\u05d5\u05df \u05de\u05d0\u05b7\u05d8\u05e8\u05d9\u05e6\u05e2
Undo=\u05d7\u05e8\u05d8\u05d4
+UngroupObjectes=\u05e4\u05bf\u05d5\u05e0\u05d0\u05b7\u05e0\u05d3\u05e2\u05e8\u05d2\u05e8\u05d5\u05e4\u05bc\u05d9\u05e8\u05df \u05d3\u05d9 \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df
+Untitled=\u05d0\u05b8\u05df \u05d0\u05b7 \u05d8\u05d9\u05d8\u05dc
+UploadGeoGebraTube=\u05d0\u05b7\u05e8\u05d9\u05d1\u05e2\u05e8\u05dc\u05d0\u05b8\u05d3\u05df \u05d0\u05d9\u05df GeoGebraTube
+UpperLimit=\u05d0\u05d9\u05d9\u05d1\u05e2\u05e8\u05e9\u05d8\u05e2\u05e8 \u05dc\u05d9\u05de\u05d9\u05d8
+UseBrowserForJS=\u05e0\u05d9\u05e6\u05df \u05d3\u05e2\u05dd \u05d1\u05dc\u05e2\u05d8\u05e2\u05e8\u05e2\u05e8 \u05e4\u05bf\u05d0\u05b7\u05e8 JavaScript\u05be\u05e1\u05e7\u05e8\u05d9\u05e4\u05bc\u05d8\u05df
+UseButtonsAndCheckboxes=\u05e0\u05d9\u05e6\u05df \u05e7\u05e0\u05e2\u05e4\u05bc\u05dc\u05e2\u05da \u05d0\u05d5\u05df \u05d1\u05e8\u05d9\u05e8\u05d4\u05be\u05e7\u05e2\u05e1\u05d8\u05dc\u05e2\u05da
+UseHeaderRow=\u05e0\u05d9\u05e6\u05df \u05d0\u05b7 \u05e9\u05d5\u05e8\u05d4 \u05e7\u05e2\u05e4\u05bc\u05dc\u05e2\u05da
UserInterface=\u05d1\u05d0\u05b7\u05e0\u05d9\u05e6\u05e2\u05e8\u05be\u05e6\u05d5\u05d5\u05d9\u05e9\u05e0\u05e4\u05bf\u05dc\u05d0\u05b7\u05da
+Value=\u05d5\u05d5\u05e2\u05e8\u05d8
+Values=\u05d5\u05d5\u05e2\u05e8\u05d8\u05df
Vector=\u05d5\u05d5\u05e2\u05e7\u05d8\u05d0\u05b8\u05e8
Vector.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d3\u05e2\u05dd \u05d0\u05d5\u05d9\u05e1\u05d2\u05d0\u05b7\u05e0\u05d2\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05d0\u05d5\u05df \u05d3\u05e2\u05dd \u05e2\u05e0\u05d3\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8
VectorFromPoint=\u05d5\u05d5\u05e2\u05e7\u05d8\u05d0\u05b8\u05e8\u05be\u05e8\u05e2\u05e4\u05bc\u05e8\u05e2\u05d6\u05e2\u05e0\u05d8\u05d0\u05b7\u05e0\u05d8
VectorFromPoint.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 [\u05e4\u05bf\u05d0\u05b7\u05e8\u05d0\u05b7\u05e0\u05e2\u05e0\u05e2] \u05d0\u05d5\u05d9\u05e1\u05d2\u05d0\u05b7\u05e0\u05d2\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05d0\u05d5\u05df \u05d5\u05d5\u05e2\u05e7\u05d8\u05d0\u05b8\u05e8
VectorMenu=\u05d5\u05d5\u05e2\u05e7\u05d8\u05d0\u05b8\u05e8
+VectorPolygon=\u05d5\u05d5\u05e2\u05e7\u05d8\u05d0\u05b8\u05e8\u05be\u05e4\u05bc\u05d0\u05b8\u05dc\u05d9\u05d2\u05d0\u05b8\u05df
+VectorPolygon.Help=\u05d1\u05d0\u05b7\u05e9\u05d8\u05d9\u05de\u05d8 \u05d3\u05d9 \u05e2\u05e7\u05df \u05dc\u05d5\u05d9\u05d8\u05df \u05e1\u05d3\u05e8, \u05d0\u05d5\u05df \u05d2\u05d9\u05d8 \u05d5\u05d5\u05d9\u05d3\u05e2\u05e8 \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d5\u05d9\u05e4\u05bf\u05df \u05e2\u05e8\u05e9\u05d8\u05df \u05e2\u05e7
VerticalScrollbars=\u05d5\u05d5\u05e2\u05e8\u05d8\u05d9\u05e7\u05d0\u05b7\u05dc\u05e2 \u05d5\u05d5\u05d9\u05e0\u05d3\u05e2
-View=\u05d1\u05d0\u05b7\u05d5\u05d5\u05f2\u05b7\u05d6\u05df
+View=\u05d0\u05b7\u05e8\u05d5\u05d9\u05e1\u05e9\u05d8\u05e2\u05dc
+Views=\u05d0\u05b8\u05e0\u05d1\u05dc\u05d9\u05e7\u05df
VisualStyle=\u05d2\u05e8\u05d0\u05b7\u05e4\u05bf\u05d9\u05e9\u05e2\u05e8 \u05e1\u05d8\u05d9\u05dc
+VisualStyle.Help=\u05d8\u05d9\u05d9\u05dc\u05d8 \u05d0\u05d5\u05d9\u05e1 \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df \u05d3\u05d5\u05e8\u05da \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05b8\u05d3\u05e2\u05e8 \u05de\u05d9\u05d8\u05df \u05d0\u05d5\u05d9\u05e1\u05d8\u05d9\u05d9\u05dc\u05be\u05d2\u05e8\u05d0\u05b8\u05d3\u05e2\u05e7, \u05db\u05bc\u05d3\u05d9 \u05e6\u05d5 \u05d1\u05f2\u05b7\u05d8\u05df \u05d6\u05d9\u05d9\u05e2\u05e8\u05e2 \u05d0\u05d9\u05d9\u05d2\u05e0\u05e9\u05d0\u05b7\u05e4\u05bf\u05d8\u05df
Width=\u05d1\u05e8\u05d9\u05d9\u05d8
Window=\u05e4\u05bf\u05e2\u05e0\u05e6\u05d8\u05e2\u05e8
Windows=\u05e4\u05bf\u05e2\u05e0\u05e6\u05d8\u05e2\u05e8
+WithOpacityPen=\u05de\u05d9\u05d8 \u05e4\u05bc\u05e2\u05df\u05be\u05d0\u05b8\u05e4\u05bc\u05d0\u05b7\u05e6\u05d9\u05d8\u05e2\u05d8
+WithinGroups=\u05d0\u05d9\u05df \u05d2\u05e8\u05d5\u05e4\u05bc\u05e2\u05e1
+ZMeanInterval=Z \u05d3\u05d5\u05e8\u05db\u05e9\u05e0\u05d9\u05d8\u05be\u05e9\u05d0\u05b7\u05e6\u05d5\u05e0\u05d2
+ZMeanTest=Z \u05d3\u05d5\u05e8\u05db\u05e9\u05e0\u05d9\u05d8\u05be\u05d8\u05e2\u05e1\u05d8
Zoom=\u05e4\u05bf\u05d0\u05b7\u05e8\u05d2\u05e8\u05e2\u05e1\u05e2\u05e8\u05d5\u05e0\u05d2
ZoomIn=\u05e4\u05bf\u05d0\u05b7\u05e8\u05d2\u05e8\u05e2\u05e1\u05e2\u05e8\u05df
ZoomIn.Help=\u05d2\u05d9\u05d8 \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d9\u05df \u05d3\u05e2\u05dd \u05e6\u05d9\u05d9\u05db\u05df\u05be\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc \u05db\u05bc\u05d3\u05d9 \u05e6\u05d5 \u05e4\u05bf\u05d0\u05b7\u05e8\u05d2\u05e8\u05e2\u05e1\u05e2\u05e8\u05df (\u05d0\u05d5\u05d9\u05da \u05d3\u05d5\u05e8\u05db\u05df \u05e8\u05e2\u05d3\u05dc \u05e4\u05bf\u05d5\u05e0\u05e2\u05dd \u05de\u05f2\u05b7\u05d6\u05dc)
diff --git a/geogebra/properties/menu_kk.properties b/geogebra/properties/menu_kk.properties
index a40b5e9..c2b02ee 100644
--- a/geogebra/properties/menu_kk.properties
+++ b/geogebra/properties/menu_kk.properties
@@ -382,8 +382,6 @@ OperationTable=\u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u043a\u0435\u04
Options=\u0411\u0430\u043f\u0442\u0430\u0443\u043b\u0430\u0440
Orthogonal=\u041f\u0435\u0440\u043f\u0435\u043d\u0434\u0438\u043a\u0443\u043b\u044f\u0440 \u0442\u04af\u0437\u0443
Orthogonal.Help=\u0411\u0456\u0440 \u043d\u04af\u043a\u0442\u0435 \u043c\u0435\u043d \u043e\u0493\u0430\u043d \u043f\u0435\u0440\u043f\u0435\u043d\u0434\u0438\u043a\u0443\u043b\u044f\u0440 \u0442\u04af\u0437\u0443\u0434\u0456 \u0442\u0430\u04a3\u0434\u0430\u04a3\u044b\u0437
-OrthogonalPlane=\u041f\u0435\u0440\u043f\u0435\u043d\u0434\u0438\u043a\u0443\u043b\u044f\u0440 \u0436\u0430\u0437\u044b\u049b\u0442\u044b\u049b
-OrthogonalPlane.Help=\u0411\u0456\u0440 \u043d\u04af\u043a\u0442\u0435 \u043c\u0435\u043d \u043e\u0493\u0430\u043d \u043f\u0435\u0440\u043f\u0435\u043d\u0434\u0438\u043a\u0443\u043b\u044f\u0440 \u0442\u04af\u0437\u0443\u0434\u0456 \u0442\u0430\u04a3\u0434\u0430\u04a3\u044b\u0437
Other=\u0411\u0430\u0441\u049b\u0430
OutputObjects=\u0428\u044b\u0493\u044b\u0441 \u043e\u0431\u044a\u0435\u043a\u0442\u0456\u043b\u0435\u0440\u0456
Overlay=\u0421\u044b\u0440\u0442\u049b\u044b \u049b\u0430\u0431\u0430\u0442
@@ -395,8 +393,6 @@ Parabola=\u041f\u0430\u0440\u0430\u0431\u043e\u043b\u0430
Parabola.Help=\u0411\u0456\u0440 \u043d\u04af\u043a\u0442\u0435 \u043c\u0435\u043d \u0434\u0438\u0440\u0435\u043a\u0442\u0440\u0438\u0441\u0430\u043d\u044b \u0431\u0435\u043b\u0433\u0456\u043b\u0435\u04a3\u0456\u0437
Parallel=\u041f\u0430\u0440\u0430\u043b\u043b\u0435\u043b\u044c \u0442\u04af\u0437\u0443
Parallel.Help=\u0411\u0456\u0440 \u043d\u04af\u043a\u0442\u0435 \u043c\u0435\u043d \u043e\u0493\u0430\u043d \u043f\u0430\u0440\u0430\u043b\u043b\u0435\u043b\u044c \u0442\u04af\u0437\u0443\u0434\u0456 \u0431\u0435\u043b\u0433\u0456\u043b\u0435\u04a3\u0456\u0437
-ParallelPlane=\u041f\u0430\u0440\u0430\u043b\u043b\u0435\u043b\u044c \u0436\u0430\u0437\u044b\u049b\u0442\u044b\u049b
-ParallelPlane.Help=\u0411\u0456\u0440 \u043d\u04af\u043a\u0442\u0435 \u043c\u0435\u043d \u043e\u0493\u0430\u043d \u043f\u0430\u0440\u0430\u043b\u043b\u0435\u043b\u044c \u0436\u0430\u0437\u044b\u049b\u0442\u044b\u049b \u0431\u0435\u043b\u0433\u0456\u043b\u0435\u04a3\u0456\u0437
Paste=\u049a\u043e\u044e
PasteDataFromClipboard=\u0410\u0439\u044b\u0440\u0431\u0430\u0441\u0442\u0430\u0443 \u0431\u0443\u0444\u0435\u0440\u0456\u043d\u0435\u043d \u0430\u043b\u044b\u043f, \u049b\u043e\u044e
PasteSpecial=\u0415\u0440\u0435\u043a\u0448\u0435 \u049b\u043e\u044e
@@ -410,10 +406,6 @@ Perspective.Primary=\u041d\u0435\u0433\u0456\u0437\u0433\u0456
Perspective.TableAndGraphics=\u041a\u0435\u0441\u0442\u0435 \u0436\u04d9\u043d\u0435 \u0413\u0440\u0430\u0444\u0438\u043a\u0430
Perspective.Whiteboard=\u0410\u049b \u0422\u0430\u049b\u0442\u0430
Perspectives=\u041a\u0435\u043b\u0431\u0435\u0442\u0442\u0435\u0440
-PlanePointLine=\u0411\u0456\u0440 \u043d\u04af\u043a\u0442\u0435 \u043c\u0435\u043d \u0442\u04af\u0437\u0443 \u0430\u0440\u049b\u044b\u043b\u044b \u0441\u0430\u043b\u044b\u043d\u0493\u0430\u043d \u0436\u0430\u0437\u044b\u049b\u0442\u044b\u049b
-PlanePointLine.Help=\u0411\u0456\u0440 \u043d\u04af\u043a\u0442\u0435 \u043c\u0435\u043d \u0442\u04af\u0437\u0443\u0434\u0456 \u0442\u0430\u04a3\u0434\u0430\u04a3\u044b\u0437
-PlaneThreePoint=\u04ae\u0448 \u043d\u04af\u043a\u0442\u0435 \u0430\u0440\u049b\u044b\u043b\u044b \u0441\u0430\u043b\u044b\u043d\u0493\u0430\u043d \u0436\u0430\u0437\u044b\u049b\u0442\u044b\u049b
-PlaneThreePoint.Help=\u04ae\u0448 \u043d\u04af\u043a\u0442\u0435 \u0442\u0430\u04a3\u0434\u0430\u04a3\u044b\u0437
Point=\u0416\u0430\u04a3\u0430 \u043d\u04af\u043a\u0442\u0435
Point.Help=\u0413\u0440\u0430\u0444\u0438\u043a\u0430\u043b\u044b\u049b \u041a\u04e9\u0440\u0456\u043d\u0456\u0441 \u0430\u043b\u0430\u04a3\u044b\u043d\u0430, \u0442\u04af\u0437\u0443\u0433\u0435, \u0444\u0443\u043d\u043a\u0446\u0438\u044f\u0493\u0430 \u043d\u0435\u043c\u0435\u0441\u0435 \u043a\u043e\u043d\u0443\u0441\u0442\u044b\u049b \u049b\u0438\u043c\u0430\u0493\u0430 \u0431\u0430\u0441\u044b\u04a3\u044b\u0437.
PointCapturing=\u041d\u04af\u043a\u0442\u0435\u043b\u0435\u0440\u0434\u0456\u04a3 \u0431\u0430\u0439\u043b\u0430\u043d\u0443\u044b
@@ -437,8 +429,6 @@ Power=\u041a\u04af\u0448
Preview=\u0410\u043b\u0434\u044b\u043d-\u0430\u043b\u0430 \u043a\u04e9\u0440\u0443
Print=\u0411\u0430\u0441\u044b\u043f \u0448\u044b\u0493\u0430\u0440\u0443
PrintPreview=\u0411\u0430\u0441\u044b\u043f \u0448\u044b\u0493\u0430\u0440\u0430\u0442\u044b\u043d \u043d\u04b1\u0441\u049b\u0430\u0441\u044b\u043d \u0430\u043b\u0434\u044b\u043d-\u0430\u043b\u0430 \u043a\u04e9\u0440\u0443
-Prism=\u041f\u0440\u0438\u0437\u043c\u0430
-Prism.Help=\u041a\u04e9\u043f\u0431\u04b1\u0440\u044b\u0448\u0442\u044b \u043d\u0435\u043c\u0435\u0441\u0435 (\u043d\u04af\u043a\u0442\u0435\u043b\u0435\u0440\u0434\u0456) \u0431\u0435\u043b\u0433\u0456\u043b\u0435\u04a3\u0456\u0437 \u0434\u0435 \u043e\u0493\u0430\u043d \u043f\u0430\u0440\u0430\u043b\u043b\u0435\u043b\u044c \u0431\u043e\u043b\u0430\u0442\u044b\u043d \u0435\u043a\u0456\u043d\u0448\u0456 \u0431\u0435\u0442\u0442\u0456\u04a3 \u0430\u043b\u0493\u0430\u0448\u049b\u044b \u043d\u04af\u043a\u0442\u0435\u0441\u0456\u043d \u0442\u0430\u04a3\u0434\u0430\u04a3\u044b\u0437
Probability=\u042b\u049b\u0442\u0438\u043c\u0430\u043b\u0434\u044b\u049b
ProbabilityCalculator=\u042b\u049b\u0442\u0438\u043c\u0430\u043b\u0434\u044b\u049b\u0442\u044b\u04a3 \u0435\u0441\u0435\u043f\u0442\u0435\u0433\u0456\u0448\u0456
ProbabilityCalculator.Help=\u042b\u049b\u0442\u0438\u043c\u0430\u043b\u0434\u044b\u049b\u0442\u0430\u0440\u0434\u044b \u0435\u0441\u0435\u043f\u0442\u0435\u0443\u0433\u0435 \u0430\u0440\u043d\u0430\u043b\u0493\u0430\u043d \u0431\u0435\u0442
@@ -479,8 +469,6 @@ ResidualPlot=\u049a\u0430\u043b\u0434\u044b\u049b\u0442\u0430\u0440
Result=\u049a\u043e\u0440\u044b\u0442\u044b\u043d\u0434\u044b
ReturnAngleInverseTrig=\u041a\u0435\u0440\u0456 \u0442\u0440\u0438\u0433\u043e\u043d\u043e\u043c\u0435\u0442\u0440\u0438\u044f\u043b\u044b\u049b \u0444\u0443\u043d\u043a\u0446\u0438\u044f\u0434\u0430\u0493\u044b \u0431\u04b1\u0440\u044b\u0448\u0442\u044b \u049b\u0430\u0439\u0442\u0430\u0440\u0443
RightAngleStyle=\u0422\u0456\u043a \u0431\u04b1\u0440\u044b\u0448\u0442\u044b\u04a3 \u0442\u04af\u0440\u0456
-RightPrism=\u0422\u0456\u043a \u043f\u0440\u0438\u0437\u043c\u0430
-RightPrism.Help=\u041a\u04e9\u043f\u0431\u04b1\u0440\u044b\u0448\u0442\u044b \u0448\u0435\u0440\u0442\u0456\u04a3\u0456\u0437, \u043d\u0435\u043c\u0435\u0441\u0435 \u043a\u04e9\u043f\u0431\u04b1\u0440\u044b\u0448\u0442\u044b \u0442\u0430\u04a3\u0434\u0430\u043f \u0448\u0430\u043c\u0430\u0441\u044b\u043d \u0435\u043d\u0433\u0456\u0437\u0456\u04a3\u0456\u0437
RightProb=\u0414\u04b1\u0440\u044b\u0441 \u0436\u0430\u049b\u0442\u044b
RigidPolygon=\u0411\u0435\u043a\u0456\u0442\u0456\u043b\u0433\u0435\u043d \u043a\u04e9\u043f\u0431\u04b1\u0440\u044b\u0448
RigidPolygon.Help=\u0411\u0430\u0440\u043b\u044b\u049b \u0442\u04e9\u0431\u0435\u043b\u0435\u0440\u0434\u0456 \u0431\u0435\u043b\u0433\u0456\u043b\u0435\u04a3\u0456\u0437, \u043a\u0435\u0439\u0456\u043d \u0430\u043b\u0493\u0430\u0448\u049b\u044b \u0442\u04e9\u0431\u0435\u043d\u0456 \u049b\u0430\u0439\u0442\u0430\u0434\u0430\u043d \u0442\u0430\u04a3\u0434\u0430\u04a3\u044b\u0437
@@ -697,8 +685,6 @@ VectorPolygon=\u0412\u0435\u043a\u0442\u043e\u0440\u043b\u044b\u049b \u041a\u04e
VectorPolygon.Help=\u0411\u0430\u0440\u043b\u044b\u049b \u0442\u04e9\u0431\u0435\u043b\u0435\u0440\u0434\u0456 \u0448\u0435\u0440\u043a\u0435\u043d\u043d\u0435\u043d \u043a\u0435\u0439\u0456\u043d \u0431\u0456\u0440\u0456\u043d\u0448\u0456 \u0442\u04e9\u0431\u0435\u043d\u0456 \u049b\u0430\u0439\u0442\u0430\u0434\u0430\u043d \u0448\u0435\u0440\u0442\u0456\u04a3\u0456\u0437
VerticalScrollbars=\u0422\u0456\u0433\u0456\u043d\u0435\u043d \u043e\u0440\u043d\u0430\u043b\u0430\u0441\u049b\u0430\u043d \u0436\u044b\u043b\u0436\u044b\u0442\u049b\u044b\u0448\u0442\u0430\u0440
View=\u041a\u04e9\u0440\u0456\u043d\u0456\u0441
-ViewInFrontOf=\u0410\u043b\u0434\u044b\u043d\u0434\u0430\u0493\u044b \u043a\u04e9\u0440\u0456\u043d\u0456\u0441
-ViewInFrontOf.Help=\u0422\u0430\u04a3\u0434\u0430\u043b\u0493\u0430\u043d \u043e\u0431\u044a\u0435\u043a\u0442\u0456\u043d\u0456\u04a3 \u0430\u043b\u0434\u044b\u043d\u0434\u0430\u0493\u044b \u043a\u04e9\u0440\u0456\u043d\u0456\u0441\u0442\u0456 \u04e9\u0437\u0433\u0435\u0440\u0442\u0443
Views=\u041a\u04e9\u0440\u0456\u043d\u0456\u0441\u0442\u0435\u0440
VisualStyle=\u0424\u043e\u043d
VisualStyle.Help=\u041e\u0431\u044a\u0435\u043a\u0442\u0456\u043b\u0435\u0440\u0434\u0456\u04a3 \u049b\u0430\u0441\u0438\u0435\u0442\u0442\u0435\u0440\u0456\u043d \u0430\u0443\u044b\u0441\u0442\u044b\u0440\u0443 \u04af\u0448\u0456\u043d \u043e\u043b\u0430\u0440\u0493\u0430 \u0431\u0430\u0441\u044b\u04a3\u044b\u0437 \u043d\u0435\u043c\u0435\u0441\u0435 \u0442\u0456\u043a \u0442\u04e9\u0440\u0442\u0431\u04b1\u0440\u044b\u0448\u0442\u044b \u0442\u0430\u04a3\u0434\u0430\u04a3\u044b\u0437
diff --git a/geogebra/properties/menu_ko.properties b/geogebra/properties/menu_ko.properties
index 8f40321..4607c5e 100644
--- a/geogebra/properties/menu_ko.properties
+++ b/geogebra/properties/menu_ko.properties
@@ -1,5 +1,5 @@
ANOVA=\uc544\ub178\ubc14
-About=GeoGebra \uc815\ubcf4
+About=\uc9c0\uc624\uc9c0\ube0c\ub77c \uc815\ubcf4
Accents=\uac15\uc870\ud45c\uc2dc
AccentsExt=\ub458 \uc774\uc0c1 \uac15\uc870\ud45c\uc2dc
ActionObjectTools=\uc6c0\uc9c1\uc774\ub294 \ub300\uc0c1 \ub3c4\uad6c
@@ -8,7 +8,7 @@ Adjustment=\uc870\uc815
Advanced=\uace0\uae09 \uae30\ub2a5
AlgebraDescriptions=\ub300\uc218 \ud45c\ud604
AllCommands=\ubaa8\ub4e0 \uba85\ub839
-AllowRescaling=\uc7ac\uacc4\uc0b0
+AllowRescaling=\ubaa8\ub4e0 \ub300\uc0c1 \uc7ac\uacc4\uc0b0
AllowTooltips=\ub3c4\uad6c \ub3c4\uc6c0\ub9d0 \ubcf4\uc774\uae30
AlternativeHypothesis=\ub300\ub9bd\uac00\uc124
AlternativeHypothesis.short=\ub300\ub9bd\uac00\uc124
@@ -19,7 +19,7 @@ AngleFixed.Help=\ud68c\uc804\uc2dc\ud0ac \uc810, \uc911\uc2ec\uc810\uc744 \uc120
AngleUnit=\uac01\ub3c4 \ub2e8\uc704
AngularBisector=\uac01\uc758 \uc774\ub4f1\ubd84\uc120
AngularBisector.Help=\uc138 \uc810 \ub610\ub294 \ub450 \uc9c1\uc120\uc744 \uc120\ud0dd\ud558\uc138\uc694
-ApplyDefaults=\uae30\ubcf8 \uc124\uc815 \uc801\uc6a9
+ApplyDefaults=\uae30\ubcf8\uc124\uc815\uc0ac\ud56d\uc744 \uc801\uc6a9
Area=\ub113\uc774
Area.Help=\ub2e4\uac01\ud615, \uc6d0 \ub610\ub294 \uc6d0\ubfd4\uace1\uc120(\uc774\ucc28\uace1\uc120)\uc744 \uc120\ud0dd\ud558\uc138\uc694
Ascending=\uc99d\uac00
@@ -77,7 +77,7 @@ ClearRows=\uc5ec\ub7ec \ud589 \uc9c0\uc6b0\uae30
ClearSelection=\uc120\ud0dd \uc9c0\uc6b0\uae30
ClearTrace=\ubaa8\ub4e0 \uc790\ucde8 \uc9c0\uc6b0\uae30
Clipboard=\ud074\ub9bd\ubcf4\ub4dc
-ClipboardMessage=\ud074\ub9bd\ubcf4\ub4dc \ub0b4\ubcf4\ub0b4\uae30\uac00 \uc131\uacf5\ud588\uc2b5\ub2c8\ub2e4. HTML\uc744 \ud3b8\uc9d1\ud55c \ud6c4, \uc6d0\ud558\ub294 LMS (\uc608. \ubb34\ub4e4) \uc5d0 \ubd99\uc5ec \ub123\uc73c\uc138\uc694.
+ClipboardMessage=\ud074\ub9bd\ubcf4\ub4dc \ub0b4\ubcf4\ub0b4\uae30\uac00 \uc131\uacf5\ud588\uc2b5\ub2c8\ub2e4. HTML\uc744 \ud3b8\uc9d1\ud55c \ud6c4, \uc6d0\ud558\ub294 LMS (Learning Management System; \ud559\uc2b5\uad00\ub9ac\uc2dc\uc2a4\ud15c, \uc608. \ubb34\ub4e4) \uc5d0 \ubd99\uc5ec \ub123\uc73c\uc138\uc694.
Close=\ub2eb\uae30
CloseAll=\ubaa8\ub450 \ub2eb\uae30
CloseFile=\ud30c\uc77c \ub2eb\uae30
@@ -96,7 +96,7 @@ ComplexNumber=\ubcf5\uc18c\uc218
ComplexNumber.Help=\ubcf5\uc18c\uc218\ub97c \ub9cc\ub4e4\uae30 \uc704\ud574 \uae30\ud558\ucc3d\uc744 \ud074\ub9ad\ud558\uc138\uc694.
ConciseCode=\ucf54\ub4dc \uc815\ub9ac
ConciseUsingCSE5=cse5\ub97c \uc774\uc6a9\ud55c \uc815\ub9ac
-Condition.ShowObject=\ub300\uc0c1\uc744 \ubcf4\uc774\uae30 \uc704\ud55c \uc870\uac74
+Condition.ShowObject=\ub300\uc0c1\uc774 \ub098\ud0c0\ub098\uae30 \uc704\ud55c \uc870\uac74
Conditions=\uc870\uac74
ConfidenceInterval=\uc2e0\ub8b0 \uad6c\uac04
ConfidenceLevel=\uc2e0\ub8b0 \uc218\uc900
@@ -114,8 +114,8 @@ CopyToInputBar=\uc785\ub825\ucc3d\uc73c\ub85c \ubcf5\uc0ac
CopyToSpreadsheet=\uc2a4\ud504\ub808\ub4dc\uc2dc\ud2b8\uc5d0 \ubcf5\uc0ac
CopyVisualStyle=\uc2a4\ud0c0\uc77c \ubcf5\uc0ac
CopyVisualStyle.Help=\ub300\uc0c1\uc744 \uba3c\uc800 \uc120\ud0dd\ud558\uace0, \ub2e4\ub978 \ub300\uc0c1\uc744 \ud074\ub9ad\ud558\uc138\uc694
-Count=\uc138\uae30
-CountCells=\uc120\ud0dd\ub41c \uc140\uc5d0\uc11c \uac12\uc758 \uac2f\uc218 \uc138\uae30
+Count=\ub3c4\uc218
+CountCells=\uc120\ud0dd\ud55c \uc140\uc758 \uac2f\uc218 \uc138\uae30
CountCells.Help=\uc140\uc744 \uc120\ud0dd\ud558\uc138\uc694.
Create=\ub9cc\ub4e4\uae30
CreateCurveFit=\ucd94\uc138\uc120
@@ -124,7 +124,7 @@ CreateList=\ub9ac\uc2a4\ud2b8 \ub9cc\ub4e4\uae30
CreateList.Help=\uc140\uc744 \uc120\ud0dd \ud6c4, \ub3c4\uad6c \ubc84\ud2bc\uc744 \ud074\ub9ad\ud558\uc138\uc694.
CreateListGraphicsView=\ub9ac\uc2a4\ud2b8 \ub9cc\ub4e4\uae30
CreateListGraphicsView.Help=\ub300\uc0c1 \uc8fc\ubcc0\uc5d0 \uc0ac\uac01\ud615\uc73c\ub85c \uc601\uc5ed\uc744 \uc120\ud0dd\ud558\uc138\uc694.
-CreateListOfPoints=\uc810\uc758 \ub9ac\uc2a4\ud2b8 \uc0dd\uc131
+CreateListOfPoints=\uc810\uc758 \ub9ac\uc2a4\ud2b8 \ub9cc\ub4e4\uae30
CreateListOfPoints.Help=\uc140\uc744 \uc120\ud0dd \ud6c4, \ub3c4\uad6c \ubc84\ud2bc\uc744 \ud074\ub9ad\ud558\uc138\uc694.
CreateMatrix=\ud589\ub82c \ub9cc\ub4e4\uae30
CreateMatrix.Help=\uc140\uc744 \uc120\ud0dd \ud6c4, \ub3c4\uad6c \ubc84\ud2bc\uc744 \ud074\ub9ad\ud558\uc138\uc694.
@@ -143,8 +143,8 @@ DataColumn=\uc790\ub8cc \uc5f4
DataColumnName=\uc790\ub8cc \uc5f4 \uc774\ub984
DataTitle=\uc790\ub8cc \uc81c\ubaa9
DecimalPlaces=\uc18c\uc218 \uc790\ub9bf\uc218
-Default.Restore=\ucc98\uc74c \uc0c1\ud0dc\ub85c \ub418\ub3cc\ub9ac\uae30
-Default.Set=\ucc98\uc74c \uc0c1\ud0dc\ub85c \uc124\uc815
+Default.Restore=\uae30\ubcf8\uc124\uc815\uc0ac\ud56d\uc73c\ub85c \ub418\ub3cc\ub9ac\uae30
+Default.Set=\uae30\ubcf8\uc124\uc815\uc0ac\ud56d\uc73c\ub85c \uc800\uc7a5
Degree=\ub3c4( \u02da )
DegreesOfFreedom.short=\uc790\uc720\ub3c4
DegreesOfFreedom1.short=\uc790\uc720\ub3c4 1
@@ -194,7 +194,7 @@ Ellipse3.Help=\ub450 \ucd08\uc810\uacfc \ud0c0\uc6d0 \uc704\uc758 \ud55c \uc810\
EnableLabelDrags=\uc774\ub984 \ub4dc\ub798\uadf8 \uac00\ub2a5
EnableRightClick=\uc624\ub978\ucabd \ud074\ub9ad, \ud655\ub300, \ud0a4\ubcf4\ub4dc \ud3b8\uc9d1 \uac00\ub2a5
English=\uc601\uc5b4
-EnterAppletAddress=GeoGebra \uc560\ud50c\ub9bf\uc758 \uc6f9 \uc8fc\uc18c\ub97c \uc785\ub825\ud558\uc138\uc694.
+EnterAppletAddress=\uc9c0\uc624\uc9c0\ube0c\ub77c \uc560\ud50c\ub9bf\uc758 \uc6f9 \uc8fc\uc18c\ub97c \uc785\ub825\ud558\uc138\uc694.
EnterWebAddress=\uc6f9 \uc8fc\uc18c\ub97c \uc785\ub825\ud558\uc138\uc694.
EqualVariance=\ub3d9\uc77c\ud55c \ubd84\uc0b0
Equation=\ubc29\uc815\uc2dd
@@ -230,7 +230,7 @@ FixedToGrid=\uaca9\uc790\uc5d0 \uace0\uc815
FontSize=\uae00\uc790 \ud06c\uae30
ForegroundColor=\uc804\uacbd\uc0c9
Formulas=\uc218\uc2dd
-FrakturLetters=Fraktur\uccb4
+FrakturLetters=\ub3c5\uc77c\uccb4(Fractur)
Frequency=\ube48\ub3c4
FrequencyPolygon=\ub3c4\uc218\ubd84\ud3ec\ub2e4\uac01\ud615
FrequencyTable=\ub3c4\uc218\ubd84\ud3ec\ud45c
@@ -241,7 +241,7 @@ Functionality=\uae30\ub2a5
GUIFontSize=\uba54\ub274 \uae00\uc790 \ud06c\uae30
General=\uc77c\ubc18
GeneralTools=\uc77c\ubc18 \ub3c4\uad6c
-GenerateCode=\ucf54\ub4dc \ub9cc\ub4e4\uae30
+GenerateCode=\ucf54\ub4dc \uc0dd\uc131
GeogebraToAsymptoteExport=\uc9c0\uc624\uc9c0\ube0c\ub77c\ub97c Asymptote\ub85c \ub0b4\ubcf4\ub0b4\uae30
Geometry=\uae30\ud558
German=\ub3c5\uc77c\uc5b4
@@ -257,7 +257,7 @@ Help=\ub3c4\uc6c0\ub9d0
Hidden.Dashed=\ube57\uae08
Hidden.Invisible=\ubcf4\uc774\uc9c0 \uc54a\uc74c
Hidden.Unchanged=\ubcc0\uacbd\ub418\uc9c0 \uc54a\uc74c
-HiddenLineStyle='\ubcf4\uc774\uc9c0 \uc54a\ub294 \uc120' \uc2a4\ud0c0\uc77c
+HiddenLineStyle=\ubcf4\uc774\uc9c0 \uc54a\ub294 \uc120 \uc2a4\ud0c0\uc77c
HighQuality=\ub192\uc740 \ud488\uc9c8
Histogram=\ud788\uc2a4\ud1a0\uadf8\ub7a8
HomeDirectory=\ud648 \ub514\ub809\ud1a0\ub9ac
@@ -289,9 +289,9 @@ Intersect=\ub450 \ub300\uc0c1\uc758 \uad50\uc810
Intersect.Help=\ub450 \uc9c1\uc120\uc744 \ub530\ub85c \uc120\ud0dd\ud558\uac70\ub098, \uc9c1\uc811 \uad50\ucc28\ubd80\ubd84\uc744 \ud074\ub9ad\ud558\uc138\uc694
IntersectionCurve=\uad50\uc120
IntersectionCurve.Help=\ub450 \uace1\uba74\uc758 \uad50\uc120\uc744 \ubcf4\uc5ec\uc90d\ub2c8\ub2e4.
-Interval=\uad6c\uac04
+Interval=\uacc4\uae09
IntervalProb=\uc591\uce21
-IntervalType=\uad6c\uac04
+IntervalType=\uacc4\uae09 \ud0c0\uc785
InvertSelection=\uc120\ud0dd \ubc18\uc804
Isometric=\ub4f1\uc7a5\ubcc0\ud658
JavaOnly=\uc790\ubc14\ub85c\ub9cc \ub0b4\ubcf4\ub0b4\uae30
@@ -308,7 +308,7 @@ Labeling.automatic=\uc790\ub3d9
Labeling.off=\uc0c8\ub85c\uc6b4 \ub300\uc0c1\uc5d0 \ub808\uc774\ube14 \ubcf4\uc774\uc9c0 \uc54a\uc74c
Labeling.on=\ubaa8\ub4e0 \uc0c8\ub85c\uc6b4 \ub300\uc0c1\uc5d0 \ub808\uc774\ube14 \ubcf4\uc784
Labeling.pointsOnly=\uc0c8\ub85c\uc6b4 \uc810\ub9cc \ub808\uc774\ube14 \ubcf4\uc784
-Labeling.propertiesDefault=\uae30\ubcf8 \uc124\uc815\uc0ac\ud56d \uc0ac\uc6a9
+Labeling.propertiesDefault=\uae30\ubcf8\uc124\uc815\uc0ac\ud56d\uc744 \uc0ac\uc6a9
Labels=\ub808\uc774\ube14\uc744 \ubcf4\uc774\uac70\ub098 \uac10\ucda4
Landscape=\ub113\uac8c
Language=\uc5b8\uc5b4
@@ -327,7 +327,7 @@ ListOfPoints=\uc810\uc758 \ub9ac\uc2a4\ud2b8
Load=\uc5f4\uae30
Location=\uc704\uce58
Locus=\uc790\ucde8 \uadf8\ub9ac\uae30
-Locus.Help=\uc790\ucde8 \uc810\uc744 \uc120\ud0dd \ud6c4, \ub300\uc0c1 \uc704\uc758 \uc810\uc744 \uc120\ud0dd\ud558\uc138\uc694
+Locus.Help=\uc790\ucde8\ub97c \uadf8\ub9b4 \uc810\uc744 \uc120\ud0dd \ud6c4, \ub300\uc0c1 \uc704\uc758 \uc810(\ub610\ub294 \uc2ac\ub77c\uc774\ub354)\uc744 \uc120\ud0dd\ud558\uc138\uc694
Log=\ub85c\uadf8
Logistic=\ub85c\uc9c0\uc2a4\ud2f1
LookAndFeel=\ub8e9\uc564\ud544(Look and Feel)
@@ -339,11 +339,11 @@ MarginOfError.short=\uc624\ucc28\uc758 \ud55c\uacc4
MathematicalFunctions=\uc218\ud559 \ud568\uc218
Matrices=\ud589\ub82c
Matrix=\ud589\ub82c
-MaxCells=\uc120\ud0dd\ub41c \uc140\uc758 \ucd5c\ub313\uac12 \uad6c\ud558\uae30
+MaxCells=\uc120\ud0dd\ud55c \uc140\uc758 \ucd5c\ub313\uac12 \uad6c\ud558\uae30
MaxCells.Help=\uc140\uc744 \uc120\ud0dd\ud558\uc138\uc694.
Maximum.short=\ucd5c\ub313\uac12
Mean=\ud3c9\uade0
-MeanCells=\uc140\uc758 \uc9d1\ud569\uc758 \ud3c9\uade0\uac12 \uad6c\ud558\uae30
+MeanCells=\uc120\ud0dd\ud55c \uc140\uc758 \ud3c9\uade0\uac12 \uad6c\ud558\uae30
MeanCells.Help=\uc140\uc744 \uc120\ud0dd\ud558\uc138\uc694.
MeanDifference=\ud3c9\uade0 \ucc28\uc774
MeanSquare.short=\ud3c9\uade0 \uc81c\uacf1
@@ -354,7 +354,7 @@ Median=\uba54\ub514\uc548
Metal=\uba54\ud0c8
Midpoint=\uc911\uc810 \ub610\ub294 \uc911\uc2ec
Midpoint.Help=\ub450 \uc810, \uc120\ubd84, \uc6d0 \ub610\ub294 \uc6d0\ubfd4\uace1\uc120(\uc774\ucc28\uace1\uc120)\uc744 \uc120\ud0dd\ud558\uc138\uc694
-MinCells=\uc120\ud0dd\ub41c \uc140\uc758 \ucd5c\uc19f\uac12 \uad6c\ud558\uae30
+MinCells=\uc120\ud0dd\ud55c \uc140\uc758 \ucd5c\uc19f\uac12 \uad6c\ud558\uae30
MinCells.Help=\uc140\uc758 \uc9d1\ud569\uc744 \uc120\ud0dd\ud558\uc138\uc694.
Minimum.short=\ucd5c\uc19f\uac12
MirrorAtCircle=\uc6d0\uc5d0 \uc810\uc744 \ub300\uce6d
@@ -371,7 +371,7 @@ MoveRotate=\uc810\uc744 \uc911\uc2ec\uc73c\ub85c \ud68c\uc804
MoveRotate.Help=\ud68c\uc804 \uc911\uc2ec\uc810\uc744 \uc120\ud0dd \ud6c4, \ub300\uc0c1\uc744 \ub4dc\ub798\uadf8 \ud558\uc138\uc694
MovementTools=\uc774\ub3d9 \ub3c4\uad6c
MultiVarStats=\ub2e4\ubcc0\uc218 \ubd84\uc11d
-MultiVarStats.Help=\uc120\ud0dd\ub41c \uc5f4\ub85c\ubd80\ud130 2\uac1c \uc774\uc0c1\uc758 \ub370\uc774\ud130 \uc9d1\ud569\uc744 \ubd84\uc11d\ud569\ub2c8\ub2e4.
+MultiVarStats.Help=\uc120\ud0dd\ud55c \uc5f4\ub85c\ubd80\ud130 2\uac1c \uc774\uc0c1\uc758 \ub370\uc774\ud130 \uc9d1\ud569\uc744 \ubd84\uc11d\ud569\ub2c8\ub2e4.
MultiVariableStatistics=\ub2e4\ubcc0\uc218 \ud1b5\uacc4
Name=\uc774\ub984
NameAndDraw=\uc774\ub984 \ubd99\uc774\uace0 \uadf8\ub9ac\uae30
@@ -390,7 +390,7 @@ Numeric=\uc218\uce58 \uc5f0\uc0b0
Numeric.Help=\uc218\uce58 \uc5f0\uc0b0
Objects=\ub300\uc0c1
OneVarStats=\uc77c\ubcc0\uc218 \ubd84\uc11d
-OneVarStats.Help=\uc120\ud0dd\ub41c \uc140\ub85c\ubd80\ud130 \uac12\uc744 \ubd84\uc11d\ud569\ub2c8\ub2e4.
+OneVarStats.Help=\uc120\ud0dd\ud55c \uc140\ub85c\ubd80\ud130 \uac12\uc744 \ubd84\uc11d\ud569\ub2c8\ub2e4.
OneVariable=\uc77c\ubcc0\uc218
OneVariableInference=\uc77c\ubcc0\uc218 \ucd94\ub860
OneVariableStatistics=\uc77c\ubcc0\uc218 \ud1b5\uacc4
@@ -404,9 +404,7 @@ OperationTable=\uc5f0\uc0b0\ud45c
Options=\uc120\ud0dd\uc0ac\ud56d
Orthogonal=\uc218\uc9c1\uc120
Orthogonal.Help=\ud55c \uc810, \uadf8\ub9ac\uace0 \uad6c\ud558\ub294 \uc9c1\uc120\uacfc \uc218\uc9c1\uc774 \ub420 \uc9c1\uc120\uc744 \uc120\ud0dd\ud558\uc138\uc694
-OrthogonalPlane=\uc218\uc9c1\ud3c9\uba74
-OrthogonalPlane.Help=\ud55c \uc810\uacfc \uc218\uc9c1\uc120\uc744 \uc120\ud0dd\ud558\uc138\uc694.
-Other=\ub2e4\ub978
+Other=\uadf8 \uc678 \uc0c9\uc0c1
OutputObjects=\ucd9c\ub825 \ub300\uc0c1
Overlay=\uacb9\uccd0\ubcf4\uae30
OverlayFrequencyPolygon=\ub3c4\uc218\ubd84\ud3ec\ub2e4\uac01\ud615\uc744 \uacb9\uccd0\ubcf4\uae30
@@ -417,8 +415,6 @@ Parabola=\ud3ec\ubb3c\uc120
Parabola.Help=\uc810\uacfc \uc900\uc120\uc744 \uc120\ud0dd\ud558\uc138\uc694
Parallel=\ud3c9\ud589\uc120
Parallel.Help=\ud55c \uc810, \uadf8\ub9ac\uace0 \uad6c\ud558\ub294 \uc9c1\uc120\uacfc \ud3c9\ud589\uc774 \ub420 \uc9c1\uc120\uc744 \uc120\ud0dd\ud558\uc138\uc694
-ParallelPlane=\ud3c9\ud589\ud55c \ud3c9\uba74
-ParallelPlane.Help=\ud55c \uc810\uc744 \uc120\ud0dd\ud558\uace0, \ud3c9\ud589\ud55c \ud3c9\uba74\uc744 \uc120\ud0dd\ud558\uc138\uc694.
Paste=\ubd99\uc774\uae30
PasteDataFromClipboard=\ud074\ub9bd\ubcf4\ub4dc\ub85c\ubd80\ud130 \uc790\ub8cc\ub97c \ubd99\uc774\uc138\uc694
PasteSpecial=\ud2b9\ubcc4\ud55c \ub300\uc0c1 \ubd99\uc774\uae30
@@ -432,10 +428,6 @@ Perspective.Primary=\ucd08\ub4f1\uc218\ud559
Perspective.TableAndGraphics=\ud45c\uc640 \uadf8\ub798\ud504
Perspective.Whiteboard=\uc804\uc790\uce60\ud310
Perspectives=\ub3c4\uad6c\uc0c1\uc790\uad6c\uc131
-PlanePointLine=\ud55c \uc810\uacfc \ud55c \uc9c1\uc120\uc744 \ud3ec\ud568\ud558\ub294 \ud3c9\uba74
-PlanePointLine.Help=\ud55c \uc810\uacfc \ud55c \uc9c1\uc120\uc744 \uc120\ud0dd\ud558\uc138\uc694.
-PlaneThreePoint=\uc138 \uc810\uc744 \uc9c0\ub098\ub294 \ud3c9\uba74
-PlaneThreePoint.Help=\uc138 \uc810\uc744 \uc120\ud0dd\ud558\uc138\uc694.
Point=\uc0c8\ub85c\uc6b4 \uc810
Point.Help=\uae30\ud558\ucc3d\uc774\ub098 \uc9c1\uc120, \ud568\uc218, \uace1\uc120 \uc704\ub97c \ud074\ub9ad\ud558\uc138\uc694
PointCapturing=\uc810 \ubd80\ucc29
@@ -459,8 +451,6 @@ Power=\uac70\ub4ed\uc81c\uacf1
Preview=\ubbf8\ub9ac\ubcf4\uae30
Print=\uc778\uc1c4
PrintPreview=\uc778\uc1c4 \ubbf8\ub9ac\ubcf4\uae30
-Prism=\uac01\uae30\ub465
-Prism.Help=\ub2e4\uac01\ud615 (\ub610\ub294 \uc810\ub4e4)\uc744 \uc120\ud0dd \ud6c4, \ub450\ubc88\uc9f8 \ud3c9\ud589\ud55c \uba74\uc758 \uccab \uc810\uc744 \uc120\ud0dd\ud558\uc138\uc694.
Probability=\ud655\ub960
ProbabilityCalculator=\ud655\ub960 \uacc4\uc0b0\uae30
ProbabilityCalculator.Help=\uac01\uc885 \ud1b5\uacc4 \ubd84\ud3ec\uc5d0\uc11c \ud655\ub960\uc744 \uacc4\uc0b0\ud574 \uc8fc\ub294 \uacc4\uc0b0\uae30\uc785\ub2c8\ub2e4.
@@ -501,8 +491,6 @@ ResidualPlot=\uc794\ucc28\uadf8\ub9bc
Result=\uacb0\uacfc
ReturnAngleInverseTrig=\uc5ed\uc0bc\uac01\ud568\uc218\ub85c\ubd80\ud130 \uac01\ub3c4 \ubc18\ud658
RightAngleStyle=\uc9c1\uac01 \uc2a4\ud0c0\uc77c
-RightPrism=\uc9c1\uac01\uae30\ub465
-RightPrism.Help=\ub2e4\uac01\ud615\uc744 \ub4dc\ub798\uadf8\ud558\uac70\ub098, \ub2e4\uac01\ud615\uc744 \uc120\ud0dd \ud6c4 \ub192\uc774\ub97c \uc785\ub825\ud558\uc138\uc694.
RightProb=\uc6b0\uce21
RigidPolygon=\uace0\uc815\ub41c \ub2e4\uac01\ud615
RigidPolygon.Help=\ubaa8\ub4e0 \uaf2d\uc9d3\uc810\uc744 \uc120\ud0dd \ud6c4, \ucc98\uc74c \uaf2d\uc9d3\uc810\uc744 \ud074\ub9ad\ud558\uc138\uc694.
@@ -543,10 +531,10 @@ Semicolon=\uc138\ubbf8\ucf5c\ub860
Separator=\ubd84\ub9ac\uc790
SetClasssesManually=\uc0ac\uc6a9\uc790 \uacc4\uae09 \uc124\uc815
SetToCurrentLocation=\ud604\uc7ac \uc704\uce58\uc5d0 \uace0\uc815
-Settings=\uc124\uc815
-Settings.ResetDefault=\ucc98\uc74c \uc124\uc815\uc73c\ub85c \ub418\ub3cc\ub9ac\uae30
+Settings=\uc124\uc815\uc0ac\ud56d
+Settings.ResetDefault=\uae30\ubcf8\uc124\uc815\uc0ac\ud56d\uc73c\ub85c \ub418\ub3cc\ub9ac\uae30
Settings.Save=\uc124\uc815\uc0ac\ud56d \uc800\uc7a5
-Share=\uacf5\uc720
+Share=\uc9c0\uc624\uc9c0\ube0c\ub77c\ud29c\ube0c\uc5d0 \uacf5\uc720
Show=\ubcf4\uc774\uae30
ShowAtTop=\ub9e8 \uc704\uc5d0 \ubcf4\uc774\uae30
ShowAxesGrid=\ucd95 / \uaca9\uc790 \ubcf4\uc774\uae30
@@ -616,7 +604,7 @@ Step=\ub2e8\uacc4
Substitute=\uce58\ud658
Substitute.Help=\uc2dd\uc758 \uce58\ud658\ud560 \ubd80\ubd84\uc785\ub2c8\ub2e4.
SubstituteDialog=\uce58\ud658 \ub300\ud654\uc0c1\uc790
-SumCells=\uc120\ud0dd\ud55c \uc140\uc758 \uac12\uc744 \ub354\ud569\ub2c8\ub2e4.
+SumCells=\uc120\ud0dd\ud55c \uc140\uc758 \ud569 \uad6c\ud558\uae30
SumCells.Help=\uc6d0\ud558\ub294 \uc140\uc744 \uc120\ud0dd\ud558\uc138\uc694.
SumsAndIntegrals=\ud569(\u03a3)\uacfc \uc801\ubd84
Symbol.And=\uadf8\ub9ac\uace0
@@ -650,7 +638,7 @@ Tab=\ud0ed
Table=\ud45c
Tangent=\uc811\uc120
Tangent.Help=\uc810\uc744 \uc120\ud0dd \ud6c4, \uc6d0, \uc6d0\ubfd4\uace1\uc120(\uc774\ucc28\uace1\uc120), \ud568\uc218\ub97c \uc120\ud0dd\ud558\uc138\uc694
-Text=\ud14d\uc2a4\ud2b8\ub97c \uc785\ub825
+Text=\ud14d\uc2a4\ud2b8 \uc785\ub825
Text.Help=\uae30\ud558\ucc3d\uc744 \ud074\ub9ad\ud558\uac70\ub098, \ub610\ub294 \uc704\uce58\ub97c \uc9c0\uc815\ud558\uae30 \uc704\ud55c \uc810\uc744 \ud074\ub9ad\ud558\uc138\uc694
TextFieldAction=\ud14d\uc2a4\ud2b8 \ud544\ub4dc \ub9cc\ub4e4\uae30
TextFieldAction.Help=\ud14d\uc2a4\ud2b8 \ud544\ub4dc\ub97c \ub9cc\ub4e4\uae30 \uc704\ud574 \uae30\ud558\ucc3d\uc744 \ud074\ub9ad\ud558\uc138\uc694.
@@ -684,7 +672,7 @@ Transparent=\ud22c\uba85
Transpose=\uc804\uce58
Tutorials=\uc548\ub0b4\uc11c
TwoVarStats=\uc774\ubcc0\uc218 \ud68c\uadc0\ubd84\uc11d
-TwoVarStats.Help=\uc120\ud0dd\ub41c \uc140\ub85c\ubd80\ud130 \uc22b\uc790\uc30d\uc744 \ubd84\uc11d\ud569\ub2c8\ub2e4.
+TwoVarStats.Help=\uc120\ud0dd\ud55c \uc140\ub85c\ubd80\ud130 \uc22b\uc790\uc30d\uc744 \ubd84\uc11d\ud569\ub2c8\ub2e4.
TwoVariable=\uc774\ubcc0\uc218
TwoVariableInference=\uc774\ubcc0\uc218 \ucd94\ub860
Type.Algebra=\ub300\uc218
@@ -693,6 +681,7 @@ Type.Chart=\ucc28\ud2b8
Type.Conic=\uc6d0\ubfd4\uace1\uc120(\uc774\ucc28\uace1\uc120)
Type.DiscreteMath=\uc774\uc0b0\uc218\ud559
Type.FunctionsAndCalculus=\ud568\uc218\uc640 \ubbf8\uc801\ubd84
+Type.GeoGebra=\uc9c0\uc624\uc9c0\ube0c\ub77c
Type.Geometry=\uae30\ud558
Type.List=\ub9ac\uc2a4\ud2b8
Type.Logic=\ub17c\ub9ac
@@ -707,7 +696,7 @@ Type.VectorAndMatrix=\ubca1\ud130\uc640 \ud589\ub82c
Undo=\ub418\ub3cc\ub9ac\uae30
UngroupObjectes=\uadf8\ub8f9 \ud574\uc81c
Untitled=\uc81c\ubaa9 \uc5c6\uc74c
-UploadGeoGebraTube=GeoGebraTube\ub85c \uc62c\ub9ac\uae30
+UploadGeoGebraTube=\uc9c0\uc624\uc9c0\ube0c\ub77c\ud29c\ube0c\uc5d0 \uc62c\ub9ac\uae30
UpperLimit=\uc6b0\uadf9\ud55c
UseBrowserForJS=\uc790\ubc14\uc2a4\ud06c\ub9bd\ud2b8\ub97c \uc704\ud55c \ube0c\ub77c\uc6b0\uc800 \uc0ac\uc6a9
UseButtonsAndCheckboxes=\ubc84\ud2bc\uacfc \uccb4\ud06c\ubc15\uc2a4 \uc0ac\uc6a9
@@ -724,8 +713,6 @@ VectorPolygon=\ubca1\ud130 \ub2e4\uac01\ud615
VectorPolygon.Help=\ubaa8\ub4e0 \uc810\uc744 \uc120\ud0dd\ud55c \ud6c4, \ub2e4\uc2dc \ucc98\uc74c \uc810\uc744 \uc120\ud0dd\ud558\uc138\uc694.
VerticalScrollbars=\uc218\uc9c1 \uc2a4\ud06c\ub864\ubc14
View=\ubcf4\uae30
-ViewInFrontOf=\uc120\ud0dd \ubc29\ud5a5\uc73c\ub85c \ubcf4\uae30
-ViewInFrontOf.Help=\ud074\ub9ad\ud55c \ub300\uc0c1\uc758 \uc2dc\uc810\uc73c\ub85c \ubc29\ud5a5\uc774 \uc804\ud658\ub429\ub2c8\ub2e4.
Views=\ubcf4\uae30
VisualStyle=\uc2a4\ud0c0\uc77c
VisualStyle.Help=\ub300\uc0c1\uc744 \ud074\ub9ad\ud558\uac70\ub098, \ub300\uc0c1\uc758 \uc124\uc815\uc0ac\ud56d\uc744 \ubcc0\uacbd\ud558\uae30 \uc704\ud574\uc11c \ub9c8\uc6b0\uc2a4\ub85c \uc120\ud0dd\ud558\uc138\uc694.
diff --git a/geogebra/properties/menu_lt.properties b/geogebra/properties/menu_lt.properties
index 8c8a380..9aa6967 100644
--- a/geogebra/properties/menu_lt.properties
+++ b/geogebra/properties/menu_lt.properties
@@ -388,8 +388,6 @@ OperationTable=Veiksm\u0173 lentel\u0117
Options=Pasirinkimai
Orthogonal=Statmena ties\u0117
Orthogonal.Help=Pasirinkite ta\u0161k\u0105 ir statmen\u0105 ties\u0119
-OrthogonalPlane=Statmena plok\u0161tuma
-OrthogonalPlane.Help=Pasirinkite ta\u0161k\u0105 ir statmen\u0173 ties\u0119
Other=Kitas
OutputObjects=I\u0161vesti objektai
Overlay=Perdengti
@@ -401,8 +399,6 @@ Parabola=Parabol\u0117
Parabola.Help=Pasirinkite ta\u0161k\u0105 ir direktris\u0119
Parallel=Lygiagreti ties\u0117
Parallel.Help=Pasirinkite ta\u0161k\u0105 ir lygiagre\u010di\u0105 ties\u0119
-ParallelPlane=Lygiagreti plok\u0161tuma
-ParallelPlane.Help=Pasirinkti ta\u0161k\u0105 ir lygiagre\u010di\u0105 plok\u0161tum\u0105
Paste=\u012ed\u0117ti
PasteDataFromClipboard=\u012ed\u0117ti i\u0161karp\u0105
PasteSpecial=\u012eterpti specialiu b\u016bdu
@@ -415,10 +411,6 @@ Perspective.Primary=Pagrindinis
Perspective.TableAndGraphics=Lentel\u0117s ir grafika
Perspective.Whiteboard=Balta lenta
Perspectives=Perspektyvos
-PlanePointLine=Plok\u0161tuma per ta\u0161k\u0105 ir ties\u0119
-PlanePointLine.Help=Pasirinkti ta\u0161k\u0105 ir ties\u0119
-PlaneThreePoint=Plok\u0161tuma per tris ta\u0161kus
-PlaneThreePoint.Help=Pasirinkite tris ta\u0161kus
Point=Naujas ta\u0161kas
Point.Help=Spregtelkite bet kur
PointCapturing=Ta\u0161k\u0173 surinkimas
@@ -442,8 +434,6 @@ Power=Laipsnis
Preview=Per\u017ei\u016bra
Print=Spausdinti
PrintPreview=Spaudinio per\u017ei\u016bra
-Prism=Prizm\u0117
-Prism.Help=Pasirinkite daugiakamp\u012f arba ta\u0161kus ir pirm\u0105 lygiagretaus pavir\u0161iaus ta\u0161k\u0105
Probability=Tikimyb\u0117
ProbabilityCalculator=Tikimybi\u0173 skai\u010diuotuvas
ProbabilityCalculator.Help=Dialogas tikimybi\u0173 skai\u010diavimui
@@ -484,8 +474,6 @@ ResidualPlot=LiekanosGrafikas
Result=Rezultatas
ReturnAngleInverseTrig=Gra\u017einti kamp\u0105 i\u0161 atvirk\u0161tini\u0173 trigonometrini\u0173 funkcij\u0173
RightAngleStyle=Taisyklingo kampo stilius
-RightPrism=Taisyklingoti prizm\u0117
-RightPrism.Help=Tempkite daugiakamp\u012f arba pasirinkite poligon\u0105 ir \u012fveskite auk\u0161t\u012f
RightProb=Sta\u010di\u0173 kamp\u0173
RigidPolygon=Tvirtas daugiakampis
RigidPolygon.Help=Pasirinkite visas kra\u0161tines, tuomet pirm\u0105 kra\u0161tin\u0119
@@ -705,8 +693,6 @@ VectorPolygon=Vektori\u0173 daugiakampis
VectorPolygon.Help=Pasirinkite vir\u0161\u016bnes, tuomet paspauskite ant pirmosios vir\u0161\u016bn\u0117s
VerticalScrollbars=Vertikalios slankjuost\u0117s
View=Rodyti
-ViewInFrontOf=\u017di\u016br\u0117ti priekyje
-ViewInFrontOf.Help=Keisti vaizd\u0105 prie\u0161ais paspaust\u0105 objekt\u0105
Views=Vaizdai
VisualStyle=Vaizdo stiliai
VisualStyle.Help=Spauskite ant objekt\u0173 arba pasirinkite sta\u010diakampiu nor\u0117dami keisti \u0161i\u0173 nustatymus
diff --git a/geogebra/properties/menu_mk.properties b/geogebra/properties/menu_mk.properties
index 487825e..4457ed9 100644
--- a/geogebra/properties/menu_mk.properties
+++ b/geogebra/properties/menu_mk.properties
@@ -397,8 +397,6 @@ OperationTable=\u041e\u043f\u0435\u0440\u0430\u0446\u0438\u0458\u0430 \u0422\u04
Options=\u041e\u043f\u0446\u0438\u0438
Orthogonal=\u041d\u043e\u0440\u043c\u0430\u043b\u0430
Orthogonal.Help=\u041e\u0437\u043d\u0430\u0447\u0438 \u0442\u043e\u0447\u043a\u0430 \u0438 \u043d\u043e\u0440\u043c\u0430\u043b\u0430
-OrthogonalPlane=\u041d\u043e\u0440\u043c\u0430\u043b\u043d\u0430 \u0440\u0430\u043c\u043d\u0438\u043d\u0430
-OrthogonalPlane.Help=\u0421\u0435\u043b\u0435\u043a\u0442\u0438\u0440\u0430\u0458 \u0442\u043e\u0447\u043a\u0430 \u0438 \u043d\u043e\u0440\u043c\u0430\u043b\u043d\u0430 \u043b\u0438\u043d\u0438\u0458\u0430
Other=\u0414\u0440\u0443\u0433\u043e
OutputObjects=\u0418\u0437\u043b\u0435\u0437\u043d\u0438 \u043e\u0431\u0458\u0435\u043a\u0442\u0438
Overlay=\u0421\u043f\u043e\u0458
@@ -411,8 +409,6 @@ Parabola=\u041f\u0430\u0440\u0430\u0431\u043e\u043b\u0430
Parabola.Help=\u041e\u0437\u043d\u0430\u0447\u0438 \u0442\u043e\u0447\u043a\u0430 \u0438 \u0434\u0438\u0440\u0435\u043a\u0442\u0440\u0438\u0441\u0430
Parallel=\u041f\u0430\u0440\u0430\u043b\u0435\u043b\u0430
Parallel.Help=\u041e\u0437\u043d\u0430\u0447\u0438 \u0442\u043e\u0447\u043a\u0430 \u0438 \u043f\u0430\u0440\u0430\u043b\u0435\u043b\u043d\u0430 \u043f\u0440\u0430\u0432\u0430
-ParallelPlane=\u041f\u0430\u0440\u0430\u043b\u0435\u043b\u043d\u0430 \u0420\u0430\u043c\u043d\u0438\u043d\u0430
-ParallelPlane.Help=\u0421\u0435\u043b\u0435\u043a\u0442\u0438\u0440\u0430\u0458 \u0442\u043e\u0447\u043a\u0430 \u0438 \u043f\u0430\u0440\u0430\u043b\u0435\u043b\u043d\u0430 \u0440\u0430\u043c\u043d\u0438\u043d\u0430
Paste=\u041b\u0435\u043f\u0435\u045a\u0435
PasteDataFromClipboard=\u0412\u043c\u0435\u0442\u043d\u0438 \u043f\u043e\u0434\u0430\u0442\u043e\u0446\u0438 \u043e\u0434 \u043a\u043b\u0438\u043f\u0431\u043e\u0440\u0434-\u043e\u0442
PasteSpecial=\u0417\u0430\u043b\u0435\u043f\u0438 \u0421\u043f\u0435\u0446\u0438\u0458\u0430\u043b\u043d\u043e
@@ -426,10 +422,6 @@ Perspective.Primary=\u041e\u0441\u043d\u043e\u0432\u0435\u043d
Perspective.TableAndGraphics=\u0422\u0430\u0431\u0435\u043b\u0430\u0440\u0435\u043d \u0438 \u0433\u0440\u0430\u0444\u0438\u0447\u043a\u0438 \u043f\u0440\u0438\u043a\u0430\u0437
Perspective.Whiteboard=\u0422\u0430\u0431\u043b\u0430
Perspectives=\u041f\u0440\u0438\u043a\u0430\u0437\u0438
-PlanePointLine=\u0420\u0430\u043c\u043d\u0438\u043d\u0430 \u043d\u0438\u0437 \u0442\u043e\u0447\u043a\u0430 \u0438 \u043b\u0438\u043d\u0438\u0458\u0430
-PlanePointLine.Help=\u0421\u0435\u043b\u0435\u043a\u0442\u0438\u0440\u0430\u0458 \u0442\u043e\u0447\u043a\u0430 \u0438 \u043b\u0438\u043d\u0438\u0458\u0430
-PlaneThreePoint=\u0420\u0430\u043c\u043d\u0438\u043d\u0430 \u043d\u0438\u0437 \u0442\u0440\u0438 \u0442\u043e\u0447\u043a\u0438
-PlaneThreePoint.Help=\u0421\u0435\u043b\u0435\u043a\u0442\u0438\u0440\u0430\u0458 \u0442\u0440\u0438 \u0442\u043e\u0447\u043a\u0438
Point=\u041d\u043e\u0432\u0430 \u0442\u043e\u0447\u043a\u0430
Point.Help=\u041a\u043b\u0438\u043a\u043d\u0435\u0442\u0435 \u0432\u043e \u043f\u043e\u0432\u0440\u0448\u0438\u043d\u0430\u0442\u0430 \u0437\u0430 \u0446\u0440\u0442\u0430\u045a\u0435 \u0438\u043b\u0438 \u043d\u0430 \u043f\u0440\u0430\u0432\u0430, \u0444\u0443\u043a\u0446\u0438\u0458\u0430 \u0438\u043b\u0438 \u043a\u0440\u0438\u0432\u0430
PointCapturing=\u0412\u0440\u0437\u0443\u0432\u0430\u045a\u0435 \u043d\u0430 \u0442\u043e\u0447\u043a\u0430 \u0437\u0430 \u043c\u0440\u0435\u0436\u0430
@@ -453,8 +445,6 @@ Power=\u041c\u043e\u045c
Preview=\u041f\u0440\u0438\u043a\u0430\u0437
Print=\u041f\u0435\u0447\u0430\u0442\u0438
PrintPreview=\u041f\u0440\u0438\u043a\u0430\u0437 \u0437\u0430 \u043f\u0435\u0447\u0430\u0442\u0435\u045a\u0435
-Prism=\u041f\u0440\u0438\u0437\u043c\u0430
-Prism.Help=\u0421\u0435\u043b\u0435\u043a\u0442\u0438\u0440\u0430\u0458 \u043c\u043d\u043e\u0433\u0443\u0430\u0433\u043e\u043b\u043d\u0438\u043a (\u0438\u043b\u0438 \u0442\u043e\u0447\u043a\u0438) \u0438 \u0435\u0434\u043d\u0430 \u0442\u043e\u0447\u043a\u0430 \u0437\u0430 \u0432\u0440\u0432\u043e\u0442
Probability=\u0412\u0435\u0440\u043e\u0458\u0430\u0442\u043d\u043e\u0441\u0442
ProbabilityCalculator=\u041f\u0440\u0435\u0441\u043c\u0435\u0442\u0443\u0432\u0430\u045a\u0435 \u043d\u0430 \u0412\u0435\u0440\u043e\u0458\u0430\u0442\u043d\u043e\u0441\u0442
ProbabilityCalculator.Help=\u0414\u0438\u0458\u0430\u043b\u043e\u0433 \u041f\u0440\u043e\u0437\u043e\u0440\u0435\u0446 \u0437\u0430 \u043f\u0440\u0435\u0441\u043c\u0435\u0442\u0443\u0432\u0430\u045a\u0435 \u0432\u0435\u0440\u043e\u0458\u0430\u0442\u043d\u043e\u0441\u0442\u0438
@@ -496,8 +486,6 @@ ResidualPlot=\u041e\u0441\u0442\u0430\u0442\u043e\u043a \u043d\u0430 \u041f\u043
Result=\u0420\u0435\u0437\u0443\u043b\u0442\u0430\u0442
ReturnAngleInverseTrig=\u0412\u0440\u0430\u0442\u0438 \u0430\u0433\u043e\u043b \u043e\u0434 \u0438\u043d\u0432\u0435\u0440\u0437\u043d\u0430 \u0442\u0440\u0438\u0433\u043e\u043d\u043e\u043c\u0435\u0442\u0440\u0438\u0441\u043a\u0430 \u0444\u0443\u043d\u043a\u0446\u0438\u0458\u0430
RightAngleStyle=\u041e\u0437\u043d\u0430\u043a \u0437\u0430 \u043f\u0440\u0430\u0432\u0438\u043e\u0442 \u0430\u0433\u043e\u043b
-RightPrism=\u041f\u0440\u0430\u0432\u0438\u043b\u043d\u0430 \u043f\u0440\u0438\u0437\u043c\u0430
-RightPrism.Help=\u041f\u043e\u0432\u043b\u0435\u0447\u0438 \u043c\u043d\u043e\u0433\u0443\u0430\u0433\u043e\u043b\u043d\u0438\u043a, \u0438\u043b\u0438 \u0441\u0435\u043b\u0435\u043a\u0442\u0438\u0440\u0430\u0458 \u043c\u043d\u043e\u0433\u0443\u0430\u0433\u043e\u043b\u043d\u0438\u043a \u0438 \u0432\u043d\u0435\u0441\u0438 \u0432\u0438\u0441\u0438\u043d\u0430
RightProb=\u0414\u0435\u0441\u043d\u0430 \u0421\u0442\u0440\u0430\u043d\u0430
RigidPolygon=\u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u0435\u043d \u041c\u043d\u043e\u0433\u0443\u0430\u0433\u043e\u043b\u043d\u0438\u043a
RigidPolygon.Help=\u0421\u0435\u043b\u0435\u043a\u0442\u0438\u0440\u0430\u0458 \u0433\u0438 \u0441\u0438\u0442\u0435 \u0442\u0435\u043c\u0438\u045a\u0430, \u043f\u043e\u0442\u043e\u0430 \u043a\u043b\u0438\u043a\u043d\u0438 \u043d\u0430 \u043f\u0440\u0432\u043e\u0442\u043e \u0442\u0435\u043c\u0435 \u043f\u043e\u0432\u0442\u043e\u0440\u043d\u043e
@@ -730,8 +718,6 @@ VectorPolygon=\u0412\u0435\u043a\u0442\u043e\u0440 \u043d\u0430 \u043c\u043d\u04
VectorPolygon.Help=\u0421\u0435\u043b\u0435\u043a\u0442\u0438\u0440\u0430\u0458 \u0433\u0438 \u0441\u0438\u0442\u0435 \u0442\u0435\u043c\u0438\u045a\u0430, \u043f\u043e\u0442\u043e\u0430 \u043a\u043b\u0438\u043a\u043d\u0438 \u043d\u0430 \u043f\u0440\u0432\u043e\u0442\u043e \u0442\u0435\u043c\u0435
VerticalScrollbars=\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u0435\u043d \u041b\u0438\u0437\u0433\u0430\u0447
View=\u041f\u043e\u0433\u043b\u0435\u0434
-ViewInFrontOf=\u041f\u043e\u0433\u043b\u0435\u0434 \u043e\u0434\u043d\u0430\u043f\u0440\u0435\u0434
-ViewInFrontOf.Help=\u041f\u0440\u043e\u043c\u0435\u043d\u0438 \u0433\u043e \u043f\u043e\u0433\u043b\u0435\u0434\u043e\u0442 \u043e\u0434\u043d\u0430\u043f\u0440\u0435\u0434 \u043d\u0430 \u043a\u043b\u0438\u043a\u043d\u0430\u0442\u0438\u043e\u0442 \u043e\u0431\u0458\u0435\u043a\u0442
Views=\u041f\u043e\u0433\u043b\u0435\u0434\u0438
VisualStyle=\u0412\u0438\u0437\u0443\u0435\u043b\u0435\u043d \u0421\u0442\u0438\u043b
VisualStyle.Help=\u041a\u043b\u0438\u043a\u043d\u0438 \u043d\u0430 \u043e\u0431\u0458\u0435\u043a\u0442\u043e\u0442 \u0438\u043b\u0438 \u043f\u043e\u0432\u043b\u0435\u0447\u0438 \u043a\u0432\u0430\u0434\u0440\u0430\u0442 \u0437\u0430 \u0434\u0430 \u0433\u0438 \u043f\u0440\u043e\u043c\u0435\u043d\u0438\u0448 \u043e\u043f\u0446\u0438\u0438\u0442\u0435
diff --git a/geogebra/properties/menu_ms.properties b/geogebra/properties/menu_ms.properties
index 588b0cb..d75c56b 100644
--- a/geogebra/properties/menu_ms.properties
+++ b/geogebra/properties/menu_ms.properties
@@ -378,8 +378,6 @@ OperationTable=Jadual Operasi
Options=Opsyen-opsyen
Orthogonal=Garis Serenjang
Orthogonal.Help=Pilih titk dan garis serenjang
-OrthogonalPlane=Satah Serenjang
-OrthogonalPlane.Help=Pilih titik dan garis serenjang
Other=Lain
OutputObjects=Objek-objek Output
Overlay=Tindihan Atas
@@ -390,8 +388,6 @@ PairedT=T Berpasangan
Parabola.Help=Pilih titik dan direktriks
Parallel=Garis Selari
Parallel.Help=Pilih titik dan garis selari
-ParallelPlane=Satah Selari
-ParallelPlane.Help=Pilih titik dan satah selari
Paste=Tampal
PasteDataFromClipboard=Tampal Data daripada Papanklip
PasteSpecial=Tampal Istimewa
@@ -405,10 +401,6 @@ Perspective.Primary=Utama
Perspective.TableAndGraphics=Jadual & Grafik
Perspective.Whiteboard=Papan Putih
Perspectives=Perspektif-perspektif
-PlanePointLine=Satah melalui satu titik dan satu garis
-PlanePointLine.Help=Pilih titik dan garis
-PlaneThreePoint=Satah melalui tiga titik
-PlaneThreePoint.Help=Pilih tiga titik
Point=Titik Baru
Point.Help=Klik pada Paparan Grafik atau atas garis, fungsi, atau lengkung
PointCapturing=Penangkapan Titik
@@ -432,8 +424,6 @@ Power=Kuasa
Preview=Pratonton
Print=Cetak
PrintPreview=Pratonton Cetakan
-Prism=Prisma
-Prism.Help=Pilih poligon (atau titik-titik) dan titik pertama pada muka selari yang kedua
Probability=Kebarangkalian
ProbabilityCalculator=Kalkulator Kebarangkalian
ProbabilityCalculator.Help=Dialog untuk mengira kebarangkalian
@@ -473,8 +463,6 @@ ResidualPlot=PlotSisa
Result=Hasil
ReturnAngleInverseTrig=Kembali sudut daripada fungsi-fungsi songsang trigonometrik
RightAngleStyle=Gaya Sudut Tegak
-RightPrism=Prisma Tegak
-RightPrism.Help=Heret poligon, atau pilih poligon dan masukkan altitud
RightProb=Sisi Kanan
RigidPolygon=Poligon Tegar
RigidPolygon.Help=Pilih semua bucu, kemudian klik semula bucu pertama
@@ -692,8 +680,6 @@ VectorPolygon=Poligon Vektor
VectorPolygon.Help=Pilih semua bucu, kemudian klik semula bucu pertama
VerticalScrollbars=Bar Skrol Menegak
View=Paparan
-ViewInFrontOf=Paparan di depan
-ViewInFrontOf.Help=Tukar paparan di depan objek yang diklik
Views=Paparan-paparan
VisualStyle=Stail Visual
VisualStyle.Help=Klik pada objek-objek atau heret satu segiempat tepat untuk menukar sifat-sifat mereka
diff --git a/geogebra/properties/menu_ne.properties b/geogebra/properties/menu_ne.properties
index c18c525..9aab004 100644
--- a/geogebra/properties/menu_ne.properties
+++ b/geogebra/properties/menu_ne.properties
@@ -1,5 +1,8 @@
+ANOVA=\u090f\u0928\u094b\u092d\u093e
About=\u092c\u093e\u0930\u0947\u092e\u093e
Advanced=\u0909\u0928\u094d\u0928\u0924
+Alpha.short=\u0905\u0932\u094d\u092b\u093e
+AlternativeHypothesis.short=\u092c\u0948\u0915\u0932\u094d\u092a\u093f\u0915
Angle=\u0915\u094b\u0923
Angle.Help=\u0924\u0940\u0928 \u0935\u093e \u0926\u0941\u0907 \u092c\u093f\u0928\u094d\u0926\u0941\u0939\u0930\u0941 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
AngleFixed=\u0928\u093e\u092a\u0938\u0939\u093f\u0924\u0915\u094b \u0915\u094b\u0923
@@ -10,14 +13,28 @@ AngularBisector.Help=\u0924\u0940\u0928 \u092c\u093f\u0928\u094d\u0926\u0941\u
Area=\u0915\u094d\u0937\u0947\u0924\u094d\u0930\u092b\u0932
Area.Help=\u092c\u0939\u0941\u092d\u0941\u091c,\u0935\u0943\u0924 \u0935\u093e \u0915\u094b\u0928\u093f\u0915 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
Axes=\u0905\u0915\u094d\u0937\u0939\u0930\u0941
+Back=\u092a\u091b\u093e\u0921\u0940
BasicLineTools=\u0930\u0947\u0916\u093f\u092f \u0914\u091c\u093e\u0930
+Beta.short=\u092c\u093f\u091f\u093e
+BetweenGroups=\u0926\u0941\u0908 \u0938\u092e\u0941\u0939\u0915\u094b \u092c\u0940\u091a\u092e\u093e
+BlackboardLetters=\u092c\u094d\u0932\u092f\u093e\u0915\u092c\u094b\u0930\u094d\u0921 \u0905\u0936\u094d\u0930\u0930\u0939\u0930\u0941
Blue=\u0928\u093f\u0932\u094b
Bold=\u092e\u094b\u091f\u094b \u0935\u093e \u0938\u094d\u092a\u0937\u094d\u091f
+Boxplot=\u092c\u0915\u094d\u0938\u092a\u094d\u0932\u091f
+Brackets=\u0915\u094b\u0937\u094d\u091f\u0915\u0939\u0930\u0941
+Browser=\u092c\u094d\u0930\u093e\u090a\u091c\u0930
Button.Caption=\u092a\u0930\u093f\u091a\u094d\u091b\u0947\u0926
+ButtonAction=\u092c\u091f\u0928 \u0930\u093e\u0916\u094d\u0928\u0941\u0939\u094b\u0938
+ButtonAction.Help=\u092c\u091f\u0928 \u0930\u093e\u0916\u094d\u0928 \u0917\u094d\u0930\u093e\u092b\u093f\u0915\u094d\u0938 \u0926\u0943\u0937\u094d\u092f\u092e\u093e \u0915\u094d\u0932\u093f\u0915 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938
+ByLayering=\u0924\u0939\u0917\u0924 \u0930\u0941\u092a\u092e\u093e
+Calculate=\u0917\u0923\u0928\u093e, \u0932\u0947\u0916\u093e\u091c\u094b\u0916\u093e \u0917\u0930\u094d\u0928\u0941
+CalligraphicLetters=\u0915\u094d\u092f\u093e\u0932\u093f\u0917\u094d\u0930\u093e\u092b\u093f\u0915 \u0905\u0936\u094d\u0930\u0930\u0939\u0930\u0941
Cancel=\u0930\u0926\u094d\u0927 \u0917\u0930\u094d\u0928\u0941
+Cartesian=\u0915\u093e\u0930\u094d\u091f\u0936\u093f\u092f\u0928
CheckboxSize=\u0915\u094b\u0920\u093e\u0915\u094b \u0906\u0915\u093e\u0930 \u091c\u093e\u0902\u091a
CheckboxSize.Large=\u0920\u0942\u0932\u094b
CheckboxSize.Regular=\u0928\u093f\u092f\u092e\u093f\u0924
+ChooseFromFile=\u092b\u093e\u0908\u0932\u092c\u093e\u091f \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
Circle2=\u092c\u093f\u0928\u094d\u0926\u0941 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0935\u0943\u0924
Circle2.Help=\u0915\u0947\u0928\u094d\u0926\u094d\u0930\u092c\u093f\u0928\u094d\u0926\u0941 \u0905\u0928\u093f \u0915\u0941\u0928\u0948\u092c\u093f\u0928\u094d\u0926\u0941 \u0935\u0943\u0924\u0915\u094b \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
Circle3=\u0924\u0940\u0928 \u092c\u093f\u0928\u0926\u0941\u0939\u0930\u0941 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0935\u0924\u0943
@@ -33,37 +50,56 @@ CircumcircleArc3=\u0924\u0940\u0928\u092c\u093f\u0928\u094d\u0926\u0941 \u092d\u
CircumcircleArc3.Help=\u091a\u093e\u092a\u092e\u093e \u0924\u0940\u0928 \u092c\u093f\u0928\u094d\u0926\u0941\u0939\u0930\u0941 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
CircumcircleSector3=\u0924\u0940\u0928\u092c\u093f\u0928\u094d\u0926\u0941 \u092d\u090f\u0930\u091c\u093e\u0928\u0947 \u0938\u0930\u0915\u092e\u0938\u0930\u094d\u0915\u0941\u0932\u0930 \u0935\u0943\u0924\u0916\u0923\u094d\u0921
CircumcircleSector3.Help=\u0935\u0943\u0924\u0916\u0923\u094d\u0921\u092e\u093e \u0924\u0940\u0928\u092c\u093f\u0928\u094d\u0926\u0941 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
+ClassRule=\u0935\u0930\u094d\u0917 \u0928\u093f\u092f\u092e
+Classes=\u0935\u0930\u094d\u0917\u0939\u0930\u0941
ClearColumn=\u092a\u0902\u0915\u094d\u0924\u093f \u0939\u091f\u093e\u0909\u0928\u0941\u0939\u094b\u0938
ClearColumns=\u092a\u0902\u0915\u094d\u0924\u093f\u0939\u0930\u0941 \u0939\u091f\u093e\u0909\u0928\u0941\u0939\u094b\u0938
ClearRow=\u0932\u0939\u0930 \u0939\u091f\u093e\u0909\u0928\u0941\u0939\u094b\u0938
ClearRows=\u0932\u0939\u0930\u0939\u0930\u0941 \u0939\u091f\u093e\u0909\u0928\u0941\u0939\u094b\u0938
ClearSelection=\u091b\u0928\u094c\u091f \u0930\u0926\u094d\u0927 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938
+ClearTrace=\u0938\u092c\u0948 \u0938\u0902\u0915\u0947\u0924\u0939\u0930\u0941 \u0939\u091f\u093e\u090a\u0928\u0941\u0939\u094b\u0938
Clipboard=\u0915\u094d\u0932\u093f\u092a\u092c\u094b\u0930\u094d\u0921
Close=\u092c\u0928\u094d\u0926 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938
CloseAll=\u0938\u092c\u0948 \u092c\u0928\u094d\u0926 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938
CloseFile=\u092b\u093e\u092f\u0932 \u092c\u0928\u094d\u0926 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938
CmdList=\u0915\u092e\u093e\u0923\u094d\u0921\u0902 \u0938\u0941\u091a\u0940
+Coefficient=\u0915\u094b\u092b\u093f\u0938\u093f\u092f\u0928\u094d\u091f
CollapseAll=\u0938\u092c\u0948 \u0928\u0937\u094d\u091f \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938
+ColumnHeader=\u092a\u0919\u0924\u0940 \u0936\u093f\u0930\u094d\u0938\u0915
+Comma=\u0915\u092e\u093e
CommandName=\u0915\u092e\u093e\u0902\u0923\u094d\u0921 \u0928\u093e\u092e
Compasses=\u0915\u092e\u094d\u092a\u093e\u0938
Compasses.Help=\u0905\u0930\u094d\u0927\u092c\u094d\u092f\u093e\u0938\u0915\u094b\u0928\u093f\u092e\u094d\u0924\u093f \u0916\u0923\u094d\u0921 \u0935\u093e \u0926\u0941\u0907\u092c\u093f\u0928\u094d\u0926\u0941 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938 \u0905\u0928\u093f \u0915\u0947\u0928\u094d\u0926\u0943\u092c\u093f\u0928\u094d\u0926\u0941 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
+ComplexNumber=\u092e\u093f\u0936\u094d\u0930\u0940\u0924 \u0938\u0902\u0916\u094d\u092f\u093e
+ConciseCode=\u0938\u0902\u0936\u094d\u0930\u094d\u092a\u093f\u0924 \u0915\u094b\u0921
Condition.ShowObject=\u0935\u0938\u094d\u0924\u0941 \u0926\u0947\u0916\u093f\u0928\u0947 \u0905\u0935\u0938\u094d\u0925\u093e
Conditions=\u0905\u0935\u0938\u094d\u0925\u093e \u0935\u093e \u0936\u0930\u094d\u0924
+ConfidenceInterval=\u0915\u0928\u094d\u092b\u093f\u0921\u0947\u0928\u094d\u0938 \u0935\u0930\u094d\u0917
+ConfidenceLevel=\u0915\u0928\u094d\u092b\u093f\u0921\u0947\u0928\u094d\u0938 \u0924\u0939
Conic=\u0915\u094b\u0928\u093f\u0915
Conic5=\u092a\u093e\u0902\u091a\u092c\u093f\u0928\u094d\u0926\u0941 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0915\u093f\u0928\u093f\u0915
-Conic5.Help=\u0915\u093f\u0928\u093f\u0915\u092e\u093e \u092a\u093e\u0902\u091a\u092c\u093f\u0928\u094d\u0926\u0941 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
+Conic5.Help=\u0915\u094b\u0928\u093f\u0915\u092e\u093e \u092a\u093e\u0902\u091a\u092c\u093f\u0928\u094d\u0926\u0941 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
ConicMenu=\u0915\u094b\u0928\u093f\u0915
ConicSectionTools=\u0915\u094b\u0928\u093f\u0915 \u0938\u0947\u0915\u094d\u0938\u0928 \u091f\u0941\u0932
Continuity=\u0905\u0935\u093f\u091a\u094d\u091b\u093f\u0928\u0924\u093e
+Continuous=\u0905\u0935\u093f\u091b\u093f\u0928\u094d\u0928
Copy=\u0928\u0915\u094d\u0915\u0932 \u0917\u0930\u094d\u0928\u0941
+CopyToClipboard=\u0915\u094d\u0932\u093f\u092a\u092c\u094b\u0930\u094d\u0921\u092e\u093e \u0915\u092a\u093f \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938
CopyToInputBar=\u0907\u0928\u092a\u0941\u091f\u092c\u093e\u0930\u092e\u093e \u0915\u092a\u093f \u0917\u0930\u094d\u0928\u0941
CopyVisualStyle=\u092d\u093f\u091c\u0941\u092f\u0932\u094d \u0938\u094d\u091f\u093e\u092f\u0932 \u0915\u092a\u093f
CopyVisualStyle.Help=\u090f\u0909\u091f\u093e \u0935\u0938\u094d\u0924\u0941 \u091b\u093e\u0928\u093f \u0905\u0930\u0941\u092e\u093e \u0915\u094d\u0932\u093f\u0915 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938
+CountCells=\u0917\u0923\u0928\u093e
+Create=\u0930\u091a\u0928\u093e
CreateList=\u0930\u091a\u0928\u093e\u0915\u094b \u0938\u0941\u091a\u0940
+CreateListGraphicsView=\u0938\u0941\u091a\u093f\u0915\u094b \u0930\u091a\u0928\u093e
CreateListOfPoints=\u092c\u093f\u0928\u094d\u0926\u0941\u0939\u0930\u0941\u0915\u094b \u0938\u0941\u091a\u0940\u0915\u094b \u0930\u091a\u0928\u093e
CreateMatrix=\u092e\u094d\u092f\u093e\u091f\u094d\u0930\u093f\u0915\u094d\u0938\u0915\u094b \u0930\u091a\u0928\u093e
+CreateTable=\u091f\u0947\u092c\u0932\u0915\u094b \u0930\u091a\u0928\u093e
+Cumulative=\u0938\u0902\u091a\u093f\u0924\u093f
+CursiveLetters=\u0915\u0930\u094d\u0938\u093f\u092d \u0905\u0936\u094d\u0930\u0930\u0939\u0930\u0941
CustomTools=\u0915\u0938\u094d\u091f\u092e\u094d \u091f\u0941\u0932
Cut=\u0915\u093e\u091f\u094d\u0928\u0941
+Data=\u0921\u093e\u091f\u093e
DecimalPlaces=\u0926\u0936\u092e\u0932\u092c \u0938\u094d\u0925\u093e\u0928
Default.Restore=\u0921\u093f\u092b\u0932\u094d\u091f \u0930\u093f\u0938\u094d\u091f\u094b\u0930
Default.Set=\u0921\u093f\u092b\u0932\u094d\u091f \u0938\u0947\u091f
@@ -72,14 +108,33 @@ Delete=\u0935\u0938\u094d\u0924\u0941 \u092e\u0947\u091f\u094d\u0928\u0941
Delete.Help=\u0935\u0938\u094d\u0924\u0941\u0915\u094b \u091b\u0928\u094c\u091f
DeleteObjects=\u0935\u0938\u094d\u0924\u0941\u0939\u0930\u0941 \u092e\u0947\u091f\u094d\u0928\u0941
DeleteTool=\u091f\u0941\u0932 \u092e\u0947\u091f\u094d\u0928\u0941
+Delimiter=\u0921\u0940\u0932\u093f\u092e\u093f\u091f\u0930
+Derivative=\u0921\u0947\u0930\u093f\u092d\u0947\u091f\u093f\u092d
+Derivative.Help=\u092a\u094d\u0930\u0925\u092e \u0921\u0947\u0930\u093f\u092d\u0947\u091f\u0940\u092c \u092a\u0924\u094d\u0924\u093e \u0932\u0917\u093e\u090a\u0928\u0941\u0939\u094b\u0938
+Descending=\u0918\u091f\u094d\u0926\u094b \u0915\u094d\u0930\u092e
+Differences=\u092d\u093f\u0928\u094d\u0928\u0924\u093e
DilateFromPoint=\u0938\u094d\u0915\u0947\u0932\u0928\u093e\u092a\u094b\u0926\u094d\u0927\u0930\u093e \u0915\u0941\u0928\u0948\u092c\u093f\u0928\u094d\u0926\u0941\u092e\u093e \u0935\u0938\u094d\u0924\u0941\u0915\u094b \u0935\u093f\u0938\u094d\u0924\u093e\u0930\u093f\u0915\u0930\u0923
DilateFromPoint.Help=\u0935\u093f\u0938\u094d\u0924\u093e\u0930\u0940\u0915\u0930\u0923 \u0917\u0930\u094d\u0928\u0941\u092a\u0930\u094d\u0928\u0947\u0935\u0938\u094d\u0924\u0941 \u0905\u0928\u093f \u0915\u0947\u0928\u094d\u0926\u0943\u092c\u093f\u0928\u094d\u0926\u0941 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938 \u0930 \u0928\u093e\u092a\u094b \u0930\u093e\u0916\u094d\u0928\u0941\u0939\u094b\u0938
Distance=\u0926\u0941\u0930\u0940 \u0935\u093e \u0932\u092e\u094d\u092c\u093e\u0908
Distance.Help=\u0926\u0941\u0908\u092c\u093f\u0928\u094d\u0926\u0941,\u0916\u0923\u094d\u0921,\u092c\u0939\u092d\u0941\u091c \u0935\u093e \u0935\u0943\u0924 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
+Distribution=\u0935\u0930\u094d\u0917\u093f\u0915\u0930\u0923
+Distribution.Binomial=\u092c\u093e\u092f\u0928\u094b\u092e\u093f\u092f\u0932
+Distribution.Cauchy=\u0915\u0935\u094d\u091a\u0940
+Distribution.ChiSquare=\u0915\u093e\u0907 \u0938\u094d\u0915\u093e\u0935\u092f\u0930,
+Distribution.Exponential=\u090f\u0915\u094d\u0938\u092a\u094b\u0928\u0947\u0928\u094d\u0938\u093f\u092f\u0932
+Distribution.F=F \u0935\u0930\u094d\u0917\u0940\u0915\u0930\u0923
+Distribution.Gamma=\u0917\u093e\u092e\u093e
+Distribution.Hypergeometric=\u0939\u093e\u0907\u092a\u0930\u091c\u094b\u092e\u0947\u091f\u094d\u0930\u093f\u0915
+Distribution.Logistic=\u0932\u094b\u091c\u093f\u0938\u094d\u091f\u0915
+Distribution.Normal=\u0938\u093e\u092e\u093e\u0928\u094d\u092f
+Distribution.Pascal=\u092a\u093e\u0938\u094d\u0915\u0932
+Distribution.Shape=\u0906\u0915\u093e\u0930
+Distribution.StudentT=\u092c\u093f\u0927\u093e\u0930\u094d\u0925\u093f
DoYouWantToSaveYourChanges=\u0924\u092a\u093e\u0908\u0932\u0947 \u092c\u0926\u0932\u0947\u0915\u094b \u092b\u093e\u092f\u0932 \u0938\u0941\u0930\u0915\u094d\u0937\u093f\u0924 \u0917\u0930\u094d\u0928\u0941 \u091a\u093e\u0939\u0928\u0941 \u0939\u0941\u0928\u094d\u091b\u094d
DontDeleteTool=\u091f\u0941\u0932 \u0928\u092e\u0947\u091f\u094d\u0928\u0941\u0939\u094b\u0938
DontOverwrite=\u0913\u092d\u0930\u0930\u093e\u0907\u091f \u0928\u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938
DontSave=\u0938\u0941\u0930\u0915\u094d\u0937\u093f\u0924 \u0928\u0930\u093e\u0916\u094d\u0928\u0941\u0939\u094b\u0938
+DotPlot=\u0921\u091f \u092a\u094d\u0932\u091f
DrawingPadToClipboard=\u0915\u094d\u0932\u093f\u092a\u092c\u094b\u0930\u094d\u0921\u092e \u0932\u0947\u0916\u093f\u092f \u0926\u0943\u0937\u094d\u092f\u094d
DynamicColors=\u0921\u093e\u0907\u0928\u093e\u092e\u093f\u0915 \u0930\u0919\u094d\u0917\u0939\u0930\u0941
Edit=\u0938\u092e\u094d\u092a\u093e\u0926\u0928 \u0917\u0930\u094d\u0928\u0941
@@ -88,32 +143,49 @@ Ellipse3.Help=\u0908\u0932\u094d\u092a\u093f\u0938\u092e\u093e \u0926\u0941\u090
EnableLabelDrags=\u0938\u0941\u091a\u0940\u0915\u0930\u0923\u0921\u094d\u0930\u092f\u094d\u0917\u0940\u0902\u0919\u0932\u093e\u0907 \u0938\u0930\u094d\u092e\u0925 \u092a\u093e\u0930\u094d\u0928\u0941\u0939\u094b\u0938
EnableRightClick=\u0926\u093e\u0939\u093f\u0928\u0947\u092a\u091f\u093f\u0915\u093e \u092b\u093f\u091a\u0930\u0932\u093e\u0907 \u092f\u094b\u0917\u094d\u092f \u092a\u093e\u0930\u094d\u0928\u0941\u0939\u094b\u0938
English=\u0905\u0902\u0917\u094d\u0930\u0947\u091c\u0940
+Equation=\u0938\u092e\u093f\u0915\u0930\u0923
+EstimatedValue=\u0905\u0928\u0941\u092e\u093e\u0928\u093f\u0924 \u092e\u093e\u0928
+Evaluate=\u092e\u0941\u0932\u094d\u092f\u093e\u0902\u0915\u0928
+Evaluate.Help=\u0920\u093f\u0915 \u092e\u0941\u0932\u094d\u092f\u093e\u0902\u0915\u0928
Exit=\u092c\u093e\u0939\u093f\u0930
+Expand=\u092c\u093f\u0938\u094d\u0924\u093e\u0930
ExpandAll=\u0938\u092e\u094d\u092a\u0941\u0930\u094d\u0923\u092c\u093f\u0938\u094d\u0924\u093e\u0930
Export=\u0928\u093f\u0930\u094d\u092f\u093e\u0924\u094d
FastHelp=\u0936\u0940\u0918\u094d\u0930 \u092e\u0926\u094d\u0926\u0924\u094d
File=\u092b\u093e\u092f\u0932
Files=\u092b\u093e\u092f\u0932\u0939\u0930\u0941
+Filling.Image=\u092a\u094d\u0930\u0924\u093f\u092c\u093f\u092e\u094d\u092c
+Filling.Standard=\u0938\u094d\u0924\u0930\u093f\u092f
FitLine=\u0909\u092a\u092f\u0941\u0915\u094d\u0924\u0909\u0924\u092e\u094d \u0930\u0947\u0916\u093e
FitLine.Help=\u091b\u0928\u094c\u091f \u091a\u0930\u094d\u0924\u0941\u092d\u0942\u091c \u0935\u093e \u092c\u093f\u0928\u094d\u0926\u0941\u0939\u0930\u0941\u0915\u094b \u0938\u0941\u091a\u0940 \u092a\u094d\u0930\u092f\u094b\u0917\u0917\u0930\u093f \u092c\u093f\u0928\u094d\u0926\u0941 \u091b\u093e\u0928\u094d\u0928\u0942\u0939\u094b\u0938
Fix=\u0928\u093f\u0936\u094d\u091a\u093f\u0924\u094d \u0916\u0942\u0932\u094d\u0932\u093e \u0935\u093e \u092c\u0928\u094d\u0926\u094d
Fix.Help=\u0928\u093f\u0936\u094d\u091a\u093f\u0924\u0917\u0930\u094d\u0928 \u0935\u093e \u0938\u094d\u0935\u0924\u094d\u0930\u0902\u0928\u094d\u0924\u0915\u093e \u0928\u093f\u092e\u094d\u0924\u093f \u0935\u0938\u094d\u0924\u0941 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
FontSize=\u0905\u0915\u094d\u0937\u0930\u0915\u094b \u0906\u0915\u093e\u0930
+Formulas=\u0938\u0941\u0924\u094d\u0930\u0939\u0930\u0941
+Frequency=\u092c\u093e\u0930\u092e\u094d\u092c\u093e\u0930\u0924\u093e
Functionality=\u092b\u0932\u0928\u093f\u092f\u0924\u093e
General=\u0938\u093e\u092e\u093e\u0928\u094d\u092f
GeneralTools=\u0938\u093e\u092e\u093e\u0928\u094d\u092f \u091f\u0941\u0932\u094d
Geometry=\u091c\u094d\u092f\u093e\u092e\u093f\u0924\u093f
German=\u091c\u0930\u094d\u092e\u0928\u094d
+Graph=\u0932\u0947\u0916\u093e\u091a\u093f\u0924\u094d\u0930
GraphicsQuality=\u0917\u094d\u0930\u093e\u092b\u093f\u0915\u094d\u0938
Green=\u0939\u0930\u093f\u092f\u094b
Grid=\u0917\u094d\u0930\u0940\u0921
Help=\u092e\u0926\u0924\u094d
+Hidden.Dashed=\u0921\u094d\u092f\u093e\u0938
+Hidden.Invisible=\u0928\u0926\u0947\u0916\u093f\u0928\u0947
+Hidden.Unchanged=\u0928\u092c\u0926\u0932\u093f\u0928\u0947
HighQuality=\u0909\u091a\u094d\u091a\u0915\u094b\u091f\u093f
+Histogram=\u0939\u093f\u0938\u094d\u091f\u094b\u0917\u094d\u0930\u093e\u092e
Hyperbola3=\u0939\u093e\u0907\u092a\u0930\u0935\u094b\u0932\u093e
Hyperbola3.Help=\u0939\u093e\u0907\u092a\u0930\u0935\u094b\u0932\u093e\u092e\u093e \u0926\u0941\u0907\u0935\u091f\u093e \u092b\u094b\u0915\u093f \u0930 \u090f\u0909\u091f\u093e \u092c\u093f\u0928\u094d\u0926\u0941 \u091b\u093e\u0928\u094d\u0928\u0939\u094b\u0938\u094d
+Hypergeometric.population=\u091c\u0928\u0938\u0902\u0916\u094d\u092f\u093e
+Hypergeometric.sample=\u0928\u092e\u0941\u0928\u093e
Icon=\u0906\u0907\u0915\u0928\u094d
Image=\u091a\u093f\u0924\u094d\u0930 \u0930\u093e\u0916\u094d\u0928\u0941\u0939\u094b\u0938
Image.Help=\u0905\u0935\u0938\u094d\u0925\u093e \u091c\u0928\u093e\u0909\u0928 \u0921\u094d\u0930\u0908\u0919 \u0915\u094d\u0937\u0947\u0924\u094d\u0930 \u0935\u093e \u092c\u093f\u0928\u094d\u0926\u0941\u092e\u093e \u0915\u094d\u0932\u093f\u0915 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938
+Images=\u091a\u093f\u0924\u094d\u0930\u0939\u0930\u0941
InputField=\u0908\u0928\u092a\u0941\u091f\u092c\u093e\u0930
InputField.Help=\u0908\u0928\u092a\u0941\u091f\u092c\u093e\u0930\u092e\u093e \u0915\u092a\u093f \u0917\u0930\u094d\u0928 \u0935\u0938\u094d\u0924\u0941\u0915\u094b \u0928\u093e\u092e \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
InputObjects=\u0908\u0928\u092a\u0941\u091f \u0935\u0938\u094d\u0924\u0941
@@ -123,6 +195,8 @@ InsertLeft=\u0926\u094d\u0930\u0947\u092c\u0947\u0924\u093f\u0930 \u0930\u093e\u
InsertRight=\u0926\u093e\u0939\u093f\u0928\u0947\u0924\u093f\u0930 \u0930\u093e\u0916\u094d\u0928\u0941\u0939\u094b\u0938
Intersect=\u0926\u0941\u0908 \u0935\u0938\u094d\u0924\u0941\u0915\u094b \u092a\u094d\u0930\u0924\u093f\u091b\u094d\u0926\u0947\u0928\u094d
Intersect.Help=\u0926\u0941\u0908 \u0935\u0938\u094d\u0924\u0941\u0939\u0930\u0941 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938 \u0935\u093e \u0938\u0940\u0927\u0948 \u092a\u094d\u0930\u0924\u093f\u091b\u094d\u0926\u0947\u0928\u092e\u093e \u0915\u094d\u0932\u093f\u0915 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938
+IntervalProb=\u0935\u0930\u094d\u0917 \u0905\u0928\u094d\u0924\u0930
+IntervalType=\u0935\u0930\u094d\u0917 \u092a\u094d\u0930\u0915\u093e\u0930
Isometric=\u0906\u0907\u0938\u094b\u092e\u0947\u091f\u094d\u0930\u093f\u0915
Join=\u0926\u0941\u0907\u092c\u093f\u0928\u094d\u0926\u0941\u0939\u0930\u0941 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0930\u0947\u0916\u093e
Join.Help=\u0926\u0941\u0908\u092c\u093f\u0928\u094d\u0926\u0941\u0939\u0930\u0941 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
@@ -135,20 +209,36 @@ Labeling.propertiesDefault=\u0921\u093f\u092b\u0932\u094d\u091f \u0917\u0941\u09
Labels=\u0938\u0941\u091a\u0940\u0915\u0930\u0923 \u0926\u0947\u0916\u093e\u0909\u0928\u0941 \u0935\u093e \u0932\u0942\u0915\u093e\u0909\u0928\u0941
Landscape=\u0932\u094d\u092f\u093e\u0923\u094d\u0921\u0902\u0938\u094d\u0915\u0947\u092a
Language=\u092d\u093e\u0937\u093e
+Layout=\u092a\u094d\u0930\u093e\u0930\u0941\u092a
+LeftProb=\u0926\u0947\u092c\u094d\u0930\u0947\u0924\u093f\u0930
License=\u0905\u0928\u0941\u092e\u0924\u093f\u092a\u0924\u094d\u0930
+Lightness=\u0939\u0932\u094d\u0915\u093e\u092a\u0928\u093e
LineBisector=\u0932\u092e\u094d\u092c\u093e\u0930\u094d\u0927\u0915
LineBisector.Help=\u0926\u0941\u0908\u092c\u093f\u0928\u094d\u0926\u0941 \u0935\u093e \u090f\u0915 \u0916\u0923\u094d\u0921 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
LineMenu=\u0930\u0947\u0916\u093e
+Linear=\u090f\u0915\u0930\u0941\u092a\u0924\u093e
+List=\u0938\u0941\u091a\u0940
+ListOfPoints=\u092c\u093f\u0928\u094d\u0926\u0941\u0939\u0930\u0941\u0915\u094b \u0938\u0941\u091a\u0940
Load=\u0916\u094b\u0932\u094d\u0928\u0942
+Location=\u0938\u094d\u0925\u093e\u0928
Locus=\u092c\u093f\u0928\u094d\u0926\u0941\u092a\u0925
Locus.Help=\u092c\u093f\u0928\u094d\u0926\u0941\u092a\u0925 \u0905\u0928\u093f \u0935\u0938\u094d\u0924\u0941\u0915\u094b \u092c\u093f\u0928\u094d\u0926\u0941 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
LookAndFeel=\u0939\u0947\u0930 \u0930 \u0905\u0928\u0941\u092d\u0935 \u0917\u0930
LowQuality=\u0928\u093f\u092e\u094d\u0928\u0915\u094b\u091f\u093f
ManagePerspectives=\u0926\u0943\u0937\u094d\u092f\u092d\u0941\u092e\u093f\u0915\u093e \u092c\u094d\u092f\u0935\u0938\u094d\u0925\u093e\u092a\u0928
+MathematicalFunctions=\u0917\u0923\u093f\u0924\u093f\u092f \u092b\u0932\u0928
+Matrices=\u092e\u0947\u091f\u094d\u0930\u093f\u0938\u0947\u0938
+Matrix=\u092e\u094d\u092f\u093e\u091f\u094d\u0930\u093f\u0915\u094d\u0938
+MaxCells=\u090a\u091a\u094d\u091a\u0924\u092e
+Maximum.short=\u090a\u091a\u094d\u091a
+Mean=\u092e\u0927\u094d\u092f\u0915
+MeanCells=\u092e\u0927\u094d\u092f\u0915
MeasurementTools=\u0928\u093e\u092a \u0914\u091c\u093e\u0930
Metal=\u0927\u093e\u0924\u0941
Midpoint=\u092e\u0927\u094d\u092f \u0935\u093e \u0915\u0947\u0928\u094d\u0926\u0943\u092c\u093f\u0928\u094d\u0926\u0941
Midpoint.Help=\u0926\u0941\u0908\u092c\u093f\u0928\u094d\u0926\u0941,\u090f\u0915 \u0916\u0923\u094d\u0921,\u0935\u0943\u0924 \u0935\u093e \u0915\u094b\u0928\u093f\u0915 \u091b\u093e\u0928\u094d\u0928\u0942\u0939\u094b\u0938
+MinCells=\u0928\u094d\u092f\u0941\u0928\u0924\u092e
+Minimum.short=\u0928\u094d\u092f\u0941\u0928
MirrorAtCircle=\u0935\u0943\u0924\u092e\u093e \u092c\u093f\u0928\u094d\u0926\u0941\u0915\u094b \u092a\u0930\u093e\u0935\u0930\u094d\u0924\u0928\u094d
MirrorAtCircle.Help=\u0930\u093f\u092b\u0947\u0932\u094d\u0915\u0938\u0928\u094d \u092c\u093f\u0928\u094d\u0926\u0941 \u0905\u0928\u093f \u0935\u0943\u0924 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
MirrorAtLine=\u0930\u0947\u0916\u093e\u092e\u093e \u0935\u0938\u094d\u0924\u0941\u0915\u094b \u092a\u0930\u093e\u0935\u0930\u094d\u0924\u0928\u094d
@@ -162,12 +252,24 @@ Move.Help=\u0935\u0938\u094d\u0924\u0941 \u0924\u093e\u0928\u094d\u0928\u0941 \u
MoveRotate=\u092c\u093f\u0928\u094d\u0926\u0941\u092e\u093e \u0918\u0941\u092e\u093e\u0909\u0928\u0942
MoveRotate.Help=\u092a\u0930\u093f\u0915\u094d\u0930\u092e\u0923 \u0915\u0947\u0928\u094d\u0926\u0943\u092c\u093f\u0928\u094d\u0926\u0941 \u091b\u093e\u0928\u093f \u0935\u0938\u094d\u0924\u0941\u0932\u093e\u0908 \u0924\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
MovementTools=\u091a\u093e\u0932 \u091f\u0941\u0932\u094d\u0938\u094d
+Name=\u0928\u093e\u092e
+NameAndDraw=\u0928\u093e\u092e \u0930 \u0928\u0915\u094d\u0938\u093e
NameIcon=\u0928\u093e\u092e \u0930 \u092a\u094d\u0930\u0924\u093f\u092e\u093e
New=\u0928\u092f\u093e\u0902
NewWindow=\u0928\u092f\u093e\u0902 \u0935\u093f\u0928\u094d\u0921\u094b
+Next=\u0905\u0930\u094d\u0915\u094b
+None=\u0915\u0941\u0928\u0948\u092a\u0928\u093f \u0939\u094b\u0907\u0928
+NormalCurve=\u0938\u093e\u092e\u093e\u0928\u094d\u092f \u092c\u0915\u094d\u0930
+Normalized=\u0938\u093e\u092e\u093e\u0928\u094d\u092f\u0940\u0915\u0930\u0923
+NullHypothesis=\u0938\u0941\u0928\u094d\u092f \u092a\u0930\u093f\u0915\u0932\u094d\u092a\u0928\u093e
+Numeric=\u0938\u093e\u0902\u0916\u0940\u0915
+Objects=\u0935\u0938\u094d\u0924\u0941\u0939\u0930\u0941
+OneVariable=\u090f\u0915 \u091a\u0932
+Operation=\u0915\u0943\u092f\u093e
Options=\u0935\u093f\u0915\u0932\u094d\u092a
Orthogonal=\u0932\u092e\u094d\u092c \u0930\u0947\u0916\u093e
Orthogonal.Help=\u092c\u093f\u0928\u094d\u0926\u0941 \u0905\u0928\u093f \u0932\u092e\u094d\u092c\u0930\u0947\u0916\u093e \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
+Other=\u0905\u0928\u094d\u092f
OutputObjects=\u0906\u0909\u091f\u092a\u091f \u092c\u0938\u094d\u0924\u0941\u0939\u0930\u0941
Overwrite=\u0939\u0939\u0939\u0939\u0917\u0917\u0917\u0917\u0917\u092f\u092f\u092f\u092f\u092f\u092f\u092f\u092f\u0948\u0947\u0938\u0938\u0938\u0938\u0938\u0938\u0938Overwrite\u0928\u0928\u0928\u0928
Parabola=\u092a\u093e\u0930\u093e\u0935\u094b\u0932\u093e\u094d
@@ -176,25 +278,31 @@ Parallel=\u0938\u092e\u093e\u0928\u094d\u0928\u0924\u0930 \u0930\u0947\u0916\u09
Parallel.Help=\u092c\u093f\u0928\u094d\u0926\u0941 \u0905\u0928\u093f \u0938\u092e\u093e\u0928\u094d\u0928\u0924\u0930 \u0930\u0947\u0916\u093e \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
Paste=\u091f\u093e\u0901\u0938\u094d\u0928\u0942
PasteDataFromClipboard=\u0915\u094d\u0932\u093f\u092a\u092c\u094b\u0930\u094d\u0921\u092c\u093e\u091f \u0924\u0925\u094d\u092f\u093e\u0902\u0915 \u091f\u093e\u0901\u0938\u094d\u0928\u0941\u0939\u094b\u0938
+Pen=\u0915\u0932\u092e\u093f\u092f \u0914\u091c\u093e\u0930
Perspective.AlgebraAndGraphics=\u092c\u0940\u091c\u0917\u0923\u093f\u0924 \u0930 \u0930\u0947\u0916\u093e\u091a\u093f\u0924\u094d\u0930
Perspective.BasicGeometry=\u0906\u0927\u093e\u0930\u092d\u0941\u0924 \u091c\u094d\u092f\u093e\u092e\u093f\u0924\u093f
Perspective.Geometry=\u091c\u094d\u092f\u093e\u092e\u093f\u0924\u093f
+Perspective.Primary=\u092a\u094d\u0930\u0925\u092e
Perspective.TableAndGraphics=\u091f\u092c\u0932 \u0930 \u0930\u0947\u0916\u093e\u091a\u093f\u0924\u094d\u0930
Point=\u0928\u092f\u093e\u0902 \u092c\u093f\u0928\u094d\u0926\u0941
Point.Help=\u0921\u094d\u0930\u0907\u0919\u0915\u094d\u0937\u0947\u0924\u094d\u0930\u092e\u093e \u0935\u093e \u0930\u0947\u0916\u093e\u092e\u093e, \u092b\u0932\u0928\u092e\u093e \u0935\u093e \u092c\u0915\u094d\u0930\u092e\u093e \u0915\u094d\u0932\u093f\u0915 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938
PointCapturing=\u092c\u093f\u0928\u094d\u0926\u0942 \u0915\u094d\u092f\u093e\u092a\u091a\u0930\u093f\u0919\u094d
PointMenu=\u092c\u093f\u0928\u094d\u0926\u0941
+PointOnObject=\u0935\u0938\u094d\u0924\u0941\u092e\u093e \u092c\u093f\u0928\u094d\u0926\u0941
PointStyle=\u092c\u093f\u0928\u094d\u0926\u0941 \u0922\u093e\u0902\u091a\u093e
PointTools=\u092c\u093f\u0928\u094d\u0926\u0941 \u0914\u091c\u093e\u0930
+Polar=\u0927\u094d\u0930\u0941\u092c\u093f\u092f
PolarDiameter=\u0927\u094d\u0930\u0942\u092c\u093f\u092f \u0935\u093e \u092c\u094d\u092f\u093e\u0938 \u0930\u0947\u0916\u093e
PolarDiameter.Help=\u092c\u093f\u0928\u094d\u0926\u0941 \u0935\u093e \u0930\u0947\u0916\u093e \u0905\u0928\u093f \u0935\u0943\u0924 \u0935\u093e \u0915\u094b\u0928\u093f\u0915 \u091b\u093e\u0928\u094d\u0928\u0942\u0939\u094b\u0938
Polygon=\u092c\u0939\u0941\u092d\u0941\u091c
Polygon.Help=\u0938\u092e\u094d\u092a\u0941\u0930\u094d\u0923 \u0936\u093f\u0930\u094d\u0937\u092c\u093f\u0928\u094d\u0926\u0941\u0939\u0930\u0941 \u0905\u0928\u093f \u092b\u0947\u0930\u093f \u092a\u094d\u0930\u0925\u092e \u0936\u093f\u0930\u094d\u0937\u092c\u093f\u0928\u094d\u0926\u0941 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
PolygonTools=\u092c\u0939\u0941\u092d\u0942\u091c \u091f\u0941\u0932\u094d\u0938\u094d
+Polynomial=\u092c\u0939\u0941\u092a\u0926
Portrait=\u092a\u094d\u0930\u0924\u093f\u092e\u093e, \u092a\u094b\u0930\u094d\u091f-\u091f\u094d\u0930\u0947\u091f\u094d
Preview=\u092a\u0941\u0930\u094d\u0935 \u0926\u0943\u0937\u094d\u092f
Print=\u091b\u093e\u092a\u094d\u0928\u0942
PrintPreview=\u091b\u093e\u092a\u094d\u0928\u0947 \u092a\u0941\u0930\u094d\u0935 \u0926\u0943\u0937\u094d\u092f
+Probability=\u0938\u0902\u092d\u093e\u0935\u094d\u092f\u0924\u093e
Properties.Algebra=\u092c\u0940\u091c\u0917\u0923\u093f\u0924
Properties.Basic=\u0906\u0927\u093e\u0930\u092d\u0942\u0924
Properties.Position=\u0905\u0935\u0938\u094d\u0925\u093e
@@ -202,9 +310,13 @@ Properties.Style=\u0936\u0948\u0932\u0940
Radiant=\u0930\u0947\u0921\u093f\u092f\u0928\u094d\u0938
Ray=\u0926\u0941\u0907\u092c\u093f\u0928\u094d\u0926\u0941 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0930\u0947\u0916\u093e
Ray.Help=\u0936\u0942\u0930\u0941\u0915\u094b \u092c\u093f\u0928\u094d\u0926\u0941 \u0905\u0928\u093f \u0930\u0947\u0916\u093e\u092e\u093e \u092c\u093f\u0928\u094d\u0926\u0941 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
+Recent=\u0939\u093e\u0932\u0948 \u0916\u094b\u0932\u093f\u090f\u0915\u094b
RecomputeAllViews=\u0938\u092c\u0948 \u0935\u0938\u094d\u0924\u0941\u0932\u093e\u0907 \u092a\u0941\u0928\u0902 \u0932\u0947\u0916\u093e\u091c\u094b\u0916\u093e \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938
RecordToSpreadsheet=\u0938\u094d\u092a\u094d\u0930\u0947\u0921\u0938\u093f\u091f\u092e\u093e \u0930\u0947\u0915\u0930\u094d\u0921 \u0917\u0930\u094d\u0928\u0942\u0939\u094b\u0938
RecordToSpreadsheet.Help=\u0928\u093f\u0936\u093e\u0928 \u0917\u0930\u093f\u0928\u0947 \u0935\u0938\u094d\u0924\u0941 \u091b\u093e\u0928\u093f \u0930\u091a\u0928\u093e \u092c\u0926\u0932\u094d\u0928\u0941\u0939\u094b\u0938
+RecoveryCancel=\u0930\u0926\u094d\u0926
+RecoveryOpen=\u0916\u094b\u0932\u094d\u0928\u0941
+RecoverySave=\u0938\u0941\u0930\u0915\u094d\u0937\u0940\u0924 \u0917\u0930\u094d\u0928\u0941
Red=\u0930\u093e\u0924\u094b
Redo=\u092a\u0941\u0930\u094d\u0928\u0915\u093e\u0930\u094d\u092f
Refresh=\u0924\u093e\u091c\u093e \u0926\u0943\u0937\u094d\u092f\u0939\u0930\u0941
@@ -212,33 +324,56 @@ RegularPolygon=\u0928\u093f\u092f\u092e\u093f\u0924 \u092c\u0939\u0941\u092d\u09
RegularPolygon.Help=\u0926\u0941\u0907\u092c\u093f\u0928\u094d\u0926\u0941 \u091b\u093e\u0928\u093f \u0936\u093f\u0930\u094d\u0938\u092c\u093f\u0928\u094d\u0926\u0941\u0939\u0930\u0941 \u0930\u093e\u0916\u094d\u0928\u0942\u0939\u094b\u0938
Relation=\u0926\u0942\u0907\u0935\u0938\u094d\u0924\u0941\u092c\u0940\u091a\u0915\u094b \u0938\u092e\u094d\u092c\u0928\u094d\u0927
Relation.Help=\u0926\u0941\u0907\u0935\u0938\u094d\u0924\u0941 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
+Relative=\u0938\u093e\u092a\u0947\u0915\u094d\u0937
Rename=\u092a\u0941\u0930\u094d\u0928\u0928\u093e\u092e
+Result=\u0928\u0924\u093f\u091c\u093e
RightAngleStyle=\u0938\u092e\u0915\u094b\u0923 \u0936\u0948\u0932\u0940
+RightProb=\u0926\u093e\u0939\u093f\u0928\u0947\u0924\u093f\u0930
+RigidPolygon=\u0930\u093f\u091c\u093f\u0921 \u092c\u0939\u0941\u092d\u0941\u091c
+RootsAndFractions=\u0935\u0930\u094d\u0917 \u0930 \u092d\u093f\u0928\u094d\u0928
RotateByAngle=\u0915\u0941\u0928\u0948\u092c\u093f\u0928\u094d\u0926\u0941\u092e\u093e \u0935\u0938\u094d\u0924\u0941\u0915\u094b \u0915\u094b\u0923\u093f\u092f \u0918\u0941\u092e\u093e\u0908
RotateByAngle.Help=\u092a\u0930\u093f\u0915\u094d\u0930\u092e\u0923 \u0917\u0930\u093f\u0928\u0947\u0935\u0938\u094d\u0924\u0941 \u0905\u0928\u093f \u0915\u0947\u0928\u094d\u0926\u0943\u092c\u093f\u0928\u094d\u0926\u0941 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938 \u0930 \u0915\u094b\u0923 \u0930\u093e\u0916\u094d\u0928\u0941\u0939\u094b\u0938
Rounding=\u0930\u093e\u0909\u0928\u094d\u0921\u093f\u0902\u0919
+RowHeader=\u092a\u0902\u0915\u094d\u0924\u093f \u0936\u093f\u0930\u094d\u0937\u0915
+RowLimit=\u092a\u0902\u0915\u094d\u0924\u093f \u0932\u093f\u092e\u093f\u091f
+RowOrder=\u092a\u0902\u0915\u094d\u0924\u093f \u0915\u094d\u0930\u092e
+Sample1=\u092a\u094d\u0930\u0925\u092e \u0928\u092e\u0941\u0928\u093e
+Sample2=\u0926\u094b\u0938\u094d\u0930\u094b \u0928\u092e\u0941\u0928\u093e
Save=\u0938\u0942\u0930\u0915\u094d\u0937\u093e
SaveAs=\u0909\u0939\u0940 \u0938\u0942\u0930\u0915\u094d\u0937\u093e
SaveCurrentFileQuestion=\u0939\u093e\u0932 \u091a\u093e\u0932\u0942 \u092b\u093e\u0907\u0932 \u0938\u0942\u0930\u0915\u094d\u0937\u093e \u0917\u0930\u094d\u0928\u091a\u093e\u0939\u0928\u0941\u0939\u0941\u0928\u094d\u091b?
SaveCurrentPerspective=\u091a\u093e\u0932\u0942 \u0926\u0943\u0937\u094d\u092f \u0938\u0942\u0930\u0915\u094d\u0937\u093e \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938
+SaveToXML=XML \u092e\u093e \u0938\u0941\u0930\u0915\u094d\u0937\u093f\u0924 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938
+Scatterplot=\u0938\u094d\u0915\u092f\u093e\u091f\u0930\u092a\u094d\u0932\u091f
Segment=\u0926\u0941\u0908\u092c\u093f\u0928\u094d\u0926\u0941\u092c\u0940\u091a\u0915\u094b \u0916\u0923\u094d\u0921
Segment.Help=\u0926\u0942\u0908\u092c\u093f\u0928\u094d\u0926\u0941 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
SegmentFixed=\u092c\u093f\u0928\u094d\u0926\u0941\u092c\u093e\u091f \u0926\u093f\u0907\u090f\u0915\u094b \u0932\u092e\u094d\u092c\u093e\u0908\u0938\u0939\u093f\u0924\u0915\u094b \u0916\u0923\u094d\u0921
SegmentFixed.Help=\u092c\u093f\u0928\u094d\u0926\u0941\u091b\u093e\u0928\u093f \u0916\u0928\u094d\u0921\u0915\u094b \u0932\u092e\u094d\u092c\u093e\u0908 \u0930\u093e\u0916\u094d\u0928\u0941\u0939\u094b\u0938
Select=\u0935\u0938\u094d\u0924\u0941 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
Select.Help=\u0935\u0938\u094d\u0924\u0941 \u091b\u093e\u0928\u094d\u0928 \u0915\u094d\u0932\u093f\u0915 \u0917\u0930\u094d\u0928\u0942\u0939\u094b\u0938
+SelectACurve=\u092c\u0915\u0943 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
SelectAll=\u0938\u092c\u0948 \u091b\u093e\u0928\u094d\u0928\u0942\u0939\u094b\u0938
SelectAncestors=\u092a\u0941\u0930\u094d\u0935\u091a\u0940\u091c \u091b\u093e\u0928\u094d\u0928\u0942\u0939\u094b\u0938
SelectCurrentLayer=\u091a\u093e\u0932\u0942 \u0924\u0939 \u091b\u093e\u0928\u094d\u0928\u0942\u0939\u094b\u0938
SelectDescendants=\u092a\u091b\u093f\u0906\u0909\u0928\u0947\u091a\u0940\u091c \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
Semicircle=\u0926\u0941\u0908\u092c\u093f\u0928\u094d\u0926\u0941\u092d\u090f\u0930\u091c\u093e\u0928\u0947 \u0905\u0930\u094d\u0927\u0935\u0943\u0924
Semicircle.Help=\u0905\u0928\u094d\u0924\u093f\u092e \u0926\u0941\u0908\u092c\u093f\u0928\u094d\u0926\u0941 \u091b\u093e\u0928\u094d\u0928\u0942\u0939\u094b\u0938
+Semicolon=\u0938\u094b\u092e\u093f\u0915\u0932\u0928
Separator=\u0935\u093f\u092d\u093e\u091c\u0915
+SetToCurrentLocation=\u0939\u093e\u0932\u0915\u094b \u0938\u094d\u0925\u093e\u0928\u092e\u093e \u092e\u093f\u0932\u093e\u0909\u0928\u0941\u0939\u094b\u0938
Settings=\u0938\u0947\u091f\u093f\u0902\u0919\u094d\u0938 \u0935\u093e \u092e\u093f\u0932\u093e\u0909\u0928\u0941
Settings.ResetDefault=\u0921\u093f\u092b\u0932\u094d\u091f \u0938\u0947\u091f\u093f\u0902\u0919\u0938\u094d \u092a\u0941\u0930\u094d\u0928\u0938\u094d\u0925\u093e\u092a\u0928\u093e
Settings.Save=\u0938\u0947\u091f\u093f\u0902\u0919\u094d\u0938 \u092c\u091a\u0924
+Share=\u092d\u093e\u0917\u092c\u094d\u0921\u093e \u0917\u0930\u094d\u0928\u0941
+Show=\u0926\u0947\u0916\u093e\u0909\u0928\u0941
+ShowAtTop=\u092e\u093e\u0925\u093f\u092a\u091f\u093f \u0926\u0947\u0916\u093e\u0909\u0928\u0941\u0939\u094b\u0938
+ShowAxesGrid=\u0905\u0915\u094d\u0937 \u0935\u093e \u0917\u094d\u0930\u093f\u0921 \u0926\u0947\u0916\u093e\u0909\u0928\u0941\u0939\u094b\u0938
ShowCheckBox=\u0935\u0938\u094d\u0924\u0941 \u0926\u0947\u0916\u093e\u0909\u0928\u0947 \u0935\u093e \u0932\u0941\u0915\u093e\u0909\u0928\u0947 \u0915\u094b\u0920\u093e\u0915\u094b \u092a\u0930\u0947\u0915\u094d\u0937\u093f\u0923
ShowCheckBox.Help=\u0905\u0935\u0938\u094d\u0925\u093e \u091c\u0928\u093e\u0909\u0928 \u0921\u094d\u0930\u0907\u0919 \u0915\u094d\u0937\u0947\u0924\u094d\u0930\u092e\u093e \u0915\u094d\u0932\u093f\u0915 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938
+ShowColumnHeader=\u0915\u0932\u092e \u0936\u093f\u0930\u094d\u0937\u0915 \u0926\u0947\u0916\u093e\u0909\u0928\u0941\u0939\u094b\u0938
+ShowCornerCoordinates=\u0915\u0941\u0928\u093e\u0915\u094b \u0928\u093f\u0930\u094d\u0926\u0947\u0936\u093e\u0902\u0915 \u0926\u0947\u0916\u093e\u0909\u0928\u0941\u0939\u094b\u0938
+ShowData=\u0906\u0902\u0915\u0921 \u0926\u0947\u0916\u093e\u0909\u0928\u0941\u0939\u094b\u0938
+ShowGridlines=\u0917\u094d\u0930\u093f\u0921\u0930\u0947\u0916\u093e\u0939\u0930\u0941 \u0926\u0947\u0916\u093e\u0909\u0928\u0941\u0939\u094b\u0938
ShowHideLabel=\u0938\u0941\u091a\u093e\u0902\u0919\u094d\u0915 \u0926\u0947\u0916\u093e\u0909 \u0935\u093e \u0932\u0941\u0915\u093e\u0909
ShowHideLabel.Help=\u0935\u0938\u094d\u0924\u0941 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
ShowHideObject=\u092c\u0938\u094d\u0924\u0941 \u0926\u0947\u0916\u093e\u0909 \u0935\u093e \u0932\u0941\u0915\u093e\u0909
@@ -249,13 +384,40 @@ ShowMenuBar=\u092e\u0947\u0928\u0941\u092c\u093e\u0930 \u0926\u0947\u0916\u093e\
ShowResetIcon=\u0930\u091a\u0928\u093e\u0932\u093e\u0908 \u092a\u0941\u0930\u094d\u0928\u092c\u094d\u092f\u093e\u0935\u0938\u094d\u0925\u093e\u092a\u0928 \u0917\u0930\u094d\u0928\u0947 \u0906\u0907\u0915\u0928 \u0926\u0947\u0916\u093e\u0909\u0928\u0941\u0939\u094b\u0938
ShowToolBar=\u091f\u0941\u0932\u092c\u093e\u0930 \u0926\u0947\u0916\u093e\u0909\u0928\u0941\u0939\u094b\u0938
ShowToolBarHelp=\u091f\u0941\u0932\u092c\u093e\u0930 \u092e\u0926\u094d\u0926\u0924\u094d \u0926\u0947\u0916\u093e\u0909\u0928\u0941\u0939\u094b\u0938
+SingleFileTabs=\u090f\u0909\u091f\u093e \u092b\u093e\u092f\u0932
Slider=\u0938\u094d\u0932\u093e\u0908\u0921\u0930
Slider.Help=\u0905\u0935\u0938\u094d\u0925\u093e \u091c\u0928\u093e\u0909\u0928 \u0921\u094d\u0930\u0907\u0919 \u0915\u094d\u0937\u0947\u0924\u094d\u0930\u092e\u093e \u0915\u094d\u0932\u093f\u0915 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938
Slope=\u091d\u0942\u0915\u093e\u0935
Slope.Help=\u0930\u0947\u0916\u093e \u091b\u093e\u0928\u094d\u0928\u0942\u0939\u094b\u0938
+Solution=\u0938\u092e\u093e\u0927\u093e\u0928
+Solve=\u0938\u092e\u093e\u0927\u093e\u0928 \u0917\u0930\u094d\u0928\u0941
+Sort=\u0938\u0947\u0932\u094d\u0938\u0939\u0930\u0941\u0915\u094b \u091b\u0928\u0948\u093e\u091f
+Space=\u0916\u093e\u0932\u0940 \u0920\u093e\u090a\u0902
+Spacing=\u0916\u093e\u0932\u0940 \u0920\u093e\u090a\u0902
SpecialLineTools=\u092c\u093f\u0936\u0947\u0938 \u0930\u0947\u0916\u093f\u092f \u091f\u0941\u0932\u094d\u0938
SpecialObjectTools=\u092c\u093f\u0936\u0947\u0938 \u0935\u0938\u094d\u0924\u0941 \u091f\u0941\u0932\u094d\u0938
+Start=\u0936\u0941\u0930\u0941 \u0917\u0930\u094d\u0928\u0941
+Statistics=\u0924\u0925\u094d\u092f\u093e\u0902\u0915\u093e
+Step=\u0924\u0939
+Substitute=\u092a\u094d\u0930\u0924\u093f\u0938\u094d\u0925\u093e\u092a\u0928
SubstituteDialog=\u0915\u0925\u0928\u0915\u094b \u092a\u094d\u0930\u0924\u093f\u0938\u094d\u0925\u093e\u092a\u0928
+SumCells=\u092f\u094b\u0917\u092b\u0932
+Symbol.And=\u0930
+Symbol.Angle=\u0915\u094b\u0923
+Symbol.AngleMeasure=\u0915\u094b\u0923\u0915\u094b \u0928\u093e\u092a
+Symbol.Cube=\u0915\u094d\u092f\u0941\u092c
+Symbol.Degree=\u0921\u093f\u0917\u094d\u0930\u0940
+Symbol.Infinity=\u0905\u0928\u094d\u0928\u0924
+Symbol.LessThanEqualTo=\u0915\u092e \u092d\u0928\u094d\u0926\u093e \u0935\u093e \u092c\u0930\u093e\u092c\u0930
+Symbol.Negation=\u0928\u093f\u0937\u0947\u0927\u093f\u0924
+Symbol.NotEqual=\u0905\u0938\u092e\u093e\u0928
+Symbol.Or=\u0905\u0925\u0935\u093e
+Symbol.Parallel=\u0938\u092e\u093e\u0928\u094d\u0928\u0924\u0930
+Symbol.Perpendicular=\u0932\u092e\u094d\u092c
+Symbol.Square=\u0935\u0930\u094d\u0917
+Symbols=\u0938\u0902\u0915\u0947\u0924\u0939\u0930\u0941
+Tab=\u091f\u094d\u092f\u093e\u092c
+Table=\u091f\u0947\u092c\u0932
Tangent=\u0938\u094d\u0930\u094d\u092a\u0936\u093f\u0930\u0947\u0916\u093e
Tangent.Help=\u092c\u093f\u0928\u094d\u0926\u0941 \u0935\u093e \u0930\u0947\u0916\u093e \u0905\u0928\u093f \u0935\u0943\u0924 \u0935\u093e \u092b\u0932\u0928 \u091b\u093e\u0928\u094d\u0928\u0942\u0939\u094b\u0938
Text=\u091f\u0915\u094d\u0938\u091f\u094d \u0930\u093e\u0916\u094d\u0928\u0941\u0939\u094b\u0938
@@ -272,6 +434,7 @@ Toolbar=\u091f\u0942\u0932\u092c\u093e\u0930
Toolbar.Customize=\u091f\u0941\u0932 \u0915\u0938\u094d\u091f\u092e\u093e\u0908\u091c
Toolbar.ResetDefault=\u0921\u093f\u092b\u0932\u094d\u091f \u091f\u0941\u0932\u092c\u093e\u0930\u0915\u094b \u092a\u0941\u0930\u094d\u0928\u0938\u094d\u0925\u093e\u092a\u0928\u093e
Tools=\u091f\u0941\u0932\u094d\u0938
+Total=\u091c\u092e\u094d\u092e\u093e
Trace=\u0928\u093f\u0936\u093e\u0928 \u091a\u093e\u0932\u0941 \u0935\u093e \u092c\u0928\u094d\u0926
Trace.Help=\u0928\u093f\u0936\u093e\u0928 \u0926\u0947\u0916\u093e\u0909\u0928 \u0935\u093e \u0932\u0941\u0915\u093e\u0909\u0928 \u0935\u0938\u094d\u0924\u0941 \u091b\u093e\u0928\u094d\u0928\u0942\u0939\u094b\u0938
TransformationTools=\u091f\u0932 \u0930\u0942\u092a\u093e\u0928\u094d\u0924\u0930\u0923
@@ -279,23 +442,34 @@ TranslateByVector=\u092d\u0947\u0915\u094d\u091f\u0930\u0926\u094d\u0927\u0930\u
TranslateByVector.Help=\u0935\u0938\u094d\u0924\u0941 \u092c\u093f\u0938\u094d\u0925\u093f\u092a\u093f\u0924 \u0917\u0930\u093f\u0928\u0947 \u0935\u0938\u094d\u0924 \u0905\u0928\u093f \u092d\u0947\u0915\u094d\u091f\u0930 \u091b\u093e\u0928\u094d\u0928\u0942\u0939\u094b\u0938
TranslateView=\u0921\u094d\u0930\u0907\u0919 \u092a\u094d\u092f\u093e\u0921 \u091a\u0932\u093e\u0909\u0928\u0941\u0939\u094b\u0938
TranslateView.Help=\u090f\u0915 \u0905\u0915\u094d\u0937 \u0935\u093e \u0921\u094d\u0930\u0907\u0919 \u092a\u094d\u092f\u093e\u0921 \u0924\u093e\u0928\u094d\u0928\u0942\u0939\u094b\u0938 (Shift + Drag)
-Type.Text=Text\n\u091f\u0947\u0915\u094d\u0938\u091f
+Transparent=\u092a\u093e\u0930\u0926\u0930\u094d\u0936\u0915
+Transpose=\u091f\u094d\u0930\u093e\u0928\u094d\u0938\u092a\u094b\u091c
+TwoVariable=\u0926\u0941\u0907 \u091a\u0932
+Type.Algebra=\u092c\u093f\u091c\u0917\u0923\u093f\u0924
+Type.Chart=\u0924\u093e\u0932\u093f\u0915\u093e
+Type.Conic=\u0915\u094b\u0928\u093f\u0915
+Type.Geometry=\u091c\u094d\u092f\u093e\u092e\u093f\u0924\u093f
+Type.List=\u0938\u0941\u091a\u0940
+Type.Logic=\u0924\u0930\u094d\u0915
+Type.Statistics=\u0924\u0925\u094d\u092f\u093e\u0902\u0915
+Type.Text=\u091f\u0947\u0915\u094d\u0938\u091f
+Type.Transformation=\u0930\u0941\u092a\u093e\u0928\u094d\u0924\u0930\u0923
Undo=\u0905\u0928\u0921\u0941
+Untitled=\u0936\u093f\u0930\u094d\u0937\u0915\u092c\u093f\u0928\u093e\u0915\u094b
UserInterface=\u0908\u0928\u094d\u091f\u0930\u092b\u0947\u0938 \u092a\u094d\u0930\u092f\u094b\u0917\u0915\u0930\u094d\u0924\u093e
+Value=\u092e\u093e\u0928
+Values=\u092e\u093e\u0928\u0939\u0930\u0941
Vector=\u0926\u0941\u0908\u092c\u093f\u0928\u094d\u0926\u0941\u092c\u0940\u091a\u0915\u094b \u092d\u0947\u0915\u094d\u091f\u0930
Vector.Help=\u0936\u0941\u0930\u0941\u0915\u094b \u0905\u0928\u093f \u0905\u0928\u094d\u0924\u093f\u092e \u092c\u093f\u0928\u094d\u0926\u0941 \u091b\u093e\u0928\u094d\u0928\u0942\u0939\u094b\u0938
VectorFromPoint=\u092c\u093f\u0928\u094d\u0926\u0941\u092c\u093e\u091f \u092d\u0947\u0915\u094d\u091f\u0930
VectorFromPoint.Help=\u0936\u0941\u0930\u0941\u0915\u094b \u092c\u093f\u0928\u094d\u0926\u0941 \u0930 \u092d\u0947\u0915\u094d\u091f\u0930 \u091b\u093e\u0928\u094d\u0928\u0942\u0939\u094b\u0938
VectorMenu=\u092d\u0947\u0915\u094d\u091f\u0930
View=\u0926\u0943\u0937\u094d\u091f\u093f
-Views=Views\n\u0926\u0943\u0937\u094d\u092f
-Width=Width\n\u091a\u0948\u093e\u0921\u093e\u0908
+Views=\u0926\u0943\u0937\u094d\u092f
+Width=\u091a\u0948\u093e\u0921\u093e\u0908
Window=\u0935\u093f\u0928\u094d\u0921\u094b
Windows=\u0935\u093f\u0928\u094d\u0921\u094b\u0939\u0930\u0941
-X->Y=X \u2192 Y\nX \u2192 Y
-XBetween=\u2264 X \u2264\n\u2264 X \u2264
-XLessThanOrEqual=X \u2264\nX \u2264
-ZStatistic=Z\nZ
+WithinGroups=\u0938\u092e\u0941\u0939\u0939\u0930\u0941\u092d\u093f\u0924\u094d\u0930
Zoom=\u0920\u0941\u0932\u094b
ZoomIn=\u0920\u0941\u0932\u094b \u092a\u093e\u0930\u094d\u0928\u0941
ZoomIn.Help=\u0920\u0941\u0932\u094b \u092a\u093e\u0930\u094d\u0928 \u0921\u094d\u0930\u0908\u0919 \u092a\u094d\u092f\u093e\u0921\u092e\u093e \u0915\u094d\u0932\u093f\u0915 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938 (Mouse Wheel)
diff --git a/geogebra/properties/menu_nl.properties b/geogebra/properties/menu_nl.properties
index 5b5357e..83f3655 100644
--- a/geogebra/properties/menu_nl.properties
+++ b/geogebra/properties/menu_nl.properties
@@ -3,8 +3,9 @@ Accents=Accenten
ActionObjectTools=Actieknop
AddTrace=Voeg object toe aan spoorlijst
Advanced=Geavanceerd
-AlgebraDescriptions=Algebraische beschrijvingen
+AlgebraDescriptions=Algebraïsche beschrijvingen
AllCommands=Alle commando's
+AllowTooltips=Tooltips toestaan
AlternativeHypothesis=Alternatieve hypothese
AlternativeHypothesis.short=Alternatief
Angle=Hoek
@@ -33,7 +34,7 @@ Brackets=Haakjes
Button.Caption=Titel
ButtonAction=Actieknop invoegen
ButtonAction.Help=Klik in het tekenvenster voor het invoegen van een knop
-ByLayering=met layers
+ByLayering=Met lagen
Calculate=Bereken
CalligraphicLetters=Calligrafische letters
Cancel=Annuleren
@@ -58,6 +59,7 @@ CircumcircleArc3=Cirkelboog door drie punten
CircumcircleArc3.Help=Drie punten op cirkelboog
CircumcircleSector3=Cirkelsector door drie punten
CircumcircleSector3.Help=Drie punten op sector
+ClassRule=Begrenzing
Classes=Klassen
ClearColumn=Verwijder kolom
ClearColumns=Verwijder kolommen
@@ -66,7 +68,7 @@ ClearRows=Verwijder rijen
ClearSelection=Verwijder selectie
ClearTrace=Wis spoor
Clipboard=Klembord
-ClipboardMessage=Broncode gekopieerd naar klembord\nEditeer html-code en plak dezecode in leeromgeving (bvb Moodle)
+ClipboardMessage=Broncode gekopieerd naar klembord\nEditeer html-code en plak deze code in leeromgeving (bvb Moodle)
Close=Sluiten
CloseAll=Alles sluiten
CloseFile=Bestand sluiten
@@ -180,6 +182,7 @@ Filling=Vulling
Filling.Hatch=Arceren
Filling.Image=Afbeelding
Filling.Standard=Standaard
+FitCurve=Regressiekromme
FitCurve.Help=Selecteer punten door rechthoek te slepen
FitLine=Regressielijn
FitLine.Help=Selecteer punten
@@ -196,6 +199,7 @@ FrequencyType=Frequentietype
FunctionInspector=Functie onderzoeker
FunctionInspector.Help=Selecteer een functie
Functionality=Functionaliteit
+GUIFontSize=Lettergrootte menu
General=Algemeen
GeneralTools=Layoutknop
GenerateCode=Genereer code
@@ -262,6 +266,7 @@ Labeling.propertiesDefault=Gebruik standaardinstelling
Labels=Toon of verberg labels
Landscape=Liggend
Language=Taal
+Layout=Lay-out
LeftProb=Linker
LessThanOrEqualToX=\u2264 x
License=Licentie
@@ -307,6 +312,8 @@ Move.Help=Sleep of selecteer objecten (Esc)
MoveRotate=Roteren
MoveRotate.Help=Kies rotatiemiddelpunt eerst, verplaats vervolgens het object
MovementTools=Verplaatsknop
+MultiVarStats=Onderzoek meerdere variabelen
+MultiVariableStatistics=Onderzoek meerdere variabelen
Name=Benoem
NameIcon=Naam en pictogram
New=Nieuw
@@ -314,11 +321,15 @@ NewWindow=Nieuw venster
Next=Volgende
None=Geen
NormalCurve=Normaalkromme
+NormalQuantilePlot=Kwantielplot
Normalized=Genormaliseerd
Numeric=Numeriek
Numeric.Help=Numerieke berekening
Objects=Objecten
-Opacity=Doorzichtigheid
+OneVarStats=Onderzoek één variabele
+OneVariable=Eén variabele
+OneVariableStatistics=Onderzoek één variabele
+Opacity=Ondoorschijnendheid
OpenFileFolder=Open map
OpenFromWebpage=Open uit webpagina
OpenWebpage=Open webpagina
@@ -327,8 +338,6 @@ OperationTable=Bewerkingstabel
Options=Opties
Orthogonal=Loodlijn
Orthogonal.Help=Punt en loodlijn
-OrthogonalPlane=Loodvlak
-OrthogonalPlane.Help=Selecteer punt en loodlijn
Other=Ander
OutputObjects=Eindobjecten
Overwrite=Overschrijven
@@ -336,8 +345,6 @@ Parabola=Parabool
Parabola.Help=Selecteer een punt en de richtlijn
Parallel=Evenwijdige rechte
Parallel.Help=Punt en evenwijdige rechte
-ParallelPlane=Evenwijdig vlak
-ParallelPlane.Help=Selecteer punt en evenwijdig vlak
Paste=Plakken
PasteDataFromClipboard=Gegevens van klembord plakken
PasteSpecial=Plakken speciaal
@@ -350,10 +357,6 @@ Perspective.Geometry=Meetkundevenster
Perspective.Primary=Basis
Perspective.TableAndGraphics=Rekenblad en tekenvenster
Perspectives=Schermindelingen
-PlanePointLine=Vlak door punt en rechte
-PlanePointLine.Help=Selecteer punt en rechte
-PlaneThreePoint=Vlak door 3 punten
-PlaneThreePoint.Help=Selecteer 3 punten
Point=Nieuw punt
Point.Help=Klik in tekenvenster of op rechte, grafiek of kromme
PointCapturing=Magnetische roosterpunten
@@ -378,7 +381,6 @@ Preview=Voorbeeld
Print=Afdrukken
PrintPreview=Afdrukvoorbeeld
Prism=Prisma
-Prism.Help=Selecteer veelhoek (of punten) en eerste punt evenwijdig vlak
Probability=Kansen
ProbabilityCalculator=Waarschijnlijkheidrekening
ProbabilityCalculator.Help=Dialoogvenster voor waarschijnlijkheidsrekening
@@ -411,8 +413,6 @@ RequireEquals=Nodig "=" voor de commando's
Result=Resultaat
ReturnAngleInverseTrig=Bereken hoek
RightAngleStyle=Stijl voor rechte hoek
-RightPrism=Recht prisma
-RightPrism.Help=Versleep veelhoek en voer de hoogte in
RightProb=Rechts
RigidPolygon=Starre veelhoek
RigidPolygon.Help=Selecteer hoekpunten en tenslotte het beginpunt
@@ -449,6 +449,7 @@ Semicircle=Halfcirkel door twee punten
Semicircle.Help=Twee punten
Semicolon=Puntkomma
Separator=Scheidingslijn
+SetClasssesManually=Bepaal manueel grenzen
Settings=Instellingen
Settings.ResetDefault=Standaardinstellingen herstellen
Settings.Save=Instellingen opslaan
@@ -508,7 +509,7 @@ SpreadsheetOptions=Opties van rekenblad
StartRow=Startrij
Statistics=Statistiek
Statistics2=Statistiek 2
-StemPlot=Stemplot
+StemPlot=Stengel- en bladdiagram
Step=Stap
Substitute=Vervangen
Substitute.Help=Vervang deel van een uitdrukking
@@ -539,7 +540,7 @@ Tangent=Raaklijnen
Tangent.Help=Punt, dan cirkel, kegelsnede of functie
Text=Tekst invoegen
Text.Help=Klik in tekenvenster of op punt
-TextFieldAction=Invoegen tekstveld
+TextFieldAction=Invulvak invoegen
TextFieldAction.Help=Klik in tekenvenster
Tool=Macro
Tool.CreateNew=Nieuwe macro aanmaken
@@ -566,6 +567,8 @@ TranslateView.Help=Versleep tekenvenster of as (Shift + slepen)
Transparent=Transparant
Transpose=Transponeer
Tutorials=Handleidingen
+TwoVarStats=Regressieanalyse
+TwoVariable=Twee variabelen
Type.CAS=CAS commando's
Type.Conic=Kegelsnede
Type.DiscreteMath=Discrete wiskunde
diff --git a/geogebra/properties/menu_no_NO.properties b/geogebra/properties/menu_no_NO.properties
index 0bc4fc7..504b7b1 100644
--- a/geogebra/properties/menu_no_NO.properties
+++ b/geogebra/properties/menu_no_NO.properties
@@ -388,8 +388,6 @@ OperationTable=Operasjonstabell
Options=Innstillinger
Orthogonal=Normal linje
Orthogonal.Help=Velg punkt og linje
-OrthogonalPlane=Vinkelrett plan
-OrthogonalPlane.Help=Velg punkt og vinkelrett linje
Other=Annet
OutputObjects=Sluttobjekt
Overlay=I samme diagram
@@ -401,8 +399,6 @@ Parabola=Parabel
Parabola.Help=Punkt og styrelinje
Parallel=Parallell linje
Parallel.Help=Punkt og parallell linje
-ParallelPlane=Parallelt plan
-ParallelPlane.Help=Velg punkt og parallelt plan
Paste=Lim inn
PasteDataFromClipboard=Lim inn data fra utklippstavla
PasteSpecial=Lim inn spesial
@@ -416,10 +412,6 @@ Perspective.Primary=Basis
Perspective.TableAndGraphics=Tabell og grafikk
Perspective.Whiteboard=Tavle
Perspectives=Oppsett
-PlanePointLine=Plan gjennom et punkt og ei linje
-PlanePointLine.Help=Velg punkt og linje
-PlaneThreePoint=Plan gjennom tre punkt
-PlaneThreePoint.Help=Velg tre punkt
Point=Nytt punkt
Point.Help=Klikk på grafikkfeltet eller på ei linje, en funksjon eller ei kurve
PointCapturing=Punktstyring
@@ -442,8 +434,6 @@ Power=Potens
Preview=Forhåndsvis
Print=Skriv ut
PrintPreview=Forhåndsvis utskrift
-Prism=Prisme
-Prism.Help=Velg mangekant (eller punkt) og første punkt på den andre parallelle overflaten
Probability=Sannsynlighet
ProbabilityCalculator=Sannsynlighetskalkulator
ProbabilityCalculator.Help=Meny for å beregne sannsynligheter
@@ -483,8 +473,6 @@ ResidualPlot=Restplott
Result=Resultat
ReturnAngleInverseTrig=Gi vinkel ut fra inverse trigonometriske funksjoner
RightAngleStyle=Type markering av rett vinkel
-RightPrism=Rett prisme
-RightPrism.Help=Dra i en mangekant eller velg en mangekant, og skriv inn høyden
RightProb=Høyresidig
RigidPolygon=Fast mangekant
RigidPolygon.Help=Velg alle hjørner og klikk så på det første hjørnet igjen
@@ -700,8 +688,6 @@ VectorPolygon=Vektormangekant
VectorPolygon.Help=Velg alle hjørnene. Klikk deretter på det første hjørnet igjen.
VerticalScrollbars=Vertikale rullefelt
View=Vis
-ViewInFrontOf=Frontperspektiv
-ViewInFrontOf.Help=Vis frontperspektiv for det valgte objektet
Views=Perspektiv
VisualStyle=Egenskaper og utseende
VisualStyle.Help=Klikk på flere objekt eller dra et rektangel over dem for å forandre egenskapene
diff --git a/geogebra/properties/menu_no_NO_NY.properties b/geogebra/properties/menu_no_NO_NY.properties
index 1bb9e4e..d4a20b2 100644
--- a/geogebra/properties/menu_no_NO_NY.properties
+++ b/geogebra/properties/menu_no_NO_NY.properties
@@ -90,6 +90,7 @@ FitCurve.Help=Vel punkt med markeringsrektangelet eller vel liste med punkt
FitLine=Beste tilpassa linje
FitLine.Help=Vel punkt ved å drage eit rektangel over aktuelt område, eller vel ei liste med punkt
Fix.Help=Vel objekt som skal låsast eller frigjerast
+FixedToGrid=Berre på rutenettet
FontSize=Fontstorleik
Formulas=Formlar
FrakturLetters=Gotiske bokstavar
@@ -97,6 +98,7 @@ FrequencyPolygon=Stolpediagram
FunctionInspector.Help=Vel ein funksjon
GUIFontSize=Meny - Fontstorleik
Green=Grøn
+HTML5Only=Eksporter berre til HTML 5
Hidden.Dashed=Stipla
Hidden.Invisible=Usynleg
Hidden.Unchanged=Uendra
@@ -118,6 +120,7 @@ Intersect.Help=Vel to linjer eller klikk p
IntersectionCurve=Skjering mellom to overflater
IntersectionCurve.Help=Lag ei kurve ved skjering mellom to overflater
InvertSelection=Inverter utval
+JavaOnly=Eksporter berre til Java
Join.Help=To punkt
KeepDotColors=Behald punktfargar
KeepInput=Behald inntasting
@@ -126,7 +129,7 @@ LabelColumn=Namngje kolonne
LabelColumnName=Kolonnenamn
Labeling=Namn på objekt
Labeling.off=Ikkje på nye objekt
-Labeling.pointsOnly=Bare på nye objekt
+Labeling.pointsOnly=Berre på nye objekt
Labeling.propertiesDefault=Bruk standardeigenskapar
Labels=Vis eller skjul namn
Landscape=Liggande
@@ -165,25 +168,20 @@ OneVarStats.Help=Analyserer talverdiar fr
OneVariable=Ein variabel
OneVariableInference=Inferens for ein variabel
OneVariableStatistics=Statistikk for ein variabel
-OnlyOpaqueFills=Bare heildekkende fyll
+OnlyOpaqueFills=Berre heildekkande fyll
OpenFileFolder=Opne filmappe
OpenFromWebpage=Opne frå nettside
OpenWebpage=Opne nettside
Options=Innstillingar
Orthogonal.Help=Vel punkt og linje
-OrthogonalPlane.Help=Vel punkt og vinkelrett linje
Other=Anna
Overlay=I same diagram
OverlayFrequencyPolygon=Stolpediagram i same diagram
OverlayNormalCurve=Normalfordelingskurve i same diagram
PairedT=Para T
-ParallelPlane.Help=Vel punkt og parallelt plan
PasteDataFromClipboard=Lim inn data frå utklippstavla
Pen.Help=Teikn i grafikkfeltet. Vel eit anna verktøy for å fullføre
Perspective.BasicGeometry=Grunnleggande geometri
-PlanePointLine=Plan gjennom eit punkt og ei linje
-PlanePointLine.Help=Vel punkt og linje
-PlaneThreePoint.Help=Vel tre punkt
Point.Help=Klikk på grafikkfeltet eller på ei linje, ein funksjon eller ei kurve
PointOnObject.Help=Klikk inne i eit objekt eller på omkrinsen av dette for å lage eit punkt
PolyLine.Help=Klikk på alle hjørna og så på det første hjørnet igjen
@@ -192,7 +190,6 @@ PolygonTools=Verkt
Portrait=Ståande
Preview=Førehandsvis
PrintPreview=Førehandsvis utskrift
-Prism.Help=Vel mangekant (eller punkt) og første punkt på den andre parallelle overflata
Probability=Sannsyn
ProbabilityCalculator=Sannsynskalkulator
ProbabilityCalculator.Help=Meny for å rekne ut sannsyn
@@ -212,7 +209,6 @@ RemoveTrace=Fjern objekt fr
Rename=Gje nytt namn
RequireEquals=Krev "=" framfor kommandoar
ReturnAngleInverseTrig=Gje vinkel ut frå inverse trigonometriske funksjonar
-RightPrism.Help=Drag i ein mangekant eller vel ein mangekant, og skriv inn høgda
RightProb=Høgresidig
RigidPolygon=Regulær mangekant
RigidPolygon.Help=Vel alle hjørne og klikk så på det første hjørnet igjen
@@ -315,7 +311,6 @@ Vector.Help=Vel startpunkt og deretter sluttpunkt
VectorFromPoint=Vektor frå punkt
VectorFromPoint.Help=Vel startpunkt og vektor
VectorPolygon.Help=Vel alle hjørna. Klikk deretter på det første hjørnet igjen.
-ViewInFrontOf.Help=Vis frontperspektiv for det valde objektet
VisualStyle=Eigenskapar og utsjånad
VisualStyle.Help=Klikk på fleire objekt eller drag eit rektangel over dei for å endre eigenskapane
Width=Breidde
diff --git a/geogebra/properties/menu_pl.properties b/geogebra/properties/menu_pl.properties
index a67ef7b..63f72e0 100644
--- a/geogebra/properties/menu_pl.properties
+++ b/geogebra/properties/menu_pl.properties
@@ -386,8 +386,6 @@ OperationTable=Tabela operacji
Options=Opcje
Orthogonal=Proste prostopad\u0142e
Orthogonal.Help=Wybierz punkt i prost\u0105 prostopad\u0142\u0105
-OrthogonalPlane=P\u0142aszczyzna prostopad\u0142a
-OrthogonalPlane.Help=Wybierz punkt i prost\u0105 prostopad\u0142\u0105
Other=Pozosta\u0142e
OutputObjects=Obiekty Wyj\u015bcia
Overlay=Na\u0142ó\u017c
@@ -397,8 +395,6 @@ Overwrite=Zast\u0105p (Nadpisz)
Parabola.Help=Wybierz punkt i kierownic\u0119
Parallel=Prosta równoleg\u0142a
Parallel.Help=Wybierz punkt i prost\u0105 równoleg\u0142\u0105
-ParallelPlane=P\u0142aszczyzna równolegla
-ParallelPlane.Help=Zaznacz punkt i p\u0142aszczyzn\u0119 równoleg\u0142\u0105
Paste=Wklej
PasteDataFromClipboard=Wklej ze Schowka
PasteSpecial=Wklej specjalnie
@@ -412,10 +408,6 @@ Perspective.Primary=Podstawowy
Perspective.TableAndGraphics=Tabela i Grafika
Perspective.Whiteboard=Tablica
Perspectives=Widoki
-PlanePointLine=P\u0142aszczyzna przechodz\u0105ca przez dany punkt i prost\u0105
-PlanePointLine.Help=Wska\u017c punkt i prost\u0105
-PlaneThreePoint=P\u0142aszczyzna przechodz\u0105ca przez trzy punkty
-PlaneThreePoint.Help=Wybierz trzy punkty
Point=Nowy Punkt
Point.Help=Kliknij w Widoku Grafiki lub na prostej, funkcji lub krzywej
PointCapturing=Przechwytywanie punktu
@@ -439,8 +431,6 @@ Power=Si\u0142a
Preview=Podgl\u0105d
Print=Drukuj
PrintPreview=Podgl\u0105d wydruku
-Prism=Graniastos\u0142up
-Prism.Help=Wybierz wielok\u0105t (lub punkty) a nast\u0119pnie punkt na drugiej równoleg\u0142ej podstawie
Probability=Prawdopodobie\u0144stwo
ProbabilityCalculator=Kalkulator Prawdopodobie\u0144stwa
ProbabilityCalculator.Help=Okienko Dialogowe do obliczania prawdopodobie\u0144stw
@@ -480,8 +470,6 @@ ResidualPlot=Pozosta\u0142e wykresy
Result=Wynik
ReturnAngleInverseTrig=Podaj k\u0105ty dla odwrotnych funkcji trygonometrycznych
RightAngleStyle=Styl k\u0105ta prostego
-RightPrism=Graniastos\u0142up Prawid\u0142owy
-RightPrism.Help=Narysuj wielok\u0105t lub zaznacz wielok\u0105t, wprowad\u017a wysoko\u015b\u0107
RightProb=Prawostronny
RigidPolygon=Wielok\u0105t o Sta\u0142ym Kszta\u0142cie
RigidPolygon.Help=Zaznacz wszystkie wierzcho\u0142ki, a nast\u0119pnie ponownie kliknij pierwszy wierzcho\u0142ek
@@ -689,7 +677,6 @@ VectorPolygon=Wielok\u0105t Wektorowy
VectorPolygon.Help=Zaznacz wszystkie wierzcho\u0142ki, a nast\u0119pnie ponownie kliknij pierwszy wierzcho\u0142ek
VerticalScrollbars=Pionowy Pasek przewijania
View=Widok
-ViewInFrontOf=Zobacz przed
Views=Widoki
VisualStyle=Styl wizualny
VisualStyle.Help=Kliknij na Obiekt i wyznacz prostok\u0105t, aby zmieni\u0107 jego w\u0142a\u015bciwo\u015bci
diff --git a/geogebra/properties/menu_pt.properties b/geogebra/properties/menu_pt.properties
index 3070d35..a8381af 100644
--- a/geogebra/properties/menu_pt.properties
+++ b/geogebra/properties/menu_pt.properties
@@ -386,8 +386,6 @@ OperationTable=Tabela de Opera
Options=Opções
Orthogonal=Reta Perpendicular
Orthogonal.Help=Selecione primeiro o ponto e, depois, uma reta (ou segmento, ou semirreta, ou vetor)
-OrthogonalPlane=Plano Perpendicular
-OrthogonalPlane.Help=Selecione um ponto e uma reta perpendicular
Other=Outro
OutputObjects=Objetos Finais
Overlay=Sobreposição
@@ -399,8 +397,6 @@ Parabola=Par
Parabola.Help=Selecione primeiro o foco e, depois, a diretriz
Parallel=Reta Paralela
Parallel.Help=Selecione primeiro o ponto e, depois, a reta (ou segmento, ou semirreta ou vetor)
-ParallelPlane=Plano Paralelo
-ParallelPlane.Help=Selecione um ponto e um plano paralelo
Paste=Colar
PasteDataFromClipboard=Colar da Área de Transferência
PasteSpecial=Colagem Especial
@@ -414,10 +410,6 @@ Perspective.Primary=Prim
Perspective.TableAndGraphics=Tabelas e Gráficos
Perspective.Whiteboard=Quadro Interativo
Perspectives=Disposições
-PlanePointLine=Plano passando por um ponto e uma reta
-PlanePointLine.Help=Selecione um ponto e uma reta
-PlaneThreePoint=Plano passando por três pontos
-PlaneThreePoint.Help=Selecione três pontos
Point=Novo Ponto
Point.Help=Clique na Janela de Visualização ou sobre um objeto
PointCapturing=Pontos Sobre a Malha
@@ -440,8 +432,6 @@ Power=Pot
Preview=Visualizar
Print=Imprimir
PrintPreview=Visualizar Impressão
-Prism=Prisma
-Prism.Help=Selecione um polígono (ou pontos) e o primeiro ponto da segunda face paralela
Probability=Probabilidade
ProbabilityCalculator=Calculadora de Probabilidades
ProbabilityCalculator.Help=Cálculo de Probabilidades
@@ -482,8 +472,6 @@ ResidualPlot=Res
Result=Resultado
ReturnAngleInverseTrig=Retornar ângulo de funções trigonométricas inversas
RightAngleStyle=Estilo do Ângulo Reto
-RightPrism=Prisma reto
-RightPrism.Help=Arraste um polígono, ou selecione um polígono e em, seguida, defina a altura
RightProb=Unicaudal à Direita
RigidPolygon=Polígono Rígido
RigidPolygon.Help=Selecione todos os vértices e, então, clique novamente no vértice inicial
@@ -706,8 +694,6 @@ VectorPolygon=Pol
VectorPolygon.Help=Selecione todos os vértices e, então, clique novamente no vértice inicial
VerticalScrollbars=Barras de Rolagem Verticais
View=Exibir
-ViewInFrontOf=Vista para frente de
-ViewInFrontOf.Help=Muda a vista para a frente do objeto selecionado
Views=Vistas
VisualStyle=Estilo Visual
VisualStyle.Help=Clique nos objetos ou use um retângulo de seleção para modificar suas propriedades
diff --git a/geogebra/properties/menu_pt_PT.properties b/geogebra/properties/menu_pt_PT.properties
index d077752..2f9a646 100644
--- a/geogebra/properties/menu_pt_PT.properties
+++ b/geogebra/properties/menu_pt_PT.properties
@@ -1,113 +1,125 @@
-AccentsExt=Extensão dos acentos
-ActionObjectTools=Ferramentas de Interação
-AddTrace=Juntar objeto à lista dos traços
-Adjustment=Ajustar
+AccentsExt=Estender acentos
+ActionObjectTools=Ferramenta de Ação do Objeto
+AddTrace=Adicionar objeto à lista do traço
+Adjustment=Ajustamento
+AllCommands=Todos os comandos
+AllowRescaling=Permitir redimensionamento
AllowTooltips=Permitir Descrições
AlternativeHypothesis=Hipótese Alternativa
-AngleFixed.Help=Selecione um ponto, o vértice e a amplitude
-AngleUnit=Unidade Angular
-ApplyDefaults=Aplicar Configuração Padrão
-Area.Help=Selecione um polígono, um círculo ou uma cónica
+AngleFixed=Ângulo com uma dada amplitude
+AngleFixed.Help=Seleccione o ponto,depois o vértice e digite o comprimento
+AngleUnit=Unidade de amplitude
+ApplyDefaults=Aplicar configuração padrão
+Area.Help=Selecione polígono, circunferência, ou cónica
Ascending=Ascendente
-AttachDetachPoint=Juntar ou Separar Ponto
-AttachDetachPoint.Help=Clique no Ponto (e no Objeto a vincular)
+AttachDetachPoint=Ligar/Desligar Ponto
+AttachDetachPoint.Help=Clique num Ponto (e num Objeto para fixar)
AutoDimension=Dimensões Automáticas
-Axes=Eixos Coordenados
Back=Fundo
BackgroundColor=Cor do Fundo
-BasicLineTools=Ferramentas Básicas de Reta
+BasicLineTools=Ferramenta de reta
BlackboardLetters=Fonte Blackboard
-Boxplot=Diagrama de Extremos e Quartis
-ButtonAction.Help=Clique numa área livre da Folha Gráfica
-CalligraphicLetters=Fonte Caligráfica
-CheckboxSize=Tamanho das Caixas de Controlo
+Boxplot=Caixa de Bigodes
+Brackets=Suportes
+ButtonAction.Help=Clique na Folha Gráfica para inserir um botão
+CalligraphicLetters=Letras de Caligrafia
+Cartesian=Cartesiano
+CheckboxSize=Tamanho da Caixa de Verificação
CheckboxSize.Regular=Regular
-ChooseFromFile=Escolha a partir de um ficheiro
-Circle2=Circunferência (Centro, Ponto)
-Circle2.Help=Selecione o centro e depois um ponto da circunferência
+ChooseFromFile=Escolher do Ficheiro
+Circle2=Circunferência (Centro,Ponto)
+Circle2.Help=Selecione o centro, depois um ponto na circunferência
Circle3=Circunferência (Três Pontos)
-Circle3.Help=Selecione três pontos da circunferência
+Circle3.Help=Selecione três pontos na Circunferência
CircleArc3=Arco Circular (Centro, Dois Pontos)
CircleArc3.Help=Selecione o centro e dois pontos
-CircleArcTools=Ferramentas de Círculo e Arco
+CircleArcTools=Circunferência & Ferramenta de Arcos
CircleAxisPoint=Circunferência (Eixo, Ponto)
-CircleAxisPoint.Help=Selecione o eixo e depois o ponto na circunferência
+CircleAxisPoint.Help=Selecione eixo, depois o ponto na circunferência
CirclePointRadius=Circunferência (Centro, Raio)
CirclePointRadius.Help=Selecione o centro e digite o raio
-CirclePointRadiusDirection=Circunferência (Centro, Direção, Raio)
-CirclePointRadiusDirection.Help=Selecione o centro, a direção e digite o raio
-CircleSector3=Setor Circular (Centro, Dois Pontos)
+CirclePointRadiusDirection=Circunferência (Centro, Raio e Direção)
+CirclePointRadiusDirection.Help=Selecione o centro, direção e digite o raio
+CircleSector3=Setor Circular (Centro ,Dois Pontos)
CircleSector3.Help=Selecione o centro e dois pontos
CircumcircleArc3=Arco Circuncircular (Três Pontos)
+CircumcircleArc3.Help=Selecione três pontos no arco
CircumcircleSector3=Setor Circuncircular (Três Pontos)
CircumcircleSector3.Help=Selecione três pontos no setor
-ClassRule=Regra
-ClearSelection=Eliminar os Objetos Selecionados
-ClearTrace=Eliminar Todos os Traços
+ClearColumn=Apagar Colunas
+ClearColumns=Apagar Colunas
+ClearRow=Apagar Linha
+ClearRows=Apagar Linhas
+ClearSelection=Desfazer Seleção
+ClearTrace=apagar todos os traços
ClipboardMessage=A exportação para a área de transferência foi bem sucedida.\nAgora edite o HTML e cole no seu LMS (por exemplo, Moodle)
-CloseFile=Fechar o Ficheiro
-CollapseAll=Erro geral
-ColumnReset=Reiniciar Coluna
-Compasses.Help=Selecione um segmento ou dois pontos para definir o raio, depois o centro
+CloseAll=Fechar tudo
+CloseFile=Fechar Ficheiro
+CmdList=Ajuda da Entrada
+CollapseAll=Fechar tudo
+ColumnReset=Redefinir Coluna
+Compasses.Help=Selecione o segmento ou dois pontos para definir o raio, em seguida o centro
ComplexNumber.Help=Clique na Folha Gráfica para criar um número complexo
-ConciseUsingCSE5=Código Conciso Usando CSE5
-Condition.ShowObject=Condição para mostrar objetos
+ConciseUsingCSE5=Código Conciso utilizando cse5
+Condition.ShowObject=Condição para Mostrar Objeto
Conic=Cónica
-Conic5=Cónica por Cinco Pontos
+Conic5=Cónica (Cinco Pontos)
Conic5.Help=Selecione cinco pontos na cónica
ConicMenu=Cónica
-ConicSectionTools=Ferramentas de Cónica
-Continuous=Continua
-CopyToClipboard=Copiar Para a Área de Transferência
-CopyToGraphics=Copiar Para a Folha Gráfica
-CopyToInputBar=Copiar Para a Entrada de Comandos
-CopyToSpreadsheet=Copiar Para a Folha de Cálculo
-CopyVisualStyle.Help=Clique no objeto modelo e depois naquele(s) cujo estilo pretende alterar
-CountCells=Contar valores num bloco de células
-CountCells.Help=Selecione um bloco de células
-CreateCurveFit=Criar Regressão
-CreateCurveFit.Help=Selecione células para pontos e depois clique na ferramenta
-CreateList.Help=Selecione as células e clique na ferramenta
-CreateListGraphicsView.Help=Pressione a tecla ALT e selecione os objetos com o rato
-CreateListOfPoints.Help=Selecione as células e depois clique na ferramenta
-CreateMatrix.Help=Selecione as células e depois clique na ferramenta
-CreateOperationTable.Help=Selecione um bloco de células e em seguida clique na ferramenta
+ConicSectionTools=Ferramentas das Cónicas
+Continuous=Continuo
+CopyToClipboard=Copiar para a Área de Transferência
+CopyToGraphics=Copiar para a Folha Gráfica
+CopyToInputBar=Copiar para o Campo de Entrada
+CopyToSpreadsheet=Copiar para a Folha de Cálculo
+CopyVisualStyle.Help=Selecione um objeto, depois clique nos outros
+Count=Contar
+CountCells=Contar
+CountCells.Help=Selecione um conjunto de células
+CreateCurveFit=Curva de Regressão
+CreateCurveFit.Help=Selecione células para pontos depois clique na botão da ferramenta
+CreateList.Help=Selecione células depois clique no botão da ferramenta
+CreateListGraphicsView.Help=Arraste o retângulo em redor do objeto
+CreateListOfPoints.Help=Selecione células depois clique no botão da ferramenta
+CreateMatrix.Help=Selecione células depois clique no botão da ferramenta
+CreateOperationTable=Criar Tabela
+CreateOperationTable.Help=Selecione um bloco de células e depois clique no botão da ferramenta
CreatePolyLine=Criar Linha Poligonal
-CreatePolyLine.Help=Selecione as células para pontos e em seguida clique na ferramenta
-CreateTable.Help=Selecione as células e em seguida clique na ferramenta
-Cumulative=Acumuladas
-CursiveLetters=Fonte Cursiva
-CustomTools=Ferramentas do Utilizador
-DataColumn=Coluna
-DataColumnName=Nome da Coluna
+CreatePolyLine.Help=Selecione células para pontos depois clique no botão da ferramenta
+CreateTable.Help=Selecione células depois clique no botão da ferramenta
+Cumulative=Cumulativa
+CustomTools=Ferramenta Personalizada
Default.Restore=Restaurar a Configuração Padrão
+Default.Set=Restaurar configuração padrão
DegreesOfFreedom.short=gl
DegreesOfFreedom1.short=gl1
DegreesOfFreedom2.short=gl2
-Delete.Help=Selecione os objetos para apagar
+Delete.Help=Selecionar objeto
+DeleteTool=Apagar Ferramenta
+Delimiter=Delimitar
Derivative=Derivada
-Derivative.Help=Calcula a primeira derivada
+Derivative.Help=Encontrar a primeira derivada
Descending=Descendente
-DifferenceofMeansT=Diferença das Médias T
-DilateFromPoint=Homotetia (Objeto, Centro, Fator)
-DilateFromPoint.Help=Selecione o objeto do homotetia, depois o centro e o fator
-Distance.Help=Selecione dois pontos, um segmento, um ponto e uma reta, um polígono, uma circunferência ou uma elipse
-Distribution.ChiSquare=QuiQuadrato
+DilateFromPoint=Homotetia (Centro, Razão)
+DilateFromPoint.Help=Selecione objeto depois o centro e em seguida digite a razão da homotetia
+Distance=Distância ou Comprimento
+Distance.Help=Selecione dois pontos, segmento de reta, polígono ou circunferência
+Distribution.ChiSquare=Qui-Quadrado
Distribution.F=Distribuição F
Distribution.Lognormal=Log-Normal
Distribution.Shape=Forma
-DoYouWantToSaveYourChanges=Quer gravar as alterações efetuadas?
+DoYouWantToSaveYourChanges=Quer gravar as alterações?
DontSave=Não
DrawingPadToClipboard=Cópia da Folha Gráfica para a Área de Transferência
Ellipse3.Help=Selecione dois focos e um ponto da elipse
-EnableLabelDrags=Permitir deslocar os rótulos
-EnableRightClick=Permitir clique direito, Zoom e edição com teclado
+EnableLabelDrags=Permitir Deslocar os Rótulos
+EnableRightClick=Permitir Clique Direito, Zoom e Edição com Teclado
EnterAppletAddress=Digite o endereço Web da apliqueta Geogebra
EnterWebAddress=Digite o Endereço Web
EqualVariance=Igual Variância
Evaluate.Help=Calcula o Valor Exato
Expand.Help=Expande expressão fatorizada
-ExportAllWorksheets=Exportar todas as apliquetas ggb abertas
+ExportAllWorksheets=Exportar todas as Folhas de Cálculo
Factor=Fatorizar
File=Ficheiro
FileBrowser=Explorador de Ficheiros
@@ -126,7 +138,6 @@ ForegroundColor=Cor de Fundo
FrakturLetters=Fonte Fraktur
Frequency=Frequências Ponderadas
FrequencyType=Tipo de Frequências
-FunctionInspector.Help=Selecione a função
GUIFontSize=Escolha no Menu
GeneralTools=Ferramentas Gerais
GeogebraToAsymptoteExport=Exportar Geogebra para Asymptote
@@ -141,8 +152,7 @@ Hyperbola3.Help=Selecione dois focos e um ponto da hip
Image=Inserir imagem
Image.Help=Clique numa área livre da Folha Gráfica ou num ponto
ImportDataFile=Importar Ficheiro de Dados
-InputField=Barra de Comandos
-InputField.Help=Clique no objeto para copiar o respetivo nome para a entrada de comandos
+InputField.Help=Clique no objeto para copiar o respetivo nome para a Campo de Entrada
InputHelp=Ajuda na Entrada
InsertAbove=Inserir Acima
InsertBelow=Inserir Abaixo
@@ -208,19 +218,16 @@ Orthogonal.Help=Selecione um ponto e uma reta perpendicular
Overlay=Sobrepor
PValue=valor-P
PairedT=Teste T emparelhado
-Parabola.Help=Selecione o foco e a diretriz
+Parabola.Help=Selecione ponto e a diretriz
Parallel.Help=Selecione um ponto e uma reta paralela
PasteDataFromClipboard=Colar Dados da Área de Transferência
Pen.Help=Desenhe na Folha Gráfica e depois selecione outra ferramenta para finalizar
Perspective.AlgebraAndGraphics=Álgebra & Gráficos
Perspective.CASAndGraphics=CAS & Gráficos
Perspective.Primary=Primária
-Perspective.TableAndGraphics=Tabelas & Gráficos
+Perspective.TableAndGraphics=Folha de Cálculo & Gráficos
Perspective.Whiteboard=Quadro Branco
-PlanePointLine=Plano (Ponto, Reta)
-PlanePointLine.Help=Selecione um ponto e a reta
-PlaneThreePoint=Plano (Ponto, Ponto, Ponto)
-Point.Help=Clique numa área livre da Folha Gráfica ou numa linha geométrica
+Point.Help=Clique numa área livre da Folha Gráfica ou numa reta, função ou curva
PointCapturing=Captura de Pontos
PointOnObject=Ponto no Objeto
PointOnObject.Help=Clique no interior do objeto ou no seu perímetro
@@ -246,13 +253,11 @@ RecoveryTitle=Restaurar
Refresh=Atualizar
RegressionInference=Inferência da Regressão
RegularPolygon.Help=Selecione dois pontos e digite o número de vértices
-Relative=Relativas
RemoveTrace=Remover objeto da lista
RequireEquals=Obrigar "=" antes dos Comandos
ResidualPlot=Gráfico de Resíduos
ReturnAngleInverseTrig=Devolver o ângulo da função trigonométrica inversa
RightAngleStyle=Representação do Ângulo Reto
-RightPrism.Help=Arraste o polígono, ou selecione o polígono e em seguida introduza a altura
RightProb=À direita (X\u2265b)
RigidPolygon.Help=Selecione todos os vértices, e depois clique outra vez no primeiro vértice
RotateByAngle=Rotação (Objeto, Centro, Amplitude)
@@ -293,7 +298,7 @@ ShowHideLabels=Exibir/Esconder R
ShowHideObject=Exibir/Esconder Objeto
ShowHideObject.Help=Selecione o objeto a exibir ou esconder e mude de modo para aplicar
ShowHorizontalScrollbars=Exibir Barras de Rolamento Horizontal
-ShowInputField=Exibir Barra de Comandos
+ShowInputField=Mostrar Campo de Entrada
ShowMenuBar=Exibir Barra de Menus
ShowMouseCoordinates=Exibir Coordenadas do Cursor
ShowPlot2=Exibir Folha Gráfica 2
@@ -345,7 +350,7 @@ TMeanTest=Teste T para a M
TTestDifferenceOfMeans=Teste T, Diferença das Médias
TTestPairedDifferences=T Teste, Diferenças Emparelhadas
Tab=Aba
-Tangent=Tangente
+Tangent=Tangentes
Tangent.Help=Selecione um ponto ou reta, depois a circunferência,outra cónica ou função
Text.Help=Clique numa área livre da Folha Gráfica ou num ponto
TextFieldAction=Inserir Caixa de Texto
@@ -386,12 +391,10 @@ UseHeaderRow=Utilizar Cabe
UserInterface=Interface do Utilizador
Vector=Vetor (Dois Pontos)
Vector.Help=Selecione o ponto origem e o ponto extremidade
-VectorFromPoint=Vetor Aplicado num Ponto
+VectorFromPoint=Vetor aplicado num Ponto
VectorFromPoint.Help=Selecione o ponto origem e um vetor
VectorPolygon.Help=Selecione todos os vértices, e em seguida selecione o primeiro vértice outra vez
VerticalScrollbars=Barras de Rolamento Vertical
-ViewInFrontOf=Vista frontal
-ViewInFrontOf.Help=Permite a vista frontal do objeto selecionado
VisualStyle.Help=Clique no objeto ou defina um retângulo de seleção para alterar as propriedades
Width=Amplitude
WithOpacityPen=Traço da Caneta Opaco
diff --git a/geogebra/properties/menu_ru.properties b/geogebra/properties/menu_ru.properties
index 90bb954..9043419 100644
--- a/geogebra/properties/menu_ru.properties
+++ b/geogebra/properties/menu_ru.properties
@@ -372,8 +372,6 @@ Operation=\u041e\u043f\u0435\u0440\u0430\u0446\u0438\u044f
Options=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
Orthogonal=\u041f\u0435\u0440\u043f\u0435\u043d\u0434\u0438\u043a\u0443\u043b\u044f\u0440\u043d\u0430\u044f \u043f\u0440\u044f\u043c\u0430\u044f
Orthogonal.Help=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0442\u043e\u0447\u043a\u0443 \u0438 \u043f\u0435\u0440\u043f\u0435\u043d\u0434\u0438\u043a\u0443\u043b\u044f\u0440\u043d\u0443\u044e \u043f\u0440\u044f\u043c\u0443\u044e
-OrthogonalPlane=\u041f\u0435\u0440\u043f\u0435\u043d\u0434\u0438\u043a\u0443\u043b\u044f\u0440\u043d\u0430\u044f \u043f\u043b\u043e\u0441\u043a\u043e\u0441\u0442\u044c
-OrthogonalPlane.Help=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0442\u043e\u0447\u043a\u0443 \u0438 \u043f\u0435\u0440\u043f\u0435\u043d\u0434\u0438\u043a\u0443\u043b\u044f\u0440\u043d\u0443\u044e \u043f\u0440\u044f\u043c\u0443\u044e
Other=\u0414\u0440\u0443\u0433\u043e\u0435
OutputObjects=\u0412\u044b\u0445\u043e\u0434\u043d\u044b\u0435 \u043e\u0431\u044a\u0435\u043a\u0442\u044b
Overwrite=\u041f\u0435\u0440\u0435\u043f\u0438\u0441\u0430\u0442\u044c
@@ -381,8 +379,6 @@ Parabola=\u041f\u0430\u0440\u0430\u0431\u043e\u043b\u0430
Parabola.Help=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0442\u043e\u0447\u043a\u0443 \u0438 \u0434\u0438\u0440\u0435\u043a\u0442\u0440\u0438\u0441\u0443 \u043f\u0430\u0440\u0430\u0431\u043e\u043b\u044b
Parallel=\u041f\u0430\u0440\u0430\u043b\u043b\u0435\u043b\u044c\u043d\u0430\u044f \u043f\u0440\u044f\u043c\u0430\u044f
Parallel.Help=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0442\u043e\u0447\u043a\u0443 \u0438 \u043f\u0430\u0440\u0430\u043b\u043b\u0435\u043b\u044c\u043d\u0443\u044e \u043f\u0440\u044f\u043c\u0443\u044e
-ParallelPlane=\u041f\u0430\u0440\u0430\u043b\u043b\u0435\u043b\u044c\u043d\u0430\u044f \u043f\u043b\u043e\u0441\u043a\u043e\u0442\u044c
-ParallelPlane.Help=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0442\u043e\u0447\u043a\u0443 \u0438 \u043f\u0430\u0440\u0430\u043b\u043b\u0435\u043b\u044c\u043d\u0443\u044e \u043f\u043b\u043e\u0441\u043a\u043e\u0441\u0442\u044c
Paste=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c
PasteDataFromClipboard=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0434\u0430\u043d\u043d\u044b\u0435 \u0438\u0437 \u0431\u0443\u0444\u0435\u0440\u0430 \u043e\u0431\u043c\u0435\u043d\u0430
Pen=\u041a\u0430\u0440\u0430\u043d\u0434\u0430\u0448
@@ -394,10 +390,6 @@ Perspective.Geometry=\u0413\u0435\u043e\u043c\u0435\u0442\u0440\u0438\u044f
Perspective.TableAndGraphics=\u0422\u0430\u0431\u043b\u0438\u0446\u044b \u0438 \u0433\u0440\u0430\u0444\u0438\u043a\u0438
Perspective.Whiteboard=\u0411\u0435\u043b\u0430\u044f \u0434\u043e\u0441\u043a\u0430
Perspectives=\u041f\u0435\u0440\u0441\u043f\u0435\u043a\u0442\u0438\u0432\u044b
-PlanePointLine=\u041f\u043b\u043e\u0441\u043a\u043e\u0441\u0442\u044c \u0447\u0435\u0440\u0435\u0437 \u0442\u043e\u0447\u043a\u0443 \u0438 \u043f\u0440\u044f\u043c\u0443\u044e
-PlanePointLine.Help=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0442\u043e\u0447\u043a\u0443 \u0438 \u043f\u0440\u044f\u043c\u0443\u044e
-PlaneThreePoint=\u041f\u043b\u043e\u0441\u043a\u043e\u0441\u0442\u044c \u0447\u0435\u0440\u0435\u0437 3 \u0442\u043e\u0447\u043a\u0438
-PlaneThreePoint.Help=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0442\u0440\u0438 \u0442\u043e\u0447\u043a\u0438
Point=\u0422\u043e\u0447\u043a\u0430
Point.Help=\u0429\u0451\u043b\u043a\u043d\u0438\u0442\u0435 \u043d\u0430 \u043f\u043e\u043b\u043e\u0442\u043d\u0435 \u0438\u043b\u0438 \u043b\u0438\u043d\u0438\u0438
PointCapturing=\u041f\u0440\u0438\u0432\u044f\u0437\u043a\u0430 \u0442\u043e\u0447\u0435\u043a
@@ -421,8 +413,6 @@ Power=\u0421\u0442\u0435\u043f\u0435\u043d\u043d\u0430\u044f
Preview=\u041f\u0440\u0435\u0434\u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440
Print=\u041f\u0435\u0447\u0430\u0442\u044c
PrintPreview=\u041f\u0435\u0447\u0430\u0442\u044c
-Prism=\u041f\u0440\u0438\u0437\u043c\u0430
-Prism.Help=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u043c\u043d\u043e\u0433\u043e\u0443\u0433\u043e\u043b\u044c\u043d\u0438\u043a (\u0438\u043b\u0438 \u0442\u043e\u0447\u043a\u0438) \u0438 \u0442\u043e\u0447\u043a\u0443 \u043d\u0430 \u043f\u0430\u0440\u0430\u043b\u043b\u0435\u043b\u044c\u043d\u043e\u0439 \u0433\u0440\u0430\u043d\u0438
Probability=\u0412\u0435\u0440\u043e\u044f\u0442\u043d\u043e\u0441\u0442\u044c
ProbabilityCalculator=\u041a\u0430\u043b\u044c\u043a\u0443\u043b\u044f\u0442\u043e\u0440 \u0412\u0435\u0440\u043e\u044f\u0442\u043d\u043e\u0441\u0442\u0435\u0439
ProbabilityCalculator.Help=\u041e\u043a\u043d\u043e \u0434\u043b\u044f \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u044f \u0432\u0435\u0440\u043e\u044f\u0442\u043d\u043e\u0441\u0442\u0435\u0439
@@ -462,8 +452,6 @@ ResidualPlot=\u0413\u0440\u0430\u0444\u0438\u043a \u043e\u0441\u0442\u0430\u0442
Result=\u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442
ReturnAngleInverseTrig=\u0412\u043e\u0437\u0432\u0440\u0430\u0449\u0430\u0442\u044c \u0443\u0433\u043e\u043b \u043e\u0442 \u043e\u0431\u0440\u0430\u0442\u043d\u044b\u0445 \u0442\u0440\u0438\u0433\u043e\u043d\u043e\u043c\u0435\u0442\u0440\u0438\u0447\u0435\u0441\u043a\u0438\u0445 \u0444\u0443\u043d\u043a\u0446\u0438\u0439
RightAngleStyle=\u041f\u0440\u044f\u043c\u043e\u0439 \u0443\u0433\u043e\u043b
-RightPrism=\u041f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u0430\u044f \u043f\u0440\u0438\u0437\u043c\u0430
-RightPrism.Help=\u0422\u0430\u0449\u0438\u0442\u0435 \u043c\u043d\u043e\u0433\u043e\u0443\u0433\u043e\u043b\u044c\u043d\u0438\u043a, \u0438\u043b\u0438 \u0443\u043a\u0430\u0436\u0438\u0442\u0435 \u043c\u043d\u043e\u0433\u043e\u0443\u0433\u043e\u043b\u044c\u043d\u0438\u043a \u0432\u0432\u0435\u0434\u0438\u0442\u0435 \u0432\u044b\u0441\u043e\u0442\u0443
RightProb=\u041f\u0440\u0430\u0432\u043e\u0441\u0442\u043e\u0440\u043e\u043d\u043d\u044f\u044f
RigidPolygon=\u0416\u0451\u0441\u0442\u043a\u0438\u0439 \u043c\u043d\u043e\u0433\u043e\u0443\u0433\u043e\u043b\u044c\u043d\u0438\u043a
RigidPolygon.Help=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0432\u0441\u0435 \u0432\u0435\u0440\u0448\u0438\u043d\u044b, \u043f\u043e\u0442\u043e\u043c \u0449\u0451\u043b\u043a\u043d\u0438\u0442\u0435 \u043d\u0430 \u043f\u0435\u0440\u0432\u043e\u0439 \u0441\u043d\u043e\u0432\u0430
@@ -664,8 +652,6 @@ VectorPolygon=\u0412\u0435\u043a\u0442\u043e\u0440\u043d\u044b\u0439 \u043c\u043
VectorPolygon.Help=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0432\u0441\u0435 \u0432\u0435\u0440\u0448\u0438\u043d\u044b, \u0437\u0430\u0442\u0435\u043c \u0443\u043a\u0430\u0436\u0438\u0442\u0435 \u043f\u0435\u0440\u0432\u0443\u044e \u0441\u043d\u043e\u0432\u0430
VerticalScrollbars=\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u044b\u0435 \u043f\u043e\u043b\u0437\u0443\u043d\u043a\u0438
View=\u0412\u0438\u0434
-ViewInFrontOf=\u041d\u043e\u0440\u043c\u0430\u043b\u044c\u043d\u043e \u043a
-ViewInFrontOf.Help=\u041c\u0435\u043d\u044f\u0435\u0442 \u0432\u0438\u0434 \u043d\u043e\u0440\u043c\u0430\u043b\u044c\u043d\u043e \u043a \u0443\u043a\u0430\u0437\u0430\u043d\u043e\u043c\u0443 \u043e\u0431\u044a\u0435\u043a\u0442\u0443
Views=\u0412\u0438\u0434\u044b
Width=\u0428\u0438\u0440\u0438\u043d\u0430
Window=\u041e\u043a\u043d\u043e
diff --git a/geogebra/properties/menu_sk.properties b/geogebra/properties/menu_sk.properties
index 951fade..f086d0b 100644
--- a/geogebra/properties/menu_sk.properties
+++ b/geogebra/properties/menu_sk.properties
@@ -39,7 +39,7 @@ Brackets=Hranat
Browser=Prehliada\u010d
Button.Caption=Legenda
ButtonAction=Vlo\u017ei\u0165 tla\u010didlo
-ButtonAction.Help=Kliknite do geometrického okna na prilo\u017eenie tla\u010didla
+ButtonAction.Help=Kliknite do nákresne na vlo\u017eenie tla\u010didla
ByLayering=So vrstvovaním
Calculate=Vypo\u010díta\u0165
CalligraphicLetters=Kaligrafické písmená
@@ -159,7 +159,7 @@ Derivative.Help=N
Descending=Zostupne
DifferenceofMeansT=\u0160tandardná deviácia T
Differences=Rozdiely
-DilateFromPoint=Zobrazi\u0165 v rovoha\u013ehosti s daným stredom a koeficientom
+DilateFromPoint=Zobrazi\u0165 v rovnoha\u013ehosti s daným stredom a koeficientom
DilateFromPoint.Help=Vyzna\u010d objekt, potom stred a koeficient rovno\u013eahlosti!
Discrete=diskrétna
Distance=Vzdialenos\u0165 alebo d\u013a\u017eka
@@ -324,7 +324,7 @@ LookAndFeel=Nastavenie vzh\u013eadu
LowQuality=Nízka kvalita
LowerLimit=Dolná hranica
LowerQuartile.short=Prvý kvartil
-ManagePerspectives=Zorganizova\u0165 perspektivity
+ManagePerspectives=Zorganizova\u0165 perspektívy
MarginOfError=Tolerancia chýb
MarginOfError.short=TCh
MathematicalFunctions=Matematické funkcie
@@ -393,8 +393,6 @@ OperationTable=Opera\u010dn
Options=Nastavenia
Orthogonal=Kolmica
Orthogonal.Help=Vyzna\u010d bod a priamku, na ktorú zostrojíme kolmicu!
-OrthogonalPlane=Kolmá rovina
-OrthogonalPlane.Help=Vyber bod a priamku!
Other=Iné
OutputObjects=Výstupné objekty
Overlay=Prekrytie
@@ -405,13 +403,11 @@ PairedT=p
Parabola.Help=Zadaj ohnisko a ur\u010dujúcu priamku!
Parallel=Rovnobe\u017eka
Parallel.Help=Vyzna\u010d bod a potom priamku, ku ktorej treba zostroji\u0165 rovnobe\u017eku!
-ParallelPlane=Rovnobe\u017ená rovina
-ParallelPlane.Help=Vyber bod a priamku!
Paste=Vlo\u017ei\u0165
PasteDataFromClipboard=Prilepi\u0165 z schránky
PasteSpecial=Vlo\u017ei\u0165 \u0161peciálne
Pen=Nástroj pero
-Pen.Help=Kresli\u0165 do geometrického vzh\u013eadu
+Pen.Help=Kresli\u0165 do nákresne
Perspective.AlgebraAndGraphics=Algebra a Grafika
Perspective.BasicGeometry=Základná geometria
Perspective.CASAndGraphics=CAS a Grafika
@@ -419,11 +415,7 @@ Perspective.Geometry=Geometria
Perspective.Primary=Primárna
Perspective.TableAndGraphics=Tabu\u013eka a Grafika
Perspective.Whiteboard=Tabu\u013ea
-Perspectives=Perspektivity
-PlanePointLine=Rovina obsahujúci bod a priamku
-PlanePointLine.Help=Vyber bod a priamku!
-PlaneThreePoint=Rovina cez tri body
-PlaneThreePoint.Help=Vyber tri body
+Perspectives=Perspektívy
Point=Nový bod
Point.Help=Klikni na nákres\u0148u alebo na priamku, graf funkcie, krivku!
PointCapturing=Uchopi\u0165 bod
@@ -436,7 +428,7 @@ PointTools=N
Polar=Polárne
PolarDiameter=Polárna priamka alebo priemer
PolarDiameter.Help=Vyzna\u010d bod alebo priamku a potom kru\u017enicu alebo ku\u017ee\u013eose\u010dku!
-PolyLine=Zalomená \u010diara
+PolyLine=Lomená \u010diara
PolyLine.Help=Vyzna\u010d postupne v\u0161etky vrcholy, a potom e\u0161te raz prvý!
Polygon=Mnohouholník
Polygon.Help=Vyzna\u010d postupne v\u0161etky vrcholy, a potom e\u0161te raz prvý!
@@ -447,10 +439,8 @@ Power=Umocnenie
Preview=Uká\u017eka
Print=Tla\u010di\u0165
PrintPreview=Uká\u017eka pred tla\u010dou
-Prism=Hranol
-Prism.Help=Vyzna\u010d polynom ako podstavu a bod proti\u013eahlej steny
Probability=Pravdepodobnos\u0165
-ProbabilityCalculator=Vypo\u010det pravdepodobnosti
+ProbabilityCalculator=Výpo\u010det pravdepodobnosti
ProbabilityCalculator.Help=Dialóg na výpo\u010det pravdepodobnosti
Properties.Basic=Základný
Properties.Position=Pozícia
@@ -488,8 +478,6 @@ ResidualPlot=Diagram rezdu
Result=Rie\u0161enie
ReturnAngleInverseTrig=Ur\u010dí uhol z inverznej trigeometrickej funkcie
RightAngleStyle=\u0160týl pravého uhla
-RightPrism=Kolmý hranol
-RightPrism.Help=Vyber alebo vyzna\u010d mnohouholník a zadaj vý\u0161ku
RightProb=Skú\u0161ka z pravej strany
RigidPolygon=Pevný mnohouholník
RigidPolygon.Help=Vyzna\u010d postupne v\u0161etky vrcholy, a potom e\u0161te raz prvý!
@@ -581,7 +569,7 @@ SortBy=triedi\u0165 pomocou
Space=Priestor
SpaceBetweenThousands=medzi tisíckami
Spacing=miesto
-SpecialLineTools=Nástroj \u0161peciálny priamok
+SpecialLineTools=Nástroj \u0161peciálnych priamok
SpecialObjectTools=Nástroj \u0161peciálnych objektov
Sphere2=Gu\u013ea so stredom cez bod
Sphere2.Help=Vyzna\u010d stred a potom bod povrchu
@@ -680,8 +668,8 @@ Type.CAS=CAS \u0161peci
Type.Chart=Grafy, diagramy
Type.Conic=Ku\u017ee\u013eose\u010dky
Type.DiscreteMath=Diskrétna matematika
-Type.FunctionsAndCalculus=Funkcie a alanýza
-Type.Geometry=Goemetria
+Type.FunctionsAndCalculus=Funkcie a analýza
+Type.Geometry=Geometria
Type.List=Zoznamy
Type.Logic=Logika
Type.OptimizationCommands=Optimalizovacie príkazy
@@ -709,11 +697,9 @@ VectorFromPoint=Vektor z bodu
VectorFromPoint.Help=Vyzna\u010d za\u010diato\u010dný bod a vektor!
VectorMenu=Vektor
VectorPolygon=Vektorový mnohouholník
-VectorPolygon.Help=Vyzna\u010d v\u013eetky vrcholy a potom znovu prvý vrchol
+VectorPolygon.Help=Vyzna\u010d v\u0161etky vrcholy a potom znovu prvý vrchol
VerticalScrollbars=Zvislé posúva\u010de
View=Vzh\u013ead
-ViewInFrontOf=Poh\u013ead z prednej strane
-ViewInFrontOf.Help=Zmeni\u0165 poh\u013ead z prednej strany vybratého objektu
Views=Vzh\u013eady
VisualStyle=Vizuálny \u0161tíl
VisualStyle.Help=Kliknite na objekt alebo vyzna\u010dte obd\u013a\u017eník pre nastavenie vlastností
diff --git a/geogebra/properties/menu_sl.properties b/geogebra/properties/menu_sl.properties
index a4cb197..fe5d905 100644
--- a/geogebra/properties/menu_sl.properties
+++ b/geogebra/properties/menu_sl.properties
@@ -158,6 +158,7 @@ Derivative.Help=Poi\u0161\u010di prvi odvod
Descending=Padajo\u010de
DifferenceOfMeans.short=\u03bc\u2081 - \u03bc\u2081
DifferenceofMeansT=Razlika srednjih vrednosti
+Differences=Razlike
DilateFromPoint=Razteg objekta od to\u010dke za faktor
DilateFromPoint.Help=Objekt za razteg, nato sredi\u0161\u010dna to\u010dka in faktor raztega
Discrete=Diskretno
@@ -171,6 +172,7 @@ Distribution.Exponential=Eksponentna porazdelitev
Distribution.F=F porazdelitev
Distribution.Gamma=Gama porazdelitev
Distribution.Hypergeometric=Hipergeometri\u010dna porazdelitev
+Distribution.Logistic=Logisti\u010dnaPorazdelitev
Distribution.Normal=Normalna porazdelitev
Distribution.Pascal=Pascalova porazdelitev
Distribution.Poisson=Poissonova porazdelitev
@@ -228,6 +230,7 @@ FontSize=Velikost pisave
ForegroundColor=Barva pisave
Formulas=Formule
FrakturLetters=\u010crke preloma
+Frequency=Frekvenca
FrequencyPolygon=frekven\u010dni poligon
FrequencyTable=Frekven\u010dna tabela
FrequencyType=Vrste frekvenc
@@ -393,8 +396,6 @@ OperationTable=Tabela operacij
Options=Mo\u017enosti
Orthogonal=Pravokotnica
Orthogonal.Help=Izberi to\u010dko in premico za pravokotnost
-OrthogonalPlane=Pravokotna ravnina
-OrthogonalPlane.Help=Izberi to\u010dko in pravokotnico
Other=Ostali
OutputObjects=Izhodni objekti
Overlay=Dodajanje
@@ -405,8 +406,6 @@ PairedT=Primerjalni T
Parabola.Help=Izberi to\u010dko in vodnico
Parallel=Vzporednica
Parallel.Help=To\u010dka in premica za vzporednico
-ParallelPlane=Vzporedna ravnina
-ParallelPlane.Help=Izberi to\u010dko in vzporedno ravnino
Paste=Prilepi
PasteDataFromClipboard=Prilepi podatke z odlo\u017ei\u0161\u010da
PasteSpecial=Posebno lepljenje
@@ -420,10 +419,6 @@ Perspective.Primary=Osnovni prikaz
Perspective.TableAndGraphics=Tabele in risalna povr\u0161ina
Perspective.Whiteboard=Tabla
Perspectives=Prikazi
-PlanePointLine=Ravnina skozi to\u010dko in premico
-PlanePointLine.Help=Izberi to\u010dko in premico
-PlaneThreePoint=Ravnina skozi tri to\u010dke
-PlaneThreePoint.Help=Izberi tri to\u010dke
Point=Nova to\u010dka
Point.Help=Klikni kjerkoli na risalni povr\u0161ini, na premici, funkciji ali krivulji
PointCapturing=Vezava to\u010dke na mre\u017eo
@@ -447,8 +442,6 @@ Power=Potenca
Preview=Predogled
Print=Natisni
PrintPreview=Predogled tiskanja
-Prism=Prizma
-Prism.Help=Izberi mnogokotnik (ali le to\u010dke) in prvo to\u010dko vzporedne osnovne ploskve
Probability=Verjetnost
ProbabilityCalculator=Ra\u010dunanje verjetnosti
ProbabilityCalculator.Help=Dialog za ra\u010dunanje verjetnosti
@@ -488,8 +481,6 @@ ResidualPlot=Slika ostankov
Result=Rezultat
ReturnAngleInverseTrig=Vrne kot za inverzno trigonometrijsko funkcijo
RightAngleStyle=Slog ozna\u010devanja pravega kota
-RightPrism=Pravilna prizma
-RightPrism.Help=Povleci mnogokotnik, ali izberi mnogokotnik in vnesi vi\u0161ino
RightProb=Desno od
RigidPolygon=Togi mnogokotnik
RigidPolygon.Help=Izberi robove, in nato ponovno klikni na prvega
@@ -713,8 +704,6 @@ VectorPolygon=Vektorski mnogokotnik
VectorPolygon.Help=Izberi vsa ogli\u0161\u010da, nato ponovno klikni na prvo ogli\u0161\u010de
VerticalScrollbars=Navpi\u010dni drsniki
View=Pogled
-ViewInFrontOf=Poglej objekt
-ViewInFrontOf.Help=Spremeni pogled na izbrani objekt (dolo\u010den s klikom)
Views=Pogledi
VisualStyle=Slog
VisualStyle.Help=Klikni na objekt ali premakni pravokotnik, da mu spremeni\u0161 lastnosti
diff --git a/geogebra/properties/menu_sr.properties b/geogebra/properties/menu_sr.properties
index 318d9e4..955b282 100644
--- a/geogebra/properties/menu_sr.properties
+++ b/geogebra/properties/menu_sr.properties
@@ -333,16 +333,12 @@ OpenWebpage=Otvori Web stranicu
Options=Opcije
Orthogonal=Normala
Orthogonal.Help=Izaberite ta\u010dku i normalu
-OrthogonalPlane=Normalna ravan
-OrthogonalPlane.Help=Odaberite ta\u010dku i normalnu pravu
Other=Ostali
OutputObjects=Izlazni objekti
Overwrite=Zamena
Parabola.Help=Izaberite ta\u010dku i direktrisu
Parallel=Paralela
Parallel.Help=Izaberite ta\u010dku i paralelu
-ParallelPlane=Paralelna ravan
-ParallelPlane.Help=Odaberite ta\u010dku i paralelnu ravan
Paste=Zalepi
PasteDataFromClipboard=Ubaci podatke iz bafera
PasteSpecial=Zalepi specijalno
@@ -355,10 +351,6 @@ Perspective.Primary=Primarno
Perspective.TableAndGraphics=Tabelarni i grafi\u010dki prikaz
Perspective.Whiteboard=Tabla
Perspectives=Perspektive
-PlanePointLine=Ravan kroz ta\u010dku i pravu
-PlanePointLine.Help=Odaberite ta\u010dku i pravu
-PlaneThreePoint=Ravan kroz tri ta\u010dke
-PlaneThreePoint.Help=Odaberite tri ta\u010dke
Point=Nova ta\u010dka
Point.Help=Kliknite na povr\u0161inu za crtanje ili na pravu, funkciju ili krivu
PointCapturing=Vezivanje ta\u010dke za mre\u017eu
@@ -383,7 +375,6 @@ Preview=Pregled
Print=\u0160tampanje
PrintPreview=Pregled pre \u0161tampanja
Prism=Prizma
-Prism.Help=Odaberite poligon (ili ta\u010dke) i prvu ta\u010dku druge paralelne strane
Probability=Verovatno\u0107a
ProbabilityCalculator=Kalkulator verovatno\u0107e
ProbabilityCalculator.Help=Prozor za ra\u010dunanje verovatno\u0107e
@@ -419,7 +410,6 @@ RequireEquals=Zahtevaj "=" pre naredbe
Result=Rezultat
ReturnAngleInverseTrig=Vrati ugao iz inverznih trigonometrijskih funkcija
RightAngleStyle=Stil pravog ugla
-RightPrism.Help=Razvucite mnogougao, ili odaberite mnogougao i unesite visinu
RigidPolygon=Kruti mnogougao
RigidPolygon.Help=Odaberi sve ta\u010dke, a zatim ponovo klini na prvu ta\u010dku
RootsAndFractions=Koreni i razlomci
@@ -606,8 +596,6 @@ VectorFromPoint.Help=Izaberite po\u010detnu ta\u010dku i vektor
VectorMenu=Vektor
VerticalScrollbars=Vertikalni kliza\u010di
View=Prikaz
-ViewInFrontOf=Posmatraj ispred
-ViewInFrontOf.Help=Promeni pogled ispred kliknutog objekta
Views=Pogledi
VisualStyle=Vizuelni stil
VisualStyle.Help=Kliknite na objekte ili razvucite pravougaonik da im izmenite osobine
diff --git a/geogebra/properties/menu_sv.properties b/geogebra/properties/menu_sv.properties
index b6a1e82..6258f7b 100644
--- a/geogebra/properties/menu_sv.properties
+++ b/geogebra/properties/menu_sv.properties
@@ -1,22 +1,52 @@
About=Om
+Accents=Accenter
+AccentsExt=Utökade accenter
+ActionObjectTools=Verktyg för interaktivitet
+AddTrace=Lägg till objekt till listan över objekt som skall spåras
+Adjustment=Justering
Advanced=Avancerat
+AlgebraDescriptions=Algebraisk beskrivning
+AllCommands=Alla kommandon
+AllowRescaling=Tillåt omskalning
+AllowTooltips=Tillåt tips
+AlternativeHypothesis=Alternativ Hypotes
+AlternativeHypothesis.short=Alternativ
Angle=Vinkel
Angle.Help=Tre punkter eller två linjer
AngleFixed=Vinkel med given storlek
AngleFixed.Help=Punkt på vinkelns ben, vinkelns spets och vinkelns storlek
AngleUnit=Vinkelmått
-AngularBisector=Vinkelns bisektris
+AngularBisector=Bisektris
AngularBisector.Help=Tre punkter eller två linjer
+ApplyDefaults=Standardinställningar
Area.Help=Polygon, cirkel eller kägelsnitt
-Axes=Axlar
+Ascending=Stigande
+AttachDetachPoint=Fäst / Lossa Punkt
+AttachDetachPoint.Help=Klicka på en punkt (och ett objekt att fästa den i)
+AutoDimension=Autoskala
+Axes=Visa axlar
+Back=Tillbaka
+BackgroundColor=Bakgrundsfärg
BasicLineTools=Verktyg för linjer
+BetweenGroups=Mellan grupper
+BlackboardLetters=Tavelbokstäver
Blue=Blå
Bold=Fetstil
+Boxplot=Boxplot (Lådagram)
+Brackets=Hakparenteser
+Browser=Webbläsare
Button.Caption=Förklaring
+ButtonAction=Infoga knapp
+ButtonAction.Help=Klicka i ritområdet för att infoga en knapp
+ByLayering=Efter lager
+Calculate=Beräkna
+CalligraphicLetters=Kalligrafi
Cancel=Avbryt
-CheckboxSize=Storlek på avkryssningsboxen
+Cartesian=Rektangulära
+CheckboxSize=Storlek på kryssrutor
CheckboxSize.Large=Stor
CheckboxSize.Regular=Vanlig
+ChooseFromFile=Välj från fil
Circle2=Cirkel definierad via medelpunkt och periferipunkt
Circle2.Help=Medelpunkt och punkt på cirkelns periferi
Circle3=Cirkel genom tre punkter
@@ -24,45 +54,91 @@ Circle3.Help=Tre punkter p
CircleArc3=Cirkelsegment definierad via medelpunkt och två periferipunkter
CircleArc3.Help=Medelpunkt och två punkter på cirkelsegmentet
CircleArcTools=Verktyg för cirklar och bågar
+CircleAxisPoint=Cirkel med axel genom punkt
+CircleAxisPoint.Help=Välj axel, därefter punkt på cirkeln
CirclePointRadius=Cirkel definierad via medelpunkt och radie
CirclePointRadius.Help=Medelpunkt och radie
+CirclePointRadiusDirection=Cirkel med centrum, radie och riktning
+CirclePointRadiusDirection.Help=Välj punkt för centrum, därefter riktning och sedan radie
CircleSector3=Cirkelsektor definierad via medelpunkt och två punkter
CircleSector3.Help=Medelpunkt och två punkter på sektorn
CircumcircleArc3=Cirkelbåge genom tre punkter
CircumcircleArc3.Help=Tre punkter på cirkelsegment
CircumcircleSector3=Cirkelsektor med tre punkter
CircumcircleSector3.Help=Tre punkter på sektor
+ClassRule=Klassregel
+Classes=Klasser
ClearColumn=Rensa kolumn
ClearColumns=Rensa kolumnerna
ClearRow=Rensa rad
ClearRows=Rensa rader
ClearSelection=Rensa valda celler
+ClearTrace=Radera alla spår
Clipboard=Urklipp
+ClipboardMessage=Exporten av Urklipp lyckades. \nAktivera HTML-redigering och klistra in i ditt Learning Management System (t.ex. Moodle)
Close=Stäng
CloseAll=Stäng alla
CloseFile=Stäng fil
CmdList=Kommandolista
+Coefficient=Koefficient
CollapseAll=Fäll ihop allt
+ColumnHeader=Kolumnrubrik
+ColumnOrder=Kolumnordning
+ColumnReset=Nollställ kolumn
+Columns=Kolumner
+Comma=Komma
CommandName=Kommandonamn
Compasses=Passare
Compasses.Help=Välj linje eller två punkter för radie, därefter mittpunkt
+ComplexNumber=Komplext tal
+ComplexNumber.Help=Klicka i ritområdet för att skapa ett komplext tal
+ConciseCode=Kompaktifiera koden
+ConciseUsingCSE5=Kompaktifiera koden med cse5
Condition.ShowObject=Villkor att visa objekt
Conditions=Villkor
+ConfidenceInterval=Konfidensintervall
+ConfidenceLevel=Konfidensnivå
Conic=Kägelsnitt
Conic5=Kägelsnitt genom fem punkter
Conic5.Help=Fem punkter på kägelsnitt
ConicMenu=Kägelsnitt
ConicSectionTools=Verktyg för kägelsnitt
Continuity=Kontinuitet
+Continuous=Kontinuerlig
Copy=Kopiera
+CopyToClipboard=Kopiera till Urklipp
+CopyToGraphics=Kopiera till Ritområdet
CopyToInputBar=Kopiera till inmatningsfältet
+CopyToSpreadsheet=Kopiera till Kalkylbladet
CopyVisualStyle=Kopiera visuellt format
CopyVisualStyle.Help=Välj ett objekt först, klicka sedan på ett annat objekt för att kopiera dess format
+Count=Antal
+CountCells=Antal
+CountCells.Help=Välj ett område med celler
+Create=Skapa
+CreateCurveFit=Regressionskurva
+CreateCurveFit.Help=Välj celler som representerar punkter. Klicka därefter på verktygsknappen.
CreateList=Skapa lista
+CreateList.Help=Välj celler och klicka därefter på verktygsknappen
+CreateListGraphicsView=Skapa lista
+CreateListGraphicsView.Help=Rita en rektangel runt objekten
CreateListOfPoints=Skapa en lista med punkter
+CreateListOfPoints.Help=Välj celler och klicka därefter på verktygsknappen
CreateMatrix=Skapa matris
+CreateMatrix.Help=Välj celler och klicka därefter på verktygsknappen
+CreateOperationTable=Skapa Operationstabell
+CreateOperationTable.Help=Välj cellområde och klicka därefter på verktygsknappen
+CreatePolyLine=Skapa polygontåg
+CreatePolyLine.Help=Välj celler som representerar punkterna, klicka sedan på verktygsknappen
+CreateTable=Skapa tabell
+CreateTable.Help=Välj celler och klicka därefter på verktygsknappen
+Cumulative=Kumulativ
+CursiveLetters=Kursiv
CustomTools=Egna verktyg
Cut=Klipp ut
+DataColumn=Datakolumn
+DataColumnName=Namn på datakolumn
+DataTitle=Titel på data
DecimalPlaces=Antal decimaler
Default.Restore=Återställ
Default.Set=Välj standard värden
@@ -71,15 +147,40 @@ Delete=Ta bort objekt
Delete.Help=Välj ett objekt för att ta bort det
DeleteObjects=Ta bort objekt
DeleteTool=Ta bort verktyg
+Delimiter=Avgränsare
+Derivative=Derivata
+Derivative.Help=Beräknar förstaderivatan
+Descending=Fallande
+DifferenceofMeansT=Skillnader av medelvärden T
+Differences=Skillnader
DilateFromPoint=Utvidga objekt från punkt med faktor
DilateFromPoint.Help=Objekt att utvidga, därefter mittpunkt och faktor
+Discrete=Diskret
Distance=Avstånd eller längd
Distance.Help=Två punkter, segment, polygon eller cirkel
+Distribution=Fördelning
+Distribution.Binomial=Binomialfördelning
+Distribution.Cauchy=Cauchy-fördelning
+Distribution.ChiSquare=Chi-kvadrat-fördelning
+Distribution.Exponential=Exponentiell fördelning
+Distribution.F=F-Fördelning
+Distribution.Gamma=Gammafördelning
+Distribution.Hypergeometric=Hypergeometrisk fördelning
+Distribution.Logistic=Logistisk fördelning
+Distribution.Lognormal=Logaritmisk normalfördelning
+Distribution.Normal=Normalfördelning
+Distribution.Pascal=Pascals fördelning
+Distribution.Poisson=Poissonfördelning
+Distribution.Scale=Skala
+Distribution.Shape=Form
+Distribution.StudentT=Students T-fördelning
+Distribution.Weibull=Weibulls fördelning
DoYouWantToSaveYourChanges=Vill du spara dina ändringar?
DontDeleteTool=Ta inte bort verktyg
DontOverwrite=Skriv inte över
DontSave=Spara inte
-DrawingPadToClipboard=Ritområde till urklipp
+DotPlot=Punktdiagram
+DrawingPadToClipboard=Kopiera aktuellt ritområde till urklipp
DynamicColors=Dynamiska färger
Edit=Redigera
Ellipse3=Ellips
@@ -87,67 +188,155 @@ Ellipse3.Help=Tv
EnableLabelDrags=Tillåt flyttning av namn
EnableRightClick=Högerklicka för att välja
English=Engelska
+EnterAppletAddress=Ange webbadressen för denna GeoGebra-Applet
+EnterWebAddress=Ange webbadress
+Equation=Ekvation
+EstimatedValue=Uppskattat värde
+Evaluate=Beräkna
+Evaluate.Help=Exakt beräkning
Exit=Avsluta
+Expand=Multiplicera in
+Expand.Help=Multiplicera in i parenteserna
ExpandAll=Utvidga allt
+Exponential=Exponentiell a*e^bx
Export=Exportera
+ExportAllWorksheets=Exportera alla öppna arbetsböcker
+Factor=Faktor
+Factor.Help=Hitta faktorer
FastHelp=Snabbhjälp
File=Arkiv
+FileBrowser=Utforskaren
+FileSystem=Filsystem
Files=Filer
+FillType=Fyllnadstyp
+Filling=Figurfyllning
+Filling.Hatch=Sneda ränder
+Filling.Image=Bild
+Filling.Standard=Toning (std)
+FitCurve=Regressionskurva
+FitCurve.Help=Välj punkter genom att dra upp en rektangel, eller ange en lista
FitLine=Anpassa linje
FitLine.Help=Välj punkter genom att markera på skärmen eller välj en lista med punkter
Fix=Lås objekt på/av
Fix.Help=Välj objekt för att låsa eller frigöra
+FixedToGrid=Låst till rutnätet
FontSize=Teckenstorlek
+ForegroundColor=Förgrundsfärg
+Formulas=Formler
+FrakturLetters=Fraktur
+Frequency=Frekvens
+FrequencyPolygon=Frekvenspolygon
+FrequencyTable=Frekvenstabell
+FrequencyType=Frekvenstyp
+FunctionInspector=Funktionsinspektören
+FunctionInspector.Help=Välj en funktion
Functionality=Funktionalitet
+GUIFontSize=Menyfontens storlek
General=Allmänt
GeneralTools=Allmänna verktyg
+GenerateCode=Generera kod
+GeogebraToAsymptoteExport=Exportera GeoGebra till Asymptote
Geometry=Geometri
German=Tyska
+Graph=Rita
GraphicsQuality=Grafisk kvalitet
Green=grön
Grid=Rutnät
+Gridlines=Linjer för rutnät
+GroupObjects=Gruppera Objekt
+HTML5Only=Exportera endast till HTML5
+HTML5WithJava=Exportera till HTML5 (med Java "fallback")
Help=Hjälp
+Hidden.Dashed=Streckad
+Hidden.Invisible=Osynlig
+Hidden.Unchanged=Oförändrad
+HiddenLineStyle=Dold linjestil
HighQuality=Hög kvalitet
+HomeDirectory=Hemkatalog
+HorizontalScrollbars=Horisontella fönsterhissar
+Hue=Nyans
Hyperbola3=Hyperbel
Hyperbola3.Help=Två brännpunkter och en punkt på hyperbeln
+Hypergeometric.sample=urval
Icon=Ikon
Image=Infoga bild
Image.Help=Klicka på ritområdet eller punkt för att välja bildens nedre vänstra hörn
+Images=Bilder
+ImportDataFile=Importera datafil
+IncludeHTML5=Inkludera HTML5
InputField=Inmatningsfält
InputField.Help=Välj objekt för att kopiera dess namn till inmatningsfält
+InputHelp=Hjälp för inmatning
InputObjects=inmatningsobjekt
InsertAbove=Lägg in ovanför
InsertBelow=Lägg in nedanför
InsertLeft=Lägg in till vänster
InsertRight=Lägg in till höger
+Integral.Help=Beräknar den obestämda integralen (primitiva funktionen)
+InternalCAS=Intern CAS
Intersect=Skärning mellan två objekt
Intersect.Help=Välj två linjer och klicka på skärningspunkt
+IntersectionCurve=Skär två ytor
+IntersectionCurve.Help=Skapa en kurva genom att skära två ytor
+Interval=Intervall
+IntervalProb=Intervall
+IntervalType=Typ av intervall
+InvertSelection=Invertera urvalet
Isometric=Isometrisk
+JavaOnly=Exportera endast till Java
+JavaWithHTML5=Exportera till Java (med HTML5 "fallback")
Join=Linje genom två punkter
Join.Help=Två punkter
+KeepDotColors=Behåll punktfärger
+KeepInput=Behåll inmatning
+KeepInput.Help=Behåll och kontrollera inmatning
+LabelColumn=Döp kolumn
+LabelColumnName=Kolumn namn
Labeling=Namn på objekt
Labeling.automatic=Automatisk
Labeling.off=Inga nya objekt
Labeling.on=Alla objekt
Labeling.pointsOnly=Endast nya punkter
Labeling.propertiesDefault=Använd standardinställningar
-Labels=Visa eller dölj namn
+Labels=Visa eller dölj etiketter
Landscape=Landskap
Language=Språk
+LeftProb=Skev åt vänster
License=Licens
+Lightness=Ljusstyrka
LineBisector=Mittpunktsnormal
LineBisector.Help=Två punkter eller en sträcka
+LineGraph=Linjediagram
LineMenu=Linje
+Linear=Linjär
+LinkedFiles=Länkade filer
+List=Lista
+ListOfPoints=Lista med punkter
Load=Öppna
+Location=Plats
Locus=Geometrisk ort
Locus.Help=Geometrisk ortpunkt först, sedan punkt på objektet
+Logistic=Logistisk
LookAndFeel=Stil och format
LowQuality=Låg kvalitet
-ManagePerspectives=Välj uppsättning
+LowerLimit=Undre gräns
+ManagePerspectives=Välj Perspektiv
+MarginOfError=Felmarginal
+MathematicalFunctions=Matematiska funktioner
+Matrices=Matriser
+Matrix=Matris
+MaxCells.Help=Välj celler
+Mean=Medel
+MeanCells=Medel
+MeanCells.Help=Välj celler
+MeanDifference=Medelvärdenas differens
+MeanX=Medelvärdet för x
+MeanY=medelvärdet för y
MeasurementTools=Verktyg för mätning
Metal=Metall
Midpoint=Mitt- eller medelpunkt
Midpoint.Help=Två punkter, sträcka, cirkel eller kägelsnitt
+MinCells.Help=Välj celler
MirrorAtCircle=Speglingspunkt till cirkel
MirrorAtCircle.Help=Välj punkt och cirkel
MirrorAtLine=Spegla objekt i en linje
@@ -161,101 +350,273 @@ Move.Help=Flytta eller v
MoveRotate=Rotera kring punkt
MoveRotate.Help=Välj rotationspunkt, flytta sedan objekt
MovementTools=Verktyg för förflyttning
+MultiVarStats=Flervariabelanalys
+MultiVarStats.Help=Analyserar två eller flera dataserier från markerade kolumner
+MultiVariableStatistics=Multivariabelstatistik
+Name=Namn
+NameAndDraw=Namnge och rita upp
+NameAndDraw.Help=Namnger och ritar upp aktuell rad
NameIcon=Namn och ikon
New=Nytt
NewWindow=Nytt fönster
+Next=Nästa
+None=Ingen
+NormalCurve=Normalkurva (Gausskurva)
+NormalQuantilePlot=Kvantildiagram (normalfördelat)
+Normalized=Normaliserad
+NullHypothesis=Nollhypotes
+NullHypothesis.short=NollH
+Numeric=Numerisk
+Numeric.Help=Numerisk beräkning
+Objects=Objekt
+OneVarStats=Envariabelanalys
+OneVarStats.Help=Analyserar numeriska värden från markerade celler
+OneVariable=En variabel
+OneVariableInference=Envariabelinferens
+OneVariableStatistics=Envariabelstatistik
+OnlyOpaqueFills=Enbart ogenomskinliga fyllningar
+Opacity=Opacitet
+OpenFileFolder=Öppen mapp
+OpenFromWebpage=Öppna från webbsida
+OpenWebpage=Öppna webbsida
+OperationTable=Operationstabell
Options=Inställningar
Orthogonal=Vinkelrät linje
Orthogonal.Help=Punkt och vinkelrät linje
+Other=Övrigt
OutputObjects=Färdigt objekt
+Overlay=Överlägg
+OverlayFrequencyPolygon=Lägg på frekvenspolygon
+OverlayNormalCurve=Lägg på normalfördelningskurva
Overwrite=Skriv över
+PairedT=Parvisa T
Parabola=Parabel
Parabola.Help=Punkt och styrlinje
Parallel=Parallell linje
Parallel.Help=Punkt och parallell linje
Paste=Klistra in
PasteDataFromClipboard=Klistra in data från urklipp
+PasteSpecial=Klistra in special...
+Pen=Pennverktyg
+Pen.Help=Rita i ritområdet. Välj ett annat verktyg för att avsluta
Perspective.AlgebraAndGraphics=Algebra och grafik
Perspective.BasicGeometry=Grundläggande geometri
+Perspective.CASAndGraphics=CAS & Grafik
Perspective.Geometry=Geometri
+Perspective.Primary=Primärt
Perspective.TableAndGraphics=Tabeller och grafik
+Perspectives=Perspektiv
Point=Ny punkt
Point.Help=Klicka på ritområdet eller på objekt
PointCapturing=Punktstyrning
+PointInside=Punkt i område
PointMenu=Punkt
+PointOnObject=Punkt på objekt
+PointOnObject.Help=Klicka inuti ett objekt eller på dess rand för att skapa en punkt
PointStyle=Punkttyp
PointTools=Verktyg för punkter
+Polar=Polära
PolarDiameter=Sekant eller diameterlinje
PolarDiameter.Help=Punkt eller linje, sedan cirkel eller kägelsnitt
+PolyLine=Polygontåg
+PolyLine.Help=Välj alla punkter, klicka därefter på första punkten en gång till för att avsluta
Polygon.Help=Välj hörn, sedan första hörnet igen
PolygonTools=Verktyg för polygoner
+Polynomial=Polynom
Portrait=Porträtt
+Power=Exponentiell a*b^x
Preview=Förhandsvisa
Print=Skriv ut
PrintPreview=Förhandsvisning
+Prism=Prisma
+Probability=Sannolikhet
+ProbabilityCalculator=Sannolikhetskalkylatorn
+ProbabilityCalculator.Help=Dialogruta för att beräkna sannolikheter
Properties.Basic=Grundinställningar
Properties.Style=Utseende
Radiant=Radianer
Ray=Stråle genom två punkter
Ray.Help=Välj startpunkt och en punkt på strålen
+Recent=Öppna senaste
RecomputeAllViews=Beräkna alla värden på nytt
RecordToSpreadsheet=Överför värden till kalkylarket
RecordToSpreadsheet.Help=Välj objekt som skall sparas och justera därefter konstruktionen
+RecoveryCancel=Avbryt
+RecoveryCancelQuestion=Är du säker på att du vill avbryta återställningen? Filer du ej sparat kommer att förloras.
+RecoveryOpen=Öppna
+RecoverySave=Spara
+RecoveryText=Följande GeoGebra-filer kan återställas.
+RecoveryTitle=Återställning
Red=Röd
Redo=Gör om
Refresh=Uppdatera
+RegressionAnalysis=Regressionsanalys
+RegressionInference=Regressionsinferens
+RegressionModel=Regressionsmodell
RegularPolygon=Regelbunden polygon
RegularPolygon.Help=Två punkter och ett tal
Relation=Relation mellan två objekt
Relation.Help=Två objekt
+Relative=Relativ
+RemoveLineBreaks=Radera radslut
+RemoveTrace=Tag bort objektet från spårningslistan
Rename=Nytt namn
+ReplaceAll=Ersätt alla celler
+RequireEquals=Kräv "=" framför kommandon
+ResidualPlot=Residualdiagram
+Result=Resultat
+ReturnAngleInverseTrig=Returnera vinkel från inversa trigonometriska funktioner
RightAngleStyle=Rätvinkeltyp
+RightProb=Skev åt höger
+RigidPolygon=Stel polygon
+RigidPolygon.Help=Välj alla hörn, avsluta därefter genom att klicka på det första hörnet igen.
+RootsAndFractions=Rötter och bråk
RotateByAngle=Rotera objekt kring punkt med vinkel
RotateByAngle.Help=Objekt som skall roteras, sedan rotationspunkt och vinkel
+RotateView=Rotera 3D-vyn
+RotateView.Help=Dra 3D-vyn
Rounding=Antal decimaler
+RowHeader=Radrubrik
+RowLimit=Radgräns
+RowOrder=Radordning
+Sample1=Urval 1
+Sample2=Urval 2
+Saturation=Mättnad
Save=Spara
SaveAs=Spara som
SaveCurrentFileQuestion=Vill du spara filen?
-SaveCurrentPerspective=Spara inställningar
+SaveCurrentPerspective=Spara Perspektiv
+SavePrintUndo=Tillåt Spara, Skriv ut och Ångra
+SaveToXML=Spara till XML
+Scatterplot=Spridningsdiagram
Segment=Segment mellan två punkter
Segment.Help=Två punkter
SegmentFixed=Segment med given längd från punkt
SegmentFixed.Help=Punkt och segmentets längd
Select=Välj objekt
Select.Help=Klicka på ett objekt för att välja det
+SelectACurve=Välj en kurva
SelectAll=Välj allt
+SelectAnObjectToTrace=Välj ett objekt att spåra
SelectAncestors=Välj startobjekt
SelectCurrentLayer=Välj detta skikt
SelectDescendants=Välj slutobjekt
Semicircle=Halvcirkel genom två punkter
Semicircle.Help=Två punkter
+Semicolon=Semikolon
Separator=Skiljetecken
+SetClasssesManually=Ange klasser manuellt
+SetToCurrentLocation=Nuvarande plats
Settings=Inställningar
Settings.ResetDefault=Återställ standardinställningar
Settings.Save=Spara inställningar
-ShowCheckBox=Checkbox för att visa och dölja objekt
+Share=Dela
+Show=Visa
+ShowAtTop=Visa högst upp
+ShowAxesGrid=Visa Axlar/Rutnät
+ShowCheckBox=Kryssruta för att visa och dölja objekt
ShowCheckBox.Help=Klicka på ritområdet för att skapa en kryssruta
-ShowHideLabel=Visa / Dölj namn
+ShowColumnHeader=Visa kolumnrubrik
+ShowCornerCoordinates=Visa koordinater för hörn
+ShowData=Visa data
+ShowFileBrowser=Visa dialogrutan Öppna/Spara
+ShowGridlines=Visa rutnät
+ShowHide=Visa/Dölj objekt
+ShowHideLabel=Visa/Dölj etikett
ShowHideLabel.Help=Välj objekt för att visa/dölja dess namn
-ShowHideObject=Visa / dölj objekt
+ShowHideLabels=Visa/Dölj etiketter
+ShowHideObject=Visa/Dölj objekt
ShowHideObject.Help=Välj objekt för att dölja dem, byt sedan verktyg för att verkställa ändringarna
+ShowHorizontalScrollbars=Visa horisontella fönsterhissar
ShowInToolBar=Visa i verktygsfältet
ShowInputField=Visa inmatningsfält
ShowMenuBar=Visa meny
+ShowMouseCoordinates=Visa muskoordinater
+ShowPlot2=Visa det andra diagrammet
ShowResetIcon=Visa ikon för att återställa konstruktionen
+ShowRowHeader=Visa radrubrik
+ShowStatistics=Visa statistik
ShowToolBar=Visa verktygsfält
ShowToolBarHelp=Visa hjälp för verktygsfältet
+ShowVerticalScrollbars=Visa vertikala fönsterhissar
+SingleFile=En fil
+SingleFileTabs=En fil (flikar)
Slider=Glidare
Slider.Help=Klicka på ritområdet för att ange glidarens position
Slope=Lutning
Slope.Help=Linje
+SnapToGrid=Fäst vid rutnät
+SnapToObjects=Fäst vid objekt
+SnapToPoints=Fäst vid punkter
+Solution=Lösning
+Solution.Help=Hittar lösningar till en eller flera ekvationer
+Solve=Lös
+Solve.Help=Löser en eller flera ekvationer
+Sort=Sortera celler
+Sort.Help=Välj celler som ska sorteras
+SortBy=Sortera efter
+Space=Utrymme
+SpaceBetweenThousands=Tusentalsavgränsare
+Spacing=Avståndsjustering
SpecialLineTools=Verktyg för speciella linjer
SpecialObjectTools=Verktyg för speciella objekt
+Sphere2=Klot med centrum i punkt
+Sphere2.Help=Välj punkt i centrum, därefter punkt på ytan
+SpherePointRadius=Klot med centrum och radie
+SpherePointRadius.Help=Välj punkt i centrum och mata därefter in radien
+Split=Dela celler
+Split.Help=Välj kolumner att dela
+SpreadsheetOptions=Alternativ för kalkylblad
+Stack=Stapla cellkolumner
+Stack.Help=Välj kolumner att stapla
+StackedBoxPlots=Flera Boxplottar (lådagram)
+StandardError=Standardfel
+StartRow=Första rad
+Statistics=Statistik
+Statistics2=Statistik 2
+StemPlot=Stam-och-bladdiagram
+Step=Steglängd
+Substitute=Substituera
+Substitute.Help=Ersätter en del av ett uttryck
SubstituteDialog=Dialog för substitution
+SumCells=Summera
+SumCells.Help=Välj celler
+SumsAndIntegrals=Summor and integraler
+Symbol.And=Logiskt OCH (AND)
+Symbol.Angle=Vinkel
+Symbol.AngleMeasure=Vinkel
+Symbol.BooleanEqual=Logisk ekvivalens
+Symbol.Cube=Kub
+Symbol.Degree=Grader
+Symbol.ElementOf=Element av
+Symbol.GreaterThanEqualTo=Större än eller lika med
+Symbol.Infinity=Oändligheten
+Symbol.LessThanEqualTo=Mindre än eller lika med
+Symbol.NBSP=Mellanslag med klister
+Symbol.Negation=Logisk negation (NOT)
+Symbol.NotEqual=Ej lika med
+Symbol.Or=Logisk ELLER (OR)
+Symbol.Parallel=Parallell med
+Symbol.Perpendicular=Vinkelrät mot
+Symbol.Square=Kvadrat
+Symbol.StrictSubset=Äkta delmängd
+Symbol.Subset=Delmängd
+Symbol.VectorProduct=Vektorprodukt
+Symbols=Symboler
+TEstimateDifferenceOfMeans=T-Väntevärde, medelvärdesskillnad
+TEstimatePairedDifferences=T-väntevärde, parvisa differenser
+TMeanInterval=T-väntevärde på medelvärdet
+TMeanTest=T-test på medelvärdet
+TTestDifferenceOfMeans=T-test, medelvärdesskillnad
+TTestPairedDifferences=T-test, parvisa differenser
+Table=Tabell
Tangent=Tangent
Tangent.Help=Punkt, sedan cirkel, kägelsnitt eller funktion
Text=Infoga text
Text.Help=Klicka på ritområdet eller punkt för att infoga en text
+TextFieldAction=Infoga inmatningsfält
+TextFieldAction.Help=Klicka i ritområdet för att infoga ett inmatningsfält
+ThenBy=Därefter
Tool=Verktyg
Tool.CreateNew=Skapa nytt verktyg
Tool.CreationSuccess=Nytt verktyg skapat!
@@ -268,23 +629,70 @@ Toolbar=Verktygsf
Toolbar.Customize=Anpassa verktygsfält
Toolbar.ResetDefault=Återställ verktygsfältet
Tools=Verktyg
+Tooltip=Tips
+Total=Summa
Trace=Spår på/av
Trace.Help=Välj objekt för att visa/dölja dess spår
+TraceCopy=Kopiera spår
+TraceToList=Spåra till lista
+TraceToSpreadsheet=Spåra till kalkylblad
+TraceToSpreadsheet.Help=Dialogrutan för att spåra objekt till kalkylbladet
TransformationTools=Verktyg för transformationer
TranslateByVector=Parallellförflytta objekt med vektor
TranslateByVector.Help=Objekt som skall parallellförflyttas, sedan vektor
TranslateView=Flytta ritområdet
TranslateView.Help=Flytta ritområdet eller axel (Shift + Drag)
+Transpose=Transponera
+Tutorials=Guider
+TwoVarStats=Tvåvariabels regressionanalys
+TwoVarStats.Help=Analysera parvisa värden från valda celler
+TwoVariable=Tvåvariabel
+TwoVariableInference=Tvåvariabelinferens
+Type.CAS=CAS-specifika kommandon
+Type.Chart=Statistikdiagram
+Type.Conic=Kägelsnitt
+Type.DiscreteMath=Diskret Matematik
+Type.FunctionsAndCalculus=Funktioner & Analys
+Type.Geometry=Geometri
+Type.List=Listor
+Type.Logic=Logik
+Type.OptimizationCommands=Optimeringskommandon
+Type.Probability=Sannolikhet
+Type.Scripting=Programmering (script)
+Type.Spreadsheet=Kalkylblad
+Type.Statistics=Statistik
+Type.Transformation=Transformationer
+Type.VectorAndMatrix=Vektorer & Matriser
Undo=Ångra
+UngroupObjectes=Dela upp grupp
+Untitled=Namnlös
+UploadGeoGebraTube=Ladda upp till GeoGebraTube
+UpperLimit=Övre gräns
+UseBrowserForJS=Använd webbläsare för JavaScriptprogram
+UseButtonsAndCheckboxes=Använd knappar och kryssrutor
+UseHeaderRow=Använd Rubrikrad
UserInterface=Användargränssnitt
+Value=Värde
+Values=Värden
Vector=Vektor mellan två punkter
Vector.Help=Välj startpunkt och slutpunkt
VectorFromPoint=Vektor från punkt
VectorFromPoint.Help=Startpunkt och vektor
VectorMenu=Vektor
+VectorPolygon=Vektorpolygon
+VectorPolygon.Help=Välj alla hörn, därefter avsluta genom att välja första hörnet igen
+VerticalScrollbars=Vertikala fönsterhissar
View=Visa
+Views=Ritområden
+VisualStyle=Visuell stil
+VisualStyle.Help=Klicka på objekt eller välj dem genom att dra en rektangel runt dem för att ändra deras egenskaper
+Width=Bredd
Window=Fönster
Windows=Fönster
+WithOpacityPen=Med opacitetspenna
+WithinGroups=Inom grupper
+ZMeanInterval=Z-väntevärde på medelvärdet
+ZMeanTest=Z-test på medelvärdet
Zoom=Zooma
ZoomIn=Zooma in
ZoomIn.Help=Klicka på ritområdet för att zooma in (använd mushjulet)
diff --git a/geogebra/properties/menu_tg.properties b/geogebra/properties/menu_tg.properties
index e69de29..22e489a 100644
--- a/geogebra/properties/menu_tg.properties
+++ b/geogebra/properties/menu_tg.properties
@@ -0,0 +1 @@
+Coefficient=\u041a\u043e\u044d\u0444\u0444\u0438\u0441\u0438\u0435\u043d\u0442
\ No newline at end of file
diff --git a/geogebra/properties/colors_cy.properties b/geogebra/properties/menu_tl.properties
similarity index 100%
copy from geogebra/properties/colors_cy.properties
copy to geogebra/properties/menu_tl.properties
diff --git a/geogebra/properties/menu_tr.properties b/geogebra/properties/menu_tr.properties
index d8e119d..261f6b2 100644
--- a/geogebra/properties/menu_tr.properties
+++ b/geogebra/properties/menu_tr.properties
@@ -382,8 +382,6 @@ OperationTable=\u0130\u015elem TAblosu
Options=Seçenekler
Orthogonal=Dik do\u011fru
Orthogonal.Help=Nokta ve dik do\u011fru
-OrthogonalPlane=Dik Düzlem
-OrthogonalPlane.Help=Bir nokta ve dik do\u011fru seçin
Other=Di\u011fer
OutputObjects=Ç\u0131k\u0131\u015f Nesneleri
Overlay=Kapla
@@ -395,8 +393,6 @@ Parabola=Parabol
Parabola.Help=Önce noktay\u0131 sonra do\u011frultman\u0131 seçin
Parallel=Paralel do\u011fru
Parallel.Help=Nokta ve paralel do\u011fru
-ParallelPlane=Paralel Düzlem
-ParallelPlane.Help=Bir nokta ve paralel düzlem seçin
Paste=Yap\u0131\u015ft\u0131r
PasteDataFromClipboard=Ta\u015f\u0131ma Panosundan Veriyi Yap\u0131\u015ft\u0131r
PasteSpecial=Özel Yap\u0131\u015ft\u0131r
@@ -408,10 +404,6 @@ Perspective.Geometry=Geometri
Perspective.Primary=Birincil
Perspective.TableAndGraphics=Tablo & Grafik
Perspectives=Perspektifler
-PlanePointLine=Bir nokta ve bir do\u011frudan geçen düzlem
-PlanePointLine.Help=Nokta ve do\u011fruyu seç
-PlaneThreePoint=Üç noktadan geçen düzlem
-PlaneThreePoint.Help=Üç nokta seçin
Point=Yeni Nokta
Point.Help=Çizim tahtas\u0131na veya do\u011fruya t\u0131klay\u0131n
PointCapturing=Nokta Yakalama
@@ -435,8 +427,6 @@ Power=
Preview=Öngörünüm
Print=Yazd\u0131r
PrintPreview=Bask\u0131 Önizleme
-Prism=Prizma
-Prism.Help=Çokgeni( veya noktalar\u0131) ve ikinci paralel yüzün ilk nokts\u0131n\u0131 seçin
Probability=Olas\u0131l\u0131k
ProbabilityCalculator=Olas\u0131l\u0131k Hesap Makinesi
ProbabilityCalculator.Help=Olas\u0131l\u0131k hesaplama Diyalo\u011fu
@@ -477,8 +467,6 @@ ResidualPlot=Art\u0131k
Result=Sonuç
ReturnAngleInverseTrig=Ters trigonometrik fonksiyonlardan aç\u0131 döndür
RightAngleStyle=Dik aç\u0131 sitili
-RightPrism=Sa\u011f Prizma
-RightPrism.Help=Çokgeni çekin veya çokgeni seçin ve yükseklik girin
RightProb=Sa\u011f Tarafl\u0131
RigidPolygon=Bükülmez Çokgen
RigidPolygon.Help=Tüm kö\u015feleri seçin ve sonra ilk kö\u015feye tekrar t\u0131klay\u0131n
@@ -698,8 +686,6 @@ VectorFromPoint.Help=Ba\u015flang\u0131
VectorMenu=Vektör
VerticalScrollbars=Dü\u015fey
View=Görünüm
-ViewInFrontOf=Önündeki Görünüm
-ViewInFrontOf.Help=T\u0131klanan nesnenin önündeki görünümü de\u011fi\u015ftir
Views=Görünümler
VisualStyle=Görsel Sitil
VisualStyle.Help=Özelliklerini de\u011fi\u015ftirmek için bir nesneye t\u0131klay\u0131n veya bir dikdörtgeni çekin
diff --git a/geogebra/properties/menu_uk.properties b/geogebra/properties/menu_uk.properties
index e662922..fd40acd 100644
--- a/geogebra/properties/menu_uk.properties
+++ b/geogebra/properties/menu_uk.properties
@@ -1,5 +1,13 @@
About=\u041f\u0440\u043e \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u0443
+ActionObjectTools=\u0414\u0456\u0457 \u043d\u0430\u0434 \u043e\u0431'\u0454\u043a\u0442\u0430\u043c\u0438
+AddTrace=\u0414\u043e\u0434\u0430\u0442\u0438 \u043e\u0431'\u0454\u043a\u0442 \u0432 \u0441\u043f\u0438\u0441\u043e\u043a \u0434\u043e\u0441\u043b\u0456\u0434\u0436\u0443\u0432\u0430\u043d\u0438\u0445 \u043e\u0431'\u0454\u043a\u0442\u0456\u0432
Advanced=\u0414\u043e\u0434\u0430\u0442\u043a\u043e\u0432\u043e
+AlgebraDescriptions=\u041e\u043f\u0438\u0441 \u043e\u0431'\u0454\u043a\u0442\u0456\u0432
+AllCommands=\u0412\u0441\u0456 \u043a\u043e\u043c\u0430\u043d\u0434\u0438
+AllowRescaling=\u0414\u043e\u0437\u0432\u043e\u043b\u0438\u0442\u0438 \u0437\u043c\u0456\u043d\u0443 \u043c\u0430\u0441\u0448\u0442\u0430\u0431\u0443
+AllowTooltips=\u0414\u043e\u0437\u0432\u043e\u043b\u0438\u0442\u0438 \u043f\u0456\u0434\u043a\u0430\u0437\u043a\u0438
+AlternativeHypothesis=\u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u0430 \u0433\u0456\u043f\u043e\u0442\u0435\u0437\u0430
+AlternativeHypothesis.short=\u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u0430
Angle=\u041a\u0443\u0442
Angle.Help=\u0412\u043a\u0430\u0436\u0456\u0442\u044c \u0442\u0440\u0438 \u0442\u043e\u0447\u043a\u0438 \u0430\u0431\u043e \u0434\u0432\u0456 \u043f\u0440\u044f\u043c\u0456
AngleFixed=\u041a\u0443\u0442 \u0437\u0430\u0434\u0430\u043d\u043e\u0457 \u0432\u0435\u043b\u0438\u0447\u0438\u043d\u0438
@@ -7,8 +15,10 @@ AngleFixed.Help=\u0412\u043a\u0430\u0436\u0456\u0442\u044c \u0442\u043e\u0447\u0
AngleUnit=\u041e\u0434\u0438\u043d\u0438\u0446\u044f \u0432\u0438\u043c\u0456\u0440\u0443 \u043a\u0443\u0442\u0430
AngularBisector=\u0411\u0456\u0441\u0435\u043a\u0442\u0440\u0438\u0441\u0430 \u043a\u0443\u0442\u0430
AngularBisector.Help=\u0412\u043a\u0430\u0436\u0456\u0442\u044c \u0442\u0440\u0438 \u0442\u043e\u0447\u043a\u0438 \u0430\u0431\u043e \u0434\u0432\u0456 \u043f\u0440\u044f\u043c\u0456
+ApplyDefaults=\u0421\u043a\u0438\u043d\u0443\u0442\u0438 \u043d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f
Area=\u041f\u043b\u043e\u0449\u0430
Area.Help=\u0412\u043a\u0430\u0436\u0456\u0442\u044c \u043c\u043d\u043e\u0433\u043e\u043a\u0443\u0442\u043d\u0438\u043a, \u043a\u043e\u043b\u043e \u0430\u0431\u043e \u043a\u043e\u043d\u0456\u043a\u0443
+AttachDetachPoint=\u041f\u0440\u0438\u0441\u0442\u0435\u0431\u043d\u0443\u0442\u0438 / \u0412\u0456\u0434\u0441\u0442\u0435\u0431\u043d\u0443\u0442\u0438 \u0442\u043e\u0447\u043a\u0443
Axes=\u041e\u0441\u0456
BasicLineTools=\u041f\u0440\u044f\u043c\u0456 \u043b\u0456\u043d\u0456\u0457
Blue=\u0411\u043b\u0430\u043a\u0438\u0442\u043d\u0438\u0439
diff --git a/geogebra/properties/menu_vi.properties b/geogebra/properties/menu_vi.properties
index 5f96a82..d533c86 100644
--- a/geogebra/properties/menu_vi.properties
+++ b/geogebra/properties/menu_vi.properties
@@ -397,8 +397,6 @@ OperationTable=B\u1ea3ng ph
Options=Các tùy ch\u1ecdn
Orthogonal=\u0110\u01b0\u1eddng vuông góc
Orthogonal.Help=Ch\u1ecdn \u0111i\u1ec3m và \u0111\u01b0\u1eddng vuông góc
-OrthogonalPlane=M\u1eb7t ph\u1eb3ng vuông góc
-OrthogonalPlane.Help=Ch\u1ecdn 1 \u0111i\u1ec3m và 1 \u0111\u01b0\u1eddng th\u1eb3ng vuông góc
Other=Khác
OutputObjects=\u0110\u1ed1i t\u01b0\u1ee3ng xu\u1ea5t ra
Overlay=Ph\u1ee7
@@ -410,8 +408,6 @@ Parabola=Parab
Parabola.Help=Ch\u1ecdn \u0111i\u1ec3m và \u0111\u01b0\u1eddng chu\u1ea9n
Parallel=\u0110\u01b0\u1eddng song song
Parallel.Help=T\u1ea1o \u0111i\u1ec3m sau \u0111ó ch\u1ecdn \u0111\u1ed1i t\u01b0\u1ee3ng c\u1ea7n l\u1ea5y song song
-ParallelPlane=M\u1eb7t ph\u1eb3ng song song
-ParallelPlane.Help=Ch\u1ecdn \u0111i\u1ec3m và m\u1eb7t ph\u1eb3ng song song
Paste=Dán
PasteDataFromClipboard=Dán d\u1eef li\u1ec7u t\u1eeb b\u1ed9 nh\u1edb
PasteSpecial=Dán \u0111\u1eb7c bi\u1ec7t
@@ -425,10 +421,6 @@ Perspective.Primary=C\u01a1 s\u1edf
Perspective.TableAndGraphics=B\u1ea3ng tính & \u0111\u1ed3 th\u1ecb
Perspective.Whiteboard=B\u1ea3ng tr\u1eafng
Perspectives=Ph\u1ed1i c\u1ea3nh
-PlanePointLine=M\u1eb7t ph\u1eb3ng qua 1 \u0111i\u1ec3m và ch\u1ee9a 1 \u0111\u01b0\u1eddng th\u1eb3ng
-PlanePointLine.Help=Ch\u1ecdn 1 \u0111i\u1ec3m và 1 \u0111\u01b0\u1eddng th\u1eb3ng
-PlaneThreePoint=M\u1eb7t ph\u1eb3ng qua 3 \u0111i\u1ec3m
-PlaneThreePoint.Help=Ch\u1ecdn 3 \u0111i\u1ec3m
Point=\u0110i\u1ec3m m\u1edbi
Point.Help=Ch\u1ecdn trên vùng làm vi\u1ec7c ho\u1eb7c \u0111\u01b0\u1eddng th\u1eb3ng
PointCapturing=B\u1eaft \u0111i\u1ec3m
@@ -452,8 +444,6 @@ Power=L\u0169y th\u1eeba
Preview=Xem tr\u01b0\u1edbc
Print=In
PrintPreview=Xem tr\u01b0\u1edbc khi in
-Prism=Hình l\u0103ng tr\u1ee5
-Prism.Help=Ch\u1ecdn \u0111a giác (ho\u1eb7c các \u0111i\u1ec3m) và \u0111i\u1ec3m \u0111\u1ea7u tiên c\u1ee7a m\u1eb7t th\u1ee9 hai song song
Probability=Xác su\u1ea5t
ProbabilityCalculator=Phép tính xác su\u1ea5t
ProbabilityCalculator.Help=Tính xác su\u1ea5t
@@ -494,8 +484,6 @@ ResidualPlot=\u0110\u1ed3 th\u1ecb d\u1ea1ng Residual
Result=K\u1ebft qu\u1ea3
ReturnAngleInverseTrig=Tr\u1ea3 l\u1ea1i giá tr\u1ecb góc t\u1eeb hàm l\u01b0\u1ee3ng giác ng\u01b0\u1ee3c
RightAngleStyle=Ki\u1ec3u góc vuông
-RightPrism=Hình l\u0103ng tr\u1ee5 \u0111\u1ee9ng
-RightPrism.Help=Kéo \u0111a giác, ho\u1eb7c ch\u1ecdn \u0111a giác và nh\u1eadp \u0111\u01b0\u1eddng cao
RightProb=Bên ph\u1ea3i
RigidPolygon=\u0110a giác có h\u01b0\u1edbng
RigidPolygon.Help=Ch\u1ecdn t\u1ea5t c\u1ea3 các \u0111\u1ec9nh và nh\u1ea5p chu\u1ed9t l\u1ea1i \u0111\u1ec9nh \u0111\u1ea7u tiên
@@ -717,8 +705,6 @@ VectorPolygon=V
VectorPolygon.Help=Ch\u1ecdn t\u1ea5t c\u1ea3 các \u0111i\u1ec3m và nh\u1ea5p chu\u1ed9t l\u1ea1i \u0111i\u1ec3m \u0111\u1ea7u tiên
VerticalScrollbars=Thanh cu\u1ed1n d\u1ecdc
View=Hi\u1ec3n th\u1ecb
-ViewInFrontOf=Hi\u1ec7n th\u1ecb phía tr\u01b0\u1edbc
-ViewInFrontOf.Help=Thay \u0111\u1ed5i hi\u1ec3n th\u1ecb phía tr\u01b0\u1edbc \u0111\u1ed1i t\u01b0\u1ee3ng \u0111ã nh\u1ea5p chu\u1ed9t
Views=Các hi\u1ec3n th\u1ecb
VisualStyle=Ki\u1ec3u hi\u1ec3n th\u1ecb
VisualStyle.Help=Ch\u1ecdn các \u0111\u1ed1i t\u01b0\u1ee3ng ho\u1eb7c kéo hình ch\u1eef nh\u1eadt \u0111\u1ec3 thay \u0111\u1ed5i các \u0111\u1eb7c \u0111i\u1ec3m c\u1ee7a nó
diff --git a/geogebra/properties/menu_zh_CN.properties b/geogebra/properties/menu_zh_CN.properties
index a409227..44d938b 100644
--- a/geogebra/properties/menu_zh_CN.properties
+++ b/geogebra/properties/menu_zh_CN.properties
@@ -2,7 +2,7 @@ ANOVA=\u65b9\u5dee\u5206\u6790
About=\u5173\u4e8e
Accents=\u91cd\u97f3\u6807\u8bb0\u7c7b
AccentsExt=\u4e0a\u4e0b\u5e95\u7ebf\u7c7b
-ActionObjectTools=\u52a8\u4f5c\u5bf9\u8c61\u5de5\u5177
+ActionObjectTools=\u52a8\u4f5c\u5bf9\u8c61
AddTrace=\u5c06\u5bf9\u8c61\u52a0\u5165\u8ffd\u8e2a\u540d\u5355
Adjustment=\u8c03\u6574
Advanced=\u9ad8\u7ea7
@@ -20,7 +20,7 @@ AngleUnit=\u89d2\u7684\u5355\u4f4d
AngularBisector=\u89d2\u5e73\u5206\u7ebf
AngularBisector.Help=\u8bf7\u9009\u4e2d\u4e09\u4e2a\u70b9\uff0c\u6216\u4e24\u6761\u76f4\u7ebf\u3002
ApplyDefaults=\u4f7f\u7528\u9ed8\u8ba4\u503c
-Area=\u6d4b\u91cf\u9762\u79ef
+Area=\u9762\u79ef
Area.Help=\u8bf7\u9009\u62e9\u591a\u8fb9\u5f62\uff0c\u6216\uff08\u692d\uff09\u5706\u3002
Ascending=\u9012\u589e
AttachDetachPoint=\u9644\u7740\u2571\u8131\u79bb\u70b9
@@ -28,7 +28,7 @@ AttachDetachPoint.Help=\u9009\u70b9\u4e0e\u8981\u9644\u7740\u7684\u5bf9\u8c61\u3
Axes=\u5750\u6807\u8f74
Back=\u56de\u590d
BackgroundColor=\u80cc\u666f\u8272
-BasicLineTools=\u76f4\u7ebf\u5de5\u5177
+BasicLineTools=\u76f4\u7ebf
BlackboardLetters=\u9ed1\u677f\u4f53\u5b57\u6bcd
Blue=\u84dd
Bold=\u52a0\u7c97
@@ -52,7 +52,7 @@ Circle3=\u5706 (\u8fc7\u4e09\u70b9)
Circle3.Help=\u8bf7\u9009\u62e9\u5706\u4e0a\u7684\u4e09\u70b9\u3002
CircleArc3=\u5706\u5f27 (\u6307\u5b9a\u5706\u5fc3\u4e0e\u4e24\u70b9)
CircleArc3.Help=\u8bf7\u70b9\u9009\u5706\u5fc3\u3001\u8d77\u70b9\u3001\u7ec8\u70b9\uff08\u2605\u6ce8\u610f\uff1a\u7ec8\u70b9\u4e0d\u9700\u5728\u5706\u4e0a\uff09\u3002
-CircleArcTools=\u5706\u3001\u5f27\u5de5\u5177
+CircleArcTools=\u5706/\u5f27
CircleAxisPoint=\u5706 (\u4e2d\u5fc3\u8f74\u3001\u4e00\u70b9)
CircleAxisPoint.Help=\u70b9\u9009\u4e2d\u5fc3\u8f74\uff0c\u518d\u9009\u8981\u901a\u8fc7\u7684\u70b9\u3002
CirclePointRadius=\u5706 (\u6307\u5b9a\u5706\u5fc3\u4e0e\u534a\u5f84)
@@ -89,7 +89,7 @@ ComplexNumber=\u590d\u6570
ComplexNumber.Help=\u5728\u7ed8\u56fe\u533a\u6309\u4e00\u4e0b\u5373\u53ef\u65b0\u589e\u4e00\u4e2a\u590d\u6570\u3002
ConciseCode=\u7b80\u7801
ConciseUsingCSE5=CSE5 \u7b80\u7801
-Condition.ShowObject=\u663e\u793a\u5bf9\u8c61\u7684\u6761\u4ef6
+Condition.ShowObject=\u663e\u793a\u6761\u4ef6
Conditions=\u6761\u4ef6
ConfidenceInterval=\u7f6e\u4fe1\u533a\u95f4
ConfidenceLevel=\u7f6e\u4fe1\u6c34\u5e73
@@ -97,7 +97,7 @@ Conic=\u5706\u9525\u66f2\u7ebf
Conic5=\u5706\u9525\u66f2\u7ebf (\u8fc7\u4e94\u70b9)
Conic5.Help=\u8bf7\u9009\u62e9\u5706\u9525\u66f2\u7ebf\u4e0a\u7684\u4e94\u4e2a\u70b9\u3002
ConicMenu=\u5706\u9525\u66f2\u7ebf
-ConicSectionTools=\u5706\u9525\u66f2\u7ebf\u5de5\u5177
+ConicSectionTools=\u5706\u9525\u66f2\u7ebf
Continuity=\u79fb\u52a8\u8fde\u7eed\u6027
Continuous=\u8fde\u7eed
Copy=\u590d\u5236
@@ -146,10 +146,10 @@ Delimiter=\u5206\u9694\u7b26\u53f7
Derivative=\u5bfc\u6570
Derivative.Help=\u6c42\u51fa\u4e00\u9636\u5bfc\u6570\u3002
Descending=\u9012\u51cf
-DilateFromPoint=\u4ee5\u67d0\u70b9\u4e3a\u4e2d\u5fc3\u4f38\u7f29\u5bf9\u8c61
+DilateFromPoint=\u7f29\u653e
DilateFromPoint.Help=\u8bf7\u9009\u8981\u7f29\u653e\u7684\u5bf9\u8c61\u3001\u7f29\u653e\u4e2d\u5fc3\u3001\u518d\u6307\u5b9a\u7f29\u653e\u6bd4\u4f8b\u3002
Discrete=\u79bb\u6563
-Distance=\u6d4b\u91cf\u8ddd\u79bb
+Distance=\u8ddd\u79bb
Distance.Help=\u9009\u62e9\u4e24\u4e2a\u70b9\u6216\u7ebf\u6bb5\u3001\u591a\u8fb9\u5f62\u3001\u5706\u3002
Distribution=\u7edf\u8ba1\u5206\u5e03
Distribution.Binomial=\u4e8c\u9879\u5206\u5e03
@@ -173,7 +173,7 @@ DontDeleteTool=\u4e0d\u5220\u9664\u5de5\u5177
DontOverwrite=\u4e0d\u8986\u76d6
DontSave=\u4e0d\u4fdd\u5b58
DotPlot=\u70b9\u56fe
-DrawingPadToClipboard=\u5c06\u7ed8\u56fe\u533a\u653e\u5165\u526a\u8d34\u677f
+DrawingPadToClipboard=\u653e\u5165\u526a\u8d34\u677f
DynamicColors=\u52a8\u6001\u989c\u8272
Edit=\u7f16\u8f91
Ellipse3=\u692d\u5706
@@ -213,7 +213,7 @@ FitLine.Help=\u9009\u62e9\u4e00\u4e9b\u70b9\u3002
Fix=\u56fa\u5b9a\u6216\u91ca\u653e\u5bf9\u8c61
Fix.Help=\u8bf7\u70b9\u9009\u8981\u56fa\u5b9a\uff08\u6216\u91ca\u653e\uff09\u7684\u5bf9\u8c61\u3002
FixedToGrid=\u56fa\u5b9a\u5230\u7f51\u683c
-FontSize=\u5b57\u4f53\u5927\u5c0f
+FontSize=\u5b57\u53f7
ForegroundColor=\u524d\u666f\u8272
Formulas=\u516c\u5f0f
FrakturLetters=\u6b4c\u5fb7\u4f53\u5b57\u6bcd
@@ -222,7 +222,7 @@ FunctionInspector.Help=\u8bf7\u9009\u62e9\u51fd\u6570\u3002
Functionality=\u529f\u80fd
GUIFontSize=\u83dc\u5355\u5b57\u4f53\u5927\u5c0f
General=\u4e00\u822c
-GeneralTools=\u5e38\u7528\u5de5\u5177
+GeneralTools=\u5e38\u7528
GenerateCode=\u751f\u6210\u4ee3\u7801
GeogebraToAsymptoteExport=\u5bfc\u51fa\u81f3 Asymptote
Geometry=\u51e0\u4f55
@@ -254,7 +254,7 @@ Image.Help=\u8bf7\u9009\u4e00\u70b9\u6216\u7ed8\u56fe\u533a\u7a7a\u767d\u5904\uf
Images=\u56fe\u7247
ImportDataFile=\u5bfc\u5165\u6570\u636e\u6587\u4ef6
IncludeHTML5=\u5305\u542b HTML5
-InputField=\u590d\u5236\u5230\u547d\u4ee4\u6846
+InputField=\u547d\u4ee4\u6846
InputField.Help=\u5c06\u6240\u9009\u7684\u5bf9\u8c61\u5b9a\u4e49\u590d\u5236\u5230\u547d\u4ee4\u6846\u4e2d\u3002
InputHelp=\u6307\u4ee4\u8bf4\u660e
InputObjects=\u8f93\u5165\u5bf9\u8c61
@@ -322,7 +322,7 @@ MeanCells.Help=\u8bf7\u9009\u62e9\u4e00\u7ec4\u5355\u5143\u683c
MeanDifference=\u5e73\u5747\u5dee
MeanX=X\u5747\u503c
MeanY=Y\u5747\u503c
-MeasurementTools=\u6d4b\u91cf\u5de5\u5177
+MeasurementTools=\u6d4b\u91cf
Median=\u4e2d\u4f4d\u6570
Metal=\u91d1\u5c5e
Midpoint=\u4e2d\u70b9\u6216\u4e2d\u5fc3\u70b9
@@ -331,17 +331,17 @@ MinCells=\u6c42\u6240\u9009\u50a8\u5b58\u683c\u7684\u6700\u5c0f\u503c
MinCells.Help=\u9009\u62e9\u4e00\u7ec4\u5355\u5143\u683c\u3002
MirrorAtCircle=\u53cd\u6f14
MirrorAtCircle.Help=\u9009\u70b9\uff0c\u518d\u9009\u5706\u3002
-MirrorAtLine=\u505a\u8f74\u5bf9\u79f0
+MirrorAtLine=\u8f74\u5bf9\u79f0\u955c\u50cf
MirrorAtLine.Help=\u5148\u9009\u8981\u505a\u5bf9\u79f0\u7684\u5bf9\u8c61\uff0c\u518d\u9009\u5bf9\u79f0\u8f74\u3002
-MirrorAtPoint=\u505a\u70b9\u5bf9\u79f0
+MirrorAtPoint=\u4e2d\u5fc3\u5bf9\u79f0\u955c\u50cf
MirrorAtPoint.Help=\u5148\u9009\u8981\u505a\u5bf9\u79f0\u7684\u5bf9\u8c61\uff0c\u518d\u9009\u5bf9\u79f0\u4e2d\u5fc3\u3002
Mode=\u6a21\u5f0f
Motif=\u4e3b\u9898
Move=\u79fb\u52a8
-Move.Help=\u62d6\u66f3\u6216\u70b9\u9009\u5bf9\u8c61 \uff08\u5feb\u901f\u952e\uff1aEsc\uff09\u3002
-MoveRotate=\u7ed5\u70b9\u8f6c\u52a8
+Move.Help=\u62d6\u66f3\u6216\u70b9\u9009\u5bf9\u8c61 \uff08\u5feb\u6377\u952e\uff1aEsc\uff09\u3002
+MoveRotate=\u7ed5\u70b9\u65cb\u8f6c
MoveRotate.Help=\u8bf7\u5148\u70b9\u9009\u300c\u65cb\u8f6c\u4e2d\u5fc3\u300d\uff0c\u7136\u540e\u518d\u8f6c\u52a8\u53e6\u4e00\u5bf9\u8c61\u3002
-MovementTools=\u79fb\u52a8\u5de5\u5177
+MovementTools=\u79fb\u52a8
MultiVarStats=\u591a\u53d8\u91cf\u5206\u6790
MultiVarStats.Help=\u5206\u6790\u4e24\u680f\u4ee5\u4e0a\u8d44\u6599\u3002
MultiVariableStatistics=\u591a\u53d8\u91cf\u7edf\u8ba1
@@ -368,8 +368,6 @@ OpenWebpage=\u6253\u5f00\u7f51\u9875
Options=\u9009\u9879
Orthogonal=\u5782\u7ebf
Orthogonal.Help=\u8bf7\u70b9\u9009\u201c\u901a\u8fc7\u7684\u70b9\u201d\u4e0e\u201c\u8981\u5782\u76f4\u7684\u76f4\u7ebf\u201d\u3002
-OrthogonalPlane=\u5782\u76f4\u9762 (\u70b9\u3001\u7ebf)
-OrthogonalPlane.Help=\u8bf7\u9009\u901a\u8fc7\u7684\u70b9\u4e0e\u5782\u76f4\u7684\u7ebf\u3002
Other=\u5176\u5b83
OutputObjects=\u8f93\u51fa\u5bf9\u8c61
Overlay=\u8986\u76d6
@@ -380,8 +378,6 @@ Parabola=\u629b\u7269\u7ebf
Parabola.Help=\u9009\u62e9\u7126\u70b9\u548c\u51c6\u7ebf\u3002
Parallel=\u5e73\u884c\u7ebf
Parallel.Help=\u8bf7\u9009\u8981\u201c\u901a\u8fc7\u7684\u70b9\u201d\u4e0e\u201c\u8981\u5e73\u884c\u7684\u7ebf\u201d\u3002
-ParallelPlane=\u5e73\u884c\u9762 (\u70b9\u3001\u9762)
-ParallelPlane.Help=\u8bf7\u9009\u901a\u8fc7\u7684\u70b9\u4e0e\u8981\u5e73\u884c\u7684\u9762\u3002
Paste=\u7c98\u8d34
PasteDataFromClipboard=\u4ece\u526a\u8d34\u677f\u7c98\u8d34\u6570\u636e
PasteSpecial=\u9009\u62e9\u6027\u7c98\u8d34
@@ -395,19 +391,15 @@ Perspective.Primary=\u9ed8\u8ba4\u914d\u7f6e
Perspective.TableAndGraphics=\u8868\u4e0e\u56fe
Perspective.Whiteboard=\u767d\u677f
Perspectives=\u683c\u5c40
-PlanePointLine=\u5e73\u9762 (\u8fc7\u70b9\u3001\u76f4\u7ebf)
-PlanePointLine.Help=\u8bf7\u70b9\u9009\u5e73\u9762\u6240\u901a\u8fc7\u7684\u70b9\u4e0e\u76f4\u7ebf\u3002
-PlaneThreePoint=\u5e73\u9762 (\u8fc7\u4e09\u70b9)
-PlaneThreePoint.Help=\u9009\u62e9\u5e73\u9762\u6240\u901a\u8fc7\u7684\u4e09\u70b9\u3002
Point=\u65b0\u70b9
Point.Help=\u8bf7\u70b9\u9009\u300c\u7ed8\u56fe\u533a\u7a7a\u767d\u5904\u300d\uff0c\u6216\u67d0\u7ebf\u578b\u5bf9\u8c61\uff08\u76f4\u7ebf\u3001\u5706\u9525\u66f2\u7ebf\u7b49\uff09\u3002
PointCapturing=\u5438\u9644\u683c\u70b9
PointInside=\u5185\u70b9
PointMenu=\u70b9
-PointOnObject=\u5185\u70b9\u6216\u8fb9\u754c\u70b9
+PointOnObject=\u5185\u70b9/\u8fb9\u754c\u70b9
PointOnObject.Help=\u70b9\u5728\u5bf9\u8c61\u5185\u90e8\u4f1a\u4ea7\u751f\u5185\u70b9\uff0c\u70b9\u5728\u5468\u8fb9\u4e0a\u4f1a\u4ea7\u751f\u8fb9\u754c\u70b9\u3002
PointStyle=\u70b9\u7684\u6837\u5f0f
-PointTools=\u70b9\u5de5\u5177
+PointTools=\u70b9
Polar=\u6781\u5750\u6807
PolarDiameter=\u6781\u7ebf\u6216\u5f84\u7ebf
PolarDiameter.Help=\u7528\u6cd5\uff1a(1)\u9009\u70b9\u3001\u5706\u9525\u66f2\u7ebf\uff0c\u753b\u51fa\u6781\u7ebf (2)\u9009\u7ebf\u3001\u5706\u9525\u66f2\u7ebf\uff0c\u753b\u51fa\u5f84\u7ebf\u3002
@@ -415,14 +407,13 @@ PolyLine=\u6298\u7ebf\u56fe
PolyLine.Help=\u4f9d\u5e8f\u70b9\u9009\u6240\u6709\u9876\u70b9\uff0c\u518d\u70b9\u56de\u7b2c\u4e00\u4e2a\u70b9\u3002
Polygon=\u591a\u8fb9\u5f62
Polygon.Help=\u8bf7\u70b9\u9009\u591a\u8fb9\u5f62\u7684\u6240\u6709\u9876\u70b9\uff08\u2605\u6ce8\u610f\uff1a\u6700\u540e\uff0c\u8981\u518d\u70b9\u4e00\u6b21\u300c\u7b2c\u4e00\u4e2a\u9876\u70b9\u300d\uff09\u3002
-PolygonTools=\u591a\u8fb9\u5f62\u5de5\u5177
+PolygonTools=\u591a\u8fb9\u5f62
Polynomial=\u591a\u9879\u5f0f
Portrait=\u7ad6\u6392
Preview=\u9884\u89c8
Print=\u6253\u5370
PrintPreview=\u6253\u5370\u9884\u89c8
Prism=\u68f1\u67f1
-Prism.Help=\u8bf7\u70b9\u9009\u68f1\u67f1\u5e95\u9762(\u4e00\u4e2a\u591a\u8fb9\u5f62\u6216\u6570\u4e2a\u9876\u70b9)\uff0c\u518d\u70b9\u9009\u67f1\u4f53\u9876\u9762\u7684\u7b2c\u4e00\u4e2a\u70b9\u3002
Probability=\u6982\u7387
ProbabilityCalculator=\u6982\u7387\u8ba1\u7b97\u5668
ProbabilityCalculator.Help=\u8ba1\u7b97\u6982\u7387\u5bf9\u8bdd\u6846\u3002
@@ -433,7 +424,7 @@ Properties.Style=\u6837\u5f0f
Radiant=\u5f27\u5ea6
Ray=\u5c04\u7ebf (\u8fc7\u4e24\u70b9)
Ray.Help=\u8bf7\u9009\u4e24\u70b9\u3002
-Recent=\u6253\u5f00\u6700\u8fd1\u7684\u6587\u4ef6
+Recent=\u6700\u8fd1\u6240\u7528\u6587\u4ef6
RecomputeAllViews=\u91cd\u65b0\u8ba1\u7b97\u6240\u6709\u5bf9\u8c61
RecordToSpreadsheet=\u8bb0\u5f55\u5230\u5de5\u4f5c\u8868
RecordToSpreadsheet.Help=\u9009\u62e9\u8981\u8ddf\u8e2a\u7684\u5bf9\u8c61\uff0c\u518d\u4fee\u6539\u521b\u5efa\u65b9\u5f0f
@@ -443,7 +434,7 @@ RecoveryOpen=\u6253\u5f00
RecoverySave=\u4fdd\u5b58
RecoveryText=\u4e0b\u5217\u4e3a\u53ef\u590d\u539f\u7684 GGB \u6863\u3002
RecoveryTitle=\u4ece\u5d29\u6e83\u4e2d\u8fd8\u539f
-Red=\u7ea2\u8272
+Red=\u7ea2
Redo=\u91cd\u505a
Refresh=\u5237\u65b0\u89c6\u56fe
RegressionInference=\u56de\u5f52\u8fed\u4ee3
@@ -469,7 +460,7 @@ RotateByAngle=\u65cb\u8f6c
RotateByAngle.Help=\u5148\u9009\u8981\u505a\u65cb\u8f6c\u7684\u5bf9\u8c61\u3001\u65cb\u8f6c\u4e2d\u5fc3\uff0c\u518d\u6307\u5b9a\u65cb\u8f6c\u89d2\u3002
RotateView=\u65cb\u8f6c 3D \u7ed8\u56fe\u533a
RotateView.Help=\u62d6\u66f3 3D \u7ed8\u56fe\u533a\u5373\u53ef\u65cb\u8f6c\u6574\u4e2a\u89c6\u7a97\u3002
-Rounding=\u6570\u503c\u8fd1\u4f3c
+Rounding=\u7cbe\u786e\u5ea6
RowHeader=\u884c\u5934
RowLimit=\u884c\u6570\u4e0a\u9650
RowOrder=\u7531\u5de6\u81f3\u53f3
@@ -490,7 +481,7 @@ SegmentFixed.Help=\u5148\u9009\u300c\u8d77\u70b9\u300d\uff0c\u518d\u6307\u5b9a\u
Select=\u9009\u62e9\u5bf9\u8c61
Select.Help=\u8bf7\u9009\u62e9\u4e00\u4e2a\u5bf9\u8c61
SelectACurve=\u9009\u53d6\u66f2\u7ebf
-SelectAll=\u9009\u62e9\u5168\u90e8
+SelectAll=\u5168\u9009
SelectAnObjectToTrace=\u9009\u62e9\u8981\u8ffd\u8e2a\u7684\u5bf9\u8c61
SelectAncestors=\u9009\u62e9\u7236\u5bf9\u8c61
SelectCurrentLayer=\u9009\u62e9\u5f53\u524d\u5c42
@@ -552,8 +543,8 @@ SortBy=\u6392\u5e8f\u4f9d\u636e
Space=\u7a7a\u767d
SpaceBetweenThousands=\u6bcf\u4e09\u4f4d\u6570\u95f4\u7684\u7a7a\u767d
Spacing=\u95f4\u9694
-SpecialLineTools=\u9ad8\u7ea7\u76f4\u7ebf\u5de5\u5177
-SpecialObjectTools=\u9ad8\u7ea7\u5bf9\u8c61\u5de5\u5177
+SpecialLineTools=\u76f4\u7ebf\uff08\u9ad8\u7ea7\uff09
+SpecialObjectTools=\u5bf9\u8c61\uff08\u9ad8\u7ea7\uff09
Sphere2=\u7403\u9762 (\u7403\u5fc3\u3001\u4e00\u70b9)
Sphere2.Help=\u5148\u9009\u7403\u5fc3\uff0c\u518d\u9009\u7403\u4e0a\u4e00\u70b9\u3002
SpherePointRadius=\u7403\u9762 (\u7403\u5fc3\u3001\u534a\u5f84)
@@ -627,7 +618,7 @@ TraceCopy=\u751f\u6210\u5b9e\u4f53\u5bf9\u8c61
TraceToList=\u8bb0\u5f55\u81f3\u5217\u8868
TraceToSpreadsheet=\u8bb0\u5f55\u8f68\u8ff9\u81f3\u5de5\u4f5c\u8868
TraceToSpreadsheet.Help=\u7eaa\u5f55\u8f68\u8ff9\u81f3\u5de5\u4f5c\u8868\u7684\u5bf9\u8bdd\u6846
-TransformationTools=\u53d8\u6362\u5de5\u5177
+TransformationTools=\u53d8\u6362
TranslateByVector=\u5e73\u79fb
TranslateByVector.Help=\u5148\u9009\u8981\u505a\u5e73\u79fb\u7684\u5bf9\u8c61\uff0c\u518d\u9009\u201c\u5e73\u79fb\u5411\u91cf\u201d\u3002
TranslateView=\u79fb\u52a8\u7ed8\u56fe\u533a
@@ -676,8 +667,6 @@ VectorPolygon=\u5411\u91cf\u591a\u8fb9\u5f62
VectorPolygon.Help=\u8fde\u7eed\u70b9\u9009\u6570\u70b9\uff0c\u518d\u56de\u5230\u7b2c\u4e00\u70b9\u3002\u5b8c\u6210\u540e\uff0c\u62d6\u66f3\u7b2c\u4e00\u70b9\u53ef\u5e73\u79fb\u6574\u4e2a\u591a\u8fb9\u5f62\u3002
VerticalScrollbars=\u7ad6\u76f4\u6eda\u52a8\u6761
View=\u67e5\u770b
-ViewInFrontOf=\u9762\u5bf9\u6307\u5b9a\u9762
-ViewInFrontOf.Help=\u5c06\u89c6\u89d2\u8f6c\u81f3\u9762\u5bf9\u6307\u5b9a\u5bf9\u8c61\u3002
VisualStyle=\u6837\u5f0f
VisualStyle.Help=\u7528\u9f20\u6807\u70b9\u9009\u6216\u6846\u9009\u5bf9\u8c61\u540e\uff0c\u53ef\u6539\u53d8\u5bf9\u8c61\u5c5e\u6027\u3002
Width=\u5bbd\u5ea6
diff --git a/geogebra/properties/menu_zh_TW.properties b/geogebra/properties/menu_zh_TW.properties
index f640a63..0ac3cb5 100644
--- a/geogebra/properties/menu_zh_TW.properties
+++ b/geogebra/properties/menu_zh_TW.properties
@@ -371,8 +371,6 @@ OpenWebpage=\u958b\u555f\u7db2\u9801
Options=\u9078\u9805
Orthogonal=\u5782\u76f4\u7dda
Orthogonal.Help=\u8acb\u9ede\u9078\u300c\u901a\u904e\u7684\u9ede\u300d\u8207\u300c\u8981\u5782\u76f4\u7684\u76f4\u7dda\u300d
-OrthogonalPlane=\u5782\u76f4\u9762 (\u9ede\u3001\u7dda)
-OrthogonalPlane.Help=\u8acb\u9078\u901a\u904e\u7684\u9ede\u8207\u5782\u76f4\u7684\u7dda
Other=\u5176\u4ed6
OutputObjects=\u8f38\u51fa\u7269\u4ef6
Overlay=\u8986\u84cb
@@ -383,8 +381,6 @@ Parabola=\u62cb\u7269\u7dda
Parabola.Help=\u9ede\u9078\u7126\u9ede\u8207\u6e96\u7dda
Parallel=\u5e73\u884c\u7dda
Parallel.Help=\u8acb\u9078\u8981\u901a\u904e\u7684\u300c\u9ede\u300d\u8207\u8981\u5e73\u884c\u7684\u300c\u7dda\u300d
-ParallelPlane=\u5e73\u884c\u9762 (\u9ede\u3001\u9762)
-ParallelPlane.Help=\u8acb\u9078\u901a\u904e\u7684\u9ede\u8207\u8981\u5e73\u884c\u7684\u9762
Paste=\u8cbc\u4e0a
PasteDataFromClipboard=\u5f9e\u526a\u8cbc\u7c3f\u8cbc\u4e0a\u8cc7\u6599
PasteSpecial=\u9078\u64c7\u6027\u8cbc\u4e0a
@@ -398,10 +394,6 @@ Perspective.Primary=\u9810\u8a2d\u914d\u7f6e
Perspective.TableAndGraphics=\u7e6a\u5716\u5340+\u8a66\u7b97\u8868
Perspective.Whiteboard=\u767d\u677f
Perspectives=\u683c\u5c40
-PlanePointLine=\u5e73\u9762 (\u904e\u9ede\u3001\u76f4\u7dda)
-PlanePointLine.Help=\u8acb\u9ede\u9078\u5e73\u9762\u6240\u901a\u904e\u7684\u9ede\u8207\u76f4\u7dda
-PlaneThreePoint=\u5e73\u9762 (\u904e\u4e09\u9ede)
-PlaneThreePoint.Help=\u9078\u64c7\u5e73\u9762\u6240\u901a\u904e\u7684\u4e09\u9ede
Point=\u65b0\u9ede
Point.Help=\u8acb\u9ede\u9078\u300c\u7e6a\u5716\u5340\u7a7a\u767d\u8655\u300d\uff0c\u6216\u67d0\u7dda\u578b\u7269\u4ef6\uff08\u76f4\u7dda\u3001\u5713\u9310\u66f2\u7dda\u7b49\uff09
PointCapturing=\u5438\u9644\u529f\u80fd
@@ -424,8 +416,6 @@ Portrait=\u76f4\u5370
Preview=\u9810\u89bd
Print=\u5217\u5370
PrintPreview=\u9810\u89bd\u5217\u5370
-Prism=\u89d2\u67f1
-Prism.Help=\u8acb\u9ede\u9078\u67f1\u9ad4\u5e95\u9762(\u4e00\u500b\u591a\u908a\u5f62\u6216\u6578\u500b\u9802\u9ede)\uff0c\u518d\u9ede\u9078\u67f1\u9ad4\u9802\u9762\u7684\u7b2c\u4e00\u500b\u9ede\u3002
Probability=\u6a5f\u7387
ProbabilityCalculator=\u6a5f\u7387\u8a08\u7b97\u6a5f
ProbabilityCalculator.Help=\u8a08\u7b97\u6a5f\u7387\u7684\u8996\u7a97
@@ -466,7 +456,6 @@ ResidualPlot=\u6b98\u5dee\u5716
Result=\u7d50\u679c
ReturnAngleInverseTrig=\u4ee5\u53cd\u4e09\u89d2\u51fd\u6578\u8868\u793a\u89d2\u5ea6
RightAngleStyle=\u76f4\u89d2\u6a23\u5f0f
-RightPrism=\u6b63\u89d2\u67f1
RightProb=\u9650\u5236\u5de6\u7aef
RigidPolygon=\u525b\u9ad4\u591a\u908a\u5f62
RigidPolygon.Help=\u9ede\u9078\u6240\u6709\u9802\u9ede\uff0c\u518d\u9ede\u56de\u7b2c\u4e00\u500b\u9802\u9ede\u3002
@@ -684,8 +673,6 @@ VectorPolygon=\u5411\u91cf\u591a\u908a\u5f62
VectorPolygon.Help=\u9023\u7e8c\u9ede\u9078\u6578\u9ede\uff0c\u518d\u56de\u5230\u7b2c\u4e00\u9ede\u3002\u5b8c\u6210\u5f8c\uff0c\u62d6\u66f3\u7b2c\u4e00\u9ede\u53ef\u5e73\u79fb\u6574\u500b\u591a\u908a\u5f62\u3002
VerticalScrollbars=\u5782\u76f4\u6372\u8ef8
View=\u6aa2\u8996
-ViewInFrontOf=\u9762\u5c0d\u6307\u5b9a\u9762
-ViewInFrontOf.Help=\u5c07\u8996\u89d2\u8f49\u81f3\u9762\u5c0d\u6307\u5b9a\u7269\u4ef6
VisualStyle=\u6a23\u5f0f
VisualStyle.Help=\u7528\u6ed1\u9f20\u9ede\u9078\u6216\u6846\u9078\u7269\u4ef6\u5f8c\uff0c\u53ef\u6539\u8b8a\u7269\u4ef6\u5c6c\u6027
Width=\u5bec\u5ea6
diff --git a/geogebra/properties/plain.properties b/geogebra/properties/plain.properties
index 317ddeb..f8cb05b 100644
--- a/geogebra/properties/plain.properties
+++ b/geogebra/properties/plain.properties
@@ -1,5 +1,3 @@
-2x2Matrix=2x2 matrix
-3x3Matrix=3x3 matrix
ADecimalPlace=%0 Decimal Place
ADecimalPlaces=%0 Decimal Places
ADerivativeOfB=%0 derivative of %1
@@ -35,6 +33,7 @@ Algebra=Algebra
AlgebraWindow=Algebra
AliesOnB=%0 lies on %1
AliesOnThePerimeterOfB=%0 lies on the perimeter of %1
+AllowOfflineUse=Allow Offline Use
AllowStyleBar=Style Bar is Allowed
Alt=Alt
AltGr=AltG
@@ -119,7 +118,6 @@ ConstructionProtocolHelp=<html><body><p><b>Using the Construction Protocol</b></
ConstructionProtocolNavigation=Navigation Bar for Construction Steps
Coordinates=Coordinates
CopyToClipboard=Copy to Clipboard
-CopyToLaTeX=Copy to LaTeX
CornerPoint=Corner
CreatedWith=Created with
CreatedWithGeoGebra=Created with GeoGebra
@@ -232,7 +230,6 @@ ImplicitConicEquation=a x
ImplicitLineEquation=a x + b y = c
ImplicitPoly=Implicit Curve
IncircleOfTriangleABC=Incircle of triangle %0%1%2
-IncludeJARFiles=Include jar Files
Increasing=Increasing
IncreasingOnce=Increasing (Once)
Inequality=Inequality
@@ -251,7 +248,7 @@ Interpolate=Draw with interpolation
IntersectingLines=Intersecting lines
IntersectionCurveOfAB=Intersection curve of %0, %1
IntersectionLineOfAB=Intersection line of %0, %1
-IntersectionPathsOfAB=Intersection paths of %0, %1
+IntersectionOfAandB=Intersection of %0 and %1
IntersectionPointOfAB=Intersection point of %0, %1
IntersectionPointOfABNearC=Intersection point of %0, %1 near to point %2
IntersectionPointOfABWithInitialValueC=Intersection point of %0, %1 with initial value %2
@@ -348,12 +345,6 @@ PerspectiveName=Name of Perspective
Picture=Picture
PictureHeight=Picture height
PictureWidth=Picture width
-PlaneA=plane %0
-PlaneContainingA=Plane containing %0
-PlaneFromA=plane created from %0
-PlaneThroughAB=Plane through %0, %1
-PlaneThroughABC=Plane through %0, %1, %2
-PlaneThroughAParallelToB=Plane through %0 parallel to %1
Play=Play
PlayButton=Play button
Point=Point
@@ -367,7 +358,7 @@ PointOnA=Point on %0
PointOnAClosestToB=Point on %0 closest to %1
PointOnPath=On Path
PointSize=Point Size
-Points=Points
+Points=Vertices
PolarCoords=Polar Coordinates
PolarLineOfARelativeToB=Polar line of %0 relative to %1
PolyLine=PolyLine
diff --git a/geogebra/properties/plain_ar.properties b/geogebra/properties/plain_ar.properties
index a8a51db..b3a82aa 100644
--- a/geogebra/properties/plain_ar.properties
+++ b/geogebra/properties/plain_ar.properties
@@ -1,5 +1,3 @@
-2x2Matrix=2x2 \u0645\u0635\u0641\u0648\u0641\u0629
-3x3Matrix=3x3 \u0645\u0635\u0641\u0648\u0641\u0629
ADecimalPlace=%0 \u062c\u0632\u0621 \u0639\u0634\u0631\u064a
ADecimalPlaces=%0 \u0623\u062c\u0632\u0627\u0621 \u0639\u0634\u0631\u064a\u0629
ADerivativeOfB=%0 \u0645\u0634\u062a\u0642\u0629 \u0645\u0646 %1
@@ -34,6 +32,7 @@ Algebra=\u0627\u0644\u062c\u0628\u0631
AlgebraWindow=\u0646\u0627\u0641\u0630\u0629 \u0627\u0644\u062c\u0628\u0631
AliesOnB=%0 \u062a\u0646\u062a\u0645\u064a \u0625\u0644\u0649 %1
AliesOnThePerimeterOfB=%0 \u062a\u0646\u062a\u0645\u064a \u0625\u0644\u0649 \u0645\u062d\u064a\u0637 %1
+AllowOfflineUse=*.jar \u0627\u062f\u0631\u0627\u062c \u0645\u0644\u0641\u0627\u062a \u0627\u0644\u0623\u0631\u0634\u064a\u0641Increasing=\u062a\u0632\u0627\u064a\u062f\u064a\u0629
AllowStyleBar=\u064a\u0633\u0645\u062d \u0644\u0634\u0631\u064a\u0637 \u0627\u0644\u0646\u0645\u0637
Altitude=\u0627\u0644\u0625\u0631\u062a\u0641\u0627\u0639
Angle=\u0632\u0627\u0648\u064a\u0629
@@ -113,7 +112,6 @@ ConstructionProtocolHelp=<html><body><p><b>Utilisation du protocole de construct
ConstructionProtocolNavigation=\u0627\u0628\u062d\u0627\u0631 \u0641\u064a \u0645\u0631\u0627\u062d\u0644 \u0627\u0644\u0628\u0646\u0627\u0621
Coordinates=\u0627\u0644\u0625\u062d\u062f\u0627\u062b\u064a\u0627\u062a
CopyToClipboard=\u0646\u0633\u062e \u0639\u0644\u0649 \u0644\u0648\u062d\u0629 \u0627\u0644\u0645\u0634\u0647\u062f
-CopyToLaTeX=LaTeX\u0646\u0633\u062e \u0646\u062d\u0648CornerPoint=\u0631\u0643\u0646
CornerPoint=\u0631\u0643\u0646
CreatedWith=\u0625\u0646\u062a\u0627\u062c
CreatedWithGeoGebra=GeoGebra \u0627\u0646\u0634\u0627\u0621 \u0628\u0640
@@ -218,7 +216,6 @@ IgnoreDocumentLayout=\u062a\u062c\u0627\u0647\u0644 \u062a\u062e\u0637\u064a\u06
Image=\u0635\u0648\u0631\u0629
ImplicitPoly=\u0645\u0646\u062d\u0649 \u0636\u0645\u0646\u064a
IncircleOfTriangleABC=\u0627\u0644\u062f\u0627\u0626\u0631\u0629 \u0627\u0644\u0645\u062d\u0627\u0637\u0629 \u0628\u0627\u0644\u0645\u062b\u0644\u062b %0%1%2
-IncludeJARFiles=*.jar \u0627\u062f\u0631\u0627\u062c \u0645\u0644\u0641\u0627\u062a \u0627\u0644\u0623\u0631\u0634\u064a\u0641Increasing=\u062a\u0632\u0627\u064a\u062f\u064a\u0629
Increasing=\u062a\u0635\u0627\u0639\u062f\u064a\u0627
IncreasingOnce=(\u0632\u064a\u0627\u062f\u0629 (\u0645\u0631\u0629 \u0648\u0627\u062d\u062f\u0629
Inequality=\u0645\u062a\u0628\u0627\u064a\u0646\u0629
@@ -237,7 +234,7 @@ Interpolate=\u0631\u0633\u0645 \u0628\u0627\u0644\u0625\u0633\u062a\u0643\u0645\
IntersectingLines=\u0642\u0637\u0639 \u0632\u0627\u0626\u062f \u0645\u0646\u062d\u0637
IntersectionCurveOfAB=\u062a\u0642\u0627\u0637\u0639 \u0627\u0644\u0645\u0646\u062d\u064a\u064a\u0646 %0, %1
IntersectionLineOfAB=\u0645\u0633\u062a\u0642\u064a\u0645 \u062a\u0642\u0627\u0637\u0639 %0 \u0648 %1
-IntersectionPathsOfAB=\u062a\u0642\u0627\u0637\u0639 \u0627\u0644\u0637\u0631\u064a\u0642\u064a\u0646 %0, %1
+IntersectionOfAandB=\u062a\u0642\u0627\u0637\u0639 \u0627\u0644\u0637\u0631\u064a\u0642\u064a\u0646 %0, %1
IntersectionPointOfAB=\u0646\u0642\u0637\u0629 \u062a\u0642\u0627\u0637\u0639 %0 \u0648 %1
IntersectionPointOfABNearC=\u0646\u0642\u0637\u0629 \u062a\u0642\u0627\u0637\u0639 %0 \u0648%1 \u0628\u0627\u0644\u0642\u0631\u0628 \u0645\u0646 \u0627\u0644\u0646\u0642\u0637\u0629 %2
IntersectionPointOfABWithInitialValueC=\u0646\u0642\u0637\u0629 \u062a\u0642\u0627\u0637\u0639 %0 \u0648%1 \u0645\u0639 %2 \u0643\u0642\u064a\u0645\u0629 \u0623\u0648\u0644\u0649
@@ -295,7 +292,7 @@ Name.matrix=\u0645\u0635\u0641\u0648\u0641\u0629
Name.picture=\u0635\u0648\u0631\u0629
Name.polygon=\u0645\u0636\u0644\u0639
Name.text=\u0646\u0635
-Name.textfield=\u062d\u0642\u0644 \u0627\u062f\u0631\u0627\u062c \u0646\u0635
+Name.textfield=\u062d\u0642\u0644\u0627\u062f\u0631\u0627\u062c \u0646\u0635
NameAndValue=\u0627\u0644\u0625\u0633\u0645 \u0648 \u0627\u0644\u0642\u064a\u0645\u0629
NewExpression=\u0639\u0628\u0627\u0631\u0629 \u062c\u062f\u064a\u062f\u0629
NewNameForA=\u0627\u0644\u0625\u0633\u0645 \u0627\u0644\u062c\u062f\u064a\u062f \u0644\u0640 %0
@@ -333,11 +330,6 @@ PerspectiveName=\u0625\u0633\u0645 \u0627\u0644\u0645\u0646\u0638\u0648\u0631
Picture=\u0635\u0648\u0631\u0629
PictureHeight=\u0637\u0648\u0644 \u0627\u0644\u0635\u0648\u0631\u0629
PictureWidth=\u0639\u0631\u0636 \u0627\u0644\u0635\u0648\u0631\u0629
-PlaneA=%0 \u0627\u0644\u0645\u0633\u062a\u0648\u064a
-PlaneContainingA=\u0645\u0633\u062a\u0648\u064a \u064a\u062d\u062a\u0648\u064a \u0639\u0644\u064a %0
-PlaneFromA=\u0645\u0633\u062a\u0648 \u0645\u062d\u062f\u062f \u0628\u0640 %0
-PlaneThroughAB=%0 ; %1\u0645\u0633\u062a\u0648\u064a \u064a\u062d\u062a\u0648\u064a \u0639\u0644\u0649
-PlaneThroughABC=%2, %1 et %0 \u0645\u0633\u062a\u0648\u064a \u064a\u0645\u0631 \u0645\u0646
Play=\u0642\u0631\u0627\u0621\u0629
PlayButton=\u0632\u0631 \u0627\u0644\u0642\u0631\u0627\u0621\u0629
Point=\u0646\u0642\u0637\u0629
diff --git a/geogebra/properties/plain_bg.properties b/geogebra/properties/plain_bg.properties
index 0e11c3c..b4a07a1 100644
--- a/geogebra/properties/plain_bg.properties
+++ b/geogebra/properties/plain_bg.properties
@@ -1,11 +1,38 @@
-2x2Matrix=2x2 \u043c\u0430\u0442\u0440\u0438\u0446\u0430
-3x3Matrix=3x3 \u043c\u0430\u0442\u0440\u0438\u0446\u0430
ADecimalPlace=%0 \u0446\u0438\u0444\u0440\u0430 \u0441\u043b\u0435\u0434 \u0434\u0435\u0441. \u0437\u0430\u043f\u0435\u0442\u0430\u044f
ADecimalPlaces=%0 \u0446\u0438\u0444\u0440\u0438 \u0441\u043b\u0435\u0434 \u0434\u0435\u0441. \u0437\u0430\u043f\u0435\u0442\u0430\u044f
+ADerivativeOfB=%0 \u043f\u0440\u043e\u0438\u0437\u0432\u043e\u0434\u043d\u0430 \u043d\u0430 %1
+ADoesNotIntersectWithB=%0 \u043d\u0435 \u0441\u0435 \u043f\u0440\u0435\u0441\u0438\u0447\u0430 \u0441 %1
+AIntersectsWithB=%0 \u043f\u0440\u0435\u0441\u0438\u0447\u0430 \u0441\u0435 \u0441 %1
+AMirroredAtB=%0 \u043e\u0442\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u043d\u0430 %1
+ARotatedByAngleB=%0 \u0437\u0430\u0432\u044a\u0440\u0442\u044f\u043d \u043d\u0430 \u044a\u0433\u044a\u043b %1
+AandBareEqual=%0 \u0438 %1 \u0441\u0430 \u0435\u0434\u043d\u0430\u043a\u0432\u0438
+AandBareLinearlyDependent=%0 \u0438 %1 \u0441\u0430 \u043b\u0438\u043d\u0435\u0439\u043d\u043e \u0437\u0430\u0432\u0438\u0441\u0438\u043c\u0438
+AandBareLinearlyIndependent=%0 \u0438 %1 \u0441\u0430 \u043b\u0438\u043d\u0435\u0439\u043d\u043e \u043d\u0435\u0437\u0430\u0432\u0438\u0441\u0438\u043c\u0438
+AandBareNotEqual=%0 \u0438 %1 \u043d\u0435 \u0441\u0430 \u0435\u0434\u043d\u0430\u043a\u0432\u0438
+AandBareParallel=%0 \u0438 %1 \u0441\u0430 \u0443\u0441\u043f\u043e\u0440\u0435\u0434\u043d\u0438
+AandBarePerpendicular=%0 \u0438 %1 \u0441\u0430 \u043f\u0435\u0440\u043f\u0435\u043d\u0434\u0438\u043a\u0443\u043b\u044f\u0440\u043d\u0438
+AandBcannotBeCompared=%0 \u0438 %1 \u043d\u0435 \u043c\u043e\u0433\u0430\u0442 \u0434\u0430 \u0431\u044a\u0434\u0430\u0442 \u0441\u0440\u0430\u0432\u043d\u0435\u043d\u0438
AbsoluteScreenLocation=\u0410\u0431\u0441\u043e\u043b\u044e\u0442\u043d\u0430 \u043f\u043e\u0437\u0438\u0446\u0438\u044f \u043d\u0430 \u0435\u043a\u0440\u0430\u043d\u0430
+AdoesNotLieOnB=%0 \u043d\u0435\u043b\u0435\u0436\u0438 \u043d\u0430 %1
+AdoesNothaveTheSameAreaAsB=%0 \u043d\u044f\u043c\u0430 \u0441\u044a\u0449\u0430\u0442\u0430 \u043e\u0431\u043b\u0430\u0441\u0442 \u043a\u0430\u0442\u043e %1
+AdoesNothaveTheSameLengthAsB=%0 \u043d\u044f\u043c\u0430 \u0441\u044a\u0449\u0430\u0442\u0430 \u0434\u044a\u043b\u0436\u0438\u043d\u0430 \u043a\u0430\u043a\u0442\u043e %1
+AhasTheSameAreaAsB=%0 \u0438\u043c\u0430 \u0441\u044a\u0449\u0430\u0442\u0430 \u043e\u0431\u043b\u0430\u0441\u0442 \u043a\u0430\u043a\u0442\u043e %1
+AhasTheSameLengthAsB=%0 \u0438\u043c\u0430 \u0441\u044a\u0449\u0430\u0442\u0430 \u0434\u044a\u043b\u0436\u0438\u043d\u0430 \u043a\u0430\u043a\u0442\u043e %1
+AintersectsWithBOnce=%0 \u0441\u0435 \u043f\u0440\u0435\u0441\u0438\u0447\u0430 \u0441 %1 \u0432\u0435\u0434\u043d\u044a\u0436
+AintersectsWithBTwice=%0 \u0441\u0435 \u043f\u0440\u0435\u0441\u0438\u0447\u0430 \u0441 %1 \u043d\u0430 \u0434\u0432\u0435 \u043c\u0435\u0441\u0442\u0430
+AisAnAsymptoteToB=%0 \u0435 \u0430\u0441\u0438\u043c\u043f\u0442\u043e\u0442\u0430 \u043d\u0430 %1
+AisNotDefined=%0 \u043d\u0435 \u0435 \u0434\u0435\u0444\u0438\u043d\u0438\u0440\u0430\u043d
+AisaTangentToB=%0 \u0435 \u0434\u043e\u043f\u0438\u0440\u0430\u0442\u0435\u043b\u043d\u0430 \u043d\u0430 %1
Algebra=\u0410\u043b\u0433\u0435\u0431\u0440\u0430
AlgebraWindow=\u0410\u043b\u0433\u0435\u0431\u0440\u0430 \u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446
+AliesOnB=%0 \u0441\u0435 \u043d\u0430\u043c\u0438\u0440\u0430 \u043d\u0430 %1
Angle=\u042a\u0433\u044a\u043b
+AngleBetweenAB=\u042a\u0433\u044a\u043b \u043c\u0435\u0436\u0434\u0443 %0, %1
+AngleBetweenABC=\u042a\u0433\u044a\u043b \u043c\u0435\u0436\u0434\u0443 %0, %1, %2
+AngleBetweenABCofD=\u042a\u0433\u044a\u043b \u043c\u0435\u0436\u0434\u0443 %0, %1, %2 of %3
+AngleBisectorOfAB=\u042a\u0433\u043b\u043e\u043f\u043e\u043b\u043e\u0432\u044f\u0449\u0430 \u043d\u0430 %0, %1
+AngleBisectorOfABC=\u042a\u0433\u043b\u043e\u043f\u043e\u043b\u043e\u0432\u044f\u0449\u0430 \u043d\u0430 %0, %1, %2
+AngleOfA=\u042a\u0433\u044a\u043b \u043d\u0430 %0
Angles=\u042a\u0433\u043b\u0438
Animating=\u0410\u043d\u0438\u043c\u0430\u0446\u0438\u044f \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0430
Animation=\u0410\u043d\u0438\u043c\u0430\u0446\u0438\u044f
@@ -13,7 +40,9 @@ AnimationSpeed=\u0421\u043a\u043e\u0440\u043e\u0441\u0442
AnimationStep=\u0421\u0442\u044a\u043f\u043a\u0430 \u043d\u0430 \u0434\u0432\u0438\u0436\u0435\u043d\u0438\u0435
Apply=\u041f\u0440\u0438\u043b\u043e\u0436\u0438
Arc=\u0414\u044a\u0433\u0430
+AsymptoteToA=\u0410\u0441\u0438\u043c\u0442\u043e\u0442\u0430 \u043d\u0430 %0
Author=\u0410\u0432\u0442\u043e\u0440
+Automatic=\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u043e
AuxiliaryObject=\u041f\u043e\u043c\u043e\u0449\u0435\u043d \u043e\u0431\u0435\u043a\u0442
AuxiliaryObjects=\u041f\u043e\u043c\u043e\u0449\u043d\u0438 \u043e\u0431\u0435\u043a\u0442\u0438
AxisLabel=\u0418\u043c\u0435 \u043d\u0430 \u043e\u0431\u0435\u043a\u0442\u0430
@@ -26,12 +55,22 @@ BackgroundImage=\u0424\u043e\u043d \u043d\u0430 \u043a\u0430\u0440\u0442\u0438\u
Bold=\u041d\u0430\u0434\u0435\u0431\u0435\u043b\u0435\u043d
Boolean=\u041b\u043e\u0433\u0438\u0447\u0435\u0441\u043a\u0430 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442
Breakpoint=\u041f\u043e\u043a\u0430\u0436\u0438 \u0442\u043e\u0437\u0438 \u043e\u0431\u0435\u043a\u0442
+Button=\u0411\u0443\u0442\u043e\u043d
Cancel=\u041e\u0442\u043c\u0435\u043d\u0438
Caption=\u041d\u0430\u0434\u043f\u0438\u0441
CartesianCoords=\u0414\u0435\u043a\u0430\u0440\u0442\u043e\u0432\u0438 \u043a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u0438
+CellAisNotDefined=\u041a\u043b\u0435\u0442\u043a\u0430\u0442\u0430 %0 \u043d\u0435 \u0435 \u0434\u0435\u0444\u0438\u043d\u0438\u0440\u0430\u043d\u0430
+CenterOfA=\u0426\u0435\u043d\u0442\u044a\u0440 \u043d\u0430 %0
+CentroidOfA=\u0426\u0435\u043d\u0442\u044a\u0440 \u043d\u0430 \u0442\u0435\u0436\u0435\u0441\u0442\u0442\u0430 \u043d\u0430 %0
ChooseColor=\u0418\u0437\u0431\u0435\u0440\u0438 \u0446\u0432\u044f\u0442
ChooseObject=\u0418\u0437\u0431\u0435\u0440\u0438 \u0435\u0434\u0438\u043d \u043e\u0431\u0435\u043a\u0442
Circle=\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442
+CircleThroughABC=\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442 \u043f\u0440\u0435\u0437 %0, %1, %2
+CircleThroughAwithCenterB=\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442 \u043f\u0440\u0435\u0437 %0 \u0441 \u0446\u0435\u043d\u0442\u044a\u0440 %1
+CircleWithCenterARadiusBParallelToC=\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442 \u0441 \u0446\u0435\u043d\u0442\u044a\u0440 %0 \u0438 \u0440\u0430\u0434\u0438\u0443\u0441 %1, \u0443\u0441\u043f\u043e\u0440\u0435\u0434\u043d\u0430 \u043d\u0430 %2
+CircleWithCenterAThroughBAxisParallelToC=\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442 \u0441 \u0446\u0435\u043d\u0442\u044a\u0440 %0 \u0434\u043e %1, axis parallel to %2
+CircleWithCenterAandRadiusB=\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442 \u0441 \u0446\u0435\u043d\u0442\u044a\u0440 %0 \u0438 \u0440\u0430\u0434\u0438\u0443\u0441 %1
+CircleWithCenterAandRadiusBAxisParallelToC=\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442 \u0441 \u0446\u0435\u043d\u0442\u044a\u0440 %0 \u0438 \u0440\u0430\u0434\u0438\u0443\u0441 %1, axis parallel to %2
Color=\u0426\u0432\u044f\u0442
ColorfulConstructionProtocol=\u041a\u043e\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u043e\u043d\u0435\u043d \u043f\u0440\u043e\u0442\u043e\u043a\u043e\u043b \u0441 \u0446\u0432\u0435\u0442\u043e\u0432\u0435
Command=\u041a\u043e\u043c\u0430\u043d\u0434\u0430
@@ -45,6 +84,7 @@ Coordinates=\u041a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u0438
CopyToClipboard=\u041a\u043e\u043f\u0438\u0440\u0430\u0439 \u0432 \u041a\u043b\u0438\u043f\u0431\u043e\u0440\u0434\u0430
CornerPoint=\u042a\u0433\u043b\u043e\u0432\u0430 \u0442\u043e\u0447\u043a\u0430 \u043d\u0430 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0430
CreatedWith=\u0421\u044a\u0437\u0434\u0430\u0434\u0435\u043d \u043e\u0442
+CreatedWithGeoGebra=\u0421\u044a\u0437\u0434\u0430\u0439 \u0441 GeoGebra
Curve=\u041a\u0440\u0438\u0432\u0430
Date=\u0414\u0430\u0442\u0430
Day.1=\u041d\u0435\u0434\u0435\u043b\u044f
@@ -59,13 +99,17 @@ Decreasing=\u041d\u0430\u043c\u0430\u043b\u044f\u0432\u0430
Default=\u041f\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043d\u0435
Definition=\u0414\u0435\u0444\u0438\u043d\u0438\u0446\u0438\u044f
Delete=\u0418\u0437\u0442\u0440\u0438\u0439
+DeleteRowA=\u0418\u0437\u0442\u0440\u0438\u0439 \u0440\u0435\u0434 %0
DependentObjects=\u0417\u0430\u0432\u0438\u0441\u0438\u043c\u0438 \u043e\u0431\u0435\u043a\u0442\u0438
Directrix=\u0414\u0438\u0440\u0435\u043a\u0442\u0440\u0438\u0441\u0430
DisplayPointSymbol=\u041f\u043e\u043a\u0430\u0436\u0438 \u0441\u0438\u043c\u0432\u043e\u043b\u0430 \u0437\u0430 \u0442\u043e\u0447\u043a\u0438\u0442\u0435
+DistanceOfAandB=\u0420\u0430\u0437\u0441\u0442\u043e\u044f\u043d\u0438\u0435 \u043e\u0442 %0 \u0434\u043e %1
DoubleClickToOpen=\u041c\u043e\u0436\u0435\u0442\u0435 \u0434\u0430 \u043e\u0442\u0432\u043e\u0440\u0438\u0442\u0435 \u0444\u0430\u0439\u043b\u0430, \u043a\u0430\u0442\u043e \u043a\u043b\u0438\u043a\u043d\u0435\u0442\u0435 \u0434\u0432\u0430 \u043f\u044a\u0442\u0438 \u0432\u044a\u0440\u0445\u0443 \u0447\u0435\u0440\u0442\u043e\u0436\u043d\u0430\u0442\u0430 \u043f\u043e\u0432\u044a\u0440\u0445\u043d\u043e\u0441\u0442.
DoubleLine=\u0414\u0432\u043e\u0439\u043d\u0430 \u043b\u0438\u043d\u0438\u044f
Down=\u041d\u0430\u0434\u043e\u043b\u0443
DrawingPad=\u0427\u0435\u0440\u0442\u043e\u0436\u043d\u0430 \u043f\u043e\u0432\u044a\u0440\u0445\u043d\u043e\u0441\u0442
+DrawingPad2=\u0427\u0435\u0440\u0442\u043e\u0436\u043d\u0430 \u043f\u043e\u0432\u044a\u0440\u0445\u043d\u043e\u0441\u0442 2
+DrawingPadA=\u0427\u0435\u0440\u0442\u043e\u0436\u043d\u0430 \u043f\u043e\u0432\u044a\u0440\u0445\u043d\u043e\u0441\u0442 %0
DrawingPadAsPSTricks=\u0433\u0440\u0430\u0444\u0438\u043a\u0430\u0442\u0430 \u043a\u0430\u0442\u043e PSTricks
DrawingPadAsPicture=\u0433\u0440\u0430\u0444\u0438\u043a\u0430\u0442\u0430 \u043a\u0430\u0442\u043e \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0430
DrawingPagAsPGF=\u0433\u0440\u0430\u0444\u0438\u043a\u0430\u0442\u0430 \u043a\u0430\u0442\u043e PGF/TikZ
@@ -76,8 +120,15 @@ Ellipse=\u0415\u043b\u0438\u043f\u0441\u0430
EmphasizeRightAngle=\u041f\u043e\u0441\u0442\u0430\u0432\u0438 \u0434\u0435\u0441\u043d\u0438\u044f \u044a\u0433\u044a\u043b
EmptySet=\u041f\u0440\u0430\u0437\u043d\u043e
Equation=\u0423\u0440\u0430\u0432\u043d\u0435\u043d\u0438\u0435
+ErrorInJavaScript=\u0413\u0440\u0435\u0448\u043a\u0430 \u0432 JavaScript
+ErrorInJavaScriptAtLineA=\u0413\u0440\u0435\u0448\u043a\u0430 \u0432 JavaScript \u043d\u0430 %0 \u043b\u0438\u043d\u0438\u044f
+ErrorInScriptAtLineAFromObjectB=\u0413\u0440\u0435\u0448\u043a\u0430 \u0432 \u0441\u043a\u0440\u0438\u043f\u0442\u0430 \u043d\u0430 %0 \u043b\u0438\u043d\u0438\u044f (called from %1)
+ExportAsPicture=\u0415\u043a\u0441\u043f\u043e\u0440\u0442\u0438\u0440\u0430\u0439 \u043a\u0430\u0442\u043e \u041a\u0430\u0440\u0442\u0438\u043d\u043a\u0430
ExportAsWebpage=\u0415\u043a\u0441\u043f\u043e\u0440\u0442\u0438\u0440\u0430\u0439 \u043a\u0430\u0442\u043e web \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430
ExportTextAsShapes=\u0415\u043a\u0441\u043f\u043e\u0440\u0442\u0438\u0440\u0430\u0439 \u0442\u0435\u043a\u0441\u0442\u0430 \u043a\u0430\u0442\u043e \u043a\u0440\u0438\u0432\u0438
+ExtremumOfA=\u0415\u043a\u0441\u0442\u0440\u0435\u043c\u0443\u043c \u043d\u0430 %0
+File.HTML=\u0424\u0430\u0439\u043b: html
+File.SCORM=\u0424\u0430\u0439\u043b: SCORM
Filling=\u041f\u0440\u043e\u0437\u0440\u0430\u0447\u043d\u043e\u0441\u0442
Finish=\u041a\u0440\u0430\u0439
FixCheckbox=\u0424\u0438\u043a\u0441\u0438\u0440\u0430\u0439 checkbox-a
@@ -86,6 +137,8 @@ ForceGnuplotPgf=\u0418\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0439 Gnuplot \
Format=\u0424\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u0439
FreeObjects=\u0421\u0432\u043e\u0431\u043e\u0434\u043d\u0438 \u043e\u0431\u0435\u043a\u0442\u0438
Function=\u0424\u0443\u043d\u043a\u0446\u0438\u044f
+FunctionAonIntervalBC=\u0424\u0443\u043d\u043a\u0446\u0438\u044f\u0442\u0430 %0 \u0432 \u0438\u043d\u0442\u0435\u0440\u0432\u0430\u043b\u0430 [%1, %2]
+FunctionNVar=\u0424\u0443\u043d\u043a\u0446\u0438\u044f
GeneratePgf=\u0413\u0435\u043d\u0435\u0440\u0438\u0440\u0430\u0439 PGF/TikZ \u043a\u043e\u0434\u0430
GeneratePstricks=\u0413\u0435\u043d\u0435\u0440\u0438\u0440\u0430\u0439 PSTricks \u043a\u043e\u0434\u0430
GeometricObjects=\u0413\u0435\u043e\u043c\u0435\u0442\u0440\u0438\u0447\u043d\u0438 \u043e\u0431\u0435\u043a\u0442\u0438
@@ -112,14 +165,21 @@ IntersectingLines=\u041f\u0440\u0435\u0441\u0438\u0447\u0430\u0449\u0438 \u0441\
IntersectionPointOfAB=\u041f\u0440\u0435\u0441\u0435\u0447\u043d\u0430 \u0442\u043e\u0447\u043a\u0430 \u043d\u0430 %0, %1
Interval=\u0418\u043d\u0442\u0435\u0440\u0432\u0430\u043b
Italic=\u041a\u0443\u0440\u0441\u0438\u0432
+Keyboard=\u041a\u043b\u0430\u0432\u0438\u0430\u0442\u0443\u0440\u0430
LaTeXFormula=LaTeX \u0444\u043e\u0440\u043c\u0443\u043b\u0430
+LaTeXHelp=\u041f\u043e\u043c\u043e\u0449 Latex
LatexFontSize=\u0420\u0430\u0437\u043c\u0435\u0440 \u043d\u0430 LaTeX \u0442\u0435\u043a\u0441\u0442\u0430
Layer=\u0421\u043b\u043e\u0439
Length=\u0414\u044a\u043b\u0436\u0438\u043d\u0430
LengthOfA=\u0414\u044a\u043b\u0436\u0438\u043d\u0430 \u043d\u0430 %0
Lengths=\u0414\u044a\u043b\u0436\u0438\u043d\u0438
Line=\u041f\u0440\u0430\u0432\u0430
+LineBisectorOfA=\u042a\u0433\u043b\u043e\u043f\u043e\u043b\u043e\u0432\u044f\u0449\u0430 %0
LineStyle=\u0421\u0442\u0438\u043b \u043d\u0430 \u043f\u0440\u0430\u0432\u0430\u0442\u0430
+LineThroughAB=\u041f\u0440\u0430\u0432\u0430 \u043f\u0440\u0435\u0437 %0, %1
+LineThroughAParallelToB=\u041f\u0440\u0430\u0432\u0430 \u043f\u0440\u0435\u0437 %0 \u0443\u0441\u043f\u043e\u0440\u0435\u0434\u043d\u0430 \u043d\u0430 %1
+LineThroughAPerpendicularToB=\u041f\u0440\u0430\u0432\u0430 \u043f\u0440\u0435\u0437 %0 \u043f\u0435\u0440\u043f\u0435\u043d\u0434\u0438\u043a\u0443\u043b\u044f\u0440\u043d\u0430 \u043d\u0430 %1
+LineThroughAwithDirectionB=\u041f\u0440\u0430\u0432\u0430 \u043f\u0440\u0435\u0437 %0 \u0441 \u043d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 %1
LinearInequality=\u041b\u0438\u043d\u0435\u0439\u043d\u043e \u043d\u0435\u0440\u0430\u0432\u0435\u043d\u0441\u0442\u0432\u043e
Lines=\u041f\u0440\u0430\u0432\u0438
List=\u0421\u043f\u0438\u0441\u044a\u043a
@@ -140,6 +200,7 @@ Month.7=\u042e\u043b\u0438
Month.8=\u0410\u0432\u0433\u0443\u0441\u0442
Month.9=\u0421\u0435\u043f\u0442\u0435\u043c\u0432\u0440\u0438
Name=\u0418\u043c\u0435
+Name.button=\u0431\u0443\u0442\u043e\u043d
Name.list=\u0441\u043f\u0438\u0441\u044a\u043a
Name.locus=\u041b\u043e\u0442\u043e\u0441
Name.matrix=\u043c\u0430\u0442\u0440\u0438\u0446\u0430
@@ -147,6 +208,8 @@ Name.picture=\u0441\u043d\u0438\u043c\u043a\u0430
Name.polygon=\u043c\u043d\u043e\u0433\u043e\u044a\u0433\u044a\u043b\u043d\u0438\u043a
Name.text=\u0442\u0435\u043a\u0441\u0442
NameAndValue=\u0418\u043c\u0435 \u0438 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442
+NewNameForA=\u041d\u043e\u0432\u043e \u0438\u043c\u0435 \u043d\u0430 %0
+NewerVersionA=\u041d\u043e\u0432\u0430 \u0432\u0435\u0440\u0441\u0438\u044f \u043d\u0430 GeoGebra \u0435 \u043d\u0430 \u0440\u0430\u0437\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435.\n\u0411\u0438\u0445\u0442\u0435 \u043b\u0438 \u0436\u0435\u043b\u0430\u043b\u0438 \u0434\u0430 \u043f\u043e\u043b\u0437\u0432\u0430\u0442\u0435 \u043d\u043e\u0432\u0430\u0442\u0430 GeoGebra %0 \u0441\u0435\u0433\u0430?
Next=\u0421\u043b\u0435\u0434\u0432\u0430\u0449
NextCell=\u0421\u043b\u0435\u0434\u0432\u0430\u0449\u0430 \u043a\u043b\u0435\u0442\u043a\u0430
No.=\u041d\u043e\u043c\u0435\u0440
diff --git a/geogebra/properties/plain_bs.properties b/geogebra/properties/plain_bs.properties
index 8791a17..9d2128b 100644
--- a/geogebra/properties/plain_bs.properties
+++ b/geogebra/properties/plain_bs.properties
@@ -1,16 +1,14 @@
-2x2Matrix=2 x 2 matrica
-3x3Matrix=3 x 3 matrica
-ADecimalPlace=%0 decim. mjesto
-ADecimalPlaces=%0 decim. mjesta
+ADecimalPlace=%0 decimalno mjesto
+ADecimalPlaces=%0 decimalna/ih mjesta
ADerivativeOfB=%0 izvod od %1
ADilatedByFactorBfromC=%0 homotetija za faktor %1 iz %2
-ADoesNotIntersectWithB=%0 i %1 nemaju presje\u010dnih ta\u010daka
-AGray=%0 Siva
+ADoesNotIntersectWithB=%0 nema presje\u010dnih ta\u010daka s %1
+AGray=%0 siva
AIntersectsWithB=%0 sje\u010de %1
AMirroredAtB=%0 simetri\u010dna s %1
ARotatedByAngleB=%0 rotirana za ugao %1
ASignificantFigure=%0 decimala
-ASignificantFigures=%0 decimale
+ASignificantFigures=%0 decimala/e
AandBareEqual=%0 i %1 su podudarne
AandBareLinearlyDependent=%0 i %1 su linearno zavisni
AandBareLinearlyIndependent=%0 i %1 su linearno nezavisni
@@ -18,7 +16,7 @@ AandBareNotEqual=%0 i %1 nisu podudarne
AandBareParallel=%0 i %1 su paralelne
AandBarePerpendicular=%0 i %1 su normalne
AandBcannotBeCompared=%0 i %1 se ne mogu uporediti
-AbsoluteScreenLocation=Apsolutna pozicija na ekranu
+AbsoluteScreenLocation=apsolutna pozicija na ekranu
AdoesNotLieOnB=%0 ne le\u017ei na %1
AdoesNotLieOnThePerimeterOfB=%0 ne le\u017ei na povr\u0161ini %1
AdoesNothaveTheSameAreaAsB=%0 i %1 nemaju jednake povr\u0161ine
@@ -28,14 +26,14 @@ AhasTheSameLengthAsB=%0 i %1 imaju jednake du\u017eine
AintersectsWithBOnce=%0 i %1 imaju jednu presje\u010dnu ta\u010dku
AintersectsWithBTwice=%0 i %1 imaju dvije presje\u010dne ta\u010dke
AisAnAsymptoteToB=%0 je asimptota od %1
-AisNotDefined=%0 nije definisana
+AisNotDefined=%0 nije definirano/a
AisaDegenerateBranchOfB=%0 je degenerirani slu\u010daj od %1
AisaTangentToB=%0 je tangenta od %1
AlgebraWindow=Algebarski prikaz
AliesOnB=%0 le\u017ei na %1
AliesOnThePerimeterOfB=%0 le\u017ei na povr\u0161ini %1
-AllowStyleBar=Stil alatna traka je omogu\u0107ena
-AltGr=AltGr
+AllowOfflineUse=Uklju\u010di *.jar datoteke
+AllowStyleBar=Prika\u017ei Stil alatnu traku
Altitude=Visina
Angle=Ugao
AngleBetweenAB=Ugao odre\u0111en sa %0, %1
@@ -45,7 +43,7 @@ AngleBisectorOfAB=Simetrala ugla odre\u0111enog sa %0, %1
AngleBisectorOfABC=Simetrala ugla odre\u0111enog sa %0, %1, %2
AngleOfA=Ugao %0
Angles=Uglovi
-AnimatedGIFExport=Animarani GIF Prenos
+AnimatedGIFExport=Prenos animirane GIF datoteke
Animating=Animiraj
Animation=Animacija
AnimationLoop=Kao petlja?
@@ -54,7 +52,7 @@ AnimationStep=Korak
Apply=Primjeni
Arc=Luk
AsymptoteToA=Asimptota od %0
-Ath=%0-ti
+Ath=%0.
Author=Autor
Automatic=Automatski
AuxiliaryObject=Pomo\u0107na figura
@@ -66,36 +64,37 @@ AxisUnitLabel=Jedini\u010dna du\u017eina
Back=Nazad
BackgroundColor=Boja pozadine
BackgroundImage=Pozadinska slika
-Boolean=Boolean vrijednost
+Boolean=Boolean/logi\u010dka vrijednost
Breakpoint=Kontrolna ta\u010dka
Button=Dugme
-CASInitializing=CAS Pokretanje
+CASInitializing=CAS Inicijalizacija
CASTimedOut=CAS vrijeme je isteklo
Cancel=Poni\u0161ti
Caption=Naslov
CartesianCoords=Descartes-ove koordinate
-CasTimeout=CAS Vrijeme ( u sekundama)
+CasTimeout=CAS vremensko ograni\u010denje(u sekundama)
CellAisNotDefined=\u0106elija %0 nije definirana
CenterOfA=Centar od %0
CentroidOfA=Te\u017ei\u0161te od %0
-CheckedNumerically=(provjereno numeri\u010dki)
+CheckedNumerically=(numeri\u010dki provjereno)
ChooseColor=Izaberi boju
ChooseObject=Izaberi figuru
Circle=Kru\u017enica
+CircleEquation=(x - p)² + (y - q)² = r²
CircleOfAxisAThroughB=Kru\u017enica odre\u0111ena s osom %0 kroz %1
CircleThroughABC=Kru\u017enica odre\u0111ena sa %0, %1, %2
CircleThroughAwithCenterB=Kru\u017enica odre\u0111ena centrom %1 i ta\u010dkom %0 na kru\u017enici
-CircleWithCenterARadiusBParallelToC=Kru\u017enica odre\u0111ena centrom %0 i polupre\u010dnikom%1, paralelno s %2
-CircleWithCenterAThroughBAxisParallelToC=Kru\u017enica odre\u0111ena centrom %0 kroz ta\u010dku %1, ose paralelne s %2
-CircleWithCenterAThroughBParallelToC=Kru\u017enica odre\u0111ena centrom %0 kroz ta\u010dku %1, paralelno s %2
+CircleWithCenterARadiusBParallelToC=Kru\u017enica odre\u0111ena centrom %0 i polupre\u010dnikom %1, paralelno sa %2
+CircleWithCenterAThroughBAxisParallelToC=Kru\u017enica odre\u0111ena centrom %0 kroz ta\u010dku %1, ose paralelne sa %2
+CircleWithCenterAThroughBParallelToC=Kru\u017enica odre\u0111ena centrom %0 kroz ta\u010dku %1, paralelno sa %2
CircleWithCenterAandRadiusB=Kru\u017enica odre\u0111ena centrom %0 i polupre\u010dnikom %1
-CircleWithCenterAandRadiusBAxisParallelToC=Kru\u017enica odre\u0111ena centrom %0 i polupre\u010dnikom %1, ose paralelne s %2
-Clipboard.Blackboard=Me\u0111uspremnik: Blackboard
+CircleWithCenterAandRadiusBAxisParallelToC=Kru\u017enica odre\u0111ena centrom %0 i polupre\u010dnikom %1, ose paralelne sa %2
+Clipboard.Blackboard=Radna memorija: Blackboard
Clipboard.Google=Radna memorija: Google Gadget
Clipboard.HTML=Radna memorija: html
Clipboard.MediaWiki=Radna memorija: MediaWiki
Clipboard.Moodle=Radna memorija: Moodle
-Clipboard.iframe=Me\u0111uspremnik: <iframe>
+Clipboard.iframe=Radna memorija: <iframe>
Color=Boja
ColorfulConstructionProtocol=Opis konstrukcije u boji
Command=Naredba
@@ -107,15 +106,14 @@ ConicThroughABCDE=Konika odre\u0111ena sa %0, %1, %2, %3, %4
Conics=Konike
ConstructionProtocol=Opis konstrukcije
ConstructionProtocolButton=Dugme za opis konstrukcije
-ConstructionProtocolHelp=<html><body><p><b>Opis konstrukcije</b></p><p><br><b>Tastatura</b></p><table border="1"><tr><td>↑</td><td>Prethodni korak konstrukcije</td></tr><tr><td>↓</td><td>Sljede\u0107i korak konstrukcije</td></tr><tr><td>Home</td><td>Start konstrukcije</td></tr><tr><td>End</td><td>Kraj konstrukcije</td></tr><tr><td>Delete</td><td>Brisanje koraka konstrukcije</td></tr></table><p><b><br>Mi\u0161</b></p><table border="1"><tr><td>Dvostruki klik na red</td><td>Izbor koraka konstrukcije</td></tr><tr><td>Dvostruki klik na naslov</td><td>Po\u010detak konstrukcije</td></tr><tr><td>Povla\u010denje i spu\u0161tanje reda</td><td>Pomjeranje reda konstrukcije</td></tr><tr><td>Desni klik na red</td><td>Izbornik</td></tr></table><body></html>
+ConstructionProtocolHelp=<html><body><p><b>Opis konstrukcije</b></p><p><br><b>Tastatura</b></p><table border="1"><tr><td>\u2191</td><td>Prethodni korak konstrukcije</td></tr><tr><td>\u2193</td><td>Sljede\u0107i korak konstrukcije</td></tr><tr><td>Home</td><td>Start konstrukcije</td></tr><tr><td>End</td><td>Kraj konstrukcije</td></tr><tr><td>Delete</td><td>Brisanje koraka konstrukcije</td></tr></table><p><b><br>Mi\u0161</b></p><table border="1"><tr><td>Dvostruki klik na red</td><td>Izbor koraka konstrukcije</td></tr><tr><td>Dvostruki klik na naslov</td><td>Po\u010detak konstrukcije</td></tr><tr><td>Povla\u010denje i spu\u0161tanje reda</td><td>Pomjeranje reda konstrukcije</td></tr><tr><td>Desni klik na red</td><td>Izbornik</td></tr></table><body></html>
ConstructionProtocolNavigation=Traka za korake konstrukcije
Coordinates=Koordinate
CopyToClipboard=Kopiraj u radnu memoriju
-CopyToLaTeX=Kopiraj u LaTex
CornerPoint=Ugao
CreatedWith=Kreirano u programu
-CreatedWithGeoGebra=Kreirano GeoGebrom
-CrossAt=Unakrsno
+CreatedWithGeoGebra=Kreirano programom GeoGebra
+CrossAt=Presjek u
Curve=Kriva
Date=Datum
Day.1=Nedjelja
@@ -127,21 +125,21 @@ Day.6=Petak
Day.7=Subota
Decoration=Dekoracija
Decreasing=Opadaju\u0107i
-Default=Standard
+Default=Standardno
DefaultPointStyle=Standardni izgled ta\u010dke
-Defaults=Standardni
+Defaults=Osnovne postavke
Definition=Definicija
Delete=Brisanje
DeleteRowA=Bri\u0161i red %0
DeleteRowsAtoB=Bri\u0161i redove od %0 do %1
DependentObjects=Zavisne figure
DerivativeOfA=Izvod od %0
-DiameterOfAConjugateToB=Dijametar od %0 konjugiran s %1
+DiameterOfAConjugateToB=Konjugirani pre\u010dnik od %0 konjugiran s %1
Dimensions=Dimenzije
DirectionOfA=Smjer od %0
Directrix=Direktrisa
DirectrixOfA=Direktrisa od %0
-Display=Prikaz
+Display=Prika\u017ei
DisplayPointSymbol=Prika\u017ei simbole za ta\u010dke
DistanceOfAandB=Udaljenost izme\u0111u %0 i %1
DoubleClickToOpen=Dvostruki klik mi\u0161a otvara prozor programa
@@ -149,17 +147,18 @@ DoubleLine=Dvostruka prava
Down=Dolje
DrawingPad=Radna povr\u0161
DrawingPad2=Radna povr\u0161 2
-DrawingPadA=Graf %0
+DrawingPadA=Grafi\u010dki prikaz %0
DrawingPadAsPSTricks=Radna povr\u0161 kao PSTricks
DrawingPadAsPicture=Radna povr\u0161 kao slika
DrawingPagAsPGF=Radna povr\u0161 kao PGF/TikZ
-DynamicCoordinatesOfA=Dinami\u010dne koordinate od %0
-DynamicWorksheet=Dinami\u010dni crte\u017e
-DynamicWorksheetAsWebpage=Dinami\u010dni crte\u017e kao web-stranica
-DynamicWorksheetExport=Dinami\u010dni crte\u017e Prenos (html)
+DynamicCoordinatesOfA=Dinami\u010dke koordinate od %0
+DynamicWorksheet=Dinami\u010dki radni list
+DynamicWorksheetAsWebpage=Dinami\u010dki radni list kao Web-stranica
+DynamicWorksheetExport=Prenos dinami\u010dkog radnog lista(html)
EccentricityOfA=Ekscentricitet od %0
Edit=Ure\u0111enje
Ellipse=Elipsa
+EllipseEquation=(x - p)² / a² + (y - q)² / b² = 1
EllipseWithFociABPassingThroughC=Elipsa odre\u0111ena fokusima %0, %1 i ta\u010dkom %2 na elipsi
EllipseWithFociABandFirstAxisLengthC=Elipsa odre\u0111ena fokusima %0, %1 i du\u017einom %2 glavne ose elipse
EmphasizeRightAngle=Istakni pravi ugao
@@ -168,13 +167,13 @@ EnableScripting=Omogu\u0107i skriptiranje
Equation=Jedna\u010dina
ErrorInJavaScript=Gre\u0161ka u JavaScriptu
ErrorInJavaScriptAtLineA=Gre\u0161ka u JavaScriptu linija %0
-ErrorInScriptAtLineAFromObjectB=Gre\u0161ka u skriptu linija %0 ( od %1)
+ErrorInScriptAtLineAFromObjectB=Gre\u0161ka u skriptu linija %0 (od %1)
ExplicitLineEquation=y =k x + n
ExplicitLineGradient=k
ExportAnimatedGIF=Radna povr\u0161 kao animirani GIF
-ExportAsPicture=Prenos kao slika
-ExportAsWebpage=Prenos kao web-stranica
-ExportTextAsShapes=Prenos teksta kao grafike
+ExportAsPicture=Prenos kao slike
+ExportAsWebpage=Prenos kao Web-stranice
+ExportTextAsShapes=Prenos teksta kao okvira
ExtendedForm=Pro\u0161irena forma
ExtraLarge=Ekstra veliko
ExtraSmall=Ekstra malo
@@ -200,7 +199,7 @@ GeometricObjects=Geometrijske figure
GlobalJavaScript=JavaScript
GoToDownloadPage=Idi na stranicu za preuzimanje.
GraphicsViewAsAsymptote=Radna povr\u0161 kao Asymptote
-GreekCharacterA=Gr\u010dki karakter: %0
+GreekCharacterA=Gr\u010dko slovo: %0
GridType=Tip mre\u017ee
Height=Visina
Hexagon=\u0160esterougao
@@ -208,24 +207,24 @@ Hide=Sakrij
Home=Po\u010detak
HorizontalSplit=Rasporedi horizontalno
Hyperbola=Hiperbola
+HyperbolaEquation=(x - p)² / a² - (y - q)² / b² = 1
HyperbolaWithFociABPassingThroughC=Hiperbola odre\u0111ena fokusima %0, %1 i ta\u010dkom %2 na hiperboli
HyperbolaWithFociABandFirstAxisLengthC=Hiperbola odre\u0111ena fokusima %0, %1 i du\u017einom %2 glavne ose hiperbole
IgnoreDocumentLayout=Ignori\u0161i dizajn dokumenta
Image=Slika
-ImplicitPoly=Implicitna Kriva
+ImplicitPoly=Implicitna kriva
IncircleOfTriangleABC=Upisana kru\u017enica trougla %0%1%2
-IncludeJARFiles=Uklju\u010di *.jar datoteke
Increasing=Rastu\u0107i
-IncreasingOnce=Strogo rastu\u0107i
+IncreasingOnce=Rastu\u0107i(jedanput)
Inequality=Nejedna\u010dina
InflectionPointofA=Ta\u010dka prevoja od %0
-InputFieldHelp=<html><body><p><b>Upotreba polja za unos</b></p><table border="1"><tr><td>Enter </td><td>Izvedi naredbu</td></tr><tr><td>Escape</td><td>O\u010disti polje za unos</td></tr><tr><td>↑</td><td>Posljednji unos</td></tr><tr><td>↓</td><td>Sljede\u0107i unos</td></tr><tr><td>F1</td><td>Pomo\u0107 za teku\u0107u naredbu</td></tr></table><p><br><b>Automatska dopuna naredbe</b><br>Poslije ukucavanja prvih nekoliko slova<br>program GeoGebra \u0107e prikazati naredbu.</p><table border="1"><tr><td>Enter </td><td>Prihvati prijedlog naredbe</td></tr><tr><td>Drugo slovo</td><td>Prilagodi prijedlog naredbe</td></tr></table><body></html>
+InputFieldHelp=<html><body><p><b>Upotreba polja za unos</b></p><table border="1"><tr><td>Enter </td><td>Izvodi naredbu</td></tr><tr><td>Escape</td><td>\u010cisti traku za unos</td></tr><tr><td>\u2191</td><td>Posljednji unos</td></tr><tr><td>\u2193</td><td>Sljede\u0107i unos</td></tr><tr><td>F1</td><td>Pomo\u0107 za trenutnu naredbu</td></tr></table><p><br><b>Automatska dopuna naredbe</b><br>Poslije unosa prvih nekoliko slova<br>program GeoGebra \u0107e prikazati naredbu.</p><table border="1"><tr><td>Enter </td><td>Prihvati prijedlog naredbe</td></tr><tr><td>Drugo slovo</td><td>Prilagodi prijedlog naredbe</td></tr></table><body></html>
InputForm=Forma unosa
InputLabel=Unos
-InputLabelToolTip=Unesite naredbu
+InputLabelToolTip=Tip naredbe
Insert=Ubaci
-InsertPictureOfAllOpenViews=Ubaci sliku
-InsertPictureOfConstruction=Ubaci crte\u017e konstrukcije
+InsertPictureOfAllOpenViews=Ubaci sliku u sve otvorene prikaze
+InsertPictureOfConstruction=Ubaci sliku radne povr\u0161i
Integer=Cijeli broj
IntegralOfA=Integral %0
IntegralOfAfromBtoC=Integral %0 od %1 do %2
@@ -233,42 +232,41 @@ Interpolate=Nacrtaj s interpolacijom
IntersectingLines=Presje\u010dne prave
IntersectionCurveOfAB=Presje\u010dna kriva od %0, %1
IntersectionLineOfAB=Presje\u010dna prava od %0, %1
-IntersectionPathsOfAB=Presje\u010dne putanje od %0,%1
+IntersectionOfAandB=Presje\u010dna putanja od %0 i %1
IntersectionPointOfAB=Presje\u010dne ta\u010dke od %0, %1
IntersectionPointOfABNearC=Presje\u010dna ta\u010dka od %0, %1 blizu ta\u010dke %2
IntersectionPointOfABWithInitialValueC=Presje\u010dna ta\u010dka od %0, %1 s po\u010detnom vrijedno\u0161\u0107u %2
-InverseFilling=Inverz Ispune
-Italic=Kurziv
+InverseFilling=Inverzna ispuna
Keyboard=Tastatura
-LaTeXHelp=Latex pomo\u0107
+LaTeXHelp=Latex-Pomo\u0107
Large=Veliko
-LatexFontSize=Veli\u010dina slova
+LatexFontSize=Veli\u010dina LaTeX slova:
Layer=Sloj
Length=Du\u017eina
LengthOfA=Du\u017eina od %0
Lengths=Du\u017eine
Line=Prava
LineBisectorAB=Simetrala odsje\u010dka izme\u0111u %0 i %1
-LineBisectorOfA=Simetrala %0
+LineBisectorOfA=Simetrala du\u017ei %0
LineStyle=Vrsta linije
-LineThroughAB=Prava odre\u0111ena s %0 i %1
-LineThroughAParallelToB=Prava kroz %0 paralelna s %1
+LineThroughAB=Prava odre\u0111ena sa %0 i %1
+LineThroughAParallelToB=Prava kroz %0 paralelna sa %1
LineThroughAPerpendicularToB=Prava kroz %0 normalna na %1
-LineThroughAwithDirectionB=Prava kroz %0 s smjerom %1
+LineThroughAwithDirectionB=Prava kroz %0 sa smjerom %1
LinearEccentricityOfA=Linearni ekscentritet od %0
LinearInequality=Linearna nejedna\u010dina
Lines=Prave
LinkedObject=Povezane figure
List=Lista
-LocalizedDigits=Koristi lokalne cifre
-LocalizedLabels=Koristi lokalna imena ta\u010daka
+LocalizedDigits=Koristi lokalizirane cifre
+LocalizedLabels=Koristi lokalizirana imena ta\u010daka
LockObject=Zaklju\u010daj figuru
Locus=Lokus
Medium=Srednje
Midpoint=Sredi\u0161te
MidpointOfA=Sredi\u0161te od %0
MidpointOfAB=Sredi\u0161te odsje\u010dka izme\u0111u %0 i %1
-Miscellaneous=Razli\u010dito
+Miscellaneous=Razno
Month.1=Januar
Month.10=Oktobar
Month.11=Novembar
@@ -292,24 +290,24 @@ Name.textfield=tekstpolje
NameAndValue=Ime&Vrijednost
NewExpression=Novi izraz
NewNameForA=Novo ime za %0
-NewerVersionA=Najnovija verzija GeoGebre je dostupna.\n\u017delite li dobiti GeoGebru %0 sada?
+NewerVersionA=Najnovija verzija GeoGebre je dostupna.\n\u017delite li preuzeti GeoGebra %0?
Next=Sljede\u0107e
NextCell=Sljede\u0107a \u0107elija
No.=Br.
-NoJavaMessage=Ovaj je Java Aplet kreiran pomo\u0107u GeoGebre, www.geogebra.org - ako nemate instaliran program Java, mo\u017eete ga preuzeti s www.java.com
+NoJavaMessage=Ovaj je Java Aplet kreiran pomo\u0107u GeoGebre, www.geogebra.org-ako nemate instaliran program Java, mo\u017eete ga preuzeti sa www.java.com
NotAvailable=Nedostupno
-NotIncluded=nije uklju\u010deno
+NotIncluded=Nije uklju\u010deno
Numeric=Broj
NumericObjects=Numeri\u010dke figure
Objects=Figure
Off=Isklju\u010deno
OldExpression=Stari izraz
On=Uklju\u010deno
-OnClick=na klik
-OnMouseOver=pokretanjem mi\u0161a
+OnClick=Na klik
+OnMouseOver=Pokretanjem mi\u0161a
OnUpdate=Nadogradnja
Open=Otvori
-OpenButton=Dugme za otvaranje aplikacijskog prozora
+OpenButton=Dugme za otvaranje GeoGebra prozora
Oscillating=Oscilacija
OverwriteFile=\u017delite li zamijeniti postoje\u0107u datoteku?
PGFExport.Grayscale=Siva skala
@@ -324,26 +322,20 @@ PerspectiveName=Naziv perspektive
Picture=Slika
PictureHeight=Visina slike
PictureWidth=\u0160irina slike
-PlaneA=ravan %0
-PlaneContainingA=Ravan sadr\u017ei %0
-PlaneFromA=ravan kreirana s %0
-PlaneThroughAB=Ravan kroz %0, %1
-PlaneThroughABC=Ravan kroz %0, %1, %2
-PlaneThroughAParallelToB=Ravan kroz %0 paralelno s %1
Play=Pokreni
PlayButton=Dugme za pokretanje
Point=Ta\u010dka
PointAplusB=Ta\u010dka %0 + %1
PointDep=Zavisna
-PointFree=Slobodna
+PointFree=Nezavisna
PointInA=Ta\u010dka u %0
-PointInside=U Regionu
+PointInside=U regionu
PointOn=Ta\u010dka na
PointOnA=Ta\u010dka na %0
-PointOnAClosestToB=Ta\u010dka na %0 najbli\u017ea s %1
+PointOnAClosestToB=Ta\u010dka na %0 najbli\u017ea sa %1
PointOnPath=Na putanji
PointSize=Veli\u010dina ta\u010dke
-Points=Ta\u010dke
+Points=Tjemena
PolarCoords=Polarne koordinate
PolarLineOfARelativeToB=Polara %0 u odnosu na %1
PolyLine=Mnogougaona linija
@@ -351,28 +343,28 @@ Polygon=Mnogougao
PositiveDirectionOnly=Samo pozitivan smjer
PositiveValuesFollowTheView=Pozitivne vrijednosti slijede prikaz
PreviewUnavailable=Prikaz nije mogu\u0107
-ProbabilityCalculator=Kalkulator Vjerovatno\u0107e
+ProbabilityCalculator=Kalkulator vjerovatno\u0107e
Properties=Osobine
Quadrangle=\u010cetverougao
-Quadrilateral=\u010cetverougaoni
+Quadrilateral=\u010cetverougao
Question=Pitanje
Radius=Polupre\u010dnik
-RadiusOfA=Polupre\u010dnik %0
+RadiusOfA=Polupre\u010dnik od %0
Random=Slu\u010dajna
-Range=Rang
+Range=Kodomen
Ray=Poluprava
-RayThroughAB=Poluprava odre\u0111ena %0 i %1
-RayThroughAWithDirectionB=Poluprava kroz %0 s smjerom %1
+RayThroughAB=Poluprava odre\u0111ena sa %0 i %1
+RayThroughAWithDirectionB=Poluprava kroz %0 sa smjerom %1
Redefine=Redefiniranje
Remove=Ukloni
Rename=Preimenovanje
Repeat=Ponovi
-ResizeAngle=Automatska veli\u010dina uglova
+ResizeAngle=Automatski mijenjaj veli\u010dinu ugla
ResolutionInDPI=Rezolucija u dpi
-ReverseMouseWheel=okretanje unatrag kota\u010di\u0107a mi\u0161a
-RootOfA=Nula %0
-RootOfAWithInitialValueB=Nule %0 sa po\u010detnom vrijedno\u0161\u0107u %1
-RootOfAonIntervalBC=Nule %0 na intervalu [%1, %2]
+ReverseMouseWheel=Obrni smjer kota\u010di\u0107a mi\u0161a
+RootOfA=Nule od %0
+RootOfAWithInitialValueB=Nule od %0 s po\u010detnom vrijedno\u0161\u0107u %1
+RootOfAonIntervalBC=Nule od %0 na intervalu [%1, %2]
ScaleInCentimeter=Skala u cm
Scripting=Skriptiranje
SecondAxisLengthOfA=Du\u017eina sporedne poluose %0
@@ -380,11 +372,11 @@ SecondAxisOfA=Sporedna poluosa %0
Sector=Isje\u010dak
Segment=Du\u017e
SegmentAB=Du\u017e [%0, %1]
-SegmentABofC=Stranica [%0, %1] od %2
+SegmentABofC=Du\u017e [%0, %1] od %2
Selection=Ozna\u010davanje
-SelectionAllowed=Dopu\u0161teno ozna\u010davanje
+SelectionAllowed=Omogu\u0107i ozna\u010davanje
Semicircle=Polukru\u017enica
-SemicircleThroughAandB=Polukru\u017enica odre\u0111ena %0 i %1
+SemicircleThroughAandB=Polukru\u017enica odre\u0111ena sa %0 i %1
Show=Prika\u017ei
ShowAllObjects=Prika\u017ei sve figure
ShowAutomatically=Automatski prikaz
@@ -398,28 +390,28 @@ ShowOnlineHelp=Prika\u017ei online pomo\u0107
ShowOnlyBreakpoints=Prika\u017ei samo kontrolne ta\u010dke
ShowTitleBar=Prika\u017ei traku za naslov
ShowTrace=Prika\u017ei trag
-ShowTrimmed=Prika\u017ei reduicirane prave oko njihovog presjeka
+ShowTrimmed=Prika\u017ei reducirane linije
ShowxAxis=Prika\u017ei x-osu
ShowyAxis=Prika\u017ei y-osu
-SimpleFormulas=Proste Formule
+SimpleFormulas=Proste formule
Size=Veli\u010dina
Slider=Kliza\u010d
SlopeOfA=Nagib od %0
Small=Malo
Speed=Brzina
SphereThroughAwithCenterB=Sfera kroz %0 s centrom %1
-SphereWithCenterAandRadiusB=Sfera s centrom %0 i polupre\u010dnikom %1
+SphereWithCenterAandRadiusB=Sfera odre\u0111ena centrom %0 i polupre\u010dnikom %1
Spreadsheet=Tabelarni prikaz
StandardObject=Standardna figura
StandardView=Standardni prikaz
StartingPoint=Po\u010detna ta\u010dka
-StemPlot.KeyAMeansB=Tipka: %0 zna\u010de %1
-StemPlot.high=visok
-StemPlot.low=nizak
-StickToEdge=Zalijepi uz rub
-StopScript=Zaustavi Skript
-Substitute=Zamijeni
-SubstituteForAinB=Zamijeni s %0 u %1
+StemPlot.KeyAMeansB=Tipka: %0 zna\u010di %1
+StemPlot.high=visoko
+StemPlot.low=nisko
+StickToEdge=Poravnaj uz rub
+StopScript=Zaustavi skript
+Substitute=Zamjeni
+SubstituteForAinB=Zamjeni sa %0 u %1
SubstituteSimplify=Zamjeni&Uprosti
Syntax=Sintaksa
SyntaxErrorAisNotAList=Gre\u0161ka:%0 nije lista
@@ -439,11 +431,11 @@ TimeBetweenFrames=Vrijeme izme\u0111u slika
Title=Naslov
TitleExportPgf=Prenos GeoGebra kao PGF
TitleExportPstricks=Prenos GeoGebra kao PSTriks
-ToggleStyleBar=Promjena stila u alatnoj traci
-ToolbarIcon=Ikona alatne trake
+ToggleStyleBar=Uklju\u010di/Isklju\u010di stil alatnu traku
+ToolbarIcon=Ikone alatne trake
ToolbarIconsConstructionProtocolExport=Prika\u017ei ikone u alatnoj traci
-TooltipLanguage=Kratke bilje\u0161ke Jezik
-TooltipTimeout=Kratke bilje\u0161ke Vrijeme ( u sekundama)
+TooltipLanguage=Kratke bilje\u0161ke-jezik
+TooltipTimeout=Kratke bilje\u0161ke-vrijeme(u sekundama)
Tooltips=Kratke bilje\u0161ke
TraceOff=Isklju\u010di trag
TraceOn=Uklju\u010di trag
@@ -455,30 +447,30 @@ TreeModeLayer=Sortiraj figure po slojevima
TreeModeType=Sortiraj figure po tipu
TreeModeView=Sortiraj figure po prikazu
Triangle=Trougao
-UnitVectorOfA=Jedini\u010dni vektor %0
-UnitVectorPerpendicularToA=Jedini\u010dni normalni vektor %0
+UnitVectorOfA=Jedini\u010dni vektor od %0
+UnitVectorPerpendicularToA=Jedini\u010dni normalni vektor na %0
UntitledConstruction=Neimenovana konstrukcija
Up=Gore
Upload=U\u010ditavanje
-UploadError=Ne mo\u017ee se pristupiti GeoGebraTube. Prekinutu u\u010ditavanje. (Kod gre\u0161ke:%0)
+UploadError=Ne mo\u017ee se pristupiti GeoGebraTube. Prekinuto u\u010ditavanje.(Kod gre\u0161ke:%0)
UploadPrepare=Priprema u\u010ditavanja
UseJavaFontsForLaTeX=Koristite Java font za Latex tekst
Value=Vrijednost
Vector=Vektor
VectorPerpendicularToA=Vektor normalan na %0
Vectors=Vektori
-VertexOfA=Tjeme %0
+VertexOfA=Tjeme od %0
VeryLarge=Vrlo veliko
VerySmall=Vrlo malo
ViewCloseExtraWindow=Prika\u017ei u glavnom prozoru
ViewOpenExtraWindow=Prika\u017ei u novom prozoru
VirtualKeyboard=Virtualna tastatura
-VirtualKeyboardLanguage=Virtualna tastatura Jezik
+VirtualKeyboardLanguage=Virtualna tastatura-jezik
Width=\u0160irina
-WindowOpened=Otvoren prozor
+WindowOpened=Prozor je otvoren
XMLTagANotFound=Neispravna datoteka: XML tag %0 nije prona\u0111en
-XUnits=X jedinice (cm)
-YUnits=Y jedinice (cm)
+XUnits=X jedinice(cm)
+YUnits=Y jedinice(cm)
ZoomIn=Uve\u0107anje
ZoomOut=Umanjenje
allowOutlyingIntersections=Presjek u produ\u017eetku
@@ -489,46 +481,48 @@ clockwise=u smjeru kazaljke na satu
counterClockwise=suprotno smjeru kazaljke na satu
dependent=zavisno
dilatedByFactor=homotetija za faktor
-emf=EMF format
-eps=Sa\u017eeti dodatak
+emf=EMF
+eps=EPS
equal=jednako
firstAxisLength=glavna poluosa
-fixed=Fiksirano
+fixed=Fiksno
fncInspector.Curvature=Krivina
fncInspector.Derivative=Izvod
-fncInspector.Derivative2=Drugi Izvod
+fncInspector.Derivative2=Drugi izvod
fncInspector.Difference=Razlika
-fncInspector.MultipleRoots=Vi\u0161estruke Nule
+fncInspector.MultipleRoots=Vi\u0161estruke nule
fncInspector.NoRoots=Nema nula
fncInspector.Points=Ta\u010dke
fncInspector.Property=Osobine
-fncInspector.ShowArea=Prika\u017ei Povr\u0161inu
+fncInspector.ShowArea=Prika\u017ei povr\u0161inu
fncInspector.Value=Vrijednost
fncInspector.addColumn=Dodaj kolonu
fncInspector.removeColumn=Ukloni posljednju kolonu
fncInspector.showOscCircle=Prika\u017ei oskulatornu kru\u017enicu
fncInspector.showTable=Prika\u017ei tabelu ta\u010daka
fncInspector.showTangent=Prika\u017ei tangentu
-fncInspector.showXYLines=Prika\u017ei x,y pozicije pravih
-fncInspector.step=Korak veli\u010dine x
-forceReflexAngle=Obavezan izbo\u010deni ugao
+fncInspector.showXYLines=Prika\u017ei x,y smjernice
+fncInspector.step=Veli\u010dina koraka za vrijednosti x
+forceReflexAngle=Obavezan refleksivni ugao
forward=naprijed
free=nezavisni
horizontal=Horizontalan
html=Web-stranica
jpg=JPG format
+max=max
+min=min
off=isklju\u010deno
otherwise=u suprotnom
parallel=paralelno
pdf=PDF format
-png=PNG format
+png=PNG
polar=polarno
-resetConstruction=Vrati na po\u010detnu konstrukciju
-stylebar.Align=Vodoravno poravnanje
-stylebar.AlignCenter=Centar
-stylebar.AlignLeft=Poravnanje lijevo
-stylebar.AlignRight=Poravnanje desno
-stylebar.Axes=Prika\u017ei/Sakrij ose
+resetConstruction=Resetuj konstrukciju
+stylebar.Align=Horizontalno poravnanje
+stylebar.AlignCenter=Centriraj
+stylebar.AlignLeft=Lijevo poravnanje
+stylebar.AlignRight=Desno poravnanje
+stylebar.Axes=Prika\u017ei/Sakrij koordinatne ose
stylebar.BgColor=Boja pozadine
stylebar.Bold=Bold
stylebar.Border=Rub
@@ -536,13 +530,13 @@ stylebar.Bracket=Zagrade
stylebar.Caption=Naslov
stylebar.Capture=Vezivanje ta\u010dke na mre\u017eu
stylebar.Color=Boja
-stylebar.ColorTransparency=Boja i Providnost
+stylebar.ColorTransparency=Boja i providnost
stylebar.CopyVisualStyle=Kopiraj vizualni stil
stylebar.Eraser=Obri\u0161i trag olovke
stylebar.Grid=Prika\u017ei/Sakrij mre\u017eu
-stylebar.Hidden=Sakrij
+stylebar.Hidden=Skriveno
stylebar.HorizontalLine=Prika\u017ei/Sakrij horizontalne linije
-stylebar.Italic=Kurziv
+stylebar.Italic=Italic
stylebar.Label=Oznake
stylebar.LineStyle=Linija
stylebar.Pen=Crtaj s olovkom
@@ -551,9 +545,9 @@ stylebar.TextColor=Boja teksta
stylebar.TextSize=Veli\u010dina teksta
stylebar.VerticalLine=Prika\u017ei/Sakrij vertikalne linije
svg=SVG format
-undefined=nedefinisano
+undefined=nedefinirano
unequal=nije jednako
-vertical=Vertikalno
+vertical=vertikalno
xAxis=xOsa
xmax=xmax
xmin=xmin
diff --git a/geogebra/properties/plain_ca.properties b/geogebra/properties/plain_ca.properties
index 90869f2..b31eca3 100644
--- a/geogebra/properties/plain_ca.properties
+++ b/geogebra/properties/plain_ca.properties
@@ -1,5 +1,3 @@
-2x2Matrix=Matriu 2x2
-3x3Matrix=Matriu 3x3
ADecimalPlace=%0 Xifra decimal
ADecimalPlaces=%0 Xifres decimals
ADerivativeOfB=%0a derivada de %1
@@ -35,6 +33,7 @@ Algebra=
AlgebraWindow=Finestra algebraica
AliesOnB=%1 passa per %0
AliesOnThePerimeterOfB=%0 pertany al perímetre de %1
+AllowOfflineUse=Inclou fitxers *.jar
AllowStyleBar=Habilita la barra d'estils
Altitude=Altura
AngleBetweenAB=Angle definit per %0 i %1
@@ -63,7 +62,7 @@ Back=Anterior
BackgroundColor=Color de fons
BackgroundImage=Imatge de fons
Bold=Negreta
-Boolean=Valor Booleà
+Boolean=Booleà
Breakpoint=Punt d'interrupció
Button=Botó
CASInitializing=Iniciant CAS
@@ -107,7 +106,6 @@ ConstructionProtocolHelp=<html><body><p><b>Utilitzaci
ConstructionProtocolNavigation=Barra de navegació pels passos de la construcció
Coordinates=Coordenades
CopyToClipboard=Copia al Porta-retalls
-CopyToLaTeX=Copia a LaTeX
CornerPoint=Cantonada
CreatedWith=Creat amb
CreatedWithGeoGebra=Creat amb GeoGebra
@@ -159,7 +157,7 @@ EllipseWithFociABPassingThroughC=El
EllipseWithFociABandFirstAxisLengthC=El·lipse de focus %0 i %1 amb l'eix principal igual a %2
EmphasizeRightAngle=Destaca l'angle recte
EmptySet=Conjunt buit
-EnableScripting=Activa la seqüència de comandaments
+EnableScripting=Permet les seqüències de comandaments
Equation=Equació
ErrorInJavaScript=Error en JavaScript
ErrorInJavaScriptAtLineA=Error en JavaScript a la línia %0
@@ -180,7 +178,7 @@ Filling=Ombrejat
Finish=D'acord
FirstAxisLengthOfA=Semieix principal de %0
FirstAxisOfA=Eix principal de %0
-FixCheckbox=Fixa casella de verificació
+FixCheckbox=Fixa casella de control
FixObject=Fixa objecte
FocusOfA=Focus de %0
ForceGnuplotPgf=Usa Gnuplot per representar funcions
@@ -208,9 +206,8 @@ IgnoreDocumentLayout=Ignora el disseny del document
Image=Imatge
ImplicitPoly=Corba implícita
IncircleOfTriangleABC=Circumferència inscrita en el triangle %0%1%2
-IncludeJARFiles=Inclou fitxers *.jar
Increasing=Creixent
-IncreasingOnce=Augmenta (un cop)
+IncreasingOnce=Creixent (només una vegada)
Inequality=Inequació
InflectionPointofA=Punt d'intersecció de %0
InputFieldHelp=<html><body><p><b>Utilització del camp d'entrada de text</b></p><table border="1"><tr><td>Retorn </td><td>executar entrada</td></tr><tr><td>Escape</td><td>neteja el camp d'entrada de text</td></tr><tr><td>↑</td><td>entrada anterior</td></tr><tr><td>↓</td><td>entrada següent</td></tr><tr><td>F1</td><td>ajuda del comandament actual</td></tr></table><p><br><b>Auto-escritura dels comandaments</b><br>Un cop escrites les dues primeres lletres<br>es mostrarà un comandament, </p><table border="1"><tr><td>Retorn </td><td>accepta el comandament proposat</td></tr><tr><td>una lletra més</td><td>continua escrivint</td></tr></table><body></html>
@@ -227,7 +224,7 @@ Interpolate=Dibuixa amb interpolaci
IntersectingLines=Rectes Secants
IntersectionCurveOfAB=Corba d\u2019intersecció entre %0, %1
IntersectionLineOfAB=Recta d\u2019intersecció entre %0, %1
-IntersectionPathsOfAB=Recorreguts d\u2019intersecció entre %0, %1
+IntersectionOfAandB=Recorreguts d\u2019intersecció entre %0 i %1
IntersectionPointOfAB=Punt d'intersecció entre %0 i %1
IntersectionPointOfABNearC=Punt d\u2019intersecció entre %0, %1 a prop del punt %2
IntersectionPointOfABWithInitialValueC=Punt d'intersecció entre %0 i %1 amb valor inicial %2
@@ -320,12 +317,6 @@ PerspectiveName=Nom de l'Escenari
Picture=imatge
PictureHeight=Alçada de la imatge
PictureWidth=Amplada de la imatge
-PlaneA=pla %0
-PlaneContainingA=Pla que conté %0
-PlaneFromA=pla creat a partir de %0
-PlaneThroughAB=Pla que passa per %0, %1
-PlaneThroughABC=Pla que passa per %0, %1, %2
-PlaneThroughAParallelToB=Pla que passa per %0 i és paral·lel a %1
Play=Reprodueix
PlayButton=Botó de reproduir
Point=Punt
@@ -338,7 +329,7 @@ PointOnA=Punt en %0
PointOnAClosestToB=Punt de %0 més proper a %1
PointOnPath=En una línia
PointSize=Mida del punt
-Points=Punts
+Points=Vèrtexs
PolarCoords=Coordenades polars
PolarLineOfARelativeToB=Recta polar de %0 relativa a %1
PolyLine=Línia poligonal
@@ -390,6 +381,7 @@ ShowOnlineHelp=Mostra l'ajuda en l
ShowOnlyBreakpoints=Mostra només els punts d'interrupció
ShowTitleBar=Mostra la barra de títol
ShowTrace=Activa el traç
+ShowTrimmed=Mostra un retall de la intersecció
ShowxAxis=Mostra l\u2019eix de les x
ShowyAxis=Mostra l\u2019eix de les y
SimpleFormulas=Fórmules simples
@@ -469,7 +461,7 @@ YUnits=Unitats eix Y (cm)
ZoomIn=Apropa
ZoomOut=Allunya
allowOutlyingIntersections=Permet interseccions en perllongaments
-allowReflexAngle=permetre angles orientats
+allowReflexAngle=Permet angles orientats
back=enrera
cartesian=cartesià
clockwise=sentit horari
diff --git a/geogebra/properties/plain_cs.properties b/geogebra/properties/plain_cs.properties
index 52312a8..7fce3c3 100644
--- a/geogebra/properties/plain_cs.properties
+++ b/geogebra/properties/plain_cs.properties
@@ -1,5 +1,3 @@
-2x2Matrix=Matice 2x2
-3x3Matrix=Matice 3x3
ADecimalPlace=%0 desetinné místo
ADecimalPlaces=%0 desetinných míst
ADerivativeOfB=%0 derivace %1
@@ -34,6 +32,7 @@ AisaTangentToB=%0 je te\u010dna %1
AlgebraWindow=Algebraické okno
AliesOnB=%0 le\u017eí na %1
AliesOnThePerimeterOfB=%0 le\u017eí na pr\u016fm\u011bru %1
+AllowOfflineUse=Obsahuje *.jar soubory
AltGr=Alt Gr
Altitude=Vý\u0161ka
Angle=Úhel
@@ -111,7 +110,6 @@ ConstructionProtocolHelp=<html><body><p><b>U\u017eit
ConstructionProtocolNavigation=Naviga\u010dní panel pro krokování konstrukce
Coordinates=Sou\u0159adnice
CopyToClipboard=Kopírovat do schránky
-CopyToLaTeX=Kopírovat do LaTeXu
CornerPoint=Roh
CreatedWith=Vytvo\u0159eno programem
CreatedWithGeoGebra=Vytvo\u0159ené GeoGebrou
@@ -200,9 +198,9 @@ GeneratePstricks=Generovat PSTricks
GeometricObjects=Geometrické objekty
GlobalJavaScript=Globální JavaScript
GoToDownloadPage=Zobrazit stránku "Ke sta\u017eení"
-GraphicsViewAsAsymptote=Grafický náhled jako asymptota
+GraphicsViewAsAsymptote=Grafický náhled jako Asymptote
GreekCharacterA=\u0158ecký znak: %0
-GridType=Typ sou\u0159adnicové sít\u011b
+GridType=Sou\u0159adnicová soustava
Height=Vý\u0161ka
Hexagon=\u0160estiúhelník
Hide=Skrýt
@@ -214,7 +212,6 @@ IgnoreDocumentLayout=Ignorovat n
Image=Obrázek
ImplicitPoly=Implicitní k\u0159ivka
IncircleOfTriangleABC=Vepsaná kru\u017enice trojúhelníka %0%1%2
-IncludeJARFiles=Obsahuje *.jar soubory
Increasing=Rostoucí
IncreasingOnce=Rostoucí (jedenkrát)
Inequality=Nerovnost
@@ -322,12 +319,6 @@ PerspectiveName=N
Picture=Obraz
PictureHeight=Vý\u0161ka obrázku
PictureWidth=\u0160í\u0159ka obrázku
-PlaneA=rovina %0
-PlaneContainingA=rovina obsahující %0
-PlaneFromA=rovina vytvo\u0159ená z %0
-PlaneThroughAB=Rovina procházející %0, %1
-PlaneThroughABC=Rovina procházející %0, %1, %2
-PlaneThroughAParallelToB=Rovina procházející %0 rovnob\u011b\u017ená s %1
Play=P\u0159ehrát
PlayButton=Tla\u010dítko pro p\u0159ehrání konstrukce
Point=Bod
@@ -397,7 +388,7 @@ ShowOnlineHelp=Zobrazit online n
ShowOnlyBreakpoints=Zobrazit jen body zastavení
ShowTitleBar=Zobrazit záhlaví
ShowTrace=Zobrazit stopu
-ShowTrimmed=Zobrazit pouze pr\u016fse\u010dík p\u0159ímek
+ShowTrimmed=Zobrazit úseky protínajících se \u010dar
ShowxAxis=Zobrazit osu x
ShowyAxis=Zobrazit osu y
SimpleFormulas=Jednoduché vzorce
@@ -491,7 +482,7 @@ emf=roz\u0161
equal=rovno
firstAxisLength=délka hlavní osy
fixed=upevn\u011bn
-fncInspector.Curvature=Zak\u0159ivení
+fncInspector.Curvature=K\u0159ivost
fncInspector.Derivative=Derivace
fncInspector.Derivative2=2. derivace
fncInspector.Difference=Rozdíl
diff --git a/geogebra/properties/plain_cy.properties b/geogebra/properties/plain_cy.properties
index 71ad10f..b86d75a 100644
--- a/geogebra/properties/plain_cy.properties
+++ b/geogebra/properties/plain_cy.properties
@@ -1,5 +1,3 @@
-2x2Matrix=matrics 2x2
-3x3Matrix=matrics 3x3
ADecimalPlace=%0 lle degol
ADecimalPlaces=%0 lle degol
ADerivativeOfB=deilliad %0 o %1
diff --git a/geogebra/properties/plain_da.properties b/geogebra/properties/plain_da.properties
index 6ab8bf9..03fdb21 100644
--- a/geogebra/properties/plain_da.properties
+++ b/geogebra/properties/plain_da.properties
@@ -32,6 +32,7 @@ AisaTangentToB=%0 trangerer %1
AlgebraWindow=Algebra vindue
AliesOnB=%0 ligger på %1
AliesOnThePerimeterOfB=%0 ligger på omkredsen af %1
+AllowOfflineUse=Inkluder *.jar filer
AllowStyleBar=Stilbjælke tilladt
Altitude=Udsving
Angle=Vinkel
@@ -108,7 +109,6 @@ ConstructionProtocolHelp=<html><body><p><b>Brug af konstruktionsbeskrivelsen</b>
ConstructionProtocolNavigation=Navigationslinje for konstruktionstrin
Coordinates=Koordinater
CopyToClipboard=Kopier til udklipsholder
-CopyToLaTeX=Kopier til LaTex
CornerPoint=Hjørne
CreatedWith=Lavet med
CreatedWithGeoGebra=Lavet med GeoGebra
@@ -208,7 +208,6 @@ IgnoreDocumentLayout=Ignorer dokument layout
Image=Billede
ImplicitPoly=Implicit kurve
IncircleOfTriangleABC=Indskreven cirkel i trekant %0%1%2
-IncludeJARFiles=Inkluder *.jar filer
Increasing=Stigende
IncreasingOnce=Forøg (en gang)
Inequality=Ulighed
@@ -225,7 +224,7 @@ Interpolate=Tegn med interpolation
IntersectingLines=Skærende linjer
IntersectionCurveOfAB=Skæringskurve mellem %0 og %1
IntersectionLineOfAB=Skæringslinje mellem %0 og %1
-IntersectionPathsOfAB=Skæringssti mellem %0 og %1
+IntersectionOfAandB=Skæringssti mellem %0 og %1
IntersectionPointOfAB=Skæringspunkt mellem %0 og %1
IntersectionPointOfABNearC=Skæringspunkt mellem %0 og %1 nær punkt %2
IntersectionPointOfABWithInitialValueC=Skæringspunkt mellem %0 og %1 udfra en begyndelsesværdi på %2
@@ -257,7 +256,7 @@ LocalizedDigits=Anvend lokale cifre
LocalizedLabels=Anvend lokaliserede punkt navne
LockObject=Lås objekt
Locus=Sted
-Medium=Medie
+Medium=Mellem
Midpoint=midtpunkt
MidpointOfA=Midtpunkt på %0
MidpointOfAB=Midtpunkt på %0%1
@@ -311,12 +310,6 @@ PerspectiveName=Navn p
Picture=Billede
PictureHeight=Billede højde
PictureWidth=Billede bredde
-PlaneA=plan %0
-PlaneContainingA=Plan der indeholder %0
-PlaneFromA=Plan lavet fra %0
-PlaneThroughAB=Plan gennem %0 og %1
-PlaneThroughABC=Plan gennem %0, %1 og %2
-PlaneThroughAParallelToB=Plan gennem %0 parallel med %1
Play=Spil
PlayButton=Spil knap
Point=Punkt
diff --git a/geogebra/properties/plain_de.properties b/geogebra/properties/plain_de.properties
index 32e555a..4288c4a 100644
--- a/geogebra/properties/plain_de.properties
+++ b/geogebra/properties/plain_de.properties
@@ -1,5 +1,3 @@
-2x2Matrix=2x2 Matrix
-3x3Matrix=3x3 Matrix
ADecimalPlace=%0 Dezimalstelle
ADecimalPlaces=%0 Dezimalstellen
ADerivativeOfB=%0 Ableitung von %1
@@ -33,6 +31,7 @@ AisaDegenerateBranchOfB=%0 ist Teil von %1
AisaTangentToB=%0 ist Tangente zu %1
AliesOnB=%0 liegt auf %1
AliesOnThePerimeterOfB=%0 liegt auf dem Umriss von %1
+AllowOfflineUse=inklusive *.jar-Dateien
AltGr=AltGr
Altitude=Höhe
Angle=Winkel
@@ -68,6 +67,7 @@ Boolean=Wahrheitswert
Breakpoint=Haltepunkt
Button=Schaltfläche
CASInitializing=CAS Initialisierung
+CASTimedOut=CAS Zeitüberschreitung
Cancel=Abbrechen
Caption=Beschriftung
CartesianCoords=Cartesische Koordinaten
@@ -87,10 +87,12 @@ CircleWithCenterAThroughBAxisParallelToC=Kreis mit Mittelpunkt %0 durch %1, Achs
CircleWithCenterAThroughBParallelToC=Kreis mit Mittelpunkt %0 durch %1, parallel zu %2
CircleWithCenterAandRadiusB=Kreis mit Mittelpunkt %0 und Radius %1
CircleWithCenterAandRadiusBAxisParallelToC=Kreis mit Mittelpunkt %0 und Radius %1, Achse parallel zu %2
+Clipboard.Blackboard=Zwischenablage: Blackboard
Clipboard.Google=Zwischenablage: Google Gadget
Clipboard.HTML=Zwischenablage: HTML
Clipboard.MediaWiki=Zwischenablage: MediaWiki
Clipboard.Moodle=Zwischenablage: Moodle
+Clipboard.iframe=Zwischenablage: <iframe>
Color=Farbe
ColorfulConstructionProtocol=Konstruktionsprotokoll in Farbe
Command=Befehl
@@ -189,7 +191,9 @@ General=Allgemein
GeneratePgf=Erzeuge PGF/TikZ
GeneratePstricks=Erzeuge PSTricks
GeometricObjects=Geometrische Objekte
-GraphicsViewAsAsymptote=Garfik-Ansicht als Asymptote
+GlobalJavaScript=Globales JavaScript
+GoToDownloadPage=Zur Downloadseite gehen
+GraphicsViewAsAsymptote=Grafik-Ansicht als Asymptote
GreekCharacterA=Griechischer Buchstabe: %0
GridType=Art des Koordinatengitters
Height=Höhe
@@ -204,7 +208,6 @@ IgnoreDocumentLayout=Dokumentenlayout ignorieren
Image=Bild
ImplicitPoly=Implizite Kurve
IncircleOfTriangleABC=Inkreis des Dreiecks %0%1%2
-IncludeJARFiles=inklusive *.jar-Dateien
Increasing=Zunehmend
IncreasingOnce=Zunehmend (einmalig)
Inequality=Ungleichung
@@ -223,7 +226,7 @@ Interpolate=Zeichne mit Interpolation
IntersectingLines=Schneidendes Geradenpaar
IntersectionCurveOfAB=Schnittkurve von %0, %1
IntersectionLineOfAB=Schnittgerade von %0, %1
-IntersectionPathsOfAB=Schnittpfad von %0, %1
+IntersectionOfAandB=Schnittpfad von %0, %1
IntersectionPointOfAB=Schnittpunkt von %0, %1
IntersectionPointOfABNearC=Schnittpunkt von %0, %1 nahe Punkt %2
IntersectionPointOfABWithInitialValueC=Schnittpunkt von %0, %1 mit Startwert %2
@@ -280,6 +283,7 @@ Name.textfield=Textfeld
NameAndValue=Name & Wert
NewExpression=Neuer Ausdruck
NewNameForA=Neuer Name für %0
+NewerVersionA=Es ist eine neue Version von GeoGebra verfügbar.\nWollen Sie jetzt mit GeoGebra %0 arbeiten?
Next=Weiter
NextCell=Nächste Zelle
No.=Nr.
@@ -311,12 +315,6 @@ PerspectiveName=Name der Perspektive
Picture=Bild
PictureHeight=Bildhöhe
PictureWidth=Bildbreite
-PlaneA=Ebene %0
-PlaneContainingA=Ebene enthält %0
-PlaneFromA=Ebene erstellt von %0
-PlaneThroughAB=Ebene durch %0, %1
-PlaneThroughABC=Ebene durch %0, %1, %2
-PlaneThroughAParallelToB=Ebene durch %0, parallel zu %1
Play=Abspielen
PlayButton=Schaltfläche "Abspielen"
Point=Punkt
@@ -407,6 +405,7 @@ StopScript=Skript stoppen
Substitute=Ersetze
SubstituteForAinB=Ersetze %0 in %1
SubstituteSimplify=Ersetzen & Vereinfachen
+Syntax=Schreibweise
SyntaxErrorAisNotAList=Syntax Fehler: %0 ist keine Liste
SystemInformation=Systeminformation
SystemInformationMessage=Systeminformation erfolgreich in die Zwischenablage kopiert
@@ -480,6 +479,7 @@ fncInspector.Derivative2=Zweite Ableitung
fncInspector.Difference=Differenz
fncInspector.Interval=Intervall
fncInspector.MultipleRoots=Mehrfache Nullstelle
+fncInspector.NoRoots=Keine Nullstellen
fncInspector.Points=Punkte
fncInspector.Property=Eigenschaft
fncInspector.ShowArea=Bereich anzeigen
@@ -499,6 +499,8 @@ max=max
min=min
off=aus
otherwise=sonst
+pdf=PDF-Format
+png=Bilddatei
resetConstruction=Konstruktion neu laden
stylebar.Align=Horizontal ausrichten
stylebar.AlignCenter=Zentriert
@@ -525,8 +527,11 @@ stylebar.PointStyle=Punktdarstellung
stylebar.TextColor=Textfarbe
stylebar.TextSize=Textgröße
stylebar.VerticalLine=Vertikale Linien anzeigen oder verbergen
+svg=Skalierbare Vektorgrafiken
undefined=undefiniert
unequal=ungleich
vertical=Vertikal
xAxis=xAchse
-yAxis=yAchse
\ No newline at end of file
+xstep=X Schrittweite
+yAxis=yAchse
+ystep=Y Schrittweite
\ No newline at end of file
diff --git a/geogebra/properties/plain_el.properties b/geogebra/properties/plain_el.properties
index 0622bf8..1ff81b2 100644
--- a/geogebra/properties/plain_el.properties
+++ b/geogebra/properties/plain_el.properties
@@ -1,5 +1,3 @@
-2x2Matrix=\u03a0\u03af\u03bd\u03b1\u03ba\u03b1\u03c2 2x2
-3x3Matrix=\u03a0\u03af\u03bd\u03b1\u03ba\u03b1\u03c2 3x3
ADecimalPlace=%0 \u0394\u03b5\u03ba\u03b1\u03b4\u03b9\u03ba\u03ae \u0398\u03ad\u03c3\u03b7
ADecimalPlaces=%0 \u0394\u03b5\u03ba\u03b1\u03b4\u03b9\u03ba\u03ad\u03c2 \u0398\u03ad\u03c3\u03b5\u03b9\u03c2
ADerivativeOfB=%0 \u03c0\u03b1\u03c1\u03ac\u03b3\u03c9\u03b3\u03bf\u03c2 \u03c4\u03b7\u03c2 %1
@@ -35,6 +33,7 @@ Algebra=\u0386\u03bb\u03b3\u03b5\u03b2\u03c1\u03b1
AlgebraWindow=\u0386\u03bb\u03b3\u03b5\u03b2\u03c1\u03b1
AliesOnB=%0 \u03b1\u03bd\u03ae\u03ba\u03b5\u03b9 \u03c3\u03c4\u03b7\u03bd %1
AliesOnThePerimeterOfB=%0 \u03b1\u03bd\u03ae\u03ba\u03b5\u03b9 \u03c3\u03c4\u03b7\u03bd \u03c0\u03b5\u03c1\u03af\u03bc\u03b5\u03c4\u03c1\u03bf \u03c4\u03bf\u03c5 %1
+AllowOfflineUse=\u0395\u03bd\u03c3\u03c9\u03bc\u03ac\u03c4\u03c9\u03c3\u03b7 \u03ba\u03b1\u03b9 \u03c4\u03c9\u03bd \u0391\u03c1\u03c7\u03b5\u03af\u03c9\u03bd .jar
AllowStyleBar=\u0395\u03c0\u03b9\u03c4\u03c1\u03ad\u03c0\u03b5\u03c4\u03b1\u03b9 \u03b7 \u039c\u03c0\u03ac\u03c1\u03b1 \u0391\u03bb\u03bb\u03b1\u03b3\u03ae\u03c2 \u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7\u03c2
Alt=\u03a3\u03c4\u03b1\u03bc\u03ac\u03c4\u03b1
AltGr=\u03a3\u03c4\u03b1\u03bc\u03ac\u03c4\u03b1G
@@ -116,7 +115,6 @@ ConstructionProtocolHelp=<html><body><p><b> \u03a0\u03c9\u03c2 \u03c7\u03c1\u03b
ConstructionProtocolNavigation=\u039c\u03c0\u03ac\u03c1\u03b1 \u03c0\u03bb\u03bf\u03ae\u03b3\u03b7\u03c3\u03b7\u03c2 \u03b3\u03b9\u03b1 \u03c4\u03b1 \u03b2\u03ae\u03bc\u03b1\u03c4\u03b1 \u03c4\u03b7\u03c2 \u03ba\u03b1\u03c4\u03b1\u03c3\u03ba\u03b5\u03c5\u03ae\u03c2
Coordinates=\u03a3\u03c5\u03bd\u03c4\u03b5\u03c4\u03b1\u03b3\u03bc\u03ad\u03bd\u03b5\u03c2
CopyToClipboard=\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae \u03c3\u03c4\u03b7 \u03bc\u03bd\u03ae\u03bc\u03b7
-CopyToLaTeX=\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae \u03c3\u03b5 LaTeX
CornerPoint=\u039a\u03bf\u03c1\u03c5\u03c6\u03ae
CreatedWith=\u0394\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03ae\u03b8\u03b7\u03ba\u03b5 \u03bc\u03b5 \u03c4\u03bf \u03c0\u03c1\u03cc\u03b3\u03c1\u03b1\u03bc\u03bc\u03b1
CreatedWithGeoGebra=\u0394\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03ae\u03b8\u03b7\u03ba\u03b5 \u03bc\u03b5 \u03c4\u03bf \u03c0\u03c1\u03cc\u03b3\u03c1\u03b1\u03bc\u03bc\u03b1 GeoGebra
@@ -225,7 +223,6 @@ ImplicitConicEquation=\u03b1 x
ImplicitLineEquation=\u03b1 x + \u03b2 y = \u03b3
ImplicitPoly=\u03a0\u03b5\u03c0\u03b5\u03bb\u03b5\u03b3\u03bc\u03ad\u03bd\u03b7 \u039a\u03b1\u03bc\u03c0\u03cd\u03bb\u03b7
IncircleOfTriangleABC=\u0395\u03b3\u03b3\u03b5\u03b3\u03c1\u03b1\u03bc\u03bc\u03ad\u03bd\u03bf\u03c2 \u03ba\u03cd\u03ba\u03bb\u03bf\u03c2 \u03c4\u03bf\u03c5 \u03c4\u03c1\u03b9\u03b3\u03ce\u03bd\u03bf\u03c5 %0%1%2
-IncludeJARFiles=\u0395\u03bd\u03c3\u03c9\u03bc\u03ac\u03c4\u03c9\u03c3\u03b7 \u03ba\u03b1\u03b9 \u03c4\u03c9\u03bd \u0391\u03c1\u03c7\u03b5\u03af\u03c9\u03bd .jar
Increasing=\u0391\u03cd\u03be\u03b7\u03c3\u03b7
IncreasingOnce=\u0391\u03cd\u03be\u03b7\u03c3\u03b7 (\u039c\u03af\u03b1 \u03c6\u03bf\u03c1\u03ac)
Inequality=\u0391\u03bd\u03b9\u03c3\u03cc\u03c4\u03b7\u03c4\u03b1
@@ -244,7 +241,7 @@ Interpolate=\u03a3\u03c7\u03b5\u03b4\u03af\u03b1\u03c3\u03b7 \u03bc\u03b5 \u03c0
IntersectingLines=\u03a4\u03b5\u03bc\u03bd\u03cc\u03bc\u03b5\u03bd\u03b5\u03c2 \u03b5\u03c5\u03b8\u03b5\u03af\u03b5\u03c2
IntersectionCurveOfAB=\u039a\u03b1\u03bc\u03c0\u03cd\u03bb\u03b7 \u03c4\u03bf\u03bc\u03ae\u03c2 \u03c4\u03c9\u03bd %0, %1
IntersectionLineOfAB=\u0393\u03c1\u03b1\u03bc\u03bc\u03ae \u03a4\u03bf\u03bc\u03ae\u03c2 \u03c4\u03c9\u03bd %0, %1
-IntersectionPathsOfAB=\u03a4\u03bf\u03bc\u03ae \u03b4\u03b9\u03b1\u03b4\u03c1\u03bf\u03bc\u03ce\u03bd \u03c4\u03c9\u03bd %0, %1
+IntersectionOfAandB=\u03a4\u03bf\u03bc\u03ae \u03b4\u03b9\u03b1\u03b4\u03c1\u03bf\u03bc\u03ce\u03bd \u03c4\u03c9\u03bd %0, %1
IntersectionPointOfAB=\u03a3\u03b7\u03bc\u03b5\u03af\u03bf \u03c4\u03bf\u03bc\u03ae\u03c2 \u03c4\u03c9\u03bd %0, %1
IntersectionPointOfABNearC=\u03a3\u03b7\u03bc\u03b5\u03af\u03bf \u03c4\u03bf\u03bc\u03ae\u03c2 \u03c4\u03c9\u03bd %0, %1 \u03ba\u03bf\u03bd\u03c4\u03ac \u03c3\u03c4\u03bf \u03c3\u03b7\u03bc\u03b5\u03af\u03bf %2
IntersectionPointOfABWithInitialValueC=\u03a3\u03b7\u03bc\u03b5\u03af\u03bf \u03c4\u03bf\u03bc\u03ae\u03c2 \u03c4\u03c9\u03bd %0, %1 \u03bc\u03b5 \u03b1\u03c1\u03c7\u03b9\u03ba\u03ae \u03c4\u03b9\u03bc\u03ae %2
@@ -336,12 +333,6 @@ PerspectiveName=\u038c\u03bd\u03bf\u03bc\u03b1 \u03c4\u03b7\u03c2 \u038c\u03c8\u
Picture=\u0395\u03b9\u03ba\u03cc\u03bd\u03b1
PictureHeight=\u038e\u03c8\u03bf\u03c2 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2
PictureWidth=\u03a0\u03bb\u03ac\u03c4\u03bf\u03c2 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2
-PlaneA=\u03b5\u03c0\u03af\u03c0\u03b5\u03b4\u03bf %0
-PlaneContainingA=\u0395\u03c0\u03af\u03c0\u03b5\u03b4\u03bf \u03c0\u03bf\u03c5 \u03c0\u03b5\u03c1\u03b9\u03ad\u03c7\u03b5\u03b9 %0
-PlaneFromA=\u03b5\u03c0\u03af\u03c0\u03b5\u03b4\u03bf \u03c0\u03bf\u03c5 \u03b4\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03ae\u03b8\u03b7\u03ba\u03b5 \u03b1\u03c0\u03cc %0
-PlaneThroughAB=\u0395\u03c0\u03af\u03c0\u03b5\u03b4\u03bf \u03c0\u03bf\u03c5 \u03c0\u03b5\u03c1\u03bd\u03ac \u03b1\u03c0\u03cc %0, %1
-PlaneThroughABC=\u0395\u03c0\u03af\u03c0\u03b5\u03b4\u03bf \u03c0\u03bf\u03c5 \u03c0\u03b5\u03c1\u03bd\u03ac \u03b1\u03c0\u03cc %0, %1, %2
-PlaneThroughAParallelToB=\u0395\u03c0\u03af\u03c0\u03b5\u03b4\u03bf \u03c0\u03bf\u03c5 \u03c0\u03b5\u03c1\u03bd\u03ac \u03b1\u03c0\u03cc %0 \u03c0\u03b1\u03c1\u03ac\u03bb\u03bb\u03b7\u03bb\u03bf \u03c3\u03c4\u03bf %1
Play=\u0395\u03bd\u03b1\u03c1\u03be\u03b7
PlayButton=\u039a\u03bf\u03c5\u03bc\u03c0\u03af \u03ad\u03bd\u03b1\u03c1\u03be\u03b7\u03c2
Point=\u03a3\u03b7\u03bc\u03b5\u03af\u03bf
diff --git a/geogebra/properties/plain_es.properties b/geogebra/properties/plain_es.properties
index fdbe2af..a43dd62 100644
--- a/geogebra/properties/plain_es.properties
+++ b/geogebra/properties/plain_es.properties
@@ -1,5 +1,3 @@
-2x2Matrix=Matriz 2x2
-3x3Matrix=Matriz 3x3
ADecimalPlace=%0 Lugar Decimal
ADecimalPlaces=%0 Lugares Decimales
ADerivativeOfB=%0 derivada de %1
@@ -35,6 +33,7 @@ Algebra=
AlgebraWindow=Vista Algebraica
AliesOnB=%0 está en %1
AliesOnThePerimeterOfB=%0 no yace en el perímetro de %1
+AllowOfflineUse=Admite Uso Fuera de Línea (Offline)
AllowStyleBar=Barra de Estilo Habilitada
AltGr=AltGr
Altitude=Altura
@@ -113,7 +112,6 @@ ConstructionProtocolHelp=<html><body><p><b>Uso del Protocolo de Construcci
ConstructionProtocolNavigation=Barra de Navegación por Pasos de Construcción
Coordinates=Coordenadas
CopyToClipboard=Copia al Portapapeles
-CopyToLaTeX=Copia a LaTeX
CornerPoint=Esquina
CreatedWith=Creación realizada con
CreatedWithGeoGebra=Creado con GeoGebra
@@ -215,7 +213,6 @@ IgnoreDocumentLayout=Ignora Disposici
Image=Imagen
ImplicitPoly=Curva Implícita
IncircleOfTriangleABC=Circunferencia Inscripta en triángulo %0%1%2
-IncludeJARFiles=Incluyendo archivos *.jar
Increasing=Incrementando
IncreasingOnce=Aumentando(Una vez)
Inequality=Inecuación
@@ -223,10 +220,10 @@ InflectionPointofA=Punto de Inflexi
InputFieldHelp=<html><body><p><b>Uso del Campo de Entrada</b></p><table border="1"><tr><td >Intro </td><td >Ejecuta la entrada</td></tr><tr><td >Esc</td><td >Borra la entrada</td></tr><tr><td ><p align="center">↑</p></td><td >Entrada anterior</td></tr><tr><td ><p align="center">↓</p></td><td >Entrada siguiente</td></tr><tr><td>F1</td><td>Ayuda para el comando introducido</td></tr></table><p><br><b>Autocompletar Comandos</b><br>Tras escribir las dos primeras letras de<br>un comando, aparecerá completo.</p><table border="1" ><tr><td >Intro </td><td >Acepta el comando propuesto</td></tr><tr><td >Otra letra</td><td >Se prosigue con la entrada</td></tr></table></body></html>
InputForm=Formulario de entrada
InputLabel=Entrada
-InputLabelToolTip=Anota un comando
-Insert=Inserta
-InsertPictureOfAllOpenViews=Inserta imagen de todas las vistas abiertas
-InsertPictureOfConstruction=Inserta imagen de Vista Gráfica
+InputLabelToolTip=Anotar un comando
+Insert=Insertar
+InsertPictureOfAllOpenViews=Insertar imagen de todas las vistas abiertas
+InsertPictureOfConstruction=Insertar imagen de Vista Gráfica
Integer=Entero
IntegralOfA=Integral de %0
IntegralOfAfromBtoC=Integral de %0 desde %1 a %2
@@ -234,7 +231,7 @@ Interpolate=Trazar con interpolaci
IntersectingLines=Rectas secantes
IntersectionCurveOfAB=Curvas de intersección de %0, %1
IntersectionLineOfAB=Recta de Intersección de %0, %1
-IntersectionPathsOfAB=Recorridos de Intersección de %0, %1
+IntersectionOfAandB=Intersección de %0, %1
IntersectionPointOfAB=Punto de intersección de %0, %1
IntersectionPointOfABNearC=Punto de intersección de %0, %1 en proximidades del punto %2
IntersectionPointOfABWithInitialValueC=Punto de Intersección de %0, %1 con valor inicial %2
@@ -329,12 +326,6 @@ PerspectiveName=Nombre de la Apariencia
Picture=Imagen
PictureHeight=Altura de la Imagen
PictureWidth=Ancho de la Imagen
-PlaneA=plano %0
-PlaneContainingA=Plano que contiene a %0
-PlaneFromA=plano creado desde %0
-PlaneThroughAB=Plano que pasa por %0, %1
-PlaneThroughABC=Plano que pasa por %0, %1, %2
-PlaneThroughAParallelToB=Plano paralelo a %1 que pasa por %0
Play=Reproduce
PlayButton=Botón de Reproducción
Point=Punto
@@ -348,7 +339,7 @@ PointOnA=Punto sobre %0
PointOnAClosestToB=Punto sobre %0 más próximo a %1
PointOnPath=Sobre Trayecto
PointSize=Tamaño del Punto
-Points=Puntos
+Points=Vértices
PolarCoords=Coordenadas Polares
PolarLineOfARelativeToB=Recta Polar de %0 relativa a %1
PolyLine=Poligonal
@@ -484,7 +475,7 @@ XUnits=X unidades (cm)
YUnits=Y unidades (cm)
ZoomIn=Zoom-Acerca
ZoomOut=Zoom-Aleja
-allowOutlyingIntersections=Silueta de Intersecciones
+allowOutlyingIntersections=Admite Intersección en Prolongaciones
allowReflexAngle=Admite Ángulos Cóncavos
back=Anterior
cartesian=Cartesiano
diff --git a/geogebra/properties/plain_et.properties b/geogebra/properties/plain_et.properties
index bec0066..c1d2092 100644
--- a/geogebra/properties/plain_et.properties
+++ b/geogebra/properties/plain_et.properties
@@ -1,5 +1,3 @@
-2x2Matrix=2x2 maatriks
-3x3Matrix=3x3 maatriks
ADecimalPlace=%0 kümnendkoht
ADecimalPlaces=%0 kümnendkohta
ADerivativeOfB=%1 %0 tuletis
@@ -33,6 +31,7 @@ AisaTangentToB=%0 on %1 puutuja
AlgebraWindow=Algebravaade
AliesOnB=%0 asub objektil %1
AliesOnThePerimeterOfB=%0 asub %1 piiraval joonel
+AllowOfflineUse=Sisaldab *.jar faile
Altitude=Kõrgus
Angle=Nurk
AngleBetweenAB=%0 ja %1 vaheline nurk
@@ -201,7 +200,6 @@ HyperbolaWithFociABandFirstAxisLengthC=H
IgnoreDocumentLayout=Ignoreeri dokumendi küljendust
Image=Pilt
ImplicitPoly=Ilmutamata kõver
-IncludeJARFiles=Sisaldab *.jar faile
Increasing=Kasvav
IncreasingOnce=Kasvav (üks kord)
Inequality=Mittevõrdsus
@@ -307,11 +305,6 @@ PerspectiveName=Perspektiivi t
Picture=Pilt
PictureHeight=Pildi kõrgus
PictureWidth=Pildi laius
-PlaneA=tasand %0
-PlaneFromA=%0-st loodud tasand
-PlaneThroughAB=Tasand läbi %0 ja %1
-PlaneThroughABC=Tasand läbi punktide %0, %1 ja %2
-PlaneThroughAParallelToB=Tasand läbi %0, mis on paralleelne %1-ga
Play=Mängi
PlayButton=Mängi nupp
Point=Punkt
diff --git a/geogebra/properties/plain_eu.properties b/geogebra/properties/plain_eu.properties
index e7f754e..e6f4a3d 100644
--- a/geogebra/properties/plain_eu.properties
+++ b/geogebra/properties/plain_eu.properties
@@ -1,5 +1,3 @@
-2x2Matrix=2x2 matrizea
-3x3Matrix=3x3 matrizea
ADecimalPlace=Hamartar %0
ADecimalPlaces=%0 hamartar
ADerivativeOfB=%1 funtzioaren %0 deribatua
@@ -35,6 +33,7 @@ Algebra=Aljebra
AlgebraWindow=Aljebra
AliesOnB=%0 %1-(e)n dago
AliesOnThePerimeterOfB=%0 %1-(r)en perimetroan dago
+AllowOfflineUse=Sartu *.jar fitxategiak
AllowStyleBar=Estilo-Barra Onartua
AltGr=AltGr
Altitude=Altuera
@@ -114,7 +113,6 @@ ConstructionProtocolHelp=<html><body><p><b>Eraikuntzaren pausoak</b></p><p><br><
ConstructionProtocolNavigation=Nabigazio-Barra Eraikuntzaren Pausoetarako
Coordinates=Koordenatuak
CopyToClipboard=Kopiatu Arbelean
-CopyToLaTeX=Kopiatu LaTeX-en
CornerPoint=Izkina
CreatedWith=Honekin egina:
CreatedWithGeoGebra=GeoGebrarekin eginda
@@ -218,7 +216,6 @@ IgnoreDocumentLayout=Ezikusi Dokumentuaren Diseinua
Image=Irudia
ImplicitPoly=Kurba Inplizitua
IncircleOfTriangleABC=%0%1%2 triangeluaren zirkunferentzia inskribatua
-IncludeJARFiles=Sartu *.jar fitxategiak
Increasing=Gorakorra
IncreasingOnce=Goratu (behin)
Inequality=Inekuazioa
@@ -237,7 +234,7 @@ Interpolate=Marraztu interpolazioarekin
IntersectingLines=Zuzen ebakitzaileak
IntersectionCurveOfAB=%0 eta %1-(e)n ebakidura-kurba
IntersectionLineOfAB=%0 eta %1-(e)n ebakidura-zuzena
-IntersectionPathsOfAB=%0 eta %1-(e)n ebakidura-ibilbidea
+IntersectionOfAandB=%0 eta %1-(e)n ebakidura-ibilbidea
IntersectionPointOfAB=%0 eta %1-(r)en ebaki-puntua
IntersectionPointOfABNearC=%0 eta %1-(e)n ebaki-puntua %2-(e)tik hurbil
IntersectionPointOfABWithInitialValueC=%0 eta %1-(r)en ebaki-puntua (hasierako balioa, %2)
@@ -331,12 +328,6 @@ PerspectiveName=Antolaketaren Izena
Picture=Irudia
PictureHeight=Irudiaren altuera
PictureWidth=Irudiaren zabalera
-PlaneA=%0 planoa
-PlaneContainingA=%0 daukan planoa
-PlaneFromA=%0-(e)tik sortutako planoa
-PlaneThroughAB=Planoa %0 eta %1-(e)tik pasatuz
-PlaneThroughABC=Planoa %0, %1 eta %2-(e)tik pasatuz
-PlaneThroughAParallelToB=Planoa: %0-(r)en paraleloa, %1-(e)tik pasatuz
Play=Erreproduzitu
PlayButton=Erreproduzitzeko botoia
Point=Puntua
diff --git a/geogebra/properties/plain_fa.properties b/geogebra/properties/plain_fa.properties
index 8f87c30..a93d1aa 100644
--- a/geogebra/properties/plain_fa.properties
+++ b/geogebra/properties/plain_fa.properties
@@ -1,5 +1,3 @@
-2x2Matrix=\u0645\u0627\u062a\u0631\u06cc\u0633 2*2
-3x3Matrix=\u0645\u0627\u062a\u0631\u06cc\u0633 3*3
ADecimalPlace=%0 \u0631\u0642\u0645 \u0627\u0639\u0634\u0627\u0631
ADecimalPlaces=%0 \u0631\u0642\u0645 \u0627\u0639\u0634\u0627\u0631
ADerivativeOfB=\u0645\u0634\u062a\u0642 \u062f\u0631\u062c\u0647 %0 \u0627\u0632 %1
@@ -35,6 +33,7 @@ Algebra=\u0639\u0628\u0627\u0631\u062a \u062c\u0628\u0631\u06cc
AlgebraWindow=\u067e\u0646\u062c\u0631\u0647 \u0639\u0628\u0627\u0631\u062a \u0647\u0627\u06cc \u062c\u0628\u0631\u06cc
AliesOnB=%0 \u0642\u0631\u0627\u0631 \u06af\u0631\u0641\u062a\u0647 \u0628\u0631 %1
AliesOnThePerimeterOfB=%0 \u0642\u0631\u0627\u0631 \u0646\u06af\u0631\u0641\u062a\u0647 \u0627\u0633\u062a \u0628\u0631 \u0645\u062d\u06cc\u0637 %1
+AllowOfflineUse=\u0634\u0627\u0645\u0644 \u0641\u0627\u06cc\u0644 *.jar
AllowStyleBar=\u0646\u0648\u0627\u0631 \u0633\u0628\u06a9 \u0646\u0634\u0627\u0646 \u062f\u0627\u062f\u0647 \u0634\u0648\u062f
Altitude=\u0627\u0631\u062a\u0641\u0627\u0639
Angle=\u0632\u0627\u0648\u06cc\u0647
@@ -51,7 +50,9 @@ Animation=\u0645\u062a\u062d\u0631\u06a9 \u0633\u0627\u0632\u06cc
AnimationLoop=\u0628\u0647 \u0635\u0648\u0631\u062a \u062a\u06a9\u0631\u0627\u0631 \u0634\u0648\u0646\u062f\u0647\u061f
AnimationSpeed=\u0633\u0631\u0639\u062a \u062d\u0631\u06a9\u062a
AnimationStep=\u062f\u0642\u062a \u0627\u0641\u0632\u0627\u06cc\u0634
+ApplicationName=\u062c\u0626\u0648\u062c\u0628\u0631\u0627
Apply=\u062a\u0623\u06cc\u06cc\u062f
+Apt=%0 \u0646\u0642\u0637\u0647
Arc=\u06a9\u0645\u0627\u0646
AsymptoteToA=%0 \u0645\u062c\u0627\u0646\u0628
Ath=%0
@@ -92,6 +93,7 @@ CircleWithCenterAThroughBAxisParallelToC=\u062f\u0627\u06cc\u0631\u0647 \u0628\u
CircleWithCenterAThroughBParallelToC=\u062f\u0627\u06cc\u0631\u0647 \u0628\u0647 \u0645\u0631\u06a9\u0632 %0 \u0627\u0632 \u0637\u0631\u06cc\u0635 %1\u060c\u200c\u0645\u0648\u0627\u0632\u06cc \u0628\u0627 %2
CircleWithCenterAandRadiusB=\u062f\u0627\u06cc\u0631\u0647 \u0628\u0627 \u0645\u0631\u06a9\u0632 %0 \u0648 \u0634\u0639\u0627\u0639 %1
CircleWithCenterAandRadiusBAxisParallelToC=\u062f\u0627\u06cc\u0631\u0647 \u0628\u0627 \u0645\u0631\u06a9\u0632 %0 \u0648 \u0634\u0639\u0627\u0639 %1\u060c \u0645\u062d\u0648\u0631 \u0645\u0648\u0627\u0632\u06cc \u0628\u0627 %2
+Clipboard.Blackboard=\u062a\u062e\u062a\u0647 \u0646\u06af\u0647 \u062f\u0627\u0631\u0646\u062f\u0647: \u062a\u062e\u062a\u0647 \u0633\u06cc\u0627\u0647
Clipboard.Google=\u062a\u062e\u062a\u0647 \u0646\u06af\u0647\u062f\u0627\u0631\u0646\u062f\u0647: \u06af\u0648\u06af\u0644 \u06af\u062c\u062a
Clipboard.HTML=\u062a\u062e\u0646\u0647 \u0646\u06af\u0647\u062f\u0627\u0631\u0646\u062f\u0647: html
Clipboard.MediaWiki=\u062a\u062d\u062a\u0647 \u0646\u06af\u0647\u062f\u0627\u0631\u0646\u062f\u0647: \u0645\u062f\u06cc\u0627 \u0648\u06cc\u06a9\u06cc
@@ -112,7 +114,6 @@ ConstructionProtocolHelp=<html><body><p><b>\u0637\u0631\u0632 \u0627\u0633\u062a
ConstructionProtocolNavigation=\u0646\u0648\u0627\u0631 \u067e\u06cc\u0645\u0627\u06cc\u0634 \u0645\u0631\u0627\u062d\u0644 \u062a\u0631\u0633\u06cc\u0645
Coordinates=\u0634\u06a9\u0644 \u0646\u0645\u0627\u06cc\u0634 \u0645\u062e\u062a\u0635\u0627\u062a
CopyToClipboard=\u062a\u0635\u0648\u06cc\u0631 \u0628\u0631\u062f\u0627\u0631\u06cc \u0635\u0641\u062d\u0647 \u062a\u0631\u0633\u06cc\u0645 \u0648 \u0627\u0646\u062a\u0642\u0627\u0644 \u0628\u0647 \u062a\u062e\u062a\u0647 \u0646\u06af\u0647 \u062f\u0627\u0631\u0646\u062f\u0647
-CopyToLaTeX=\u0631\u0648\u0646\u0648\u0634\u062a \u0628\u0647 \u0644\u0627\u062a\u06a9\u0633
CornerPoint=\u06af\u0648\u0634\u0647
CreatedWith=\u0627\u06cc\u0646 \u0627\u067e\u0644\u062a \u0627\u06cc\u062c\u0627\u062f \u0634\u062f\u0647 \u0627\u0633\u062a \u062a\u0648\u0633\u0637
CreatedWithGeoGebra=\u0627\u06cc\u0646 \u0645\u062d\u062a\u0648\u0627 \u0628\u0627 \u06a9\u0645\u06a9 \u0646\u0631\u0645 \u0627\u0641\u0632\u0627\u0631 \u062c\u0626\u0648\u062c\u0628\u0631\u0627 \u062a\u0648\u0644\u06cc\u062f \u0634\u062f\u0647 \u0627\u0633\u062a GeoGebra
@@ -214,7 +215,6 @@ IgnoreDocumentLayout=\u0646\u0627\u062f\u06cc\u062f\u0647 \u06af\u0631\u0641\u06
Image=\u062a\u0635\u0648\u06cc\u0631
ImplicitPoly=\u0645\u0646\u062d\u0646\u06cc \u0645\u0637\u0644\u0642
IncircleOfTriangleABC=\u062f\u0627\u06cc\u0631\u0647 \u0645\u062d\u0627\u0637\u06cc \u0627\u0632 \u0645\u062b\u0644\u062b %0%1%2
-IncludeJARFiles=\u0634\u0627\u0645\u0644 \u0641\u0627\u06cc\u0644 *.jar
Increasing=\u0627\u0641\u0632\u0627\u06cc\u0646\u062f\u0647
IncreasingOnce=\u0627\u0641\u0632\u0627\u06cc\u0646\u062f\u0647(\u064a\u0643\u0628\u0627\u0631)
Inequality=\u0646\u0627 \u0645\u0633\u0627\u0648\u06cc
@@ -233,7 +233,7 @@ Interpolate=\u06a9\u0634\u06cc\u062f\u0646 \u0628\u0627 \u062c\u0627 \u062f\u062
IntersectingLines=\u062e\u0637\u0648\u0637 \u0645\u062a\u0642\u0627\u0637\u0639
IntersectionCurveOfAB=\u0645\u062d\u0644 \u062a\u0642\u0627\u0637\u0639 \u0645\u0646\u062d\u0646\u06cc \u0627\u0632 %0\u060c %1
IntersectionLineOfAB=\u062e\u0637 \u062a\u0642\u0627\u0637\u0639 \u0628\u0627 %0\u060c\u200c %1
-IntersectionPathsOfAB=\u0645\u0633\u06cc\u0631 \u062a\u0642\u0627\u0637\u0639 \u0627\u0632 %0\u060c %1
+IntersectionOfAandB=\u0645\u0633\u06cc\u0631 \u062a\u0642\u0627\u0637\u0639 \u0627\u0632 %0\u060c %1
IntersectionPointOfAB=\u0646\u0642\u0637\u0647 \u062a\u0642\u0627\u0637\u0639 %0\u060c %1
IntersectionPointOfABNearC=\u0646\u0642\u0637\u0647 \u062a\u0642\u0627\u0637\u0639 \u0627\u0632 %0\u060c %1 \u0646\u0632\u062f\u06cc\u06a9 \u0646\u0642\u0637\u0647 %2
IntersectionPointOfABWithInitialValueC=\u0646\u0642\u0637\u0647 \u062a\u0642\u0627\u0637\u0639 %0\u060c %1 \u0628\u0627 \u0645\u0642\u062f\u0627\u0631 \u0627\u0648\u0644\u06cc\u0647 %2
@@ -329,12 +329,6 @@ PerspectiveName=\u0646\u0627\u0645 \u0646\u0645\u0627\u0647\u0627
Picture=\u062a\u0635\u0648\u06cc\u0631
PictureHeight=\u0627\u0631\u062a\u0641\u0627\u0639 \u062a\u0635\u0648\u06cc\u0631
PictureWidth=\u0639\u0631\u0636 \u062a\u0635\u0648\u06cc\u0631
-PlaneA=\u0635\u0641\u062d\u0647 %0
-PlaneContainingA=\u0635\u0641\u062d\u0647 \u0634\u0627\u0645\u0644 %0
-PlaneFromA=\u0635\u0641\u062d\u0647 \u0627\u06cc\u062c\u0627\u062f \u0634\u062f\u0647 \u0627\u0632 %0
-PlaneThroughAB=\u0645\u06cc\u0627\u0646 \u0633\u0637\u062d %0, %1
-PlaneThroughABC=\u0645\u06cc\u0627\u0646 \u0633\u0637\u062d %0, %1, %2
-PlaneThroughAParallelToB=\u0645\u06cc\u0627\u0646 \u0633\u0637\u062d%0 \u0645\u0648\u0627\u0632\u06cc \u0628\u0627 %1
Play=\u0627\u062c\u0631\u0627
PlayButton=\u062f\u06a9\u0645\u0647 \u0627\u062c\u0631\u0627
Point=\u0646\u0641\u0637\u0647
diff --git a/geogebra/properties/plain_fi.properties b/geogebra/properties/plain_fi.properties
index 1e40413..d449669 100644
--- a/geogebra/properties/plain_fi.properties
+++ b/geogebra/properties/plain_fi.properties
@@ -1,5 +1,3 @@
-2x2Matrix=2x2-matriisi
-3x3Matrix=3x3-matriisi
ADecimalPlace=%0 desimaali
ADecimalPlaces=%0 desimaalia
ADerivativeOfB=%1:n %0 derivaatta
@@ -301,9 +299,6 @@ PerspectiveName=N
Picture=Kuva
PictureHeight=Kuvan korkeus
PictureWidth=Kuvan leveys
-PlaneThroughAB=Taso pisteiden %0 ja %1 kautta
-PlaneThroughABC=Taso pisteiden %0, %1 ja %2 kautta
-PlaneThroughAParallelToB=Taso: pisteen %0 kautta, yhdensyyntainen %1 kanssa
Play=Käynnistä
PlayButton=Käynnistä-painike
Point=Piste
diff --git a/geogebra/properties/plain_fr.properties b/geogebra/properties/plain_fr.properties
index 68d86a5..9642c1a 100644
--- a/geogebra/properties/plain_fr.properties
+++ b/geogebra/properties/plain_fr.properties
@@ -1,5 +1,3 @@
-2x2Matrix=Matrice 2x2
-3x3Matrix=Matrice 3x3
ADecimalPlace=%0 décimale
ADecimalPlaces=%0 décimales
ADerivativeOfB=%0 dérivée de %1
@@ -35,6 +33,7 @@ Algebra=Alg
AlgebraWindow=Algèbre
AliesOnB=%0 appartient à %1
AliesOnThePerimeterOfB=%0 est sur le pourtour de %1
+AllowOfflineUse=Permettre utilisation hors ligne
AllowStyleBar=Barre de style autorisée
AltGr=AltGr
Altitude=Hauteur
@@ -110,7 +109,6 @@ ConstructionProtocolHelp=<html><body><p><b>Utilisation du protocole de construct
ConstructionProtocolNavigation=Navigation dans les étapes de construction
Coordinates=Coordonnées
CopyToClipboard=Copier dans Presse-papiers
-CopyToLaTeX=Copier vers LaTeX
CornerPoint=Coin
CreatedWith=Créé avec
CreatedWithGeoGebra=Créé avec GeoGebra
@@ -211,7 +209,6 @@ HyperbolaWithFociABandFirstAxisLengthC=Hyperbole de foyers %0 et %1 de longueur
IgnoreDocumentLayout=Ignorer présentation du document
ImplicitPoly=Courbe implicite
IncircleOfTriangleABC=Cercle inscrit dans le triangle %0%1%2
-IncludeJARFiles=Inclure les archives *.jar
Increasing=Croissant
IncreasingOnce=Une fois (croissant)
Inequality=Inégalité
@@ -230,7 +227,7 @@ Interpolate=Dessiner par interpolation
IntersectingLines=Hyperbole dégénérée
IntersectionCurveOfAB=Intersection des courbes %0, %1
IntersectionLineOfAB=Droite d'intersection de %0 et %1
-IntersectionPathsOfAB=Intersection des chemins %0, %1
+IntersectionOfAandB=Intersection des chemins %0 et %1
IntersectionPointOfAB=Point d'intersection de %0 et %1
IntersectionPointOfABNearC=Point d'intersection de %0 et %1 proche du point %2
IntersectionPointOfABWithInitialValueC=Point d'intersection de %0 et %1 avec %2 comme valeur de départ
@@ -322,12 +319,6 @@ PerspectiveName=Nom Disposition
Picture=Image
PictureHeight=Hauteur de la figure
PictureWidth=Largeur de la figure
-PlaneA=Plan %0
-PlaneContainingA=Plan contenant %0
-PlaneFromA=Plan créé à partir de %0
-PlaneThroughAB=Plan contenant %0 et %1
-PlaneThroughABC=Plan passant par %0, %1 et %2
-PlaneThroughAParallelToB=Plane passant par %0 et parallèle à %1
Play=Exécuter
PlayButton="Exécuter"
PointDep=Dépendant
@@ -339,6 +330,7 @@ PointOnA=Point sur %0
PointOnAClosestToB=Point de %0 le plus proche de %1
PointOnPath=Sur chemin
PointSize=Taille Point
+Points=Points
PolarCoords=Coordonnées polaires
PolarLineOfARelativeToB=Polaire de %0 par rapport à %1
PolyLine=Ligne brisée
diff --git a/geogebra/properties/plain_gl.properties b/geogebra/properties/plain_gl.properties
index 3994238..86d9df9 100644
--- a/geogebra/properties/plain_gl.properties
+++ b/geogebra/properties/plain_gl.properties
@@ -1,10 +1,9 @@
-2x2Matrix=Matriz 2x2
-3x3Matrix=Matriz 3x3
ADecimalPlace=%0 cifra decimal
ADecimalPlaces=%0 cifras decimais
ADerivativeOfB=%0 derivada de %1
ADilatedByFactorBfromC=%0 dilatado polo factor %1 dende %2
ADoesNotIntersectWithB=%0 non interseca con %1
+AGray=%0 Gris
AIntersectsWithB=%0 interseca con %1
AMirroredAtB=%0 reflectido respecto a %1
ARotatedByAngleB=%0 rotado polo ángulo %1
@@ -15,7 +14,7 @@ AandBareLinearlyDependent=%0 e %1 son linealmente dependentes
AandBareLinearlyIndependent=%0 e %1 son linealmente independentes
AandBareNotEqual=%0 e %1 non son iguais
AandBareParallel=%0 e %1 son paralelos
-AandBarePerpendicular=%0 e %1 son perpendiculais
+AandBarePerpendicular=%0 e %1 son perpendiculares
AandBcannotBeCompared=%0 e %1 non poden ser comparados
AbsoluteScreenLocation=Posición absoluta na pantalla
AdoesNotLieOnB=%0 non se acha sobre %1
@@ -34,6 +33,10 @@ Algebra=
AlgebraWindow=Xanela de álxebra
AliesOnB=%0 xace en %1
AliesOnThePerimeterOfB=%0 xace no perímetro de %1
+AllowOfflineUse=Incluíndo arquivos *.jar
+AllowStyleBar=Barra de estilo admitida
+AltGr=AltGr
+Altitude=Altura
Angle=Ángulo
AngleBetweenAB=Ángulo entre %0, %1
AngleBetweenABC=Ángulo entre %0, %1, %2
@@ -42,17 +45,20 @@ AngleBisectorOfAB=
AngleBisectorOfABC=Ángulo bisector de %0, %1, %2
AngleOfA=Ángulo de %0
Angles=Ángulos
+AnimatedGIFExport=Exporta GIF Animado
Animating=Animación activa
Animation=Animación
+AnimationLoop=¿Como bucle?
AnimationSpeed=Velocidade
AnimationStep=Incremento
Apply=Aplicar
Arc=Arco
AsymptoteToA=Asíntota de %0
-Ath=%0ava
+Ath=%0º
Author=Autor
+Automatic=Automático
AuxiliaryObject=Obxecto auxiliar
-AuxiliaryObjects=Obxectos auxiliais
+AuxiliaryObjects=Obxectos auxiliares
AxisLabel=Rótulo
AxisOfA=Eixe de %0
AxisTicks=Graduacións
@@ -62,24 +68,43 @@ BackgroundColor=Cor de fondo
BackgroundImage=Imaxe de fondo
Bold=Negra
Boolean=Valor booleano
-Breakpoint=Punto de quebra
+Breakpoint=Punto de pausa
+Button=Botón
+CAS=CAS - Cálculo Simbólico
+CASInitializing=Inicializando CAS
+CASTimedOut=CAS lapso de tempo
Cancel=Cancelar
Caption=Subtítulo
CartesianCoords=Coordenadas cartesianas
+CasTimeout=Tempo de espera de CAS (en segundos)
CellAisNotDefined=Cela %0 non definida
CenterOfA=Centro de %0
CentroidOfA=Centroide de %0
+CheckedNumerically=(controlado numericamente)
ChooseColor=Escoller unha cor
ChooseObject=Escoller un obxecto
Circle=Circunferencia
+CircleOfAxisAThroughB=Circunferencia de eixe %0 a través de %1
CircleThroughABC=Circunferencia pasando por %0, %1, %2
CircleThroughAwithCenterB=Circunferencia pasando por %0 con centro %1
+CircleWithCenterARadiusBParallelToC=Circunferencia con centro %0 e radio %1, paralela a %2
+CircleWithCenterAThroughBAxisParallelToC=Circunferencia con centro %0 a través de %1, eixe paralelo a %2
+CircleWithCenterAThroughBParallelToC=Circunferencia con centro %0 a través de %1, paralela a %2
CircleWithCenterAandRadiusB=Circunferencia con centro %0 e raio %1
+CircleWithCenterAandRadiusBAxisParallelToC=Circunferencia con centro %0 e raio %1, paralelo a %2
+Clipboard.Blackboard=Portapapeis: Blackboard
+Clipboard.Google=Portapapeis: Aparello Google
+Clipboard.HTML=Portapapeis: html
+Clipboard.MediaWiki=Portapapeis: MediaWiki
+Clipboard.Moodle=Portapapeis: Moodle
+Clipboard.iframe=Portapapeis: <iframe>
Color=Cor
-ColorfulConstructionProtocol=Protocolo de construción colorido
+ColorfulConstructionProtocol=Protocolo de construción en cores
Command=Comando
+CommonTangentOfCirclesAandB=Tanxente común ás circunferencias %0 e %1
ComplexNumber=Número complexo
Conic=Cónica
+ConicFromCoeffListA=Cónica desde %0
ConicThroughABCDE=Cónica pasando por %0, %1, %2, %3, %4
Conics=Cónicas
ConstructionProtocol=Protocolo de construción
@@ -90,30 +115,49 @@ Coordinates=Coordenadas
CopyToClipboard=Copiar ao portapapeis
CornerPoint=Esquina
CreatedWith=Creado con
+CreatedWithGeoGebra=Creado con GeoGebra
+CrossAt=Cruzamento en
Curve=Curva
Date=Data
+Day.1=Domingo
+Day.2=Luns
+Day.3=Martes
+Day.4=Mércores
+Day.5=Xoves
+Day.6=Venres
+Day.7=Sábado
Decoration=Decoración
Decreasing=Decrecente
Default=Predefinido
+DefaultPointStyle=Estilo do Punto por defecto
+Defaults=Patróns por defecto
Definition=Definición
Delete=Borrar
+DeleteRowA=Elimina Fila %0
+DeleteRowsAtoB=Elimina Filas %0 ata %1
DependentObjects=Obxectos dependentes
DerivativeOfA=Derivada de %0
DiameterOfAConjugateToB=Diámetro de %0 conxugado de %1
-DirectionOfA=Dirección of %0
+Dimensions=Dimensións
+DirectionOfA=Dirección de %0
Directrix=Directriz
DirectrixOfA=Directriz de %0
+Display=Amosa
DisplayPointSymbol=Amosar o símbolo para puntos
DistanceOfAandB=Distancia de %0 a %1
DoubleClickToOpen=Dobre clic na zona gráfica para abrir a xanela da aplicación
DoubleLine=Recta dobre
Down=Debaixo
DrawingPad=Zona gráfica
+DrawingPad2=Zona gráfica 2
+DrawingPadA=Gráficos %0
DrawingPadAsPSTricks=Zona gráfica como PSTricks
DrawingPadAsPicture=Zona gráfica como Imaxe
DrawingPagAsPGF=Zona gráfica como PGF/TikZ
+DynamicCoordinatesOfA=Coordenadas dinámicas de %0
DynamicWorksheet=Folla de traballo dinámica
DynamicWorksheetAsWebpage=Folla de traballo dinámica como páxina web
+DynamicWorksheetExport=Exporta folla dinámica (html)
EccentricityOfA=Excentricidade de %0
Edit=Editar
Ellipse=Elipse
@@ -121,27 +165,45 @@ EllipseWithFociABPassingThroughC=Elipse con focos %0, %1 pasando por %2
EllipseWithFociABandFirstAxisLengthC=Elipse con focos %0, %1 e a lonxitude do primeiro eixe %2
EmphasizeRightAngle=Salientar angulo recto
EmptySet=Conxunto baleiro
+EnableScripting=Admite guións (Scripting)
Equation=Ecuación
+ErrorInJavaScript=Erro en JavaScript
+ErrorInJavaScriptAtLineA=Erro en JavaScript na liña %0
+ErrorInScriptAtLineAFromObjectB=Erro no guión na liña %0 (chamada desde %1)
ExplicitLineEquation=y = a x + b
ExplicitLineGradient=a
+ExportAnimatedGIF=Vista gráfica como GIF Animado
+ExportAsPicture=Exporta como imaxe gráfica
ExportAsWebpage=Exportar como páxina web
ExportTextAsShapes=Exportar texto como figuras
+ExtendedForm=Formulario estendido
+ExtraLarge=Extra grande
+ExtraSmall=Extra reducido
ExtremumOfA=Extremo de %0
+File.HTML=Arquivo: html
+File.SCORM=Arquivo: SCORM
Filling=Recheo
Finish=Final
-FirstAxisLengthOfA=Lonxitude do primeiro eixe de %0
-FirstAxisOfA=Primeiro eixe de %0
+FirstAxisLengthOfA=Lonxitude do semi-eixe principal de %0
+FirstAxisOfA=Semi-eixe principal de %0
FixCheckbox=Fixar caixa de verificación
FixObject=Fixar obxecto
FocusOfA=Foco de %0
ForceGnuplotPgf=Empregar gnuplot para debuxar funcións
Format=Formato
-FreeObjects=Obxectos Independentes
+FreeObjects=Obxectos libres
Function=Función
FunctionAonIntervalBC=Función %0 no intervalo [%1, %2]
+FunctionNVar=Función
+General=Xeral
GeneratePgf=Xerar código PGF/TikZ
GeneratePstricks=Xerar código PSTricks
GeometricObjects=Obxectos xeométricos
+GlobalJavaScript=JavaScript Global
+GoToDownloadPage=Ir á páxina de descarga
+GraphicsViewAsAsymptote=Vista gráfica como Asymptote
+GreekCharacterA=Carácter grego: %0
+GridType=Tipo de cuadrícula
Height=Altura
Hexagon=Hexágono
Hide=Agochar
@@ -149,24 +211,40 @@ Home=Inicio
HorizontalSplit=División horizontal
Hyperbola=Hipérbole
HyperbolaWithFociABPassingThroughC=Hipérbole con focos %0, %1 pasando por %2
-HyperbolaWithFociABandFirstAxisLengthC=Hipérbole con focos %0, %1 e a lonxitude do primeiro eixe %2
+HyperbolaWithFociABandFirstAxisLengthC=Hipérbole con focos %0, %1 e a lonxitude do semi-eixe principal %2
+IgnoreDocumentLayout=Ignora disposición do documento
Image=Imaxe
+ImplicitPoly=Curva implícita
+IncircleOfTriangleABC=Circunferencia inscrita no triángulo %0%1%2
Increasing=Crecente
+IncreasingOnce=Incrementando (unha vez)
Inequality=Desigualdade
InflectionPointofA=Punto de inflexión de %0
InputFieldHelp=<html><body><p><b>Empregando a barra de entradas</b></p><table border="1"><tr><td>Intro</td><td>Executar a entrada</td></tr><tr><td Esc</td><td>Limpar barra de entradas</td></tr><tr><td>↑</td><td>Entrada anterior</td></tr><tr><td>↓</td><td>Entrada posterior</td></tr><tr><td>F1</td><td>Axuda sobre o comando actual</td></tr></table><p><br><b>Autocompletar comandos</b><br>Logo de escribir as dúas primeiras letras <br>dun comando, éste aparecerá completo.</p><table border="1"><tr><td>Intro</td><td>Aceptar o comando proposto</td></tr><tr><td>Outra letra</td><td>Proseguir escribindo</td></tr></table><body></html>
+InputForm=Formulario de entrada
InputLabel=Entrada
InputLabelToolTip=Escribir un comando
Insert=Inserir
+InsertPictureOfAllOpenViews=Inserir imaxe de todas as vistas abertas
InsertPictureOfConstruction=Inserir imaxe da construción
+Integer=Enteiro
IntegralOfA=Integral de %0
IntegralOfAfromBtoC=Integral de %0 dende %1 ata %2
+Interpolate=Trazar con interpolación
IntersectingLines=Rectas secantes
+IntersectionCurveOfAB=Curvas de intersección de %0, %1
+IntersectionLineOfAB=Recta de intersección de %0, %1
+IntersectionOfAandB=Intersección de %0 e %1
IntersectionPointOfAB=Punto de intersección de %0, %1
+IntersectionPointOfABNearC=Punto de intersección de %0, %1 nas proximidades do punto %2
IntersectionPointOfABWithInitialValueC=Punto de intersección de %0, %1 con valor inicial %2
Interval=Intervalo
+InverseFilling=Inverte recheo
Italic=Cursiva
+Keyboard=Teclado
LaTeXFormula=Fórmula LaTeX
+LaTeXHelp=Axuda Latex
+Large=Grande
LatexFontSize=Tamaño de fonte do documento:
Layer=Capa
Length=Lonxitude
@@ -180,27 +258,59 @@ LineThroughAB=Recta pasando por %0, %1
LineThroughAParallelToB=Recta pasando por %0 paralela a %1
LineThroughAPerpendicularToB=Recta pasando por %0 perpendicular a %1
LineThroughAwithDirectionB=Recta pasando por %0 con dirección %1
-LinearEccentricityOfA=Excentricidade linear de %0
-LinearInequality=Desigualdade linear
+LinearEccentricityOfA=Excentricidade lineal de %0
+LinearInequality=Desigualdade lineal
Lines=Rectas
+LinkedObject=Obxecto vinculado
List=Lista
+LocalizedDigits=Empleo localizado de díxitos
+LocalizedLabels=Empleo localizado de nomes de puntos
+LockObject=Bloquea obxecto
Locus=Lugar xeométrico
+Medium=Mediano
Midpoint=Punto medio
MidpointOfA=Punto medio de %0
MidpointOfAB=Punto medio entre %0, %1
+Miscellaneous=Miscelánea
+Month.1=Xaneiro
+Month.10=Outubro
+Month.11=Novembro
+Month.12=Decembro
+Month.2=Febreiro
+Month.3=Marzo
+Month.4=Abril
+Month.5=Maio
+Month.6=Xuño
+Month.7=Xullo
+Month.8=Agosto
+Month.9=Setembro
Name=Nome
+Name.button=botón
Name.list=lista
Name.locus=lugar
Name.matrix=matriz
Name.picture=imaxe
Name.polygon=polígono
Name.text=texto
-NameAndValue=Nome e Valor
+Name.textfield=campoDeTexto
+NameAndValue=Nome e valor
+NewExpression=Nova expresión
NewNameForA=Novo nome para %0
+NewerVersionA=Disponse dunha versión máis recente de GeoGebra.\nDesexa instalar agora GeoGebra %0?
Next=Seguinte
+NextCell=Seguinte cela
+NoJavaMessage=Este é un Applet de Java creado con GeoGebra desde www.geogebra.org \u2013 Java non parece estar instalado Java no seu equipo. Aconséllase dirixirse a www.java.com
+NotAvailable=Non dispoñible
+NotIncluded=non incluído
Numeric=Número
NumericObjects=Obxectos numéricos
Objects=Obxectos
+Off=Desactivado
+OldExpression=Antiga expresión
+On=Activado
+OnClick=Ao premer
+OnMouseOver=Ao pasar o rato
+OnUpdate=Ao actualizar
Open=Abrir
OpenButton=Botón para abrir a xanela da aplicación coa construción
Oscillating=Oscilante
@@ -222,19 +332,32 @@ Play=Reproducir
PlayButton=Botón de reprodución
Point=Punto
PointAplusB=Punto %0 + %1
+PointDep=Dependente
+PointFree=Libre
+PointInA=Punto en %0
+PointInside=Dentro da rexión
PointOn=Punto en
PointOnA=Punto en %0
-PointSize=Tamaño do Punto
+PointOnAClosestToB=Punto sobre %0 máis próximo a %1
+PointOnPath=Sobre traxecto
+PointSize=Tamaño do punto
Points=Puntos
PolarCoords=Coordenadas polares
PolarLineOfARelativeToB=Recta polar de %0 relativa a %1
+PolyLine=Poligonal
Polygon=Polígono
+PositiveDirectionOnly=Unicamente rama positiva
+PositiveValuesFollowTheView=Valores positivos próximos á vista
+PreviewUnavailable=Previsualización inaccesible
+ProbabilityCalculator=Cálculos de probabilidade
Properties=Propiedades
Quadrangle=Cuadrángulo
Quadrilateral=Cuadrilátero
Question=Cuestión
Radius=Raio
RadiusOfA=Raio de %0
+Random=Aleatorio
+Range=Rango
Ray=Semirrecta
RayThroughAB=Semirrecta pasando por %0, %1
RayThroughAWithDirectionB=Semirrecta pasando por %0 con dirección %1
@@ -242,61 +365,112 @@ Redefine=Redefinir
Remove=Eliminar
Rename=Renomear
Repeat=Repetir
+ResizeAngle=Reaxuste angular automático
ResolutionInDPI=Resolución en dpi
+ReverseMouseWheel=Inverte a roda do rato
RootOfA=Raíces de %0
RootOfAWithInitialValueB=Raíces de %0 con valor inicial %1
RootOfAonIntervalBC=Raíces de %0 no intervalo [%1, %2]
ScaleInCentimeter=Escala en cm
-SecondAxisLengthOfA=Lonxitude do segundo eixe de %0
-SecondAxisOfA=Segundo eixe de %0
+Script=Guión (Script) GeoGebra
+Scripting=Programa de Guión - Scripting
+SecondAxisLengthOfA=Lonxitude do semi-eixe secundario de %0
+SecondAxisOfA=Eixe secundario de %0
Segment=Segmento
SegmentAB=Segmento [%0, %1]
SegmentABofC=Segmento [%0, %1] de %2
+Selection=Selección
+SelectionAllowed=Selección habilitada
Semicircle=Semicircunferencia
-SemicircleThroughAandB=Semicircunferencia pasando por %0 and %1
+SemicircleThroughAandB=Semicircunferencia pasando por %0 e %1
Show=Amosar
ShowAllObjects=Amosar todos os obxectos
+ShowAutomatically=Amosa automáticamente
+ShowAxes=Amosa eixes
+ShowAxisNumbers=Amosa números
+ShowGrid=Amosa cuadrícula
ShowLabel=Amosar rótulo
ShowObject=Amosar obxecto
+ShowOnXAxis=Expón sobre eixeX
+ShowOnlineHelp=Expón axuda en liña
ShowOnlyBreakpoints=Amosar só os puntos de quebra
+ShowTitleBar=Expón barra de título
ShowTrace=Amosar rastro
+ShowTrimmed=Amosa intersección en prolongacións
+ShowxAxis=Amosa eixeX
+ShowyAxis=Amosa eixeY
+SimpleFormulas=Fórmulas simples
Size=Tamaño
Slider=Esvarador
SlopeOfA=Pendente de %0
+Small=Pequeno
Speed=Velocidade
+SphereThroughAwithCenterB=Esfera a través de %0 con centro en %1
+SphereWithCenterAandRadiusB=Esfera con centro en %0 e raio %1
Spreadsheet=Folla de cálculo
StandardObject=Obxecto estándar
StandardView=Visualización estándar
StartingPoint=Orixe
+StemPlot.KeyAMeansB=Tecla: %0 implica %1
+StemPlot.high=alto
+StemPlot.low=baixo
+StickToEdge=Adhesión ao bordo
+StopScript=Detén o guión
Substitute=Substituír
-SubstituteSimplify=Substituír e Simplificar
+SubstituteForAinB=Substituír %0 por %1
+SubstituteSimplify=Substituír e simplificar
+Syntax=Sintaxe
SyntaxErrorAisNotAList=Erro: %0 non é unha lista
+SystemInformation=Información do sistema
+SystemInformationMessage=Información do sistema adecuadamente copiada ao portapapeis
TangentToAParallelToB=Tanxente a %0 paralela a %1
TangentToAThroughB=Tanxente a %0 pasando por %1
TangentToAatB=Tanxente a %0 en %1
Text=Texto
TextAfterConstruction=Texto embaixo da construción
TextBeforeConstruction=Texto enriba da construción
+TextField=Caixa de entrada
+TextfieldLength=Lonxitude do campo de texto
Thickness=Grosor de liña
TickDistance=Distancia
+TimeBetweenFrames=Tempo entre cadros
Title=Título
TitleExportPgf=Exportar GeoGebra a PGF
TitleExportPstricks=Exportar GeoGebra a PSTricks
+ToggleStyleBar=Barra de estilo activa/inactiva
+ToolbarIcon=Icona de barra de ferramentas
+ToolbarIconsConstructionProtocolExport=Expone iconas de barra de ferramentas
+TooltipLanguage=Idioma de apuntes
+TooltipTimeout=Prazo dos apuntes (en segundos)
+Tooltips=Apuntes
TraceOff=Desactivar rastro
TraceOn=Activar rastro
TraceToSpreadsheet=Rexistrar na folla de cálculo
TranslationOfAbyB=Translación de %0 por %1
TranslationOfAtoB=Translación de %0 a %1
+TreeModeDependency=Organiza obxectos por orde de dependencia
+TreeModeLayer=Ordena obxectos por capa
+TreeModeType=Ordena oxectos por tipo
+TreeModeView=Ordena obxectos por vista
Triangle=Triángulo
-UnitVectorOfA=Versor de %0
-UnitVectorPerpendicularToA=Versor perpendicular a %0
-Up=Derriba
+UnitVectorOfA=Vector de %0
+UnitVectorPerpendicularToA=Vector perpendicular a %0
+UntitledConstruction=Construción sen título
+Up=Arriba
+Upload=Cargar
+UploadError=Sen acceso a GeoGebraTube. Transferencia detida (Código de erro: %0)
+UploadPrepare=Preparación de transferencia
+UseJavaFontsForLaTeX=Usar tipografía Java para textos LaTeX
Value=Valor
VectorPerpendicularToA=Vector perpendicular a %0
Vectors=Vectores
VertexOfA=Vértice de %0
+VeryLarge=Moi grande
+VerySmall=Moi pequeno
ViewCloseExtraWindow=Amosar vista na xanela principal
ViewOpenExtraWindow=Amosar vista en nova xanela
+VirtualKeyboard=Teclado virtual
+VirtualKeyboardLanguage=Idioma do teclado virtual
Width=Ancho
WindowOpened=Xanela aberta
XMLTagANotFound=Ficheiro non válido: XML tag %0 non atopado
@@ -304,32 +478,84 @@ XUnits=X unidades (cm)
YUnits=Y unidades (cm)
ZoomIn=Achegar
ZoomOut=Afastar
-allowOutlyingIntersections=Permitir interseccións periféricas
-allowReflexAngle=Permitir ángulo reflexo
-back=atrás
-cartesian=cartesiano
+allowOutlyingIntersections=Permitir interseccións nas prolongacións
+allowReflexAngle=Permitir ángulos cóncavos
+back=Atrás
+cartesian=Cartesiano
clockwise=sentido horario
counterClockwise=sentido antihorario
dependent=dependente
dilatedByFactor=dilatado polo factor
+emf=Meta formato enriquecido
+eps=Postscript encapsulado
equal=igual
firstAxisLength=lonxitude do eixe principal
-fixed=fixo
+fixed=Fixo
+fncInspector.Curvature=Curvatura
+fncInspector.Derivative=Derivada
+fncInspector.Derivative2=Segunda derivada
+fncInspector.Difference=Diferenza
+fncInspector.Interval=Intervalo
+fncInspector.MultipleRoots=Múltiples raíces
+fncInspector.NoRoots=Sen raíces
+fncInspector.Points=Puntos
+fncInspector.Property=Propiedade
+fncInspector.ShowArea=Expón área
+fncInspector.Value=Valor
+fncInspector.addColumn=Engade unha columna
+fncInspector.removeColumn=Elimina última columna
+fncInspector.showOscCircle=Expón círculo osculatorio
+fncInspector.showTable=Expón táboa de puntos
+fncInspector.showTangent=Expón recta tanxente
+fncInspector.showXYLines=Expón posición x, y de rectas
+fncInspector.step=Tamaño de paso para valores x
forceReflexAngle=Forzar ángulo reflexo
forward=adiante
-free=independente
+free=libre
html=Páxina web
jpg=Formato JPG
-max=máx
-min=mín
+max=Máx
+min=Mín
off=desactivado
+otherwise=en caso contrario
parallel=paralela
+pdf=Formato de documento pdf
+png=Formato de gráficos png
resetConstruction=Reinicializar construción
+stylebar.Align=Fixa alineación horizontal
+stylebar.AlignCenter=Central
+stylebar.AlignLeft=Alineación esquerda
+stylebar.AlignRight=Alineación dereita
+stylebar.Axes=Expón ou oculta os eixes
+stylebar.BgColor=Fixa a cor de fondo
+stylebar.Bold=Fixa o estilo tipográfico en negriña
+stylebar.Border=Fixa o límite
+stylebar.Bracket=Fixa o estilo das chaves
+stylebar.Caption=Fixa o estilo de subtítulo
+stylebar.Capture=Fixa o estilo de punto de captura
+stylebar.Color=Fixa a cor
+stylebar.ColorTransparency=Fixa cor e transparencia
+stylebar.CopyVisualStyle=Copia estilo visual
+stylebar.Eraser=Borra trazo de pluma
+stylebar.Grid=Expón ou oculta a cuadrícula
+stylebar.Hidden=Ocultos
+stylebar.HorizontalLine=Expón ou oculta as liñas horizontais
+stylebar.Italic=Fixa o estilo tipográfico en itálica
+stylebar.Label=Fixa estilo de rótulo
+stylebar.LineStyle=Fixa estilo de rectas
+stylebar.Pen=Traza en tinta
+stylebar.PointStyle=Fixa estilo do punto
+stylebar.TextColor=Fixa cor do texto
+stylebar.TextSize=Fixa medida do texto
+stylebar.VerticalLine=Expón ou oculta liñas verticais
+svg=Formato de gráfico SVG
undefined=indefinido
unequal=desigual
-xAxis=EixeX
+xAxis=eixeX
xmax=xmáx
xmin=xmín
-yAxis=EixeY
+xstep=Paso X
+yAxis=eixeY
ymax=ymáx
-ymin=ymín
\ No newline at end of file
+ymin=ymín
+ystep=Paso Y
\ No newline at end of file
diff --git a/geogebra/properties/plain_hr.properties b/geogebra/properties/plain_hr.properties
index a1a1667..362ba08 100644
--- a/geogebra/properties/plain_hr.properties
+++ b/geogebra/properties/plain_hr.properties
@@ -1,5 +1,3 @@
-2x2Matrix=matrica 2x2
-3x3Matrix=matrica 3x3
ADecimalPlace=%0 decimalno mjesto
ADecimalPlaces=%0 decimal. mjesta
ADerivativeOfB=%0 derivacija od %1
@@ -33,6 +31,7 @@ AisaDegenerateBranchOfB=%0 je degenerirani slu\u010daj od %1
AisaTangentToB=%0 je tangenta od %1
AliesOnB=%0 le\u017ei na %1
AliesOnThePerimeterOfB=%0 le\u017ei na obodu %1
+AllowOfflineUse=Uklju\u010di *.jar datoteke
AllowStyleBar=Prika\u017ei traku sa stilovima
Altitude=Visina
Angle=Kut
@@ -110,7 +109,6 @@ ConstructionProtocolHelp=<html><body><p><b>Uporaba opisa konstrukcije</b></p><p>
ConstructionProtocolNavigation=Traka za korake konstrukcije
Coordinates=Koordinate
CopyToClipboard=Kopiraj u me\u0111uspremnik
-CopyToLaTeX=Kopiraj u LaTeX
CornerPoint=Ugao
CreatedWith=Izra\u0111eno programom
CreatedWithGeoGebra=Izra\u0111eno GeoGebrom
@@ -214,7 +212,6 @@ IgnoreDocumentLayout=Zanemari izgled dokumenta
Image=Slika
ImplicitPoly=Implicitno zadana krivulja
IncircleOfTriangleABC=Upisana kru\u017enica trokuta %0%1%2
-IncludeJARFiles=Uklju\u010di *.jar datoteke
Increasing=rastu\u0107e
IncreasingOnce=rastu\u0107e (jednom)
Inequality=Nejednad\u017eba
@@ -233,7 +230,7 @@ Interpolate=Nacrtaj interpolacijom
IntersectingLines=Ukr\u0161teni pravci
IntersectionCurveOfAB=Presje\u010dna krivulja od %0, %1
IntersectionLineOfAB=Presje\u010dnica od %0, %1
-IntersectionPathsOfAB=Presje\u010dna putanja od %0, %1
+IntersectionOfAandB=Presjek od %0 i %1
IntersectionPointOfAB=Sjeci\u0161te od %0, %1
IntersectionPointOfABNearC=Sjeci\u0161te od %0, %1 blizu to\u010dke %2
IntersectionPointOfABWithInitialValueC=Sjeci\u0161te od %0, %1 s po\u010detnom vrijedno\u0161\u0107u %2
@@ -326,12 +323,6 @@ PerspectiveName=Naziv prikaza
Picture=Crte\u017e
PictureHeight=Visina crte\u017ea
PictureWidth=\u0160irina crte\u017ea
-PlaneA=ravnina %0
-PlaneContainingA=Ravnina sadr\u017ei %0
-PlaneFromA=ravnina konstruirana iz %0
-PlaneThroughAB=Ravnina kroz %0, %1
-PlaneThroughABC=Ravnina kroz %0, %1, %2
-PlaneThroughAParallelToB=Ravnina kroz %0 usporedna s %1
Play=Pokreni
PlayButton=Gumb za pokretanje
Point=To\u010dka
@@ -345,7 +336,7 @@ PointOnA=To\u010dka na %0
PointOnAClosestToB=To\u010dka na %0 koja je najbli\u017ea %1
PointOnPath=Na putanji
PointSize=Veli\u010dina to\u010dke
-Points=To\u010dke
+Points=Vrhovi
PolarCoords=Polarne koordinate
PolarLineOfARelativeToB=Polara od %0 u odnosu na %1
PolyLine=Razlomljena crta
diff --git a/geogebra/properties/plain_hu.properties b/geogebra/properties/plain_hu.properties
index 057ab00..989d03d 100644
--- a/geogebra/properties/plain_hu.properties
+++ b/geogebra/properties/plain_hu.properties
@@ -1,5 +1,3 @@
-2x2Matrix=2x2-es mátrix
-3x3Matrix=3x3-as mátrix
ADecimalPlace=Tizedes jegyek száma %0
ADecimalPlaces=Tizedes jegyek száma %0
ADerivativeOfB=%1 %0 deriváltja
@@ -34,6 +32,7 @@ AisaTangentToB=%0 %1
AlgebraWindow=Algebra ablak
AliesOnB=%0 %1-n fekszik
AliesOnThePerimeterOfB=%0 %1 kerületén fekszik
+AllowOfflineUse=Kapcsolat nélküli munka engedélyezése
AllowStyleBar=Formázó léc engedélyezése
Altitude=Magasság
Angle=Szög
@@ -82,9 +81,14 @@ CheckedNumerically=(numerikusan ellen\u0151rz
ChooseColor=Válassz színt
ChooseObject=Válassz egy alakzatot
Circle=Kör
+CircleOfAxisAThroughB=Kör %0 tengellyel %1 ponton át
CircleThroughABC=Kör %0, %1, %2 pontokon át
CircleThroughAwithCenterB=Kör %1 középponttal, %0 kerületi ponttal
+CircleWithCenterARadiusBParallelToC=Kör %0 középponttal, %1 sugárral, párhuzamos %2 -vel
+CircleWithCenterAThroughBAxisParallelToC=Kör %0 középponttal. %1 ponton át, tengelye párhuzamos %2 -vel
+CircleWithCenterAThroughBParallelToC=Kör %0 középponttal, %1 ponton át, párhuzamos %2 -vel
CircleWithCenterAandRadiusB=%0 középpontú %1 sugarú kör
+CircleWithCenterAandRadiusBAxisParallelToC=Kör %0 középponttal, %1 sugárral, tengelye párhuzamos %2-vel
Clipboard.Blackboard=Vágólap: Blackboaard
Clipboard.Google=Vágólap: Google Gadget
Clipboard.HTML=Vágólap: html
@@ -106,7 +110,6 @@ ConstructionProtocolHelp=<html><body><p><b>A szerkeszt
ConstructionProtocolNavigation=Navigációs eszköztár a szerkesztési lépésekhez
Coordinates=Koordináták
CopyToClipboard=Vágólapra másolás
-CopyToLaTeX=Másolás LaTeX-be
CornerPoint=Sarokpont
CreatedWith=Készítette a
CreatedWithGeoGebra=Ez a dokumentum a GeoGebra programmal készült.
@@ -195,6 +198,7 @@ GeneratePgf=PGF/TikZ k
GeneratePstricks=PSTricks kód generálása
GeometricObjects=Mértani alakzatok
GlobalJavaScript=Teljes Javascript
+GoToDownloadPage=Tovább az oldal letöltéséhez
GraphicsViewAsAsymptote=Rajzlap Asymptote kódként
GreekCharacterA=Görög bet\u0171: %0
GridType=Rács típusa
@@ -210,7 +214,6 @@ IgnoreDocumentLayout=Munkalapok fed
Image=Kép
ImplicitPoly=Implicit görbe
IncircleOfTriangleABC=%0%1%2 háromszög beírt köre
-IncludeJARFiles=Tartalmaz jar fájlokat
Increasing=Növekv\u0151
IncreasingOnce=Növekv\u0151 (Egyszer)
Inequality=Egyenl\u0151tlenség
@@ -229,7 +232,7 @@ Interpolate=Rajzol
IntersectingLines=Egymást metsz\u0151 egyenesek
IntersectionCurveOfAB=%0 és %1 metszésvonala
IntersectionLineOfAB=%0 és %1 metszésvonala
-IntersectionPathsOfAB=%0 és %1 metszésvonala
+IntersectionOfAandB=%0 és %1 metszésvonala
IntersectionPointOfAB=%0 és %1 metszéspontja
IntersectionPointOfABNearC=%0 és %1 metszéspontja %2 közelében
IntersectionPointOfABWithInitialValueC=%0 és %1 metszéspontja %2 kezd\u0151értékkel
@@ -321,12 +324,6 @@ PerspectiveName=Munkaasztal elnevez
Picture=Kép
PictureHeight=Képmagasság
PictureWidth=Képszélesség
-PlaneA=%0 sík
-PlaneContainingA=%0-t tartalmazó sík
-PlaneFromA=sík %0-ból
-PlaneThroughAB=%0, %1-en áthaladó sík
-PlaneThroughABC=%0, %1, %2-n áthaladó sík
-PlaneThroughAParallelToB=%0- áthaladó, %1-vel párhuzamos sík
Play=Lejátszás
PlayButton=Lejátszás gomb
Point=Pont
@@ -346,6 +343,7 @@ PolarLineOfARelativeToB=%0 %1-ra/-re vonatkoz
PolyLine=Törött vonal
Polygon=Sokszög
PositiveDirectionOnly=Csak pozitív irány
+PositiveValuesFollowTheView=Pozitív értékek
PreviewUnavailable=El\u0151nézet nincs
ProbabilityCalculator=Valószín\u0171ség számítás
Properties=Tulajdonságok
@@ -355,6 +353,7 @@ Question=K
Radius=Sugár
RadiusOfA=%0 sugara
Random=Véletlen
+Range=Skála
Ray=Félegyenes
RayThroughAB=%0 és %1 által meghatározott félegyenes
RayThroughAWithDirectionB=%0 végpontú %1 irányvektor által meghatározott félegyenes
@@ -416,8 +415,8 @@ StopScript=Script le
Substitute=Behelyettesít
SubstituteForAinB=%0-t behelyettesíti %1-be
SubstituteSimplify=Behelyettesít & egyszer\u0171sít
-Syntax=Szintakszis
-SyntaxErrorAisNotAList=Hiba: %0 nem lista
+Syntax=Szintaxis
+SyntaxErrorAisNotAList=Szintaktikai hiba: %0 nem lista
SystemInformation=Rendszer információk
SystemInformationMessage=Rendszer információk másolása vágólapra sikeresen megtörtént
TangentToAParallelToB=Érint\u0151 %0-hoz/-hez %1-val/-vel parhuzamosan
@@ -455,7 +454,7 @@ UnitVectorPerpendicularToA=Mer\u0151leges egys
UntitledConstruction=Névtelen szerkesztés
Up=Fel
Upload=Feltöltés
-UploadError=A GeoGebra Tube nem érhet\u0151 el. A feltöltés megszakadt. (Hibakód. %0)
+UploadError=A GeoGebra Tube nem érhet\u0151 el. A feltöltés megszakadt. (Hibakód: %0)
UploadPrepare=Feltöltés el\u0151készítése
UseJavaFontsForLaTeX=Java fontok használata Latex szövegben
Value=Érték
@@ -497,7 +496,7 @@ fncInspector.Interval=Intervallum
fncInspector.MultipleRoots=Több gyök
fncInspector.NoRoots=Nincs gyök
fncInspector.Points=Pontok
-fncInspector.Property=Tulajdonság
+fncInspector.Property=Jellemz\u0151
fncInspector.ShowArea=Terület mutatása
fncInspector.Value=Érték
fncInspector.addColumn=Oszlop hozzáadása
@@ -516,7 +515,7 @@ jpg=JPG form
max=max
min=min
off=ki
-otherwise=másképp
+otherwise=különben
parallel=párhuzamos
pdf=Portable Document Format (.pdf)
png=Portable Network Graphics (.png)
diff --git a/geogebra/properties/plain_hy.properties b/geogebra/properties/plain_hy.properties
new file mode 100644
index 0000000..f7d7510
--- /dev/null
+++ b/geogebra/properties/plain_hy.properties
@@ -0,0 +1,557 @@
+ADecimalPlace=%0 \u0576\u056b\u0577 \u057d\u057f\u0578\u0580\u0561\u056f\u0565\u057f\u056b\u0581 \u0570\u0565\u057f\u0578
+ADecimalPlaces=%0 \u0576\u056b\u0577 \u057d\u057f\u0578\u0580\u0561\u056f\u0565\u057f\u056b\u0581 \u0570\u0565\u057f\u0578
+ADerivativeOfB=%1-\u056b %0 \u056f\u0561\u0580\u0563\u056b \u0561\u056e\u0561\u0576\u0581\u056b\u0561\u056c\u0568
+ADilatedByFactorBfromC=%0-\u0576 \u0565\u0576\u0569\u0561\u0580\u056f\u057e\u0565\u056c \u0567 %2 \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u0578\u057e \u0587 %1 \u0563\u0578\u0580\u056e\u0561\u056f\u0581\u0578\u057e \u0570\u0578\u0574\u0578\u057f\u0565\u057f\u056b\u0561\u0575\u056b
+ADoesNotIntersectWithB=%0-\u0568 \u0579\u056b \u0570\u0561\u057f\u057e\u0578\u0582\u0574 %1-\u056b \u0570\u0565\u057f
+AGray=%0 \u0533\u0578\u0580\u0577
+AIntersectsWithB=%0-\u0568 \u0570\u0561\u057f\u057e\u0578\u0582\u0574 \u0567 %1-\u056b \u0570\u0565\u057f
+AMirroredAtB=%0-\u056b \u0570\u0561\u0574\u0561\u0579\u0561\u057a\u0576 \u0567 %1-\u056b \u0576\u056f\u0561\u057f\u0574\u0561\u0574\u0562
+ARotatedByAngleB=%0-\u0568 %1 \u0561\u0576\u056f\u0575\u0578\u0582\u0576\u0578\u057e \u057a\u057f\u057f\u057e\u0561\u056e\u0576 \u0567
+ASignificantFigure=%0-\u0561\u0576\u056b\u0577 \u0569\u056b\u057e
+ASignificantFigures=%0 \u0569\u057e\u0561\u0576\u0577\u0561\u0576
+AandBareEqual=%0-\u0568 \u0587 %1-\u0568 \u0570\u0561\u0574\u0561\u0580\u056a\u0565\u0584 \u0565\u0576
+AandBareLinearlyDependent=%0-\u0568 \u0587 %1-\u0568 \u0563\u056e\u0578\u0580\u0565\u0576 \u0561\u0576\u056f\u0561\u056d \u0565\u0576
+AandBareLinearlyIndependent=%0-\u0568 \u0587 %1-\u0568 \u0563\u056e\u0578\u0580\u0565\u0576 \u0561\u0576\u056f\u0561\u056d \u0565\u0576
+AandBareNotEqual=%0-\u0576 \u0578\u0582 %1-\u0568 \u0570\u0561\u0574\u0561\u0580\u056a\u0565\u0584 \u0579\u0565\u0576
+AandBareParallel=%0-\u0576 \u0578\u0582 %1-\u0568 \u0566\u0578\u0582\u0563\u0561\u0570\u0565\u057c \u0579\u0565\u0576
+AandBarePerpendicular=%0-\u0576 \u0578\u0582 %1-\u0568 \u0578\u0582\u0572\u0572\u0561\u0570\u0561\u0575\u0561\u0581 \u0579\u0565\u0576
+AandBcannotBeCompared=%0-\u0576 \u0578\u0582 %1-\u0568 \u0579\u0565\u0576 \u056f\u0561\u0580\u0578\u0572 \u0570\u0561\u0574\u0565\u0574\u0561\u057f\u057e\u0565\u056c
+AbsoluteScreenLocation=\u0532\u0561\u0581\u0561\u0580\u0571\u0561\u056f \u0564\u056b\u0580\u0584 \u0567\u056f\u0580\u0561\u0576\u056b\u0576
+AdoesNotLieOnB=%0-\u0568 \u0579\u056b \u0563\u057f\u0576\u057e\u0578\u0582\u0574 %1-\u056b \u057e\u0580\u0561
+AdoesNotLieOnThePerimeterOfB=%0-\u0568 \u0579\u056b \u0563\u057f\u0576\u057e\u0578\u0582\u0574 %1-\u056b \u0565\u0566\u0580\u0561\u0563\u056e\u056b \u057e\u0580\u0561
+AdoesNothaveTheSameAreaAsB=%0-\u056b \u0587 %1-\u056b \u0574\u0561\u056f\u0565\u0580\u0565\u057d\u0576\u0565\u0580\u0568 \u0570\u0561\u057e\u0561\u057d\u0561\u0580 \u0579\u0565\u0576
+AdoesNothaveTheSameLengthAsB=%0-\u056b \u0578\u0582 %1-\u056b \u0565\u0580\u056f\u0561\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u0568 \u0570\u0561\u057e\u0561\u057d\u0561\u0580 \u0579\u0565\u0576
+AhasTheSameAreaAsB=%0-\u056b \u0587 %1-\u056b \u0574\u0561\u056f\u0565\u0580\u0565\u057d\u0576\u0565\u0580\u0568 \u0570\u0561\u057e\u0561\u057d\u0561\u0580 \u0565\u0576
+AhasTheSameLengthAsB=%0-\u056b \u0578\u0582 %1-\u056b \u0565\u0580\u056f\u0561\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u0568 \u0570\u0561\u057e\u0561\u057d\u0561\u0580 \u0565\u0576
+AintersectsWithBOnce=%0-\u0568 \u0587 %1-\u0568 \u0570\u0561\u057f\u057e\u0578\u0582\u0574 \u0565\u0576 \u0574\u0565\u056f \u056f\u0565\u057f\u0578\u0582\u0574
+AintersectsWithBTwice=%0-\u0568 \u0570\u0561\u057f\u057e\u0578\u0582\u0574 \u0567 %1-\u056b \u0570\u0565\u057f \u0565\u0580\u056f\u0578\u0582 \u056f\u0565\u057f\u0578\u0582\u0574
+AisAnAsymptoteToB=%0-\u0568 %1-\u056b \u0561\u057d\u056b\u0574\u057f\u0578\u057f\u0576 \u0567
+AisNotDefined=%0 \u0585\u0562\u0575\u0565\u056f\u057f\u0568 \u0578\u0580\u0578\u0577\u057e\u0561\u056e \u0579\u0567
+AisaDegenerateBranchOfB=%0-\u0568 %1-\u056b \u0561\u0575\u056c\u0561\u057d\u0565\u0580\u057e\u0561\u056e \u0573\u0575\u0578\u0582\u0572\u0576 \u0567
+AisaTangentToB=%0-\u0568 %1-\u056b \u0577\u0578\u0577\u0561\u0583\u0578\u0572\u0576 \u0567
+Algebra=\u0540\u0561\u0576\u0580\u0561\u0570\u0561\u0577\u056b\u057e
+AlgebraWindow=\u0555\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u056b \u057e\u0561\u0570\u0561\u0576\u0561\u056f
+AliesOnB=%0-\u0568 \u0563\u057f\u0576\u057e\u0578\u0582\u0574 \u0567 %1-\u056b \u057e\u0580\u0561
+AliesOnThePerimeterOfB=%0-\u0576 \u0568\u0576\u056f\u0561\u056e \u0567 %1-\u056b \u0565\u0566\u0580\u0561\u0563\u056e\u056b \u057e\u0580\u0561
+AllowOfflineUse=\u0546\u0565\u0580\u0561\u057c\u0565\u0574 jar \u0586\u0561\u0575\u056c\u0565\u0580\u0568
+AllowStyleBar=\u0544\u056b\u0561\u0581\u0576\u0565\u056c \u0578\u0573\u056b \u057e\u0561\u0570\u0561\u0576\u0561\u056f\u0568
+Altitude=\u0532\u0561\u0580\u0571\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Angle=\u0531\u0576\u056f\u0575\u0578\u0582\u0576
+AngleBetweenAB=%0-\u056b \u0578\u0582 %1-\u056b \u056f\u0561\u0566\u0574\u0561\u056e \u0561\u0576\u056f\u0575\u0578\u0582\u0576\u0568
+AngleBetweenABC=%0, %1, %2 \u056f\u0565\u057f\u0565\u0580\u0578\u057e \u0561\u0576\u056f\u0575\u0578\u0582\u0576
+AngleBetweenABCofD=%3 \u0562\u0561\u0566\u0574\u0561\u0576\u056f\u0575\u0561\u0576 %0, %1, %2 \u056f\u0565\u057f\u0565\u0580\u0578\u057e \u0561\u0576\u056f\u0575\u0578\u0582\u0576\u0568
+AngleBisectorOfAB=%0-\u056b \u0578\u0582 %1-\u056b \u056f\u0561\u0566\u0574\u0561\u056e \u0561\u0576\u056f\u0575\u0561\u0576 \u056f\u056b\u057d\u0578\u0580\u0564\u0568
+AngleBisectorOfABC=%0, %1, %2 \u056f\u0565\u057f\u0565\u0580\u0578\u057e \u0561\u0576\u056f\u0575\u0561\u0576 \u056f\u056b\u057d\u0578\u0580\u0564\u0568
+AngleOfA=%0-\u056b \u0561\u0576\u056f\u0575\u0578\u0582\u0576
+Angles=\u0531\u0576\u056f\u0575\u0578\u0582\u0576\u0576\u0565\u0580
+AnimatedGIFExport=\u0531\u0580\u057f\u0561\u0570\u0561\u0576\u0565\u0574 \u0578\u0580\u057a\u0565\u057d GIF \u0561\u0576\u056b\u0574\u0561\u0581\u056b\u0561
+Animating=\u0531\u0576\u056b\u0574\u0561\u0581\u056b\u0561
+Animation=\u0531\u0576\u056b\u0574\u0561\u0581\u056b\u0561
+AnimationLoop=\u0548\u0580\u057a\u0565\u057d \u0581\u056b\u055e\u056f\u056c
+AnimationSpeed=\u0531\u0580\u0561\u0563\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+AnimationStep=\u0554\u0561\u0575\u056c
+ApplicationName=\u0533\u0565\u0578\u0533\u0565\u0562\u0580\u0561
+Apply=\u053f\u056b\u0580\u0561\u057c\u0565\u0574
+Arc=\u0531\u0572\u0565\u0572
+AsymptoteToA=%0-\u056b \u0561\u057d\u056b\u0574\u057a\u057f\u0578\u057f
+Ath=%0-\u0580\u0564
+Author=\u0540\u0565\u0572\u056b\u0576\u0561\u056f
+Automatic=\u0531\u057e\u057f\u0578\u0574\u0561\u057f
+AuxiliaryObject=\u0555\u056a\u0561\u0576\u0564\u0561\u056f \u0585\u0562\u0575\u0565\u056f\u057f
+AuxiliaryObjects=\u0555\u056a\u0561\u0576\u0564\u0561\u056f \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580
+AxisLabel=\u0546\u0577\u0561\u0576\u0561\u056f\u0578\u0582\u0574
+AxisOfA=%0-\u056b \u0561\u057c\u0561\u0576\u0581\u0584
+AxisTicks=\u0532\u0561\u056a\u0561\u0576\u0574\u0561\u0576 \u0563\u056e\u0565\u0580
+AxisUnitLabel=\u0544\u056b\u0561\u057e\u0578\u0580
+Back=\u0535\u057f
+BackgroundColor=\u0556\u0578\u0576\u056b \u0563\u0578\u0582\u0575\u0576\u0568
+BackgroundImage=\u0556\u0578\u0576\u0561\u0575\u056b\u0576 \u0576\u056f\u0561\u0580
+Bold=\u0539\u0561\u057e
+Boolean=\u054f\u0580\u0561\u0574\u0561\u0562\u0561\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584
+Breakpoint=\u0544\u0565\u057f\u056f\u0561
+Button=\u053f\u0578\u0573\u0561\u056f
+CASInitializing=CAS-\u056b \u0576\u0561\u056d\u0561\u057a\u0561\u057f\u0580\u0561\u057d\u057f\u0578\u0582\u0574
+CASTimedOut=CAS-\u0568 \u0569\u0561\u0575\u0574\u0561\u0578\u0582\u0569 \u057c\u0565\u056a\u056b\u0574\u0578\u0582\u0574 \u0567
+Cancel=\u0532\u0561\u0576 \u0579\u0561\u0576\u0565\u0574
+Caption=\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580
+CartesianCoords=\u0534\u0565\u056f\u0561\u0580\u057f\u0575\u0561\u0576 \u056f\u0578\u0578\u0580\u0564\u056b\u0576\u0561\u057f\u0576\u0565\u0580
+CasTimeout=CAS-\u056b \u0569\u0561\u0575\u0574\u0561\u0578\u0582\u0569\u0568 (\u057e\u0561\u0575\u0580\u056f\u0575\u0561\u0576\u0576\u0565\u0580\u0578\u057e)
+CellAisNotDefined=%0 \u057e\u0561\u0576\u0564\u0561\u056f\u0568 \u0579\u056b \u0578\u0580\u0578\u0577\u057e\u0561\u056e
+CenterOfA=%0-\u056b \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u0568
+CentroidOfA=%0-\u056b \u056e\u0561\u0576\u0580\u0578\u0582\u0569\u0575\u0561\u0576 \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u0568
+CheckedNumerically=(\u0569\u057e\u0561\u0575\u056b\u0576 \u057d\u057f\u0578\u0582\u0563\u0578\u0582\u0574)
+ChooseColor=\u0538\u0576\u057f\u0580\u0565\u0574 \u0563\u0578\u0582\u0575\u0576\u0568
+ChooseObject=\u0538\u0576\u057f\u0580\u0565\u0584 \u0574\u0565\u056f \u0585\u0562\u0575\u0565\u056f\u057f
+Circle=\u0547\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e
+CircleOfAxisAThroughB=%0-\u0561\u057c\u0561\u0576\u0581\u0584\u0578\u057e \u0578\u0582 %1 \u056f\u0565\u057f\u0578\u057e \u0561\u0576\u0581\u0576\u0578\u0572 \u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e
+CircleThroughABC=%0, %1, %2 \u056f\u0565\u057f\u0565\u0580\u0578\u057e \u0561\u0576\u0581\u0576\u0578\u0572 \u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e
+CircleThroughAwithCenterB=%1 \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u0578\u057e \u0587 %0-\u0578\u057e \u0561\u0576\u0581\u0576\u0578\u0572 \u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e
+CircleWithCenterARadiusBParallelToC=%0 \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u0578\u057e \u0578\u0582 %1 \u0577\u0561\u057c\u0561\u057e\u0572\u0578\u057e \u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e, \u0566\u0578\u0582\u0563\u0561\u0570\u0565\u057c %2-\u056b\u0576
+CircleWithCenterAThroughBAxisParallelToC=%0 \u056f\u0565\u0576\u057f\u0580\u0578\u057e\u0578\u057e, %1-\u0578\u057e \u0561\u0576\u0581\u0576\u0578\u0572 \u0578\u0582 %2-\u056b\u0576 \u0566\u0578\u0582\u0563\u0561\u0570\u0565\u057c \u0561\u057c\u0561\u0576\u0581\u0584\u0578\u057e \u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e
+CircleWithCenterAThroughBParallelToC=%0 \u056f\u0565\u0576\u057f\u0580\u0578\u057e\u0578\u057e, %1-\u0578\u057e \u0561\u0576\u0581\u0576\u0578\u0572, %2-\u056b\u0576 \u0566\u0578\u0582\u0563\u0561\u0570\u0565\u057c \u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e
+CircleWithCenterAandRadiusB=%0 \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u0578\u057e \u0578\u0582 %1 \u0577\u0561\u057c\u0561\u057e\u0572\u0578\u057e \u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e
+CircleWithCenterAandRadiusBAxisParallelToC=%0 \u056f\u0565\u0576\u057f\u0580\u0578\u057e\u0578\u057e, %1 \u0577\u0561\u057c\u0561\u057e\u0572\u0578\u057e, %2-\u056b\u0576 \u0566\u0578\u0582\u0563\u0561\u0570\u0565\u057c \u0561\u057c\u0561\u0576\u0581\u0584\u0578\u057e \u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e
+Clipboard.Blackboard=\u0553\u0578\u056d\u0561\u0576\u0561\u056f\u0574\u0561\u0576 \u0562\u0578\u0582\u0586\u0565\u0580
+Clipboard.Google=\u0553\u0578\u056d\u0561\u0576\u0561\u056f\u0574\u0561\u0576 \u0562\u0578\u0582\u0586\u0565\u0580. Google Gadget
+Clipboard.HTML=\u0553\u0578\u056d\u0561\u0576\u0561\u056f\u0574\u0561\u0576 \u0562\u0578\u0582\u0586\u0565\u0580. html
+Clipboard.MediaWiki=\u0553\u0578\u056d\u0561\u0576\u0561\u056f\u0574\u0561\u0576 \u0562\u0578\u0582\u0586\u0565\u0580. MediaWiki
+Clipboard.Moodle=\u0553\u0578\u056d\u0561\u0576\u0561\u056f\u0574\u0561\u0576 \u0562\u0578\u0582\u0586\u0565\u0580. Moodle
+Clipboard.iframe=\u0553\u0578\u056d\u0561\u0576\u0561\u056f\u0574\u0561\u0576 \u0562\u0578\u0582\u0586\u0565\u0580. <iframe>
+Color=\u0533\u0578\u0582\u0575\u0576
+ColorfulConstructionProtocol=\u0533\u0578\u0582\u0576\u0561\u0575\u056b\u0576 \u0571\u0587\u0561\u057e\u0578\u0580\u0578\u0582\u0574
+Command=\u0540\u0580\u0561\u0574\u0561\u0576
+CommonTangentOfCirclesAandB=%0 \u0587 %1 \u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056e\u0565\u0580\u056b \u0568\u0576\u0564\u0570\u0561\u0576\u0578\u0582\u0580 \u0577\u0578\u0577\u0561\u0583\u0578\u0572
+ComplexNumber=\u053f\u0578\u0574\u057a\u056c\u0565\u0584\u057d \u0569\u056b\u057e
+Conic=\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569
+ConicFromCoeffListA=\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569 %0-\u056b\u0581
+ConicThroughABCDE=%0, %1, %2, %3, %4 \u056f\u0565\u057f\u0565\u0580\u0578\u057e \u0561\u0576\u0581\u0576\u0578\u0572 \u056f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569
+Conics=\u053f\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057f\u0578\u0582\u0575\u0569\u0576\u0565\u0580
+ConstructionProtocol=\u0531\u0580\u0571\u0561\u0576\u0561\u0563\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+ConstructionProtocolButton=\u0531\u0580\u0571\u0561\u0576\u0561\u0563\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568 \u0562\u0561\u0581\u0565\u056c\u0578\u0582 \u056f\u0578\u0573\u0561\u056f
+ConstructionProtocolHelp=<html><body><p><b>\u0531\u0580\u0571\u0561\u0576\u0561\u0563\u0580\u0578\u0582\u0569\u0575\u0561\u0576 \u0585\u0563\u057f\u0561\u0563\u0578\u0580\u056e\u0578\u0582\u0574</b></p><p><br><b>\u054d\u057f\u0565\u0572\u0576\u0561\u0577\u0561\u0580</b></p><table border="1"><tr><td>\u2191</td><td>\u053f\u0561\u057c\u0578\u0582\u0581\u0574\u0561\u0576 \u0576\u0561\u056d\u0578\u0580\u0564 \u0584\u0561\u0575\u056c</td></tr><tr><td>\u2193</td><td>\u053f\u0561\u057c\u0578\u0582\u0581\u0574\u0561\u0576 \u0570\u0561\u057b\u0578\u0580\u0564 \u0584\u0561\u0575\u056c</td></tr><tr><td>Home</td><td>\u054d\u056f\u056b\u0566\u0562</td></tr><tr><td>End</td><td>\u054e\u0565\u0580\u057b</td></tr><tr><td>\u054b\u0576\u057b\u0565\u0574</td><td>\u054b\u0576\u057b\u0565\u0574 \u0584\u0561\u0575\u056c\u0568</td></tr></table><p><b><br>\u0544\u056f\u0576\u056b\u056f</b></p><table border="1"><tr><td>\u053f\u0580\u056f\u0576\u0561\u056f\u056b \u0584\u056c\u056b\u056f \u057f\u0578\u0572\u056b \u057e\u0580\u0561</td><td>\u0538\u0576\u057f\u0580\u0565\u0584 \u056f\u0561\u057c\u0578\u0582\u0581\u0574\u0561\u0576 \u0584\u0561\u0575\u056c\u0568</td></tr><tr><td>\u053f\u0580\u056f\u0576\u0561\u056f\u056b \u0584\u056c\u056b\u056f \u057e\u0565\u0580\u0576\u0561\u0563\u0580\u056b \u057e\u0580\u0561</td><td>\u054d\u056f\u057d\u0565\u0584 \u056f\u0561\u057c\u0578\u0582\u0581\u0578\u0582\u0574\u0568</td></tr><tr><td>\u054f\u0565\u0572\u0561\u0577\u0561\u0580\u056a\u0565\u0584 \u057f\u0578\u0572\u0568</td><td>\u054f\u0565\u0572\u0561\u0577\u0561\u0580\u056a\u0565\u0584 \u056f\u0561\u057c\u0578\u0582\u0581\u0574\u0561\u0576 \u0584\u0561\u0575\u056c\u0568</td></tr><tr><td>\u0531\u057b \u0584\u056c\u056b\u056f \u057f\u0578\u0572\u056b \u057e\u0580\u0561</td><td>\u053f\u0578\u0576\u057f\u0565\u0584\u057d\u057f\u0561\u0575\u056b\u0576 \u0574\u0565\u0576\u0575\u0578\u0582</td></tr></table><body></html>
+ConstructionProtocolNavigation=\u053f\u0561\u057c\u0578\u0582\u0581\u0574\u0561\u0576 \u0584\u0561\u0575\u056c\u0565\u0580\u0568
+Coordinates=\u053f\u0578\u0578\u0580\u0564\u056b\u0576\u0561\u057f\u0576\u0565\u0580
+CopyToClipboard=\u053f\u0580\u056f\u0576\u0585\u0580\u056b\u0576\u0561\u056f\u0576 \u0578\u0582\u0572\u0572\u0561\u0580\u056f\u0565\u056c \u0583\u0578\u056d\u0561\u0576\u0561\u056f\u0574\u0561\u0576 \u0562\u0578\u0582\u0586\u0565\u0580
+CornerPoint=\u0533\u0561\u0563\u0561\u0569
+CreatedWith=\u054d\u057f\u0565\u0572\u056e\u057e\u0561\u056e \u0567
+CreatedWithGeoGebra=\u054d\u057f\u0565\u0572\u056e\u057e\u0561\u056e \u0567 \u0533\u0565\u0578\u0533\u0565\u0562\u0580\u0561\u0575\u0578\u057e
+CrossAt=\u0531\u057c\u0561\u0576\u0581\u0584\u0576\u0565\u0580\u056b \u0570\u0561\u057f\u0574\u0561\u0576 \u056f\u0565\u057f\u0568
+Curve=\u053f\u0578\u0580
+Day.1=\u053f\u056b\u0580\u0561\u056f\u056b
+Day.2=\u0535\u0580\u056f\u0578\u0582\u0577\u0561\u0562\u0569\u056b
+Day.3=\u0535\u0580\u0565\u0584\u0577\u0561\u0562\u0569\u056b
+Day.4=\u0549\u0578\u0580\u0565\u0584\u0577\u0561\u0562\u0569\u056b
+Day.5=\u0540\u056b\u0576\u0563\u0577\u0561\u0562\u0569\u056b
+Day.6=\u0548\u0582\u0580\u0562\u0561\u0569
+Day.7=\u0547\u0561\u0562\u0561\u0569
+Decoration=\u0541\u0587\u0561\u057e\u0578\u0580\u0578\u0582\u0574
+Decreasing=\u0553\u0578\u0584\u0580\u0561\u0581\u0576\u0565\u0574
+Default=\u0540\u056b\u0574\u0576\u0561\u056f\u0561\u0576
+DefaultPointStyle=\u053f\u0565\u057f\u056b \u0578\u0573\u0568 \u0570\u056b\u0574\u0576\u0561\u056f\u0561\u0576 \u056f\u0561\u0580\u0563\u0561\u057e\u0578\u0580\u0578\u0582\u0574\u0576\u0565\u0580\u0578\u057e
+Defaults=\u0540\u056b\u0574\u0576\u0561\u056f\u0561\u0576 \u056f\u0561\u0580\u0563\u0561\u057e\u0578\u0580\u0578\u0582\u0574\u0576\u0565\u0580\u0568
+Definition=\u054d\u0561\u0570\u0574\u0561\u0576\u0578\u0582\u0574
+Delete=\u054b\u0576\u057b\u0565\u0574
+DeleteRowA=%0 \u057f\u0578\u0572\u0568 \u057b\u0576\u057b\u0565\u0574
+DeleteRowsAtoB=%0-\u056b\u0581 \u0574\u056b\u0576\u0579\u0587 %1 \u057f\u0578\u0572\u0565\u0580\u0568 \u057b\u0576\u057b\u0565\u0574
+DependentObjects=\u053f\u0561\u056d\u0575\u0561\u056c \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580
+DerivativeOfA=%0-\u056b \u0561\u056e\u0561\u0576\u0581\u056b\u0561\u056c\u0568
+DiameterOfAConjugateToB=%1-\u056b\u0576 \u0570\u0561\u0574\u0561\u056c\u0578\u0582\u0575\u056e %0-\u056b \u0577\u0561\u057c\u0561\u057e\u056b\u0572
+Dimensions=\u0549\u0561\u0583\u0565\u0580
+DirectionOfA=%0-\u056b \u0578\u0582\u0572\u0572\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+Directrix=\u0534\u056b\u0580\u0565\u056f\u057f\u0580\u056b\u057d\u0561
+DirectrixOfA=%0-\u056b \u0564\u056b\u0580\u0565\u056f\u057f\u0580\u056b\u057d\u0561\u0576
+Display=\u0534\u056b\u057d\u0583\u056c\u0565\u0575
+DisplayPointSymbol=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u056f\u0565\u057f\u0565\u0580\u056b \u057d\u056b\u0574\u057e\u0578\u056c\u0576\u0565\u0580\u0568
+DistanceAB.LaTeX="\\\u0578\u0582\u0572\u0572\u0578\u057e{" + %0 + %1 + "} \\, = \\, " + %2
+DistanceOfAandB=%0-\u056b \u0578\u0582 %1-\u056b \u0570\u0565\u057c\u0561\u057e\u0578\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+DoubleClickToOpen=\u0532\u0561\u0581\u0565\u0574 \u056e\u0580\u0561\u0563\u0580\u056b \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576\u0568 \u056f\u0580\u056f\u0576\u0561\u056f\u056b \u057d\u0565\u0572\u0574\u0561\u0574\u0562 (Click)
+DoubleLine=\u053f\u0580\u056f\u0576\u0561\u056f\u056b \u0563\u056b\u056e
+Down=\u0546\u0565\u0580\u0584\u0587
+DrawingPad=\u053f\u057f\u0561\u057e
+DrawingPad2=\u053f\u057f\u0561\u057e 2
+DrawingPadA=\u053f\u057f\u0561\u057e %0
+DrawingPadAsPSTricks=\u053f\u057f\u0561\u057e\u0568 \u0578\u0580\u057a\u0565\u057d PSTricks
+DrawingPadAsPicture=\u053f\u057f\u0561\u057e\u0568 \u0578\u0580\u057a\u0565\u057d \u0576\u056f\u0561\u0580
+DrawingPagAsPGF=\u053f\u057f\u0561\u057e\u0568 \u0578\u0580\u057a\u0565\u057d PGF/TikZ
+DynamicCoordinatesOfA=%0-\u056b \u0564\u056b\u0576\u0561\u0574\u056b\u056f \u056f\u0578\u0578\u0580\u0564\u056b\u0576\u0561\u057f\u0576\u0565\u0580\u0568
+DynamicWorksheet=\u053b\u0576\u057f\u0565\u0580\u0561\u056f\u057f\u056b\u057e \u0563\u056e\u0561\u0563\u056b\u0580
+DynamicWorksheetAsWebpage=\u053b\u0576\u057f\u0565\u0580\u0561\u056f\u057f\u056b\u057e \u0563\u056e\u0561\u0563\u056b\u0580\u0568 \u0578\u0580\u057a\u0565\u057d \u057e\u0565\u0562 \u0567\u057b
+DynamicWorksheetExport=\u053b\u0576\u057f\u0565\u0580\u0561\u056f\u057f\u056b\u057e \u0563\u056e\u0561\u0563\u056b\u0580\u0568 \u0561\u0580\u057f\u0561\u0570\u0561\u0576\u0565\u056c \u0578\u0580\u057a\u0565\u057d html
+EccentricityOfA=%0-\u056b \u0567\u0584\u057d\u0581\u0565\u0576\u057f\u0580\u056b\u057d\u056b\u057f\u0565\u057f
+Edit=\u053d\u0574\u0562\u0561\u0563\u0580\u0565\u0574
+Ellipse=\u0537\u056c\u056b\u057a\u057d
+EllipseWithFociABPassingThroughC=%0, %1 \u0586\u0578\u056f\u0578\u0582\u057d\u0576\u0565\u0580\u0578\u057e \u0578\u0582 %2 \u056f\u0565\u057f\u0578\u057e \u0561\u0576\u0581\u0576\u0578\u0572 \u0567\u056c\u056b\u057a\u057d
+EllipseWithFociABandFirstAxisLengthC=%0, %1 \u0586\u0578\u056f\u0578\u0582\u057d\u0576\u0565\u0580\u0578\u057e \u0578\u0582 %2 \u0565\u0580\u056f\u0561\u0580\u0578\u0582\u0569\u0575\u0561\u0574\u0562 \u0574\u0565\u056e \u056f\u056b\u057d\u0561\u0561\u057c\u0561\u0576\u0581\u0584\u0578\u057e \u0567\u056c\u056b\u057a\u057d
+EmphasizeRightAngle=\u0546\u0577\u0565\u0574 \u0578\u0582\u0572\u056b\u0572 \u0561\u0576\u056f\u0575\u0578\u0582\u0576\u0568
+EmptySet=\u0534\u0561\u057f\u0561\u0580\u056f \u0562\u0561\u0566\u0574\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+EnableScripting=\u0539\u0578\u0582\u0575\u056c\u0561\u057f\u0580\u0565\u0574 \u057d\u056f\u0580\u056b\u057a\u057f\u0576\u0565\u0580
+Equation=\u0540\u0561\u057e\u0561\u057d\u0561\u0580\u0578\u0582\u0574
+ErrorInJavaScript=JavaScript-\u056b \u057d\u056d\u0561\u056c
+ErrorInJavaScriptAtLineA=\u054d\u056d\u0561\u056c JavaScript-\u056b %0 \u057f\u0578\u0572\u0578\u0582\u0574
+ErrorInScriptAtLineAFromObjectB=\u054d\u0584\u0580\u056b\u0583\u057f\u056b \u057d\u056d\u0561\u056c %0 \u057f\u0578\u0572\u0578\u0582\u0574 ( \u0561\u057c\u0561\u057b\u0561\u0581\u0561\u056e %1-\u0578\u057e )
+ExportAnimatedGIF=\u0531\u0576\u056b\u0574\u0561\u0581\u056b\u0578\u0576 \u0576\u056f\u0561\u0580 (GIF)
+ExportAsPicture=\u0531\u0580\u057f\u0561\u0570\u0561\u0576\u0565\u0574 \u0578\u0580\u057a\u0565\u057d \u0576\u056f\u0561\u0580
+ExportAsWebpage=\u0531\u0580\u057f\u0561\u0570\u0561\u0576\u0565\u056c \u0578\u0580\u057a\u0565\u057d \u057e\u0565\u0562 \u0567\u057b
+ExportTextAsShapes=\u0531\u0580\u057f\u0561\u0570\u0561\u0576\u0565\u0574 \u057f\u0565\u0584\u057d\u057f\u0568 \u0578\u0580\u057a\u0565\u057d \u0563\u0580\u0561\u0586\u056b\u056f\u0561
+ExtendedForm=\u0538\u0576\u0564\u056c\u0561\u0575\u0576\u057e\u0561\u056e \u0571\u0587
+ExtraLarge=\u0540\u057d\u056f\u0561
+ExtraSmall=\u0533\u0565\u0580\u0583\u0578\u0584\u0580
+ExtremumOfA=%0-\u056b \u0567\u0584\u057d\u057f\u0580\u0565\u0574\u0578\u0582\u0574
+File.HTML=\u0556\u0561\u0575\u056c. html
+File.SCORM=\u0556\u0561\u0575\u056c. SCORM
+Filling=\u0546\u0565\u0580\u056f\u0578\u0582\u0574
+Finish=\u0531\u057e\u0561\u0580\u057f\u0565\u0574
+FirstAxisLengthOfA=%0-\u056b \u0574\u0565\u056e \u056f\u056b\u057d\u0561\u0561\u057c\u0561\u0576\u0581\u0584\u056b \u0565\u0580\u056f\u0561\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+FirstAxisOfA=%0-\u056b \u0574\u0565\u056e \u056f\u056b\u057d\u0561\u0561\u057c\u0561\u0576\u0581\u0584\u0568
+FixCheckbox=\u0531\u0574\u0580\u0561\u0581\u0576\u0565\u0574 \u0564\u0580\u0578\u0577\u0561\u056f\u0568
+FixObject=\u0531\u0574\u0580\u0561\u0581\u0576\u0565\u0574 \u0585\u0562\u0575\u0565\u056f\u057f\u0568
+FocusOfA=%0-\u056b \u0586\u0578\u056f\u0578\u0582\u057d\u0568
+ForceGnuplotPgf=\u0533\u0580\u0561\u0586\u056b\u056f\u0576\u0565\u0580 \u0563\u056e\u0565\u056c\u0578\u0582 \u0570\u0561\u0574\u0561\u0580 \u0585\u0563\u057f\u0561\u0563\u0578\u0580\u056e\u0565\u0574 Gnuplot \u056e\u0580\u0561\u0563\u056b\u0580\u0568
+Format=\u0556\u0578\u0580\u0574\u0561\u057f
+FreeObjects=\u0531\u0566\u0561\u057f \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580
+Function=\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561
+FunctionAonIntervalBC=%0 \u0586\u0578\u0582\u0576\u056f\u0581\u056b\u0561\u0576 [%1, %2] \u0574\u056b\u057b\u0561\u056f\u0561\u0575\u0584\u0578\u0582\u0574
+FunctionNVar=\u0556\u0578\u0582\u0576\u056f\u0581\u056b\u0561
+General=\u0538\u0576\u0564\u0570\u0561\u0576\u0578\u0582\u0580
+GeneratePgf=\u0533\u0565\u0576\u0565\u0580\u0561\u0581\u0576\u0565\u0574 PGF/TikZ \u056f\u0578\u0564
+GeneratePstricks=\u0533\u0565\u0576\u0565\u0580\u0561\u0581\u0576\u0565\u0574 \u056f\u0578\u0564
+GeometricObjects=\u0535\u0580\u056f\u0580\u0561\u0579\u0561\u0583\u0561\u056f\u0561\u0576 \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580
+GlobalJavaScript=\u0538\u0576\u0564\u0570\u0561\u0576\u0578\u0582\u0580 JavaScript
+GoToDownloadPage=\u0531\u0576\u0581\u0576\u0565\u0574 \u0576\u0565\u0580\u0562\u0565\u057c\u0576\u0574\u0561\u0576 \u0567\u057b
+GraphicsViewAsAsymptote=\u053f\u057f\u0561\u057e\u0568 \u0578\u0580\u057a\u0565\u057d Asymptote
+GreekCharacterA=\u0540\u0578\u0582\u0576\u0561\u056f\u0561\u0576 \u057f\u0561\u057c. %0
+GridType=\u0551\u0561\u0576\u0581\u056b \u057f\u0565\u057d\u0561\u056f\u0568
+Height=\u0532\u0561\u0580\u0571\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Hexagon=\u054e\u0565\u0581\u0561\u0576\u056f\u0575\u0578\u0582\u0576
+Hide=\u0539\u0561\u0584\u0581\u0576\u0565\u0574
+Home=\u054d\u056f\u056b\u0566\u0562
+HorizontalSplit=\u0540\u0578\u0580\u056b\u0566\u0578\u0576\u0561\u056f\u0561\u0576 \u0562\u0561\u056a\u0561\u0576\u0578\u0582\u0574
+Hyperbola=\u0540\u056b\u057a\u0565\u0580\u0562\u0578\u056c\u0561
+HyperbolaWithFociABPassingThroughC=%0, %1 \u0586\u0578\u056f\u0578\u0582\u057d\u0576\u0565\u0580\u0578\u057e \u0587 %2 \u056f\u0565\u057f\u0578\u057e \u0570\u056b\u057a\u0565\u0580\u0562\u0578\u056c
+HyperbolaWithFociABandFirstAxisLengthC=%0, %1 \u0586\u0578\u056f\u0578\u0582\u057d\u0576\u0565\u0580\u0578\u057e \u0587 \u0574\u0565\u056e \u056f\u056b\u057d\u0561\u0561\u057c\u0561\u0576\u0581\u0584\u056b %2 \u0565\u0580\u056f\u0561\u0580\u0578\u0582\u0569\u0575\u0561\u0574\u0562 \u0570\u056b\u057a\u0565\u0580\u0562\u0578\u056c
+IgnoreDocumentLayout=\u0531\u0576\u057f\u0565\u057d\u0565\u0574 \u0583\u0561\u057d\u057f\u0561\u0569\u0572\u0569\u056b \u0563\u056e\u0561\u0576\u0577\u0578\u0582\u0574\u0568
+Image=\u054a\u0561\u057f\u056f\u0565\u0580
+ImplicitPoly=\u0531\u0576\u0562\u0561\u0581\u0561\u0570\u0561\u0575\u057f \u056f\u0578\u0580
+IncircleOfTriangleABC=%0%1%2 \u0565\u057c\u0561\u0576\u056f\u0575\u0561\u0576\u0568 \u0576\u0565\u0580\u0563\u056e\u0565\u0574 \u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e
+Increasing=\u0544\u0565\u056e\u0561\u0581\u0578\u0582\u0574
+IncreasingOnce=\u0544\u0565\u056e\u0561\u0581\u0578\u0582\u0574 (\u0535\u0580\u056f\u0578\u0582 \u0561\u0576\u0563\u0561\u0574)
+Inequality=\u0531\u0576\u0570\u0561\u057e\u0561\u057d\u0561\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+InflectionPointofA=%0-\u056b \u0577\u0580\u057b\u0574\u0561\u0576 \u056f\u0565\u057f
+InputFieldHelp=<html><body><p><b>\u0555\u0563\u057f\u057e\u0565\u0584 \u0544\u0578\u0582\u057f\u0584\u056b \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576\u056b\u0581</b></p><table border="1"><tr><td>Enter </td><td>\u053f\u0561\u057f\u0561\u0580\u0565\u0584</td></tr><tr><td>Escape</td><td>\u0544\u0561\u0584\u0580\u0565\u0584 \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576\u0568</td></tr><tr><td>\u2191</td><td>\u0546\u0561\u056d\u0578\u0580\u0564 \u0570\u0580\u0561\u0574\u0561\u0576</td></tr><tr><td>\u2193</td><td>\u0540\u0561\u057b\u0578\u0580\u0564 \u0570\u0580\u0561\u0574\u0561\u0576</td></tr><tr><td>F1</td><td>\u0540\u0580\u0561\u0574\u0561\u0576\u056b \u057e\u0565\u0580\u0561\u0562\u0565\u0580\u0575\u0561\u056c \u0585\u0563\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576</td></tr><tr><td>TAB</td><td>\u0540\u0576\u0561\u0580\u0561\u057e\u0578\u0580 \u0570\u0561\u057b\u0578\u0580 \u0570\u0580\u0561\u0574\u0561\u0576\u056b \u0581\u0578\u0582\u0581\u0561\u0564\u0580\u0578\u0582\u0574</td></tr></table><p><br><b>\u0540\u0580\u0561\u0574\u0561\u0576\u056b \u0561\u057e\u057f\u0578\u0574\u0561\u057f \u0577\u0561\u0580\u0578\u0582\u0576\u0561\u056f\u0578\u0582\u0574</b><br>\u0540\u0580\u0561\u0574\u0561\u0576\u056b \u0561\u057c\u0561\u057b\u056b \u0565\u0580\u056f\u0578\u0582 \u057f\u0561\u057c\u0568 \u0563\u0580\u0565\u056c\u0578\u0582\u0581 \u0570\u0565\u057f\u0578<br> \u0533\u0565\u0578\u0533\u0565\u0562\u0580\u0561\u0576 \u0581\u0578\u0582\u0575\u0581 \u056f\u057f\u0561 \u0564\u0561 \u0561\u0574\u0562\u0578\u0572\u057b\u0578\u0582\u0569\u0575\u0561\u0574\u0562:</p><table border="1"><tr><td>Enter </td><td>\u053f\u0561\u0574 \u0568\u0576\u0564\u0578\u0582\u0576\u0565\u0584 \u0561\u057c\u0561\u057b\u0561\u0580\u056f\u057e\u0578\u0572 \u0570\u0580\u0561\u0574\u0561\u0576\u0568</td></tr><tr><td>\u056f\u0561\u0574 \u0578\u0582\u0580\u056b\u0577 \u057f\u0561\u057c \u0563\u0580\u0565\u056c\u0578\u057e</td><td>\u0577\u0561\u0580\u0578\u0582\u0576\u0561\u056f\u0565\u0584 \u0574\u0578\u0582\u057f\u0584\u0561\u0563\u0580\u0578\u0582\u0574\u0568</td></tr></table><body></html>
+InputForm=\u0546\u0565\u0580\u0574\u0578\u0582\u056e\u0574\u0561\u0576 \u0571\u0587\u0561\u0569\u0578\u0582\u0572\u0569
+InputLabel=\u0544\u0578\u0582\u057f\u0584\u056b \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576
+InputLabelToolTip=\u0546\u0565\u0580\u0574\u0578\u0582\u056e\u0565\u0574 \u0570\u0580\u0561\u0574\u0561\u0576
+Insert=\u0546\u0565\u0580\u0574\u0578\u0582\u056e\u0565\u0574
+InsertPictureOfAllOpenViews=\u0546\u0565\u0580\u0574\u0578\u0582\u056e\u0565\u056c \u0576\u056f\u0561\u0580 \u0562\u0578\u056c\u0578\u0580 \u0562\u0561\u0581 \u056f\u057f\u0561\u057e\u0576\u0565\u0580\u0578\u0582\u0574
+InsertPictureOfConstruction=\u0546\u0565\u0580\u0574\u0578\u0582\u056e\u0565\u0574 \u056f\u057f\u0561\u057e\u056b \u0576\u056f\u0561\u0580\u0568
+Integer=\u0531\u0574\u0562\u0578\u0572\u057b \u0569\u056b\u057e
+IntegralOfA=%0-\u056b \u056b\u0576\u057f\u0565\u0563\u0580\u0561\u056c\u0568
+IntegralOfAfromBtoC=%0-\u056b \u056b\u0576\u057f\u0565\u0563\u0580\u0561\u056c\u0568 %1-\u056b\u0581 \u0574\u056b\u0576\u0579\u0587 %2
+Interpolate=\u0533\u056e\u0565\u0574 \u056b\u0576\u057f\u0565\u0580\u057a\u0578\u056c\u0561\u0581\u056b\u0561\u0575\u0578\u057e
+IntersectingLines=\u0540\u0561\u057f\u057e\u0578\u0572 \u0563\u056e\u0565\u0580
+IntersectionCurveOfAB=%0 \u0587 %1 \u056f\u0578\u0580\u0565\u0580\u056b \u0570\u0561\u057f\u0578\u0582\u0574\u0568
+IntersectionLineOfAB=%0 \u0587 %1 \u0578\u0582\u0572\u056b\u0572\u0576\u0565\u0580\u056b \u0570\u0561\u057f\u0578\u0582\u0574\u0568
+IntersectionOfAandB=%0-\u056b \u0587 %1-\u056b \u0570\u0561\u057f\u0578\u0582\u0574\u0568
+IntersectionPointOfAB=%0-\u056b \u0578\u0582 %1-\u056b \u0570\u0561\u057f\u0574\u0561\u0576 \u056f\u0565\u057f
+IntersectionPointOfABNearC=%0-\u056b \u0578\u0582 %1-\u056b \u0570\u0561\u057f\u0574\u0561\u0576 \u056f\u0565\u057f\u0568, \u0578\u0580\u0568 \u0574\u0578\u057f \u0567 %2-\u056b\u0576
+IntersectionPointOfABWithInitialValueC=%0-\u056b, %1-\u056b \u0570\u0561\u057f\u0574\u0561\u0576 \u056f\u0565\u057f\u0568, %2 \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0574\u0578\u057f\u0561\u057e\u0578\u0580\u0578\u0582\u0569\u0575\u0561\u0574\u0562
+Interval=\u0544\u056b\u057b\u0561\u056f\u0561\u0575\u0584
+InverseFilling=\u0547\u0580\u057b\u0565\u0574 \u0563\u0578\u0582\u0576\u0561\u057e\u0578\u0580\u0578\u0582\u0574\u0568
+Italic=\u0547\u0565\u0572\u0561\u057f\u0561\u057c
+Keyboard=\u054d\u057f\u0565\u0572\u0576\u0561\u0577\u0561\u0580
+LaTeXFormula=LaTeX \u0562\u0561\u0576\u0561\u0571\u0587
+LaTeXHelp=LaTeX \u0585\u0563\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+Large=\u0544\u0565\u056e
+LatexFontSize=\u0553\u0561\u057d\u057f\u0561\u0569\u0572\u0569\u056b \u057f\u0561\u057c\u0561\u0579\u0561\u0583\u0568
+Layer=\u0547\u0565\u0580\u057f
+Length=\u0535\u0580\u056f\u0561\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+LengthOfA=%0-\u056b \u0565\u0580\u056f\u0561\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+Lengths=\u0535\u0580\u056f\u0561\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580
+Line=\u0548\u0582\u0572\u056b\u0572
+LineBisectorAB=%0, %1 \u056e\u0561\u0575\u0580\u0561\u056f\u0565\u057f\u0565\u0580\u0578\u057e \u0570\u0561\u057f\u057e\u0561\u056e\u056b \u0574\u056b\u057b\u0576\u0578\u0582\u0572\u0572\u0561\u0570\u0561\u0575\u0561\u0581\u0568
+LineBisectorOfA=%0-\u056b \u0574\u056b\u057b\u0576\u0578\u0582\u0572\u0572\u0561\u0570\u0561\u0575\u0561\u0581\u0568
+LineStyle=\u0533\u056e\u0565\u0580\u056b \u0578\u0573\u0568
+LineThroughAB=%0-\u0578\u057e \u0578\u0582 %1-\u0578\u057e \u0578\u0582\u0572\u056b\u0572
+LineThroughAParallelToB=%0-\u0578\u057e \u0561\u0576\u0581\u0576\u0578\u0572 \u0578\u0582 %1-\u056b\u0576 \u0566\u0578\u0582\u0563\u0561\u0570\u0565\u057c \u0578\u0582\u0572\u056b\u0572
+LineThroughAPerpendicularToB=%0-\u0578\u057e \u0561\u0576\u0581\u0576\u0578\u0572 \u0578\u0582 %1-\u056b\u0576 \u0578\u0582\u0572\u0572\u0561\u0570\u0561\u0575\u0561\u0581 \u0578\u0582\u0572\u056b\u0572
+LineThroughAwithDirectionB=%0-\u0578\u057e \u0561\u0576\u0581\u0576\u0578\u0572 \u0587 %1-\u0578\u057e \u0578\u0582\u0572\u0572\u057e\u0561\u056e \u0578\u0582\u0572\u056b\u0572
+LinearEccentricityOfA=%0-\u056b \u0563\u056e\u0561\u0575\u056b\u0576 \u0567\u0584\u057d\u0581\u0565\u0576\u057f\u0580\u056b\u057d\u056b\u057f\u0565\u057f
+LinearInequality=\u0533\u056e\u0561\u0575\u056b\u0576 \u0561\u0576\u0570\u0561\u057e\u0561\u057d\u0561\u0580\u0578\u0582\u0574
+Lines=\u0548\u0582\u0572\u056b\u0572\u0576\u0565\u0580
+LinkedObject=\u053f\u0561\u0580\u0563\u0561\u057e\u0578\u0580\u057e\u0578\u0572 \u0585\u0562\u0575\u0565\u056f\u057f
+List=\u0551\u0578\u0582\u0581\u0561\u056f
+LocalizedDigits=\u0555\u0563\u057f\u0561\u0563\u0578\u0580\u056e\u0565\u0574 \u0565\u0580\u056f\u0561\u0580\u0578\u0582\u0569\u0575\u0561\u0576 \u056c\u0578\u056f\u0561\u056c\u056b\u0566\u0561\u0581\u057e\u0561\u056e \u0579\u0561\u0583
+LocalizedLabels=\u0555\u0563\u057f\u0561\u0563\u0578\u0580\u056e\u0565\u0574 \u056f\u0565\u057f\u0565\u0580\u056b \u056c\u0578\u056f\u0561\u056c\u056b\u0566\u0561\u0581\u057e\u0561\u056e \u0561\u0576\u0578\u0582\u0576\u0576\u0565\u0580
+LockObject=\u0531\u0574\u0580\u0561\u0581\u0576\u0565\u0574 \u0585\u0562\u0575\u0565\u056f\u057f\u0568
+Locus=\u053f\u0565\u057f\u0565\u0580\u056b \u0565\u0580\u056f\u0580\u0561\u0579\u0561\u0583\u0561\u056f\u0561\u0576 \u057f\u0565\u0572\u0568
+Medium=\u0544\u056b\u057b\u056b\u0576 \u0579\u0561\u0583\u056b
+Midpoint=\u0544\u056b\u057b\u0576\u0561\u056f\u0565\u057f
+MidpointOfA=%0-\u056b \u0574\u056b\u057b\u0576\u0561\u056f\u0565\u057f\u0568
+MidpointOfAB=%0, %1 \u056e\u0561\u0575\u0580\u0561\u056f\u0565\u057f\u0565\u0580\u0578\u057e \u0570\u0561\u057f\u057e\u0561\u056e\u056b \u0574\u056b\u057b\u0576\u0561\u056f\u0565\u057f\u0568
+Miscellaneous=\u053c\u0580\u0561\u0579\u0578\u0582\u0581\u056b\u0579
+Month.1=\u0540\u0578\u0582\u0576\u057e\u0561\u0580
+Month.10=\u0540\u0578\u056f\u057f\u0565\u0574\u0562\u0565\u0580
+Month.11=\u0546\u0578\u0575\u0565\u0574\u0562\u0565\u0580
+Month.12=\u0534\u0565\u056f\u057f\u0565\u0574\u0562\u0565\u0580
+Month.2=\u0553\u0565\u057f\u0580\u057e\u0561\u0580
+Month.3=\u0544\u0561\u0580\u057f
+Month.4=\u0531\u057a\u0580\u056b\u056c
+Month.5=\u0544\u0561\u0575\u056b\u057d
+Month.6=\u0540\u0578\u0582\u0576\u056b\u057d
+Month.7=\u0540\u0578\u0582\u056c\u056b\u057d
+Month.8=\u0555\u0563\u0578\u057d\u057f\u0578\u057d
+Month.9=\u054d\u0565\u057a\u057f\u0565\u0574\u0562\u0565\u0580
+Name=\u0531\u0576\u0578\u0582\u0576
+Name.button=\u053f\u0578\u0573\u0561\u056f
+Name.list=\u0551\u0578\u0582\u0581\u0561\u056f
+Name.locus=\u053f\u0565\u057f\u0565\u0580\u056b \u0565\u0580\u056f\u0580\u0561\u0579\u0561\u0583\u0561\u056f\u0561\u0576 \u057f\u0565\u0572\u0568
+Name.matrix=\u0574\u0561\u057f\u0580\u056b\u0581
+Name.picture=\u0576\u056f\u0561\u0580
+Name.polygon=\u0562\u0561\u0566\u0574\u0561\u0576\u056f\u0575\u0578\u0582\u0576
+Name.text=\u054f\u0565\u0584\u057d\u057f
+Name.textfield=\u0544\u0578\u0582\u057f\u0584\u056b \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576
+NameAndValue=\u0531\u0576\u0578\u0582\u0576\u0576 \u0578\u0582 \u0561\u0580\u056a\u0565\u0584\u0568
+NewExpression=\u0546\u0578\u0580 \u0561\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+NewNameForA=\u0546\u0578\u0580 \u0561\u0576\u0578\u0582\u0576 %0-\u056b \u0570\u0561\u0574\u0561\u0580
+NewerVersionA=\u053f\u0561 \u0533\u0565\u0578\u0533\u0565\u0562\u0580\u0561\u0575\u056b \u0576\u0578\u0580 \u057f\u0561\u0580\u0562\u0565\u0580\u0561\u056f:\n\u0551\u0561\u0576\u056f\u0561\u0576\u0578\u055e\u0582\u0574 \u0565\u0584 \u0561\u0576\u0581\u0576\u0565\u056c \u0533\u0565\u0578\u0533\u0565\u0562\u0580\u0561 %0-\u056b\u0576:
+Next=\u0540\u0561\u057b\u0578\u0580\u0564\u0568
+NextCell=\u0540\u0561\u057b\u0578\u0580\u0564 \u057e\u0561\u0576\u0564\u0561\u056f\u0568
+NoJavaMessage=\u0531\u0575\u057d Java \u0561\u057a\u056c\u0565\u057f\u0568 \u057d\u057f\u0565\u0572\u056e\u057e\u0561\u056e \u0567 \u0533\u0565\u0578\u0533\u0565\u0562\u0580\u0561\u0575\u0578\u057e:\n\u0540\u0561\u057e\u0561\u0576\u0561\u0562\u0561\u0580 \u0541\u0565\u0580 \u0570\u0561\u0574\u0561\u056f\u0561\u0580\u0563\u056b\u0579\u0578\u0582\u0574 \u0579\u056f\u0561 Java, \u0561\u0575\u0576 \u056f\u0561\u0580\u0578\u0572 \u0565\u0584 \u0561\u0576\u057e\u0573\u0561\u0580 \u0576\u0565\u0580\u0562\u0565\u057c\u0576\u0565\u056c www.java.com-\u056b\u0581:
+NotAvailable=\u0540\u0561\u057d\u0561\u0576\u0565\u056c\u056b \u0579\u0567
+NotIncluded=\u0579\u056b \u0574\u056b\u0561\u0581\u057e\u0561\u056e
+Numeric=\u0539\u056b\u057e
+NumericObjects=\u0539\u057e\u0561\u0575\u056b\u0576 \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580
+Objects=\u0555\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580
+Off=\u0531\u0576\u057b\u0561\u057f\u0565\u0574
+OldExpression=\u0540\u056b\u0576 \u0561\u0580\u057f\u0561\u0570\u0561\u0575\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+On=\u0544\u056b\u0561\u0581\u0576\u0565\u0574
+OnClick=\u0554\u056c\u056b\u056f\u056b \u0564\u0565\u057a\u0584\u0578\u0582\u0574
+OnMouseOver=\u0535\u0569\u0565 \u056f\u0578\u0582\u0580\u057d\u0578\u0580\u0568 \u0585\u0562\u0575\u0565\u056f\u057f\u056b \u057e\u0580\u0561 \u0567
+OnUpdate=\u0539\u0561\u0580\u0574\u0561\u0581\u0574\u0561\u0576 \u0564\u0565\u057a\u0584\u0578\u0582\u0574
+Open=\u0532\u0561\u0581\u0565\u0574
+OpenButton=\u053e\u0580\u0561\u0563\u0580\u056b \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576\u0568 \u0562\u0561\u0581\u0565\u056c\u0578\u0582 \u056f\u0578\u0573\u0561\u056f
+Oscillating=\u054f\u0561\u057f\u0561\u0576\u0578\u0582\u0574\u0576\u0565\u0580
+OverwriteFile=\u053b\u0580\u0578\u0584 \u0578\u0582\u0566\u0578\u055e\u0582\u0574 \u0565\u0584 \u057e\u0565\u0580\u0561\u0563\u0580\u0565\u0584 \u0561\u0575\u0564 \u0586\u0561\u0575\u056c\u0568
+PGFExport.Grayscale=\u0544\u056b\u0561\u0563\u0578\u0582\u0575\u0576
+Parabola=\u054a\u0561\u0580\u0561\u0562\u0578\u056c
+ParabolaEquation=y² = \u056f\u0561\u0574 x² =
+ParabolaWithFocusAandDirectrixB=%0 \u0586\u0578\u056f\u0578\u0582\u057d\u0578\u057e \u0587 %1 \u0564\u056b\u0580\u0565\u056f\u057f\u0580\u056b\u057d\u0561\u0575\u0578\u057e \u057a\u0561\u0580\u0561\u0562\u0578\u056c
+ParallelLines=\u0536\u0578\u0582\u0563\u0561\u0570\u0565\u057c \u0578\u0582\u0572\u056b\u0572\u0576\u0565\u0580
+ParameterOfA=%0-\u056b \u057a\u0561\u0580\u0561\u0574\u0565\u057f\u0580
+ParametricForm=\u054a\u0561\u0580\u0561\u0574\u0565\u057f\u0580\u0561\u056f\u0561\u0576 \u057f\u0565\u057d\u0584
+Pause=\u0534\u0561\u0564\u0561\u0580
+Pentagon=\u0548\u0582\u0572\u0572\u0561\u0576\u056f\u0575\u0578\u0582\u0576
+PerspectiveName=\u0535\u0576\u0569\u0561\u0562\u0561\u056a\u0576\u056b \u0561\u0576\u057e\u0561\u0576\u0578\u0582\u0574\u0568
+Picture=\u054a\u0561\u057f\u056f\u0565\u0580
+PictureHeight=\u054a\u0561\u057f\u056f\u0565\u0580\u056b \u0562\u0561\u0580\u0571\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+PictureWidth=\u0546\u056f\u0561\u0580\u056b \u056c\u0561\u0575\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+Play=\u0533\u0578\u0580\u056e\u0561\u0580\u056f\u0565\u0574
+PlayButton=\u0533\u0578\u0580\u056e\u0561\u0580\u056f\u0574\u0561\u0576 \u056f\u0578\u0573\u0561\u056f
+Point=\u053f\u0565\u057f
+PointAplusB=%0 + %1 \u056f\u0565\u057f
+PointDep=\u053f\u0561\u056d\u0575\u0561\u056c
+PointFree=\u0531\u0566\u0561\u057f
+PointInA=\u053f\u0565\u057f %0-\u056b \u057e\u0580\u0561
+PointInside=\u0555\u0562\u0575\u0565\u056f\u057f\u056b \u0576\u0565\u0580\u057d\u0578\u0582\u0574
+PointOn=\u053f\u0565\u057f \u0563\u056e\u056b \u057e\u0580\u0561
+PointOnA=\u053f\u0565\u057f %0-\u056b \u057e\u0580\u0561
+PointOnAClosestToB=%0-\u056b \u057e\u0580\u0561 \u0563\u057f\u0576\u057e\u0578\u0572 \u0587 %1-\u056b\u0576 \u0561\u0574\u0565\u0576\u0561\u0574\u0578\u057f \u056f\u0565\u057f
+PointOnPath=\u0540\u0565\u057f\u0561\u0563\u056e\u056b \u057e\u0580\u0561
+PointSize=\u053f\u0565\u057f\u056b \u0579\u0561\u0583\u057d\u0568
+Points=\u053f\u0565\u057f\u0565\u0580
+PolarCoords=\u0532\u0587\u0565\u057c\u0561\u0575\u056b\u0576 \u056f\u0578\u0578\u0580\u0564\u056b\u0576\u0561\u057f\u0576\u0565\u0580
+PolarLineOfARelativeToB=%0-\u056b \u057a\u0578\u056c\u0575\u0561\u0580\u0568 %1-\u056b \u0576\u056f\u0561\u057f\u0574\u0561\u0574\u0562
+PolyLine=\u0532\u0565\u056f\u0575\u0561\u056c
+Polygon=\u0532\u0561\u0566\u0574\u0561\u0576\u056f\u0575\u0578\u0582\u0576
+PositiveDirectionOnly=\u0544\u056b\u0561\u0575\u0576 \u0564\u0580\u0561\u056f\u0561\u0576 \u0578\u0582\u0572\u0572\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+PreviewUnavailable=\u0546\u0561\u056d\u0561\u0564\u056b\u057f\u0578\u0582\u0574 \u0570\u0576\u0561\u0580\u0561\u057e\u0578\u0580 \u0579\u0567
+ProbabilityCalculator=\u0540\u0561\u057e\u0561\u0576\u0561\u056f\u0561\u0576\u0561\u0575\u056b\u0576 \u0570\u0561\u0577\u057e\u056b\u0579
+Properties=\u0540\u0561\u057f\u056f\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580
+Quadrangle=\u0554\u0561\u057c\u0561\u0576\u056f\u0575\u0578\u0582\u0576
+Quadrilateral=\u0554\u0561\u057c\u0561\u0576\u056f\u0575\u0578\u0582\u0576
+Question=\u0540\u0561\u0580\u0581
+Radius=\u0547\u0561\u057c\u0561\u057e\u056b\u0572
+RadiusOfA=%0-\u056b \u0577\u0561\u057c\u0561\u057e\u056b\u0572\u0568
+Random=\u054a\u0561\u057f\u0561\u0570\u0561\u056f\u0561\u0576 \u0569\u056b\u057e
+Range=\u0547\u0561\u0580\u0584
+Ray=\u0543\u0561\u057c\u0561\u0563\u0561\u0575\u0569
+RayThroughAB=%0-\u0578\u057e \u0578\u0582 %1-\u0578\u057e \u0573\u0561\u057c\u0561\u0563\u0561\u0575\u0569
+RayThroughAWithDirectionB=%0-\u0578\u057e \u0561\u0576\u0581\u0576\u0578\u0572 \u0573\u0561\u057d\u057c\u0561\u0563\u0561\u0575\u0569 \u0578\u0582\u0572\u0572\u057e\u0561\u056e %1-\u0578\u057e
+Redefine=\u054e\u0565\u0580\u0561\u057d\u0561\u0570\u0574\u0561\u0576\u0565\u0574
+Remove=\u054b\u0576\u057b\u0565\u0574
+Rename=\u054e\u0565\u0580\u0561\u0576\u057e\u0561\u0576\u0565\u0574
+Repeat=\u053f\u0580\u056f\u0576\u0565\u0574
+ResizeAngle=\u0531\u0576\u056f\u0575\u0561\u0576 \u0561\u057e\u057f\u0578\u0574\u0561\u057f \u057e\u0565\u0580\u0561\u0579\u0561\u0583\u0578\u0582\u0574
+ResolutionInDPI=\u053c\u0578\u0582\u056e\u056b\u0579 \u0578\u0582\u056a (dpi)
+ReverseMouseWheel=\u0544\u056f\u0576\u056b\u056f\u056b \u0561\u0576\u057e\u056b\u056f\u0568 \u0561\u0577\u056d\u0561\u057f\u056b \u0570\u0561\u056f\u0561\u057c\u0561\u056f \u0578\u0582\u0572\u0572\u0578\u0582\u0569\u0575\u0561\u0574\u0562
+RootOfA=%0-\u056b \u0561\u0580\u0574\u0561\u057f\u0568
+RootOfAWithInitialValueB=%0-\u056b \u0561\u0580\u0574\u0561\u057f\u0568 %1 \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u056a\u0565\u0584\u0578\u057e
+RootOfAonIntervalBC=[%1, %2]-\u0578\u0582\u0574 \u0563\u057f\u0576\u057e\u0578\u0572 %0-\u056b \u0561\u0580\u0574\u0561\u057f
+ScaleInCentimeter=\u0549\u0561\u0583 (\u057d\u0574)
+Script=\u0533\u0565\u0578\u0533\u0565\u0562\u0580\u0561 \u057d\u056f\u0580\u056b\u057a\u057f
+Scripting=\u054d\u0581\u0565\u0576\u0561\u0580\u0576\u0565\u0580
+SecondAxisLengthOfA=%0-\u056b \u0583\u0578\u0584\u0580 \u056f\u056b\u057d\u0561\u057c\u0561\u0576\u0581\u0584\u056b \u0565\u0580\u056f\u0561\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+SecondAxisOfA=%0-\u056b \u0583\u0578\u0584\u0580 \u056f\u056b\u057d\u0561\u057c\u0561\u0576\u0581\u0584\u0568
+Sector=\u054d\u0565\u056f\u057f\u0578\u0580
+Segment=\u0540\u0561\u057f\u057e\u0561\u056e
+SegmentAB=[%0, %1] \u0570\u0561\u057f\u057e\u0561\u056e
+SegmentABofC=%2-\u056b\u0576 \u057a\u0561\u057f\u056f\u0561\u0576\u0578\u0572 [%0, %1] \u0570\u0561\u057f\u057e\u0561\u056e
+Selection=\u0538\u0576\u057f\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+SelectionAllowed=\u0539\u0578\u0582\u0575\u056c \u057f\u0561\u0574 \u0568\u0576\u057f\u0580\u0565\u056c
+Semicircle=\u053f\u056b\u057d\u0561\u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e
+SemicircleThroughAandB=\u053f\u056b\u057d\u0561\u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e \u0568\u057d\u057f %0-\u056b \u0578\u0582 %1-\u056b
+Show=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574
+ShowAllObjects=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0561\u0574\u0565\u0576 \u056b\u0576\u0579
+ShowAutomatically=\u0531\u057e\u057f\u0578\u0574\u0561\u057f \u0581\u0578\u0582\u0575\u0581 \u057f\u0561\u0574
+ShowAxes=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0561\u057c\u0561\u0576\u0581\u0584\u0576\u0565\u0580\u0568
+ShowAxisNumbers=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0569\u057e\u0565\u0580\u0568
+ShowGrid=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0581\u0561\u0576\u0581\u0568
+ShowLabel=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0576\u0577\u0561\u0576\u0561\u056f\u0578\u0582\u0574\u0568
+ShowObject=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0585\u0562\u0575\u0565\u056f\u057f\u0568
+ShowOnXAxis=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 x-\u0565\u0580\u056b \u0561\u057c\u0561\u0576\u0581\u0584\u056b \u057e\u0580\u0561
+ShowOnlineHelp=\u0555\u0563\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576 (Online)
+ShowOnlyBreakpoints=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0574\u056b\u0561\u0575\u0576 \u0576\u0577\u057e\u0561\u056e\u0576\u0565\u0580\u0568
+ShowTitleBar=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576\u0576\u0565\u0580\u056b \u057e\u0565\u0580\u0576\u0561\u0563\u0580\u0565\u0580\u0568
+ShowTrace=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0570\u0565\u057f\u0584\u0568
+ShowxAxis=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 x-\u0576\u0565\u0580\u056b \u0561\u057c\u0561\u0576\u0581\u0584\u0568
+ShowyAxis=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 y-\u0576\u0565\u0580\u056b \u0561\u057c\u0561\u0576\u0581\u0584\u0568
+SimpleFormulas=\u054a\u0561\u0580\u0566 \u0562\u0561\u0576\u0561\u0571\u0587\u0565\u0580
+Size=\u0549\u0561\u0583
+Slider=\u054d\u0578\u0572\u0576\u0561\u056f
+SlopeOfA=%0-\u056b \u0569\u0565\u0584\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+Small=\u0553\u0578\u0584\u0580
+Speed=\u0531\u0580\u0561\u0563\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+SphereThroughAwithCenterB=%1 \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u0578\u057e \u0587 %0-\u0578\u057e \u0561\u0576\u0581\u0576\u0578\u0572 \u0563\u0576\u0564\u0561\u0575\u056b\u0576 \u0574\u0561\u056f\u0565\u0580\u0587\u0578\u0582\u0575\u0569
+SphereWithCenterAandRadiusB=%0 \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u0578\u057e \u0578\u0582 %1 \u0577\u0561\u057c\u0561\u057e\u0578\u0572\u0578\u057e \u0563\u0576\u0564\u0561\u0575\u056b\u0576 \u0574\u0561\u056f\u0565\u0580\u0587\u0578\u0582\u0575\u0569
+Spreadsheet=\u0531\u0572\u0575\u0578\u0582\u057d\u0561\u056f
+StandardObject=\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f \u0585\u0562\u0575\u0565\u056f\u057f
+StandardView=\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f \u057f\u0565\u057d\u0584
+StartingPoint=\u054d\u056f\u0566\u0562\u0576\u0561\u056f\u0565\u057f
+StemPlot.high=\u0562\u0561\u0580\u0571\u0580
+StemPlot.low=\u0581\u0561\u056e\u0580
+StickToEdge=\u0531\u0574\u0580\u0561\u0581\u0576\u0565\u0574 \u0565\u0566\u0580\u0561\u0563\u056e\u056b\u0576
+StopScript=\u0534\u0561\u0564\u0561\u0580\u0565\u0581\u0576\u0565\u0574 \u057d\u0581\u0565\u0576\u0561\u0580\u0568
+Substitute=\u054f\u0565\u0572\u0561\u0564\u0580\u0578\u0582\u0574
+SubstituteForAinB=%0-\u0568 \u057f\u0565\u0572\u0561\u0564\u0580\u0565\u0574 %1-\u0578\u0574
+SubstituteSimplify=\u054f\u0565\u0572\u0561\u0564\u0580\u0578\u0582\u0574 \u0587 \u057a\u0561\u0580\u0566\u0565\u0581\u0578\u0582\u0574
+Syntax=\u0547\u0561\u0580\u0561\u0570\u0575\u0578\u0582\u057d\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+SyntaxErrorAisNotAList=\u0547\u0561\u0580\u0561\u0570\u0575\u0578\u0582\u057d\u0578\u0582\u0569\u0575\u0561\u0576 \u057d\u056d\u0561\u056c. %0-\u0576 \u0581\u0578\u0582\u0581\u0561\u056f \u0579\u0567
+SystemInformation=\u0540\u0561\u0574\u0561\u056f\u0561\u0580\u0563\u056b \u0574\u0561\u057d\u056b\u0576 \u056b\u0576\u0586\u0578\u0580\u0574\u0561\u0581\u056b\u0561
+SystemInformationMessage=\u0540\u0561\u0574\u0561\u056f\u0561\u0580\u0563\u056b \u0574\u0561\u057d\u056b\u0576 \u056b\u0576\u0586\u0578\u0580\u0574\u0561\u0581\u056b\u0561\u0576 \u0570\u0561\u057b\u0578\u0572\u0578\u0582\u0569\u0575\u0561\u0574\u0562 \u056f\u0580\u056f\u0576\u0585\u0580\u056b\u0576\u0561\u056f\u057e\u0565\u0581 \u0583\u0578\u056d\u0561\u0576\u0561\u056f\u0574\u0561\u0576 \u0562\u0578\u0582\u0586\u0565\u0580\u0578\u0582\u0574
+TangentToAParallelToB=%0-\u056b \u0577\u0578\u0577\u0561\u0583\u0578\u0572, \u0578\u0580\u0568 \u0566\u0578\u0582\u0563\u0561\u0570\u0565\u057c \u0567 %1-\u056b\u0576
+TangentToAThroughB=%1 \u056f\u0565\u057f\u0578\u057e \u0561\u0576\u0581\u0576\u0578\u0572 %0-\u056b \u0577\u0578\u0577\u0561\u0583\u0578\u0572
+TangentToAatB=%1 \u056f\u0565\u057f\u0578\u0582\u0574 %0-\u056b \u0577\u0578\u0577\u0561\u0583\u0578\u0572
+Text=\u054f\u0565\u0584\u057d\u057f
+TextAfterConstruction=\u054f\u0565\u0584\u057d\u057f \u0563\u056e\u0561\u0563\u0580\u056b \u057f\u0561\u056f
+TextBeforeConstruction=\u054f\u0565\u0584\u057d\u057f \u0563\u056e\u0561\u0563\u0580\u056b\u0581 \u057e\u0565\u0580\u0587
+TextField=\u0544\u0578\u0582\u057f\u0584\u056b \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576
+TextfieldLength=\u0544\u0578\u0582\u057f\u0584\u056b \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576\u056b \u0565\u0580\u056f\u0561\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+Thickness=\u0533\u056e\u056b \u0570\u0561\u057d\u057f\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+TickDistance=\u0540\u0565\u057c\u0561\u057e\u0578\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+TimeBetweenFrames=\u053f\u0561\u0564\u0565\u0580\u056b \u0574\u056b\u057b\u0587 \u056a\u0561\u0574\u0561\u0576\u0561\u056f\u0568
+Title=\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580
+TitleExportPgf=\u0531\u0580\u057f\u0561\u0570\u0561\u0576\u0565\u0574 \u0533\u0565\u0578\u0533\u0565\u0562\u0580\u0561\u0576 \u0578\u0580\u057a\u0565\u057d PGF
+TitleExportPstricks=\u0531\u0580\u057f\u0561\u0570\u0561\u0576\u0565\u0574 \u0533\u0565\u0578\u0533\u0565\u0562\u0580\u0561\u0576 \u0578\u0580\u057a\u0565\u057d PSTricks
+ToggleStyleBar=\u0548\u0573\u056b \u056f\u0561\u0580\u0563\u0561\u057e\u0578\u0580\u0578\u0582\u0574
+ToolbarIcon=\u053b\u056f\u0578\u0576 (\u057a\u0561\u057f\u056f\u0565\u0580\u0561\u056f)
+ToolbarIconsConstructionProtocolExport=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0563\u0578\u0580\u056e\u056b\u0584\u0576\u0565\u0580\u056b \u057e\u0561\u0570\u0561\u0576\u0561\u056f\u056b \u056b\u056f\u0578\u0576\u0568 (\u057a\u0561\u057f\u056f\u0565\u0580\u0561\u056f\u0568)
+TooltipLanguage=\u053c\u0565\u0566\u0578\u0582\u0576
+TooltipTimeout=\u0539\u0561\u0575\u0574\u0561\u0578\u0582\u057f (\u057e\u0561\u0575\u0580\u056f\u0575\u0561\u0576\u0576\u0565\u0580\u0578\u057e)
+Tooltips=\u0540\u0561\u0575\u057f\u0576\u057e\u0578\u0572 \u0570\u0578\u0582\u0577\u0578\u0582\u0574
+TraceOff=\u0540\u0565\u057f\u0584 \u0579\u056b \u0569\u0578\u0572\u0576\u0578\u0582\u0574
+TraceOn=\u0540\u0565\u057f\u0584 \u0567 \u0569\u0578\u0572\u0576\u0578\u0582\u0574
+TranslationOfAbyB=%0-\u056b \u057f\u0565\u0572\u0561\u0583\u0578\u056d\u0578\u0582\u0574 %1-\u0578\u057e
+TranslationOfAtoB=%0-\u056b \u057f\u0565\u0572\u0561\u0583\u0578\u056d\u0578\u0582\u0574 %1
+TreeModeDependency=\u054f\u0565\u057d\u0561\u056f\u0561\u057e\u0578\u0580\u0565\u0574 \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u0568 \u0568\u057d\u057f \u056f\u0561\u056d\u057e\u0561\u056e\u0578\u0582\u0569\u0575\u0561\u0576
+TreeModeLayer=\u054f\u0565\u057d\u0561\u056f\u0561\u057e\u0578\u0580\u0565\u0574 \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u0576 \u0568\u057d\u057f \u0577\u0565\u0580\u057f\u0565\u0580\u056b
+TreeModeType=\u054f\u0565\u057d\u0561\u056f\u0561\u057e\u0578\u0580\u0565\u0574 \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u0576 \u0568\u057d\u057f \u057f\u0565\u057d\u0561\u056f\u056b
+TreeModeView=\u054f\u0565\u057d\u0561\u056f\u0561\u057e\u0578\u0580\u0565\u0574 \u0585\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580\u0576 \u0568\u057d\u057f \u057f\u0565\u057d\u0584\u056b
+Triangle=\u0535\u057c\u0561\u0576\u056f\u0575\u0578\u0582\u0576
+UnitVectorOfA=%0-\u056b \u0574\u056b\u0561\u057e\u0578\u0580 \u057e\u0565\u056f\u057f\u0578\u0580
+UnitVectorPerpendicularToA=%0-\u056b\u0576 \u0578\u0582\u0572\u0572\u0561\u0570\u0561\u0575\u0561\u0581 \u0574\u056b\u0561\u057e\u0578\u0580 \u057e\u0565\u056f\u057f\u0578\u0580
+UntitledConstruction=\u0531\u0576\u0561\u0576\u0578\u0582\u0576 \u056f\u0578\u0576\u057d\u057f\u0580\u0578\u0582\u056f\u0581\u056b\u0561
+Up=\u054e\u0565\u0580\u0587
+Upload=\u054e\u0565\u0580\u0562\u0565\u057c\u0576\u0565\u0574
+UploadError=GeoGebraTube-\u0568 \u0561\u0576\u0570\u0561\u057d\u0561\u0576\u0565\u056c\u056b \u0567: \u054e\u0565\u0580\u0562\u0565\u057c\u0576\u0578\u0582\u0574\u0568 \u0579\u0565\u0572\u0575\u0561\u056c \u0570\u0561\u0574\u0561\u0580\u0565\u0574: (\u054d\u056d\u0561\u056c\u056b \u056f\u0578\u0564. %0)
+UploadPrepare=\u0546\u0561\u056d\u0561\u057a\u0561\u057f\u0580\u0561\u057d\u057f\u0565\u0574 \u057e\u0565\u0580\u0562\u0565\u057c\u0576\u0574\u0561\u0576
+UseJavaFontsForLaTeX=LaTeX \u057f\u0565\u0584\u057d\u057f\u0565\u0580\u0578\u0582\u0574 \u0585\u0563\u057f\u0561\u0563\u0578\u0580\u056e\u0565\u0574 Java \u0586\u0578\u0576\u0564\u0565\u0580
+Value=\u0531\u0580\u056a\u0565\u0584
+Vector=\u054e\u0565\u056f\u057f\u0578\u0580
+VectorPerpendicularToA=%0-\u056b\u0576 \u0578\u0582\u0572\u0572\u0561\u0570\u0561\u0575\u0561\u0581 \u057e\u0565\u056f\u057f\u0578\u0580
+Vectors=\u054e\u0565\u056f\u057f\u0578\u0580\u0576\u0565\u0580
+VertexOfA=%0-\u056b \u0563\u0561\u0563\u0561\u0569
+VeryLarge=\u0547\u0561\u057f \u0574\u0565\u056e
+VerySmall=\u0547\u0561\u057f \u0583\u0578\u0584\u0580
+ViewCloseExtraWindow=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0563\u056c\u056d\u0561\u057e\u0578\u0580 \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576\u0578\u0582\u0574
+ViewOpenExtraWindow=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0561\u057c\u0561\u0576\u0571\u056b\u0576 \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576\u0578\u0582\u0574
+VirtualKeyboard=\u054e\u056b\u0580\u057f\u0578\u0582\u0561\u056c \u057d\u057f\u0565\u0572\u0576\u0561\u0577\u0561\u0580
+VirtualKeyboardLanguage=\u054e\u056b\u0580\u057f\u0578\u0582\u0561\u056c \u057d\u057f\u0565\u0572\u0576\u0561\u0577\u0561\u0580\u056b \u056c\u0565\u0566\u0578\u0582\u0576
+Width=\u053c\u0561\u0575\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+WindowOpened=\u054a\u0561\u057f\u0578\u0582\u0570\u0561\u0576\u0568 \u0562\u0561\u0581\u057e\u0561\u056e \u0567
+XMLTagANotFound=%0 XML \u0569\u0565\u0563\u0568 \u0579\u056b \u0563\u057f\u0576\u057e\u0565\u056c
+XUnits=X-\u056b \u0574\u056b\u0561\u057e\u0578\u0580\u0576\u0565\u0580\u0568 (\u057d\u0574)
+YUnits=Y-\u056b \u0574\u056b\u0561\u057e\u0578\u0580\u0576\u0565\u0580\u0568 (\u057d\u0574)
+ZoomIn=\u0544\u0565\u056e\u0561\u0581\u0576\u0565\u0574
+ZoomOut=\u0553\u0578\u0584\u0580\u0561\u0581\u0576\u0565\u0574
+allowOutlyingIntersections=\u0539\u0578\u0582\u0575\u056c\u0561\u057f\u0580\u0565\u0574 \u0561\u0580\u057f\u0561\u0584\u056b\u0576 \u0570\u0561\u057f\u0578\u0582\u0574
+allowReflexAngle=\u0539\u0578\u0582\u0575\u056c\u0561\u057f\u0580\u0565\u0574 \u0561\u0580\u057f\u0561\u0584\u056b\u0576 \u0561\u0576\u056f\u0575\u0578\u0582\u0576
+back=\u0535\u057f
+cartesian=\u0564\u0565\u056f\u0561\u0580\u057f\u0575\u0561\u0576
+clockwise=\u056a\u0561\u0574\u057d\u056c\u0561\u0584\u056b \u0578\u0582\u0572\u0572\u0578\u0582\u0569\u0575\u0561\u0574\u0562
+counterClockwise=\u056a\u0561\u0574\u057d\u056c\u0561\u0584\u056b \u0570\u0561\u056f\u0561\u057c\u0561\u056f \u0578\u0582\u0572\u0572\u0578\u0582\u0569\u0575\u0561\u0574\u0562
+dependent=\u056f\u0561\u056d\u0575\u0561\u056c
+dilatedByFactor=\u0540\u0578\u0574\u0578\u057f\u0565\u057f\u056b\u0561 \u0563\u0578\u0580\u056e\u0561\u056f\u0581\u0578\u057e
+equal=\u0570\u0561\u057e\u0561\u057d\u0561\u0580
+firstAxisLength=\u0574\u0565\u056e \u0561\u057c\u0561\u0576\u0581\u0584\u056b \u0565\u0580\u056f\u0561\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+fixed=\u0531\u0574\u0580\u0561\u0581\u057e\u0561\u056e, \u0586\u056b\u0584\u057d\u057e\u0561\u056e
+fncInspector.Curvature=\u053f\u0578\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+fncInspector.Derivative=\u0531\u056e\u0561\u0576\u0581\u056b\u0561\u056c
+fncInspector.Derivative2=2-\u0580\u0564 \u0561\u056e\u0561\u0576\u0581\u056b\u0561\u056c
+fncInspector.Difference=\u054f\u0561\u0580\u0562\u0565\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576
+fncInspector.Interval=\u0544\u056b\u057b\u0561\u056f\u0561\u0575\u0584
+fncInspector.MultipleRoots=\u0544\u056b \u0584\u0561\u0576\u056b \u0561\u0580\u0574\u0561\u057f
+fncInspector.NoRoots=\u0531\u0580\u0574\u0561\u057f\u0576\u0565\u0580 \u0579\u056f\u0561\u0576
+fncInspector.Points=\u053f\u0565\u057f\u0565\u0580
+fncInspector.Property=\u0540\u0561\u057f\u056f\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580
+fncInspector.ShowArea=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u057f\u056b\u0580\u0578\u0582\u0575\u0569\u0568
+fncInspector.Value=\u0531\u0580\u056a\u0565\u0584
+fncInspector.addColumn=\u0531\u057e\u0565\u056c\u0561\u0581\u0576\u0565\u0574 \u057d\u0575\u0578\u0582\u0576
+fncInspector.removeColumn=\u054b\u0576\u057b\u0565\u0574 \u057e\u0565\u0580\u057b\u056b\u0576 \u057d\u0575\u0578\u0582\u0576\u0568
+fncInspector.showOscCircle=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0577\u0578\u0577\u0561\u0583\u0578\u0572 \u0577\u0580\u057b\u0561\u0576\u0561\u0563\u056b\u056e\u0568
+fncInspector.showTable=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u056f\u0565\u057f\u0565\u0580\u056b \u0561\u0572\u0575\u0578\u0582\u057d\u0561\u056f\u0568
+fncInspector.showTangent=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0577\u0578\u0577\u0561\u0583\u0578\u0572\u0568
+fncInspector.showXYLines=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0563\u056e\u0565\u0580\u056b x,y \u057a\u0580\u0578\u0575\u0565\u056f\u0581\u056b\u0561\u0576\u0565\u0580\u0568
+fncInspector.step=x \u0583\u0578\u0578\u0583\u056d\u0561\u056f\u0561\u0576\u056b \u0584\u0561\u0575\u056c\u056b \u0579\u0561\u0583\u0568
+forceReflexAngle=\u0544\u056b\u0577\u057f \u0561\u0580\u057f\u0561\u0584\u056b\u0576
+forward=\u0534\u056b\u0574\u0561\u0581
+free=\u0561\u0566\u0561\u057f
+horizontal=\u0540\u0578\u0580\u056b\u0566\u0578\u0576\u0561\u056f\u0561\u0576
+html=\u054e\u0565\u0562 \u0567\u057b
+jpg=JPG \u0586\u0578\u0580\u0574\u0561\u057f
+max=\u0544\u0561\u0584\u057d\u056b\u0574\u0578\u0582\u0574
+min=\u0544\u056b\u0576\u056b\u0574\u0578\u0582\u0574
+off=\u0531\u0576\u057b\u0561\u057f\u0565\u0574
+otherwise=\u0540\u0561\u056f\u0561\u057c\u0561\u056f \u0564\u0565\u057a\u0584\u0578\u0582\u0574
+parallel=\u0566\u0578\u0582\u0563\u0561\u0570\u0565\u057c \u0578\u0582\u0572\u056b\u0572
+pdf=\u054f\u0565\u0572\u0561\u0583\u0578\u056d\u0565\u056c\u056b \u0583\u0561\u057d\u057f\u0561\u0569\u0572\u0569\u056b \u0586\u0578\u0580\u0574\u0561\u057f\u0568
+png=\u0586\u0578\u0580\u0574\u0561\u057f png
+polar=\u054a\u0578\u056c\u0575\u0561\u0580
+resetConstruction=\u054e\u0565\u0580\u0561\u0564\u0561\u0580\u0571\u0576\u0565\u0574 \u057d\u056f\u0566\u0562\u0576\u0561\u056f\u0561\u0576 \u057e\u056b\u0573\u0561\u056f\u056b
+stylebar.Align=\u0540\u0578\u0580\u056b\u0566\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057e\u0561\u057d\u0561\u0580\u0565\u0581\u0578\u0582\u0574
+stylebar.AlignCenter=\u0540\u0561\u057e\u0561\u057d\u0561\u0580\u0565\u0581\u0576\u0565\u0574 \u056f\u0565\u0576\u057f\u0580\u0578\u0576\u0576\u0565\u0580\u0568
+stylebar.AlignLeft=\u0540\u0561\u057e\u0561\u057d\u0561\u0580\u0565\u0581\u0576\u0565\u0574 \u0571\u0561\u056d \u0565\u0566\u0580\u0565\u0580\u0568
+stylebar.AlignRight=\u0540\u0561\u057e\u0561\u057d\u0561\u0580\u0565\u0581\u0576\u0565\u0574 \u0561\u057b \u0565\u0566\u0580\u0565\u0580\u0568
+stylebar.Axes=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u056f\u0561\u0574 \u0569\u0561\u0584\u0581\u0576\u0565\u0574 \u0561\u057c\u0561\u0576\u0581\u0584\u0576\u0565\u0580\u0568
+stylebar.BgColor=\u0556\u0578\u0576\u056b \u0563\u0578\u0582\u0575\u0576\u0568
+stylebar.Bold=\u0539\u0561\u057e \u057f\u0561\u057c\u0561\u057f\u0565\u057d\u0561\u056f
+stylebar.Border=\u054d\u0561\u0570\u0574\u0561\u0576\u0576\u0565\u0580\u0568
+stylebar.Bracket=\u0553\u0561\u056f\u0561\u0563\u056e\u0565\u0580\u056b \u0578\u0573\u0568
+stylebar.Caption=\u0538\u0576\u057f\u0580\u0565\u0574 \u057e\u0565\u0580\u0576\u0561\u0563\u0580\u056b \u0578\u0573\u0568
+stylebar.Capture=\u0538\u0576\u057f\u0580\u0565\u0574 \u056f\u0565\u057f\u0565\u0580\u056b \u0561\u0574\u0580\u0561\u0581\u0574\u0561\u0576 \u0578\u0573\u0568
+stylebar.Color=\u0533\u0578\u0582\u0575\u0576
+stylebar.ColorTransparency=\u0538\u0576\u057f\u0580\u0565\u0574 \u0563\u0578\u0582\u0575\u0576\u0568 \u0587 \u0569\u0561\u0583\u0561\u0576\u0581\u056b\u056f\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568
+stylebar.CopyVisualStyle=\u053f\u0580\u056f\u0576\u0585\u0580\u056b\u0576\u0561\u056f\u0565\u0574 \u0578\u0573\u0568
+stylebar.Eraser=\u054b\u0576\u057b\u0565\u0574 \u0574\u0561\u057f\u056b\u057f\u056b \u0570\u0565\u057f\u0584\u0565\u0580\u0568
+stylebar.Grid=\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u0574/\u0569\u0561\u0584\u0581\u0576\u0565\u0574 \u0581\u0561\u0576\u0581\u0568
+stylebar.Hidden=\u0539\u0561\u0584\u0581\u0576\u0565\u056c
+stylebar.HorizontalLine=\u0539\u0561\u0584\u0581\u0576\u0565\u0574 \u056f\u0561\u0574 \u0581\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0570\u0578\u0580\u056b\u0566\u0578\u0576\u0561\u056f\u0561\u0576 \u0563\u056e\u0565\u0580\u0568
+stylebar.Italic=\u0547\u0565\u0572\u0561\u057f\u0561\u057c
+stylebar.Label=\u0546\u0577\u0561\u0576\u0561\u056f\u0578\u0582\u0574\u0576\u0565\u0580\u056b \u0578\u0573\u0568
+stylebar.LineStyle=\u0533\u056e\u0565\u0580\u056b \u0578\u0573\u0568
+stylebar.Pen=\u0546\u056f\u0561\u0580\u0565\u0574 \u0574\u0561\u057f\u056b\u057f\u0578\u057e
+stylebar.PointStyle=\u0538\u0576\u057f\u0580\u0565\u0574 \u056f\u0565\u057f\u0565\u0580\u056b \u0578\u0573\u0568
+stylebar.TextColor=\u054f\u0565\u0584\u057d\u057f\u056b \u0563\u0578\u0582\u0575\u0576\u0568
+stylebar.TextSize=\u054f\u0561\u057c\u0561\u0579\u0561\u0583\u0568
+stylebar.VerticalLine=\u0539\u0561\u0584\u0581\u0576\u0565\u0574 \u056f\u0561\u0574 \u0581\u0578\u0582\u0575\u0581 \u057f\u0561\u0574 \u0578\u0582\u0572\u0572\u0561\u0571\u056b\u0563 \u0563\u056e\u0565\u0580\u0568
+svg=\u0544\u0561\u057d\u0577\u057f\u0561\u0562\u0561\u057e\u0578\u0580\u057e\u0578\u0572 \u057e\u0565\u056f\u057f\u0578\u0580\u0561\u056f\u0561\u0576 \u0563\u0580\u0561\u0586\u056b\u056f\u0561
+undefined=\u0578\u0580\u0578\u0577\u057e\u0561\u056e \u0579\u0567
+unequal=\u0570\u0561\u057e\u0561\u057d\u0561\u0580 \u0579\u0567
+vertical=\u0548\u0582\u0572\u0572\u0561\u0571\u056b\u0563
+xAxis=x\u0531\u057c\u0561\u0576\u0581\u0584
+xmax=X\u0544\u0561\u0584\u057d\u056b\u0574\u0578\u0582\u0574
+xmin=X\u0544\u056b\u0576\u056b\u0574\u0578\u0582\u0574
+xstep=X\u0554\u0561\u0575\u056c
+yAxis=y\u0531\u057c\u0561\u0576\u0581\u0584
+ymax=Y\u0544\u0561\u0584\u057d\u056b\u0574\u0578\u0582\u0574
+ymin=Y\u0544\u056b\u0576\u056b\u0574\u0578\u0582\u0574
+ystep=Y\u0554\u0561\u0575\u056c
\ No newline at end of file
diff --git a/geogebra/properties/plain_in.properties b/geogebra/properties/plain_in.properties
index 055a428..b5d4f19 100644
--- a/geogebra/properties/plain_in.properties
+++ b/geogebra/properties/plain_in.properties
@@ -1,5 +1,3 @@
-2x2Matrix=Matriks 2x2
-3x3Matrix=Matriks 3x3
ADecimalPlace=%0 Angka Desimal
ADecimalPlaces=%0 Angka Desimal
ADerivativeOfB=Turunan %0 dari %1
diff --git a/geogebra/properties/plain_is.properties b/geogebra/properties/plain_is.properties
index 88a0898..01cebbd 100644
--- a/geogebra/properties/plain_is.properties
+++ b/geogebra/properties/plain_is.properties
@@ -1,5 +1,3 @@
-2x2Matrix=2x2 fylki
-3x3Matrix=3x3 fylki
ADecimalPlace=%0 Aukastafur
ADecimalPlaces=%0 Aukastafir
ADerivativeOfB=%0 afleiða %1
@@ -34,6 +32,7 @@ AisaTangentToB=%0 er snertill vi
AlgebraWindow=Algebrugluggi
AliesOnB=%0 liggur á %1
AliesOnThePerimeterOfB=%0 liggur á jaðri %1
+AllowOfflineUse=Taka inn *.jar skrár
Altitude=Hæð
Angle=Horn
AngleBetweenAB=Horn milli %0, %1
@@ -205,7 +204,6 @@ IgnoreDocumentLayout=Hir
Image=Mynd
ImplicitPoly=Fólginn ferill
IncircleOfTriangleABC=Innritaður hringur þríhyrnings %0 %1 %2
-IncludeJARFiles=Taka inn *.jar skrár
Increasing=Vaxandi
IncreasingOnce=Vaxandi (einu sinni)
Inequality=Ójafna
@@ -224,7 +222,7 @@ Interpolate=Teikna me
IntersectingLines=Línur sem skerast
IntersectionCurveOfAB=Skurðferill %0 og %1
IntersectionLineOfAB=Skurðlína %0 og %1
-IntersectionPathsOfAB=Skurðvegur %0 og %1
+IntersectionOfAandB=Skurðvegur %0 og %1
IntersectionPointOfAB=Skurðpunktur %0, %1
IntersectionPointOfABNearC=Skurðpunktur %0 og %1, nálægt punktinum %2
IntersectionPointOfABWithInitialValueC=Skurðpunktur %0, %1 með byrjunargildi %2
@@ -316,12 +314,6 @@ PerspectiveName=Nafn s
Picture=Mynd
PictureHeight=Hæð myndar
PictureWidth=Breidd myndar
-PlaneA=plan %0
-PlaneContainingA=Plan sem inniheldur %0
-PlaneFromA=plan búið til úr %0
-PlaneThroughAB=Plan gegnum %0, %1
-PlaneThroughABC=Plan gegnum %0, %1, %2
-PlaneThroughAParallelToB=Plan gegnum %0 samsíða %1
Play=Spila
PlayButton=Hnappur til að spila
Point=Punktur
diff --git a/geogebra/properties/plain_it.properties b/geogebra/properties/plain_it.properties
index cfc18bb..cb93bca 100644
--- a/geogebra/properties/plain_it.properties
+++ b/geogebra/properties/plain_it.properties
@@ -1,5 +1,3 @@
-2x2Matrix=Matrice 2x2
-3x3Matrix=Matrice 3x3
ADecimalPlace=%0 cifra decimale
ADecimalPlaces=%0 cifre decimali
ADerivativeOfB=Derivata di ordine %0 di %1
@@ -34,6 +32,7 @@ AisaTangentToB=%0
AlgebraWindow=Vista Algebra
AliesOnB=%0 giace su %1
AliesOnThePerimeterOfB=%0 giace sul perimetro di %1
+AllowOfflineUse=Consenti l'uso offline
AllowStyleBar=Barra di stile accessibile
Alt=ALT
AltGr=ALTGR
@@ -114,7 +113,6 @@ ConstructionProtocolHelp=<html><body><p><b>Uso del Protocollo di Costruzione</b>
ConstructionProtocolNavigation=Barra di navigazione per i passi della costruzione
Coordinates=Coordinate
CopyToClipboard=Copia negli Appunti
-CopyToLaTeX=Copia in LaTeX
CreatedWith=Creato con
CreatedWithGeoGebra=Creato con GeoGebra
CrossAt=Origine in
@@ -216,7 +214,6 @@ IgnoreDocumentLayout=Ignora layout del documento
Image=Immagine
ImplicitPoly=Curva implicita
IncircleOfTriangleABC=Circonferenza inscritta nel triangolo %0%1%2
-IncludeJARFiles=Includi i file *.jar
Increasing=Crescente
IncreasingOnce=Crescente (una volta)
Inequality=Disequazione
@@ -235,7 +232,7 @@ Interpolate=Traccia il grafico interpolante
IntersectingLines=Rette secanti
IntersectionCurveOfAB=Curva intersezione di %0, %1
IntersectionLineOfAB=Retta intersezione di %0, %1
-IntersectionPathsOfAB=Percorsi intersezione di %0, %1
+IntersectionOfAandB=Intersezione di %0, %1
IntersectionPointOfAB=Punto di intersezione tra %0 e %1
IntersectionPointOfABNearC=Punto di intersezione tra %0 e %1, vicino al punto %2
IntersectionPointOfABWithInitialValueC=Punto di intersezione tra %0 e %1 con valore iniziale %2
@@ -329,12 +326,6 @@ PerspectiveName=Nome Raccolta
Picture=Immagine
PictureHeight=Altezza immagine
PictureWidth=Larghezza immagine
-PlaneA=piano %0
-PlaneContainingA=Piano contenente %0
-PlaneFromA=piano originato da %0
-PlaneThroughAB=Piano per %0, %1
-PlaneThroughABC=Piano per %0, %1, %2
-PlaneThroughAParallelToB=Piano per %0 parallelo a %1
Play=Esegui
PlayButton=Pulsante Esegui
Point=Punto
@@ -348,7 +339,7 @@ PointOnA=Punto su %0
PointOnAClosestToB=Punto su %0 più vicino a %1
PointOnPath=Su percorso
PointSize=Dimensione del punto
-Points=Punti
+Points=Vertici
PolarCoords=Coordinate polari
PolarLineOfARelativeToB=Polare di %0 rispetto a %1
PolyLine=Spezzata
diff --git a/geogebra/properties/plain_iw.properties b/geogebra/properties/plain_iw.properties
index 342257d..bcf14ae 100644
--- a/geogebra/properties/plain_iw.properties
+++ b/geogebra/properties/plain_iw.properties
@@ -1,5 +1,3 @@
-2x2Matrix=\u05de\u05d8\u05e8\u05d9\u05e6\u05d4 \u200f\u200e2x2\u200e\u200f
-3x3Matrix=\u05de\u05d8\u05e8\u05d9\u05e6\u05d4 \u200f\u200e3x3\u200e\u200f
ADecimalPlace=\u05de\u05e7\u05d5\u05dd \u05e2\u05e9\u05e8\u05d5\u05e0\u05d9 \u200f\u200e%0\u200e\u200f
ADecimalPlaces=\u200f\u200e%0\u200e\u200f \u05de\u05e7\u05d5\u05de\u05d5\u05ea \u05e2\u05e9\u05e8\u05d5\u05e0\u05d9\u05d9\u05dd
ADerivativeOfB=\u05e0\u05d2\u05d6\u05e8\u05ea \u200f\u200e%0\u200e\u200f \u05e9\u05dc \u200f\u200e%1\u200e\u200f
@@ -35,7 +33,8 @@ Algebra=\u05d0\u05dc\u05d2\u05d1\u05e8\u05d4
AlgebraWindow=\u05ea\u05e6\u05d5\u05d2\u05d4 \u05d0\u05dc\u05d2\u05d1\u05e8\u05d9\u05ea
AliesOnB=\u200f\u200e%0\u200e\u200f \u05e0\u05de\u05e6\u05d0\u05ea \u05e2\u05dc \u200f\u200e%1\u200e\u200f
AliesOnThePerimeterOfB=\u200f\u200e%0\u200e\u200f \u05e0\u05de\u05e6\u05d0\u05ea \u05e2\u05dc \u05d4\u05d4\u05d9\u05e7\u05e3 \u05e9\u05dc \u200f\u200e%1\u200e\u200f
-AllowStyleBar=\u05e1\u05e8\u05d2\u05dc \u05e1\u05d2\u05e0\u05d5\u05df \u05de\u05d0\u05d5\u05e4\u05e9\u05e8
+AllowOfflineUse=\u05d4\u05e8\u05e9\u05d4 \u05d4\u05e4\u05e2\u05dc\u05d4 \u05dc\u05d0 \u05de\u05e7\u05d5\u05d5\u05e0\u05ea
+AllowStyleBar=\u05d4\u05e6\u05d2 \u05e1\u05e8\u05d2\u05dc \u05e1\u05d2\u05e0\u05d5\u05df
Altitude=\u05d2\u05d5\u05d1\u05d4
Angle=\u05d6\u05d5\u05d5\u05d9\u05ea
AngleBetweenAB=\u05d6\u05d5\u05d5\u05d9\u05ea \u05d1\u05d9\u05df \u200f\u200e%0\u200e\u200f, \u200f\u200e%1\u200e\u200f
@@ -115,7 +114,6 @@ ConstructionProtocolHelp=<html><body style="direction: rtl;" align="right"><p><b
ConstructionProtocolNavigation=\u05e1\u05e8\u05d2\u05dc \u05e0\u05d9\u05d5\u05d5\u05d8 \u05dc\u05e6\u05e2\u05d3\u05d9 \u05d1\u05e0\u05d9\u05d4
Coordinates=\u05e7\u05d5\u05d0\u05d5\u05e8\u05d3\u05d9\u05e0\u05d8\u05d5\u05ea
CopyToClipboard=\u05d4\u05e2\u05ea\u05e7\u05d4 \u05dc\u05dc\u05d5\u05d7 \u05d2\u05d6\u05d9\u05e8\u05d9\u05dd
-CopyToLaTeX=\u05d4\u05e2\u05ea\u05e7 \u05dc-\u200fLaTeX\u200f
CornerPoint=\u05e4\u05d9\u05e0\u05d4
CreatedWith=\u05e0\u05d5\u05e6\u05e8 \u05d1\u05d0\u05de\u05e6\u05e2\u05d5\u05ea
CreatedWithGeoGebra=\u05e0\u05d5\u05e6\u05e8 \u05d1\u05d0\u05de\u05e6\u05e2\u05d5\u05ea GeoGebra\u200f
@@ -217,7 +215,6 @@ IgnoreDocumentLayout=\u05d4\u05ea\u05e2\u05dc\u05dd \u05de\u05de\u05ea\u05d5\u05
Image=\u05ea\u05de\u05d5\u05e0\u05d4
ImplicitPoly=\u05e2\u05e7\u05d5\u05de\u05ea \u05e4\u05d5\u05e0\u05e7\u05e6\u05d9\u05d4 \u05e1\u05ea\u05d5\u05de\u05d4
IncircleOfTriangleABC=\u05de\u05e2\u05d2\u05dc \u05d7\u05e1\u05d5\u05dd \u05d1\u05de\u05e9\u05d5\u05dc\u05e9 \u200f\u200e%0%1%2\u200e\u200f
-IncludeJARFiles=\u05db\u05dc\u05d5\u05dc \u05e7\u05d1\u05e6\u05d9 \u200f\u200e*.jar\u200e\u200f
Increasing=\u05e2\u05d5\u05dc\u05d4
IncreasingOnce=\u05e2\u05d5\u05dc\u05d4 (\u05e4\u05e2\u05dd \u05d0\u05d7\u05ea)
Inequality=\u05d0\u05d9-\u05e9\u05d5\u05d5\u05d9\u05d5\u05df
@@ -236,7 +233,7 @@ Interpolate=\u05e1\u05e8\u05d8\u05d8 \u05e2\u05dd \u05d0\u05d9\u05e0\u05d8\u05e8
IntersectingLines=\u05d9\u05e9\u05e8\u05d9\u05dd \u05e0\u05d7\u05ea\u05db\u05d9\u05dd
IntersectionCurveOfAB=\u05e2\u05e7\u05d5\u05de\u05ea \u05d7\u05d9\u05ea\u05d5\u05dc \u05e9\u05dc \u200f\u200e%0\u200e\u200f,\u200f\u200e%1\u200e\u200f
IntersectionLineOfAB=\u05d9\u05e9\u05e8 \u05d7\u05d9\u05ea\u05d5\u05da \u05e9\u05dc \u200f\u200e%0\u200e\u200f, \u200f\u200e%1\u200e\u200f
-IntersectionPathsOfAB=\u05de\u05e1\u05dc\u05d5\u05dc\u05d9 \u05d7\u05d9\u05ea\u05d5\u05dc \u05e9\u05dc \u200f\u200e%0\u200e\u200f, \u200f\u200e%1\u200e\u200f
+IntersectionOfAandB=\u05d7\u05d9\u05ea\u05d5\u05da \u05e9\u05dc \u200f\u200e%0\u200e\u200f \u05d5-\u200f\u200e%1\u200e\u200f
IntersectionPointOfAB=\u05e0\u05e7\u05d5\u05d3\u05ea \u05d7\u05d9\u05ea\u05d5\u05da \u05e9\u05dc \u200f\u200e%0\u200e\u200f, \u200f\u200e%1\u200e\u200f
IntersectionPointOfABNearC=\u05e0\u05e7\u05d5\u05d3\u05ea \u05d7\u05d9\u05ea\u05d5\u05da \u05e9\u05dc \u200f\u200e%0\u200e\u200f, \u200f\u200e%1\u200e\u200f \u05dc\u05d9\u05d3 \u05e0\u05e7\u05d5\u05d3\u05d4 \u200f\u200e%2\u200e\u200f
IntersectionPointOfABWithInitialValueC=\u05e0\u05e7\u05d5\u05d3\u05ea \u05d7\u05d9\u05ea\u05d5\u05da \u05e9\u05dc \u200f\u200e%0\u200e\u200f, \u200f\u200e%1\u200e\u200f \u05e2\u05dd \u05e2\u05e8\u05da \u05ea\u05d7\u05d9\u05dc\u05d9 \u200f\u200e%2\u200e\u200f
@@ -265,8 +262,8 @@ LinearInequality=\u05d0\u05d9-\u05e9\u05d5\u05d5\u05d9\u05d5\u05df \u05dc\u05d9\
Lines=\u05d9\u05e9\u05e8\u05d9\u05dd
LinkedObject=\u05e2\u05e6\u05dd \u05de\u05e7\u05d5\u05e9\u05e8
List=\u05e8\u05e9\u05d9\u05de\u05d4
-LocalizedDigits=\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05e1\u05e4\u05e8\u05d5\u05ea \u05de\u05de\u05d5\u05e7\u05de\u05d5\u05ea
-LocalizedLabels=\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05de\u05d5\u05ea \u05e0\u05e7\u05d5\u05d3\u05d5\u05ea \u05de\u05de\u05d5\u05e7\u05de\u05d9\u05dd
+LocalizedDigits=\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05e1\u05e4\u05e8\u05d5\u05ea \u05de\u05e7\u05d5\u05de\u05d9\u05d5\u05ea
+LocalizedLabels=\u05e9\u05de\u05d5\u05ea \u05e0\u05e7\u05d5\u05d3\u05d5\u05ea \u05de\u05e7\u05d5\u05de\u05d9\u05d9\u05dd
LockObject=\u05e0\u05e2\u05d9\u05dc\u05ea \u05e2\u05e6\u05dd
Locus=\u05de\u05e7\u05d5\u05dd \u05d2\u05d0\u05d5\u05de\u05d8\u05e8\u05d9
Medium=\u05d1\u05d9\u05e0\u05d5\u05e0\u05d9
@@ -325,12 +322,6 @@ PerspectiveName=\u05e9\u05dd \u05d4\u05ea\u05e6\u05d5\u05e8\u05d4
Picture=\u05ea\u05de\u05d5\u05e0\u05d4
PictureHeight=\u05d2\u05d5\u05d1\u05d4 \u05ea\u05de\u05d5\u05e0\u05d4
PictureWidth=\u05e8\u05d5\u05d7\u05d1 \u05ea\u05de\u05d5\u05e0\u05d4
-PlaneA=\u05de\u05d9\u05e9\u05d5\u05e8 \u200f\u200e%0\u200e\u200f
-PlaneContainingA=\u05de\u05d9\u05e9\u05d5\u05e8 \u05d4\u05de\u05db\u05d9\u05dc \u05d0\u05ea \u200f\u200e%0\u200e\u200f
-PlaneFromA=\u05de\u05d9\u05e9\u05d5\u05e8 \u05e9\u05e0\u05d5\u05e6\u05e8 \u05de-\u200f\u200e%0\u200e\u200f
-PlaneThroughAB=\u05de\u05d9\u05e9\u05d5\u05e8 \u05d3\u05e8\u05da \u200f\u200e%0\u200e\u200f, \u200f\u200e%1\u200e\u200f
-PlaneThroughABC=\u05de\u05d9\u05e9\u05d5\u05e8 \u05d3\u05e8\u05da \u200f\u200e%0\u200e\u200f,\u200f\u200e%1\u200e\u200f, \u200f\u200e%2\u200e\u200f
-PlaneThroughAParallelToB=\u05de\u05d9\u05e9\u05d5\u05e8 \u05d3\u05e8\u05da \u200f\u200e%0\u200e\u200f \u05de\u05e7\u05d1\u05d9\u05dc \u05dc-\u200f\u200e%1\u200e\u200f
Play=\u05d4\u05e6\u05d2\u05d4
PlayButton=\u05db\u05e4\u05ea\u05d5\u05e8 \u05d4\u05e6\u05d2\u05d4
Point=\u05e0\u05e7\u05d5\u05d3\u05d4
@@ -344,7 +335,7 @@ PointOnA=\u05e0\u05e7\u05d5\u05d3\u05d4 \u05e2\u05dc \u200f\u200e%0\u200e\u200f
PointOnAClosestToB=\u05d4\u05e0\u05e7\u05d5\u05d3\u05d4 \u05e2\u05dc \u200f\u200e%0\u200e\u200f \u05d4\u05e7\u05e8\u05d5\u05d1\u05d4 \u05d1\u05d9\u05d5\u05ea\u05e8 \u05dc-\u200f\u200e%1\u200e\u200f
PointOnPath=\u05e2\u05dc \u05de\u05e1\u05dc\u05d5\u05dc
PointSize=\u05d2\u05d5\u05d3\u05dc \u05e0\u05e7\u05d5\u05d3\u05d4
-Points=\u05e0\u05e7\u05d5\u05d3\u05d5\u05ea
+Points=\u05e7\u05d5\u05d3\u05e7\u05d5\u05d3\u05d9\u05dd
PolarCoords=\u05e7\u05d5\u05d0\u05d5\u05e8\u05d3\u05d9\u05e0\u05d8\u05d5\u05ea \u05e7\u05d5\u05d8\u05d1\u05d9\u05d5\u05ea
PolarLineOfARelativeToB=\u05d9\u05e9\u05e8 \u05e7\u05d5\u05d8\u05d1\u05d9 \u05e9\u05dc \u200f\u200e%0\u200e\u200f \u05d9\u05d7\u05e1\u05d9\u05ea \u05dc\u200f\u200e%1\u200e\u200f
PolyLine=\u05e7\u05d5 \u05e9\u05d1\u05d5\u05e8
diff --git a/geogebra/properties/plain_ja.properties b/geogebra/properties/plain_ja.properties
index 5728adc..a4f265d 100644
--- a/geogebra/properties/plain_ja.properties
+++ b/geogebra/properties/plain_ja.properties
@@ -1,5 +1,3 @@
-2x2Matrix=2x2\u884c\u5217
-3x3Matrix=3x3\u884c\u5217
ADecimalPlace=\u5c0f\u6570\u70b9\u4ee5\u4e0b%0\u6841
ADecimalPlaces=\u5c0f\u6570\u70b9\u4ee5\u4e0b%0\u6841
ADerivativeOfB=%1 \u306e %0 \u6b21\u5c0e\u95a2\u6570
@@ -35,6 +33,7 @@ Algebra=\u6570\u5f0f
AlgebraWindow=\u6570\u5f0f\u30d3\u30e5\u30fc
AliesOnB=%0 \u306f %1 \u4e0a\u306b\u3042\u308b
AliesOnThePerimeterOfB=%0 \u306f %1 \u306e\u5916\u5468\u4e0a\u306b\u3042\u308b
+AllowOfflineUse=jar\u30d5\u30a1\u30a4\u30eb\u3092\u542b\u3081\u308b
AllowStyleBar=\u30b9\u30bf\u30a4\u30eb\u30d0\u30fc\u3092\u8a31\u53ef
Angle=\u89d2\u5ea6
AngleBetweenAB=%0 \u3068 %1 \u306e\u9593\u306e\u89d2\u5ea6
@@ -110,7 +109,6 @@ ConstructionProtocolHelp=<html><body><p><b>\u4f5c\u56f3\u624b\u9806\u306e\u4f7f\
ConstructionProtocolNavigation=\u4f5c\u56f3\u30b9\u30c6\u30c3\u30d7\u30ca\u30d3\u30b2\u30fc\u30b7\u30e7\u30f3\u30d0\u30fc
Coordinates=\u5ea7\u6a19
CopyToClipboard=\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u306b\u30b3\u30d4\u30fc
-CopyToLaTeX=LaTeX\u306b\u30b3\u30d4\u30fc
CornerPoint=\u9685
CreatedWith=\u4f5c\u6210
Curve=\u66f2\u7dda
@@ -131,7 +129,7 @@ Definition=\u5b9a\u7fa9
Delete=\u524a\u9664
DeleteRowA=\u884c %0 \u3092\u6d88\u53bb
DeleteRowsAtoB=\u884c %0 \u304b\u3089 %1 \u3092\u6d88\u53bb
-DependentObjects=\u4ed6\u306e\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306b\u5f93\u5c5e\u3059\u308b\u30aa\u30d6\u30b8\u30a7\u30af\u30c8
+DependentObjects=\u5f93\u5c5e\u30aa\u30d6\u30b8\u30a7\u30af\u30c8
DerivativeOfA=%0 \u306e\u5fae\u5206
DiameterOfAConjugateToB=%1 \u306b\u5171\u5f79\u306a %0 \u306e\u76f4\u5f84
Dimensions=\u6b21\u5143
@@ -184,7 +182,7 @@ FixObject=\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u306e\u56fa\u5b9a
FocusOfA=%0 \u306e\u7126\u70b9
ForceGnuplotPgf=\u63cf\u753b\u95a2\u6570\u306bGnuplot\u3092\u4f7f\u7528
Format=\u30d5\u30a9\u30fc\u30de\u30c3\u30c8
-FreeObjects=\u81ea\u7531\u306a\u30aa\u30d6\u30b8\u30a7\u30af\u30c8
+FreeObjects=\u81ea\u7531\u30aa\u30d6\u30b8\u30a7\u30af\u30c8
Function=\u95a2\u6570
FunctionAonIntervalBC=\u533a\u9593 [%1, %2] \u4e0a\u306e\u95a2\u6570 %0
FunctionNVar=\u95a2\u6570
@@ -209,7 +207,6 @@ IgnoreDocumentLayout=\u6587\u66f8\u306e\u30ec\u30a4\u30a2\u30a6\u30c8\u3092\u712
Image=\u753b\u50cf
ImplicitPoly=\u9670\u95a2\u6570\u66f2\u7dda
IncircleOfTriangleABC=\u4e09\u89d2\u5f62 %0%1%2 \u306e\u5185\u63a5\u5186
-IncludeJARFiles=jar\u30d5\u30a1\u30a4\u30eb\u3092\u542b\u3081\u308b
Increasing=\u5897\u52a0
Inequality=\u4e0d\u7b49\u5f0f
InflectionPointofA=%0 \u306e\u5909\u66f2\u70b9
@@ -226,7 +223,7 @@ Interpolate=\u88dc\u5b8c\u3057\u3066\u63cf\u753b
IntersectingLines=\u4ea4\u53c9\u3059\u308b\u76f4\u7dda
IntersectionCurveOfAB=%0 \u3068 %1 \u306e\u4ea4\u66f2\u7dda
IntersectionLineOfAB=%0 \u3068 %1 \u306e\u4ea4\u76f4\u7dda
-IntersectionPathsOfAB=%0 \u3068 %1 \u306e\u5171\u901a\u30d1\u30b9
+IntersectionOfAandB=%0 \u3068 %1 \u306e\u5171\u901a\u30d1\u30b9
IntersectionPointOfAB=%0 \u3068 %1 \u306e\u4ea4\u70b9
IntersectionPointOfABNearC=%2 \u306b\u8fd1\u3044\u3001%0 \u3068 %1 \u306e\u4ea4\u70b9
IntersectionPointOfABWithInitialValueC=\u521d\u671f\u5024 %2 \u3067\u6c42\u3081\u305f, %0 \u3068 %1 \u306e\u4ea4\u70b9
@@ -312,11 +309,6 @@ PerspectiveName=\u30d1\u30fc\u30b9\u30da\u30af\u30c6\u30a3\u30d6\u306e\u540d\u52
Picture=\u56f3
PictureHeight=\u56f3\u306e\u9ad8\u3055
PictureWidth=\u56f3\u306e\u5e45
-PlaneA=\u5e73\u9762 %0
-PlaneContainingA=%0 \u3092\u542b\u3080\u5e73\u9762
-PlaneThroughAB=%0 \u3068 %1 \u3092\u901a\u308b\u5e73\u9762
-PlaneThroughABC=%0, %1, %2 \u3092\u901a\u308b\u5e73\u9762
-PlaneThroughAParallelToB=%0 \u3092\u901a\u308a\u3001%1 \u306b\u5e73\u884c\u306a\u5e73\u9762
Play=\u518d\u751f
PlayButton=\u518d\u751f\u30dc\u30bf\u30f3
Point=\u70b9
diff --git a/geogebra/properties/plain_ji.properties b/geogebra/properties/plain_ji.properties
index 887da72..bb8e140 100644
--- a/geogebra/properties/plain_ji.properties
+++ b/geogebra/properties/plain_ji.properties
@@ -1,9 +1,364 @@
+ADecimalPlace=%0 \u05d3\u05e2\u05e6\u05d9\u05de\u05d0\u05b7\u05dc
+ADecimalPlaces=%0 \u05d3\u05e2\u05e6\u05d9\u05de\u05d0\u05b7\u05dc\u05df
+ADerivativeOfB=%0 \u05d3\u05e2\u05e8\u05d9\u05d5\u05d5\u05d0\u05b7\u05d8\u05d9\u05d5\u05d5 \u05e4\u05bf\u05d5\u05df%1
+ADilatedByFactorBfromC=\u05d0\u05b8\u05e4\u05bc\u05d1\u05d9\u05dc\u05d3 \u05e4\u05bf\u05d5\u05df %0 \u05d3\u05d5\u05e8\u05da \u05d3\u05e2\u05e8 \u05d4\u05d0\u05b8\u05de\u05d0\u05b8\u05d8\u05e2\u05d8\u05d9\u05e9\u05e2\u05e8 \u05d0\u05d5\u05d9\u05e1\u05e6\u05d9\u05b4\u05d5\u05e0\u05d2 \u05de\u05d9\u05d8 \u05d5\u05d5\u05d9\u05e4\u05bf\u05dc\u05e2\u05e8 %1 \u05d0\u05d5\u05df \u05e6\u05e2\u05e0\u05d8\u05e2\u05e8 %2
+ADoesNotIntersectWithB=%0 \u05d0\u05d5\u05df %1 \u05e9\u05e0\u05f2\u05b7\u05d3\u05df \u05d6\u05d9\u05da \u05e0\u05d9\u05e9\u05d8 \u05d0\u05d9\u05d1\u05e2\u05e8
+AGray=%0 \u05d2\u05e8\u05d5\u05d9
+AIntersectsWithB=%0 \u05d0\u05d5\u05df %1 \u05e9\u05e0\u05f2\u05b7\u05d3\u05df \u05d6\u05d9\u05da \u05d0\u05d9\u05d1\u05e2\u05e8
+AMirroredAtB=\u05e1\u05d9\u05de\u05e2\u05d8\u05e8\u05d9\u05e9 \u05d0\u05b8\u05e4\u05bc\u05d1\u05d9\u05dc\u05d3 \u05e4\u05bf\u05d5\u05df %0 \u05dc\u05d2\u05d1\u05d9 %1
+ARotatedByAngleB=\u05d0\u05b8\u05e4\u05bc\u05d1\u05d9\u05dc\u05d3 \u05e4\u05bf\u05d5\u05df %0 \u05d3\u05d5\u05e8\u05da \u05d3\u05e2\u05e8 \u05e8\u05d0\u05b8\u05d8\u05d0\u05b7\u05e6\u05d9\u05e2 \u05de\u05d9\u05d8 \u05d5\u05d5\u05d9\u05e0\u05e7\u05dc %1
+ASignificantFigure=%0 \u05d1\u05d0\u05b7\u05d8\u05f2\u05b7\u05d8\u05d9\u05e7\u05e2\u05e8 \u05e6\u05d9\u05e4\u05bf\u05e2\u05e8
+ASignificantFigures=%0 \u05d1\u05d0\u05b7\u05d8\u05f2\u05b7\u05d8\u05d9\u05e7\u05e2 \u05e6\u05d9\u05e4\u05bf\u05e2\u05e8\u05df
+AandBareEqual=%0 \u05d0\u05d5\u05df %1 \u05d6\u05e2\u05e0\u05e2\u05df \u05d2\u05dc\u05f2\u05b7\u05da
+AandBareLinearlyDependent=%0 \u05d0\u05d5\u05df %1 \u05d6\u05e2\u05e0\u05e2\u05df \u05dc\u05d9\u05e0\u05e2\u05d0\u05b7\u05e8 \u05e4\u05bf\u05d0\u05b7\u05e8\u05d1\u05d5\u05e0\u05d3\u05df
+AandBareLinearlyIndependent=%0 \u05d0\u05d5\u05df %1 \u05d6\u05e2\u05e0\u05e2\u05df \u05e0\u05d9\u05e9\u05d8 \u05dc\u05d9\u05e0\u05e2\u05d0\u05b7\u05e8 \u05e4\u05bf\u05d0\u05b7\u05e8\u05d1\u05d5\u05e0\u05d3\u05df
+AandBareNotEqual=%0 \u05d0\u05d5\u05df %1 \u05d6\u05e2\u05e0\u05e2\u05df \u05e0\u05d9\u05e9\u05d8 \u05d2\u05dc\u05f2\u05b7\u05da
+AandBareParallel=%0 \u05d0\u05d5\u05df %1 \u05d6\u05e2\u05e0\u05e2\u05df \u05e4\u05bc\u05d0\u05b7\u05e8\u05d0\u05b7\u05dc\u05e2\u05dc
+AandBarePerpendicular=%0 \u05d0\u05d5\u05df %1 \u05d6\u05e2\u05e0\u05e2\u05df \u05e4\u05bc\u05e2\u05e8\u05e4\u05bc\u05e2\u05e0\u05d3\u05d9\u05e7\u05d5\u05dc\u05d0\u05b7\u05e8
+AandBcannotBeCompared=%0 \u05d0\u05d5\u05df %1 \u05dc\u05d0\u05b8\u05d6\u05df \u05d6\u05d9\u05da \u05e0\u05d9\u05e9\u05d8 \u05e4\u05bf\u05d0\u05b7\u05e8\u05d2\u05dc\u05f2\u05b7\u05db\u05df
+AbsoluteScreenLocation=\u05d0\u05b7\u05d1\u05e1\u05d0\u05b8\u05dc\u05d5\u05d8\u05e2 \u05e4\u05bc\u05d0\u05b8\u05d6\u05d9\u05e6\u05d9\u05e2 \u05d0\u05d5\u05d9\u05e4\u05bf\u05df \u05e2\u05e7\u05e8\u05d0\u05b7\u05df
+AdoesNotLieOnB=%0 \u05d2\u05e2\u05e4\u05bf\u05d9\u05e0\u05d8 \u05d6\u05d9\u05da \u05e0\u05d9\u05e9\u05d8 \u05d0\u05d5\u05d9\u05e3 %1
+AdoesNotLieOnThePerimeterOfB=%0 \u05d2\u05e2\u05e4\u05bf\u05d9\u05e0\u05d8 \u05d6\u05d9\u05da \u05e0\u05d9\u05e9\u05d8 \u05d0\u05d5\u05d9\u05e3 \u05d3\u05e2\u05e8 \u05d0\u05b7\u05e8\u05d5\u05de\u05dc\u05d9\u05e0\u05d9\u05e2 \u05e4\u05bf\u05d5\u05df %1
+AdoesNothaveTheSameAreaAsB=%0 \u05d0\u05d5\u05df %1 \u05d4\u05d0\u05b8\u05d1\u05df \u05e0\u05d9\u05e9\u05d8 \u05d3\u05e2\u05dd \u05d6\u05e2\u05dc\u05d1\u05df \u05e9\u05d8\u05d7
+AdoesNothaveTheSameLengthAsB=%0 \u05d0\u05d5\u05df %1 \u05d4\u05d0\u05b8\u05d1\u05df \u05e0\u05d9\u05e9\u05d8 \u05d3\u05d9 \u05d6\u05e2\u05dc\u05d1\u05e2 \u05dc\u05e2\u05e0\u05d2
+AhasTheSameAreaAsB=%0 \u05d0\u05d5\u05df %1 \u05d4\u05d0\u05b8\u05d1\u05df \u05d3\u05e2\u05dd \u05d6\u05e2\u05dc\u05d1\u05df \u05e9\u05d8\u05d7
+AhasTheSameLengthAsB=%0 \u05d0\u05d5\u05df %1 \u05d4\u05d0\u05b8\u05d1\u05df \u05d3\u05d9 \u05d6\u05e2\u05dc\u05d1\u05e2 \u05dc\u05e2\u05e0\u05d2
+AintersectsWithBOnce=%0 \u05d0\u05d5\u05df %1 \u05e9\u05e0\u05f2\u05b7\u05d3\u05df \u05d6\u05d9\u05da \u05d0\u05d9\u05d1\u05e2\u05e8 \u05d0\u05d9\u05d9\u05df \u05de\u05d0\u05b8\u05dc
+AintersectsWithBTwice=%0 \u05d0\u05d5\u05df %1 \u05e9\u05e0\u05f2\u05b7\u05d3\u05df \u05d6\u05d9\u05da \u05d0\u05d9\u05d1\u05e2\u05e8 \u05e6\u05d5\u05d5\u05d9\u05d9 \u05de\u05d0\u05b8\u05dc
+AisAnAsymptoteToB=%0 \u05d0\u05d9\u05d6 \u05d0\u05b7\u05e1\u05d9\u05de\u05e4\u05bc\u05d8\u05d0\u05b8\u05d8\u05d9\u05e9 \u05e6\u05d5 %1
+AisNotDefined=%0 \u05d0\u05d9\u05d6 \u05e0\u05d9\u05e9\u05d8 \u05d3\u05e2\u05e4\u05bf\u05d9\u05e0\u05d9\u05e8\u05d8
+AisaDegenerateBranchOfB=%0 \u05d0\u05d9\u05d6 \u05d0\u05b7 \u05d3\u05e2\u05d2\u05e2\u05e0\u05e2\u05e8\u05d9\u05e8\u05d8\u05e2\u05e8 \u05d0\u05b8\u05e4\u05bc\u05e6\u05d5\u05d5\u05f2\u05b7\u05d2 \u05e4\u05bf\u05d5\u05df %1
+AisaTangentToB=%0 \u05d0\u05d9\u05d6 \u05d8\u05d0\u05b7\u05e0\u05d2\u05e2\u05e0\u05d8 \u05e6\u05d5 %1
Algebra=\u05d0\u05b7\u05dc\u05d2\u05e2\u05d1\u05e8\u05e2
AlgebraWindow=\u05d0\u05b7\u05dc\u05d2\u05e2\u05d1\u05e8\u05e2
+AliesOnB=%0 \u05d2\u05e2\u05e4\u05bf\u05d9\u05e0\u05d8 \u05d6\u05d9\u05da \u05d0\u05d5\u05d9\u05e3 %1
+AliesOnThePerimeterOfB=%0 \u05d2\u05e2\u05e4\u05bf\u05d9\u05e0\u05d8 \u05d6\u05d9\u05da \u05d0\u05d5\u05d9\u05e3 \u05d3\u05e2\u05e8 \u05d0\u05b7\u05e8\u05d5\u05de\u05dc\u05d9\u05e0\u05d9\u05e2 \u05e4\u05bf\u05d5\u05df %1
+AllowStyleBar=\u05e1\u05d8\u05d9\u05dc\u05df\u05be\u05e9\u05d5\u05e8\u05d4 \u05d3\u05e2\u05e8\u05dc\u05d5\u05d9\u05d1\u05d8
+Altitude=\u05d4\u05d9\u05d9\u05da
+Angle=\u05d5\u05d5\u05d9\u05e0\u05e7\u05dc
+AngleBetweenAB=\u05d5\u05d5\u05d9\u05e0\u05e7\u05dc \u05e6\u05d5\u05d5\u05d9\u05e9\u05df %0 \u05d0\u05d5\u05df %1
+AngleBetweenABC=\u05d5\u05d5\u05d9\u05e0\u05e7\u05dc \u05e6\u05d5\u05d5\u05d9\u05e9\u05df %0, %1, %2
+AngleBetweenABCofD=\u05d5\u05d5\u05d9\u05e0\u05e7\u05dc \u05e6\u05d5\u05d5\u05d9\u05e9\u05df %0, %1, %2 \u05e4\u05bf\u05d5\u05df %3
+AngleBisectorOfAB=\u05d1\u05d9\u05e1\u05e2\u05e7\u05d8\u05e8\u05d9\u05e1\u05e2 \u05e4\u05bf\u05d5\u05df %0, %1
+AngleBisectorOfABC=\u05d1\u05d9\u05e1\u05e2\u05e7\u05d8\u05e8\u05d9\u05e1\u05e2 \u05e4\u05bf\u05d5\u05df %0, %1, %2
+AngleOfA=\u05d5\u05d5\u05d9\u05e0\u05e7\u05dc \u05e4\u05bf\u05d5\u05df %0
+Angles=\u05d5\u05d5\u05d9\u05e0\u05e7\u05dc\u05e2\u05df
+AnimatedGIFExport=\u05e2\u05e7\u05e1\u05e4\u05bc\u05d0\u05b8\u05e8\u05d8\u05d9\u05e8\u05df \u05d5\u05d5\u05d9 \u05d0\u05b7\u05df \u05d0\u05b7\u05e0\u05d9\u05de\u05d9\u05e8\u05d8\u05e2\u05e8 GIF
+Animating=\u05d0\u05b7\u05e0\u05d9\u05de\u05d9\u05e8\u05df
+Animation=\u05d0\u05b7\u05e0\u05d9\u05de\u05d0\u05b7\u05e6\u05d9\u05e2
+AnimationLoop=\u05d0\u05d9\u05df \u05d0\u05b7 \u05e7\u05e8\u05f2\u05b7\u05d6 ?
+AnimationSpeed=\u05d2\u05d9\u05db\u05e7\u05d9\u05d9\u05d8
+AnimationStep=\u05d0\u05d9\u05e0\u05e7\u05e8\u05e2\u05de\u05e2\u05e0\u05d8
+Apply=\u05d0\u05b8\u05e0\u05d5\u05d5\u05e2\u05e0\u05d3\u05df
+Apt=%0 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8
+Arc=\u05d1\u05d5\u05d9\u05d2\u05df
+AsymptoteToA=\u05d0\u05b7\u05e1\u05d9\u05de\u05e4\u05bc\u05d8\u05d0\u05b8\u05d8 \u05e6\u05d5 %0
+Ath=%0\u05d8\u05e2\u05e8
+Author=\u05d0\u05d5\u05d9\u05d8\u05d0\u05b8\u05e8
+Automatic=\u05d0\u05d5\u05d9\u05d8\u05d0\u05b8\u05de\u05d0\u05b7\u05d8\u05d9\u05e9
+AuxiliaryObject=\u05d0\u05d5\u05d9\u05e1\u05d4\u05e2\u05dc\u05e3\u05be\u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8
+AuxiliaryObjects=\u05d0\u05d5\u05d9\u05e1\u05d4\u05e2\u05dc\u05e3\u05be\u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df
+AxisLabel=\u05e6\u05e2\u05d8\u05dc
+AxisOfA=\u05d0\u05b7\u05e7\u05e1 \u05e4\u05bf\u05d5\u05df %0
+AxisTicks=\u05d2\u05e8\u05d0\u05b7\u05d3\u05d9\u05e8\u05d5\u05e0\u05d2
+AxisUnitLabel=\u05d0\u05d9\u05d9\u05e0\u05e1
+Back=\u05e6\u05d5\u05e8\u05d9\u05e7
+BackgroundColor=\u05d4\u05d9\u05e0\u05d8\u05e2\u05e8\u05d2\u05e8\u05d5\u05e0\u05d8\u05be\u05e7\u05d0\u05b8\u05dc\u05d9\u05e8
+BackgroundImage=\u05d4\u05d9\u05e0\u05d8\u05e2\u05e8\u05d2\u05e8\u05d5\u05e0\u05d8\u05be\u05d1\u05d9\u05dc\u05d3
+Bold=\u05e4\u05bf\u05e2\u05d8
+Boolean=\u05d1\u05d5\u05dc\u05e2\u05d0\u05b7\u05e0\u05d9\u05e9\u05e2 \u05d5\u05d5\u05e2\u05e8\u05d8
+Breakpoint=\u05d0\u05b8\u05e4\u05bc\u05e9\u05d8\u05e2\u05dc\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8
+Button=\u05e7\u05e0\u05e2\u05e4\u05bc\u05dc
+CAS=\u05e4\u05bf\u05d0\u05b8\u05e8\u05de\u05e2\u05dc\u05e2\u05e8 \u05d7\u05e9\u05d1\u05d5\u05df
+CASInitializing=\u05d3\u05d9 \u05e7\u05d0\u05b8\u05de\u05e4\u05bc\u05d9\u05d5\u05d8\u05e2\u05e8\u05d9\u05d6\u05d9\u05e8\u05d8\u05e2 \u05d0\u05b7\u05dc\u05d2\u05e2\u05d1\u05e8\u05e2\u05be\u05e1\u05d9\u05e1\u05d8\u05e2\u05dd (\u05e7\u05d0\u05b7"\u05e1) \u05dc\u05d0\u05b8\u05d6\u05d8 \u05d6\u05d9\u05da \u05d0\u05d9\u05df \u05d2\u05d0\u05b7\u05e0\u05d2
+CASTimedOut=\u05d3\u05d9 \u05e6\u05f2\u05b7\u05d8 \u05e4\u05bf\u05d0\u05b7\u05e8\u05df \u05e4\u05bf\u05d0\u05b8\u05e8\u05de\u05e2\u05dc\u05df \u05d7\u05e9\u05d1\u05d5\u05df \u05d0\u05d9\u05d6 \u05d0\u05b7\u05e8\u05d9\u05d1\u05e2\u05e8
+Cancel=\u05d0\u05b8\u05e4\u05bc\u05e8\u05d5\u05e4\u05bf\u05df
+Caption=\u05e6\u05d5\u05e9\u05e8\u05d9\u05e4\u05bf\u05d8
+CartesianCoords=\u05e7\u05d0\u05b7\u05e8\u05d8\u05e2\u05d6\u05d9\u05d0\u05b7\u05e0\u05d9\u05e9\u05e2 \u05e7\u05d0\u05b8\u05d0\u05b8\u05e8\u05d3\u05d9\u05e0\u05d0\u05b7\u05d8\u05df
+CasTimeout=\u05e6\u05d5\u05d2\u05e2\u05d8\u05d9\u05d9\u05dc\u05d8\u05e2 \u05e6\u05f2\u05b7\u05d8 \u05e4\u05bf\u05d0\u05b7\u05e8 \u05d3\u05e2\u05e8 \u05e7\u05d0\u05b7"\u05e1 (\u05e1\u05e2\u05e7\u05d5\u05e0\u05d3\u05e2\u05e1)
+CellAisNotDefined=\u05d3\u05d0\u05b8\u05e1 \u05e7\u05e2\u05de\u05e2\u05e8\u05dc %0 \u05d0\u05d9\u05d6 \u05e0\u05d9\u05e9\u05d8 \u05d3\u05e2\u05e4\u05bf\u05d9\u05e0\u05d9\u05e8\u05d8
+CenterOfA=\u05e6\u05e2\u05e0\u05d8\u05e2\u05e8 \u05e4\u05bf\u05d5\u05df %0
+CentroidOfA=\u05e9\u05d5\u05d5\u05e2\u05e8\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05e4\u05bf\u05d5\u05df %0
+CheckedNumerically=(\u05e0\u05d5\u05de\u05e2\u05e8\u05d9\u05e9\u05e2 \u05d5\u05d5\u05e2\u05e8\u05d8)
+ChooseColor=\u05d0\u05d5\u05d9\u05e1\u05e7\u05dc\u05f2\u05b7\u05d1\u05df \u05d0\u05b7 \u05e7\u05d0\u05b8\u05dc\u05d9\u05e8
+ChooseObject=\u05d0\u05d5\u05d9\u05e1\u05e7\u05dc\u05f2\u05b7\u05d1\u05df \u05d0\u05b7\u05df \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8
+Circle=\u05e7\u05e8\u05f2\u05b7\u05d6
+CircleOfAxisAThroughB=\u05e7\u05e8\u05f2\u05b7\u05d6 \u05d3\u05d5\u05e8\u05da %1 \u05de\u05d9\u05d8 %0 \u05e4\u05bf\u05d0\u05b7\u05e8 \u05d0\u05b7\u05df \u05d0\u05b7\u05e7\u05e1
+CircleThroughABC=\u05e7\u05e8\u05f2\u05b7\u05d6 \u05d3\u05d5\u05e8\u05da %0, %1, %2
+CircleThroughAwithCenterB=\u05e7\u05e8\u05f2\u05b7\u05d6 \u05de\u05d9\u05d8\u05df \u05e6\u05e2\u05e0\u05d8\u05e2\u05e8 %1 \u05d3\u05d5\u05e8\u05da %0
+CircleWithCenterARadiusBParallelToC=\u05e7\u05e8\u05f2\u05b7\u05d6 \u05de\u05d9\u05d8\u05df \u05e6\u05e2\u05e0\u05d8\u05e2\u05e8 %0 \u05d0\u05d5\u05df \u05e8\u05d0\u05b7\u05d3\u05d9\u05d5\u05e1 %1, \u05e4\u05bc\u05d0\u05b7\u05e8\u05d0\u05b7\u05dc\u05e2\u05dc \u05e6\u05d5 %2
+CircleWithCenterAThroughBAxisParallelToC=\u05e7\u05e8\u05f2\u05b7\u05d6 \u05d3\u05d5\u05e8\u05da %1 \u05de\u05d9\u05d8 %0 \u05e4\u05bf\u05d0\u05b7\u05e8 \u05d0\u05b7 \u05e6\u05e2\u05e0\u05d8\u05e2\u05e8, \u05de\u05d9\u05d8 \u05d0\u05b7\u05df \u05d0\u05b7\u05e7\u05e1 \u05e4\u05bc\u05d0\u05b7\u05e8\u05d0\u05b7\u05dc\u05e2\u05dc \u05e6\u05d5 %2
+CircleWithCenterAThroughBParallelToC=\u05e7\u05e8\u05f2\u05b7\u05d6 \u05d3\u05d5\u05e8\u05da %1 \u05de\u05d9\u05d8 %0 \u05e4\u05bf\u05d0\u05b7\u05e8 \u05d0\u05b7 \u05e6\u05e2\u05e0\u05d8\u05e2\u05e8, \u05e4\u05bc\u05d0\u05b7\u05e8\u05d0\u05b7\u05dc\u05e2\u05dc \u05e6\u05d5 %2
+CircleWithCenterAandRadiusB=\u05e7\u05e8\u05f2\u05b7\u05d6 \u05de\u05d9\u05d8 %0 \u05e4\u05bf\u05d0\u05b7\u05e8 \u05d0\u05b7 \u05e6\u05e2\u05e0\u05d8\u05e2\u05e8 \u05d0\u05d5\u05df %1 \u05e4\u05bf\u05d0\u05b7\u05e8 \u05d0\u05b7 \u05e8\u05d0\u05b7\u05d3\u05d9\u05d5\u05e1
+CircleWithCenterAandRadiusBAxisParallelToC=\u05e7\u05e8\u05f2\u05b7\u05d6 \u05de\u05d9\u05d8 %0 \u05e4\u05bf\u05d0\u05b7\u05e8 \u05d0\u05b7 \u05e6\u05e2\u05e0\u05d8\u05e2\u05e8 \u05d0\u05d5\u05df %1 \u05e4\u05bf\u05d0\u05b7\u05e8 \u05d0\u05b7 \u05e8\u05d0\u05b7\u05d3\u05d9\u05d5\u05e1, \u05de\u05d9\u05d8 \u05d0\u05b7\u05df \u05d0\u05b7\u05e7\u05e1 \u05e4\u05bc\u05d0\u05b7\u05e8\u05d0\u05b7\u05dc\u05e2\u05dc \u05e6\u05d5 %2
+Clipboard.Blackboard=\u05e7\u05dc\u05e2\u05e4\u05bc\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc: \u05e9\u05d5\u05d5\u05d0\u05b7\u05e8\u05e5
+Clipboard.Google=\u05e7\u05dc\u05e2\u05e4\u05bc\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc: \u05d2\u05d5\u05d2\u05dc\u05be\u05d2\u05d0\u05b7\u05d3\u05d6\u05e9\u05e2\u05d8
+Clipboard.HTML=\u05e7\u05dc\u05e2\u05e4\u05bc\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc: html
+Clipboard.MediaWiki=\u05e7\u05dc\u05e2\u05e4\u05bc\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc: MediaWiki
+Clipboard.Moodle=\u05e7\u05dc\u05e2\u05e4\u05bc\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc: Moodle
+Clipboard.iframe=\u05e7\u05dc\u05e2\u05e4\u05bc\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc: <iframe>
+Color=\u05e7\u05d0\u05b8\u05dc\u05d9\u05e8
+ColorfulConstructionProtocol=\u05e7\u05d0\u05b8\u05dc\u05d9\u05e8\u05d8\u05e2\u05e8\u05d8 \u05e7\u05d0\u05b8\u05e0\u05e1\u05d8\u05e8\u05d5\u05e7\u05e6\u05d9\u05e2\u05be\u05e4\u05bc\u05e8\u05d0\u05b8\u05d8\u05d0\u05b8\u05e7\u05d0\u05b8\u05dc
+Command=\u05d1\u05d0\u05b7\u05e4\u05bf\u05e2\u05dc
+CommonTangentOfCirclesAandB=\u05e9\u05d5\u05ea\u05bc\u05e4\u05bf\u05d9\u05e9\u05e2\u05e8 \u05d8\u05d0\u05b7\u05e0\u05d2\u05e2\u05e0\u05d8 \u05e6\u05d5 \u05d3\u05d9 \u05e7\u05e8\u05f2\u05b7\u05d6\u05df %0 \u05d0\u05d5\u05df %1
+ComplexNumber=\u05e7\u05d0\u05b8\u05de\u05e4\u05bc\u05dc\u05e2\u05e7\u05e1\u05e6\u05d0\u05b8\u05dc
+Conic=\u05e7\u05d0\u05b8\u05e0\u05d9\u05e9\u05e2 \u05e1\u05e2\u05e7\u05e6\u05d9\u05e2
+ConicThroughABCDE=\u05e7\u05d0\u05b8\u05e0\u05d9\u05e9\u05e2 \u05e1\u05e2\u05e7\u05e6\u05d9\u05e2 \u05d3\u05d5\u05e8\u05da %0, %1, %2, %3, %4
+Conics=\u05e7\u05d0\u05b8\u05e0\u05d9\u05e9\u05e2 \u05e1\u05e2\u05e7\u05e6\u05d9\u05e2\u05e1
+ConstructionProtocol=\u05e7\u05d0\u05b8\u05e0\u05e1\u05d8\u05e8\u05d5\u05e7\u05e6\u05d9\u05e2\u05be\u05e4\u05bc\u05e8\u05d0\u05b8\u05d8\u05d0\u05b8\u05e7\u05d0\u05b8\u05dc
+ConstructionProtocolButton=\u05e7\u05e0\u05e2\u05e4\u05bc\u05dc \u05e6\u05d5 \u05e2\u05e4\u05bf\u05e2\u05e0\u05e2\u05df \u05d3\u05e2\u05dd \u05e7\u05d0\u05b8\u05e0\u05e1\u05d8\u05e8\u05d5\u05e7\u05e6\u05d9\u05e2\u05be\u05e4\u05bc\u05e8\u05d0\u05b8\u05d8\u05d0\u05b8\u05e7\u05d0\u05b8\u05dc
+ConstructionProtocolHelp=<html><body style="direction: rtl;" align="right"><p><b>\u05e0\u05d9\u05e6\u05df \u05d3\u05e2\u05dd \u05e7\u05d0\u05b8\u05e0\u05e1\u05d8\u05e8\u05d5\u05e7\u05e6\u05d9\u05e2\u05be\u05e4\u05bc\u05e8\u05d0\u05b8\u05d8\u05d0\u05b8\u05e7\u05d0\u05b8\u05dc</b></p><p><br><b>\u05e7\u05dc\u05d0\u05b7\u05d5\u05d5\u05d9\u05d0\u05b7\u05d8\u05d5\u05e8</b></p><table border="1"><tr><td>↑</td><td>\u05e4\u05bf\u05e8\u05d9\u05b4\u05e2\u05e8\u05d3\u05d9\u05e7\u05e2\u05e8 \u05e9\u05d8\u05d0\u05b7\u05e4\u05bc\u05dc \u05d0\u05d9\u05df \u05d3\u05e2\u05e8 \u05e7\u05d0\u05b8\u05e0\u05e1\u05d8\u05e8\u05d5\u05e7\u05e6\u05d9\u05e2</td></tr><tr><td>↓</td><td>\u05d5\u05d5\u05f2\u05b7\u05d8\u05e2\u05e8\u05d3\u05d9\u05e7\u05e2\u05e8 \u05e9\u05d8\u05d0\u05b7\u05e4\u05bc\u05dc \u05d0\u05d9\u05df \u05d3\u05e2\u05e8 \u05e7\u05d0\u05b8\u05e0\u05e1\u05d8\u05e8\u05d5\u05e7\u05e6\u05d9\u05e2</td></tr><tr><td>Home</td><td>\u05d0\u05b8\u05e0\u05d4\u05d9\u05d9\u05d1 \u05e4\u05bf\u05d5\u05df \u05d3\u05e2\u05e8 \u05e7\u05d0\u05b8\u05e0\u05e1\u05d8\u05e8\u05d5\u05e7\u05e6\u05d9\u05e2</td></tr><tr><td>End</td><td>\u05e1\u05d5\u05e3 \u05e4\u05bf\u05d5\u05df \u05d3\u05e2\u05e8 \u05e7\u05d0\u05b8\u05e0\u05e1\u05d8\u05e8\u05d5\u05e7\u05e6\u05d9\u05e2</td></tr><tr><td>Del</td><td>\u05d0\u05b8\u05e4\u05bc\u05de\u05e2\u05e7\u05df \u05d3\u05e2\u05dd \u05e9\u05d8\u05d0\u05b7\u05e4\u05bc\u05dc \u05e4\u05bf\u05d5\u05df \u05d3\u05e2\u05e8 \u05e7\u05d0\u05b8\u05e0\u05e1\u05d8\u05e8\u05d5\u05e7\u05e6\u05d9\u05e2</td></tr></table><p><b><br>\u05de\u05f2\u05b7\u05d6\u05dc</b></p><table border="1"><tr><td>\u05d8\u05d0\u05b8\u05e4\u05bc\u05dc\u05be\u05e7\u05dc\u05d9\u05e7 \u05d0\u05d5\u05d9\u05e3 \u05d0\u05b7 \u05e9\u05d5\u05e8\u05d4</td><td>\u05d0\u05d5\u05d9\u05e1\u05e7\u05dc\u05f2\u05b7\u05d1\u05df \u05d0\u05b7 \u05e9\u05d8\u05d0\u05b7\u05e4\u05bc\u05dc \u05d0\u05d9\u05df \u05d3\u05e2\u05e8 \u05e7\u05d0\u05b8\u05e0\u05e1\u05d8\u05e8\u05d5\u05e7\u05e6\u05d9\u05e2</td></tr><tr><td>\u05d8\u05d0\u05b8\u05e4\u05bc\u05dc\u05be\u05e7\u05dc\u05d9\u05e7 \u05d0\u05d5\u05d9\u05e3 \u05d3\u05e2\u05e8 \u05e7\u05e2\u05e4\u05bc\u05dc\u05e2\u05da\u05be\u05e9\u05d5\u05e8\u05d4</td><td>\u05d0\u05b8\u05e0\u05d4\u05d9\u05d9\u05d1 \u05e4\u05bf\u05d5\u05df \u05d3\u05e2\u05e8 \u05e7\u05d0\u05b8\u05e0\u05e1\u05d8\u05e8\u05d5\u05e7\u05e6\u05d9\u05e2</td></tr><tr><td>\u05d0\u05b8\u05e0\u05db\u05d0\u05b7\u05e4\u05bc\u05df \u05d0\u05d5\u05df \u05d0\u05d9\u05d1\u05e2\u05e8\u05d8\u05e8\u05d0\u05b8\u05d2\u05df \u05d0\u05b7 \u05e9\u05d5\u05e8\u05d4</td><td>\u05d0\u05d9\u05d1\u05e2\u05e8\u05e9\u05d8\u05e2\u05dc\u05d5\u05e0\u05d2 \u05e4\u05bf\u05d5\u05df \u05d3\u05e2\u05dd \u05e7\u05d0\u05b8\u05e0\u05e1\u05d8\u05e8\u05d5\u05e7\u05e6\u05d9\u05e2\u05be\u05e9\u05d8\u05d0\u05b7\u05e4\u05bc\u05dc</td></tr><tr><td>\u05e8\u05e2\u05db\u05d8\u05e2\u05e8 \u05e7\u05dc\u05d9\u05e7 \u05d0\u05d5\u05d9\u05e3 \u05d0\u05b7 \u05e9\u05d5\u05e8\u05d4</td><td>\u05e7\u05d0\u05b8\u05e0\u05d8\u05e2\u05e7\u05e1\u05d8\u05be\u05de\u05e2\u05e0\u05d9\u05d5</td></tr></table></body></html>
+ConstructionProtocolNavigation=\u05d2\u05d0\u05b7\u05e0\u05d2 \u05e6\u05d5\u05d5\u05d9\u05e9\u05df \u05d3\u05d9 \u05e9\u05d8\u05d0\u05b7\u05e4\u05bc\u05dc\u05e2\u05df \u05e4\u05bf\u05d5\u05df \u05d3\u05e2\u05e8 \u05e7\u05d0\u05b8\u05e0\u05e1\u05d8\u05e8\u05d5\u05e7\u05e6\u05d9\u05e2
+Coordinates=\u05e7\u05d0\u05b8\u05d0\u05b8\u05e8\u05d3\u05d9\u05e0\u05d0\u05b7\u05d8\u05df
+CopyToClipboard=\u05d0\u05d9\u05d1\u05e2\u05e8\u05e7\u05d0\u05b8\u05e4\u05bc\u05d9\u05e8\u05df \u05d0\u05d9\u05df \u05e7\u05dc\u05e2\u05e4\u05bc\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc
+CornerPoint=\u05d5\u05d5\u05d9\u05e0\u05e7\u05dc
+CreatedWith=\u05d2\u05e2\u05e9\u05d0\u05b7\u05e4\u05bf\u05df \u05de\u05d9\u05d8
+CreatedWithGeoGebra=\u05d2\u05e2\u05e9\u05d0\u05b7\u05e4\u05bf\u05df \u05de\u05d9\u05d8 GeoGebra
+CrossAt=\u05e9\u05e0\u05f2\u05b7\u05d3\u05d8 \u05d3\u05d5\u05e8\u05da \u05d1\u05f2\u05b7
+Curve=\u05e7\u05e8\u05d5\u05de\u05e2
+Date=\u05d3\u05d0\u05b7\u05d8\u05e2
+Day.1=\u05d6\u05d5\u05e0\u05d8\u05d9\u05e7
+Day.2=\u05de\u05d0\u05b8\u05e0\u05d8\u05d9\u05e7
+Day.3=\u05d3\u05d9\u05e0\u05e1\u05d8\u05d9\u05e7
+Day.4=\u05de\u05d9\u05d8\u05d5\u05d5\u05d0\u05b8\u05da
+Day.5=\u05d3\u05d0\u05b8\u05e0\u05e2\u05e8\u05e9\u05d8\u05d9\u05e7
+Day.6=\u05e4\u05bf\u05e8\u05f2\u05b7\u05d8\u05d9\u05e7
+Day.7=\u05e9\u05d1\u05ea
+Decoration=\u05d1\u05d0\u05b7\u05e4\u05bc\u05d5\u05e6\u05d5\u05e0\u05d2
+Decreasing=\u05e4\u05bf\u05d0\u05b7\u05dc\u05e0\u05d3\u05d9\u05e7
Default=\u05e4\u05bf\u05e2\u05dc\u05d9\u05e7\u05d9\u05d9\u05d8
DefaultPointStyle=\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05e0\u05e1\u05d8\u05d9\u05dc (\u05d3\u05d5\u05e8\u05da \u05e4\u05bf\u05e2\u05dc\u05d9\u05e7\u05d9\u05d9\u05d8)
Defaults=\u05e4\u05bf\u05e2\u05dc\u05d9\u05e7\u05d9\u05d9\u05d8
+Definition=\u05d3\u05e2\u05e4\u05bf\u05d9\u05e0\u05d9\u05e6\u05d9\u05e2
+Delete=\u05d0\u05b8\u05e4\u05bc\u05de\u05e2\u05e7\u05df
+DeleteRowA=\u05d0\u05b8\u05e4\u05bc\u05de\u05e2\u05e7\u05df \u05d3\u05d9 \u05e9\u05d5\u05e8\u05d4 %0
+DeleteRowsAtoB=\u05d0\u05b8\u05e4\u05bc\u05de\u05e2\u05e7\u05df \u05d3\u05d9 \u05e9\u05d5\u05e8\u05d5\u05ea \u05e4\u05bf\u05d5\u05df %0 \u05d1\u05d9\u05d6 %1
+DependentObjects=\u05d0\u05b8\u05e4\u05bc\u05d4\u05e2\u05e0\u05d2\u05d9\u05e7\u05e2 \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df
+DerivativeOfA=\u05d3\u05e2\u05e8\u05d9\u05d5\u05d5\u05d0\u05b7\u05d8\u05d9\u05d5\u05d5 \u05e4\u05bf\u05d5\u05df %0
+Dimensions=\u05d0\u05d5\u05d9\u05e1\u05de\u05e2\u05e1\u05d8\u05df
+DirectionOfA=\u05e8\u05d9\u05db\u05d8\u05d5\u05d5\u05e2\u05e7\u05d8\u05d0\u05b8\u05e8 \u05e4\u05bf\u05d5\u05df %0
+Directrix=\u05d3\u05d9\u05e8\u05e2\u05e7\u05d8\u05e8\u05d9\u05e1\u05e2
+DirectrixOfA=\u05d3\u05d9\u05e8\u05e2\u05e7\u05d8\u05e8\u05d9\u05e1\u05e2 \u05e4\u05bf\u05d5\u05df %0
+DistanceOfAandB=\u05d3\u05d9\u05e1\u05d8\u05d0\u05b7\u05e0\u05e5 \u05e6\u05d5\u05d5\u05d9\u05e9\u05df %0 \u05d0\u05d5\u05df %1
+Down=\u05d0\u05b7\u05e8\u05d0\u05b8\u05e4\u05bc
+DrawingPad=\u05e6\u05d9\u05d9\u05db\u05df\u05be\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc
+DrawingPad2=\u05e6\u05d9\u05d9\u05db\u05df\u05be\u05d8\u05d0\u05b8\u05d5\u05d5\u05dc 2
+DynamicCoordinatesOfA=\u05d3\u05d9\u05e0\u05d0\u05b7\u05de\u05d9\u05e9\u05e2 \u05e7\u05d0\u05b8\u05d0\u05b8\u05e8\u05d3\u05d9\u05e0\u05d0\u05b7\u05d8\u05df \u05e4\u05bf\u05d5\u05df %0
+Edit=\u05d1\u05d0\u05b7\u05d0\u05b7\u05e8\u05d1\u05e2\u05d8\u05df
+Ellipse=\u05e2\u05dc\u05d9\u05e4\u05bc\u05e1
+EmptySet=\u05dc\u05d9\u05d9\u05d3\u05d9\u05e7\u05e2\u05e8 \u05e1\u05db\u05d5\u05dd
+EnableScripting=\u05d3\u05e2\u05e8\u05dc\u05d5\u05d9\u05d1\u05df \u05e1\u05e7\u05e8\u05d9\u05e4\u05bc\u05d8\u05df
+GridType=\u05d8\u05d9\u05e4\u05bc \u05e8\u05e2\u05e9\u05d0\u05b8\u05d8\u05e7\u05e2
+InputLabelToolTip=\u05e9\u05e8\u05f2\u05b7\u05d1\u05d8 \u05d0\u05b7\u05e8\u05f2\u05b7\u05df \u05d0\u05b7 \u05d1\u05d0\u05b7\u05e4\u05bf\u05e2\u05dc
+Interval=\u05d0\u05d9\u05e0\u05d8\u05e2\u05e8\u05d5\u05d5\u05d0\u05b7\u05dc
+Italic=\u05e7\u05d5\u05e8\u05e1\u05d9\u05d5\u05d5
+Keyboard=\u05d5\u05d5\u05d9\u05e8\u05d8\u05d5\u05e2\u05dc\u05e2 \u05e7\u05dc\u05d0\u05b7\u05d5\u05d5\u05d9\u05d0\u05b7\u05d8\u05d5\u05e8
+LaTeXFormula=LaTeX\u05be\u05e4\u05bf\u05d0\u05b8\u05e8\u05de\u05dc
+LaTeXHelp=\u05d4\u05d9\u05dc\u05e3 LaTeX
+Large=\u05d2\u05e8\u05d5\u05d9\u05e1
+LatexFontSize=\u05e9\u05e8\u05d9\u05e4\u05bf\u05d8\u05d2\u05e8\u05d9\u05d9\u05e1 \u05d0\u05d9\u05e0\u05e2\u05dd \u05d3\u05d0\u05b8\u05e7\u05d5\u05de\u05e2\u05e0\u05d8:
+Length=\u05dc\u05e2\u05e0\u05d2
+LengthOfA=\u05dc\u05e2\u05e0\u05d2 \u05e4\u05bf\u05d5\u05df %0
+Lengths=\u05dc\u05e2\u05e0\u05d2\u05e2\u05df
+Line=\u05d2\u05e8\u05d0\u05b8\u05d3\u05e2
+Month.1=\u05d9\u05d0\u05b7\u05e0\u05d5\u05d0\u05b7\u05e8
+Month.10=\u05d0\u05b8\u05e7\u05d8\u05d0\u05b8\u05d1\u05e2\u05e8
+Month.11=\u05e0\u05d0\u05b8\u05d5\u05d5\u05e2\u05de\u05d1\u05e2\u05e8
+Month.12=\u05d3\u05e2\u05e6\u05e2\u05de\u05d1\u05e2\u05e8
+Month.2=\u05e4\u05bf\u05e2\u05d1\u05e8\u05d5\u05d0\u05b7\u05e8
+Month.3=\u05de\u05d0\u05b7\u05e8\u05e5
+Month.4=\u05d0\u05b7\u05e4\u05bc\u05e8\u05d9\u05dc
+Month.5=\u05de\u05f2\u05b7
+Month.6=\u05d9\u05d5\u05e0\u05d9
+Month.7=\u05d9\u05d5\u05dc\u05d9
+Month.8=\u05d0\u05d5\u05d9\u05d2\u05d5\u05e1\u05d8
+Month.9=\u05e1\u05e2\u05e4\u05bc\u05d8\u05e2\u05de\u05d1\u05e2\u05e8
+Name=\u05e0\u05d0\u05b8\u05de\u05e2\u05df
+Name.button=\u05e7\u05e0\u05e2\u05e4\u05bc\u05dc
+Name.list=\u05dc\u05d9\u05e1\u05d8\u05e2
+Name.locus=\u05dc\u05d0\u05b8\u05e7\u05d5\u05e1
+Name.matrix=\u05de\u05d0\u05b7\u05d8\u05e8\u05d9\u05e6\u05e2
+Name.picture=\u05d1\u05d9\u05dc\u05d3
+Name.polygon=\u05e4\u05bc\u05d0\u05b8\u05dc\u05d9
+Name.text=\u05d8\u05e2\u05e7\u05e1\u05d8
+Name.textfield=\u05d8\u05e2\u05e7\u05e1\u05d8\u05be\u05e9\u05d8\u05d7
+NameAndValue=\u05e0\u05d0\u05b8\u05de\u05e2\u05df \u05d0\u05d5\u05df \u05d5\u05d5\u05e2\u05e8\u05d8
+NewExpression=\u05e0\u05f2\u05b7\u05e2\u05e8 \u05d0\u05d5\u05d9\u05e1\u05d3\u05e8\u05d5\u05e7
+NewNameForA=\u05e0\u05f2\u05b7\u05e2\u05e8 \u05e0\u05d0\u05b8\u05de\u05e2\u05df \u05e4\u05bf\u05d0\u05b7\u05e8 %0
+Next=\u05d5\u05d5\u05f2\u05b7\u05d8\u05e2\u05e8\u05d3\u05d9\u05e7\u05e2\u05e8
+NextCell=\u05d5\u05d5\u05f2\u05b7\u05d8\u05e2\u05e8\u05d3\u05d9\u05e7 \u05e7\u05e2\u05de\u05e2\u05e8\u05dc
+No.=\u05e0\u05d5\u05de'
+NotAvailable=\u05e0\u05d9\u05e9\u05d8 \u05e6\u05d5\u05d8\u05e8\u05d9\u05d8\u05dc\u05e2\u05da
+NotIncluded=\u05d2\u05e2\u05d4\u05e2\u05e8\u05d8 \u05e0\u05d9\u05e9\u05d8 \u05e6\u05d5
+Numeric=\u05e6\u05d0\u05b8\u05dc
+NumericObjects=\u05e0\u05d5\u05de\u05e2\u05e8\u05d9\u05e9\u05e2 \u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df
+OK=\u05d1\u05d0\u05b7\u05e9\u05d8\u05e2\u05d8\u05d9\u05e7\u05df
+Objects=\u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8\u05df
+OldExpression=\u05d0\u05b7\u05dc\u05d8\u05e2\u05e8 \u05d0\u05d5\u05d9\u05e1\u05d3\u05e8\u05d5\u05e7
+OnClick=\u05d3\u05d5\u05e8\u05da \u05d0\u05b7 \u05e7\u05dc\u05d9\u05e7
+Open=\u05e2\u05e4\u05bf\u05e2\u05e0\u05e2\u05df
+Oscillating=\u05d0\u05b7\u05d4\u05d9\u05df\u05be\u05d0\u05d5\u05df\u05be\u05e6\u05d5\u05e8\u05d9\u05e7
+OverwriteFile=\u05e6\u05d9 \u05d5\u05d5\u05d9\u05dc\u05d8 \u05d0\u05d9\u05e8 \u05d0\u05d9\u05d1\u05e2\u05e8\u05e9\u05e8\u05f2\u05b7\u05d1\u05df \u05d3\u05d9 \u05d8\u05e2\u05e7\u05e2?
+PGFExport.Grayscale=\u05d2\u05e8\u05d0\u05b7\u05d3\u05df \u05d2\u05e8\u05d5\u05d9
+Parabola=\u05e4\u05bc\u05d0\u05b7\u05e8\u05d0\u05b7\u05d1\u05d0\u05b8\u05dc\u05e2
+ParabolaEquation=y² = \u05d0\u05b8\u05d3\u05e2\u05e8 x² =
+ParallelLines=\u05e4\u05bc\u05d0\u05b7\u05e8\u05d0\u05b7\u05dc\u05e2\u05dc\u05e2 \u05d2\u05e8\u05d0\u05b8\u05d3\u05e2\u05e1
+ParametricForm=\u05e4\u05bc\u05d0\u05b7\u05e8\u05d0\u05b7\u05de\u05e2\u05d8\u05e8\u05d9\u05e9\u05e2 \u05e4\u05bf\u05d0\u05b8\u05e8\u05e2\u05dd
+Pause=\u05d4\u05e4\u05bf\u05e1\u05e7\u05d4
+Pentagon=\u05e4\u05bc\u05e2\u05e0\u05d8\u05d0\u05b7\u05d2\u05d0\u05b8\u05df
PerspectiveName=\u05d0\u05d5\u05d9\u05e1\u05e9\u05d8\u05e2\u05dc\u05be\u05d1\u05d0\u05b7\u05e6\u05d9\u05d9\u05db\u05e2\u05e0\u05d5\u05e0\u05d2
+Picture=\u05d1\u05d9\u05dc\u05d3
+PictureHeight=\u05d4\u05d9\u05d9\u05da \u05e4\u05bf\u05d5\u05df \u05d1\u05d9\u05dc\u05d3
+PictureWidth=\u05d1\u05e8\u05d9\u05d9\u05d8 \u05e4\u05bf\u05d5\u05df \u05d1\u05d9\u05dc\u05d3
+Play=\u05d0\u05d5\u05d9\u05e1\u05e4\u05bf\u05d9\u05e8\u05df
+PlayButton="\u05d0\u05d5\u05d9\u05e1\u05e4\u05bf\u05d9\u05e8\u05df"
+Point=\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8
+PointAplusB=\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 %0 + %1
+PointDep=\u05d0\u05b8\u05e4\u05bc\u05d4\u05e2\u05e0\u05d2\u05d9\u05e7
+PointFree=\u05e4\u05bf\u05e8\u05f2\u05b7
+PointInA=\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05d0\u05d9\u05df %0
+PointInside=\u05d0\u05d9\u05df \u05d2\u05e2\u05d1\u05d9\u05d8
+PointOn=\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05d0\u05d5\u05d9\u05e3
+PointOnA=\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05d0\u05d5\u05d9\u05e3 %0
+PointOnAClosestToB=\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8 \u05d0\u05d5\u05d9\u05e3 %0 \u05d5\u05d5\u05d9 \u05e6\u05d5\u05dd \u05e0\u05e2\u05e0\u05d8\u05e1\u05d8\u05df \u05e6\u05d5 %1
+PointSize=\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05d2\u05e8\u05d9\u05d9\u05e1
+Points=\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df
+PolarCoords=\u05e4\u05bc\u05d0\u05b8\u05dc\u05d0\u05b7\u05e8\u05e2 \u05e7\u05d0\u05b8\u05d0\u05b8\u05e8\u05d3\u05d9\u05e0\u05d0\u05b7\u05d8\u05df
+PolarLineOfARelativeToB=\u05e4\u05bc\u05d0\u05b8\u05dc\u05d0\u05b7\u05e8\u05e2 \u05e4\u05bf\u05d5\u05df %0 \u05dc\u05d2\u05d1\u05d9 %1
+PolyLine=\u05d2\u05e2\u05d1\u05e8\u05d0\u05b8\u05db\u05e2\u05e0\u05e2 \u05dc\u05d9\u05e0\u05d9\u05e2
+Polygon=\u05e4\u05bc\u05d0\u05b8\u05dc\u05d9\u05d2\u05d0\u05b8\u05df
+PositiveDirectionOnly=\u05d1\u05dc\u05d5\u05d9\u05d6 \u05d3\u05d9 \u05e4\u05bc\u05d0\u05b8\u05d6\u05d9\u05d8\u05d9\u05d5\u05d5\u05e2 \u05e8\u05d9\u05db\u05d8\u05d5\u05e0\u05d2
+PreviewUnavailable=\u05e0\u05d9\u05e9\u05d8\u05d0\u05b8 \u05e7\u05d9\u05d9\u05df \u05d0\u05d9\u05d1\u05e2\u05e8\u05d1\u05dc\u05d9\u05e7
+Random=\u05e6\u05d5\u05e4\u05bf\u05e2\u05dc\u05d9\u05e7
+Ray=\u05e9\u05d8\u05e8\u05d0\u05b7\u05dc
+Repeat=\u05d0\u05d9\u05d1\u05e2\u05e8\u05d7\u05d6\u05e8\u05df
Selection=\u05d0\u05d5\u05d9\u05e1\u05d8\u05d9\u05d9\u05dc
SelectionAllowed=\u05d0\u05d5\u05d9\u05e1\u05d8\u05d9\u05d9\u05dc\u05e2\u05d5\u05d5\u05d3\u05d9\u05e7
-Slider=\u05dc\u05d5\u05d9\u05e4\u05bf\u05d5\u05d5\u05f2\u05b7\u05d6\u05e2\u05e8
\ No newline at end of file
+ShowGrid=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05d9 \u05e8\u05e2\u05e9\u05d0\u05b8\u05d8\u05e7\u05e2
+ShowxAxis=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05e2\u05dd x\u05be\u05d0\u05b7\u05e7\u05e1
+ShowyAxis=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05e2\u05dd y\u05be\u05d0\u05b7\u05e7\u05e1
+SimpleFormulas=\u05e4\u05bc\u05e9\u05d5\u05d8\u05e2 \u05e4\u05bf\u05d0\u05b8\u05e8\u05de\u05dc\u05e2\u05df
+Size=\u05d2\u05e8\u05d9\u05d9\u05e1
+Slider=\u05dc\u05d5\u05d9\u05e4\u05bf\u05d5\u05d5\u05f2\u05b7\u05d6\u05e2\u05e8
+SlopeOfA=\u05d0\u05b8\u05e0\u05d1\u05d9\u05d9\u05d2 \u05e4\u05bf\u05d5\u05df %0
+Small=\u05e7\u05dc\u05d9\u05d9\u05df
+Speed=\u05d2\u05d9\u05db\u05e7\u05d9\u05d9\u05d8
+SphereThroughAwithCenterB=\u05e1\u05e4\u05bf\u05e2\u05e8\u05e2 \u05d3\u05d5\u05e8\u05da %0 \u05de\u05d9\u05d8 %1 \u05e4\u05bf\u05d0\u05b7\u05e8 \u05d0\u05b7 \u05e6\u05e2\u05e0\u05d8\u05e2\u05e8
+SphereWithCenterAandRadiusB=\u05e1\u05e4\u05bf\u05e2\u05e8\u05e2 \u05de\u05d9\u05d8 %0 \u05e4\u05bf\u05d0\u05b7\u05e8 \u05d0\u05b7 \u05e6\u05e2\u05e0\u05d8\u05e2\u05e8 \u05d0\u05d5\u05df %1 \u05e4\u05bf\u05d0\u05b7\u05e8 \u05d0\u05b7 \u05e8\u05d0\u05b7\u05d3\u05d9\u05d5\u05e1
+Spreadsheet=\u05d8\u05d0\u05b7\u05d1\u05e2\u05dc\u05e2\u05be\u05d1\u05d5\u05d9\u05d2\u05df
+StandardObject=\u05e1\u05d8\u05d0\u05b7\u05e0\u05d3\u05d0\u05b7\u05e8\u05d3\u05be\u05d0\u05b8\u05d1\u05d9\u05e2\u05e7\u05d8
+StandardView=\u05e1\u05d8\u05d0\u05b7\u05e0\u05d3\u05d0\u05b7\u05e8\u05d3\u05be\u05d0\u05b7\u05e8\u05d5\u05d9\u05e1\u05e9\u05d8\u05e2\u05dc
+StartingPoint=\u05d0\u05b8\u05e0\u05d4\u05d9\u05d9\u05d1\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8
+StemPlot.KeyAMeansB=\u05e9\u05dc\u05d9\u05e1\u05dc: %0 \u05d1\u05d0\u05b7\u05d8\u05f2\u05b7\u05d8 %1
+StemPlot.high=\u05d4\u05d5\u05d9\u05da
+StemPlot.low=\u05e0\u05d9\u05d3\u05e2\u05e8\u05d9\u05e7
+StickToEdge=\u05d4\u05d0\u05b7\u05dc\u05d8\u05df \u05d1\u05f2\u05b7\u05dd \u05e8\u05d0\u05b7\u05e0\u05d3
+StopScript=\u05d0\u05b8\u05e4\u05bc\u05e9\u05d8\u05e2\u05dc\u05df \u05d3\u05e2\u05dd \u05e1\u05e7\u05e8\u05d9\u05e4\u05bc\u05d8
+Substitute=\u05e1\u05d5\u05d1\u05e1\u05d8\u05d9\u05d8\u05d5\u05d9\u05b4\u05e8\u05df
+Syntax=\u05e1\u05d9\u05e0\u05d8\u05d0\u05b7\u05e7\u05e1
+Text=\u05d8\u05e2\u05e7\u05e1\u05d8
+TextAfterConstruction=\u05d8\u05e2\u05e7\u05e1\u05d8 \u05e0\u05d0\u05b8\u05da \u05d3\u05e2\u05e8 \u05e7\u05d0\u05b8\u05e0\u05e1\u05d8\u05e8\u05d5\u05e7\u05e6\u05d9\u05e2
+TextBeforeConstruction=\u05d8\u05e2\u05e7\u05e1\u05d8 \u05e4\u05bf\u05d0\u05b7\u05e8 \u05d3\u05e2\u05e8 \u05e7\u05d0\u05b8\u05e0\u05e1\u05d8\u05e8\u05d5\u05e7\u05e6\u05d9\u05e2
+TextField=\u05d8\u05e2\u05e7\u05e1\u05d8\u05be\u05e9\u05d8\u05d7
+TextfieldLength=\u05dc\u05e2\u05e0\u05d2 \u05e4\u05bf\u05d5\u05e0\u05e2\u05dd \u05d8\u05e2\u05e7\u05e1\u05d8\u05be\u05e9\u05d8\u05d7
+Thickness=\u05d3\u05d9\u05e7 \u05e4\u05bf\u05d5\u05e0\u05e2\u05dd \u05e9\u05d8\u05e8\u05d9\u05da
+TickDistance=\u05d3\u05d9\u05e1\u05d8\u05d0\u05b7\u05e0\u05e5
+Title=\u05d8\u05d9\u05d8\u05dc
+ToolbarIcon=\u05d0\u05d9\u05e7\u05d0\u05b8\u05e0\u05d3\u05dc \u05e4\u05bf\u05d5\u05df \u05d3\u05e2\u05e8 \u05de\u05db\u05e9\u05d9\u05e8\u05d9\u05dd\u05be\u05e9\u05d5\u05e8\u05d4
+ToolbarIconsConstructionProtocolExport=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05d9 \u05d0\u05d9\u05e7\u05d0\u05b8\u05e0\u05d3\u05dc\u05e2\u05da \u05e4\u05bf\u05d5\u05df \u05d3\u05d9 \u05de\u05db\u05e9\u05d9\u05e8\u05d9\u05dd
+TooltipLanguage=\u05e9\u05e4\u05bc\u05e8\u05d0\u05b7\u05da \u05e4\u05bf\u05d5\u05df \u05d3\u05d9 \u05d4\u05d9\u05dc\u05e3\u05be\u05e8\u05de\u05d6\u05d9\u05dd
+TooltipTimeout=\u05d3\u05d5\u05d9\u05e2\u05e8 \u05e4\u05bf\u05d5\u05df \u05d3\u05d9 \u05d4\u05d9\u05dc\u05e3\u05be\u05e8\u05de\u05d6\u05d9\u05dd (\u05e1\u05e2\u05e7\u05d5\u05e0\u05d3\u05e2\u05e1)
+Tooltips=\u05d4\u05d9\u05dc\u05e3\u05be\u05e8\u05de\u05d6\u05d9\u05dd
+TraceOff=\u05d0\u05b8\u05df \u05e0\u05d0\u05b8\u05db\u05e9\u05e4\u05bc\u05d9\u05e8
+TraceOn=\u05de\u05d9\u05d8 \u05e0\u05d0\u05b8\u05db\u05e9\u05e4\u05bc\u05d9\u05e8
+TraceToSpreadsheet=\u05e0\u05d0\u05b8\u05db\u05e9\u05e4\u05bc\u05d9\u05e8\u05df \u05d0\u05d9\u05df \u05d3\u05e2\u05dd \u05d8\u05d0\u05b7\u05d1\u05e2\u05dc\u05e2\u05be\u05d1\u05d5\u05d9\u05d2\u05df
+Triangle=\u05d3\u05e8\u05f2\u05b7\u05e2\u05e7
+UntitledConstruction=\u05e7\u05d0\u05b8\u05e0\u05e1\u05d8\u05e8\u05d5\u05e7\u05e6\u05d9\u05e2 \u05d0\u05b8\u05df \u05d0\u05b7 \u05d8\u05d9\u05d8\u05dc
+Up=\u05d0\u05b7\u05e8\u05d5\u05d9\u05e3
+Value=\u05d5\u05d5\u05e2\u05e8\u05d8
+Vector=\u05d5\u05d5\u05e2\u05e7\u05d8\u05d0\u05b8\u05e8
+Vectors=\u05d5\u05d5\u05e2\u05e7\u05d8\u05d0\u05b8\u05e8\u05df
+VeryLarge=\u05d6\u05d9\u05d9\u05e2\u05e8 \u05d2\u05e8\u05d5\u05d9\u05e1
+VerySmall=\u05d6\u05d9\u05d9\u05e2\u05e8 \u05e7\u05dc\u05d9\u05d9\u05df
+VirtualKeyboard=\u05d5\u05d5\u05d9\u05e8\u05d8\u05d5\u05e2\u05dc\u05e2 \u05e7\u05dc\u05d0\u05b7\u05d5\u05d5\u05d9\u05d0\u05b7\u05d8\u05d5\u05e8
+VirtualKeyboardLanguage=\u05e9\u05e4\u05bc\u05e8\u05d0\u05b7\u05da \u05e4\u05bf\u05d5\u05df \u05d3\u05e2\u05e8 \u05d5\u05d5\u05d9\u05e8\u05d8\u05d5\u05e2\u05dc\u05e2\u05e8 \u05e7\u05dc\u05d0\u05b7\u05d5\u05d5\u05d9\u05d0\u05b7\u05d8\u05d5\u05e8
+Width=\u05d1\u05e8\u05d9\u05d9\u05d8
+WindowOpened=\u05d0\u05b8\u05e4\u05bf\u05e2\u05e0\u05e2\u05e8 \u05e4\u05bf\u05e2\u05e0\u05e6\u05d8\u05e2\u05e8
+ZoomIn=\u05e4\u05bf\u05d0\u05b7\u05e8\u05d2\u05e8\u05e2\u05e1\u05e2\u05e8\u05df
+ZoomOut=\u05e4\u05bf\u05d0\u05b7\u05e8\u05e7\u05dc\u05e2\u05e0\u05e2\u05e8\u05df
+allowReflexAngle=\u05d3\u05e2\u05e8\u05dc\u05d5\u05d9\u05d1\u05df \u05d0\u05b7\u05e8\u05f2\u05b7\u05e0\u05d2\u05e2\u05e9\u05e4\u05bc\u05d9\u05e6\u05d8\u05e2 \u05d5\u05d5\u05d9\u05e0\u05e7\u05dc\u05e2\u05df
+back=\u05e6\u05d5\u05e8\u05d9\u05e7
+cartesian=\u05e7\u05d0\u05b7\u05e8\u05d8\u05e2\u05d6\u05d9\u05d0\u05b7\u05e0\u05d9\u05e9
+clockwise=\u05d6\u05d9\u05d9\u05d2\u05e2\u05e8\u05d5\u05d5\u05f2\u05b7\u05dc\u05e2\u05db\u05e5
+counterClockwise=\u05e7\u05e2\u05d2\u05e0\u05d6\u05d9\u05d9\u05d2\u05e2\u05e8\u05d5\u05d5\u05f2\u05b7\u05dc\u05e2\u05db\u05e5
+dependent=\u05d0\u05b8\u05e4\u05bc\u05d4\u05e2\u05e0\u05d2\u05d9\u05e7
+equal=\u05d2\u05dc\u05f2\u05b7\u05da
+firstAxisLength=\u05dc\u05e2\u05e0\u05d2 \u05e4\u05bf\u05d5\u05df \u05e2\u05e8\u05e9\u05d8\u05df \u05d0\u05b7\u05e7\u05e1
+fixed=\u05e4\u05bf\u05d9\u05e7\u05e1\u05d9\u05e8\u05d8
+fncInspector.Derivative=\u05d3\u05e2\u05e8\u05d9\u05d5\u05d5\u05d0\u05b7\u05d8\u05d9\u05d5\u05d5
+fncInspector.Derivative2=\u05e6\u05d5\u05d5\u05d9\u05d9\u05d8\u05e2\u05e8 \u05d3\u05e2\u05e8\u05d9\u05d5\u05d5\u05d0\u05b7\u05d8\u05d9\u05d5\u05d5
+fncInspector.Difference=\u05d0\u05d5\u05e0\u05d8\u05e2\u05e8\u05e9\u05d9\u05d9\u05d3
+fncInspector.Interval=\u05d0\u05d9\u05e0\u05d8\u05e2\u05e8\u05d5\u05d5\u05d0\u05b7\u05dc
+fncInspector.MultipleRoots=\u05e4\u05bf\u05d9\u05dc\u05e6\u05d0\u05b8\u05dc\u05d9\u05e7\u05e2 \u05d5\u05d5\u05d0\u05b8\u05e8\u05e6\u05dc\u05e2\u05df
+fncInspector.NoRoots=\u05e0\u05d9\u05e9\u05d8\u05d0\u05b8 \u05e7\u05d9\u05d9\u05df \u05d5\u05d5\u05d0\u05b8\u05e8\u05e6\u05dc\u05e2\u05df
+fncInspector.Points=\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df
+fncInspector.Property=\u05d0\u05d9\u05d9\u05d2\u05e0\u05e9\u05d0\u05b7\u05e4\u05bf\u05d8\u05df
+fncInspector.ShowArea=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05e2\u05dd \u05e9\u05d8\u05d7
+fncInspector.Value=\u05d5\u05d5\u05e2\u05e8\u05d8
+fncInspector.addColumn=\u05e6\u05d5\u05d2\u05e2\u05d1\u05df \u05d0\u05b7 \u05e1\u05dc\u05d5\u05e4\u05bc\u05d9\u05e7
+fncInspector.removeColumn=\u05d0\u05b8\u05e4\u05bc\u05e9\u05d0\u05b7\u05e4\u05bf\u05df \u05d3\u05e2\u05dd \u05dc\u05e2\u05e6\u05d8\u05df \u05e1\u05dc\u05d5\u05e4\u05bc\u05d9\u05e7
+fncInspector.showOscCircle=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05e2\u05dd \u05d0\u05b8\u05e1\u05e7\u05d5\u05dc\u05d9\u05e8\u05be\u05e7\u05e8\u05f2\u05b7\u05d6
+fncInspector.showTable=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05d9 \u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df\u05be\u05d8\u05d0\u05b7\u05d1\u05e2\u05dc\u05e2
+fncInspector.showTangent=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d3\u05d9 \u05d8\u05d0\u05b7\u05e0\u05d2\u05e2\u05e0\u05d8\u05df
+forceReflexAngle=\u05d0\u05b7\u05e8\u05d5\u05d9\u05e4\u05bf\u05e6\u05d5\u05d5\u05d9\u05e0\u05d2\u05e2\u05df \u05d0\u05b7\u05e8\u05f2\u05b7\u05e0\u05d2\u05e2\u05e9\u05e4\u05bc\u05d9\u05e6\u05d8\u05e2 \u05d5\u05d5\u05d9\u05e0\u05e7\u05dc\u05e2\u05df
+forward=\u05e4\u05bf\u05d0\u05b8\u05e8\u05d5\u05d9\u05e1
+free=\u05e4\u05bf\u05e8\u05f2\u05b7
+horizontal=\u05d4\u05d0\u05b8\u05e8\u05d9\u05d6\u05d0\u05b8\u05e0\u05d8\u05d0\u05b7\u05dc
+html=\u05d5\u05d5\u05e2\u05d1\u05d6\u05f2\u05b7\u05d8\u05dc
+jpg=JPG\u05be\u05e4\u05bf\u05d0\u05b8\u05e8\u05de\u05d0\u05b7\u05d8
+max=\u05de\u05d0\u05b7\u05e7\u05e1'
+min=\u05de\u05d9\u05e0'
+off=\u05e0\u05d9\u05d9\u05df
+otherwise=\u05d0\u05b7\u05e0\u05d9\u05e9\u05d8
+parallel=\u05e4\u05bc\u05d0\u05b7\u05e8\u05d0\u05b7\u05dc\u05e2\u05dc
+pdf=PDF\u05be\u05e4\u05bf\u05d0\u05b8\u05e8\u05de\u05d0\u05b7\u05d8
+png=PNG\u05be\u05e4\u05bf\u05d0\u05b8\u05e8\u05de\u05d0\u05b7\u05d8
+polar=\u05e4\u05bc\u05d0\u05b8\u05dc\u05d0\u05b7\u05e8
+resetConstruction=\u05d0\u05b8\u05e0\u05d4\u05d9\u05d9\u05d1\u05df \u05e4\u05bf\u05d5\u05df \u05d3\u05d0\u05b8\u05e1 \u05e0\u05f2\u05b7
+stylebar.Align=\u05d4\u05d0\u05b8\u05e8\u05d9\u05d6\u05d0\u05b8\u05e0\u05d8\u05d0\u05b7\u05dc\u05e2 \u05d0\u05d5\u05d9\u05e1\u05d2\u05dc\u05f2\u05b7\u05db\u05d5\u05e0\u05d2
+stylebar.AlignCenter=\u05d0\u05d9\u05df \u05e6\u05e2\u05e0\u05d8\u05e2\u05e8
+stylebar.AlignLeft=\u05d0\u05d5\u05d9\u05e1\u05d2\u05e2\u05d2\u05dc\u05f2\u05b7\u05db\u05d8 \u05dc\u05d9\u05e0\u05e7\u05e1
+stylebar.AlignRight=\u05d0\u05d5\u05d9\u05e1\u05d2\u05e2\u05d2\u05dc\u05f2\u05b7\u05db\u05d8 \u05e8\u05e2\u05db\u05d8\u05e1
+stylebar.Axes=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d0\u05b8\u05d3\u05e2\u05e8 \u05d1\u05d0\u05b7\u05d4\u05d0\u05b7\u05dc\u05d8\u05df \u05d3\u05d9 \u05d0\u05b7\u05e7\u05e1\u05df
+stylebar.BgColor=\u05d4\u05d9\u05e0\u05d8\u05e2\u05e8\u05d2\u05e8\u05d5\u05e0\u05d8\u05be\u05e7\u05d0\u05b8\u05dc\u05d9\u05e8
+stylebar.Bold=\u05e4\u05bf\u05e2\u05d8
+stylebar.Border=\u05e8\u05d0\u05b7\u05e0\u05d3\u05df
+stylebar.Bracket=\u05e7\u05dc\u05d0\u05b7\u05de\u05e2\u05e8\u05df
+stylebar.Caption=\u05e6\u05d5\u05e9\u05e8\u05d9\u05e4\u05bf\u05d8
+stylebar.Capture=\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df\u05be\u05d1\u05d0\u05b7\u05e9\u05d8\u05d0\u05b7\u05d8\u05d5\u05e0\u05d2
+stylebar.Color=\u05e7\u05d0\u05b8\u05dc\u05d9\u05e8
+stylebar.ColorTransparency=\u05e7\u05d0\u05b8\u05dc\u05d9\u05e8 \u05d0\u05d5\u05df \u05d0\u05b8\u05e4\u05bc\u05d0\u05b7\u05e6\u05d9\u05d8\u05e2\u05d8
+stylebar.CopyVisualStyle=\u05e7\u05d0\u05b8\u05e4\u05bc\u05d9\u05e8\u05df \u05d3\u05e2\u05dd \u05d2\u05e8\u05d0\u05b7\u05e4\u05bf\u05d9\u05e9\u05df \u05e1\u05d8\u05d9\u05dc
+stylebar.Eraser=\u05d0\u05b8\u05e4\u05bc\u05de\u05e2\u05e7\u05df \u05d3\u05e2\u05dd \u05e9\u05d8\u05e8\u05d9\u05da \u05e4\u05bf\u05d5\u05df \u05d3\u05e2\u05e8 \u05e4\u05bc\u05e2\u05df
+stylebar.Grid=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d0\u05b8\u05d3\u05e2\u05e8 \u05d1\u05d0\u05b7\u05d4\u05d0\u05b7\u05dc\u05d8\u05df \u05d3\u05d9 \u05e8\u05e2\u05e9\u05d0\u05b8\u05d8\u05e7\u05e2
+stylebar.Hidden=\u05d1\u05d0\u05b7\u05d4\u05d0\u05b7\u05dc\u05d8\u05df
+stylebar.HorizontalLine=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d0\u05b8\u05d3\u05e2\u05e8 \u05d1\u05d0\u05b7\u05d4\u05d0\u05b7\u05dc\u05d8\u05df \u05d3\u05d9 \u05d4\u05d0\u05b8\u05e8\u05d9\u05d6\u05d0\u05b8\u05e0\u05d8\u05d0\u05b7\u05dc\u05e2 \u05dc\u05d9\u05e0\u05d9\u05e2\u05e1
+stylebar.Italic=\u05e7\u05d5\u05e8\u05e1\u05d9\u05d5\u05d5
+stylebar.Label=\u05e7\u05d5\u05d5\u05d9\u05d8\u05dc\u05e2\u05da
+stylebar.LineStyle=\u05dc\u05d9\u05e0\u05d9\u05e2\u05e1
+stylebar.Pen=\u05e6\u05d9\u05d9\u05db\u05e2\u05e0\u05e2\u05df \u05de\u05d9\u05d8 \u05d3\u05e2\u05e8 \u05e4\u05bc\u05e2\u05df
+stylebar.PointStyle=\u05e4\u05bc\u05d5\u05e0\u05e7\u05d8\u05df
+stylebar.TextColor=\u05e7\u05d0\u05b8\u05dc\u05d9\u05e8 \u05e4\u05bf\u05d5\u05e0\u05e2\u05dd \u05d8\u05e2\u05e7\u05e1\u05d8
+stylebar.TextSize=\u05e9\u05e8\u05d9\u05e4\u05bf\u05d8\u05d2\u05e8\u05d9\u05d9\u05e1 \u05e4\u05bf\u05d5\u05e0\u05e2\u05dd \u05d8\u05e2\u05e7\u05e1\u05d8
+stylebar.VerticalLine=\u05d5\u05d5\u05f2\u05b7\u05d6\u05df \u05d0\u05b8\u05d3\u05e2\u05e8 \u05d1\u05d0\u05b7\u05d4\u05d0\u05b7\u05dc\u05d8\u05df \u05d3\u05d9 \u05d5\u05d5\u05e2\u05e8\u05d8\u05d9\u05e7\u05d0\u05b7\u05dc\u05e2 \u05dc\u05d9\u05e0\u05d9\u05e2\u05e1
+undefined=\u05e0\u05d9\u05e9\u05d8\u05be\u05d3\u05e2\u05e4\u05bf\u05d9\u05e0\u05d9\u05e8\u05d8
+unequal=\u05d0\u05d5\u05de\u05d2\u05dc\u05f2\u05b7\u05da
+vertical=\u05d5\u05d5\u05e2\u05e8\u05d8\u05d9\u05e7\u05d0\u05b7\u05dc
+xAxis=x\u05be\u05d0\u05b7\u05e7\u05e1
+xmax=X \u05de\u05d0\u05b7\u05e7\u05e1'
+xmin=X \u05de\u05d9\u05e0'
+xstep=X\u05be\u05e9\u05e4\u05bc\u05d0\u05b7\u05df
+yAxis=y\u05be\u05d0\u05b7\u05e7\u05e1
+ymax=Y \u05de\u05d0\u05b7\u05e7\u05e1'
+ymin=Y \u05de\u05d9\u05e0'
+ystep=Y\u05be\u05e9\u05e4\u05bc\u05d0\u05b7\u05df
\ No newline at end of file
diff --git a/geogebra/properties/plain_ka.properties b/geogebra/properties/plain_ka.properties
index f24c44d..5915876 100644
--- a/geogebra/properties/plain_ka.properties
+++ b/geogebra/properties/plain_ka.properties
@@ -1,5 +1,3 @@
-2x2Matrix=2x2 \u10db\u10d0\u10e2\u10e0\u10d8\u10ea\u10d0
-3x3Matrix=3x3 \u10db\u10d0\u10e2\u10e0\u10d8\u10ea\u10d0
ADecimalPlace=%0 \u10dc\u10d8\u10e8\u10d0\u10dc\u10d8 \u10db\u10eb\u10d8\u10db\u10d8\u10e1 \u10e8\u10d4\u10db\u10d3\u10d4\u10d2
ADecimalPlaces=%0 \u10dc\u10d8\u10e8\u10d0\u10dc\u10d8 \u10db\u10eb\u10d8\u10db\u10d8\u10e1 \u10e8\u10d4\u10db\u10d3\u10d4\u10d2
ADerivativeOfB=%0 \u10ec\u10d0\u10e0\u10db\u10dd\u10d4\u10d1\u10e3\u10da\u10d8\u10d0 %1-\u10e1\u10d8
diff --git a/geogebra/properties/plain_kk.properties b/geogebra/properties/plain_kk.properties
index 2930dcb..b320316 100644
--- a/geogebra/properties/plain_kk.properties
+++ b/geogebra/properties/plain_kk.properties
@@ -1,5 +1,3 @@
-2x2Matrix=2x2 \u043c\u0430\u0442\u0440\u0438\u0446\u0430
-3x3Matrix=3x3 \u043c\u0430\u0442\u0440\u0438\u0446\u0430
ADecimalPlace=%0 \u0440\u0430\u0437\u0440\u044f\u0434
ADecimalPlaces=%0 \u0440\u0430\u0437\u0440\u044f\u0434
ADerivativeOfB=%0 %1 -\u043d\u044b\u04a3 \u0442\u0443\u044b\u043d\u0434\u044b\u0441\u044b
@@ -34,6 +32,7 @@ Algebra=\u0410\u043b\u0433\u0435\u0431\u0440\u0430
AlgebraWindow=\u0410\u043b\u0433\u0435\u0431\u0440\u0430
AliesOnB=%0 %1 -\u0434\u0430 \u0436\u0430\u0442\u0430\u0434\u044b
AliesOnThePerimeterOfB=%0 %1 -\u043d\u044b\u04a3 \u043f\u0435\u0440\u0438\u043c\u0435\u0442\u0440\u0456\u043d\u0434\u0435 \u0436\u0430\u0442\u0430\u0434\u044b
+AllowOfflineUse=*.jar \u0444\u0430\u0439\u043b\u0434\u0430\u0440\u0434\u044b \u049b\u043e\u043b\u0434\u0430\u043d\u0443
Altitude=\u0411\u0438\u0456\u043a\u0442\u0456\u043a
Angle=\u0411\u04b1\u0440\u044b\u0448
AngleBetweenAB=%0 \u0436\u04d9\u043d\u0435 %1 \u0430\u0440\u0430\u0441\u044b\u043d\u0434\u0430\u0493\u044b \u0431\u04b1\u0440\u044b\u0448
@@ -195,7 +194,6 @@ HyperbolaWithFociABandFirstAxisLengthC=\u0424\u043e\u043a\u0443\u0441\u0442\u043
IgnoreDocumentLayout=\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0456\u043d\u0456\u04a3 \u041e\u0440\u043d\u0430\u043b\u0430\u0441\u0443\u044b\u043d\u0430 \u043d\u0430\u0437\u0430\u0440 \u0430\u0443\u0434\u0430\u0440\u043c\u0430\u0443
Image=\u0421\u0443\u0440\u0435\u0442
ImplicitPoly=\u0416\u0430\u0441\u044b\u0440\u044b\u043d \u049b\u0438\u0441\u044b\u049b
-IncludeJARFiles=*.jar \u0444\u0430\u0439\u043b\u0434\u0430\u0440\u0434\u044b \u049b\u043e\u043b\u0434\u0430\u043d\u0443
Increasing=\u041a\u04e9\u0442\u0435\u0440\u043c\u0435\u043b\u0456
IncreasingOnce=\u041a\u04e9\u0442\u0435\u0440\u043c\u0435\u043b\u0456 (\u0431\u0456\u0440 \u0440\u0435\u0442)
Inequality=\u0422\u0435\u04a3\u0441\u0456\u0437\u0434\u0456\u043a
@@ -296,9 +294,6 @@ PerspectiveName=\u041a\u0435\u043b\u0431\u0435\u0442\u0442\u0456\u04a3 \u0430\u0
Picture=\u0421\u0443\u0440\u0435\u0442
PictureHeight=\u0421\u0443\u0440\u0435\u0442 \u04b1\u0437\u044b\u043d\u0434\u044b\u0493\u044b
PictureWidth=\u0421\u0443\u0440\u0435\u0442 \u0435\u043d\u0456
-PlaneThroughAB=%0, %1 \u0430\u0440\u049b\u044b\u043b\u044b \u04e9\u0442\u0435\u0442\u0456\u043d \u0436\u0430\u0437\u044b\u049b\u0442\u044b\u049b
-PlaneThroughABC=%0, %1, %2 \u0430\u0440\u049b\u044b\u043b\u044b \u0436\u0430\u0437\u044b\u049b\u0442\u044b\u049b
-PlaneThroughAParallelToB=%0 \u0430\u0440\u049b\u044b\u043b\u044b \u04e9\u0442\u0435\u0442\u0456\u043d, %1 \u0442\u04af\u0437\u0443\u0456\u043d\u0435 \u043f\u0430\u0440\u0430\u043b\u043b\u0435\u043b\u044c \u0431\u043e\u043b\u0430\u0442\u044b\u043d \u0436\u0430\u0437\u044b\u049b\u0442\u044b\u049b
Play=\u041e\u0439\u043d\u0430\u0443
PlayButton=\u041e\u0439\u043d\u0430\u0443 \u0431\u0430\u0442\u044b\u0440\u043c\u0430\u0441\u044b
Point=\u041d\u04af\u043a\u0442\u0435
diff --git a/geogebra/properties/plain_ko.properties b/geogebra/properties/plain_ko.properties
index 476b655..a94e095 100644
--- a/geogebra/properties/plain_ko.properties
+++ b/geogebra/properties/plain_ko.properties
@@ -1,5 +1,3 @@
-2x2Matrix=2x2 \ud589\ub82c
-3x3Matrix=3x3 \ud589\ub82c
ADecimalPlace=%0 \uc18c\uc218\uc810 \uc544\ub798 \uc790\ub9ac
ADecimalPlaces=%0 \uc18c\uc218\uc810 \uc544\ub798 \uc790\ub9ac
ADerivativeOfB=%1 \uc758 %0 \ubc88\uc9f8 \ub3c4\ud568\uc218
@@ -35,6 +33,7 @@ Algebra=\ub300\uc218 \ud45c\ud604
AlgebraWindow=\ub300\uc218\ucc3d
AliesOnB=%0 \uc740(\ub294) %1 \uc704\uc5d0 \uc788\uc74c
AliesOnThePerimeterOfB=%0 \uc740(\ub294) %1 \uc758 \ub458\ub808 \uc704\uc5d0 \uc788\uc74c
+AllowOfflineUse=\uc624\ud504\ub77c\uc778\uc5d0\uc11c \uc0ac\uc6a9
AllowStyleBar=\uc2a4\ud0c0\uc77c \ubc14 \ubcf4\uc774\uae30
Altitude=\ub192\uc774
Angle=\uac01
@@ -113,7 +112,6 @@ ConstructionProtocolHelp=<html><body><p><b>\uad6c\uc131\ub2e8\uacc4 \uc0ac\uc6a9
ConstructionProtocolNavigation=\uad6c\uc131\ub2e8\uacc4 \ub124\ube44\uac8c\uc774\uc158 \ubc14
Coordinates=\uc88c\ud45c
CopyToClipboard=\ud074\ub9bd\ubcf4\ub4dc\ub85c \ubcf5\uc0ac
-CopyToLaTeX=LaTeX\uc73c\ub85c \ubcf5\uc0ac
CornerPoint=\uaf2d\uc9d3\uc810
CreatedWith=\uc0dd\uc131\ub428
CreatedWithGeoGebra=\uc9c0\uc624\uc9c0\ube0c\ub77c\uc5d0\uc11c \ub9cc\ub4e4\uc5b4\uc84c\uc2b5\ub2c8\ub2e4.
@@ -139,14 +137,14 @@ DeleteRowsAtoB=%0 \ud589\ubd80\ud130 %1 \ud589\uae4c\uc9c0 \uc0ad\uc81c
DependentObjects=\uc758\uc874\ud558\ub294 \ub300\uc0c1
DerivativeOfA=%0 \uc758 \ub3c4\ud568\uc218
DiameterOfAConjugateToB=%0 \uc758 \uc9c0\ub984\uc740 %1 \uc5d0 \ub300\ud558\uc5ec \ucf24\ub808\uc784
-Dimensions=\ucc28\uc6d0
+Dimensions=\ud06c\uae30
DirectionOfA=%0 \uc758 \ubc29\ud5a5
Directrix=\uc900\uc120
DirectrixOfA=%0 \uc758 \uc900\uc120
Display=\ub514\uc2a4\ud50c\ub808\uc774
DisplayPointSymbol=\uc810\ub4e4\uc5d0 \ub300\ud55c \uc2ec\ubc8c\uc744 \ubcf4\uc784
DistanceOfAandB=%0 \uc640(\uacfc) %1 \uc758 \uac70\ub9ac
-DoubleClickToOpen=\ub354\ube14 \ud074\ub9ad\ud558\uba74 GeoGebra \ucc3d\uc774 \uc5f4\ub9bc
+DoubleClickToOpen=\ub354\ube14 \ud074\ub9ad\ud558\uba74 \uc9c0\uc624\uc9c0\ube0c\ub77c \ucc3d\uc774 \uc5f4\ub9bc
DoubleLine=\ub450 \uc9c1\uc120 \uacb9\uce68
Down=\uc544\ub798
DrawingPad=\uae30\ud558\ucc3d
@@ -156,9 +154,9 @@ DrawingPadAsPSTricks=\uae30\ud558\ucc3d\uc744 PSTricks\uc73c\ub85c \uc800\uc7a5
DrawingPadAsPicture=\uae30\ud558\ucc3d\uc744 \uadf8\ub9bc\uc73c\ub85c \uc800\uc7a5
DrawingPagAsPGF=\uae30\ud558\ucc3d\uc744 PGF/TikZ\uc73c\ub85c \uc800\uc7a5
DynamicCoordinatesOfA=%0 \uc758 \ub3d9\uc801 \uc88c\ud45c
-DynamicWorksheet=\uc6c0\uc9c1\uc774\ub294 \uc6cc\ud06c\uc2dc\ud2b8
-DynamicWorksheetAsWebpage=\uc6c0\uc9c1\uc774\ub294 \uc6cc\ud06c\uc2dc\ud2b8\ub97c \uc6f9\ud398\uc774\uc9c0\ub85c \uc800\uc7a5
-DynamicWorksheetExport=\uc6c0\uc9c1\uc774\ub294 \uc6cc\ud06c\uc2dc\ud2b8\ub85c \ub0b4\ubcf4\ub0b4\uae30 (html)
+DynamicWorksheet=\uc0c1\ud638\uc791\uc6a9\uc801\uc778 \uc6cc\ud06c\uc2dc\ud2b8
+DynamicWorksheetAsWebpage=\uc0c1\ud638\uc791\uc6a9\uc801\uc778 \uc6cc\ud06c\uc2dc\ud2b8\ub97c \uc6f9\ud398\uc774\uc9c0\ub85c \uc800\uc7a5
+DynamicWorksheetExport=\uc0c1\ud638\uc791\uc6a9\uc801\uc778 \uc6cc\ud06c\uc2dc\ud2b8\ub85c \ub0b4\ubcf4\ub0b4\uae30 (html)
EccentricityOfA=%0 \uc758 \uc774\uc2ec\ub960
Edit=\ud3b8\uc9d1
Ellipse=\ud0c0\uc6d0
@@ -189,7 +187,7 @@ FixCheckbox=\uccb4\ud06c \uc0c1\uc790 \uace0\uc815
FixObject=\ub300\uc0c1\uc744 \uc88c\ud45c\uc5d0 \uace0\uc815
FocusOfA=%0 \uc758 \ucd08\uc810
ForceGnuplotPgf=\ud568\uc218\uc758 \uadf8\ub798\ud504\ub97c \uadf8\ub9ac\uae30 \uc704\ud574 Gnuplot\uc744 \uc0ac\uc6a9
-Format=\ud615\uc2dd
+Format=\ud3ec\ub9f7
FreeObjects=\uc790\uc720\ub85c\uc6b4 \ub300\uc0c1
Function=\ud568\uc218
FunctionAonIntervalBC=\uad6c\uac04[ %1, %2 ] \uc5d0\uc11c \ud568\uc218 %0
@@ -215,12 +213,11 @@ IgnoreDocumentLayout=\ubb38\uc11c \ub808\uc774\uc544\uc6c3 \ubb34\uc2dc
Image=\uadf8\ub9bc
ImplicitPoly=\uc74c\ud568\uc218 \uace1\uc120
IncircleOfTriangleABC=\uc0bc\uac01\ud615 %0%1%2 \uc758 \ub0b4\uc811\uc6d0
-IncludeJARFiles=*.jar \ud30c\uc77c \ud3ec\ud568
Increasing=\uc99d\uac00
IncreasingOnce=\uc99d\uac00 (1\ud68c)
Inequality=\ubd80\ub4f1\uc2dd
InflectionPointofA=%0 \uc758 \ubcc0\uace1\uc810
-InputFieldHelp=<html><body><p><b>\uc785\ub825\ucc3d \uc0ac\uc6a9\ubc95</b></p><table border="1"><tr><td>Enter </td><td>\uc785\ub825 \ub0b4\uc6a9 \uc2e4\ud589</td></tr><tr><td>Esc</td><td>\uc785\ub825\ucc3d \ub0b4\uc6a9\uc0ad\uc81c</td></tr><tr><td>↑</td><td>\uc774\uc804 \uc785\ub825 \ub0b4\uc6a9</td></tr><tr><td>↓</td><td>\ub2e4\uc74c \uc785\ub825 \ub0b4\uc6a9</td></tr><tr><td>F1</td><td>\ud604\uc7ac \uba85\ub839\uc5d0 \ub300\ud55c \ub3c4\uc6c0\ub9d0</td></tr></table><p><br><b>\uba85\ub839\uc5d0 \ub300\ud55c \uc790\ub3d9 \uc644\uc131\uae30\ub2a5</b><br>\uba85\ub839\uc758 \ucc98\uc74c 2\uae00\uc790\ub97c \uc785\ub825\ud558\uba74, <br> GeoGebra\uac00 \uc790\ub3d9\uc73c\ub85c \ub098\uba38\uc9c0 \uba85\ub839\uc744 \uc644\uc131\ud558\uc5ec \uc90d\ub2c8\ub2e4. </p><table border="1"><tr><td>Enter </td><td>\uc81c\uc548\ub41c \uba85\ub839 \uc785\ub825</td></tr><tr><td>\ub2e4\ub978 \uae00\uc790 \uc785\ub825</td><td>\uc81c\uc548\ub41c \uba85\ub839\uc744 \ubcc0\ud615\ud568</td></tr></table><body></html>
+InputFieldHelp=<html><body><p><b>\uc785\ub825\ucc3d \uc0ac\uc6a9\ubc95</b></p><table border="1"><tr><td>Enter </td><td>\uc785\ub825 \ub0b4\uc6a9 \uc2e4\ud589</td></tr><tr><td>Esc</td><td>\uc785\ub825\ucc3d \ub0b4\uc6a9\uc0ad\uc81c</td></tr><tr><td>\u2191</td><td>\uc774\uc804 \uc785\ub825 \ub0b4\uc6a9</td></tr><tr><td>\u2193</td><td>\ub2e4\uc74c \uc785\ub825 \ub0b4\uc6a9</td></tr><tr><td>F1</td><td>\ud604\uc7ac \uba85\ub839\uc5d0 \ub300\ud55c \ub3c4\uc6c0\ub9d0</td></tr></table><p><br><b>\uba85\ub839\uc5d0 \ub300\ud55c \uc790\ub3d9 \uc644\uc131\uae30\ub2a5</b><br>\uba85\ub839\uc758 \ucc98\uc74c 2\uae00\uc790\ub97c \uc785\ub825\ud558\uba74, <br> \uc9c0\uc624\uc9c0\ube0c\ub77c\uac00 \uc790\ub3d9\uc73c\ub85c \ub098\uba38\uc9c0 \uba85\ub839\uc744 \uc644\uc131\ud558\uc5ec \uc90d\ub2c8\ub2e4. </p><table border="1"><tr><td>Enter </td><td>\uc81c\uc548\ub41c \uba85\ub839 \uc785\ub825</td></tr><tr><td>\ub2e4\ub978 \uae00\uc790 \uc785\ub825</td><td>\uc81c\uc548\ub41c \uba85\ub839\uc744 \ubcc0\ud615\ud568</td></tr></table><body></html>
InputForm=\uc785\ub825 \ud3fc
InputLabel=\uc785\ub825
InputLabelToolTip=\uba85\ub839\uc744 \uc785\ub825\ud568
@@ -234,7 +231,7 @@ Interpolate=\ubcf4\uac04\ubc95\uc73c\ub85c \uadf8\ub9ac\uae30
IntersectingLines=\uad50\ucc28\ud558\ub294 \uc9c1\uc120
IntersectionCurveOfAB=%0, %1 \uc774 \uad50\ucc28\ud558\ub294 \uace1\uc120
IntersectionLineOfAB=%0, %1 \uc774 \uad50\ucc28\ud558\ub294 \uc9c1\uc120
-IntersectionPathsOfAB=%0, %1 \uc774 \uad50\ucc28\ud558\ub294 \uacbd\ub85c
+IntersectionOfAandB=%0, %1 \uc758 \uad50\uc810
IntersectionPointOfAB=%0, %1 \uc758 \uad50\uc810
IntersectionPointOfABNearC=%0, %1 \uc758 \uad50\uc810 \uac00\uc6b4\ub370 %2 \uc5d0 \uac00\uae4c\uc6b4 \uc810
IntersectionPointOfABWithInitialValueC=\ucd08\uae30\uac12 %2 \uc744(\ub97c) \uac00\uc9c0\uace0, %0, %1 \uc758 \uad50\uc810
@@ -246,7 +243,7 @@ Keyboard=\ud0a4\ubcf4\ub4dc
LaTeXFormula=LaTeX \uc218\uc2dd
LaTeXHelp=LaTeX \ub3c4\uc6c0\ub9d0
Large=\ud06c\uac8c
-LatexFontSize=\ubb38\uc11c \ud3f0\ud2b8 \uc0ac\uc774\uc988:
+LatexFontSize=\ubb38\uc11c \uae00\uaf34 \ud06c\uae30:
Layer=\ub808\uc774\uc5b4
Length=\uae38\uc774
LengthOfA=%0 \uc758 \uae38\uc774
@@ -327,12 +324,6 @@ PerspectiveName=\ub3c4\uad6c\uc0c1\uc790\uad6c\uc131 \uc774\ub984
Picture=\uadf8\ub9bc
PictureHeight=\ub192\uc774
PictureWidth=\ud3ed
-PlaneA=\ud3c9\uba74 %0
-PlaneContainingA=%0 \uc744 \ud3ec\ud568\ud558\ub294 \ud3c9\uba74
-PlaneFromA=%0 \uc73c\ub85c\ubd80\ud130 \ub9cc\ub4e4\uc5b4\uc9c4 \ud3c9\uba74
-PlaneThroughAB=%0, %1 \uc744(\ub97c) \uc9c0\ub098\ub294 \ud3c9\uba74
-PlaneThroughABC=%0, %1, %2 \uc744(\ub97c) \uc9c0\ub098\ub294 \ud3c9\uba74
-PlaneThroughAParallelToB=%1 \uc5d0 \ud3c9\ud589\ud558\uace0, %0 \uc744(\ub97c) \uc9c0\ub098\ub294 \ud3c9\uba74
Play=\uc2e4\ud589
PlayButton=\uc2e4\ud589 \ubc84\ud2bc
Point=\uc810
@@ -377,7 +368,7 @@ RootOfA=%0 \uc758 \uadfc
RootOfAWithInitialValueB=\ucd08\uae30\uac12 %1 \uc744(\ub97c) \uac00\uc9c0\ub294 %0 \uc758 \uadfc
RootOfAonIntervalBC=\uad6c\uac04[ %1, %2 ] \uc704\uc758 %0 \uc758 \uadfc
ScaleInCentimeter=\ube44\uc728(cm, \uadf8\ub9bc:\uc6d0\ubcf8)
-Script=GeoGebra \uc2a4\ud06c\ub9bd\ud2b8
+Script=\uc9c0\uc624\uc9c0\ube0c\ub77c \uc2a4\ud06c\ub9bd\ud2b8
Scripting=\uc2a4\ud06c\ub9bd\ud2b8
SecondAxisLengthOfA=%0\uc758 \ub458\uc9f8\ucd95\uc758 \uae38\uc774
SecondAxisOfA=%0 \uc758 \ub458\uc9f8\ucd95
@@ -441,8 +432,8 @@ Thickness=\uc120 \uad75\uae30
TickDistance=\uac70\ub9ac
TimeBetweenFrames=\ud504\ub808\uc784 \ub2f9 \uc2dc\uac04
Title=\uc81c\ubaa9
-TitleExportPgf=GeoGebra \ub97c PGF\ub85c \ub0b4\ubcf4\ub0b4\uae30
-TitleExportPstricks=GeoGebra \ub97c PSTricks\ub85c \ub0b4\ubcf4\ub0b4\uae30
+TitleExportPgf=\uc9c0\uc624\uc9c0\ube0c\ub77c\ub97c PGF\ub85c \ub0b4\ubcf4\ub0b4\uae30
+TitleExportPstricks=\uc9c0\uc624\uc9c0\ube0c\ub77c\ub97c PSTricks\ub85c \ub0b4\ubcf4\ub0b4\uae30
ToggleStyleBar=\uc2a4\ud0c0\uc77c \ubc14 \ucf1c\uae30 / \ub044\uae30
ToolbarIcon=\ub3c4\uad6c \uc544\uc774\ucf58
ToolbarIconsConstructionProtocolExport=\ub3c4\uad6c \uc544\uc774\ucf58 \ub098\ud0c0\ub0b4\uae30
@@ -466,7 +457,7 @@ Up=\uc704\ub85c
Upload=\uc5c5\ub85c\ub4dc
UploadError=\uc9c0\uc624\uc9c0\ube0c\ub77c\ud29c\ube0c\uc5d0 \uc811\uadfc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \uc5c5\ub85c\ub4dc \uc2e4\ud328. (\uc624\ub958 \ucf54\ub4dc: %0)
UploadPrepare=\uc5c5\ub85c\ub4dc \uc900\ube44
-UseJavaFontsForLaTeX=LaTeX \ud14d\uc2a4\ud2b8\uc5d0 \ub300\ud558\uc5ec \uc790\ubc14 \ud3f0\ud2b8\ub97c \uc0ac\uc6a9\ud568
+UseJavaFontsForLaTeX=LaTeX \ud14d\uc2a4\ud2b8\uc5d0 \ub300\ud558\uc5ec \uc790\ubc14 \uae00\uaf34\uc744 \uc0ac\uc6a9\ud568
Value=\uac12
Vector=\ubca1\ud130
VectorPerpendicularToA=%0 \uc5d0 \uc218\uc9c1\uc778 \ubca1\ud130
@@ -537,7 +528,7 @@ stylebar.AlignLeft=\uc67c\ucabd \uc815\ub82c
stylebar.AlignRight=\uc624\ub978\ucabd \uc815\ub82c
stylebar.Axes=\ucd95 \ubcf4\uc774\uae30 / \uc228\uae30\uae30
stylebar.BgColor=\ubc30\uacbd\uc0c9\uc0c1 \uc124\uc815
-stylebar.Bold=\ud3f0\ud2b8\ub97c \uad75\uac8c \uc124\uc815
+stylebar.Bold=\uae00\uaf34\uc744 \uad75\uac8c \uc124\uc815
stylebar.Border=\uacbd\uacc4 \uc124\uc815
stylebar.Bracket=\uad04\ud638 \uc2a4\ud0c0\uc77c \uc124\uc815
stylebar.Caption=\ucea1\uc158 \uc2a4\ud0c0\uc77c \uc124\uc815
@@ -549,7 +540,7 @@ stylebar.Eraser=\ud39c \uadf8\ub9bc \uc9c0\uc6b0\uae30
stylebar.Grid=\uaca9\uc790 \ubcf4\uc774\uae30 / \uc228\uae30\uae30
stylebar.Hidden=\uc228\uae30\uae30
stylebar.HorizontalLine=\uc218\ud3c9 \uc9c1\uc120 \ubcf4\uc774\uae30 / \uc228\uae30\uae30
-stylebar.Italic=\ud3f0\ud2b8 \uc2a4\ud0c0\uc77c\uc744 \uc774\ud0e4\ub9ad\uc73c\ub85c \uc124\uc815
+stylebar.Italic=\uae00\uaf34 \uc2a4\ud0c0\uc77c\uc744 \uc774\ud0e4\ub9ad\uc73c\ub85c \uc124\uc815
stylebar.Label=\ub808\uc774\ube14 \uc2a4\ud0c0\uc77c \uc124\uc815
stylebar.LineStyle=\uc120 \uc2a4\ud0c0\uc77c \uc124\uc815
stylebar.Pen=\ud39c\uc73c\ub85c \uadf8\ub9ac\uae30
diff --git a/geogebra/properties/plain_lt.properties b/geogebra/properties/plain_lt.properties
index dcb47fe..f229fa9 100644
--- a/geogebra/properties/plain_lt.properties
+++ b/geogebra/properties/plain_lt.properties
@@ -1,5 +1,3 @@
-2x2Matrix=2x2 matrica
-3x3Matrix=3x3 matrica
ADecimalPlace=%0 skai\u010dius po kablelio
ADecimalPlaces=%0 skai\u010di\u0173 po kablelio
ADerivativeOfB=%0 laipsnio %1 i\u0161vestin\u0117
@@ -33,6 +31,7 @@ AisaDegenerateBranchOfB=%0 yra i\u0161sigimusi %1 \u0161aka
AisaTangentToB=%0 yra %1 liestin\u0117
AliesOnB=%0 yra ant %1
AliesOnThePerimeterOfB=%0 yra ant %1 perimetro
+AllowOfflineUse=\u012etraukti *.jar dokumentus
Altitude=Auk\u0161tis
Angle=Kampas
AngleBetweenAB=Kampas tarp %0 ir %1
@@ -208,7 +207,6 @@ IgnoreDocumentLayout=Ignoruoti dokumento i\u0161d\u0117stym\u0105
Image=Vaizdas
ImplicitPoly=Numanoma kreiv\u0117
IncircleOfTriangleABC=\u012ebr\u0117\u017eti trikamp\u012f %0%1%2
-IncludeJARFiles=\u012etraukti *.jar dokumentus
Increasing=Did\u0117janti
IncreasingOnce=Didinama (vien\u0105 kart\u0105)
Inequality=Nelygyb\u0117
@@ -227,7 +225,7 @@ Interpolate=Pie\u0161ti su interpoliacija
IntersectingLines=Susikertan\u010dios ties\u0117s
IntersectionCurveOfAB=Susikertanti kreiv\u0117 %0, %1
IntersectionLineOfAB=Susikertanti ties\u0117 %0, %1
-IntersectionPathsOfAB=Susikertantys keliai %0, %1
+IntersectionOfAandB=Susikertantys keliai %0, %1
IntersectionPointOfAB=%0, %1 susikirtimo ta\u0161kas
IntersectionPointOfABNearC=%0 susikirtimo ta\u0161kas, %1 \u0161alia %2
IntersectionPointOfABWithInitialValueC=%0, %1 susikirtimo ta\u0161kas su pradine verte %2
@@ -322,12 +320,6 @@ PerspectiveName=Perspektyvos pavadinimas
Picture=Paveiksl\u0117lis
PictureHeight=Paveiksl\u0117lio auk\u0161tis
PictureWidth=Paveiksl\u0117lio plotis
-PlaneA=plok\u0161tuma %0
-PlaneContainingA=Plok\u0161tuma apimanti %0
-PlaneFromA=plok\u0161tuma sukurta nuo %0
-PlaneThroughAB=Plok\u0161tuma per %0, %1
-PlaneThroughABC=Plok\u0161tuma per %0, %1, %2
-PlaneThroughAParallelToB=Plok\u0161tuma per %0 lygiagreti %1
Play=Paleisti
PlayButton=Paleidimo mygtukas
Point=Ta\u0161kas
diff --git a/geogebra/properties/plain_mk.properties b/geogebra/properties/plain_mk.properties
index 4e2c424..06598b9 100644
--- a/geogebra/properties/plain_mk.properties
+++ b/geogebra/properties/plain_mk.properties
@@ -1,5 +1,3 @@
-2x2Matrix=2x2 \u043c\u0430\u0442\u0440\u0438\u0446\u0430
-3x3Matrix=3x3 \u043c\u0430\u0442\u0440\u0438\u0446\u0430
ADecimalPlace=%0 \u0434\u0435\u0446\u0438\u043c\u0430\u043b\u043d\u043e \u043c\u0435\u0441\u0442\u043e
ADecimalPlaces=%0 \u0434\u0435\u0446\u0438\u043c\u0430\u043b\u043d\u0438 \u043c\u0435\u0441\u0442\u0430
ADerivativeOfB=%0 \u0438\u0437\u0432\u043e\u0434 \u043e\u0434 %1
@@ -35,6 +33,7 @@ Algebra=\u0410\u043b\u0433\u0435\u0431\u0440\u0430
AlgebraWindow=\u0410\u043b\u0433\u0435\u0431\u0430\u0440\u0441\u043a\u0438 \u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446
AliesOnB=%0 \u043b\u0435\u0436\u0438 \u043d\u0430 %1
AliesOnThePerimeterOfB=%0 \u043b\u0435\u0436\u0438 \u043d\u0430 \u0433\u0440\u0430\u043d\u0438\u0446\u0430\u0442\u0430 \u043e\u0434 %1
+AllowOfflineUse=\u0412\u043a\u043b\u0443\u0447\u0438 jar \u0444\u0430\u0458\u043b\u043e\u0432\u0438
AllowStyleBar=\u041b\u0435\u043d\u0442\u0430\u0442\u0430 \u0437\u0430 \u0421\u0442\u0438\u043b \u0438 \u041e\u0432\u043e\u0437\u043c\u043e\u0436\u0435\u043d\u0430
Alt=\u041a\u043e\u043f\u0447\u0435\u0442\u043e Alt
AltGr=\u041a\u043e\u043f\u0447\u0435\u0442\u043e AltGr
@@ -218,7 +217,6 @@ IgnoreDocumentLayout=\u0417\u0430\u043d\u0435\u043c\u0430\u0440\u0438 \u0433\u04
Image=\u0421\u043b\u0438\u043a\u0430
ImplicitPoly=\u0418\u043c\u043f\u043b\u0438\u0446\u0438\u0442\u043d\u0430 \u043a\u0440\u0438\u0432\u0430
IncircleOfTriangleABC=\u0412\u043f\u0438\u0448\u0430\u043d\u0430 \u043a\u0440\u0443\u0436\u043d\u0438\u0446\u0430 \u0432\u043e \u0442\u0440\u0438\u0430\u0433\u043e\u043b\u043d\u0438\u043a %0%1%2
-IncludeJARFiles=\u0412\u043a\u043b\u0443\u0447\u0438 jar \u0444\u0430\u0458\u043b\u043e\u0432\u0438
Increasing=\u0420\u0430\u0441\u0442\u0435
IncreasingOnce=\u0417\u0433\u043e\u043b\u0435\u043c\u0443\u0432\u0430\u045a\u0435 (\u0417\u0430 \u0435\u0434\u0435\u043d)
Inequality=\u041d\u0435\u0440\u0430\u0432\u0435\u043d\u0441\u0442\u0432\u043e
@@ -237,7 +235,7 @@ Interpolate=\u0426\u0440\u0442\u0430\u0458 \u0441\u043e \u0438\u043d\u0442\u0435
IntersectingLines=\u041f\u0440\u0430\u0432\u0438 \u043a\u043e\u0438 \u0441\u0435 \u0441\u0435\u0447\u0430\u0442
IntersectionCurveOfAB=\u041f\u0440\u0435\u0441\u0435\u0447\u043d\u0430 \u043a\u0440\u0438\u0432\u0430 \u0437\u0430 %0 \u0438 %1
IntersectionLineOfAB=\u041f\u0440\u0435\u0441\u0435\u0447\u043d\u0430 \u043f\u0440\u0430\u0432\u0430 \u0437\u0430 %0 \u0438 %1
-IntersectionPathsOfAB=\u041f\u0440\u0435\u0441\u0435\u0447\u043d\u0438 \u043f\u0430\u0442\u0435\u043a\u0438 \u0437\u0430 %0 \u0438 %1
+IntersectionOfAandB=\u041f\u0440\u0435\u0441\u0435\u0447\u043d\u0438 \u043f\u0430\u0442\u0435\u043a\u0438 \u0437\u0430 %0 \u0438 %1
IntersectionPointOfAB=\u041f\u0440\u0435\u0441\u0435\u0447\u043d\u0430 \u0442\u043e\u0447\u043a\u0430 \u0437\u0430 %0 \u0438 %1
IntersectionPointOfABNearC=\u041f\u0440\u0435\u0441\u0435\u0447\u043d\u0430 \u0442\u043e\u0447\u043a\u0430 \u0437\u0430%0 \u0438 %1 \u0431\u043b\u0438\u0441\u043a\u0443 \u0434\u043e \u0442\u043e\u0447\u043a\u0430 %2
IntersectionPointOfABWithInitialValueC=\u041f\u0440\u0435\u0441\u0435\u0447\u043d\u0430 \u0442\u043e\u0447\u043a\u0430 \u0437\u0430 %0 \u0438 %1 \u0441\u043e \u043f\u043e\u0447\u0435\u0442\u043d\u0430 \u0432\u0440\u0435\u0434\u043d\u043e\u0441\u0442 %2
@@ -331,12 +329,6 @@ PerspectiveName=\u0418\u043c\u0435 \u043d\u0430 \u043f\u0435\u0440\u0441\u043f\u
Picture=\u0421\u043b\u0438\u043a\u0430
PictureHeight=\u0412\u0438\u0441\u0438\u043d\u0430 \u043d\u0430 \u0441\u043b\u0438\u043a\u0430\u0442\u0430
PictureWidth=\u0428\u0438\u0440\u0438\u043d\u0430 \u043d\u0430 \u0441\u043b\u0438\u043a\u0430\u0442\u0430
-PlaneA=\u0440\u0430\u043c\u043d\u0438\u043d\u0430 %0
-PlaneContainingA=\u0420\u0430\u043c\u043d\u0438\u043d\u0430 \u0441\u043e\u0434\u0440\u0436\u0438 %0
-PlaneFromA=\u0440\u0430\u043c\u043d\u0438\u043d\u0430 \u043a\u0440\u0435\u0438\u0440\u0430\u043d\u0430 \u043e\u0434 %0
-PlaneThroughAB=\u0420\u0430\u043c\u043d\u0438\u043d\u0430 \u043d\u0438\u0437 %0 \u0438 %1
-PlaneThroughABC=\u0420\u0430\u043c\u043d\u0438\u043d\u0430 \u043d\u0438\u0437 %0, %1 \u0438 %2
-PlaneThroughAParallelToB=\u0420\u0430\u043c\u043d\u0438\u043d\u0430 \u043d\u0438\u0437 %0 \u043f\u0430\u0440\u0430\u043b\u0435\u043b\u043d\u0430 \u043d\u0430 %1
Play=\u0421\u0442\u0430\u0440\u0442\u0443\u0432\u0430\u0458
PlayButton=\u041a\u043e\u043f\u0447\u0435 \u0437\u0430 \u0441\u0442\u0430\u0440\u0442\u0443\u0432\u0430\u045a\u0435
Point=\u0422\u043e\u0447\u043a\u0430
diff --git a/geogebra/properties/plain_mr.properties b/geogebra/properties/plain_mr.properties
index 1216f80..8f9086a 100644
--- a/geogebra/properties/plain_mr.properties
+++ b/geogebra/properties/plain_mr.properties
@@ -1,5 +1,3 @@
-2x2Matrix=2x2 \u0938\u093e\u0930\u0923\u0940 (matrix)
-3x3Matrix=3x3 \u0938\u093e\u0930\u0923\u0940 (matrix)
ADecimalPlace=%0 \u0926\u0936\u093e\u0902\u0936 \u0938\u094d\u0925\u093e\u0928
ADecimalPlaces=%0\u0926\u0936\u093e\u0902\u0936 \u0938\u094d\u0925\u093e\u0928
ADerivativeOfB=%0 \u0918\u093e\u0924\u093e\u090f\u0935\u0922\u0940 %1 \u091a\u093e \u093f\u0935\u0915\u0932\u091c (derivative)
diff --git a/geogebra/properties/plain_ms.properties b/geogebra/properties/plain_ms.properties
index 0cc84a4..6a098d2 100644
--- a/geogebra/properties/plain_ms.properties
+++ b/geogebra/properties/plain_ms.properties
@@ -1,5 +1,3 @@
-2x2Matrix=matriks 2x2
-3x3Matrix=matriks 3x3
ADecimalPlace=%0 Tempat Perpuluhan
ADecimalPlaces=%0 Tempat Perpuluhan
ADerivativeOfB=Terbitan ke %0 bagi %1
@@ -33,6 +31,7 @@ AisaDegenerateBranchOfB=%0 ialah satu cabang merosot dari %1
AisaTangentToB=%0 ialah tangen kepada %1
AliesOnB=%0 terletak pada %1
AliesOnThePerimeterOfB=%0 terletak pada perimeter %1
+AllowOfflineUse=Termasuk Fail-fail jar
Altitude=Altitud
Angle=Sudut
AngleBetweenAB=Sudut antara %0, %1
@@ -202,7 +201,6 @@ IgnoreDocumentLayout=Abaikan Tataletak Dokumen
Image=Imej
ImplicitPoly=Lengkung Tersirat
IncircleOfTriangleABC=Bulatan dalam bagi segitiga %0%1%2
-IncludeJARFiles=Termasuk Fail-fail jar
Increasing=Menokok
IncreasingOnce=Menokok (Sekali)
Inequality=Ketaksamaan
@@ -219,7 +217,7 @@ Interpolate=Lukis dengan interpolasi
IntersectingLines=Garis-garis bersilang
IntersectionCurveOfAB=Persilangan lengkung %0, %1
IntersectionLineOfAB=Persilangan garis %0, %1
-IntersectionPathsOfAB=Persilangan laluan-laluan %0, %1
+IntersectionOfAandB=Persilangan laluan-laluan %0, %1
IntersectionPointOfAB=Titik persilangan %0, %1
IntersectionPointOfABNearC=Titik persilangan %0, %1 dekat titik %2
IntersectionPointOfABWithInitialValueC=Titik persilangan %0, %1 dengan nilai awal %2
@@ -307,12 +305,6 @@ PerspectiveName=Nama Perspektif
Picture=Gambar
PictureHeight=Tinggi gambar
PictureWidth=Lebar gambar
-PlaneA=satah %0
-PlaneContainingA=Satah mengandungi %0
-PlaneFromA=satah dicipta daripada %0
-PlaneThroughAB=Satah melalui %0, %1
-PlaneThroughABC=Satah melalui %0, %1, %2
-PlaneThroughAParallelToB=Satah melalui %0 selari dengan %1
Play=Main
PlayButton=Butang main
Point=Titik
diff --git a/geogebra/properties/plain_ne.properties b/geogebra/properties/plain_ne.properties
index 30c5d65..54e3221 100644
--- a/geogebra/properties/plain_ne.properties
+++ b/geogebra/properties/plain_ne.properties
@@ -1,64 +1,60 @@
-2x2Matrix=\u0968x\u0968 \u092e\u094d\u092f\u093e\u091f\u094d\u0930\u0940\u0915\u094d\u0938
-3x3Matrix=\u0969x\u0969 \u092e\u094d\u092f\u093e\u091f\u094d\u0930\u0940\u0915\u094d\u0938
ADecimalPlace=%0 \u0926\u0936\u092e\u0932\u092c \u0938\u094d\u0925\u093e\u0928
ADecimalPlaces=%0 \u0926\u0936\u092e\u0932\u092c \u0938\u094d\u0925\u093e\u0928\u0939\u0930\u0941
-ADerivativeOfB=%0 derivative of %1\n\u0921\u0947\u0930\u0940\u092d\u0947\u091f\u093f\u092d
-ADilatedByFactorBfromC=%0 \u0928\u093e\u092a\u094b\u0926\u094d\u0927\u0930\u093e \u0921\u0940\u0932\u093f\u0938\u0928 %\u0967 \u092c\u093e\u091f %\u0968
-ADoesNotIntersectWithB=%0 \u0932\u0947 %\u0967 \u0938\u093f\u0924 \u092a\u094d\u0930\u0924\u093f\u091b\u094d\u0926\u0947\u0928 \u0917\u0930\u094d\u0926\u0948\u0928\u094d
-AIntersectsWithB=%0 \u0915\u094b %\u0967 \u0938\u093f\u0924 \u092a\u094d\u0930\u0924\u093f\u091b\u094d\u0926\u0947\u0928AMirroredAtB=%0 \u0915\u094b %\u0967 \u092e\u093e \u092a\u0930\u093e\u0930\u094d\u0935\u0924\u0928
-AMirroredAtB=%0 mirrored at %1\n\u092a\u0930\u093e\u0935\u0930\u094d\u0924\u0928
-ARotatedByAngleB=%\u0967 \u0915\u093f\u0923 \u0926\u094d\u0927\u0935\u093e\u0930\u093e %0 \u092a\u0930\u093f\u0915\u094d\u0930\u092e\u0923
+ADerivativeOfB=\u0921\u0947\u0930\u0940\u092d\u0947\u091f\u093f\u092d
+ADilatedByFactorBfromC=%0 \u0928\u093e\u092a\u094b\u0926\u094d\u0927\u0930\u093e \u0921\u0940\u0932\u093f\u0938\u0928 %1 \u092c\u093e\u091f %2
+ADoesNotIntersectWithB=%0 \u0932\u0947 %1 \u0938\u093f\u0924 \u092a\u094d\u0930\u0924\u093f\u091b\u094d\u0926\u0947\u0928 \u0917\u0930\u094d\u0926\u0948\u0928\u094d
+AIntersectsWithB=%0 \u0915\u094b %1 \u0938\u093f\u0924 \u092a\u094d\u0930\u0924\u093f\u091b\u094d\u0926\u0947\u0928
+AMirroredAtB=\u092a\u0930\u093e\u0935\u0930\u094d\u0924\u0928
+ARotatedByAngleB=%1 \u0915\u093f\u0923 \u0926\u094d\u0927\u0935\u093e\u0930\u093e %0 \u092a\u0930\u093f\u0915\u094d\u0930\u092e\u0923
ASignificantFigure=%0 \u0909\u0932\u094d\u0932\u0947\u0916\u0928\u093f\u092f\u094d \u091a\u093f\u0924\u094d\u0930
ASignificantFigures=%0 \u0909\u0932\u094d\u0932\u0947\u0916\u0928\u093f\u092f\u094d \u091a\u093f\u0924\u094d\u0930\u0939\u0930\u0941
-AandBareEqual=%0 \u0930 %\u0967 \u092c\u0930\u093e\u092c\u0930 \u091b\u0928\u094d
-AandBareLinearlyDependent=%0 \u0930 %\u0967 \u0932\u093f\u0928\u0940\u092f\u0930\u0932\u093f \u0906\u0936\u094d\u0930\u0940\u0924 \u091b\u0928\u094d
-AandBareLinearlyIndependent=%0 \u0930 %\u0967 \u0932\u093f\u0928\u0940\u092f\u0930\u0932\u093f \u0938\u094d\u0935\u093e\u0924\u0902\u0928\u094d\u0924\u094d\u0930 \u091b\u0928\u094d
-AandBareNotEqual=%0 \u0930 %\u0967 \u092c\u0930\u093e\u092c\u0930 \u091b\u0948\u0928\u0928\u094d
-AandBareParallel=%0 \u0930 %\u0967 \u0938\u092e\u093e\u0928\u094d\u0928\u0924\u0930 \u091b\u0928\u094d
-AandBarePerpendicular=%0 \u0930 %\u0967 \u0932\u092e\u094d\u092c \u091b\u0928\u094d
-AandBcannotBeCompared=%0 \u0930 %\u0967 \u0924\u0941\u0932\u0928\u093e \u0917\u0930\u094d\u0928 \u0938\u0915\u093f\u0926\u0948\u0928\u094d
+AandBareEqual=%0 \u0930 %1 \u092c\u0930\u093e\u092c\u0930 \u091b\u0928\u094d
+AandBareLinearlyDependent=%0 \u0930 %1 \u0932\u093f\u0928\u0940\u092f\u0930\u0932\u093f \u0906\u0936\u094d\u0930\u0940\u0924 \u091b\u0928\u094d
+AandBareLinearlyIndependent=%0 \u0930 %1 \u0932\u093f\u0928\u0940\u092f\u0930\u0932\u093f \u0938\u094d\u0935\u093e\u0924\u0902\u0928\u094d\u0924\u094d\u0930 \u091b\u0928\u094d
+AandBareNotEqual=%0 \u0930 %1 \u092c\u0930\u093e\u092c\u0930 \u091b\u0948\u0928\u0928\u094d
+AandBareParallel=%0 \u0930 %1 \u0938\u092e\u093e\u0928\u094d\u0928\u0924\u0930 \u091b\u0928\u094d
+AandBarePerpendicular=%0 \u0930 %1 \u0932\u092e\u094d\u092c \u091b\u0928\u094d
+AandBcannotBeCompared=%0 \u0930 %1 \u0924\u0941\u0932\u0928\u093e \u0917\u0930\u094d\u0928 \u0938\u0915\u093f\u0926\u0948\u0928\u094d
AbsoluteScreenLocation=\u092a\u0930\u094d\u0926\u093e\u092e\u093e \u092a\u0941\u0930\u094d\u0923 \u0905\u0935\u0938\u094d\u0925\u093e
-AdoesNotLieOnB=%\u0967 \u092e\u093e %0 \u0930\u0939\u0926\u0948\u0928\u094d
-AdoesNotLieOnThePerimeterOfB=%\u0967 \u092a\u0930\u093f\u0927\u093f\u092e\u093e %0 \u0930\u0939\u0926\u0948\u0928\u094d
-AdoesNothaveTheSameAreaAsB=%0 \u0930 %\u0967 \u0915\u094d\u0937\u0947\u0924\u094d\u0930\u092b\u0932 \u092c\u0930\u093e\u092c\u0930 \u091b\u0948\u0928\u094d
-AdoesNothaveTheSameLengthAsB=%0 \u0930 %\u0967 \u090f\u0909\u091f\u0948 \u0932\u092e\u094d\u092c\u093e\u0908 \u091b\u0948\u0928\u094d
-AhasTheSameAreaAsB=%0 \u0930 %\u0967 \u0915\u094d\u0937\u0947\u0924\u094d\u0930\u092b\u0932 \u092c\u0930\u093e\u092c\u0930 \u091b
-AhasTheSameLengthAsB=%0 \u0930 %\u0967 \u0932\u092e\u094d\u092c\u093e\u0908 \u092c\u0930\u093e\u092c\u0930 \u091b
-AintersectsWithBOnce=%0 \u0932\u0947 %\u0967 \u0938\u0917 \u090f\u0915\u092a\u091f\u0915 \u092a\u094d\u0930\u0924\u093f\u091b\u0947\u091a\u094d\u0926\u0928 \u0917\u0930\u094d\u091b
-AintersectsWithBTwice=%0 \u0932\u0947 %\u0967 \u0938\u0917 \u0926\u0941\u0908\u092a\u091f\u0915 \u092a\u094d\u0930\u0924\u093f\u091b\u0947\u091a\u094d\u0926\u0928 \u0917\u0930\u094d\u091b
-AisAnAsymptoteToB=%\u0967\u0915\u094b \u0905\u0928\u094d\u0928\u0924\u0938\u094d\u092a\u0930\u094d\u0936\u0930\u0947\u0916\u093e %0 \u0939\u094bAisNotDefined=%0 \u0905\u092a\u0930\u093f\u092d\u093e\u0937\u093f\u0924 \u091b\u094d
-AisNotDefined=%0 is not defined\n\u0905\u092a\u0930\u093f\u092d\u093e\u0938\u0940\u0924
-AisaDegenerateBranchOfB=%\u0967 \u0915\u094b \u0928\u093e\u0936 \u0939\u0941\u0928\u0947\u092d\u093e\u0917 %0 \u0939\u094b
-AisaTangentToB=%\u0967 \u0915\u094b \u0938\u094d\u092a\u0930\u094d\u0936\u093f\u0930\u0947\u0916\u093e %0 \u0939\u094b
+AdoesNotLieOnB=%1 \u092e\u093e %0 \u0930\u0939\u0926\u0948\u0928\u094d
+AdoesNotLieOnThePerimeterOfB=%1 \u092a\u0930\u093f\u0927\u093f\u092e\u093e %0 \u0930\u0939\u0926\u0948\u0928\u094d
+AdoesNothaveTheSameAreaAsB=%0 \u0930 %1 \u0915\u094d\u0937\u0947\u0924\u094d\u0930\u092b\u0932 \u092c\u0930\u093e\u092c\u0930 \u091b\u0948\u0928\u094d
+AdoesNothaveTheSameLengthAsB=%0 \u0930 %1 \u090f\u0909\u091f\u0948 \u0932\u092e\u094d\u092c\u093e\u0908 \u091b\u0948\u0928\u094d
+AhasTheSameAreaAsB=%0 \u0930 %1 \u0915\u094d\u0937\u0947\u0924\u094d\u0930\u092b\u0932 \u092c\u0930\u093e\u092c\u0930 \u091b
+AhasTheSameLengthAsB=%0 \u0930 %1 \u0932\u092e\u094d\u092c\u093e\u0908 \u092c\u0930\u093e\u092c\u0930 \u091b
+AintersectsWithBOnce=%0 \u0932\u0947 %1 \u0938\u0917 \u090f\u0915\u092a\u091f\u0915 \u092a\u094d\u0930\u0924\u093f\u091b\u0947\u091a\u094d\u0926\u0928 \u0917\u0930\u094d\u091b
+AintersectsWithBTwice=%0 \u0932\u0947 %1 \u0938\u0917 \u0926\u0941\u0908\u092a\u091f\u0915 \u092a\u094d\u0930\u0924\u093f\u091b\u0947\u091a\u094d\u0926\u0928 \u0917\u0930\u094d\u091b
+AisAnAsymptoteToB=%1\u0915\u094b \u0905\u0928\u094d\u0928\u0924\u0938\u094d\u092a\u0930\u094d\u0936\u0930\u0947\u0916\u093e %0 \u0939\u094b
+AisNotDefined=\u0905\u092a\u0930\u093f\u092d\u093e\u0938\u0940\u0924
+AisaDegenerateBranchOfB=%1 \u0915\u094b \u0928\u093e\u0936 \u0939\u0941\u0928\u0947\u092d\u093e\u0917 %0 \u0939\u094b
+AisaTangentToB=%1 \u0915\u094b \u0938\u094d\u092a\u0930\u094d\u0936\u093f\u0930\u0947\u0916\u093e %0 \u0939\u094b
Algebra=\u092c\u0940\u091c\u0917\u0923\u093f\u0924
AlgebraWindow=\u092c\u0940\u091c\u0917\u0923\u093f\u0924 \u0926\u0943\u0937\u094d\u092f
AliesOnB=%0 \u092e\u093e \u092a\u0930\u094d\u0926\u091b %1
-AliesOnThePerimeterOfB=%0 \u092a\u0930\u093f\u092e\u093f\u0924\u093f\u0915\u094b %\u0967 \u092e\u093e \u0930\u0939\u0928\u094d\u091bAngle=\u0915\u094b\u0923
-AllowStyleBar=Style Bar is Allowed\n\u092c\u093e\u0930 \u0936\u0948\u0932 \u0928\u093f\u0938\u0947\u0927\u093f\u0924 \u091b\u0948\u0928
-Alt=Alt\nAlt
-AltGr=AltG\nAltG
-Altitude=Altitude\n\u090a\u091a\u093e\u0908
-Angle=Angle\n\u0915\u094b\u0923
-AngleBetweenAB=\u0915\u094b\u0923\u092c\u0940\u091a\u0915\u094b %0, %\u0967
-AngleBetweenABC=\u0915\u094b\u0923\u092c\u0940\u091a\u0915\u094b %0, %\u0967, %\u0968
-AngleBetweenABCofD=\u0915\u094b\u0923\u092c\u0940\u091a\u0915\u094b %0, %\u0967, %\u0968 \u0915\u094b %\u0969
-AngleBisectorOfAB=%0, %\u0967 \u0915\u094b \u0915\u094b\u0923\u0915\u094b \u0905\u0930\u094d\u0927\u0915\u094d
-AngleBisectorOfABC=%0, %\u0967,%\u0968 \u0915\u094b \u0915\u094b\u0923\u0915\u094b \u0905\u0930\u094d\u0927\u0915\u094d
+AliesOnThePerimeterOfB=%0 \u092a\u0930\u093f\u092e\u093f\u0924\u093f\u0915\u094b %1 \u092e\u093e \u0930\u0939\u0928\u094d\u091b
+AllowStyleBar=\u092c\u093e\u0930 \u0936\u0948\u0932 \u0928\u093f\u0938\u0947\u0927\u093f\u0924 \u091b\u0948\u0928
+Altitude=\u090a\u091a\u093e\u0908
+Angle=\u0915\u094b\u0923
+AngleBetweenAB=\u0915\u094b\u0923\u092c\u0940\u091a\u0915\u094b %0, %1
+AngleBetweenABC=\u0915\u094b\u0923\u092c\u0940\u091a\u0915\u094b %0, %1, %2
+AngleBetweenABCofD=\u0915\u094b\u0923\u092c\u0940\u091a\u0915\u094b %0, %1, %2 \u0915\u094b %3
+AngleBisectorOfAB=%0, %1 \u0915\u094b \u0915\u094b\u0923\u0915\u094b \u0905\u0930\u094d\u0927\u0915\u094d
+AngleBisectorOfABC=%0, %1,%2 \u0915\u094b \u0915\u094b\u0923\u0915\u094b \u0905\u0930\u094d\u0927\u0915\u094d
AngleOfA=%0 \u0915\u094b \u0915\u094b\u0923
Angles=\u0915\u094b\u0923\u0939\u0930\u0941
-AnimatedGIFExport=Animated GIF Export\n\u090f\u0928\u093f\u092e\u0947\u091f\u0947\u0921 GIF \u0932\u094d\u092f\u093e\u0909\u0928\u0941
+AnimatedGIFExport=\u090f\u0928\u093f\u092e\u0947\u091f\u0947\u0921 GIF \u0932\u094d\u092f\u093e\u0909\u0928\u0941
Animating=\u0938\u0902\u091c\u0940\u0935\u0924\u093e \u0935\u093e \u0938\u094d\u0935\u093e\u091a\u093e\u0932\u093f\u0924 \u0930\u0939\u0928\u0941
Animation=\u0938\u0902\u091c\u0940\u0935\u0924\u093e \u0935\u093e \u0938\u094d\u0935\u093e\u091a\u093e\u0932\u093f\u0924
AnimationSpeed=\u0917\u0924\u093f
AnimationStep=\u0935\u0943\u0926\u094d\u0927\u093f
ApplicationName=\u091c\u093f\u092f\u094b\u091c\u0947\u092c\u094d\u0930\u093e
Apply=\u092a\u094d\u0930\u092f\u094b\u0917
-Apt=%0 pt\n\u092c\u093f\u0928\u094d\u0926\u0941
+Apt=\u092c\u093f\u0928\u094d\u0926\u0941
Arc=\u091a\u093e\u092a
AsymptoteToA=%0 \u092e\u093e \u0905\u0928\u094d\u0928\u0924\u0938\u094d\u092a\u0930\u094d\u0936\u093f\u0930\u0947\u0916\u093e
-Ath=%0th\n0th
+Ath=0th
Author=\u0932\u0947\u0916\u0915
-Automatic=Automatic\n\u0938\u094d\u0935\u093e\u091a\u093e\u0932\u093f\u0924
+Automatic=\u0938\u094d\u0935\u093e\u091a\u093e\u0932\u093f\u0924
AuxiliaryObject=\u0938\u0939\u093e\u092f\u0915 \u0935\u0938\u094d\u0924\u0941
AuxiliaryObjects=\u0938\u0939\u093e\u092f\u0915 \u0935\u0938\u094d\u0924\u0941\u0939\u0930\u0941
AxisLabel=\u0905\u0902\u0915\u093f\u0924
@@ -71,41 +67,41 @@ BackgroundImage=\u092a\u0943\u0937\u094d\u0920\u092d\u0942\u092e\u093f \u091a\u0
Bold=\u0920\u0942\u0932\u094b \u0935\u093e \u0938\u094d\u092a\u0938\u094d\u091f
Boolean=\u092c\u0941\u0932\u0928\u0915\u094b \u092e\u093e\u0928
Breakpoint=\u092c\u094d\u0930\u0947\u0915\u092c\u093f\u0928\u094d\u0926\u0941
-Button=Button\n\u092c\u091f\u0928
-CAS=CAS\n\u0915\u094d\u092f\u093e\u0938
-CASInitializing=CAS Initializing\n\u0915\u094d\u092f\u093e\u0938\u0915\u094b \u0938\u0941\u0930\u0941\u0935\u093e\u0924
-CASTimedOut=CAS timed out\n\u0915\u094d\u092f\u093e\u0938\u0915\u094b \u0938\u092e\u092f \u0938\u0915\u093f\u092f\u094b
+Button=\u092c\u091f\u0928
+CAS=\u0915\u094d\u092f\u093e\u0938
+CASInitializing=\u0915\u094d\u092f\u093e\u0938\u0915\u094b \u0938\u0941\u0930\u0941\u0935\u093e\u0924
+CASTimedOut=\u0915\u094d\u092f\u093e\u0938\u0915\u094b \u0938\u092e\u092f \u0938\u0915\u093f\u092f\u094b
Cancel=\u0930\u0926\u094d\u0927
Caption=\u092a\u0930\u093f\u091a\u094d\u091b\u0947\u0926\u094d
CartesianCoords=\u0930\u094d\u0915\u093e \u091f\u0947\u0936\u093f\u092f\u0928 \u0928\u093f\u0930\u094d\u0926\u093e\u0947\u0936\u093e\u0902\u0915
-CasTimeout=CAS Timeout (in seconds)\n\u0915\u0947\u0939\u0940 \u0938\u092e\u092f\u092e\u093e \u0915\u094d\u092f\u093e\u0938\u0915\u094b \u0938\u092e\u092f \u0938\u092e\u093e\u092a\u094d\u0924 \u0939\u0941\u0928\u0947\u091b
+CasTimeout=\u0915\u0947\u0939\u0940 \u0938\u092e\u092f\u092e\u093e \u0915\u094d\u092f\u093e\u0938\u0915\u094b \u0938\u092e\u092f \u0938\u092e\u093e\u092a\u094d\u0924 \u0939\u0941\u0928\u0947\u091b
CellAisNotDefined=\u0938\u0947\u0932 %0 \u0905\u092a\u0930\u093f\u092d\u093e\u0937\u093f\u0924 \u091b\u094d
CenterOfA=%0 \u0915\u094b \u0915\u0947\u0928\u094d\u0926\u094d\u0930
CentroidOfA=%0 \u0915\u094b \u0938\u0947\u0928\u094d\u091f\u094d\u0930\u094b\u092f\u0921
-CheckedNumerically=(checked numerically)\n\u0938\u0902\u0916\u094d\u092f\u093e\u0924\u094d\u092e\u0915 \u092a\u0930\u093f\u0915\u094d\u0937\u0923
+CheckedNumerically=\u0938\u0902\u0916\u094d\u092f\u093e\u0924\u094d\u092e\u0915 \u092a\u0930\u093f\u0915\u094d\u0937\u0923
ChooseColor=\u0930\u0919\u094d\u0917\u0915\u094b \u091b\u0928\u094c\u091f
ChooseObject=\u090f\u0909\u091f\u093e \u0935\u0938\u094d\u0924\u0941 \u091b\u093e\u0928\u094d\u0928\u0941\u0939\u094b\u0938
Circle=\u0935\u0943\u0924
-CircleOfAxisAThroughB=Circle of axis %0 through %1\n \u0966 \u0930 \u0967 \u0905\u0915\u094d\u0937 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0935\u0943\u0924
-CircleThroughABC=%0, %\u0967, %\u0968 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0935\u0943\u0924
-CircleThroughAwithCenterB=%0, \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0930 %\u0967 \u0915\u0947\u0928\u094d\u0926\u094d\u0930\u092c\u093f\u0928\u094d\u0926\u0941 \u092d\u090f\u0915\u094b \u0935\u0943\u0924
-CircleWithCenterARadiusBParallelToC=Circle with center %0 and radius %1, parallel to %2\n\u0966 \u0915\u0947\u0928\u094d\u0926\u094d\u0930\u092c\u093f\u0928\u094d\u0926\u0941 \u0930 \u0967 \u0905\u0930\u094d\u0927\u092c\u094d\u092f\u093e\u0938 \u0905\u0928\u093f \u0968 \u0938\u0917\u0902 \u0938\u092e\u093e\u0928\u094d\u0928\u0924\u0930 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0935\u0943\u0924
-CircleWithCenterAThroughBAxisParallelToC=Circle with center %0 through %1, axis parallel to %2\n\u0966 \u0915\u0947\u0928\u094d\u0926\u094d\u0930\u092c\u093f\u0928\u094d\u0926\u0941 \u0930 \u0967 \u0905\u0930\u094d\u0927\u092c\u094d\u092f\u093e\u0938 \u0905\u0928\u093f \u0968 \u0938\u0917\u0902 \u0905\u0915\u094d\u0937 \u0938\u092e\u093e\u0928\u094d\u0928\u0924\u0930 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0935\u0943\u0924
-CircleWithCenterAThroughBParallelToC=Circle with center %0 through %1, parallel to %2\n\u0966 \u0915\u0947\u0928\u094d\u0926\u094d\u0930\u092c\u093f\u0928\u094d\u0926\u0941 \u0930 \u0967 \u0905\u0930\u094d\u0927\u092c\u094d\u092f\u093e\u0938 \u0905\u0928\u093f \u0968 \u0938\u0917\u0902 \u0938\u092e\u093e\u0928\u094d\u0928\u0924\u0930 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0935\u0943\u0924
-CircleWithCenterAandRadiusB=%0 \u0915\u0947\u0928\u094d\u0926\u094d\u0930\u092c\u093f\u0928\u094d\u0926\u0941 \u0930 %\u0967\u0905\u0930\u094d\u0927\u092c\u094d\u092f\u093e\u0938 \u092d\u090f\u0915\u094b \u0935\u0943\u0924
-CircleWithCenterAandRadiusBAxisParallelToC=Circle with center %0 and radius %1, axis parallel to %2\n\u0966 \u0915\u0947\u0928\u094d\u0926\u094d\u0930\u092c\u093f\u0928\u094d\u0926\u0941 \u0930 \u0967 \u0905\u0930\u094d\u0927\u092c\u094d\u092f\u093e\u0938 \u0905\u0928\u093f \u0968 \u0938\u0917\u0902 \u0905\u0915\u094d\u0937 \u0938\u092e\u093e\u0928\u094d\u0928\u0924\u0930 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0935\u0943\u0924
-Clipboard.Blackboard=Clipboard: Blackboard\n\u0915\u094d\u0932\u093f\u092a\u092c\u094b\u0930\u094d\u0921: \u092c\u094d\u0932\u092f\u093e\u0915\u092c\u094b\u0930\u094d\u0921
-Clipboard.Google=Clipboard: Google Gadget\n\u0915\u094d\u0932\u093f\u092a\u092c\u094b\u0930\u094d\u0921: \u0917\u0941\u0917\u0932 \u0917\u094d\u092f\u093e\u091c\u0947\u091f
-Clipboard.HTML=Clipboard: html\n\u0915\u094d\u0932\u093f\u092a\u092c\u094b\u0930\u094d\u0921: html
-Clipboard.MediaWiki=Clipboard: MediaWiki\n\u0915\u094d\u0932\u093f\u092a\u092c\u094b\u0930\u094d\u0921: \u092e\u0947\u0921\u093f\u092f\u093e\u0935\u0940\u0915\u0940
-Clipboard.Moodle=Clipboard: Moodle\n\u0915\u094d\u0932\u093f\u092a\u092c\u094b\u0930\u094d\u0921:\u092e\u094b\u0921\u0932
-Clipboard.iframe=Clipboard: <iframe>\n\u0915\u094d\u0932\u093f\u092a\u092c\u094b\u0930\u094d\u0921:<iframe>
+CircleOfAxisAThroughB=\u0966 \u0930 \u0967 \u0905\u0915\u094d\u0937 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0935\u0943\u0924
+CircleThroughABC=%0, %1, %2 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0935\u0943\u0924
+CircleThroughAwithCenterB=%0, \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0930 %1 \u0915\u0947\u0928\u094d\u0926\u094d\u0930\u092c\u093f\u0928\u094d\u0926\u0941 \u092d\u090f\u0915\u094b \u0935\u0943\u0924
+CircleWithCenterARadiusBParallelToC=\u0966 \u0915\u0947\u0928\u094d\u0926\u094d\u0930\u092c\u093f\u0928\u094d\u0926\u0941 \u0930 \u0967 \u0905\u0930\u094d\u0927\u092c\u094d\u092f\u093e\u0938 \u0905\u0928\u093f \u0968 \u0938\u0917\u0902 \u0938\u092e\u093e\u0928\u094d\u0928\u0924\u0930 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0935\u0943\u0924
+CircleWithCenterAThroughBAxisParallelToC=\u0966 \u0915\u0947\u0928\u094d\u0926\u094d\u0930\u092c\u093f\u0928\u094d\u0926\u0941 \u0930 \u0967 \u0905\u0930\u094d\u0927\u092c\u094d\u092f\u093e\u0938 \u0905\u0928\u093f \u0968 \u0938\u0917\u0902 \u0905\u0915\u094d\u0937 \u0938\u092e\u093e\u0928\u094d\u0928\u0924\u0930 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0935\u0943\u0924
+CircleWithCenterAThroughBParallelToC=\u0966 \u0915\u0947\u0928\u094d\u0926\u094d\u0930\u092c\u093f\u0928\u094d\u0926\u0941 \u0930 \u0967 \u0905\u0930\u094d\u0927\u092c\u094d\u092f\u093e\u0938 \u0905\u0928\u093f \u0968 \u0938\u0917\u0902 \u0938\u092e\u093e\u0928\u094d\u0928\u0924\u0930 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0935\u0943\u0924
+CircleWithCenterAandRadiusB=%0 \u0915\u0947\u0928\u094d\u0926\u094d\u0930\u092c\u093f\u0928\u094d\u0926\u0941 \u0930 %1\u0905\u0930\u094d\u0927\u092c\u094d\u092f\u093e\u0938 \u092d\u090f\u0915\u094b \u0935\u0943\u0924
+CircleWithCenterAandRadiusBAxisParallelToC=\u0966 \u0915\u0947\u0928\u094d\u0926\u094d\u0930\u092c\u093f\u0928\u094d\u0926\u0941 \u0930 \u0967 \u0905\u0930\u094d\u0927\u092c\u094d\u092f\u093e\u0938 \u0905\u0928\u093f \u0968 \u0938\u0917\u0902 \u0905\u0915\u094d\u0937 \u0938\u092e\u093e\u0928\u094d\u0928\u0924\u0930 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0935\u0943\u0924
+Clipboard.Blackboard=\u0915\u094d\u0932\u093f\u092a\u092c\u094b\u0930\u094d\u0921: \u092c\u094d\u0932\u092f\u093e\u0915\u092c\u094b\u0930\u094d\u0921
+Clipboard.Google=\u0915\u094d\u0932\u093f\u092a\u092c\u094b\u0930\u094d\u0921: \u0917\u0941\u0917\u0932 \u0917\u094d\u092f\u093e\u091c\u0947\u091f
+Clipboard.HTML=\u0915\u094d\u0932\u093f\u092a\u092c\u094b\u0930\u094d\u0921: html
+Clipboard.MediaWiki=\u0915\u094d\u0932\u093f\u092a\u092c\u094b\u0930\u094d\u0921: \u092e\u0947\u0921\u093f\u092f\u093e\u0935\u0940\u0915\u0940
+Clipboard.Moodle=\u0915\u094d\u0932\u093f\u092a\u092c\u094b\u0930\u094d\u0921:\u092e\u094b\u0921\u0932
+Clipboard.iframe=\u0915\u094d\u0932\u093f\u092a\u092c\u094b\u0930\u094d\u0921:<iframe>
Color=\u0930\u0919\u094d\u0917
ColorfulConstructionProtocol=\u0930\u0919\u094d\u0917\u093f\u092f \u0930\u091a\u093e\u0928\u094d\u0924\u093e\u092e\u0915 \u092a\u094d\u0930\u094b\u091f\u094b\u0915\u0932
Command=\u0906\u0926\u0947\u0936
ComplexNumber=\u092e\u093f\u0936\u094d\u0930\u0940\u0924 \u0938\u0902\u0916\u094d\u092f\u093e
Conic=\u0915\u094b\u0928\u093f\u0915
-ConicThroughABCDE=%0, %\u0967, %\u0968, %\u0969, %\u096a \u092d\u090f\u0930 \u091c\u093e\u0928\u093f \u0915\u094b\u0928\u093f\u0915
+ConicThroughABCDE=%0, %1, %2, %3, %4 \u092d\u090f\u0930 \u091c\u093e\u0928\u093f \u0915\u094b\u0928\u093f\u0915
Conics=\u0915\u094b\u0928\u093f\u0915\u0939\u0930\u0941
ConstructionProtocol=\u0930\u091a\u0928\u093e \u092e\u0941\u0932\u0932\u093f\u092a\u093f
ConstructionProtocolButton=\u0930\u091a\u0928\u093e \u092e\u0941\u0932\u0932\u093f\u092a\u093f \u0916\u094b\u0932\u094d\u0928\u0947 \u092c\u091f\u0928
@@ -115,16 +111,15 @@ Coordinates=\u0928\u093f\u0930\u094d\u0926\u093e\u0902\u0936\u0915\u0939\u0930\u
CopyToClipboard=\u0915\u094d\u0932\u093f\u092a\u092c\u094b
CornerPoint=\u0915\u0941\u0928\u093e
CreatedWith=\u0930\u091a\u0928\u093e\u0938\u0939\u093f\u0924
-Ctrl=Ctrl\nCtrl
Curve=\u092c\u0915\u094d\u0930
Date=\u092e\u093f\u0924\u093f
-Day.1=Sunday\n\u0906\u0908\u0924\u092c\u093e\u0930
-Day.2=Monday\n\u0938\u094b\u092e\u092c\u093e\u0930
-Day.3=Tuesday\n\u092e\u0902\u0917\u0932\u092c\u093e\u0930
-Day.4=Wednesday\n\u092c\u0942\u0927\u092c\u093e\u0930
-Day.5=Thursday\n\u092c\u093f\u0939\u0940\u092c\u093e\u0930
-Day.6=Friday\n\u0936\u0941\u0915\u094d\u0930\u092c\u093e\u0930
-Day.7=Saturday\n\u0936\u0928\u093f\u092c\u093e\u0930
+Day.1=\u0906\u0908\u0924\u092c\u093e\u0930
+Day.2=\u0938\u094b\u092e\u092c\u093e\u0930
+Day.3=\u092e\u0902\u0917\u0932\u092c\u093e\u0930
+Day.4=\u092c\u0942\u0927\u092c\u093e\u0930
+Day.5=\u092c\u093f\u0939\u0940\u092c\u093e\u0930
+Day.6=\u0936\u0941\u0915\u094d\u0930\u092c\u093e\u0930
+Day.7=\u0936\u0928\u093f\u092c\u093e\u0930
Decoration=\u0938\u091c\u093e\u0935\u091f
Decreasing=\u0918\u091f\u0926\u094b
Default=\u0921\u0940\u092b\u0932\u094d\u091f
@@ -132,41 +127,40 @@ Definition=\u092a\u0930\u093f\u092d\u093e\u0937\u093e
Delete=\u092e\u0947\u091f\u094d\u0928\u0941
DependentObjects=\u0906\u0938\u094d\u0930\u093f\u0924 \u0935\u0938\u094d\u0924\u0941\u0939\u0930\u0941
DerivativeOfA=%0 \u0915\u094b \u0921\u0947\u0930\u093f\u092d\u0947\u091f\u093f\u092d
-DiameterOfAConjugateToB=%0 \u0915\u094b \u0915\u0928\u094d\u091c\u0941\u0917\u0947\u091f \u0905\u0930\u094d\u0927\u092c\u094d\u092f\u093e\u0938 %\u0967
-Dimensions=Dimensions\n\u0906\u0915\u093e\u0930 \u092a\u094d\u0930\u0915\u093e\u0930
+DiameterOfAConjugateToB=%0 \u0915\u094b \u0915\u0928\u094d\u091c\u0941\u0917\u0947\u091f \u0905\u0930\u094d\u0927\u092c\u094d\u092f\u093e\u0938 %1
+Dimensions=\u0906\u0915\u093e\u0930 \u092a\u094d\u0930\u0915\u093e\u0930
DirectionOfA=%0 \u0915\u093f \u0926\u093f\u0936\u093e
Directrix=\u0921\u093e\u0907\u0930\u0947\u0915\u094d\u091f\u094d\u0930\u093f\u0938
DirectrixOfA=%0 \u0915\u094b \u0921\u093e\u0907\u0930\u0947\u0915\u094d\u091f\u094d\u0930\u093f\u0938
-Display=Display\n\u0926\u0947\u0916\u093e\u0909\u0928\u0941
+Display=\u0926\u0947\u0916\u093e\u0909\u0928\u0941
DisplayPointSymbol=\u092c\u093f\u0928\u094d\u0926\u0939\u0930\u0941\u0915\u094b \u0938\u0902\u0915\u0947\u0924 \u0926\u0947\u0916\u093e\u0909\u0928\u0941
-DistanceOfAandB=%0 \u0930 %\u0967\u0926\u0941\u0930\u093f
+DistanceOfAandB=%0 \u0930 %1\u0926\u0941\u0930\u093f
DoubleClickToOpen=\u0909\u092a\u092f\u094b\u0917\u0940 \u0935\u093f\u0928\u094d\u0921\u093f \u0916\u094b\u0932\u094d\u0928 \u0926\u0941\u0908\u092a\u091f\u0915 \u0915\u094d\u0932\u093f\u0915 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938
DoubleLine=\u0926\u094b\u0939\u094b\u0930\u094b \u0930\u0947\u0916\u093e
Down=\u0924\u0932
DrawingPad=\u0921\u094d\u0930\u0907\u0919 \u0915\u094d\u0937\u0947\u0924\u094d\u0930
-DrawingPad2=Graphics 2\n\u0930\u0947\u0916\u093f\u092f\u091a\u093f\u0924\u094d\u0930 \u0968
-DrawingPadA=Graphics %0\n\u0930\u0947\u0916\u093f\u092f\u091a\u093f\u0924\u094d\u0930
+DrawingPad2=\u0930\u0947\u0916\u093f\u092f\u091a\u093f\u0924\u094d\u0930 \u0968
+DrawingPadA=\u0930\u0947\u0916\u093f\u092f\u091a\u093f\u0924\u094d\u0930
DrawingPadAsPSTricks=\u092a\u093f\u090f\u0938\u091f\u094d\u0930\u093f\u0915\u094d\u0938 \u0930\u0941\u092a\u092e\u093e \u0917\u094d\u0930\u093e\u092b\u093f\u0915\u094d\u0938 \u0926\u0943\u0937\u094d\u092f
DrawingPadAsPicture=\u0917\u094d\u0930\u093e\u092b\u093f\u0915\u094d\u0938 \u0926\u0943\u0937\u094d\u092f \u091a\u093f\u0924\u094d\u0930\u092e\u093e
DrawingPagAsPGF=PGF/TikZ \u0915\u094b \u0917\u094d\u0930\u093e\u092b\u093f\u0915\u094d\u0938 \u0926\u0943\u0937\u094d\u092f
-DynamicCoordinatesOfA=Dynamic Coordinates of %0\n\u0938\u094d\u0935\u093e\u091a\u093e\u0932\u093f\u0924 \u0915\u094b\u0905\u0930\u0921\u093f\u0928\u0947\u091f\u094d\u0938
+DynamicCoordinatesOfA=\u0938\u094d\u0935\u093e\u091a\u093e\u0932\u093f\u0924 \u0915\u094b\u0905\u0930\u0921\u093f\u0928\u0947\u091f\u094d\u0938
DynamicWorksheet=\u0938\u094d\u0935\u093e\u091a\u093e\u0932\u0940\u0924 \u0935\u0930\u094d\u0915\u0938\u0940\u091f
DynamicWorksheetAsWebpage=\u0938\u094d\u0935\u093e\u091a\u093e\u0932\u0940\u0924 \u0935\u0930\u094d\u0915\u0938\u0940\u091f \u0935\u0947\u092c\u092a\u0947\u091c\u0915\u094b \u0930\u0941\u092a\u092e\u093e
-DynamicWorksheetExport=Dynamic Worksheet Export (html)\n\u0938\u094d\u0935\u093e\u091a\u093e\u0932\u093f\u0924 \u0935\u0930\u094d\u0915\u0938\u093f\u091f \u0932\u094d\u092f\u093e\u0909\u0928\u0941\u0939\u094b\u0938
+DynamicWorksheetExport=\u0938\u094d\u0935\u093e\u091a\u093e\u0932\u093f\u0924 \u0935\u0930\u094d\u0915\u0938\u093f\u091f \u0932\u094d\u092f\u093e\u0909\u0928\u0941\u0939\u094b\u0938
EccentricityOfA=%0 \u0915\u094b \u0908\u0938\u0947\u0928\u094d\u091f\u094d\u0930\u0940\u0938\u093f\u091f\u093f
Edit=\u0938\u092e\u094d\u092a\u093e\u0926\u0928
Ellipse=\u0908\u0932\u094d\u092a\u093f\u0938
-EllipseWithFociABPassingThroughC=%0, %\u0967 \u092b\u094b\u0915\u093f \u092d\u090f\u0915\u094b \u0930 %\u0968 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0908\u0932\u094d\u092a\u093f\u0938\u094d
-EllipseWithFociABandFirstAxisLengthC=%0, %\u0967 \u092b\u094b\u0915\u093f \u0930 \u092a\u094d\u0930\u0925\u092e \u0905\u0915\u094d\u0937\u0915\u094b \u0932\u092e\u094d\u092c\u093e\u0907 %\u0968 \u092d\u090f\u0915\u094b \u0908\u0932\u094d\u092a\u093f\u0938\u094d
+EllipseWithFociABPassingThroughC=%0, %1 \u092b\u094b\u0915\u093f \u092d\u090f\u0915\u094b \u0930 %2 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0908\u0932\u094d\u092a\u093f\u0938\u094d
+EllipseWithFociABandFirstAxisLengthC=%0, %1 \u092b\u094b\u0915\u093f \u0930 \u092a\u094d\u0930\u0925\u092e \u0905\u0915\u094d\u0937\u0915\u094b \u0932\u092e\u094d\u092c\u093e\u0907 %2 \u092d\u090f\u0915\u094b \u0908\u0932\u094d\u092a\u093f\u0938\u094d
EmphasizeRightAngle=\u0938\u092e\u0915\u094b\u0923\u0932\u093e\u0908 \u091c\u094b\u0921
EmptySet=\u0916\u093e\u0932\u0940 \u0938\u0947\u091f
-EnableScripting=Enable Scripting\n\u0939\u0938\u094d\u0924 \u0932\u093f\u092a\u093f \u0938\u0915\u094d\u0930\u093f\u092f
+EnableScripting=\u0939\u0938\u094d\u0924 \u0932\u093f\u092a\u093f \u0938\u0915\u094d\u0930\u093f\u092f
Equation=\u0938\u092e\u0940\u0915\u0930\u0923
-ErrorInJavaScript=Error in JavaScript\n\u091c\u093e\u0935\u093e\u0932\u093f\u092a\u093f \u092e\u093e \u0924\u094d\u0930\u0941\u091f\u0940
-ErrorInJavaScriptAtLineA=Error in JavaScript at line %0\n \u0930\u0947\u0916\u093e \u0966 \u092e\u093e \u091c\u093e\u0935\u093e\u0932\u093f\u092a\u093f \u092e\u093e \u0924\u094d\u0930\u0941\u091f\u0940
-ErrorInScriptAtLineAFromObjectB=Error in script at line %0 (called from %1)\n\u0930\u0947\u0916\u093e \u0966 \u092e\u093e \u091c\u093e\u0935\u093e\u0932\u093f\u092a\u093f \u092e\u093e \u0924\u094d\u0930\u0941\u091f\u0940
-Esc=Esc\nEsc
-ExplicitLineGradient=m\n\u090f\u092e
+ErrorInJavaScript=\u091c\u093e\u0935\u093e\u0932\u093f\u092a\u093f \u092e\u093e \u0924\u094d\u0930\u0941\u091f\u0940
+ErrorInJavaScriptAtLineA=\u0930\u0947\u0916\u093e \u0966 \u092e\u093e \u091c\u093e\u0935\u093e\u0932\u093f\u092a\u093f \u092e\u093e \u0924\u094d\u0930\u0941\u091f\u0940
+ErrorInScriptAtLineAFromObjectB=\u0930\u0947\u0916\u093e \u0966 \u092e\u093e \u091c\u093e\u0935\u093e\u0932\u093f\u092a\u093f \u092e\u093e \u0924\u094d\u0930\u0941\u091f\u0940
+ExplicitLineGradient=\u090f\u092e
ExportAsWebpage=\u0935\u0947\u092c\u092a\u0947\u091c \u0928\u093f\u0930\u094d\u092f\u093e\u0924
ExportTextAsShapes=\u091f\u0947\u0915\u094d\u0938\u091f\u094d \u0906\u0915\u093e\u0930\u0915\u094b\u0930\u0941\u092a\u092e\u093e \u0928\u093f\u0930\u094d\u092f\u093e\u0924
ExtremumOfA=%0 \u0915\u094b \u0905\u0928\u094d\u0924\u093f\u092e
@@ -180,7 +174,7 @@ FocusOfA=%0 \u0915\u094b \u092b\u094b\u0915\u0938
ForceGnuplotPgf=\u092b\u0932\u0928 \u0916\u093f\u091a\u094d\u0928 \u0917\u0928\u092a\u094d\u0932\u091f \u092a\u094d\u0930\u092f\u094b\u0917Format=\u092b\u0930\u092e\u094d\u092f\u093e\u091f\u094d
FreeObjects=\u0938\u094d\u0935\u0924\u0928\u094d\u0924\u094d\u0930\u0902 \u0935\u0938\u094d\u0924\u0939\u0930\u0941
Function=\u092b\u0932\u0928
-FunctionAonIntervalBC=[%\u0967, %\u0968] \u0935\u0930\u094d\u0917\u0905\u0928\u094d\u0924\u0930\u092e\u093e %0 \u092b\u0932\u0928
+FunctionAonIntervalBC=[%1, %2] \u0935\u0930\u094d\u0917\u0905\u0928\u094d\u0924\u0930\u092e\u093e %0 \u092b\u0932\u0928
GeneratePgf=PGF/TikZ \u0938\u0902\u0915\u0947\u0924\u0915\u094b \u0930\u091a\u0928\u093e
Height=\u0909\u091a\u093e\u0908
Hexagon=\u0937\u091f\u094d\u092d\u0941\u091c
@@ -188,8 +182,8 @@ Hide=\u0932\u0941\u0915\u093e\u0909\u0928\u0941
Home=\u0918\u0930
HorizontalSplit=\u0905\u0928\u0942\u092a\u094d\u0930\u0938\u094d\u0925 \u091f\u0941\u0915\u094d\u0930\u093e\u0908
Hyperbola=\u0939\u093e\u0907\u092a\u0930\u0935\u094b\u0932\u093e
-HyperbolaWithFociABPassingThroughC=%0, %\u0967 \u092b\u094b\u0915\u093f \u092d\u090f\u0915\u094b \u0930 %\u0968 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0939\u093e\u0907\u092a\u0930\u0935\u094b\u0932\u093e
-HyperbolaWithFociABandFirstAxisLengthC=%0, %\u0967 \u092b\u094b\u0915\u093f \u0930 \u092a\u094d\u0930\u0925\u092e \u0905\u0915\u094d\u0937\u0915\u094b \u0932\u092e\u094d\u092c\u093e\u0908 %\u0968\u092d\u090f\u0915\u094b \u0939\u093e\u0907\u092a\u0930\u0935\u094b\u0932\u093e
+HyperbolaWithFociABPassingThroughC=%0, %1 \u092b\u094b\u0915\u093f \u092d\u090f\u0915\u094b \u0930 %2 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0939\u093e\u0907\u092a\u0930\u0935\u094b\u0932\u093e
+HyperbolaWithFociABandFirstAxisLengthC=%0, %1 \u092b\u094b\u0915\u093f \u0930 \u092a\u094d\u0930\u0925\u092e \u0905\u0915\u094d\u0937\u0915\u094b \u0932\u092e\u094d\u092c\u093e\u0908 %2\u092d\u090f\u0915\u094b \u0939\u093e\u0907\u092a\u0930\u0935\u094b\u0932\u093e
Image=\u0924\u0938\u094d\u092c\u0940\u0930
Increasing=\u0935\u0943\u0926\u094d\u0927\u093f
Inequality=\u0905\u0938\u092e\u093e\u0928\u0924\u093e
@@ -200,10 +194,10 @@ InputLabelToolTip=\u0906\u0926\u0947\u0936 \u0932\u0947\u0916\u094d\u0928\u0939\
Insert=\u0918\u0942\u0938\u093e\u0909\u0928\u0941
InsertPictureOfConstruction=\u0917\u094d\u0930\u093e\u092b\u093f\u0915\u094d\u0938 \u0926\u0943\u0937\u094d\u092f \u0915\u094b \u0924\u0938\u094d\u0935\u0940\u0930 \u0918\u0942\u0938\u093e\u0909\u0928\u0941\u0939\u094b\u0938
IntegralOfA=%0 \u0915\u094b \u0908\u0928\u094d\u091f\u093f\u0930\u094d\u0917\u0932\u094d
-IntegralOfAfromBtoC=%0 \u0915\u094b \u0908\u0928\u094d\u091f\u093f\u0930\u094d\u0917\u0932\u094d %\u0967 \u092c\u093e\u091f %\u0968 \u0938\u092e\u094d\u092e
+IntegralOfAfromBtoC=%0 \u0915\u094b \u0908\u0928\u094d\u091f\u093f\u0930\u094d\u0917\u0932\u094d %1 \u092c\u093e\u091f %2 \u0938\u092e\u094d\u092e
IntersectingLines=\u092a\u094d\u0930\u0924\u093f\u091b\u0947\u091a\u094d\u0926\u0928 \u0930\u0947\u0916\u093e\u0939\u0930\u0941
-IntersectionPointOfAB=%0, %\u0967 \u0915\u094b \u092a\u094d\u0930\u0924\u093f\u091b\u0947\u091a\u094d\u0926\u0928 \u092c\u093f\u0928\u094d\u0926\u0941
-IntersectionPointOfABWithInitialValueC=\u0936\u0941\u0930\u0941\u0915\u094b \u092e\u093e\u0928 %\u0968 \u0938\u0939\u093f\u0924 %0, %\u0967\u0915\u094b \u092a\u094d\u0930\u0924\u093f\u091b\u0947\u091a\u094d\u0926\u0928 \u092c\u093f\u0928\u094d\u0926\u0941
+IntersectionPointOfAB=%0, %1 \u0915\u094b \u092a\u094d\u0930\u0924\u093f\u091b\u0947\u091a\u094d\u0926\u0928 \u092c\u093f\u0928\u094d\u0926\u0941
+IntersectionPointOfABWithInitialValueC=\u0936\u0941\u0930\u0941\u0915\u094b \u092e\u093e\u0928 %2 \u0938\u0939\u093f\u0924 %0, %1\u0915\u094b \u092a\u094d\u0930\u0924\u093f\u091b\u0947\u091a\u094d\u0926\u0928 \u092c\u093f\u0928\u094d\u0926\u0941
Interval=\u0935\u0930\u094d\u0917\u093e\u0928\u094d\u0924\u0930
Italic=\u0908\u091f\u093e\u0932\u093f\u0915
LaTeXFormula=\u0932\u093e\u091f\u0947\u0915\u094d\u0938\u091f \u0938\u0941\u0924\u094d\u0930
@@ -213,13 +207,13 @@ Length=\u0932\u092e\u094d\u092c\u093e\u0908
LengthOfA=%0\u0915\u094b \u0932\u092e\u094d\u092c\u093e\u0908
Lengths=\u0932\u092e\u094d\u092c\u093e\u0908\u0939\u0930\u0941
Line=\u0930\u0947\u0916\u093e
-LineBisectorAB=%0, %\u0967 \u0915\u094b \u0905\u0930\u094d\u0927\u0915\u094d
+LineBisectorAB=%0, %1 \u0915\u094b \u0905\u0930\u094d\u0927\u0915\u094d
LineBisectorOfA=%0 \u0915\u094b \u0905\u0930\u094d\u0927\u0915\u094d
LineStyle=\u0930\u0947\u0916\u093e \u0936\u0948\u0932\u0940
-LineThroughAB=%0, %\u0967 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0930\u0947\u0916\u093e
-LineThroughAParallelToB=%0, \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0930 %\u0967 \u0938\u0901\u0917 \u0938\u092e\u093e\u0928\u094d\u0928\u0924\u0930 \u0939\u0941\u0928\u0947 \u0930\u0947\u0916\u093e
-LineThroughAPerpendicularToB=%0, \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0930 %\u0967 \u0938\u0901\u0917 \u0932\u092e\u094d\u092c \u0939\u0941\u0928\u0947 \u0930\u0947\u0916\u093e
-LineThroughAwithDirectionB=%0, \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0930 %\u0967 \u0926\u093f\u0936\u093e \u0939\u0941\u0928\u0947 \u0930\u0947\u0916\u093e
+LineThroughAB=%0, %1 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0930\u0947\u0916\u093e
+LineThroughAParallelToB=%0, \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0930 %1 \u0938\u0901\u0917 \u0938\u092e\u093e\u0928\u094d\u0928\u0924\u0930 \u0939\u0941\u0928\u0947 \u0930\u0947\u0916\u093e
+LineThroughAPerpendicularToB=%0, \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0930 %1 \u0938\u0901\u0917 \u0932\u092e\u094d\u092c \u0939\u0941\u0928\u0947 \u0930\u0947\u0916\u093e
+LineThroughAwithDirectionB=%0, \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0930 %1 \u0926\u093f\u0936\u093e \u0939\u0941\u0928\u0947 \u0930\u0947\u0916\u093e
LinearEccentricityOfA=%0 \u0915\u094b \u0930\u0947\u0916\u093f\u092f \u0907\u0938\u0947\u0928\u094d\u091f\u094d\u0930\u093f\u0938\u0940\u091f\u093f
LinearInequality=\u0932\u093f\u0928\u093f\u092f\u0930 \u0905\u0938\u092e\u093e\u0928\u0924\u093e
Lines=\u0930\u0947\u0916\u093e\u0939\u0930\u0941
@@ -227,21 +221,21 @@ List=\u0938\u0941\u091a\u0940
Locus=\u092c\u093f\u0928\u094d\u0926\u0941\u092a\u0925
Midpoint=\u092e\u0927\u094d\u092f\u092c\u093f\u0928\u094d\u0926\u0941
MidpointOfA=%0 \u0915\u094b \u092e\u0927\u094d\u092f\u092c\u093f\u0928\u094d\u0926\u0941
-MidpointOfAB=%0 %\u0967 \u0915\u094b \u092e\u0927\u094d\u092f\u092c\u093f\u0928\u094d\u0926\u0941
-Month.1=January\n\u092a\u0948\u093e\u0938 \u092e\u093e\u0918
-Month.10=October\n\u0906\u0936\u0935\u093f\u0928 \u0915\u093e\u0930\u094d\u0924\u093f\u0915
-Month.11=November\n\u0915\u093e\u0930\u094d\u0924\u093f\u0915 \u092e\u0902\u0938\u0940\u0930
-Month.12=December\n\u092e\u0902\u0938\u0940\u0930 \u092a\u0948\u093e\u0937
-Month.2=February\n\u092e\u093e\u0918 \u092b\u093e\u0917\u0941\u0928
-Month.3=March\n\u092b\u093e\u0917\u0941\u0928 \u091a\u0948\u0924
-Month.4=April\n\u091a\u0948\u0924 \u092c\u0948\u0936\u093e\u0916
-Month.5=May\n\u092c\u0948\u0936\u093e\u0916 \u091c\u0947\u0937\u094d\u0920
-Month.6=June\n\u091c\u0947\u0937\u094d\u0920 \u0906\u0937\u093e\u0922
-Month.7=July\n\u0906\u0937\u093e\u0922 \u0938\u094d\u0930\u093e\u0935\u0923
-Month.8=August\n\u0938\u094d\u0930\u093e\u0935\u0923 \u092d\u093e\u0926\u094d\u0930
-Month.9=September\n\u092d\u093e\u0926\u094d\u0930 \u0906\u0936\u0935\u093f\u0928
+MidpointOfAB=%0 %1 \u0915\u094b \u092e\u0927\u094d\u092f\u092c\u093f\u0928\u094d\u0926\u0941
+Month.1=\u092a\u0948\u093e\u0938 \u092e\u093e\u0918
+Month.10=\u0906\u0936\u0935\u093f\u0928 \u0915\u093e\u0930\u094d\u0924\u093f\u0915
+Month.11=\u0915\u093e\u0930\u094d\u0924\u093f\u0915 \u092e\u0902\u0938\u0940\u0930
+Month.12=\u092e\u0902\u0938\u0940\u0930 \u092a\u0948\u093e\u0937
+Month.2=\u092e\u093e\u0918 \u092b\u093e\u0917\u0941\u0928
+Month.3=\u092b\u093e\u0917\u0941\u0928 \u091a\u0948\u0924
+Month.4=\u091a\u0948\u0924 \u092c\u0948\u0936\u093e\u0916
+Month.5=\u092c\u0948\u0936\u093e\u0916 \u091c\u0947\u0937\u094d\u0920
+Month.6=\u091c\u0947\u0937\u094d\u0920 \u0906\u0937\u093e\u0922
+Month.7=\u0906\u0937\u093e\u0922 \u0938\u094d\u0930\u093e\u0935\u0923
+Month.8=\u0938\u094d\u0930\u093e\u0935\u0923 \u092d\u093e\u0926\u094d\u0930
+Month.9=\u092d\u093e\u0926\u094d\u0930 \u0906\u0936\u0935\u093f\u0928
Name=\u0928\u093e\u092e
-Name.button=button\n\u092c\u091f\u0928
+Name.button=\u092c\u091f\u0928
Name.list=\u0938\u0941\u091a\u0940
Name.locus=\u092c\u093f\u0928\u094d\u0926\u0941\u092a\u0925
Name.matrix=\u092e\u094d\u092f\u093e\u0902\u091f\u094d\u0930\u093f\u0915\u094d\u0938
@@ -249,20 +243,20 @@ Name.picture=\u0924\u0938\u094d\u092c\u093f\u0930
Name.polygon=\u092c\u0939\u0941\u092d\u0942\u091c
Name.text=\u091f\u0947\u0915\u094d\u0938\u091f\u094d
NameAndValue=\u0928\u093e\u092e \u0930 \u092e\u093e\u0928
-NewExpression=New expression\n\u0928\u092f\u093e\u0902 \u0915\u0925\u0928
+NewExpression=\u0928\u092f\u093e\u0902 \u0915\u0925\u0928
NewNameForA=%0 \u0915\u094b \u0928\u093f\u092e\u094d\u0924\u093f \u0928\u092f\u093e\u0902 \u0928\u093e\u092e
Next=\u0905\u0930\u094d\u0915\u094b
-NextCell=Next Cell\n\u0905\u0930\u094d\u0915\u094b \u0915\u094b\u0937\u094d\u091f\u0915
+NextCell=\u0905\u0930\u094d\u0915\u094b \u0915\u094b\u0937\u094d\u091f\u0915
No.=\u0928\u094b
-NotAvailable=Not Available\n\u090a\u092a\u0932\u092c\u094d\u0927 \u091b\u0948\u0928
-NotIncluded=not included\n\u0938\u092e\u094d\u092e\u0940\u0932\u093f\u0924 \u091b\u0948\u0928
+NotAvailable=\u090a\u092a\u0932\u092c\u094d\u0927 \u091b\u0948\u0928
+NotIncluded=\u0938\u092e\u094d\u092e\u0940\u0932\u093f\u0924 \u091b\u0948\u0928
Numeric=\u0938\u0902\u0916\u094d\u092f\u093e\u0924\u094d\u092e\u0915\u094d
NumericObjects=\u0938\u0902\u0916\u094d\u092f\u093e\u0924\u094d\u092e\u0915\u094d \u0935\u0938\u094d\u0924\u0941\u0939\u0930\u0941
OK=\u0913\u0915\u0947
Objects=\u0935\u0938\u094d\u0924\u0941\u0939\u0930\u0941
-Off=Off\n\u092c\u0928\u094d\u0926
-OldExpression=Old expression\n\u092a\u0941\u0930\u093e\u0928\u094b \u0915\u0925\u0928
-On=On\n\u0916\u0941\u0932\u094d\u0932\u093e
+Off=\u092c\u0928\u094d\u0926
+OldExpression=\u092a\u0941\u0930\u093e\u0928\u094b \u0915\u0925\u0928
+On=\u0916\u0941\u0932\u094d\u0932\u093e
Open=\u0916\u094b\u0932\u094d\u0928\u0941
OpenButton=\u0909\u092a\u092f\u094b\u0917\u093f \u0935\u093f\u0928\u094d\u0921\u094b \u0916\u094b\u0932\u094d\u0928\u0947 \u092c\u091f\u0928
Oscillating=\u0913\u0938\u093f\u0932\u0947\u091f\u093f\u0919\u094d
@@ -270,7 +264,7 @@ OverwriteFile=\u092f\u094b \u0928\u0924\u094d\u0925\u093f\u092e\u093e\u0925\u093
PGFExport.Grayscale=\u0917\u094d\u0930\u0947\u0938\u094d\u0915\u0947\u0932
Parabola=\u092a\u093e\u0930\u093e\u0935\u094b\u0932\u093e
ParabolaEquation=y² = or x² =
-ParabolaWithFocusAandDirectrixB=\u092b\u094b\u0915\u0938 %0 \u0930 \u0921\u093e\u0907\u0930\u0947\u0915\u094d\u091f\u094d\u0930\u093f\u0938 %\u0967 \u092d\u090f\u0915\u094b \u092a\u093e\u0930\u093e\u0935\u094b\u0932\u093e
+ParabolaWithFocusAandDirectrixB=\u092b\u094b\u0915\u0938 %0 \u0930 \u0921\u093e\u0907\u0930\u0947\u0915\u094d\u091f\u094d\u0930\u093f\u0938 %1 \u092d\u090f\u0915\u094b \u092a\u093e\u0930\u093e\u0935\u094b\u0932\u093e
ParallelLines=\u0938\u092e\u093e\u0928\u094d\u0928\u0924\u0930 \u0930\u0947\u0916\u093e\u0939\u0930\u0941
ParameterOfA=%0 \u0915\u094b \u092a\u093e\u0930\u093e\u092e\u093f\u091f\u0930
ParametricForm=\u092a\u094d\u092f\u093e\u0930\u093e\u092e\u0947\u091f\u094d\u0930\u093f\u0915 \u0930\u0941\u092a
@@ -283,13 +277,13 @@ PictureWidth=\u0924\u0938\u094d\u0935\u0940\u0930 \u091a\u094c\u0921\u093e\u0908
Play=\u0916\u0947\u0932\u094d\u0928\u0941
PlayButton=\u092a\u094d\u0932\u0947 \u092c\u091f\u0928
Point=\u092c\u093f\u0928\u094d\u0926\u0941
-PointAplusB=\u092c\u093f\u0928\u094d\u0926\u0941 %0 + %\u0967
+PointAplusB=\u092c\u093f\u0928\u094d\u0926\u0941 %0 + %1
PointOn=\u091a\u093e\u0932\u0942 \u092c\u093f\u0928\u094d\u0926\u0941
-PointOnA=\u092c\u093f\u0928\u094d\u0926\u0941\u092e\u093e %\u0967
+PointOnA=\u092c\u093f\u0928\u094d\u0926\u0941\u092e\u093e %1
PointSize=\u092c\u093f\u0928\u094d\u0926\u0941\u0915\u094b \u0906\u0915\u093e\u0930
Points=\u092c\u093f\u0928\u094d\u0926\u0941\u0939\u0930\u0941
PolarCoords=\u0927\u094d\u0930\u0942\u092c\u093f\u092f \u0928\u093f\u0930\u094d\u0926\u0947\u0936\u093e\u0902\u0915
-PolarLineOfARelativeToB=%0 \u0915\u094b \u0927\u094d\u0930\u0942\u092c\u093f\u092f \u0930\u0947\u0916\u093er %\u0967 \u0915\u094b \u0926\u093e\u0901\u091c\u094b\u092e\u093e
+PolarLineOfARelativeToB=%0 \u0915\u094b \u0927\u094d\u0930\u0942\u092c\u093f\u092f \u0930\u0947\u0916\u093er %1 \u0915\u094b \u0926\u093e\u0901\u091c\u094b\u092e\u093e
Polygon=\u092c\u0939\u0941\u092d\u0941\u091c
Properties=\u0935\u0938\u094d\u0924\u0941\u0915\u094b \u0917\u0941\u0923\u0939\u0930\u0941
Quadrangle=\u091a\u0930\u094d\u0924\u0942\u092d\u0942\u091c
@@ -298,25 +292,25 @@ Question=\u092a\u094d\u0930\u0938\u094d\u0928
Radius=\u0905\u0930\u094d\u0927\u092c\u094d\u092f\u093e\u0938
RadiusOfA=%0 \u0915\u094b \u0905\u0930\u094d\u0927\u092c\u094d\u092f\u093e\u0938
Ray=\u0915\u093f\u0930\u0923
-RayThroughAB=%0, %\u0967 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0930\u0947\u0916\u093e
-RayThroughAWithDirectionB=%0 \u0930%\u0967\u0926\u093f\u0936\u093e \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0930\u0947\u0916\u093e
+RayThroughAB=%0, %1 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0930\u0947\u0916\u093e
+RayThroughAWithDirectionB=%0 \u0930%1\u0926\u093f\u0936\u093e \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0930\u0947\u0916\u093e
Redefine=\u092a\u0941\u0930\u094d\u0928\u0902\u092a\u0930\u093f\u092d\u093e\u0937\u093e
Remove=\u0939\u091f\u093e\u0909\u0928\u0942
Rename=\u092a\u0941\u0930\u094d\u0928\u0928\u093e\u092e
Repeat=\u0926\u094b\u0939\u0930\u092f\u093e\u0909\u0928\u0942
ResolutionInDPI=dpi \u092e\u093e \u0930\u091c\u094b\u0932\u0941\u0938\u0928
RootOfA=%0 \u0915\u094b \u0935\u0930\u094d\u0917
-RootOfAWithInitialValueB=\u0936\u0941\u0930\u0941\u0915\u094b \u092e\u093e\u0928 %\u0967\u092d\u090f\u0915\u094b %0 \u0915\u094b \u0935\u0930\u094d\u0917
-RootOfAonIntervalBC=\u0935\u0930\u094d\u0917\u0905\u0928\u0924\u0930 [\u0967, %\u0968] \u092d\u090f\u0915\u094b %0 \u0915\u094b \u0935\u0930\u094d\u0917
+RootOfAWithInitialValueB=\u0936\u0941\u0930\u0941\u0915\u094b \u092e\u093e\u0928 %1\u092d\u090f\u0915\u094b %0 \u0915\u094b \u0935\u0930\u094d\u0917
+RootOfAonIntervalBC=\u0935\u0930\u094d\u0917\u0905\u0928\u0924\u0930 [\u0967, %2] \u092d\u090f\u0915\u094b %0 \u0915\u094b \u0935\u0930\u094d\u0917
ScaleInCentimeter=\u0938\u0947\u0928\u094d\u091f\u093f\u092e\u093f\u091f\u0930\u092e\u093e \u0928\u093e\u092a
SecondAxisLengthOfA=%0 \u0915\u094b \u0926\u094b\u0936\u094d\u0930\u094b \u0905\u0915\u094d\u0937\u0915\u094b \u0932\u092e\u094d\u092c\u093e\u0908
SecondAxisOfA=%0 \u0915\u094b \u0926\u094b\u0936\u094d\u0930\u094b \u0905\u0915\u094d\u0937
Sector=\u0935\u0943\u0924\u093f\u092f \u0916\u0923\u094d\u0921
Segment=\u0916\u0923\u094d\u0921
SegmentAB=\u0916\u0923\u0921[%0, \u0967]
-SegmentABofC=\u0916\u0923\u0921[%0, \u0967] \u0915\u094b %\u0968
+SegmentABofC=\u0916\u0923\u0921[%0, \u0967] \u0915\u094b %2
Semicircle=\u0905\u0930\u094d\u0927\u0935\u0943\u0924
-SemicircleThroughAandB=%0 \u0930 %\u0967 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0905\u0930\u094d\u0927\u0935\u0943\u0924
+SemicircleThroughAandB=%0 \u0930 %1 \u092d\u090f\u0930 \u091c\u093e\u0928\u0947 \u0905\u0930\u094d\u0927\u0935\u0943\u0924
Show=\u0926\u0947\u0916\u093e\u0909\u0928\u0941
ShowAllObjects=\u0938\u092c\u0948 \u0935\u0938\u094d\u0924\u0941\u0939\u0930\u0941 \u0926\u0947\u0916\u093e\u0909\u0928\u0941
ShowLabel=\u0938\u0941\u091a\u093f\u0924 \u0928\u093e\u092e \u0926\u0947\u0916\u093e\u0909\u0928\u0941
@@ -334,9 +328,9 @@ StartingPoint=\u0936\u0941\u0930\u0941\u0915\u094b \u092c\u093f\u0928\u094d\u092
Substitute=\u092a\u094d\u0930\u0924\u093f\u0938\u094d\u0925\u093e\u092a\u0928
SubstituteSimplify=\u092a\u094d\u0930\u0924\u093f\u0938\u094d\u0925\u093e\u092a\u0928 \u0930 \u0938\u0930\u0932\u0940\u0915\u0930\u0923
SyntaxErrorAisNotAList=\u0935\u093e\u0915\u094d\u092f \u0930\u091a\u093e\u0928\u093e\u092e\u093e \u0917\u0932\u094d\u0924\u093f:%0 \u0938\u0941\u091a\u0940 \u0939\u094b\u0908\u0928\u094d
-TangentToAParallelToB=%\u0967 \u0938\u0901\u0917 \u0938\u092e\u093e\u0928\u094d\u0928\u0924\u0930 \u0930 %0 \u0915\u094b \u0936\u0930\u094d\u092a\u0938\u093f\u0930\u0947\u0916\u093e
-TangentToAThroughB=%\u0967 \u092e\u093e %0 \u0915\u094b \u0936\u0930\u094d\u092a\u0938\u093f\u0930\u0947\u0916\u093e
-TangentToAatB=%\u0967 \u092e\u093e %0 \u0915\u094b \u0936\u0930\u094d\u092a\u0938\u093f\u0930\u0947\u0916\u093e
+TangentToAParallelToB=%1 \u0938\u0901\u0917 \u0938\u092e\u093e\u0928\u094d\u0928\u0924\u0930 \u0930 %0 \u0915\u094b \u0936\u0930\u094d\u092a\u0938\u093f\u0930\u0947\u0916\u093e
+TangentToAThroughB=%1 \u092e\u093e %0 \u0915\u094b \u0936\u0930\u094d\u092a\u0938\u093f\u0930\u0947\u0916\u093e
+TangentToAatB=%1 \u092e\u093e %0 \u0915\u094b \u0936\u0930\u094d\u092a\u0938\u093f\u0930\u0947\u0916\u093e
Text=\u091f\u0947\u0915\u094d\u0938\u091f\u094d
TextAfterConstruction=\u0930\u091a\u0928\u093e\u0915\u093f\u092e\u0941\u0928\u093f \u091f\u0947\u0915\u094d\u0938\u091f\u094d
TextBeforeConstruction=\u0930\u091a\u0928\u093e\u0915\u094b\u092e\u093e\u0925\u093f \u091f\u0947\u0915\u094d\u0938\u0924\u094d
@@ -348,8 +342,8 @@ TitleExportPstricks=\u092a\u094b\u090f\u0938\u091f\u094d\u0930\u093f\u0915\u094d
TraceOff=\u0928\u093f\u0936\u093e\u0928\u093e \u092c\u0928\u094d\u0926\u094d
TraceOn=\u0928\u093f\u0936\u093e\u0928\u093e \u091a\u093e\u0932\u0942
TraceToSpreadsheet=\u0938\u094d\u092a\u094d\u0930\u0947\u0921\u0938\u0940\u091f\u092e\u093e \u0928\u093f\u0936\u093e\u0928
-TranslationOfAbyB=%0 \u0915\u094b \u092c\u093f\u0938\u094d\u0925\u093e\u092a\u0928\u094d %\u0967 \u0926\u094d\u0927\u0930\u093e
-TranslationOfAtoB=%0 \u0915\u094b %\u0967 \u092c\u093f\u0938\u094d\u0925\u093e\u092a\u0928\u094d
+TranslationOfAbyB=%0 \u0915\u094b \u092c\u093f\u0938\u094d\u0925\u093e\u092a\u0928\u094d %1 \u0926\u094d\u0927\u0930\u093e
+TranslationOfAtoB=%0 \u0915\u094b %1 \u092c\u093f\u0938\u094d\u0925\u093e\u092a\u0928\u094d
Triangle=\u0924\u094d\u0930\u093f\u092d\u0941\u091c
UnitVectorOfA=%0 \u0915\u094b \u090f\u0915\u093e\u0908 \u092d\u0947\u0915\u094d\u091f\u0930
UnitVectorPerpendicularToA=%0 \u0938\u0901\u0917 \u0932\u092e\u094d\u092c \u090f\u0915\u093e\u0908 \u092d\u0947\u0915\u094d\u091f\u0930
@@ -401,6 +395,7 @@ vertical=\u0920\u093e\u0921\u094b
xAxis=x\u0905\u0915\u094d\u0937
xmax=x\u0909\u091a\u094d\u091a\u0924\u092e\u094d
xmin=x\u0928\u094d\u092f\u0941\u0928\u0924\u092e\u094d
+xstep=X \u0924\u0939
yAxis=y\u0905\u0915\u094d\u0937
ymax=y\u0909\u091a\u094d\u091a\u0924\u092e\u094d
ymin=y\u0928\u094d\u092f\u0941\u0928\u0924\u092e
\ No newline at end of file
diff --git a/geogebra/properties/plain_nl.properties b/geogebra/properties/plain_nl.properties
index 17169ca..4922554 100644
--- a/geogebra/properties/plain_nl.properties
+++ b/geogebra/properties/plain_nl.properties
@@ -32,6 +32,7 @@ AisaTangentToB=%0 is een raaklijn aan %1
AlgebraWindow=Algebravenster
AliesOnB=%0 is gelegen op %1
AliesOnThePerimeterOfB=%0 ligt op de omtrek van %1
+Altitude=Hoogte
Angle=Hoek
AngleBetweenAB=Hoek tussen %0, %1
AngleBetweenABC=Hoek tussen %0, %1, %2
@@ -74,6 +75,11 @@ Circle=Cirkel
CircleThroughABC=Cirkel door %0, %1, %2
CircleThroughAwithCenterB=Cirkel door %0 met middelpunt %1
CircleWithCenterAandRadiusB=Cirkel met middelpunt %0 en straal %1
+Clipboard.Google=Kladblok: Google Gadget
+Clipboard.HTML=Kladblok: html
+Clipboard.MediaWiki=Kladblok: MediaWiki
+Clipboard.Moodle=Kladblok: Moodle
+Clipboard.iframe=Kladblok: <iframe>
Color=Kleur
ColorfulConstructionProtocol=Constructieoverzicht in kleur
Command=Commando
@@ -102,6 +108,8 @@ Day.7=Zaterdag
Decoration=Markering
Decreasing=Afnemen
Default=Standaard
+DefaultPointStyle=Standaard puntstijl
+Defaults=Standaard
Definition=Definitie
Delete=Verwijderen
DependentObjects=Afhankelijke objecten
@@ -131,6 +139,7 @@ EllipseWithFociABPassingThroughC=Ellips met brandpunten %0, %1 door %2
EllipseWithFociABandFirstAxisLengthC=Ellips met brandpunten %0, %1 en grote as %2
EmphasizeRightAngle=Beklemtoon rechte hoek
EmptySet=Lege verzameling
+EnableScripting=Scripting inschakelen
Equation=Vergelijking
ExplicitLineEquation=y = a x + b
ExplicitLineGradient=a
@@ -169,6 +178,7 @@ HyperbolaWithFociABandFirstAxisLengthC=Hyperbool met brandpunten %0, %1 en grote
Image=Afbeelding
ImplicitPoly=Impliciete kromme
Increasing=Toenemen
+IncreasingOnce=Toenemen (eén keer)
Inequality=Ongelijkheid
InflectionPointofA=Buigpunt van %0
InputFieldHelp=<html><body><p><b>Gebruik van het invoerveld</b></p><table border="1"><tr><td>Enter </td><td>opdracht uitvoeren</td></tr><tr><td>Escape</td><td>Maak invoerveld leeg</td></tr><tr><td>↑</td><td>vorige opdracht</td></tr><tr><td>↓</td><td>volgende opdracht</td></tr><tr><td>F1</td><td>help voor huidig commando</td></tr></table><p><br><b>Autoaanvulling opdrachten</b><br>Na het intikken van de eerste 2 letters <br>wordt een commando getoond.</p><table border="1"><tr><td>Enter </td><td>aanvaard voorgesteld commando</td></tr><tr><td>ga door met intikken</td><td>typ</td></tr></table><body></html>
@@ -181,9 +191,11 @@ IntegralOfAfromBtoC=Integraal van %0 van %1 tot %2
IntersectingLines=Snijdende rechten
IntersectionPointOfAB=Snijpunt van %0, %1
IntersectionPointOfABWithInitialValueC=Snijpunt van %0, %1 beginpunt %2
+InverseFilling=Omgekeerde vulling
Italic=Cursief
Keyboard=Toetsenbord
LaTeXFormula=LaTeX formule
+LaTeXHelp=Latex hulp
Large=Groot
LatexFontSize=LateX lettergrootte
Layer=Laag
@@ -201,6 +213,7 @@ LineThroughAwithDirectionB=Rechte door %0 met richting %1
LinearEccentricityOfA=Lineaire excentriciteit van %0
LinearInequality=Lineaire ongelijkheid
Lines=Rechten
+LinkedObject=Gelinkt Object
List=Lijst
Locus=Meetkundige plaats
Midpoint=Midden
@@ -230,6 +243,7 @@ No.=Nr.
Numeric=Getal
NumericObjects=Getal-objecten
Objects=Objecten
+On=Aan
Open=Openen
OpenButton=Knop om applicatie met constructie te openen
Oscillating=Oscilleren
@@ -250,12 +264,18 @@ Play=Afspelen
PlayButton=Knop voor afspelen
Point=Punt
PointAplusB=Punt %0 + %1
+PointDep=Afhankelijk
+PointFree=Vrij
+PointInside=In Regio
PointOn=Punt op
PointOnA=Punt op %0
+PointOnPath=Op pad
PointSize=Puntgrootte
Points=Punten
PolarCoords=Poolcoördinaten
+PolyLine=Veelhoekslijn
Polygon=Veelhoek
+PositiveDirectionOnly=Positieve zin
Properties=Eigenschappen
Quadrangle=Vierhoek
Quadrilateral=Vierhoek
@@ -285,11 +305,13 @@ Semicircle=Halfcirkel
SemicircleThroughAandB=Halfcirkel door %0 en %1
Show=Toon
ShowAllObjects=Toon alle objecten
+ShowAutomatically=Toon steeds
ShowAxes=Toon assen
ShowAxisNumbers=Toon getallen op assen
ShowGrid=Toon rooster
ShowLabel=Label tonen
ShowObject=Object tonen
+ShowOnXAxis=Toon op x-as
ShowOnlineHelp=Toon Online Help
ShowOnlyBreakpoints=Enkel stoppunten tonen
ShowTitleBar=Toon titelbalk
@@ -322,6 +344,7 @@ TickDistance=Afstand
Title=Titel
TitleExportPgf=GeoGebra naar PGF Export
TitleExportPstricks=GeoGebra naar PSTricks omzetting
+ToggleStyleBar=Opmaakwerkbalk
TraceOff=Spoor uit
TraceOn=Spoor aan
TraceToSpreadsheet=Spoor naar rekenblad
@@ -401,6 +424,8 @@ vertical=Verticaal
xAxis=xAs
xmax=xmax
xmin=xmin
+xstep=X Stapgrootte
yAxis=yAs
ymax=ymax
-ymin=ymin
\ No newline at end of file
+ymin=ymin
+ystep=Y Stapgrootte
\ No newline at end of file
diff --git a/geogebra/properties/plain_no_NO.properties b/geogebra/properties/plain_no_NO.properties
index ad3b8fb..8472073 100644
--- a/geogebra/properties/plain_no_NO.properties
+++ b/geogebra/properties/plain_no_NO.properties
@@ -1,5 +1,3 @@
-2x2Matrix=2x2 matrise
-3x3Matrix=3x3 matrise
ADecimalPlace=%0 desimal
ADecimalPlaces=%0 desimaler
ADerivativeOfB=%0. deriverte av %1
@@ -34,6 +32,7 @@ AisaTangentToB=%0 er en tangent til %1
AlgebraWindow=Algebrafelt
AliesOnB=%0 ligger på %1
AliesOnThePerimeterOfB=%0 ligger på omkretsen til %1
+AllowOfflineUse=Tillat lokal bruk
AllowStyleBar=Stillinje tilgjengelig
Altitude=Høyde
Angle=Vinkel
@@ -111,7 +110,6 @@ ConstructionProtocolHelp=<html><body><p><b>Bruk av konstruksjonsforklaring</b></
ConstructionProtocolNavigation=Navigasjonsmeny for trinnene i konstruksjonen
Coordinates=Koordinater
CopyToClipboard=Kopier til utklippstavla
-CopyToLaTeX=Kopier til LaTeX
CornerPoint=Hjørne
CreatedWith=Laget med
CreatedWithGeoGebra=Laget med GeoGebra
@@ -213,7 +211,6 @@ IgnoreDocumentLayout=Ignorer dokumentoppsett
Image=Bilde
ImplicitPoly=Implisitt kurve
IncircleOfTriangleABC=Innsirkel til trekanten %0%1%2
-IncludeJARFiles=Ta med *.jar-filer
Increasing=Økende
IncreasingOnce=Økende (en gang)
Inequality=Ulikhet
@@ -232,7 +229,7 @@ Interpolate=Tegn med interpolasjon
IntersectingLines=Kryssende linjer
IntersectionCurveOfAB=Skjæringskurve for %0, %1
IntersectionLineOfAB=Skjæringslinje mellom %0,%1
-IntersectionPathsOfAB=Skjæringsstier for %0, %1
+IntersectionOfAandB=Skjæring mellom %0 og %1
IntersectionPointOfAB=Skjæringspunkt mellom %0,%1
IntersectionPointOfABNearC=Skjæringspunkt for %0, %1 nær punkt %2
IntersectionPointOfABWithInitialValueC=Skjæringspunkt mellom %0,%1 med startverdi %2
@@ -322,12 +319,6 @@ PerspectiveName=Navn p
Picture=Bilde
PictureHeight=BIldehøyde
PictureWidth=BIldebredde
-PlaneA=plan %0
-PlaneContainingA=Plan som inneholder %0
-PlaneFromA=plan laget fra %0
-PlaneThroughAB=Plan gjennom %0, %1
-PlaneThroughABC=Plan gjennom %0, %1, %2
-PlaneThroughAParallelToB=Plan gjennom %0 parallelt med %1
Play=Spill av
PlayButton=Avspillingsknapp
Point=Punkt
@@ -341,7 +332,7 @@ PointOnA=Punkt p
PointOnAClosestToB=Punkt på %0, nærmest %1
PointOnPath=På sti
PointSize=Punktstørrelse
-Points=Punkt
+Points=Hjørner
PolarCoords=Polare koordinater
PolarLineOfARelativeToB=Polar linje for %0 i forhold til %1
PolyLine=Polylinje
diff --git a/geogebra/properties/plain_no_NO_NY.properties b/geogebra/properties/plain_no_NO_NY.properties
index 8e5a4d4..d8154ae 100644
--- a/geogebra/properties/plain_no_NO_NY.properties
+++ b/geogebra/properties/plain_no_NO_NY.properties
@@ -32,7 +32,6 @@ AxisLabel=Namn p
AxisTicks=Merke langs aksane
AxisUnitLabel=Eining
CASTimedOut=Tidsavbrot i CAS
-Caption=Objekt-tittel
CartesianCoords=Kartesiske koordinatar
CellAisNotDefined=Celle %0 er ikkje definert
CheckedNumerically=(sjekka numerisk)
@@ -61,7 +60,7 @@ ExportTextAsShapes=Eksporter tekst som figurar
ExtendedForm=Utvida form
FixCheckbox=Lås avkryssingsboks
ForceGnuplotPgf=Bruk Gnuplot til å teikne funksjonsgrafar
-GoToDownloadPage=Gå til side for nedlating
+GoToDownloadPage=Gå til side for nedlasting
GreekCharacterA=Gresk teikn: %0
Height=Høgde
Home=Heim
@@ -79,7 +78,7 @@ Interpolate=Teikn med interpolasjon
IntersectingLines=Kryssande linjer
IntersectionCurveOfAB=Skjeringskurve for %0, %1
IntersectionLineOfAB=Skjeringslinje mellom %0,%1
-IntersectionPathsOfAB=Skjeringsstiar for %0, %1
+IntersectionOfAandB=Skjering mellom %0 og %1
IntersectionPointOfAB=Skjeringspunkt mellom %0,%1
IntersectionPointOfABNearC=Skjeringspunkt for %0, %1 nær punkt %2
IntersectionPointOfABWithInitialValueC=Skjeringspunkt mellom %0,%1 med startverdi %2
@@ -105,13 +104,13 @@ Oscillating=Begge vegar
PerspectiveName=Namn på oppsett
PictureHeight=BIldehøgde
PictureWidth=BIldebreidde
-PlaneContainingA=Plan som inneheld %0
-PlaneFromA=plan laga frå %0
Play=Spel av
PlayButton=Avspelingsknapp
PointOnAClosestToB=Punkt på %0, nærast %1
PointSize=Punktstorleik
+Points=Hjørne
PolarCoords=Polare koordinatar
+PositiveDirectionOnly=Berre i positiv retning
PositiveValuesFollowTheView=Positive verdiar følgjer perspektivet
PreviewUnavailable=Førehandsvisning er ikkje tilgjengeleg
ProbabilityCalculator=Sannsynskalkulator
@@ -126,6 +125,7 @@ ShowAutomatically=Vis automatisk
ShowAxes=Vis aksar
ShowAxisNumbers=Vis tal langs aksane
ShowLabel=Vis namn
+ShowOnlyBreakpoints=Vis berre etappepunkt
ShowTrimmed=Vis justerte skjeringslinjer
SimpleFormulas=Enkle formlar
Size=Storleik
diff --git a/geogebra/properties/plain_pl.properties b/geogebra/properties/plain_pl.properties
index 441ff14..fc0feef 100644
--- a/geogebra/properties/plain_pl.properties
+++ b/geogebra/properties/plain_pl.properties
@@ -1,5 +1,3 @@
-2x2Matrix=macierz 2x2
-3x3Matrix=macierz 3x3
ADecimalPlace=%0 miejsce po przecinku
ADecimalPlaces=%0 miejsca po przecinku
ADerivativeOfB=%0 pochodna %1
@@ -34,6 +32,7 @@ AisaTangentToB=%0 jest styczna do %1
AlgebraWindow=Widok Algebry
AliesOnB=%0 le\u017cy na %1
AliesOnThePerimeterOfB=%0 le\u017cy na brzegu %1
+AllowOfflineUse=Zawiera pliki *. jar
AllowStyleBar=Pasek stylu jest dozwolony
Alt=Alt (klawiatura)
AltGr=AltG (klawiatura)
@@ -114,7 +113,6 @@ ConstructionProtocolHelp=<html><body><p><b>Obs\u0142uga Protoko\u0142u Konstrukc
ConstructionProtocolNavigation=Pasek nawigacji etapów konstrukcji
Coordinates=Wspó\u0142rz\u0119dne
CopyToClipboard=Skopiuj do schowka
-CopyToLaTeX=Kopiuj do LaTeX
CornerPoint=Naro\u017cnik
CreatedWith=Utworzony z
CreatedWithGeoGebra=Utworzony z GeoGebra
@@ -217,7 +215,6 @@ IgnoreDocumentLayout=Ignoruj uk\u0142ad Dokumentu
Image=Obraz
ImplicitPoly=Krzywa domy\u015blna
IncircleOfTriangleABC=Okr\u0105 wpisany w trójk\u0105t %0%1%2
-IncludeJARFiles=Zawiera pliki *. jar
Increasing=Powi\u0119kszenie
IncreasingOnce=Powi\u0119kszenie (Raz)
Inequality=Nierówno\u015b\u0107
@@ -236,7 +233,7 @@ Interpolate=Interpoluj
IntersectingLines=Proste przecinaj\u0105ce si\u0119
IntersectionCurveOfAB=Przeci\u0119cie krzywych %0, %1
IntersectionLineOfAB=Przeci\u0119cie prostych %0, %1
-IntersectionPathsOfAB=Przeci\u0119cie \u015bcie\u017cek %0, %1
+IntersectionOfAandB=Przeci\u0119cie %0, %1
IntersectionPointOfAB=Punkt przeci\u0119cia %0, %1
IntersectionPointOfABNearC=Punkt przeci\u0119cia %0, %1 w pobli\u017cu punktu %2
IntersectionPointOfABWithInitialValueC=Punkt przeci\u0119cia %0, %1 z warto\u015bci\u0105 pocz\u0105tkow\u0105 %2
@@ -329,12 +326,6 @@ PerspectiveName=Nazwa widoku
Picture=Obraz
PictureHeight=Wysoko\u015b\u0107 obrazu
PictureWidth=Szeroko\u015b\u0107 obrazu
-PlaneA=P\u0142aszczyzna %0
-PlaneContainingA=P\u0142aszczyzna zawieraj\u0105ca %0
-PlaneFromA=P\u0142aszczyzna utworzona z %0
-PlaneThroughAB=P\u0142aszczyzna przez %0, %1
-PlaneThroughABC=P\u0142aszczyzna przez %0, %1, %2
-PlaneThroughAParallelToB=P\u0142aszczyzna przez %0 równoleg\u0142a do %1
Play=Odtwórz
PlayButton=Przycisk odtwarzania
Point=Punkt
@@ -526,7 +517,7 @@ jpg=Format JPG
max=maksimum
min=minimum
off=wy\u0142\u0105czony
-otherwise=pozosta\u0142e
+otherwise=pozostale
parallel=równoleg\u0142y
pdf=pdf
png=png
diff --git a/geogebra/properties/plain_pt.properties b/geogebra/properties/plain_pt.properties
index 4a595e4..9d49823 100644
--- a/geogebra/properties/plain_pt.properties
+++ b/geogebra/properties/plain_pt.properties
@@ -1,5 +1,3 @@
-2x2Matrix=Matriz 2x2
-3x3Matrix=Matriz 3x3
ADecimalPlace=%0 Casa Decimal
ADecimalPlaces=%0 Casas Decimais
ADerivativeOfB=%0 derivada de %1
@@ -35,6 +33,7 @@ Algebra=
AlgebraWindow=Janela de Álgebra
AliesOnB=%0 pertence a %1
AliesOnThePerimeterOfB=%0 pertence à fronteira de %1
+AllowOfflineUse=Incluir arquivos *.jar
AllowStyleBar=Permitir Barra de Estilos
Altitude=Altura
Angle=Ângulo
@@ -113,7 +112,6 @@ ConstructionProtocolHelp=<html><body><p><b>Usando o Protocolo de Constru
ConstructionProtocolNavigation=Barra de Navegação para Passos da Construção
Coordinates=Coordenadas
CopyToClipboard=Copiar para Área de Transferência
-CopyToLaTeX=Copiar para LaTeX
CornerPoint=Canto
CreatedWith=Criado com
CreatedWithGeoGebra=criado com o GeoGebra
@@ -217,7 +215,6 @@ IgnoreDocumentLayout=Ignorar Estrutura do Documento
Image=Imagem
ImplicitPoly=Curva Implícita
IncircleOfTriangleABC=Círculo inscrito do triângulo %0%1%2
-IncludeJARFiles=Incluir arquivos *.jar
Increasing=Crescente
IncreasingOnce=Crescente (Uma Vez)
Inequality=Desigualdade
@@ -236,7 +233,7 @@ Interpolate=Desenhar usando interpola
IntersectingLines=Hipérbole degenerada
IntersectionCurveOfAB=Curva de interseção de %0, %1
IntersectionLineOfAB=Reta de interseção de %0, %1
-IntersectionPathsOfAB=Caminhos de interseção de %0, %1
+IntersectionOfAandB=Interseção de %0, %1
IntersectionPointOfAB=Ponto de interseção de %0, %1
IntersectionPointOfABNearC=Ponto de interseção de %0, %1 próximo do ponto %2
IntersectionPointOfABWithInitialValueC=Ponto de interseção de %0, %1 com valor inicial %2
@@ -330,12 +327,6 @@ PerspectiveName=Nome da Disposi
Picture=Figura
PictureHeight=Altura da figura
PictureWidth=Largura da figura
-PlaneA=plano %0
-PlaneContainingA=Plano contendo %0
-PlaneFromA=plano criado a partir de %0
-PlaneThroughAB=Plano passando por %0, %1
-PlaneThroughABC=Plano passando por %0, %1, %2
-PlaneThroughAParallelToB=Plano passando por %0 e paralelo a %1
Play=Reproduzir
PlayButton=Botão para reproduzir a construção
Point=Ponto
diff --git a/geogebra/properties/plain_pt_PT.properties b/geogebra/properties/plain_pt_PT.properties
index f95eef3..1e49230 100644
--- a/geogebra/properties/plain_pt_PT.properties
+++ b/geogebra/properties/plain_pt_PT.properties
@@ -1,143 +1,164 @@
-3x3Matrix=Matriz 3X3
+ADecimalPlace=%0 Número Decimal
+ADecimalPlaces=%0 Números Decimais
+ADerivativeOfB=%0 Derivada de %1
ADilatedByFactorBfromC=Imagem de %0 na homotetia de razão %1 e centro %2
-ADoesNotIntersectWithB=%0 não se interseta com %1
-AIntersectsWithB=%0 interseta com %1
-AMirroredAtB=Simétrico (ou inverso) de %0 relativamente a %1
+ADoesNotIntersectWithB=%0 não interseta %1
+AGray=%0 Cinzento
+AIntersectsWithB=%0 interseta %1
+AMirroredAtB=%0 refletido a %1
ARotatedByAngleB=Imagem de %0 na rotação de ângulo %1
-AandBareLinearlyDependent=%0 e %1 são colineares
-AandBareLinearlyIndependent=%0 e %1 não são colineares
-AbsoluteScreenLocation=Posição Absoluta no Ecrã
-AdoesNothaveTheSameAreaAsB=%0 não tem a mesma área de %1
-AdoesNothaveTheSameLengthAsB=%0 não tem o mesmo comprimento de %1
-AhasTheSameAreaAsB=%0 tem a mesma área de %1
-AhasTheSameLengthAsB=%0 tem o mesmo comprimento de %1
-AintersectsWithBOnce=%0 e %1 possuem um único ponto em comum
-AintersectsWithBTwice=%0 e %1 possuem dois pontos em comum
-AisAnAsymptoteToB=%0 é assintota de %1
+ASignificantFigure=%0 algarismo significativo
+ASignificantFigures=%0 algarismos significativos
+AandBareNotEqual=%0 e %1 não são iguais
+AandBareParallel=%0 e %1 não são paralelas
+AandBarePerpendicular=%0 e %1 não são perpendiculares
+AandBcannotBeCompared=%0 e %1 não podem ser comparadas
+AbsoluteScreenLocation=Posição absoluta no Ecrã
+AdoesNotLieOnThePerimeterOfB=%0 não pertence ao perímetro de %1
+AdoesNothaveTheSameAreaAsB=%0 não tem a mesma área que %1
+AdoesNothaveTheSameLengthAsB=%0 não tem o mesmo comprimento de %1
+AhasTheSameLengthAsB=%0 não tem o mesmo comprimento de %1
+AintersectsWithBOnce=%0 interseta uma vez com %1
+AintersectsWithBTwice=%0 interseta duas vezes com %1
+AisAnAsymptoteToB=%0 é uma assintota de %1
+AisNotDefined=%0 não está definido
AlgebraWindow=Folha Algébrica
+AliesOnB=%0 não pertence a %1
+AliesOnThePerimeterOfB=%0 não pertence ao perímetro de %1
+AllowOfflineUse=Incluir ficheiros *.jar
+AllowStyleBar=Barra de Estilo permitida
AltGr=AltGr
-AngleBetweenAB=Ângulo entre %0 e %1
-AngleBetweenABC=Ângulo %0, %1,%2
-AngleOfA=Ângulo polar de %0
+AngleBetweenAB=Ângulo entre %0,%1
+AngleBetweenABC=Ângulo entre %0,%1, %2
+AngleBetweenABCofD=Ângulo entre %0,%1, %2 de %3
+AngleBisectorOfAB=Bissetriz de %0,%1
+AngleBisectorOfABC=Bissetriz de %0,%1, %2
AnimatedGIFExport=Folha Gráfica como GIF animado
-AnimationLoop=Repetida?
+AnimationLoop=Como repetição?
AsymptoteToA=Assintota de %0
-Ath=%0ª
-Automatic=Automáticas
+Ath=%0mil
+Automatic=Automático
AuxiliaryObject=Objeto Auxiliar
Back=Anterior
Boolean=Booleano
-Breakpoint=Ponto de Quebra
+Breakpoint=PontoQuebra
CAS=CAS (Cálculo Algébrico Simbólico)
CASInitializing=Inicialização CAS
-CASTimedOut=O tempo de execução da CAS atingiu o limite
-CasTimeout=Tempo de espera da CAS (segundos)
+CASTimedOut=tempo esgotado CAS
+CasTimeout=Tempo de espera da CAS (em segundos)
+CellAisNotDefined=Célula %0 não está definida
+CentroidOfA=Centróide de %0
ChooseColor=Escolher uma cor
-ChooseObject=Escolher um objeto
Circle=Circunferência
-CircleOfAxisAThroughB=Círculo de eixo %0 através de %1
-CircleThroughABC=Circunferência passando por %0, %1, %2
-CircleThroughAwithCenterB=Circunferência de centro %1 passando por %0
-CircleWithCenterARadiusBParallelToC=Circunferência de centro %0 e raio %1, paralela a %2
-CircleWithCenterAThroughBAxisParallelToC=Circunferência de centro %0 passando por %1, eixo paralelo a %2
-CircleWithCenterAThroughBParallelToC=Circunferência de centro %0 passando por %1, paralela a %2
-CircleWithCenterAandRadiusB=Circunferência de centro %0 e raio %1
-CircleWithCenterAandRadiusBAxisParallelToC=Circunferência de centro %0 e raio %1, eixo paralelo a %2
+CircleOfAxisAThroughB=Circunferência do eixo %0 que contém %1
+CircleThroughABC=Circunferência que contém %0, %1, %2
+CircleThroughAwithCenterB=Circunferência que contém %0, com centro %1
+CircleWithCenterARadiusBParallelToC=Circunferência com centro %0 e raio %1, paralelo a %2
+CircleWithCenterAThroughBAxisParallelToC=Circunferência com centro %0 passando por %1, eixo paralelo a %2
+CircleWithCenterAThroughBParallelToC=Circunferência com centro %0 passando por %1, eixo paralelo a %2
+CircleWithCenterAandRadiusB=Circunferência com centro %0 e raio %1
+CircleWithCenterAandRadiusBAxisParallelToC=Circunferência com centro %0 e raio %1, eixo paralelo a %2
Clipboard.HTML=Área de Transferência: html
-ColorfulConstructionProtocol=Protocolo de construção colorido
-CommonTangentOfCirclesAandB=Tangente comum das circunferências %0 e %1
+ColorfulConstructionProtocol=Cor do protocolo de constução
+CommonTangentOfCirclesAandB=Tangente comum às circunferências %0 e %1
Conic=Cónica
-ConicFromCoeffListA=Cónica definida por %0
-ConicThroughABCDE=Cónica passando por %0, %1, %2, %3, %4
+ConicFromCoeffListA=Cónica de %0
+ConicThroughABCDE=Cónica contendo de %0,%1,%2,%3,%4
Conics=Cónicas
-ConstructionProtocolHelp=<html><body><p><b>Como usar o protocolo de construção</b></p><p><br><b>Teclado</b></p><table border="1"><tr><td>↑</td><td>Passo anterior da construção</td></tr><tr><td>↓</td><td>Próximo passo da construção</td></tr><tr><td>Home</td><td>Início da construção</td></tr><tr><td>End</td><td>Fim da construção</td></tr><tr><td>Delete</td><td>Apagar passo da construção</td></tr></table><p><b><br>Rato</b></p><table border="1"><tr><td>Duplo clique sobre a linha</td><td>escolhe o passo da construção</td></tr><tr><td>Duplo clique no cabeçalho</td><td>início da construção</td></tr><tr><td>arrastar & largar</td><td>move para o passo da construção</td></tr><tr><td>Clique com o botão direito do rato</td><td>menu contextualizado</td></tr></table><body></html>
-ConstructionProtocolNavigation=Barra de Reprodução da Construção
+ConstructionProtocolHelp=<html> <p> <b> <body> Usando o Protocolo de Construção </ b> </ p> <p <br> <b> Teclado </ b> </ p> <table border="1"> <tr> <td> \u2191 </ td> passo da construção anterior </ td> </ tr> <tr> <td> \u2193 </ td> etapa seguinte de construção </ td> </ tr> <tr> <td> Home </ td> Início da construção </ td> </ tr> <tr> End <td> </ td> Fim da Construção </ td> </ tr> <tr> <td> Del </ td> passo construção Delete </ td> </ tr> </ table> <p <b> rato </ b> </ p> borda da tabela <= "1"> <tr> <td> linha Dê um duplo clique </ td> Escolha etapa de construção </ td> </ tr> <tr> <td> cabeçalho clique duas vezes </ td> Iniciar <td> de construção </ td> </ tr> <tr> <td> linha drag & drop </ td> passo construção Mover </ td> </ tr> <tr> <td> linha clique com o botão direito </ td > <td> menu de contexto </ td> </ tr> </ table <body>> </ html>
+ConstructionProtocolNavigation=Barra de Navegação para Passos de Construção
CopyToClipboard=Copiar para a Área de Transferência
-CreatedWithGeoGebra=Criado com Geogebra
+CreatedWithGeoGebra=Criado com GeoGebra
CrossAt=Cruza em
-Day.2=Segunda-feira
-Day.3=Terça-feira
-Day.4=Quarta-feira
-Day.5=Quinta-feira
-Day.6=Sexta-feira
-DefaultPointStyle=Representação dos Pontos
-DeleteRowA=Eliminar Linha %0
-DeleteRowsAtoB=Apagar Linhas de %0 até %1
-DiameterOfAConjugateToB=Diametral de %0 conjugada de %1
-DirectionOfA=Vetor Diretor de %0
+Day.1=domingo
+Day.2=segunda-feira
+Day.3=terça-feira
+Day.4=quarta-feira
+Day.5=quinta-feira
+Day.6=sexta-feira
+Day.7=sábado
+DefaultPointStyle=Estilo do Ponto Padrão
+DeleteRowA=Apagar linha %0
+DeleteRowsAtoB=Apagar linhas de %0 a %1
+DiameterOfAConjugateToB=Diâmetro conjugado de %1 a %0
Display=Vista
-DisplayPointSymbol=Exibir o símbolo para os pontos
-DoubleClickToOpen=Abrir aplicação com duplo clique na Folha Gráfica
-DrawingPad=Folha Gráfica 1
+DisplayPointSymbol=Exibir o símbolo de pontos
+DoubleClickToOpen=Duplo clique para abrir Janela do GeoGebra
+DoubleLine=Linha dupla
+Down=Baixo
+DrawingPad=Folha Gráfica
DrawingPad2=Folha Gráfica 2
DrawingPadA=Folha Gráfica %0
-DrawingPadAsPSTricks=Folha Gráfica como PSTricks
+DrawingPadAsPSTricks=Vista Gráfica como PSTricks
DrawingPadAsPicture=Folha Gráfica como Imagem
-DrawingPagAsPGF=Folha Gráfica como PGF/TikZ
-DynamicWorksheet=Apliqueta de Matemática Dinâmica
-DynamicWorksheetAsWebpage=Apliqueta ggb embutida em página Web
-DynamicWorksheetExport=Exportar apliqueta ggb embutida em página Web
-EccentricityOfA=Excentricidade linear de %0
-EllipseWithFociABPassingThroughC=Elipse com focos %0 e %1 passando por %2
-EllipseWithFociABandFirstAxisLengthC=Elipse com focos %0 e %1 e eixo maior de comprimento %2
-EmphasizeRightAngle=Realçar o Ângulo Reto
+DrawingPagAsPGF=Vista Gráfica como PGF/TikZ
+DynamicWorksheet=Folha Gráfica Dinâmica
+DynamicWorksheetAsWebpage=Folha Gráfica Dinâmica como Página Web
+DynamicWorksheetExport=Exportar Folha Gráfica Dinâmica (html)
+EllipseWithFociABPassingThroughC=Elipse com focos %0, %1 contendo %2
+EmphasizeRightAngle=Enfatizar Ângulo Direto
+EmptySet=Conjunto Vazio
EnableScripting=Permitir Programação
-ErrorInJavaScript=Erro no Javacript
-ErrorInJavaScriptAtLineA=Erro no JavaScript, na linha %0
+ErrorInJavaScript=Erro no JavaScript
+ErrorInJavaScriptAtLineA=Erro no JavaScript na linha %0
+ErrorInScriptAtLineAFromObjectB=Erro no JavaScript na linha %0 ( chamada de %1)
ExplicitLineEquation=y = m x + b
ExplicitLineGradient=m
ExportAnimatedGIF=Folha Gráfica como GIF animado
ExportAsPicture=Folha Gráfica como Imagem
-ExportAsWebpage=Exportar para a Web
-ExportTextAsShapes=Texto como Imagem
-ExtendedForm=Forma prolongada
+ExportAsWebpage=Exportar com página Web
+ExportTextAsShapes=Exportar Texto como formas
File.HTML=Ficheiro: html
File.SCORM=Ficheiro: SCORM
-FirstAxisLengthOfA=Comprimento do eixo maior de %0
-FirstAxisOfA=Eixo maior de %0
+Filling=Enchimento
+FirstAxisOfA=Eixo Principal de %0
FixCheckbox=Fixar Caixa de Controlo
-ForceGnuplotPgf=Utilizar Gnuplot para desenhar funções
-FunctionAonIntervalBC=Restrição de %0 no intervalo [%1, %2]
+FocusOfA=Focos de %0
+ForceGnuplotPgf=Usar GnuPlot para desenhar funções
+FreeObjects=Objetos livres
+FunctionAonIntervalBC=Função %0 no intervalo [%1, %2]
GeneratePstricks=Gerar código PostScript
-GoToDownloadPage=Ir para a página de Download
-GraphicsViewAsAsymptote=Folha Gráfica como Asymptote
-GreekCharacterA=Caráter Grego: %0
+GeometricObjects=Objeto geométricos
+GlobalJavaScript=Javascript Global
+GoToDownloadPage=Ir para Página de download
+GraphicsViewAsAsymptote=Vista Gráfica como Asymptote
+GreekCharacterA=Caráter grego; %0
GridType=Tipo de Grelha
-HyperbolaWithFociABPassingThroughC=Hipérbole com focos %0 e %1 passando por %2
-HyperbolaWithFociABandFirstAxisLengthC=Hipérbole com focos %0 e %1 e eixo principal de comprimento %2
+HyperbolaWithFociABandFirstAxisLengthC=Hipérbole com focos %0, %1 e comprimento do eixo transverso %2
IgnoreDocumentLayout=Ignorar o Layout
-IncircleOfTriangleABC=Circunferência Inscrita no Triângulo %0%1%2
-IncludeJARFiles=Incluir ficheiros *.jar
+ImplicitPoly=Curva implícita
+IncircleOfTriangleABC=Circunferência inscrita %0%1%2
IncreasingOnce=Incrementar uma vez
Inequality=Inequação
-InputFieldHelp=<html><body><p><b>Utilização do campo de entrada</b></p><table border="1"><tr><td>Enter </td><td>Executa o comando na entrada</td></tr><tr><td>Esc</td><td>Apaga o campo de entrada</td></tr><tr><td>↑</td><td>Entrada anterior</td></tr><tr><td>↓</td><td>Próxima entrada</td></tr><tr><td>F1</td><td>Ajuda para o comando actual</td></tr></table><p><br><b>Autocompletamento de comandos</b><br>Depois de digitar as primeiras duas letras de<br>um comando, este é exibido.</p><table border="1"><tr><td>Enter </td><td>aceita o comando</td></tr><tr><td>Outra letra</td><td>prossegue com a digitação do comando</td></tr></table><body></html>
+InflectionPointofA=Ponto de Inflexão de %0
+InputFieldHelp=<html> <p> <b> <body> Utilizando a Barra de Entrada </ b> </ p> <table border="1"> <tr> <td> Enter </ td> Executar entrada </ td> </ tr> <tr> <td> Escape </ td> Limpar barra de entrada </ td> </ tr> <tr> <td> \u2191 </ td> entrada anterior </ td > </ tr> <tr> <td> \u2193 </ td> entrada Next </ td> </ tr> <tr> <td> F1 </ td> Ajuda para o comando atual </ td > </ tr> <tr> TAB <td> </ td> Mostrar próximo comando </ td> </ tr> </ table> <p <br> <b> Preenchimento Automático de comandos </ b> <br> Depois de digitar as duas primeiras letras de um comando <br> GeoGebra completará o comando. </ p> <table border="1"> <tr> <td> Enter </ td> <td> Aceitar comando </ td> </ tr> <tr> <td> Outra letra </ td> Adapta comando proposto </ td> </ tr> </ table> <body> </ html>
InputForm=Formulário de entrada
-InsertPictureOfAllOpenViews=Inserir uma imagem de todas as folhas abertas
+InsertPictureOfAllOpenViews=Inserir imagem de todas as vistas
InsertPictureOfConstruction=Inserir a imagem da construção
-IntegralOfAfromBtoC=Integral de %0 desde %1 até %2
Interpolate=Desenhar com interpolação
-IntersectingLines=Interseção de linhas
-IntersectionCurveOfAB=Curva de Interseção de %0, %1
-IntersectionLineOfAB=reta de Interseção de %0, %1
-IntersectionPathsOfAB=Interseção de %0, %1
-IntersectionPointOfAB=Ponto de Interseção de %0, %1
-IntersectionPointOfABNearC=Ponto de Interseção de %0, %1 próximo do ponto %2
-IntersectionPointOfABWithInitialValueC=Ponto de Interseção de %0, %1 com valor inicial %2
-InverseFilling=Inverter preenchimento
+IntersectingLines=Interseção de retas
+IntersectionLineOfAB=Reta de interseção de %0 , %1
+IntersectionOfAandB=Interseção de %0 e %1
+IntersectionPointOfAB=Pontos de Interseção de %0, %1
+IntersectionPointOfABNearC=Pontos de Interseção de %0, %1 próximo do ponto %2
+IntersectionPointOfABWithInitialValueC=Pontos de Interseção de %0, %1 com valor inicial %2
+InverseFilling=Preenchimento Contrário
Keyboard=Teclado Virtual
LatexFontSize=Tamanho das fontes LaTeX no documento
-LineBisectorAB=Mediatriz %0,%1
+LineBisectorAB=Bissetriz %0,%1
+LineBisectorOfA=Bissetriz %0
LineStyle=Estilo da Linha
-LineThroughAParallelToB=Reta paralela a %1 passando por %0
-LineThroughAPerpendicularToB=Reta perpendicular a %1 passando por %0
-LineThroughAwithDirectionB=Reta passando por %0 e com a direção de %1
-LinearEccentricityOfA=Excentricidade Linear de %0
+LineThroughAB=Reta passando por %0,%1
+LineThroughAParallelToB=Reta passando por %0, paralela a %1
+LineThroughAPerpendicularToB=reta passando por %0, perpendicular a %1
+LineThroughAwithDirectionB=reta passando por %0 com a direção de %1
LinearInequality=Inequação linear
-LocalizedLabels=Usar Rotulagem de Pontos Local
-LockObject=Fixar Objeto
+LocalizedDigits=Definir número de digitos
+LocalizedLabels=Definir nomes dos pontos
+LockObject=Objeto Fixo
Locus=Locus
MidpointOfA=Ponto Médio de %0
-MidpointOfAB=Ponto Médio de %0,%1
+MidpointOfAB=Ponto Médio de %0, %1
Miscellaneous=Diverso
Month.1=janeiro
Month.10=outubro
@@ -155,76 +176,87 @@ Name.button=bot
Name.locus=locus
Name.picture=imagem
Name.polygon=polígono
-Name.textfield=caixatTexto
+Name.textfield=CaixaDeEntrada
NameAndValue=Nome e Valor
-NewerVersionA=Está disponível uma nova versão do GeoGebra.\nQuero obter o GeoGebra %0 agora?
+NewerVersionA=Uma nova versão do GeoGebra está disponível.\nQuer atualizar a versão %0 agora?
Next=Seguinte
NextCell=Célula Seguinte
No.=Nº
-NoJavaMessage=Esta é uma apliqueta Java criada com o GeoGebra de www.geogebra.org - Talvez não tenha o Java instalado. Vá s.f.f. para href="http://www.java.com"> <a www.java.com </ a>
+NoJavaMessage=Este é um Applet Java criado usando o GeoGebra de www.geogebra.org - parece que não tem o Java instalado, aceda a www.java.com
+NotAvailable=Não disponível
NotIncluded=Não Incluído
+NumericObjects=Objeto Numérico
Off=Inativas
+OldExpression=Expressão desatualizada
On=Ativas
OnClick=Se Clicar
-OnMouseOver=Se Sobrepuser o Rato
+OnMouseOver=Com o Rato Sobre
OnUpdate=Se Atualizar
OpenButton=Botão para abrir a aplicação com a construção
Oscillating=Alternado
OverwriteFile=Quer substituir este ficheiro?
-PGFExport.Grayscale=Tons de cinza
+PGFExport.Grayscale=Cinzento
ParabolaEquation=y² = ou x² =
+ParametricForm=Equação Vetorial
Picture=Imagem
PictureHeight=Altura da imagem
PictureWidth=Largura da imagem
-PlaneFromA=Plano criado a partir de %0
-PlaneThroughAB=Plano através %0,%1
-PlaneThroughABC=Plano %0,%1,%2
-PlaneThroughAParallelToB=Plano através de %0 paralelo a %1
-PointInside=Ponto Interior
+PointInside=Na Região
PointOn=Ponto em
PointOnA=Ponto em %0
-PointOnAClosestToB=Ponto em %0 mais próximo de %1
-PointOnPath=Ponto no Caminho
+PointOnAClosestToB=Ponto em %0 próximo de %1
+PointOnPath=No Caminho
Points=Pontos
-PolarLineOfARelativeToB=Reta polar de %0 relativamente a %1
+PolarLineOfARelativeToB=Reta polar de %0 relativa a %1
PolyLine=Linha Poligonal
PositiveDirectionOnly=Só Sentido Positivo
PositiveValuesFollowTheView=Os valores positivos seguem a vista
-PreviewUnavailable=Pré-visualização Indisponível
+PreviewUnavailable=Visualização não Disponível
Properties=Propriedades dos Objetos
Random=Aleatório
-ResizeAngle=Redimensionamento automático do ângulo
-ReverseMouseWheel=Rodar o roda do rato em sentido contrário
-RootOfAonIntervalBC=Raiz de %0 no intervalo [%1,%2]
-SecondAxisLengthOfA=Comprimento do eixo menor de %0
-SecondAxisOfA=Eixo menor de %0
+RayThroughAB=Semirreta passando %0, %1
+RayThroughAWithDirectionB=Semirreta passando %0, com a direção de %1
+ResizeAngle=Redimensionar automaticamente o ângulo
+ReverseMouseWheel=Inverter a roda do rato
+RootOfAWithInitialValueB=Raiz de %0 com valor inicial de %1
+RootOfAonIntervalBC=Raiz de %0 no intervalo[%1,%2]
+Segment=Segmento de reta
+SegmentAB=Segmento de reta [%0,%1]
+SegmentABofC=Segmento de reta [%0,%1] de %2
+SelectionAllowed=Seleção permitida
Semicircle=Semicircunferência
-SemicircleThroughAandB=Semicircunferência com extremos %0 e %1
+SemicircleThroughAandB=Semicircunferência de extremos %0 e %1
+ShowAllObjects=Mostrar Todos os Objetos
+ShowAutomatically=Mostrar Automaticamente
ShowGrid=Exibir Grelha
+ShowObject=Mostrar Objetos
ShowOnXAxis=Exibir eixo Ox
-ShowOnlyBreakpoints=Exibir Apenas Pontos de Quebra
+ShowOnlyBreakpoints=Mostrar só Pontos de Quebra
ShowTitleBar=Exibir o Título das Folhas
ShowTrace=Exibir Traço
-ShowTrimmed=Exibir prolongamentos das linhas de interseção
+ShowTrimmed=Mostrar linhas de interseção
Slider=Seletor
SlopeOfA=Declive de %0
-SphereThroughAwithCenterB=Esfera com centro %1 passando por %0
+SphereThroughAwithCenterB=Esfera contendo %0 com centro em %1
+SphereWithCenterAandRadiusB=Esfera com centro em %0 e raio %1
Spreadsheet=Folha de Cálculo
StandardView=Vista Padrão
-StartingPoint=Ponto Âncora
-StemPlot.KeyAMeansB=Chave de Leitura: %0 significa %1
-StickToEdge=Ajustar ao bordo da janela
-StopScript=Parar execução do programa
-SubstituteSimplify=Substituir e Simplificar
-SystemInformationMessage=Informação do Sistema copiada com êxito para a área de transferência
-TextAfterConstruction=Texto depois da construção
-TextBeforeConstruction=Texto antes da construção
-TextField=Caixa de Texto
-TextfieldLength=Comprimento da Caixa de Texto
+StartingPoint=Ponto inicial
+StemPlot.KeyAMeansB=Chave:%0 significa %1
+StemPlot.high=Superior
+StickToEdge=Ajustar ao Bordo da Janela
+StopScript=Para Script
+SyntaxErrorAisNotAList=Erro de Sintaxe;%0 não está disponível
+SystemInformationMessage=Informação do Sistema copiado com sucesso para a Área de Transferência
+TangentToAatB=Tangente a %0 a %1
+TextAfterConstruction=Texto debaixo da construção
+TextField=Caixa de Entrada
+TextfieldLength=Comprimento da Caixa da Entrada
+Thickness=Espessura da linha
TickDistance=Distância entre Marcas
TimeBetweenFrames=Tempo entre Frames
-TitleExportPgf=Geogebra em formato PGF
-TitleExportPstricks=Geogebra em formato PostScript
+TitleExportPgf=Exportar GeoGebra para PGF
+TitleExportPstricks=Exportar GeoGebra para PSTricks
ToggleStyleBar=Exibir ou Esconder Barra de Estilos
ToolbarIcon=Ícones das Ferramentas
ToolbarIconsConstructionProtocolExport=Mostrar Ícones das Ferramentas
@@ -233,25 +265,27 @@ TooltipTimeout=Dura
Tooltips=Descrições
TraceOff=Desativar Traço
TraceOn=Ativar Traço
-TraceToSpreadsheet=Enviar Traço para a Folha de Cálculo
-TranslationOfAbyB=Imagem de %0 na translação pelo vetor %1
-TreeModeView=Ordenar Objetos por Folha
+TraceToSpreadsheet=Traço para a Folha de Cálculo
+TreeModeLayer=Ordenar Objetos por Camadas
+TreeModeView=Ordenar objetos por Vista
UnitVectorPerpendicularToA=Vetor unitário perpendicular a %0
-Up=Para Cima
+Up=Acima
Upload=Enviar
-UploadError=Não foi possível aceder ao GeoGebraTube. Envio abortado. (Código do Erro: %0)
-UploadPrepare=A preparar o envio
-UseJavaFontsForLaTeX=Utilizar Fontes Java para Texto LaTex
+UploadError=Não pode aceder ao GeoGebraTube. Upload falhado (Código do erro:%0)
+UploadPrepare=A preparar o Upload
+UseJavaFontsForLaTeX=Utilizar as fontes Java para texto LaTexX
VectorPerpendicularToA=Vetor perpendicular a %0
+ViewCloseExtraWindow=Mostrar Vista na Janela Principal
ViewOpenExtraWindow=Exibir numa Nova Janela
VirtualKeyboardLanguage=Idioma
-XMLTagANotFound=Ficheiro inválido: tag XML %0 não encontrada
+XMLTagANotFound=Ficheiro Inválido: XML tag %0 não encontrado
+XUnits=Unidade X(cm)
YUnits=Unidade Y(cm)
-allowOutlyingIntersections=Permitir pontos de interseção exteriores
-dilatedByFactor=ampliado (ou reduzido) por um fator
+allowOutlyingIntersections=Permitir interseções
+dilatedByFactor=ampliado (ou reduzido) por uma razão
emf=Enhanced Meta Format
equal=iguais
-firstAxisLength=comprimento do eixo maior
+firstAxisLength=Comprimento do eixo principal
fncInspector.Derivative2=Segunda Derivada
fncInspector.ShowArea=Mostrar Área
fncInspector.addColumn=Adicionar coluna
@@ -259,29 +293,33 @@ fncInspector.showOscCircle=Mostrar circunfer
fncInspector.showTable=Mostrar tabela de pontos
fncInspector.showTangent=Mostrar reta tangente
fncInspector.showXYLines=Mostrar leitura das coordenadas
-fncInspector.step=Incremento para os valores de x
+fncInspector.step=Tamanho do passo para valores de x
forward=seguinte
max=Max
min=Min
off=Desativada
parallel=paralelas
resetConstruction=Reiniciar a construção
+stylebar.Align=Definir o alinhamento horizontal
stylebar.AlignCenter=Centrar
stylebar.Axes=Mostrar ou esconder os eixos
stylebar.BgColor=Definir a cor de fundo
+stylebar.Bold=Definir o estilo da fonte para negrito
stylebar.Border=Limites
stylebar.Bracket=Parêntesis
stylebar.Caption=Legenda
-stylebar.Capture=Captura de pontos
-stylebar.ColorTransparency=Cor e Opacidade
+stylebar.Capture=Definir o estilo de captura de pontos
+stylebar.Color=Definir Cor
+stylebar.ColorTransparency=Definir Cor e Opacidade
stylebar.Grid=Mostrar ou Esconder Grelha
stylebar.HorizontalLine=Exibir ou esconder linhas horizontais
stylebar.LineStyle=Estilo das linhas
-stylebar.PointStyle=Estilo dos pontos
+stylebar.PointStyle=Definir o estilo de ponto
+stylebar.TextColor=Definir a cor do texto
stylebar.TextSize=Tamanho da fonte
stylebar.VerticalLine=Exibir ou esconder linhas verticais
svg=Scaleable Vector Graphics
undefined=não definido(a)
unequal=diferentes
-xstep=passo X
-ystep=passo Y
\ No newline at end of file
+xstep=passo x
+ystep=passo y
\ No newline at end of file
diff --git a/geogebra/properties/plain_ro.properties b/geogebra/properties/plain_ro.properties
index 79bca11..df1289f 100644
--- a/geogebra/properties/plain_ro.properties
+++ b/geogebra/properties/plain_ro.properties
@@ -1,5 +1,3 @@
-2x2Matrix=Matrice 2x2
-3x3Matrix=Matrice 3x3
ADecimalPlace=Pozi\u0163ie zecimal\u0103 %0
ADecimalPlaces=Pozi\u0163ii zecimale %0
ADerivativeOfB=%0 derivat de %1
diff --git a/geogebra/properties/plain_ru.properties b/geogebra/properties/plain_ru.properties
index 1f021e2..232ae0a 100644
--- a/geogebra/properties/plain_ru.properties
+++ b/geogebra/properties/plain_ru.properties
@@ -1,5 +1,3 @@
-2x2Matrix=\u041c\u0430\u0442\u0440\u0438\u0446\u0430 2x2
-3x3Matrix=\u041c\u0430\u0442\u0440\u0438\u0446\u0430 3x3
ADecimalPlace=%0 \u0440\u0430\u0437\u0440\u044f\u0434
ADecimalPlaces=%0 \u0440\u0430\u0437\u0440\u044f\u0434\u043e\u0432
ADerivativeOfB=\u041f\u0440\u043e\u0438\u0437\u0432\u043e\u0434\u043d\u0430\u044f %0 \u043f\u043e\u0440\u044f\u0434\u043a\u0430 \u043e\u0442 %1
@@ -34,6 +32,7 @@ Algebra=\u0410\u043b\u0433\u0435\u0431\u0440\u0430
AlgebraWindow=\u041f\u0430\u043d\u0435\u043b\u044c \u043e\u0431\u044a\u0435\u043a\u0442\u043e\u0432
AliesOnB=%0 \u043b\u0435\u0436\u0438\u0442 \u043d\u0430 %1
AliesOnThePerimeterOfB=%0 \u043b\u0435\u0436\u0438\u0442 \u043d\u0430 \u0433\u0440\u0430\u043d\u0438\u0446\u0435 %1
+AllowOfflineUse=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0432 \u0430\u043f\u043f\u043b\u0435\u0442 \u0444\u0430\u0439\u043b\u044b jar
AllowStyleBar=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u043f\u0430\u043d\u0435\u043b\u044c \u0441\u0442\u0438\u043b\u044f
Altitude=\u0412\u044b\u0441\u043e\u0442\u0430
Angle=\u0423\u0433\u043e\u043b
@@ -109,7 +108,6 @@ ConstructionProtocolHelp=<html><body><p><b>\u0418\u0441\u043f\u043e\u043b\u044c\
ConstructionProtocolNavigation=\u0428\u0430\u0433\u0438 \u043f\u043e\u0441\u0442\u0440\u043e\u0435\u043d\u0438\u044f
Coordinates=\u041a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u044b
CopyToClipboard=\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432 \u0431\u0443\u0444\u0435\u0440
-CopyToLaTeX=\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432 LaTeX
CornerPoint=\u0423\u0433\u043e\u043b
CreatedWith=\u0421\u043e\u0437\u0434\u0430\u043d\u043e \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e
CreatedWithGeoGebra=\u0421\u043e\u0437\u0434\u0430\u043d\u043e \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e GeoGebra
@@ -209,7 +207,6 @@ HyperbolaWithFociABandFirstAxisLengthC=\u0413\u0438\u043f\u0435\u0440\u0431\u043
IgnoreDocumentLayout=\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0440\u0430\u0437\u043c\u0435\u0442\u043a\u0443 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430
Image=\u0418\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435
IncircleOfTriangleABC=\u0412\u043f\u0438\u0441\u0430\u043d\u043d\u0430\u044f \u043e\u043a\u0443\u0440\u0436\u043d\u043e\u0441\u0442\u044c \u0434\u043b\u044f \u0442\u0440\u0435\u0443\u0433\u043e\u043b\u044c\u043d\u0438\u043a\u0430 %0%1%2
-IncludeJARFiles=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0432 \u0430\u043f\u043f\u043b\u0435\u0442 \u0444\u0430\u0439\u043b\u044b jar
Increasing=\u0423\u0432\u0435\u043b\u0438\u0447\u0435\u043d\u0438\u0435
IncreasingOnce=\u0423\u0432\u0435\u043b\u0438\u0447\u0435\u043d\u0438\u0435 (\u043e\u0434\u0438\u043d \u0440\u0430\u0437)
Inequality=\u041d\u0435\u0440\u0430\u0432\u0435\u043d\u0441\u0442\u0432\u043e
@@ -227,6 +224,7 @@ Interpolate=\u0420\u0438\u0441\u043e\u0432\u0430\u0442\u044c \u0441 \u0438\u0441
IntersectingLines=\u041f\u0435\u0440\u0435\u0441\u0435\u043a\u0430\u044e\u0449\u0438\u0435\u0441\u044f \u043b\u0438\u043d\u0438\u0438
IntersectionCurveOfAB=\u041f\u0435\u0440\u0435\u0441\u0435\u0447\u0435\u043d\u0438\u0435 \u043a\u0440\u0438\u0432\u044b\u0445 %0 \u0438 %1
IntersectionLineOfAB=\u041f\u0435\u0440\u0435\u0441\u0435\u0447\u0435\u043d\u0438\u0435 \u043f\u0440\u044f\u043c\u044b\u0445 %0 \u0438 %1
+IntersectionOfAandB=\u041f\u0435\u0440\u0435\u0441\u0435\u0447\u0435\u043d\u0438\u0435 %0 \u0438 %1
IntersectionPointOfAB=\u0422\u043e\u0447\u043a\u0430 \u043f\u0435\u0440\u0435\u0441\u0435\u0447\u0435\u043d\u0438\u044f %0 \u0438 %1
IntersectionPointOfABWithInitialValueC=\u0422\u043e\u0447\u043a\u0430 \u043f\u0435\u0440\u0435\u0441\u0435\u0447\u0435\u043d\u0438\u044f %0 \u0438 %1 \u0441 \u043d\u0430\u0447\u0430\u043b\u044c\u043d\u044b\u043c \u043f\u0440\u0438\u0431\u043b\u0438\u0436\u0435\u043d\u0438\u0435\u043c %2
Interval=\u0418\u043d\u0442\u0435\u0440\u0432\u0430\u043b
@@ -320,12 +318,6 @@ PerspectiveName=\u0418\u043c\u044f \u043f\u0435\u0440\u0441\u043f\u0435\u043a\u0
Picture=\u0418\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435
PictureHeight=\u0412\u044b\u0441\u043e\u0442\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f
PictureWidth=\u0428\u0438\u0440\u0438\u043d\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f
-PlaneA=\u043f\u043b\u043e\u0441\u043a\u043e\u0441\u0442\u044c %0
-PlaneContainingA=\u041f\u043b\u043e\u0441\u043a\u043e\u0441\u0442\u044c, \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0449\u0430\u044f %0
-PlaneFromA=\u043f\u043b\u043e\u0441\u043a\u043e\u0441\u0442\u044c \u0441\u043e\u0437\u0434\u0430\u043d\u0430\u044f \u0447\u0435\u0440\u0435\u0437 %0
-PlaneThroughAB=\u041f\u043b\u043e\u0441\u043a\u043e\u0441\u0442\u044c \u0447\u0435\u0440\u0435\u0437 %0, %1
-PlaneThroughABC=\u041f\u043b\u043e\u0441\u043a\u043e\u0441\u0442\u044c \u0447\u0435\u0440\u0435\u0437 %0, %1, %2
-PlaneThroughAParallelToB=\u041f\u043b\u043e\u0441\u043a\u043e\u0441\u0442\u044c \u0447\u0435\u0440\u0435\u0437 %0 \u043f\u0430\u0440\u0430\u043b\u043b\u043b\u0435\u043b\u044c\u043d\u0430\u044f %1
Play=\u041f\u0440\u043e\u0438\u0433\u0440\u0430\u0442\u044c
PlayButton=\u041a\u043d\u043e\u043f\u043a\u0430 \u043f\u0440\u043e\u0438\u0433\u0440\u044b\u0432\u0430\u043d\u0438\u044f
Point=\u0422\u043e\u0447\u043a\u0430
@@ -339,7 +331,7 @@ PointOnA=\u0422\u043e\u0447\u043a\u0430 \u043d\u0430 %0
PointOnAClosestToB=\u0422\u043e\u0447\u043a\u0430 \u043d\u0430 %0, \u0431\u043b\u0438\u0436\u0430\u0439\u0448\u0430\u044f \u043a %1
PointOnPath=\u041d\u0430 \u043e\u0431\u044a\u0435\u043a\u0442\u0435
PointSize=\u0420\u0430\u0437\u043c\u0435\u0440 \u0442\u043e\u0447\u043a\u0438
-Points=\u0422\u043e\u0447\u043a\u0438
+Points=\u0412\u0435\u0440\u0448\u0438\u043d\u044b
PolarCoords=\u041f\u043e\u043b\u044f\u0440\u043d\u044b\u0435 \u043a\u043e\u043e\u0440\u0434\u0438\u043d\u0430\u0442\u044b
PolarLineOfARelativeToB=\u041f\u043e\u043b\u044f\u0440\u0430 %0 \u043f\u043e %1
PolyLine=\u041b\u043e\u043c\u0430\u043d\u0430\u044f
diff --git a/geogebra/properties/plain_si.properties b/geogebra/properties/plain_si.properties
index 37f9ffe..3eeade9 100644
--- a/geogebra/properties/plain_si.properties
+++ b/geogebra/properties/plain_si.properties
@@ -1,5 +1,3 @@
-2x2Matrix=2x2 \u0d85\u0db1\u0dd4\u0d9a\u0dd8\u0dad\u0dd2\u0dba
-3x3Matrix=3x3 \u0d85\u0db1\u0dd4\u0d9a\u0dd8\u0dad\u0dd2\u0dba
ADecimalPlace=%0 \u0dc0\u0db1 \u0daf\u0dc1\u0db8 \u0dc3\u0dca\u0dae\u0dcf\u0db1\u0dba
ADecimalPlaces=%0 \u0dc0\u0db1 \u0daf\u0dc1\u0db8 \u0dc3\u0dca\u0dae\u0dcf\u0db1
ADerivativeOfB=%0 \u0dc0\u0dca\u0dba\u0dd4\u0dad\u0dca\u0db4\u0db1\u0dca\u0db1\u0dba
diff --git a/geogebra/properties/plain_sk.properties b/geogebra/properties/plain_sk.properties
index b8ecbcd..daae277 100644
--- a/geogebra/properties/plain_sk.properties
+++ b/geogebra/properties/plain_sk.properties
@@ -1,5 +1,3 @@
-2x2Matrix=Matica typu 2x2
-3x3Matrix=Matica typu 3X3
ADecimalPlace=%0 desat. m.
ADecimalPlaces=%0 desat. m.
ADerivativeOfB=%0 derivácia z %1
@@ -34,7 +32,9 @@ AisaTangentToB=%0 je doty\u010dnicou %1
AlgebraWindow=Algebraické okno
AliesOnB=%0 le\u017ei na %1
AliesOnThePerimeterOfB=%0 le\u017eí na obvode %1
+AllowOfflineUse=vrátane *.jar súborov
AllowStyleBar=Paleta \u0161tílov povolená
+AltGr=Alt Gr
Altitude=Zemepisná \u0161írka
Angle=Uhol
AngleBetweenAB=Uhol medzi %0, %1
@@ -112,7 +112,6 @@ ConstructionProtocolHelp=<html><body><p><b>Pou\u017eit
ConstructionProtocolNavigation=Naviga\u010dný panel krokov kon\u0161trukcie
Coordinates=Súradnice
CopyToClipboard=Kopírova\u0165 do schránky
-CopyToLaTeX=Kopírova\u0165 do LaTeXu
CornerPoint=Roh
CreatedWith=Vytvorené pomocou programu
CreatedWithGeoGebra=Vytvorené s GeoGebrou
@@ -200,6 +199,7 @@ GeneratePgf=Generova\u0165 PGF/TikZ k
GeneratePstricks=Generova\u0165 PSTricky
GeometricObjects=Geometrické objekty
GlobalJavaScript=Globálny JavaScript
+GoToDownloadPage=Prejs\u0165 na stránku k stiahnutí
GraphicsViewAsAsymptote=Geometrický vzh\u013ead ako Asymptote
GreekCharacterA=Grétské písmeno: %0
GridType=Typ mrie\u017eky
@@ -214,7 +214,6 @@ IgnoreDocumentLayout=Ignorova\u0165 vrstvu dokumentu
Image=Obraz
ImplicitPoly=Implicitná krivka
IncircleOfTriangleABC=Vpísaná kru\u017enica trojuholníka %0%1%2
-IncludeJARFiles=vrátane *.jar súborov
Increasing=Rastúci
IncreasingOnce=Rastúci (raz)
Inequality=Nerovnica
@@ -233,7 +232,7 @@ Interpolate=nakresli\u0165 s interpol
IntersectingLines=Rôznobe\u017eky
IntersectionCurveOfAB=Priese\u010dník kriviek %0 a %1
IntersectionLineOfAB=Priese\u010dník priamok %0 a %1
-IntersectionPathsOfAB=Priese\u010dník ciest %0 a %1
+IntersectionOfAandB=Priese\u010dník %0 a %1
IntersectionPointOfAB=Priese\u010dník %0 a %1
IntersectionPointOfABNearC=Priese\u010dník %0 a %1 (bod) bli\u017e\u0161ie k bodu %2
IntersectionPointOfABWithInitialValueC=Priese\u010dník %0 a %1 so po\u010diato\u010dnou hodnotou %2
@@ -287,12 +286,13 @@ Name.button=Tla\u010didlo
Name.list=Zoznam
Name.locus=GMB
Name.matrix=matica
-Name.picture=obr
+Name.picture=obr.
Name.polygon=mnohouholník
Name.textfield=textovéPole
NameAndValue=Pomenovanie a hodnota
NewExpression=nový výraz
NewNameForA=Pomenovanie pre %0
+NewerVersionA=Je dostupná nov\u0161ia verzia GeoGebry.\nChcete dosta\u0165 teraz GeoGebru %0 ?
Next=\u010eal\u0161í
NextCell=\u010fal\u0161ia bunka
No.=\u010d.
@@ -319,16 +319,10 @@ ParameterOfA=Parameter pre %0
ParametricForm=Parametrické vyjadrenie
Pause=Pozastavi\u0165
Pentagon=Pä\u0165uholník
-PerspectiveName=Názov perspektivity
+PerspectiveName=Názov perspektívy
Picture=Obraz
PictureHeight=Vý\u0161ka obrazu
PictureWidth=\u0160írka obrazu
-PlaneA=rovina %0
-PlaneContainingA=Rovina obsahujúca %0
-PlaneFromA=rovina vytorená z %0
-PlaneThroughAB=rovina cez %0, %1
-PlaneThroughABC=rovina cez %0, %1, %2
-PlaneThroughAParallelToB=rovina cez %0 rovnobe\u017ená s %1
Play=Prehrávanie
PlayButton=Tla\u010dítko prehrávania
Point=Bod
@@ -345,7 +339,7 @@ PointSize="Ve\u013ekos\u0165" bodu
Points=Body
PolarCoords=Polárne súradnice
PolarLineOfARelativeToB=Polárne zdru\u017eená priamka %0-u vzh\u013eadom na %1
-PolyLine=Zalomená \u010diara
+PolyLine=Lomená \u010diara
Polygon=N-uholník
PositiveDirectionOnly=iba kladné smery
PositiveValuesFollowTheView=Kladné hodnoty po zobrazení
@@ -436,7 +430,7 @@ TimeBetweenFrames=\u010cas medzi sn
Title=Názov
TitleExportPgf=GeoGebra -> PGF Export
TitleExportPstricks=GeoGebra do PSTricks Export
-ToggleStyleBar=Prepnú\u0165 panel \u0161tílu
+ToggleStyleBar=Prepnú\u0165 panel \u0161týlu
ToolbarIcon=Ikona ponuky nástrojov
ToolbarIconsConstructionProtocolExport=Zobrazi\u0165 ikony ponuky nástrojov
TooltipLanguage=Jazyk tipu nástroja
@@ -467,7 +461,7 @@ Vectors=Vektory
VertexOfA=Vrchol toho: %0
VeryLarge=Ve\u013emi ve\u013eká
VerySmall=Ve\u013emi malá
-ViewCloseExtraWindow=Uká\u017e Vzh\u013ead vo vlastnom okne
+ViewCloseExtraWindow=Uká\u017e v novom okne
ViewOpenExtraWindow=Uká\u017e Vzh\u013ead v novom okne
VirtualKeyboard=Virtuálna klávesnica
VirtualKeyboardLanguage=Jazyk virtuálnej klávesnice
@@ -525,7 +519,7 @@ stylebar.Align=Nastavi\u0165 vodorovn
stylebar.AlignCenter=zarovna\u0165 na stred
stylebar.AlignLeft=zarovna\u0165 do\u013eava
stylebar.AlignRight=zarovna\u0165 doprava
-stylebar.Axes=ukáza\u0165 alebo sky\u0165 súradnicové osi
+stylebar.Axes=ukáza\u0165 alebo skry\u0165 súradnicové osi
stylebar.BgColor=nastavi\u0165 farbu pozadia
stylebar.Bold=nastavi\u0165 \u0161týl písma na tu\u010dné
stylebar.Border=nastavi\u0165 hranice
@@ -536,9 +530,9 @@ stylebar.Color=nastavi\u0165 farbu
stylebar.ColorTransparency=nastavi\u0165 farbu a prieh\u013eadnos\u0165
stylebar.CopyVisualStyle=kopírova\u0165 formát
stylebar.Eraser=vymaza\u0165 ceruzku
-stylebar.Grid=ukáza\u0165 a sky\u0165 mrie\u017eku
+stylebar.Grid=ukáza\u0165 alebo skry\u0165 mrie\u017eku
stylebar.Hidden=skryté
-stylebar.HorizontalLine=ukáza\u0165 a sky\u0165 vodorovné priamky
+stylebar.HorizontalLine=ukáza\u0165 alebo skry\u0165 vodorovné priamky
stylebar.Italic=nastavi\u0165 \u0161týl písma na kurzívu
stylebar.Label=nastavi\u0165 \u0161týl popisky
stylebar.LineStyle=nastavi\u0165 \u0161týl priamky
@@ -546,16 +540,16 @@ stylebar.Pen=kresli\u0165 s ceruzkou
stylebar.PointStyle=nastavi\u0165 \u0161týl bodu
stylebar.TextColor=nastavi\u0165 farbu písma
stylebar.TextSize=nastavi\u0165 ve\u013ekos\u0165 písma
-stylebar.VerticalLine=ukáza\u0165 a sky\u0165 zvislé priamky
+stylebar.VerticalLine=ukáza\u0165 alebo skry\u0165 zvislé priamky
svg=\u0160kálova\u0165elná vektorová grafika (svg)
undefined=nedefinované
unequal=nerovná sa
vertical=vertikálna
-xAxis=OsX
+xAxis=xOs
xmax=xmax
xmin=xmin
xstep=x krok
-yAxis=OsY
+yAxis=yOs
ymax=ymax
ymin=ymin
ystep=y krok
\ No newline at end of file
diff --git a/geogebra/properties/plain_sl.properties b/geogebra/properties/plain_sl.properties
index c09a57e..046b1ca 100644
--- a/geogebra/properties/plain_sl.properties
+++ b/geogebra/properties/plain_sl.properties
@@ -1,5 +1,3 @@
-2x2Matrix=matrika 2x2
-3x3Matrix=matrika 3x3
ADecimalPlace=%0 decimalno mesto
ADecimalPlaces=%0 decimalnih mest
ADerivativeOfB=%0-ti odvod %1
@@ -34,6 +32,8 @@ AisaTangentToB=%0 je tangenta na %1
AlgebraWindow=Algebrsko okno
AliesOnB=%0 le\u017ei na %1
AliesOnThePerimeterOfB=%0 le\u017ei na meji %1
+AllowOfflineUse=Omogo\u010di brez povezave
+AllowStyleBar=Dovoljena vrstica s stili
Altitude=Vi\u0161ina
Angle=Kot
AngleBetweenAB=Kot med %0, %1
@@ -72,7 +72,7 @@ CAS=Simbolno ra\u010dunanje
CASInitializing=Inicializacija simbolnega ra\u010dunanja
CASTimedOut=\u010cas za izvajanje je potekel
Cancel=Prekini
-Caption=Naslov
+Caption=Napis
CartesianCoords=Kartezi\u010dne koordinate
CasTimeout=Prekinitev CAS (v sekundah)
CellAisNotDefined=Celica %0 ni definirana
@@ -90,10 +90,12 @@ CircleWithCenterAThroughBAxisParallelToC=Kro\u017enica s sredi\u0161\u010dem %0,
CircleWithCenterAThroughBParallelToC=Kro\u017enica s sredi\u0161\u010dem %0 skozi %1, vzporedna z %2
CircleWithCenterAandRadiusB=Kro\u017enica s sredi\u0161\u010dem %0 in polmerom %1
CircleWithCenterAandRadiusBAxisParallelToC=Kro\u017enica s sredi\u0161\u010dem %0, polmerom %1 in osjo, vzporedno z %2
+Clipboard.Blackboard=Odlo\u017ei\u0161\u010de:Blackboard
Clipboard.Google=Na odlo\u017ei\u0161\u010de: Google Gadget
Clipboard.HTML=Na odlo\u017ei\u0161\u010de: html
Clipboard.MediaWiki=Na odlo\u017ei\u0161\u010de: MediaWiki
Clipboard.Moodle=Na odlo\u017ei\u0161\u010de: Moodle
+Clipboard.iframe=Odlo\u017ei\u0161\u010de: <iframe>
Color=Barva
ColorfulConstructionProtocol=Barvni opis konstrukcije
Command=Ukaz
@@ -196,6 +198,7 @@ GeneratePgf=Generiraj kodo za PGF/TikZ
GeneratePstricks=Izdelaj kodo za PSTricks
GeometricObjects=Geometrijski objekti
GlobalJavaScript=Globalno JavaScript
+GoToDownloadPage=Na stran za prenose
GraphicsViewAsAsymptote=Pribli\u017eni grafi\u010dni izgled
GreekCharacterA=Gr\u0161ka \u010drka %0
GridType=Tip mre\u017ee
@@ -211,7 +214,6 @@ IgnoreDocumentLayout=Ne upo\u0161tevaj izgleda dokumenta
Image=Slika
ImplicitPoly=Implicitna krivulja
IncircleOfTriangleABC=V\u010drtan krog trikotniku %0%1%2
-IncludeJARFiles=Vklju\u010di *.jar datoteke
Increasing=Nara\u0161\u010dajo\u010de
IncreasingOnce=Nara\u0161\u010dojo\u010de (Enkratno)
Inequality=Neena\u010dba
@@ -230,7 +232,7 @@ Interpolate=Nari\u0161i z interpolacijo
IntersectingLines=Sekajo\u010di se premici
IntersectionCurveOfAB=Prese\u010di\u0161\u010de krivulj %0, %1
IntersectionLineOfAB=Prese\u010di\u0161\u010de premic %0, %1
-IntersectionPathsOfAB=Prese\u010di\u0161\u010de poti %0, %1
+IntersectionOfAandB=Prese\u010di\u0161\u010de %0 in %1
IntersectionPointOfAB=Prese\u010di\u0161\u010de %0, %1
IntersectionPointOfABNearC=Prese\u010di\u0161\u010de %0, %1 ble\u017eje to\u010dki %2
IntersectionPointOfABWithInitialValueC=Prese\u010di\u0161\u010de %0 in %1, z za\u010detno vrednostjo %2
@@ -287,6 +289,7 @@ Name.textfield=tekst
NameAndValue=Ime & Vrednost
NewExpression=Nov izraz
NewNameForA=Novo ime za %0
+NewerVersionA=Na voljo je novej\u0161a razli\u010dica Geogebre.\n\u017deli\u0161 namestiti GeoGebr %0 ?
Next=Naprej
NextCell=Naslednja celica
No.=\u0160t.
@@ -319,12 +322,6 @@ PerspectiveName=Ime izgleda
Picture=Slika
PictureHeight=Vi\u0161ina slike
PictureWidth=\u0160irina slike
-PlaneA=ravnina %0
-PlaneContainingA=Ravnina, ki vsebuje %0
-PlaneFromA=Ravnina ustvarjena iz %0
-PlaneThroughAB=Ravnina skozi %0, %1
-PlaneThroughABC=Ravnina skozi %0, %1, %2
-PlaneThroughAParallelToB=Ravnina skozi %0 vzporedno z %1
Play=Za\u017eeni
PlayButton=Gumb za zagon
Point=To\u010dka
@@ -338,7 +335,7 @@ PointOnA=To\u010dka na %0
PointOnAClosestToB=To\u010dka na %0 najbli\u017eje %1
PointOnPath=Na sledi
PointSize=Velikost to\u010dke
-Points=To\u010dke
+Points=Ogli\u0161\u010da
PolarCoords=Polarne koordinate
PolarLineOfARelativeToB=Polara %0 glede na %1
PolyLine=Poligon
diff --git a/geogebra/properties/plain_sq.properties b/geogebra/properties/plain_sq.properties
index ce88d4b..df132b8 100644
--- a/geogebra/properties/plain_sq.properties
+++ b/geogebra/properties/plain_sq.properties
@@ -1,5 +1,3 @@
-2x2Matrix=Matrica 2x2
-3x3Matrix=Matrica 3x3
ADecimalPlace=%0 Pozicion Dhjetor
ADecimalPlaces=%0 Pozicione Dhjetore
ADerivativeOfB=Derivati i %0 i %1
diff --git a/geogebra/properties/plain_sr.properties b/geogebra/properties/plain_sr.properties
index e3cede5..9870c23 100644
--- a/geogebra/properties/plain_sr.properties
+++ b/geogebra/properties/plain_sr.properties
@@ -1,5 +1,3 @@
-2x2Matrix=matrica 2x2
-3x3Matrix=matrica 3x3
ADecimalPlace=%0 decimalno mesto
ADecimalPlaces=%0 decimal. mesto
ADerivativeOfB=%0 izvod od %1
@@ -33,6 +31,7 @@ AisaTangentToB=%0 je tangenta na %1
AlgebraWindow=Algebarski prikaz
AliesOnB=%0 le\u017ei na %1
AliesOnThePerimeterOfB=%0 le\u017ei na granici od %1
+AllowOfflineUse=Priklju\u010di *.jar datoteke
Altitude=Visina
Angle=U\ngao
AngleBetweenAB=Ugao izme\u0111u %0 i %1
@@ -196,7 +195,6 @@ HyperbolaWithFociABPassingThroughC=Hiperbola sa \u017ei\u017eama %0 i %1 kroz %2
HyperbolaWithFociABandFirstAxisLengthC=Hiperbola sa \u017ei\u017eama %0 i %1 i du\u017einom glavne ose %2
Image=Slika
ImplicitPoly=Implicitna kriva
-IncludeJARFiles=Priklju\u010di *.jar datoteke
Increasing=Rastu\u0107e
IncreasingOnce=Rastu\u0107e (jedan put)
Inequality=Nejednakost
@@ -292,11 +290,6 @@ PerspectiveName=Ime izgleda
Picture=slika
PictureHeight=Visina slike
PictureWidth=\u0160irina slike
-PlaneA=ravan %0
-PlaneFromA=ravan napravljena od %0
-PlaneThroughAB=ravan kroz %0, %1
-PlaneThroughABC=ravan kroz %0, %1, %2
-PlaneThroughAParallelToB=ravan kroz %0 paralelna sa %1
Play=Kreni
PlayButton=Dugme za pokretanje
Point=ta\u010dka
diff --git a/geogebra/properties/plain_sv.properties b/geogebra/properties/plain_sv.properties
index 678f960..95d9357 100644
--- a/geogebra/properties/plain_sv.properties
+++ b/geogebra/properties/plain_sv.properties
@@ -1,10 +1,9 @@
-2x2Matrix=2x2 matris
-3x3Matrix=3x3 matris
ADecimalPlace=%0 Decimaler
ADecimalPlaces=%0 Decimaler
-ADerivativeOfB=%0 derivatan av %1
-ADilatedByFactorBfromC=%0 utvidgad med faktor %1 från %2
+ADerivativeOfB=%0-derivatan av %1
+ADilatedByFactorBfromC=%0 utvidgad med en faktor %1 från %2
ADoesNotIntersectWithB=%0 skär inte %1
+AGray=%0 grå
AIntersectsWithB=%0 skär %1
AMirroredAtB=%0 speglad vid %1
ARotatedByAngleB=%0 roterad med vinkeln %1
@@ -17,12 +16,12 @@ AandBareNotEqual=%0 och %1
AandBareParallel=%0 och %1 är parallella
AandBarePerpendicular=%0 och %1 är vinkelräta
AandBcannotBeCompared=%0 och %1 kan inte jämföras
-AbsoluteScreenLocation=Fönstrets absoluta position
+AbsoluteScreenLocation=Absolut position i fönstret
AdoesNotLieOnB=%0 ligger inte på %1
AdoesNotLieOnThePerimeterOfB=%0 ligger inte på omkretsen av %1
AdoesNothaveTheSameAreaAsB=%0 har inte samme area som %1
AdoesNothaveTheSameLengthAsB=%0 har inte samma längd som %1
-AhasTheSameAreaAsB=%0 har samme area som %1
+AhasTheSameAreaAsB=%0 har samma area som %1
AhasTheSameLengthAsB=%0 har samma längd som %1
AintersectsWithBOnce=%0 och %1 har en skärningspunkt
AintersectsWithBTwice=%0 och %1 har två skärningspunkter
@@ -33,22 +32,28 @@ AisaTangentToB=%0
AlgebraWindow=Algebrafönster
AliesOnB=%0 ligger på %1
AliesOnThePerimeterOfB=%0 ligger på omkretsen till %1
+AllowOfflineUse=Inkludera jar-filerna
+AllowStyleBar=Formateringsverktyg är tillåtna
+AltGr=AltGr
+Altitude=Höjd
Angle=Vinkel
-AngleBetweenAB=Vinkel mellan %0, %1
-AngleBetweenABC=Vinkel mellan %0, %1, %2
-AngleBetweenABCofD=Vinkel mellan %0, %1, %2 av %3
-AngleBisectorOfAB=Halveringsvinkel för %0, %1
-AngleBisectorOfABC=Halveringsvinkel för %0, %1, %2
+AngleBetweenAB=Vinkel mellan %0 och %1
+AngleBetweenABC=Vinkel mellan %0-%1 och %1-%2
+AngleBetweenABCofD=Vinkel mellan %0-%1 och %1-%2 av %3
+AngleBisectorOfAB=Bisektrisen till %0, %1
+AngleBisectorOfABC=Bisektrisen till %0, %1, %2
AngleOfA=Vinkel till %0
Angles=Vinklar
+AnimatedGIFExport=Animerad GIF Export
Animating=Animering på
AnimationSpeed=Animationshastighet
-AnimationStep=AnimeringÖka
+AnimationStep=Steglängd
Apply=Verkställ
Arc=Båge
AsymptoteToA=Asymptot till %0
-Ath=%0
-Author=Upphovsman
+Ath=%0:e
+Author=Skapad av
+Automatic=Visa automatiskt
AuxiliaryObject=Hjälpobjekt
AuxiliaryObjects=Hjälpobjekt
AxisLabel=Namn på axlarna
@@ -59,25 +64,41 @@ Back=Tillbaka
BackgroundColor=Bakgrundsfärg
BackgroundImage=Bakgrundsbild
Bold=Fet stil
-Boolean=Booleskt värde
+Boolean=Logiskt (Booleskt) värde
Breakpoint=Brytpunkt
+CASInitializing=CAS Initialiseras
+CASTimedOut=CAS avbröts då beräkningen tog för lång tid
Cancel=Avbryt
-Caption=Bildtext
+Caption=Förklaring
CartesianCoords=Kartesiska koordinater
+CasTimeout=CAS Tidsgräns (i sekunder)
CellAisNotDefined=Cell %0 är inte definierad
CenterOfA=Centrum i %0
CentroidOfA=Tyngdpunkt för %0
+CheckedNumerically=(kontrollerat numeriskt)
ChooseColor=Välj färg
ChooseObject=Välj ett objekt
Circle=Cirkel
+CircleOfAxisAThroughB=Cirkel med radien %0 genom %1
CircleThroughABC=Cirkel genom %0, %1 och %2
CircleThroughAwithCenterB=Cirkel genom %0 med centrum i %1
+CircleWithCenterARadiusBParallelToC=Cirkel med centrum i %0 och radie %1, parallell med %2
+CircleWithCenterAThroughBAxisParallelToC=Cirkel med centrum i %0 genom %1, axlar parallella med %2
+CircleWithCenterAThroughBParallelToC=Cirkel med centrum i %0 genom %1, parallell med %2
CircleWithCenterAandRadiusB=Cirkel med centrum i %0 och radie %1
+CircleWithCenterAandRadiusBAxisParallelToC=Cirkel med centrum i %0 och radie %1, axlar parallella med %2
+Clipboard.Blackboard=Urklipp: Blackboard
+Clipboard.Google=Urklipp: Google Gadget
+Clipboard.HTML=Urklipp: html
+Clipboard.Moodle=Urklipp: Moodle
+Clipboard.iframe=Urklipp: <iframe>
Color=Färg
ColorfulConstructionProtocol=Färger i konstruktionsprotokollen
Command=Kommando
+CommonTangentOfCirclesAandB=Gemensam tangent till cirklarna %0 och %1
ComplexNumber=Komplext tal
Conic=Kägelsnitt
+ConicFromCoeffListA=Kägelsnitt från %0
ConicThroughABCDE=Kägelsnitt genom %0, %1, %2, %3, %4
Conics=Kägelsnitt
ConstructionProtocol=Konstruktionsprotokoll
@@ -85,116 +106,199 @@ ConstructionProtocolButton=Knapp som
ConstructionProtocolHelp=<html><body><p><b>Användning av konstruktionsprotokoll</b></p><p><br><b>Tangentbord</b></p><table border="1"><tr><td>↑</td><td>Föregående steg i konstruktionen</td></tr><tr><td>↓</td><td>Nästa steg i konstruktionen</td></tr><tr><td>Hem</td><td>Starta konstruktionen</td></tr><tr><td>Avsluta</td><td>Sista steget i konstruktionen</td></tr><tr><td>Del</td><td>Radera konstruktionssteg</td></tr></table><p><b><br>Mus</b></p><table border="1"><tr><td>Dubbelklicka på rad</td><td>Välj konstruktionssteg</td></tr><tr><td>Dubbelklicka på rubrik</td><td>Starta konstruktionen</td></tr><tr><td>Drag & släpp rad</td><td>Flytta konstruktionssteget</td></tr><tr><td>Högerklicka på rad</td><td>Kontextmeny</td></tr></table><body></html>
ConstructionProtocolNavigation=Navigationsfält för konstruktionssteg
Coordinates=Koordinater
-CopyToClipboard=Kopiera till urklipp
+CopyToClipboard=Kopiera till Urklipp
CornerPoint=Hörn
CreatedWith=Skapat med
+CreatedWithGeoGebra=Skapat med GeoGebra
+CrossAt=Korsa vid
Curve=Kurva
Date=Datum
+Day.1=Söndag
+Day.2=Måndag
+Day.3=Tisdag
+Day.4=Onsdag
+Day.5=Torsdag
+Day.6=Fredag
+Day.7=Lördag
Decoration=Dekoration
Decreasing=Avtagande
Default=Standard
+DefaultPointStyle=Normal punktstil
+Defaults=Standardinställningar
Delete=Radera
+DeleteRowA=Radera rad %0
+DeleteRowsAtoB=Radera raderna %0 till %1
DependentObjects=Beroende objekt
DerivativeOfA=Derivatan av %0
DiameterOfAConjugateToB=Diameter för %0 konjugerat till %1
+Dimensions=Dimensioner
DirectionOfA=Riktning för %0
Directrix=Styrlinje
DirectrixOfA=Styrlinje för %0
+Display=Visa
DisplayPointSymbol=Visa punkternas symboler
-DistanceOfAandB=Avstånd mellan %0 och %1
+DistanceOfAandB=Avståndet mellan %0 och %1
DoubleClickToOpen=Dubbelklicka för att öppna applikationsfönstret
DoubleLine=Dubbellinje
Down=Ner
DrawingPad=Ritområde
+DrawingPad2=Ritområde 2
+DrawingPadA=Ritområde %0
DrawingPadAsPSTricks=Grafikfältet som PSTricks
DrawingPadAsPicture=Grafikfältet som bild
DrawingPagAsPGF=Grafikfältet som PGF/TikZ
+DynamicCoordinatesOfA=Dynamiska koordinaterna för %0
DynamicWorksheet=Dynamisk arbetsbok
DynamicWorksheetAsWebpage=Dynamisk arbetsbok som Webbsida
+DynamicWorksheetExport=Export av dynamisk arbetsyta (html)
EccentricityOfA=Excentricitet för %0
Edit=Redigera
Ellipse=Ellips
-EllipseWithFociABPassingThroughC=Ellips med brännpunkt %0, %1 och som går genom %2
-EllipseWithFociABandFirstAxisLengthC=Ellips med brännpunkt %0, %1och storaxel med längd %2
-EmphasizeRightAngle=Betona rätvinkel
+EllipseWithFociABPassingThroughC=Ellips med brännpunkterna %0 och %1, och som går genom %2
+EllipseWithFociABandFirstAxisLengthC=Ellips med brännpunkterna %0 och %1 och storaxel med längd %2
+EmphasizeRightAngle=Betona rät vinkel
EmptySet=Tomma mängden
+EnableScripting=Tillåt scriptprogram
Equation=Ekvation
-ExplicitLineEquation=y = a x + b
-ExplicitLineGradient=a
+ErrorInJavaScript=Fel i JavaScript
+ErrorInJavaScriptAtLineA=Fel i JavaScript på rad %0
+ErrorInScriptAtLineAFromObjectB=Fel i JavaScript på rad %0 (anropat från %1)
+Esc=Escape
+ExplicitLineEquation=y = k x + m
+ExplicitLineGradient=k
+ExportAnimatedGIF=Ritområde som animerad GIF
+ExportAsPicture=Exportera som bild
ExportAsWebpage=Exportera som Webbsida
ExportTextAsShapes=Exportera text som figurer
+ExtendedForm=Utökad form
+ExtraLarge=Extra stor
+ExtraSmall=Extra liten
ExtremumOfA=Extrempunkt för %0
+File.HTML=Fil: html
+File.SCORM=Fil: SCORM
Filling=Fyllning
Finish=Slutför
FirstAxisLengthOfA=Längden av storaxeln till %0
FirstAxisOfA=Storaxeln till %0
-FixCheckbox=Lås checkbox
+FixCheckbox=Lås kryssruta
FixObject=Lås objekt
FocusOfA=Brännpunkt för %0
ForceGnuplotPgf=Använd Gnuplot till att rita funktionsgrafer
FreeObjects=Fria objekt
Function=Funktion
FunctionAonIntervalBC=Funktion %0 i intervallet [%1, %2]
+FunctionNVar=Funktion
+General=Allmänt
GeneratePgf=Generera PGF/TikZ kod
GeneratePstricks=Generera PSTricks
GeometricObjects=Geometriska objekt
+GlobalJavaScript=Globalt JavaScript
+GoToDownloadPage=Gå till nedladdningssidan
+GraphicsViewAsAsymptote=Ritområde som Asymptote
+GreekCharacterA=Grekisk bokstav: %0
+GridType=Typ av rutnät
Height=Höjd
Hide=Dölj
Home=Hem
HorizontalSplit=Horisontell delning
Hyperbola=Hyperbel
-HyperbolaWithFociABPassingThroughC=Hyperbel med brännpunkt %0 och %1 och som går genom %2
-HyperbolaWithFociABandFirstAxisLengthC=Hyperbel med brännpunkt %0 och %1 och storaxel med längd %2
+HyperbolaWithFociABPassingThroughC=Hyperbel med brännpunkterna %0 och %1, och som går genom %2
+HyperbolaWithFociABandFirstAxisLengthC=Hyperbel med brännpunkterna %0 och %1 och storaxel med längd %2
+IgnoreDocumentLayout=Ignorera dokumentets layout
Image=Bild
+ImplicitPoly=Implicit kurva
+IncircleOfTriangleABC=Inskrivna cirkeln till triangeln %0%1%2
Increasing=Växande
+IncreasingOnce=Ökande(En gång)
Inequality=Olikhet
-InflectionPointofA=inflexionspunkt vid %0
+InflectionPointofA=Inflexionspunkt vid %0
InputFieldHelp=<html><body><p><b>Använd inmatningsfältet</b></p><table border="1"><tr><td>Enter </td><td>exekvera</td></tr><tr><td>Escape</td><td>töm inmatningsfältet</td></tr><tr><td>↑</td><td>föregående inmatning</td></tr><tr><td>↓</td><td>nästa inmatning</td></tr><tr><td>F1</td><td>Hjälp med kommandot</td></tr></table><p><br><b>Automatisk avslutning av kommando</b><br>Efter att man skrivit de två första bokstäverna<br>kommer ett kommando att visas.</p><table border="1"><tr><td>Enter </td><td>Acceptera det föreslagna kommandot</td></tr><tr><td>nästa bokstav</td><td>fortsätt med inmatningen</td></tr></table><body></html>
+InputForm=Inmatningsfält
InputLabelToolTip=Skriv ett kommando
Insert=Infoga
+InsertPictureOfAllOpenViews=Infoga bild över alla öppna fönster
InsertPictureOfConstruction=Infoga bild av konstruktion
-IntegralOfA=Integral av %0
-IntegralOfAfromBtoC=Integral av %0 från %1 till %2
+Integer=Heltal
+IntegralOfA=Integralen av %0
+IntegralOfAfromBtoC=Integralen av %0 från %1 till %2
+Interpolate=Rita med interpolering
IntersectingLines=Korsande linjer
-IntersectionPointOfAB=Skärningspunkt(er) mellan %0,%1
-IntersectionPointOfABWithInitialValueC=Skärningspunkt(er) mellan %0,%1 med startvärde %2
+IntersectionCurveOfAB=Skärningskurva för %0 och %1
+IntersectionLineOfAB=Skärningslinje för %0 och %1
+IntersectionOfAandB=Skärningskurva för %0 och %1
+IntersectionPointOfAB=Skärningspunkt(er) mellan %0 och %1
+IntersectionPointOfABNearC=skärningspunkten till %0 och %1 nära punkt %2
+IntersectionPointOfABWithInitialValueC=Skärningspunkt(er) mellan %0 och %1 med startvärde %2
Interval=Intervall
+InverseFilling=Invertera fyllningen
Italic=Kursiv
-LaTeXFormula=LaTeX formel
-LatexFontSize=LaTeX teckenstorlek:
+Keyboard=Tangentbord
+LaTeXFormula=LaTeX-formel
+LaTeXHelp=Hjälp för LaTeX
+Large=Stor
+LatexFontSize=Teckenstorlek för LaTeX:
Layer=Lager
-Length=Längd
-LengthOfA=Längd av %0
+Length=Kurvlängd
+LengthOfA=Längden av %0
Lengths=Längder
Line=Linje
-LineBisectorAB=Mittpunktsnormal från %0,%1
-LineBisectorOfA=Mittpunktsnormal %0
+LineBisectorAB=Mittpunktsnormalen till sträckan mellan %0 och %1
+LineBisectorOfA=Mittpunktsnormalen till %0
LineStyle=Linjetyp
-LineThroughAB=Linje genom %0,%1
-LineThroughAParallelToB=Linje genom %0 parallell med %1
-LineThroughAPerpendicularToB=Linje genom %0 vinkelrätt mot %1
-LineThroughAwithDirectionB=Linje genom %0 med riktning %1
+LineThroughAB=Linjen genom %0 och %1
+LineThroughAParallelToB=Linjen genom %0 parallell med %1
+LineThroughAPerpendicularToB=Linjen genom %0 vinkelrätt mot %1
+LineThroughAwithDirectionB=Linjen genom %0 med riktningen %1
LinearEccentricityOfA=Linjär excentricitet till %0
LinearInequality=Linjär olikhet
Lines=Linjer
+LinkedObject=Länkat objekt
List=Lista
+LocalizedDigits=Använd lokaliserade siffror
+LocalizedLabels=Använd lokaliserade namn på punkter
+LockObject=Lås objektet
Locus=Geometrisk ort
-Midpoint=mittpunkt
-MidpointOfA=Mittpunkt på %0
-MidpointOfAB=Mittpunkt mellan %0,%1
+Medium=Mellan
+Midpoint=Mittpunkt
+MidpointOfA=Mittpunkten på %0
+MidpointOfAB=Mittpunkten mellan %0,%1
+Miscellaneous=Övrigt
+Month.1=Januari
+Month.10=Oktober
+Month.2=Februari
+Month.3=Mars
+Month.5=Maj
+Month.6=Juni
+Month.7=Juli
+Month.8=Augusti
Name=Namn
+Name.button=knapp
Name.list=Lista
Name.locus=GeometriskOrt
Name.matrix=Matris
Name.picture=Bild
Name.polygon=Polygon
Name.text=Text
+Name.textfield=Inmatningsfält
NameAndValue=Namn och Värde
+NewExpression=Nytt uttryck
NewNameForA=Nytt namn för %0
+NewerVersionA=En nyare version av GeoGebra är tillgänglig. \nVill du hämta GeoGebra %0 nu?
Next=Nästa
+NextCell=Nästa cell
+No.=Nr.
+NoJavaMessage=Detta är en Java Applet skapad med GeoGebra från www.geogebra.org - det verkar som om du inte har Java installerat på din dator, vänligen besök www.java.com\n\nThis is a Java Applet created using GeoGebra from www.geogebra.org - it looks like you don't have Java installed, please go to www.java.com
+NotAvailable=Inte tillgänglig
+NotIncluded=inte medräknad
Numeric=Tal
NumericObjects=Talobjekt
Objects=Objekt
+Off=Av
+OldExpression=Gammalt uttryck
+On=På
+OnClick=Vid klick (onClick)
+OnMouseOver=Vid muspekaren över (onMouseOver)
+OnUpdate=Vid uppdatering (onUpdate)
Open=Öppna
OpenButton=Knapp för att öppna applikationsfönster med konstruktion
Oscillating=Oscillerande
@@ -215,85 +319,146 @@ Play=Spela
PlayButton=Uppspelningsknapp
Point=Punkt
PointAplusB=Punkt %0 + %1
+PointDep=Beroende
+PointFree=Fri
+PointInA=Punkt i %0
+PointInside=I område
PointOn=Punkt på
PointOnA=Punkt på %0
+PointOnAClosestToB=Punkt på %0 närmast till %1
+PointOnPath=På kurva
PointSize=Punktstorlek
Points=Punkter
PolarCoords=Polära koordinater
PolarLineOfARelativeToB=Polär linje för %0 i förhållande till %1
+PolyLine=Polygontåg
+PositiveDirectionOnly=Endast positiv riktning
+PositiveValuesFollowTheView=Positiva värden följer ritområdet
+PreviewUnavailable=Förhandsgranskning ej tillgänglig
+ProbabilityCalculator=Sannolikhetsräknare
Properties=Egenskaper
Quadrangle=Kvadrat eller rektangel
Quadrilateral=Fyrkant
Question=Fråga
Radius=Radie
RadiusOfA=Radie för %0
+Random=Slumpmässig
+Range=Intervall
Ray=Stråle
-RayThroughAB=Stråle genom %0,%1
+RayThroughAB=Strålen från %0 genom %1
RayThroughAWithDirectionB=Stråle genom %0 med riktning %1
Redefine=Omdefiniera
Remove=Ta bort
Rename=Ge nytt namn
Repeat=Upprepa
+ResizeAngle=Storleksändra vinkeln automatiskt
ResolutionInDPI=Upplösning i dpi
-RootOfA=Rot (nollpunkt) till %0
-RootOfAWithInitialValueB=Rot (nollpunkt) till %0 med startvärde %1
-RootOfAonIntervalBC=Rot (nollpunkt) för %0 i intervallet [%1,%2]
+ReverseMouseWheel=Omvänd funktion på mushjulet
+RootOfA=Rot (nollställe) till %0
+RootOfAWithInitialValueB=Rot (nollställe) till %0 med startvärde %1
+RootOfAonIntervalBC=Rot (nollställe) för %0 i intervallet [%1,%2]
ScaleInCentimeter=Skala i cm
+Script=GeoGebra script
+Scripting=Script (Program)
SecondAxisLengthOfA=Längd av andra axeln hos %0
SecondAxisOfA=Andra axeln hos %0
Sector=Sektor
SegmentAB=Segment [%0,%1]
SegmentABofC=Segment [%0,%1] av %2
+Selection=Urval
+SelectionAllowed=Urval möjligt
Semicircle=Halvcirkel
SemicircleThroughAandB=Halvcirkel genom %0 och %1
Show=Visa
ShowAllObjects=Visa alla objekt
+ShowAutomatically=Visa automatiskt
+ShowAxes=Visa axlar
+ShowAxisNumbers=Visa värden
+ShowGrid=Visa rutnät
ShowLabel=Visa etikett
ShowObject=Visa objekt
+ShowOnXAxis=Visa på x-axeln
+ShowOnlineHelp=Visa online-hjälp
ShowOnlyBreakpoints=Visa endast brytpunkter
+ShowTitleBar=Visa namnlisten
ShowTrace=Visa spår
+ShowTrimmed=Visa korta skärningslinjer
+ShowxAxis=Visa x-axeln
+ShowyAxis=Visa y-axeln
+SimpleFormulas=Enkla formler
Size=Storlek
Slider=Glidare
SlopeOfA=Lutning för %0
+Small=Liten
Speed=Hastighet
Spreadsheet=Kalkylblad
StandardObject=Standardobjekt
StandardView=Standardvy
StartingPoint=Startpunkt
+StemPlot.KeyAMeansB=Key: %0 betyder %1
+StemPlot.high=högt
+StemPlot.low=lågt
+StickToEdge=Docka till kanten
+StopScript=Avbryt script/program
Substitute=Substituera
+SubstituteForAinB=Substituera för %0 i %1
SubstituteSimplify=Substituera och förenkla
-SyntaxErrorAisNotAList=Syntax Error: %0 är inte i listan
+SyntaxErrorAisNotAList=Syntax Error: %0 är inte en lista
+SystemInformation=Systeminformation
+SystemInformationMessage=Systeminformationen korrekt kopierad till Urklipp
TangentToAParallelToB=Tangent till %0 parallell med %1
TangentToAThroughB=Tangent till %0 genom %1
TangentToAatB=Tangent till %0 i punkten %1
TextAfterConstruction=Text efter konstruktion
TextBeforeConstruction=Text över konstruktion
+TextField=Inmatningsfält
+TextfieldLength=Inmatningsfältets längd
Thickness=Linjetjocklek
TickDistance=Avstånd
+TimeBetweenFrames=Tid mellan bildrutor
Title=Titel
TitleExportPgf=Exportera GeoGebra till PGF
TitleExportPstricks=Exportera GeoGebra till PSTricks
+ToggleStyleBar=Formatfältet På/Av
+ToolbarIcon=Ikon
+ToolbarIconsConstructionProtocolExport=Visa ikoner
+TooltipLanguage=Språk för tips
+TooltipTimeout=Visa tips i (antal sekunder)
+Tooltips=Tips
TraceOff=Spår av
TraceOn=Spår på
-TraceToSpreadsheet=Spår till kalkylblad
+TraceToSpreadsheet=Fånga spår till kalkylblad
TranslationOfAbyB=Translation av %0 med %1
TranslationOfAtoB=Translation av %0 till %1
+TreeModeDependency=Sortera objekt efter beroende
+TreeModeLayer=Sortera objekt efter lager
+TreeModeType=Sortera objekt efter typ
+TreeModeView=Sortera objekt efter ritområde
Triangle=Triangel
UnitVectorOfA=Enhetssvektor till %0
UnitVectorPerpendicularToA=Enhetsvektor vinkelrät mot %0
+UntitledConstruction=Namnlös konstruktion
Up=Upp
+Upload=Ladda upp
+UploadError=Kunde inte ansluta till GeoGebraTube. Uppladdning avbruten. (Felkod: %0)\nCould not access GeoGebraTube. Abort Upload. (Error Code: %0)
+UploadPrepare=Förbereder uppladdning
+UseJavaFontsForLaTeX=Använd java-typsnitt för texter i LaTeX
Value=Värde
Vector=Vektor
VectorPerpendicularToA=Vektor vinkelrät mot %0
Vectors=Vektorer
VertexOfA=Toppunkt för %0
+VeryLarge=Väldigt stor
+VerySmall=Väldigt liten
ViewCloseExtraWindow=Visa i huvudfönstret
ViewOpenExtraWindow=Visa i nytt fönster
+VirtualKeyboard=Virtuellt tangentbord
+VirtualKeyboardLanguage=Virtuellt tangentbordsspråk
Width=Bredd
WindowOpened=Fönstret öppnat
XMLTagANotFound=Felaktig fil: Det gick inte att hitta XML-tag %0
-XUnits=X enheter (cm)
-YUnits=Y enheter (cm)
+XUnits=X-enheter (cm)
+YUnits=Y-enheter (cm)
ZoomIn=Zooma in
ZoomOut=Zooma ut
allowOutlyingIntersections=Tillåt skärningar i förlängningen
@@ -306,20 +471,62 @@ dependent=beroende
dilatedByFactor=utvidgad med faktorn
emf=Enhanced Meta Format
equal=ekvivalent
-firstAxisLength=Halva storaxelns längd
+firstAxisLength=halva storaxelns längd
fixed=Låst
+fncInspector.Curvature=Krökning
+fncInspector.Derivative=Derivata
+fncInspector.Derivative2=Andraderivata
+fncInspector.Difference=Differens
+fncInspector.MultipleRoots=Multipla rötter
+fncInspector.NoRoots=Inga rötter
+fncInspector.Points=Punkter
+fncInspector.Property=Egenskap
+fncInspector.ShowArea=Visa area
+fncInspector.Value=Värde
+fncInspector.addColumn=Lägg till kolumn
+fncInspector.removeColumn=Radera sista kolumnen
+fncInspector.showOscCircle=Visa "osculating circle"
+fncInspector.showTable=Visa värdetabell
+fncInspector.showTangent=Visa tangent
+fncInspector.showXYLines=Visa hårkorslinjer
+fncInspector.step=Stegstorlek för x-värden
forceReflexAngle=Tvinga fram konvexa vinklar
forward=framåt
free=fri
horizontal=horisontell
html=Webbsida
-max=max
-min=min
off=Av
+otherwise=annars
parallel=parallell
pdf=pdf
polar=polär
resetConstruction=Nollställ konstruktion
+stylebar.Align=Horisontell justering
+stylebar.AlignCenter=Mitten
+stylebar.AlignLeft=Vänsterjustera
+stylebar.AlignRight=Högerjustera
+stylebar.Axes=Visa/Dölj axlar
+stylebar.BgColor=Bakgrundsfärg
+stylebar.Bold=Fet
+stylebar.Border=Kantlinje
+stylebar.Bracket=Parenteser
+stylebar.Caption=Förklaringsstil
+stylebar.Capture=Punktinfångning
+stylebar.Color=Färg
+stylebar.ColorTransparency=Färg och transparens
+stylebar.CopyVisualStyle=Kopiera visuellt format
+stylebar.Eraser=Radera penndrag
+stylebar.Grid=Visa/Dölj Rutnät
+stylebar.Hidden=Dold
+stylebar.HorizontalLine=Visa/Dölj horisontella linjer
+stylebar.Italic=Kursiv
+stylebar.Label=Etikettstil
+stylebar.LineStyle=Linjestil
+stylebar.Pen=Penna
+stylebar.PointStyle=Punktstil
+stylebar.TextColor=Textfärg
+stylebar.TextSize=Textstorlek
+stylebar.VerticalLine=Visa/Dölj Vertikala linjer
undefined=odefinierad
unequal=olika med
vertical=vertikal
@@ -328,4 +535,5 @@ xmax=xmax
xmin=xmin
yAxis=yAxeln
ymax=ymax
-ymin=ymin
\ No newline at end of file
+ymin=ymin
+ystep=Y Steg
\ No newline at end of file
diff --git a/geogebra/properties/plain_th.properties b/geogebra/properties/plain_th.properties
index f686395..81af547 100644
--- a/geogebra/properties/plain_th.properties
+++ b/geogebra/properties/plain_th.properties
@@ -1,5 +1,3 @@
-2x2Matrix=\u0e40\u0e21\u0e15\u0e23\u0e34\u0e01\u0e0b\u0e4c 2x2
-3x3Matrix=\u0e40\u0e21\u0e15\u0e23\u0e34\u0e01\u0e0b\u0e4c 3x3
ADecimalPlace=%0 \u0e15\u0e33\u0e41\u0e2b\u0e19\u0e48\u0e07\u0e17\u0e28\u0e19\u0e34\u0e22\u0e21
ADecimalPlaces=%0 \u0e15\u0e33\u0e41\u0e2b\u0e19\u0e48\u0e07\u0e17\u0e28\u0e19\u0e34\u0e22\u0e21
ADilatedByFactorBfromC=%0 \u0e22\u0e48\u0e2d\u0e02\u0e22\u0e32\u0e22\u0e44\u0e14\u0e49\u0e41\u0e1f\u0e01\u0e40\u0e15\u0e2d\u0e23\u0e4c %1 \u0e08\u0e32\u0e01 %2
diff --git a/geogebra/properties/plain_tl.properties b/geogebra/properties/plain_tl.properties
new file mode 100644
index 0000000..e9bfd92
--- /dev/null
+++ b/geogebra/properties/plain_tl.properties
@@ -0,0 +1,524 @@
+ADecimalPlace=%0 Lugar na Desimal
+ADecimalPlaces=%0 mga Lugar na Desimal
+ADerivativeOfB=Ang %0 ay inihango mula sa %1
+ADilatedByFactorBfromC=Ang %0 ay idinilate sa pamamagitan ng %1 mula sa %2
+ADoesNotIntersectWithB=Ang %0 ay hindi nakikitagpo sa %1
+AGray=%0 ay kulay-abo
+AIntersectsWithB=Ang %0 ay nakikitagpo sa %1
+AMirroredAtB=Ang %0 ay nasasalamin sa %1
+ARotatedByAngleB=Ang %0 ay inikot sa pamamamagitan ng anggulo %1
+ASignificantFigure=%0 Makabuluhang Tala
+ASignificantFigures=%0 mga Makabuluhang Tala
+AandBareEqual=%0 at %1 ay magkatumbas
+AandBareLinearlyDependent=Ang %0 at ang %1 ay linyar na umaasa
+AandBareLinearlyIndependent=Ang %0 at ang %1 ay linyar na malaya
+AandBareNotEqual=Ang %0 at ang %1 ay hindi magkatumbas
+AandBareParallel=Ang %0 at ang %1 ay magkahilera
+AandBarePerpendicular=Ang %0 at ang %1 ay perpendikular
+AandBcannotBeCompared=Ang %0 at ang %1 ay hindi maihahalintulad
+AbsoluteScreenLocation=Ganap na Puwesto sa Iskrin
+AdoesNotLieOnB=Ang %0 ay wala sa %1
+AdoesNotLieOnThePerimeterOfB=Ang %0 ay wala sa perimetro ng %1
+AdoesNothaveTheSameAreaAsB=Ang %0 ay hindi kasing-erya ng %1
+AdoesNothaveTheSameLengthAsB=Ang %0 ay hindi kasinghaba ng %1
+AhasTheSameAreaAsB=Ang %0 ay kasing-erya ng %1
+AhasTheSameLengthAsB=Ang %0 ay kasinghaba ng %1
+AintersectsWithBOnce=Ang %0 ay nakikitagpo kay %1 sa isang pagkakataon
+AintersectsWithBTwice=Ang %0 ay nakikitagpo kay %1 sa dalawang pagkakataon
+AisAnAsymptoteToB=Ang %0 ay isang asimtota ng %1
+AisNotDefined=Ang %0 ay walang kahulugan
+AisaDegenerateBranchOfB=Ang %0 ay isang deheneratang sangay ng %1
+AisaTangentToB=Ang %0 ay dikit sa %1
+Algebra=Alhebra
+AlgebraWindow=Alhebra
+AliesOnB=Ang %0 ay nasa %1
+AliesOnThePerimeterOfB=Ang %0 ay nasa perimetro ng %1
+AllowOfflineUse=Isama ang mga talatag na jar
+AllowStyleBar=Pinapayagan ang Style Bar
+Altitude=Taas
+Angle=Anggulo
+AngleBetweenAB=Anggulo sa gitna ng %0, %1
+AngleBetweenABC=Anggulo sa gitna ng %0, %1, %2
+AngleBetweenABCofD=Anggulo sa gitna ng %0, %1, %2 ng %3
+AngleBisectorOfAB=Panggitnang-anggulo ng %0, %1
+AngleBisectorOfABC=Panggitnang-anggulo ng %0, %1, %2
+AngleOfA=Anggulo ng %0
+Angles=Mga Anggulo
+Animating=Naka-on ang Animation
+AnimationLoop=Bilang Loop?
+AnimationSpeed=Bilis
+AnimationStep=Pagitan
+Apply=Gamitin
+Arc=Arko
+AsymptoteToA=Asimtota sa %0
+Ath=Ika-%0
+Author=May-akda
+Automatic=Awtomatiko
+AuxiliaryObject=Pantulong na bagay
+AuxiliaryObjects=Mga pantulong na bagay
+AxisLabel=Tatak
+AxisOfA=Aksis ng %0
+AxisTicks=Mga tik
+AxisUnitLabel=Yunit
+Back=Balik
+BackgroundColor=Kulay ng Likuran
+BackgroundImage=Larawan ng Likuran
+Bold=Makapal
+Boolean=Halagang Boolean
+Breakpoint=Punto ng pagkabreyk
+Button=Pindutan
+CASInitializing=Sinisimulan ang CAS
+CASTimedOut=Naubusan ng oras ang CAS
+Cancel=Ikansela
+Caption=Kapsyon
+CartesianCoords=Koordineyt na Kartesyan
+CasTimeout=Pagkaubos ng oras ng CAS (sa mga segundo)
+CellAisNotDefined=Walang kahulugan ang Cell %0
+CenterOfA=Gitna ng %0
+CentroidOfA=Sentroyd ng %0
+CheckedNumerically=(naka-tsek ayon sa bilang)
+ChooseColor=Pumili ng Kulay
+ChooseObject=Pumili ng isang bagay
+Circle=Pangkat
+CircleOfAxisAThroughB=Bilog ng aksis %0 %1
+CircleThroughABC=Bilog sa %0, %1, %2
+CircleThroughAwithCenterB=Bilog sa %0 na may gitnang %1
+CircleWithCenterARadiusBParallelToC=Bilog na may gitnang %0 at radius na %1 na kahilera ng %2
+CircleWithCenterAThroughBAxisParallelToC=Bilog na may gitnang %0 sa %1 na may aksis na kahilera ng %2
+CircleWithCenterAThroughBParallelToC=Bilog na may gitnang %0 sa %1, kahilera ng %2
+CircleWithCenterAandRadiusB=Bilog na may gitnang %0 at radius na %1
+CircleWithCenterAandRadiusBAxisParallelToC=Bilog na may gitnang %0 at radius na %1 na may aksis na kahilera ng %2
+Clipboard.Blackboard=Klipbord: Blakbord
+Clipboard.Google=Klipbord: Gadyet ng Google
+Clipboard.HTML=Klipbord: html
+Clipboard.MediaWiki=Klipbord: MediaWiki
+Clipboard.Moodle=Klipbord: Moodle
+Clipboard.iframe=Klipbord: <iframe>
+Color=Kulay
+ColorfulConstructionProtocol=Makulay na protokol sa paggawa
+Command=Utos
+CommonTangentOfCirclesAandB=Pangkaraniwang dikit ng mga bilog na %0 at %1
+ComplexNumber=Komplikadong Numero
+Conic=Koniko
+ConicFromCoeffListA=Koniko mula sa %0
+ConicThroughABCDE=Koniko sa %0, %1, %2, %3, %4
+Conics=Mga koniko
+ConstructionProtocol=Protokol sa paggawa
+ConstructionProtocolButton=Pindutan para sa pagbukas ng protokol sa paggawa
+ConstructionProtocolHelp=<html><body><p><b>Using the Construction Protocol</b></p><p><br><b>Keyboard</b></p><table border="1"><tr><td>\u2191</td><td>Previous construction step</td></tr><tr><td>\u2193</td><td>Next construction step</td></tr><tr><td>Home</td><td>Start of construction</td></tr><tr><td>End</td><td>End of construction</td></tr><tr><td>Del</td><td>Delete construction step</td></tr></table><p><b><br>Mouse</b></p><table border="1"><tr><td>Double click row</td><td>Choose construction step</td></tr><tr><td>Double click header</td><td>Start of construction</td></tr><tr><td>Drag & drop row</td><td>Move construction step</td></tr><tr><td>Right click row</td><td>Context menu</td></tr></table><body></html>
+ConstructionProtocolNavigation=Bar ng nabigasyon para sa hakbang sa paggawa
+Coordinates=Mga koordineyt
+CopyToClipboard=Kopyahin sa Klipbord
+CornerPoint=Sulok
+CreatedWith=Ginawa sa pamamagitan ng
+CreatedWithGeoGebra=Ginawa sa pamamagitan ng GeoGebra
+CrossAt=Magsalubong sa
+Curve=Kurba
+Date=Petsa
+Day.1=Linggo
+Day.2=Lunes
+Day.3=Martes
+Day.4=Miyerkules
+Day.5=Huwebes
+Day.6=Biyernes
+Day.7=Sabado
+Decoration=Palamuti
+Decreasing=Papaliit
+Default=Orihinal
+DefaultPointStyle=Orihinal na estilo ng point
+Defaults=Mga orihinal
+Definition=Kahulugan
+Delete=Burahin
+DeleteRowA=Burahin ang hanay %0
+DeleteRowsAtoB=Burahin ang mga hanay mula %0 hanggang %1
+DependentObjects=Mga Bagay na umaasa
+DerivativeOfA=Hango mula sa %0
+DiameterOfAConjugateToB=Kadikit na dayametro ng %0 sa %1
+Dimensions=Mga sukat
+DirectionOfA=Direksyon ng %0
+Directrix=Dayrektriks
+DirectrixOfA=Dayrektriks ng %0
+Display=Ipakita
+DisplayPointSymbol=Ipakita ang mga sagisag para sa mga point
+DistanceOfAandB=Layo ng %0 at %1
+DoubleClickToOpen=Binubuksan ng Double Click ang Window ng GeoGebra
+DoubleLine=Dobleng linya
+Down=Ibaba
+DrawingPad=Grapika
+DrawingPad2=Grapika 2
+DrawingPadA=Grapika %0
+DrawingPadAsPSTricks=Graphics View bilang PSTricks
+DrawingPadAsPicture=Graphics View bilang Larawan
+DrawingPagAsPGF=Graphics View bilang PGF/TikZ
+DynamicCoordinatesOfA=Mga daynamik na koordineyt ng %0
+DynamicWorksheet=Worksheet na daynamik
+DynamicWorksheetAsWebpage=Worksheet na daynamik bilang Webpage
+DynamicWorksheetExport=I-export ang worksheet na daynamik (html)
+EccentricityOfA=Eksentrisidad ng %0
+Edit=Baguhin
+Ellipse=Tambiyugan
+EllipseWithFociABPassingThroughC=Tambilugan na may foci na %0, %1 na dumadaan sa %2
+EllipseWithFociABandFirstAxisLengthC=Tambilugan na may foci na %0, %1 at may haba ng unang aksis na %2
+EmphasizeRightAngle=Bigyang-diin ang Anggulong Right
+EmptySet=Se
+EnableScripting=Payagan ang pag-iskrip
+Equation=Ekwasyon
+ErrorInJavaScript=Pagkakamali sa JavaScript
+ErrorInJavaScriptAtLineA=Pagkakamali sa JavaScript sa linya %0
+ErrorInScriptAtLineAFromObjectB=May pagkakamali sa iskrip sa linya %0 (itinawag mula sa %1)
+ExportAnimatedGIF=Graphics View bilang Animated GIF
+ExportAsPicture=I-export bilang Larawan
+ExportAsWebpage=I-export bilang Webpage
+ExportTextAsShapes=I-export ang teksto bilang mga hugis
+ExtendedForm=Pinahabang porma
+ExtraLarge=
+ExtraSmall=Sobrang Liit
+ExtremumOfA=Ekstremum ng %0
+File.HTML=Talatag: html
+File.SCORM=Talatag: SCORM
+Filling=Pagpuno
+Finish=Tapos
+FirstAxisLengthOfA=Haba ng mahalagang aksis ay %0
+FirstAxisOfA=Mahalagang aksis ay %0
+FixCheckbox=Ayusin ang Tsekboks
+FixObject=Ayusin ang bagay
+FocusOfA=Pokus na %0
+ForceGnuplotPgf=Gamitin ang Gnuplot para magtala ng bisa
+Format=Balangkas
+FreeObjects=Malayang mga bagay
+Function=Bisa
+FunctionAonIntervalBC=Bisa na %0 sa puwang na [%1, %2]
+FunctionNVar=Bisa
+General=Pangkalahatan
+GeneratePgf=Gumawa ng code na PGF/TikZ
+GeneratePstricks=Gumawa ng code
+GeometricObjects=Bagay na Heometriko
+GlobalJavaScript=Pangdaigdigang JavaScript
+GoToDownloadPage=Pumunta sa pahina ng pag-download
+GraphicsViewAsAsymptote=Graphics View bilang Asimtota
+GreekCharacterA=Letrang Griyego: %0
+GridType=Uri ng Grid
+Height=Taas
+Hide=Itago
+Home=Tahanan
+HorizontalSplit=Paghating Pahiga
+HyperbolaWithFociABPassingThroughC=Hyperbola na may foci na %0, %1 ay dumadaan sa %2
+HyperbolaWithFociABandFirstAxisLengthC=Hyperbola na may foci na %0, %1 at ang haba ng unang aksis ay %2
+IgnoreDocumentLayout=Huwag Pansinin ang Layout ng Dokumento
+Image=Larawan
+ImplicitPoly=Implisit na kurba
+IncircleOfTriangleABC=Bilog sa loob ng tatsulok %0%1%2
+Increasing=Papadagdag
+IncreasingOnce=Papadagdag (Isang beses)
+Inequality=Hindi pagkakatumbas
+InflectionPointofA=Impleksyon point ng %0
+InputFieldHelp=<html><body><p><b>Using the Input Bar</b></p><table border="1"><tr><td>Enter </td><td>Execute input</td></tr><tr><td>Escape</td><td>Clear input bar</td></tr><tr><td>\u2191</td><td>Previous input</td></tr><tr><td>\u2193</td><td>Next input</td></tr><tr><td>F1</td><td>Help for current command</td></tr><tr><td>TAB</td><td>Show next matching command</td></tr></table><p><br><b>Auto-Completion of Commands</b><br>After typing the first two letters of a command<br>GeoGebra will complete the command for you.</p><table border="1"><tr><td>Enter </td><td>Accept proposed command</td></tr><tr><td>Another letter</td><td>Adapts proposed command</td></tr></table><body></html>
+InputForm=Form para sa pag-input
+InputLabelToolTip=Magtype ng utos
+Insert=Maglagay
+InsertPictureOfAllOpenViews=Maglagay ng larawan ng lahat ng view na bukas
+InsertPictureOfConstruction=Maglagay ng larawan ng Graphics View
+Integer=Intedyer
+IntegralOfA=Integral ng %0
+IntegralOfAfromBtoC=Integral ng %0 mula sa %1 hanggang sa %2
+Interpolate=Iguhit ng may interpolasyon
+IntersectingLines=Mga linyang nagtatagpo
+IntersectionCurveOfAB=Kurba ng pagtatagpo ng %0, %1
+IntersectionLineOfAB=Linya ng pagtatagpo ng %0, %1
+IntersectionOfAandB=Pagtatagpo ng %0 at %1
+IntersectionPointOfAB=Point ng pagtatagpo ng %0, %1
+IntersectionPointOfABNearC=Point ng pagtatagpo ng %0, %1 malapit sa point %2
+IntersectionPointOfABWithInitialValueC=Point ng pagtatagpo ng %0, %1 na may pasimulang halagang %2
+Interval=Puwang
+InverseFilling=Pagpunong pabaliktad
+Italic=Italik
+Keyboard=Kibord
+LaTeXFormula=Pormulang LaTeX
+LaTeXHelp=Tulong sa LaTeX
+Large=Malaki
+LatexFontSize=Laki ng font sa dokumento:
+Length=Haba
+LengthOfA=Haba ng %0
+Lengths=Mga haba
+Line=Linya
+LineBisectorAB=Tagapaghati %0, %1
+LineBisectorOfA=Tagapaghati %0
+LineStyle=Istilo ng Linya
+LineThroughAB=Linya sa %0, %1
+LineThroughAParallelToB=Linya sa %0 kahilera ng %1
+LineThroughAPerpendicularToB=Linya sa %0 perpendikular sa %1
+LineThroughAwithDirectionB=Linya sa %0 na may direksyong %1
+LinearEccentricityOfA=Linyar ng eksentrisidad ng %0
+LinearInequality=Linyar na hindi pagkakatumbas
+Lines=Mga Linya
+LinkedObject=Bagay na nagkakaugnay
+List=Listahan
+LocalizedDigits=Gumamit ng mga bilang na lokalisado
+LocalizedLabels=Gumamit ng mga pangalan ng poiny na lokalisado
+LockObject=Ikandado ang bagay
+Medium=Katamtaman
+Midpoint=Point sa
+MidpointOfA=Kalagitnaan ng %0
+MidpointOfAB=Kalagitnaan ng %0, %1
+Miscellaneous=At ipa pa
+Month.1=Enero
+Month.10=Oktubre
+Month.11=Nobyembre
+Month.12=Disyembre
+Month.2=Pebrero
+Month.3=Marso
+Month.4=Abril
+Month.5=Mayo
+Month.6=Hunyo
+Month.7=Hulyo
+Month.8=Agosto
+Month.9=Setyembre
+Name=Pangalan
+Name.button=pindutan
+Name.list=listahan
+Name.picture=larawan
+Name.text=teksto
+NameAndValue=Pangalan & Halaga
+NewExpression=Bagong ekspresyon
+NewNameForA=Bagong pangalan para sa %0
+NewerVersionA=Mayroon nang mas bagong bersyon ng GeoGebra.\nGusto mo na bang makuha ang GeoGebra %0?
+Next=Susunod
+NextCell=Susunod na Cell
+No.=Hindi.
+NoJavaMessage=Ito ay isang Java Applet na ginawa gamit ang GeoGebra mula sa www.geogebra.org - mukhang wala ka pang Java. Mangyari lamang na pumunta ka sa www.java.com
+NotAvailable=Hindi Maaari
+NotIncluded=hindi kasama
+Numeric=Bilang
+NumericObjects=Bagay na Pambilang
+OK=Sige
+Objects=Mga bagay
+Off=Patayin
+OldExpression=Lumang ekspresyon
+On=Buksan
+OnClick=Sa Pag-click
+OnMouseOver=sa pag-Mouse-Over
+OnUpdate=Sa Pag-update
+Open=Buksan
+OpenButton=Pindutan para buksan ang Window ng GeoGebra
+Oscillating=Umiikot
+OverwriteFile=Gusto mo bang sapawan ang talatag na ito?
+PGFExport.Grayscale=Kulay-abo
+ParabolaWithFocusAandDirectrixB=Parabola na may pokus na %0 at direktriks na %1
+ParallelLines=Linyang nagtatagpo
+ParameterOfA=Parametro ng %0
+ParametricForm=Pormang Paramatro
+Pause=Ihinto
+Pentagon=Pentagon ;)
+PerspectiveName=Pangalan ng Perspektibo
+Picture=Larawan
+PictureHeight=Taas ng larawan
+PictureWidth=Lapad ng larawan
+Play=I-play
+PlayButton=Pindutan para i-play
+PointDep=Umaasa
+PointFree=Malaya
+PointInA=Point sa %0
+PointInside=Sa Rehiyon
+PointOn=Point sa
+PointOnA=Point sa %0
+PointOnAClosestToB=Point sa %0 na pinakamalapit sa %1
+PointOnPath=Sa Path
+PointSize=Laki ng Point
+Points=Mga Sulok
+PolarCoords=Polar na Koordineyt
+PolarLineOfARelativeToB=Polar na linya ng %0 relatibo sa %1
+PositiveDirectionOnly=Positibong Direksyon Lamang
+PositiveValuesFollowTheView=Susundan ng halagang positibo ang view
+PreviewUnavailable=Hindi maaaring mag-preview
+ProbabilityCalculator=Kalkulador ng Kalagmitan
+Properties=Mga Katangian ng Bagay
+Quadrangle=Kwadrilateral
+Quadrilateral=Kwadrilateral
+Question=Tanong
+RadiusOfA=Radius na %0
+Random=Kahit ano
+Range=Saklaw
+RayThroughAB=Ray sa %0, %1
+RayThroughAWithDirectionB=Ray sa %0 na may direksyong %1
+Redefine=Bigyang-kahulugan muli
+Remove=Tanggalin
+Rename=Muling Pangalanan
+Repeat=Ulitin
+ResizeAngle=Awtomatikong baguhin ang laki ng anggulo
+ResolutionInDPI=Resolusyon sa dpi
+RootOfA=Ugat ng %0
+RootOfAWithInitialValueB=Ugat ng %0 na may unang halagang %1
+RootOfAonIntervalBC=Ugat ng %0 sa pagitang [%1, %2]
+ScaleInCentimeter=Iskalya sa cm
+Script=Iskrip sa GeoGebra
+Scripting=Pag-iiskrip
+SecondAxisLengthOfA=Haba ng aksis na di-mahalaga ay %0
+SecondAxisOfA=Aksis na di-mahalaga ay %0
+Sector=Sektor
+SegmentABofC=Segment [%0, %1] ng %2
+Selection=Pamimili
+SelectionAllowed=Pinapayagan ang Pamimili
+Semicircle=Bahaging-bilog
+SemicircleThroughAandB=Bahaging-bilog sa %0 at %1
+Show=Ipakita
+ShowAllObjects=Ipakita ang lahat ng bagay
+ShowAutomatically=Ipakita ng awtomatiko
+ShowAxes=Ipakita ang mga akses
+ShowAxisNumbers=Ipakita ang mga bilang
+ShowGrid=Ipakita ang grid
+ShowLabel=Ipakita ang Label
+ShowObject=Ipakita ang Bagay
+ShowOnXAxis=Ipakita sa x-aksis
+ShowOnlineHelp=Ipakita ang Tulong sa Internet
+ShowOnlyBreakpoints=Ipakita lang ang mga Breakpoint
+ShowTitleBar=Ipakita ang Title Bar
+ShowTrace=Ipakita ang Bakas
+ShowTrimmed=Ipakita ang pinutol na linyang nagtagpo
+ShowxAxis=Ipakita ang xAksis
+ShowyAxis=Ipakita ang yAksis
+SimpleFormulas=Simpleng mga Pormula
+Size=Laki
+Slider=Islayder
+SlopeOfA=Tarik ng %0
+Small=Maliit
+Speed=Bilis
+SphereThroughAwithCenterB=Globo sa %0 na may gitnang %1
+SphereWithCenterAandRadiusB=Globong may gitnang %0 at radyus na %1
+Spreadsheet=Ispredsheet
+StandardObject=Saligang Bagay
+StandardView=Saligang View
+StartingPoint=Panimulang point
+StemPlot.KeyAMeansB=Susi: Ang ibig-sabihin ng %0 ay %1
+StemPlot.high=pinakamataas
+StemPlot.low=pinakamababa
+StickToEdge=Dumikit sa Dulo
+StopScript=Ihinto ang Iskrip
+Substitute=Pamalit
+SubstituteForAinB=Pamalit para sa %0 sa %1
+SubstituteSimplify=Palitan at Pasimplehin
+Syntax=Palaugnayan
+SyntaxErrorAisNotAList=Pagkakamali sa Palaugnayan: hindi listahan ang %0
+SystemInformation=Kaalaman sa Sistema
+SystemInformationMessage=Matagumpay na naikopya ang kaalaman sa sistema
+TangentToAParallelToB=Dikit sa %0 na kahilera ng %1
+TangentToAThroughB=Dikit sa %0 sa %1
+TangentToAatB=Dikit sa %0 sa %1
+Text=Teksto
+TextAfterConstruction=Teksto sa ilalim ng gawain
+TextBeforeConstruction=Teksto sa itaas ng gawain
+TextField=Kahon para sa pag-input
+TextfieldLength=Haba ng kahon para sa pag-input
+Thickness=Kapal ng Linya
+TickDistance=Layo
+TimeBetweenFrames=Oras sa pagitan ng mga Frame
+Title=Pamagat
+TitleExportPgf=GeoGebra papuntang PGF Export
+TitleExportPstricks=GeoGebra papuntang PSTricks Export
+ToggleStyleBar=Ibahin ang Styling Bar
+ToolbarIcon=Simbolo ng toolbar
+ToolbarIconsConstructionProtocolExport=Ipakita ang mga simbolo ng toolbar
+TooltipLanguage=Wika ng Tooltip
+TooltipTimeout=Pagkaubos-oras ng Tooltip (sa mga segundo)
+Tooltips=Mga tooltip
+TraceOff=Patayin ang Bakat
+TraceOn=Buksan ang Bakat
+TraceToSpreadsheet=Bakatin sa Ispredsheet
+TranslationOfAbyB=Pagsalin ng %0 sa pamamamagitan ng %1
+TranslationOfAtoB=Pagsalin ng %0 patungong %1
+TreeModeDependency=Ayusin ang mga Bagay sa Pag-asa
+TreeModeLayer=Ayusin ang mga Bagay sa Layer
+TreeModeType=Ayusin ang mga Bagay sa Uri
+TreeModeView=Ayusin ang mga Bagay sa View
+Triangle=Tatsulok
+UnitVectorOfA=Yunit na bektor ng %0
+UnitVectorPerpendicularToA=Yunit-bektor na perpendikular sa %0
+UntitledConstruction=Gawaing walang Pamagat
+Up=Taas
+Upload=I-upload
+UploadError=Hindi mabuksan ang GeoGebra Tube. Ikansela ang pag-upload. (Error Code: %0)
+UploadPrepare=Inihahanda ang Upload
+UseJavaFontsForLaTeX=Gumamit ng Java font para sa mga tekstong LaTeX
+Value=Halaga
+Vector=Bektor
+VectorPerpendicularToA=Bektor na perpendikular sa %0
+Vectors=Mga bektor
+VertexOfA=Rurok ng %0
+VeryLarge=Sobrang Laki
+VerySmall=Sobrang Liit
+ViewCloseExtraWindow=Ipakita ang View sa Pangunahing Window
+ViewOpenExtraWindow=Ipakita ang View sa Bagong Window
+VirtualKeyboard=Birtwal na Kibord
+VirtualKeyboardLanguage=Wika ng Birtwal na Kibord
+Width=Lapad
+WindowOpened=Binuksan ang window
+XMLTagANotFound=Hindi tamang talatag: hindi makita ang XML tag %0
+XUnits=X na mga yunit (cm)
+YUnits=Y na mga yunit (cm)
+ZoomIn=I-zoom papasok
+ZoomOut=I-zoom palabas
+allowOutlyingIntersections=Payagan ang Outlying Intersections
+allowReflexAngle=Payagan ang mga Reflex na anggulo
+back=Balik
+cartesian=Kartesyan
+dependent=Umaasa
+dilatedByFactor=Idinileyt ng factor
+emf=Pinalakas na Metafile
+equal=magkatumbas
+firstAxisLength=haba ng unang aksis
+fixed=Nakaayos
+fncInspector.Curvature=Pagkurba
+fncInspector.Derivative=Paghango
+fncInspector.Derivative2=Ikalawang Paghango
+fncInspector.Difference=Pagkakaiba
+fncInspector.Interval=Puwang
+fncInspector.MultipleRoots=Maraming Ugat
+fncInspector.NoRoots=Walang Ugat
+fncInspector.Points=Mga Point
+fncInspector.Property=Katangian
+fncInspector.ShowArea=Ipakita ang Area
+fncInspector.Value=halaga
+fncInspector.addColumn=Magdagdag ng hanay
+fncInspector.removeColumn=Tanggalin ang huling hanay
+fncInspector.showOscCircle=Ipakita ang bilog na osculating
+fncInspector.showTable=Ipakita ang tala ng mga point
+fncInspector.showTangent=Ipakita ang linyang dikit
+fncInspector.showXYLines=Ipakita ang linya ng x,y
+fncInspector.step=Laki ng istep para sa mga halagang x
+forward=derecho
+free=malaya
+horizontal=pahiga
+off=sarado
+otherwise=kung hindi man
+parallel=kahilera
+resetConstruction=Ulitin ang gawain
+stylebar.Align=Ayusin ang pahigang pagkahanay
+stylebar.AlignCenter=Igitna
+stylebar.AlignLeft=Ipakaliwa
+stylebar.AlignRight=Ipakanan
+stylebar.Axes=Ipakita o itago ang mga aksis
+stylebar.BgColor=Ayusin ang kulay ng likuran
+stylebar.Bold=Gawing bold ang font
+stylebar.Border=Ayusin ang border
+stylebar.Bracket=Ayusin ang istilo ng bracket
+stylebar.Caption=Ayusin ang istilo ng kapsyon
+stylebar.Capture=Ayusin ang istilo ng point capture
+stylebar.Color=Ayusin ang kulay
+stylebar.ColorTransparency=Ayusin ang Kulay at Pagkalinaw
+stylebar.CopyVisualStyle=Kopyahin ang istilong biswal
+stylebar.Eraser=Burahin ang ginuhit
+stylebar.Grid=Ipakita o itago ang grid
+stylebar.Hidden=Nakatago
+stylebar.HorizontalLine=Itago o ipakit ang pahigang linya
+stylebar.Italic=Gawing italiko ang font
+stylebar.Label=Ayusin ang istilo ng label
+stylebar.LineStyle=Ayusin ang istilo ng linya
+stylebar.Pen=Gumuhit gamit ang lapis
+stylebar.PointStyle=Ayusin ang istilo ng teksto
+stylebar.TextColor=Ayusin ang kulay ng teksto
+stylebar.TextSize=Ayusin ang laki ng teksto
+stylebar.VerticalLine=Itago o ipakita ang mga linyang patayo
+undefined=walang kahulugan
+unequal=hindi magkatumbas
+vertical=Patayo
+xAxis=xAksis
+yAxis=yAksis
\ No newline at end of file
diff --git a/geogebra/properties/plain_tr.properties b/geogebra/properties/plain_tr.properties
index e436b54..7debaf9 100644
--- a/geogebra/properties/plain_tr.properties
+++ b/geogebra/properties/plain_tr.properties
@@ -1,5 +1,3 @@
-2x2Matrix=2x2 matris
-3x3Matrix=3x3 matris
ADecimalPlace=%0 Ondal\u0131k Hane
ADecimalPlaces=%0 Ondal\u0131k Haneler
ADerivativeOfB=%1'in %0 türevi
@@ -35,6 +33,7 @@ Algebra=Cebir
AlgebraWindow=Cebir Penceresi
AliesOnB=%0,%1 üzerindedir
AliesOnThePerimeterOfB=%0,%1 çevresi üzerindedir
+AllowOfflineUse=*.jar dosyalar\u0131n\u0131 dahil et
Altitude=Yükseklik
Angle=Aç\u0131
AngleBetweenAB=%0 ve %1 aras\u0131ndaki Aç\u0131
@@ -208,7 +207,6 @@ HyperbolaWithFociABandFirstAxisLengthC=%0 ve %1 Odakl\u0131 ve ilk eksen uzunlu\
IgnoreDocumentLayout=Belge Yerle\u015fimini Önemseme
Image=Resim
ImplicitPoly=Kapal\u0131 E\u011fri
-IncludeJARFiles=*.jar dosyalar\u0131n\u0131 dahil et
Increasing=Artan
IncreasingOnce=Artan (bir kez)
Inequality=E\u015fitsizlik
@@ -317,12 +315,6 @@ PerspectiveName=Perspektif Ad\u0131
Picture=Resim
PictureHeight=Resim yüksekli\u011fi
PictureWidth=Resim geni\u015fli\u011fi
-PlaneA=düzlem %0
-PlaneContainingA=%0 içeren Düzlem
-PlaneFromA=%0 taraf\u0131ndan olu\u015fturulan düzlem
-PlaneThroughAB=%0 ve %1'den geçen Düzlem
-PlaneThroughABC=%0,%1 ve %2 noktalar\u0131ndan geçen Düzlem
-PlaneThroughAParallelToB=%0 noktas\u0131ndan geçen ve %1'e paralel Düzlem
Play=Çal\u0131\u015ft\u0131r
PlayButton=Çal\u0131\u015ft\u0131r dü\u011fmesi
Point=Nokta
diff --git a/geogebra/properties/plain_uk.properties b/geogebra/properties/plain_uk.properties
index 1e3f486..2f94a9b 100644
--- a/geogebra/properties/plain_uk.properties
+++ b/geogebra/properties/plain_uk.properties
@@ -1,5 +1,3 @@
-2x2Matrix=\u041c\u0430\u0442\u0440\u0438\u0446\u044f 2x2
-3x3Matrix=\u041c\u0430\u0442\u0440\u0438\u0446\u044f 3x3
ADecimalPlace=%0 \u0434\u0435\u0441\u044f\u0442\u043a\u043e\u0432\u0438\u0439 \u0440\u043e\u0437\u0440\u044f\u0434
ADecimalPlaces=%0 \u0434\u0435\u0441\u044f\u0442\u043a\u043e\u0432\u0438\u0445 \u0440\u043e\u0437\u0440\u044f\u0434\u0456\u0432
ADerivativeOfB=\u041f\u043e\u0445\u0456\u0434\u043d\u0430 %0 \u043f\u043e\u0440\u044f\u0434\u043a\u0443 \u0432\u0456\u0434 %1
diff --git a/geogebra/properties/plain_vi.properties b/geogebra/properties/plain_vi.properties
index 59d3452..ab593f8 100644
--- a/geogebra/properties/plain_vi.properties
+++ b/geogebra/properties/plain_vi.properties
@@ -1,5 +1,3 @@
-2x2Matrix=Ma tr\u1eadn 2x2
-3x3Matrix=Ma tr\u1eadn 3x3
ADecimalPlace=%0 D\u1ea5u th\u1eadp phân
ADecimalPlaces=%0 D\u1ea5u th\u1eadp phân
ADerivativeOfB=%0 \u0111\u1ea1o hàm c\u1ee7a %1
@@ -35,6 +33,7 @@ Algebra=D\u1ea1ng \u0111\u1ea1i s\u1ed1
AlgebraWindow=Hi\u1ec3n th\u1ecb danh sách \u0111\u1ed1i t\u01b0\u1ee3ng
AliesOnB=%0 n\u1eb1m trên %1
AliesOnThePerimeterOfB=%0 n\u1eb1m trong chu vi %1
+AllowOfflineUse=Bao g\u1ed3m t\u1eadp tin jar
AllowStyleBar=Cho phép ki\u1ec3u d\u1ea1ng hình ch\u1eef nh\u1eadt
Altitude=\u0110\u01b0\u1eddng cao
Angle=Góc
@@ -112,7 +111,6 @@ ConstructionProtocolHelp=<html><body><p><b>H\u01b0\u1edbng d\u1eabn c
ConstructionProtocolNavigation=Thanh công c\u1ee5 d\u1ef1ng hình
Coordinates=T\u1ecda \u0111\u1ed9
CopyToClipboard=Sao chép vào b\u1ed9 nh\u1edb t\u1ea1m th\u1eddi
-CopyToLaTeX=Sao chép sang LaTeX
CornerPoint=Góc \u0111\u1ec9nh
CreatedWith=T\u1ea1o v\u1edbi
CreatedWithGeoGebra=T\u1ea1o m\u1edbi v\u1edbi GeoGebra
@@ -216,7 +214,6 @@ IgnoreDocumentLayout=B\u1ecf qua \u0111\u1ecbnh d\u1ea1ng t
Image=Hình \u1ea3nh
ImplicitPoly=\u1ea8n \u0111\u01b0\u1eddng cong
IncircleOfTriangleABC=\u0110\u01b0\u1eddng tròn n\u1ed9i ti\u1ebfp tam giác %0%1%2
-IncludeJARFiles=Bao g\u1ed3m t\u1eadp tin jar
Increasing=T\u0103ng
IncreasingOnce=T\u0103ng (m\u1ed9t l\u1ea7n)
Inequality=B\u1ea5t \u0111\u1eb3ng th\u1ee9c
@@ -235,7 +232,7 @@ Interpolate=V\u1ebd s\u1eed d\u1ee5ng ph
IntersectingLines=Các \u0111\u01b0\u1eddng th\u1eb3ng giao nhau
IntersectionCurveOfAB=Giao \u0111i\u1ec3m \u0111\u01b0\u1eddng cong c\u1ee7a %0, %1
IntersectionLineOfAB=Giao \u0111i\u1ec3m \u0111\u01b0\u1eddng th\u1eb3ng c\u1ee7a %0, %1
-IntersectionPathsOfAB=Giao \u0111i\u1ec3m \u0111\u01b0\u1eddng c\u1ee7a %0, %1
+IntersectionOfAandB=Giao \u0111i\u1ec3m \u0111\u01b0\u1eddng c\u1ee7a %0, %1
IntersectionPointOfAB=Giao \u0111i\u1ec3m c\u1ee7a %0, %1
IntersectionPointOfABNearC=Giao c\u1ee7a \u0111i\u1ec3m %0, %1 g\u1ea7n \u0111i\u1ec3m %2
IntersectionPointOfABWithInitialValueC=Giao \u0111i\u1ec3m c\u1ee7a %0, %1 v\u1edbi giá tr\u1ecb b\u1eaft \u0111\u1ea7u %2
@@ -331,12 +328,6 @@ PerspectiveName=T
Picture=\u1ea2nh
PictureHeight=Chi\u1ec1u cao \u1ea3nh
PictureWidth=Chi\u1ec1u r\u1ed9ng \u1ea3nh
-PlaneA=m\u1eb7t ph\u1eb3ng %0
-PlaneContainingA=M\u1eb7t ph\u1eb3ng ch\u1ee9a %0
-PlaneFromA=m\u1eb7t ph\u1eb3ng t\u1ea1o t\u1eeb %0
-PlaneThroughAB=M\u1eb7t ph\u1eb3ng \u0111i qua %0, %1
-PlaneThroughABC=M\u1eb7t ph\u1eb3ng \u0111i qua %0, %1, %2
-PlaneThroughAParallelToB=M\u1eb7t ph\u1eb3ng \u0111i qua %0 song song v\u1edbi %1
Play=Ch\u1ea1y
PlayButton=Nút ch\u1ea1y
Point=\u0110i\u1ec3m
diff --git a/geogebra/properties/plain_zh_CN.properties b/geogebra/properties/plain_zh_CN.properties
index b9bd118..b879a6a 100644
--- a/geogebra/properties/plain_zh_CN.properties
+++ b/geogebra/properties/plain_zh_CN.properties
@@ -1,5 +1,3 @@
-2x2Matrix=2x2 \u77e9\u9635
-3x3Matrix=3x3 \u77e9\u9635
ADecimalPlace=\u4fdd\u7559%0\u4f4d\u5c0f\u6570
ADecimalPlaces=\u4fdd\u7559%0\u4f4d\u5c0f\u6570
ADerivativeOfB=%1\u7684%0\u9636\u5bfc\u6570
@@ -35,6 +33,7 @@ Algebra=\u4ee3\u6570
AlgebraWindow=\u4ee3\u6570\u533a
AliesOnB=%0\u5728%1\u4e0a
AliesOnThePerimeterOfB=%0\u5728%1\u7684\u8fb9\u754c\u4e0a
+AllowOfflineUse=\u5305\u542b *.jar \u6587\u4ef6
AllowStyleBar=\u663e\u793a\u6837\u5f0f\u680f
Altitude=\u9ad8
Angle=\u89d2\u5ea6
@@ -111,7 +110,6 @@ ConstructionProtocolHelp=<html><body><p><b>\u64cd\u4f5c\u300c\u4f5c\u56fe\u8fc7\
ConstructionProtocolNavigation=\u4f5c\u56fe\u8fc7\u7a0b\u5bfc\u822a\u6761
Coordinates=\u5750\u6807
CopyToClipboard=\u590d\u5236\u5230\u526a\u8d34\u677f
-CopyToLaTeX=\u590d\u5236\u5230LaTeX
CornerPoint=\u9876\u70b9
CreatedWith=\u5236\u4f5c\u8f6f\u4ef6\uff1a
CreatedWithGeoGebra=\u4f7f\u7528 GeoGebra \u5236\u4f5c
@@ -137,6 +135,7 @@ DeleteRowsAtoB=\u5220\u9664\u7b2c %0 - %1 \u884c
DependentObjects=\u6d3e\u751f\u5bf9\u8c61
DerivativeOfA=%0\u7684\u5bfc\u6570
DiameterOfAConjugateToB=%1 \u76f8\u5bf9\u4e8e %0 \u7684\u201c\u5f84\u7ebf\u201d
+Dimensions=\u8303\u56f4
DirectionOfA=%0 \u7684\u65b9\u5411\u5411\u91cf
Directrix=\u51c6\u7ebf
DirectrixOfA=%0\u7684\u51c6\u7ebf
@@ -149,12 +148,12 @@ Down=\u5411\u4e0b
DrawingPad=\u4e3b\u7ed8\u56fe\u533a
DrawingPad2=\u526f\u7ed8\u56fe\u533a
DrawingPadA=\u7ed8\u56fe\u533a %0
-DrawingPadAsPSTricks=\u751f\u6210PSTricks\u56fe\u7247
-DrawingPadAsPicture=\u751f\u6210\u56fe\u50cf
-DrawingPagAsPGF=\u751f\u6210PGF/TikZ\u56fe\u50cf
+DrawingPadAsPSTricks=PSTricks\u56fe\u7247
+DrawingPadAsPicture=\u56fe\u50cf
+DrawingPagAsPGF=PGF/TikZ\u56fe\u50cf
DynamicCoordinatesOfA=%0 \u7684\u52a8\u6001\u5750\u6807
DynamicWorksheet=\u52a8\u6001\u5de5\u4f5c\u8868
-DynamicWorksheetAsWebpage=\u7f51\u9875\u5f62\u5f0f\u7684\u52a8\u6001\u5de5\u4f5c\u8868
+DynamicWorksheetAsWebpage=\u52a8\u6001\u7f51\u9875
DynamicWorksheetExport=\u5bfc\u51fa\u7f51\u9875 (HTML)
EccentricityOfA=%0 \u7684\u79bb\u5fc3\u7387
Edit=\u7f16\u8f91
@@ -197,7 +196,7 @@ GeneratePstricks=\u751f\u6210 PSTricks \u4ee3\u7801
GeometricObjects=\u51e0\u4f55\u5bf9\u8c61
GlobalJavaScript=\u5168\u5c40 JavaScript
GoToDownloadPage=\u5230\u4e0b\u8f7d\u9875\u9762
-GraphicsViewAsAsymptote=\u5bfc\u51fa Asymptote \u6587\u4ef6
+GraphicsViewAsAsymptote=Asymptote \u6587\u4ef6
GreekCharacterA=\u5e0c\u814a\u5b57\u6bcd\uff1a%0
GridType=\u7f51\u683c\u7c7b\u578b
Height=\u9ad8\u5ea6
@@ -212,7 +211,6 @@ IgnoreDocumentLayout=\u5ffd\u7565\u6587\u4ef6\u683c\u5c40
Image=\u56fe\u5f62
ImplicitPoly=\u9690\u5f0f\u66f2\u7ebf
IncircleOfTriangleABC=\u4e09\u89d2\u5f62 %0%1%2 \u7684\u5185\u5207\u5706
-IncludeJARFiles=\u5305\u542b *.jar \u6587\u4ef6
Increasing=\u589e\u957f\u7684
IncreasingOnce=\u9012\u589e (\u4e00\u6b21)
Inequality=\u4e0d\u7b49\u5f0f
@@ -229,7 +227,7 @@ Interpolate=\u4f7f\u7528\u63d2\u503c
IntersectingLines=\u76f8\u4ea4\u7ebf
IntersectionCurveOfAB=%0 \u548c %1 \u7684\u76f8\u4ea4\u66f2\u7ebf
IntersectionLineOfAB=%0 \u548c %1 \u7684\u4ea4\u7ebf
-IntersectionPathsOfAB=%0 \u548c %1 \u7684\u76f8\u4ea4\u8def\u5f84
+IntersectionOfAandB=%0 \u548c %1 \u7684\u76f8\u4ea4\u8def\u5f84
IntersectionPointOfAB=%0 \u548c %1 \u7684\u4ea4\u70b9
IntersectionPointOfABNearC=%0 \u548c %1 \u7684\u4ea4\u70b9 (\u9760\u8fd1 %2)
IntersectionPointOfABWithInitialValueC=%0 \u548c %1 \u7684\u4ea4\u70b9 (\u521d\u59cb\u503c %2)
@@ -295,6 +293,9 @@ Objects=\u5bf9\u8c61
Off=\u5173\u95ed
OldExpression=\u65e7\u8868\u8fbe\u5f0f
On=\u5f00\u542f
+OnClick=\u5355\u51fb\u65f6
+OnMouseOver=\u9f20\u6807\u79fb\u8fc7\u65f6
+OnUpdate=\u88ab\u66f4\u65b0\u65f6
Open=\u6253\u5f00
OpenButton=\u5728\u7ed8\u56fe\u533a\u4e2d\u6253\u5f00\u7a0b\u5e8f\u7a97\u53e3\u7684\u6309\u94ae
Oscillating=\u5f80\u590d\u632f\u8361\u7684
@@ -311,12 +312,6 @@ PerspectiveName=\u89c6\u89d2\u540d\u79f0
Picture=\u56fe\u7247
PictureHeight=\u56fe\u7247\u9ad8\u5ea6
PictureWidth=\u56fe\u7247\u5bbd\u5ea6
-PlaneA=\u5e73\u9762 %0
-PlaneContainingA=\u5e73\u9762 (\u5305\u542b %0)
-PlaneFromA=\u5e73\u9762 (\u7531 %0 \u4ea7\u751f)
-PlaneThroughAB=\u5e73\u9762 (\u8fc7 %0\u3001%1)
-PlaneThroughABC=\u5e73\u9762 (\u8fc7 %0\u3001%1\u3001%2)
-PlaneThroughAParallelToB=\u5e73\u9762 (\u8fc7 %0\u3001\u5e73\u884c\u4e8e %1)
Play=\u64ad\u653e
PlayButton=\u663e\u793a\u201c\u64ad\u653e\u201d\u6309\u94ae
Point=\u70b9
@@ -335,7 +330,7 @@ PolarCoords=\u6781\u5750\u6807
PolarLineOfARelativeToB=%0 \u76f8\u5bf9\u4e8e %1 \u7684\u6781\u7ebf
PolyLine=\u6298\u7ebf
Polygon=\u591a\u8fb9\u5f62
-PositiveDirectionOnly=\u53ea\u663e\u793a\u6b63\u5411
+PositiveDirectionOnly=\u53ea\u663e\u793a\u6b63\u534a\u8f74
PreviewUnavailable=\u65e0\u6cd5\u9884\u89c8
ProbabilityCalculator=\u6982\u7387\u8ba1\u7b97\u5668
Properties=\u5c5e\u6027
diff --git a/geogebra/properties/plain_zh_TW.properties b/geogebra/properties/plain_zh_TW.properties
index fc58653..02b4f55 100644
--- a/geogebra/properties/plain_zh_TW.properties
+++ b/geogebra/properties/plain_zh_TW.properties
@@ -1,5 +1,3 @@
-2x2Matrix=2x2 \u77e9\u9663
-3x3Matrix=3x3 \u77e9\u9663
ADecimalPlace=%0 \u4f4d\u5c0f\u6578
ADecimalPlaces=%0 \u4f4d\u5c0f\u6578
ADerivativeOfB=%1 \u7684\u7b2c %0 \u6b21\u5fae\u5206
@@ -35,6 +33,7 @@ Algebra=\u4ee3\u6578
AlgebraWindow=\u4ee3\u6578\u5340
AliesOnB=%0 \u5728 %1 \u4e0a
AliesOnThePerimeterOfB=%0 \u5728 %1 \u7684\u5468\u908a\u4e0a
+AllowOfflineUse=\u5305\u542b *.jar \u6a94
AllowStyleBar=\u986f\u793a\u6a23\u5f0f\u6b04
Altitude=\u9ad8\u5ea6
Angle=\u89d2\u5ea6
@@ -111,7 +110,6 @@ ConstructionProtocolHelp=<html><body><p><b>\u64cd\u4f5c\u300c\u69cb\u5716\u6309\
ConstructionProtocolNavigation=\u986f\u793a\u300c\u5c0e\u64ad\u6b04\u300d\u6309\u9215
Coordinates=\u5ea7\u6a19
CopyToClipboard=\u8907\u88fd\u5230\u526a\u8cbc\u7c3f
-CopyToLaTeX=\u8907\u88fd\u5230LaTex
CornerPoint=\u9802\u9ede
CreatedWith=\u88fd\u4f5c\u8edf\u9ad4\uff1a
CreatedWithGeoGebra=GeoGebra \u88fd\u4f5c
@@ -213,7 +211,6 @@ IgnoreDocumentLayout=\u5ffd\u7565\u6587\u4ef6\u683c\u5c40
Image=\u5716\u5f62
ImplicitPoly=\u66f2\u7dda\u65b9\u7a0b\u5f0f
IncircleOfTriangleABC=\u4e09\u89d2\u5f62 %0%1%2 \u7684\u5167\u5207\u5713
-IncludeJARFiles=\u5305\u542b *.jar \u6a94
Increasing=\u905e\u589e
IncreasingOnce=\u905e\u589e (\u4e00\u6b21)
Inequality=\u4e0d\u7b49\u5f0f
@@ -230,7 +227,7 @@ Interpolate=\u4f7f\u7528\u5167\u63d2\u6cd5
IntersectingLines=\u76f8\u4ea4\u7dda
IntersectionCurveOfAB=%0 \u548c %1 \u7684\u76f8\u4ea4\u66f2\u7dda
IntersectionLineOfAB=%0 \u548c %1 \u7684\u4ea4\u7dda
-IntersectionPathsOfAB=%0 \u548c %1 \u7684\u76f8\u4ea4\u8def\u5f91
+IntersectionOfAandB=%0 \u548c %1 \u7684\u76f8\u4ea4\u8def\u5f91
IntersectionPointOfAB=%0 \u548c %1 \u7684\u4ea4\u9ede
IntersectionPointOfABNearC=%0 \u548c %1 \u7684\u4ea4\u9ede (\u9760\u8fd1 %2)
IntersectionPointOfABWithInitialValueC=%0 \u548c %1 \u548c\u4ea4\u9ede (\u521d\u59cb\u503c %2)
@@ -312,12 +309,6 @@ PerspectiveName=\u683c\u5c40\u540d\u7a31
Picture=\u5716\u7247
PictureHeight=\u5716\u7247\u9ad8\u5ea6
PictureWidth=\u5716\u7247\u5bec\u5ea6
-PlaneA=\u5e73\u9762 %0
-PlaneContainingA=\u5e73\u9762 (\u5305\u542b %0)
-PlaneFromA=\u5e73\u9762 (\u7531 %0 \u7522\u751f)
-PlaneThroughAB=\u5e73\u9762 (\u904e %0\u3001%1)
-PlaneThroughABC=\u5e73\u9762 (\u904e %0\u3001%1\u3001%2)
-PlaneThroughAParallelToB=\u5e73\u9762 (\u904e %0\u3001\u5e73\u884c %1)
Play=\u64ad\u653e
PlayButton=\u986f\u793a\u300c\u64ad\u653e\u300d\u6309\u9215
Point=\u9ede
diff --git a/geogebra/properties/symbols_es.properties b/geogebra/properties/symbols_es.properties
index e69de29..41466d1 100644
--- a/geogebra/properties/symbols_es.properties
+++ b/geogebra/properties/symbols_es.properties
@@ -0,0 +1,33 @@
+S.1=«
+S.10={
+S.11=É
+S.12=}
+S.13=Á
+S.14=Í
+S.15=Ó
+S.16=Ú
+S.17=@
+S.18=¡
+S.19=¿
+S.2=»
+S.3=\u20ac
+S.7=é
+S.8=Ü
+S.9=ü
+T.1=Comillas de Apertura
+T.10=Llave de Apertura
+T.11=E con tilde
+T.12=Llave de Cierre
+T.13=A con tilde
+T.14=I con tilde
+T.15=O con tilde
+T.16=U con tilde
+T.17=arroba
+T.18=signo de admiración de apertura
+T.19=signo de interrogación de apertura
+T.2=Comillas de Cierre
+T.3=Euro
+T.6=U con diéresis
+T.7=e con tilde
+T.8=U con diéresis
+T.9=u con diéresis
\ No newline at end of file
diff --git a/geogebra/properties/symbols_gl.properties b/geogebra/properties/symbols_gl.properties
index e69de29..a5d49fd 100644
--- a/geogebra/properties/symbols_gl.properties
+++ b/geogebra/properties/symbols_gl.properties
@@ -0,0 +1,4 @@
+S.1=«
+S.2=»
+T.1=Comiñas de apertura
+T.2=Comiñas de peche
\ No newline at end of file
diff --git a/geogebra/properties/symbols_hu.properties b/geogebra/properties/symbols_hu.properties
index e69de29..88fc3f2 100644
--- a/geogebra/properties/symbols_hu.properties
+++ b/geogebra/properties/symbols_hu.properties
@@ -0,0 +1,19 @@
+S.1=á
+S.10=^
+S.11=°
+S.12=[
+S.13=]
+S.14={
+S.15=}
+S.16=ü
+S.17=\u0171
+S.2=é
+S.3=í
+S.4=ó
+S.5=ö
+S.6=\u0151
+S.7=ú
+S.8=ü
+S.9=\u0171
+T.10=hatvány
+T.11=fok
\ No newline at end of file
diff --git a/geogebra/properties/colors_cy.properties b/geogebra/properties/symbols_hy.properties
similarity index 100%
copy from geogebra/properties/colors_cy.properties
copy to geogebra/properties/symbols_hy.properties
diff --git a/geogebra/properties/symbols_nl.properties b/geogebra/properties/symbols_nl.properties
index e69de29..d257a0f 100644
--- a/geogebra/properties/symbols_nl.properties
+++ b/geogebra/properties/symbols_nl.properties
@@ -0,0 +1 @@
+T.1=pond
\ No newline at end of file
diff --git a/geogebra/properties/symbols_sv.properties b/geogebra/properties/symbols_sv.properties
index e69de29..e77de55 100644
--- a/geogebra/properties/symbols_sv.properties
+++ b/geogebra/properties/symbols_sv.properties
@@ -0,0 +1,2 @@
+S.1=ü
+T.1=Tyskt "y"
\ No newline at end of file
diff --git a/geogebra/properties/colors_cy.properties b/geogebra/properties/symbols_tl.properties
similarity index 100%
copy from geogebra/properties/colors_cy.properties
copy to geogebra/properties/symbols_tl.properties
diff --git a/geogebra/util/GgbMat.java b/geogebra/util/GgbMat.java
index 547d788..403bfd8 100644
--- a/geogebra/util/GgbMat.java
+++ b/geogebra/util/GgbMat.java
@@ -4,161 +4,195 @@ import geogebra.kernel.Construction;
import geogebra.kernel.GeoElement;
import geogebra.kernel.GeoList;
import geogebra.kernel.GeoNumeric;
+import geogebra.kernel.Kernel;
import geogebra.kernel.arithmetic.ExpressionValue;
import geogebra.kernel.arithmetic.MyList;
import geogebra.kernel.arithmetic.NumberValue;
import org.apache.commons.math.linear.Array2DRowRealMatrix;
+import org.apache.commons.math.linear.DecompositionSolver;
+import org.apache.commons.math.linear.LUDecompositionImpl;
import org.apache.commons.math.linear.RealMatrix;
+/**
+ * Matrix format allowing conversion from/to MyList and GeoList,
+ * supporting matrix operations (inverse, determinant etc.)
+ *
+ * @author Michael Borcherds
+ *
+ */
+public class GgbMat extends Array2DRowRealMatrix{
-public class GgbMat extends Array2DRowRealMatrix {
-
+ private static final long serialVersionUID = 1L;
+
private boolean isUndefined = false;
- public GgbMat (GeoList inputList) {
+ /**
+ * Creates matrix from GeoList
+ * @param inputList list
+ */
+ public GgbMat(GeoList inputList) {
int rows = inputList.size();
if (!inputList.isDefined() || rows == 0) {
setIsUndefined(true);
return;
- }
+ }
GeoElement geo = inputList.get(0);
if (!geo.isGeoList()) {
setIsUndefined(true);
- return;
+ return;
}
-
- int cols = ((GeoList)geo).size();
+ int cols = ((GeoList) geo).size();
if (cols == 0) {
setIsUndefined(true);
- return;
+ return;
}
data = new double[rows][cols];
- //m = rows;
- //n = cols;
-
+ // m = rows;
+ // n = cols;
+
GeoList rowList;
- for (int r = 0 ; r < rows ; r++) {
+ for (int r = 0; r < rows; r++) {
geo = inputList.get(r);
if (!geo.isGeoList()) {
setIsUndefined(true);
- return;
+ return;
}
- rowList = (GeoList)geo;
+ rowList = (GeoList) geo;
if (rowList.size() != cols) {
setIsUndefined(true);
- return;
+ return;
}
- for (int c = 0 ; c < cols ; c++) {
+ for (int c = 0; c < cols; c++) {
geo = rowList.get(c);
if (!geo.isGeoNumeric()) {
setIsUndefined(true);
- return;
+ return;
}
- setEntry(r, c, ((GeoNumeric)geo).getValue());
+ setEntry(r, c, ((GeoNumeric) geo).getValue());
}
}
}
- public GgbMat (MyList inputList) {
-
-
- if ( !inputList.isMatrix()) {
+ /**
+ * Creates matrix from MyList
+ * @param inputList list
+ */
+ public GgbMat(MyList inputList) {
+
+ if (!inputList.isMatrix()) {
setIsUndefined(true);
return;
- }
+ }
int rows = inputList.getMatrixRows();
int cols = inputList.getMatrixCols();
- if(rows < 1 || cols <1){
+ if (rows < 1 || cols < 1) {
setIsUndefined(true);
return;
- }
+ }
data = new double[rows][cols];
-
- for (int r = 0 ; r < rows ; r++) {
- for (int c = 0 ; c < cols ; c++) {
+
+ for (int r = 0; r < rows; r++) {
+ for (int c = 0; c < cols; c++) {
ExpressionValue geo = MyList.getCell(inputList, c, r);
if (!geo.isNumberValue()) {
setIsUndefined(true);
- return;
+ return;
}
- setEntry(r, c, ((NumberValue)geo).getDouble());
+ setEntry(r, c, ((NumberValue) geo).getDouble());
}
}
}
-
+
+ /**
+ * Inverts this matrix. If singular, sets the undefined flag to true.
+ */
public void inverseImmediate() {
try {
- RealMatrix ret = inverse();
+ DecompositionSolver d = new LUDecompositionImpl(this,Kernel.EPSILON).getSolver();
+ RealMatrix ret = d.getInverse();
data = ret.getData();
- luDecompose();
- //m = ret.m;
- //n = ret.n;
- }
- catch (Exception e) { // can't invert
+ // m = ret.m;
+ // n = ret.n;
+ } catch (Exception e) { // can't invert
setIsUndefined(true);
}
-
+ }
+
+ /**
+ * Returns determinant of this matrix
+ * @return determinat
+ */
+ public double determinant(){
+ return new LUDecompositionImpl(this, Kernel.EPSILON).getDeterminant();
}
- /*
+ /**
+ * Computes the reduced row echelon form.
+ *
* code from http://rosettacode.org/wiki/Reduced_row_echelon_form
*/
-public void reducedRowEchelonFormImmediate() {
- int rowCount = data.length;
- if (rowCount == 0)
- return;
-
- int columnCount = data[0].length;
-
- int lead = 0;
- for (int r = 0; r < rowCount; r++) {
- if (lead >= columnCount)
- break;
- {
- int i = r;
- while (data[i][lead] == 0) {
- i++;
- if (i == rowCount) {
- i = r;
- lead++;
- if (lead == columnCount)
- return;
- }
- }
- double[] temp = data[r];
- data[r] = data[i];
- data[i] = temp;
- }
-
- {
- double lv = data[r][lead];
- for (int j = 0; j < columnCount; j++)
- data[r][j] /= lv;
- }
-
- for (int i = 0; i < rowCount; i++) {
- if (i != r) {
- double lv = data[i][lead];
- for (int j = 0; j < columnCount; j++)
- data[i][j] -= lv * data[r][j];
- }
- }
- lead++;
- }
-}
+ public void reducedRowEchelonFormImmediate() {
+ int rowCount = data.length;
+ if (rowCount == 0)
+ return;
+
+ int columnCount = data[0].length;
+
+ int lead = 0;
+ for (int r = 0; r < rowCount; r++) {
+ if (lead >= columnCount)
+ break;
+ {
+ int i = r;
+ //make sure we don't use a leader which is almost zero
+ // http://www.geogebra.org/forum/viewtopic.php?f=1&t=25684
+ while (Kernel.isZero(data[i][lead])) {
+ data[i][lead] = 0;
+ i++;
+ if (i == rowCount) {
+ i = r;
+ lead++;
+ if (lead == columnCount)
+ return;
+ }
+ }
+ double[] temp = data[r];
+ data[r] = data[i];
+ data[i] = temp;
+ }
+ {
+ double lv = data[r][lead];
+ for (int j = 0; j < columnCount; j++)
+ data[r][j] /= lv;
+ }
+
+ for (int i = 0; i < rowCount; i++) {
+ if (i != r) {
+ double lv = data[i][lead];
+ for (int j = 0; j < columnCount; j++)
+ data[i][j] -= lv * data[r][j];
+ }
+ }
+ lead++;
+ }
+ }
+
+ /**
+ * Transposes this matrix
+ */
public void transposeImmediate() {
-
+
int m = getRowDimension();
int n = getColumnDimension();
@@ -169,12 +203,12 @@ public void reducedRowEchelonFormImmediate() {
}
}
data = C;
-
- if (m == n) luDecompose();
}
- /*
+ /**
* returns GgbMatrix as a GeoList eg { {1,2}, {3,4} }
+ * @param outputList list for the copy
+ * @param cons construction
*/
public GeoList getGeoList(GeoList outputList, Construction cons) {
@@ -198,18 +232,55 @@ public void reducedRowEchelonFormImmediate() {
return outputList;
}
+
+ /**
+ * returns GgbMatrix as a MyList eg { {1,2}, {3,4} }
+ * @param outputList list for the copy
+ * @param kernel kernel
+ */
+ public void getMyList(MyList outputList,Kernel kernel) {
+ if (isUndefined) {
+ return;
+ }
- /*
- * returns true if the matrix is undefined
- * eg after being inverted
+ outputList.clear();
+
+ for (int r = 0; r < getRowDimension(); r++) {
+ MyList columnList = new MyList(kernel);
+ for (int c = 0; c < getColumnDimension(); c++) {
+ // Application.debug(get(r, c)+"");
+ columnList.addListElement(new GeoNumeric(kernel.getConstruction(), getEntry(r, c)));
+ }
+ outputList.addListElement(columnList);
+ }
+ }
+
+
+ /**
+ * @return true if the matrix is undefined eg after being inverted
*/
public boolean isUndefined() {
return isUndefined;
}
+
+ /**
+ * Sets the undefined flag to false (e.g. when inverting singular matrix)
+ * @param undefined new undefined flag
+ */
public void setIsUndefined(boolean undefined) {
isUndefined = undefined;
}
-
+ /**
+ * True for matrix formed by integers
+ * @return true if all entries are integers
+ */
+ public boolean hasOnlyIntegers() {
+ for(int i=0;i<data.length;i++)
+ for(int j=0;j<data[i].length;j++)
+ if(!Kernel.isInteger(data[i][j]))
+ return false;
+ return true;
+ }
}
diff --git a/geogebra/util/Unicode.java b/geogebra/util/Unicode.java
index 53f778b..0772971 100644
--- a/geogebra/util/Unicode.java
+++ b/geogebra/util/Unicode.java
@@ -148,6 +148,7 @@ public class Unicode {
testCharMap.put("ru", '\u0439'); // Russian
testCharMap.put("mr", '\u092e'); // Marathi
testCharMap.put("ne", '\u0947'); // Nepalese
+ testCharMap.put("am", '\u0570'); // Armenian
}
diff --git a/geogebra/util/Util.java b/geogebra/util/Util.java
index 4f4333c..f574eb9 100644
--- a/geogebra/util/Util.java
+++ b/geogebra/util/Util.java
@@ -32,7 +32,11 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.net.HttpURLConnection;
+import java.net.InetAddress;
import java.net.URL;
+import java.net.UnknownHostException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.Comparator;
import javax.swing.JComponent;
@@ -769,6 +773,35 @@ public class Util extends Object {
return comparator;
}
+ public static String getIPAddress() {
+ return (String) AccessController
+ .doPrivileged(new PrivilegedAction<Object>() {
+ public Object run() {
+ try {
+ InetAddress addr = InetAddress.getLocalHost();
+ // Get host name
+ return addr.getHostAddress();
+ } catch (UnknownHostException e) {
+ return "";
+ }
+ }
+ });
+ }
+
+ public static String getHostname() {
+ return AccessController.doPrivileged(new PrivilegedAction<String>() {
+ public String run() {
+ try {
+ InetAddress addr = InetAddress.getLocalHost();
+ // Get host name
+ return addr.getHostName();
+ } catch (UnknownHostException e) {
+ return "";
+ }
+ }
+ });
+ }
+
}
--
GeoGebra: Dynamic mathematics software for education
More information about the pkg-java-commits
mailing list