diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index ad87b2b..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-SUBDIRS = data lib src search-provider tests help po
-
-AM_DISTCHECK_CONFIGURE_FLAGS = --enable-installed-tests
-
-EXTRA_DIST = \
-	meson.build \
-	data/meson.build \
-	help/meson.build \
-	lib/meson.build \
-	po/meson.build \
-	search-provider/meson.build \
-	src/meson.build \
-	tests/meson.build \
-	meson_post_install.py \
-	$(NULL)
-
-MAINTAINERCLEANFILES = \
-	$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
-	$(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
-	$(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL)
-
-GITIGNOREFILES = m4
-
-@BEHAVE_INSTALLED_TESTS_RULE@
-INSTALLED_TESTS=basic_mode advanced_mode financial_mode programming_mode
-INSTALLED_TESTS_TYPE=session-exclusive
-
--include $(top_srcdir)/git.mk
diff --git a/NEWS b/NEWS
index c2dae8e..e905d2a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,39 @@
+Overview of changes in gnome-calculator 3.29.91
+    * Updated Polish translation (Piotr Drąg)
+    * Updated Brazilian Portuguese translation (Bruno Lopes da Silva)
+    * Updated snap to build with meson (Ken VanDine)
+    * Updated Slovenian translation (Matej Urbančič)
+    * Updated German translation (Mario Blättermann)
+    * Updated French tanslation (Alexandre Franke)
+    * Updated Lithuanian translation (Aurimas Černius)
+    * Updated Chinese (Taiwan) translation (Yi-Jyun Pan)
+    * Updated Turkish translation (Emin Tufan Çetin)
+    * Updated Italian translation (Fernando Governatore)
+
+Overview of changes in gnome-calculator 3.29.90
+    * Fixed flatpak build issues (Robert Roth)
+    * Fixed naming of Turkish lira currency (Çağatay Yiğit Şahin)
+    * Added OARS metadata (Nick Richards)
+    * CI configuration (Robert Ancell)
+    * Updated Spanish translation (Daniel Musteles)
+    * Updated Chinese (Taiwan) translation (Yi-Jyun Pan)
+    * Updated Romanian translation (Daniel Șerbănescu)
+    * Updated Catalan translation (Jordi Mas)
+    * Updated Brazilian Portuguese translation (Bruno Lopes da Silva)
+
+Overview of changes in gnome-calculator 3.29.3
+    * Fix currencies not loading gitlab#66 (Robert Roth)
+    * Use Mass instead of Weight for mass units gitlab#67 (Robert Roth)
+    * Dropped autotools in favour of meson for build (Robert Roth)
+    * Updated MPC and MPFR to latest release (Arnaud Bonatti)
+    * Updated Chinese (China) translation (Dingzhong Chen)
+    * Updated Romanian translation (Daniel Șerbănescu)
+    * Updated Chinese (Taiwan) translation (Cheng-Chia Tseng)
+    * Updated Catalan translation (Jordi Mas)
+    * Updated Croatian translations (Goran Vidović)
+    * Updated Slovak translation (Dušan Kazik)
+    * Updated Russian translation (Stas Solovey)
+
 Overview of changes in gnome-calculator 3.28.0
     * Updated German translation (Tim Sabsch)
     * Updated Czech translation (Marek Černocký)
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..540035b
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+[![Build Status](https://gitlab.gnome.org/GNOME/gnome-calculator/badges/master/build.svg)](https://gitlab.gnome.org/GNOME/gnome-calculator/pipelines)
+
+This is the source code for the standard GNOME calculator.
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 4f419f9..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-test -n "$srcdir" || srcdir=`dirname "$0"`
-test -n "$srcdir" || srcdir=.
-
-olddir=`pwd`
-cd "$srcdir"
-
-(test -f $srcdir/configure.ac) || {
-        echo "**Error**: Directory "\`$srcdir\'" does not look like the top-level project directory"
-        exit 1
-}
-
-PKG_NAME=`autoconf --trace 'AC_INIT:$1' "$srcdir/configure.ac"`
-
-if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
-        echo "**Warning**: I am going to run \`configure' with no arguments." >&2
-        echo "If you wish to pass any to it, please specify them on the" >&2
-        echo \`$0\'" command line." >&2
-        echo "" >&2
-fi
-
-set -x
-aclocal --install || exit 1
-intltoolize --force --copy --automake || exit 1
-autoreconf --verbose --force --install -Wno-portability || exit 1
-{ set +x; } 2>/dev/null
-
-cd "$olddir"
-test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
-
-
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 76afb71..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,91 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT([gnome-calculator], [3.28.0])
-AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
-AM_SILENT_RULES([yes])
-AM_MAINTAINER_MODE([enable])
-
-AM_PROG_VALAC([0.24])
-
-LT_PREREQ([2.2])
-LT_INIT
-
-AC_PATH_PROG([GLIB_COMPILE_RESOURCES], [glib-compile-resources])
-
-GLIB_GSETTINGS
-
-APPSTREAM_XML
-
-dnl ###########################################################################
-dnl Dependencies
-dnl ###########################################################################
-
-GLIB_REQUIRED=2.40.0
-GTK_REQUIRED=3.19.3
-GTKSOURCEVIEW_REQUIRED=3.15.1
-LIBSOUP_REQUIRED=2.42
-
-AC_SUBST([GLIB_REQUIRED])
-
-# FIXME We link to it too, so this check needs to be better....
-AC_CHECK_HEADER([mpfr.h], [], [AC_MSG_ERROR([The mpfr header is missing. Please, install mpfr])])
-AC_CHECK_HEADER([mpc.h], [], [AC_MSG_ERROR([The mpc header is missing. Please, install mpc])])
-
-PKG_CHECK_MODULES(LIBCALCULATOR, [
-    glib-2.0 >= $GLIB_REQUIRED
-    gio-2.0 >= $GLIB_REQUIRED
-    gtksourceview-3.0 >= $GTKSOURCEVIEW_REQUIRED
-    libxml-2.0
-    libsoup-2.4 >= $LIBSOUP_REQUIRED
-])
-
-PKG_CHECK_MODULES(GNOME_CALCULATOR, [
-    gtk+-3.0 >= $GTK_REQUIRED
-    gmodule-export-2.0
-    gtksourceview-3.0 >= $GTKSOURCEVIEW_REQUIRED
-])
-
-PKG_CHECK_MODULES(GCALCCMD, [
-    gobject-2.0 >= $GLIB_REQUIRED
-])
-
-PKG_CHECK_MODULES(SEARCH_PROVIDER, [
-    glib-2.0 >= $GLIB_REQUIRED
-    gio-2.0 >= $GLIB_REQUIRED
-])
-
-dnl ###########################################################################
-dnl Internationalization
-dnl ###########################################################################
-
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.8])
-AC_SUBST([GETTEXT_PACKAGE], [gnome-calculator])
-
-dnl ###########################################################################
-dnl Documentation
-dnl ###########################################################################
-
-YELP_HELP_INIT
-
-dnl ###########################################################################
-dnl Installed tests
-dnl ###########################################################################
-BEHAVE_INSTALLED_TESTS
-
-dnl ###########################################################################
-dnl Files to generate
-dnl ###########################################################################
-
-AC_OUTPUT([
-Makefile
-search-provider/Makefile
-lib/Makefile
-src/Makefile
-po/Makefile.in
-data/Makefile
-data/icons/Makefile
-help/Makefile
-tests/Makefile
-])
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
index 894e9f0..0000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-SUBDIRS = icons
-
-gsettings_SCHEMAS = org.gnome.calculator.gschema.xml
-@GSETTINGS_RULES@
-
-desktopdir = $(datadir)/applications
-desktop_in_files = org.gnome.Calculator.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-$(desktop_DATA): $(desktop_in_files)
-	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-
-@APPSTREAM_XML_RULES@
-appstream_in_files = org.gnome.Calculator.appdata.xml.in
-appstream_XML = $(appstream_in_files:.xml.in=.xml)
-
-$(appstream_XML): $(appstream_in_files)
-	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
-
-man1_MANS = gnome-calculator.1 gcalccmd.1
-
-EXTRA_DIST = \
-	$(appstream_in_files) \
-	$(desktop_in_files) \
-	$(gsettings_SCHEMAS) \
-	$(man1_MANS)
-
-CLEANFILES = \
-	$(appstream_XML) \
-	$(desktop_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
deleted file mode 100644
index 422c42a..0000000
--- a/data/icons/Makefile.am
+++ /dev/null
@@ -1,73 +0,0 @@
-NULL =
-
-public_icons_themes = \
-	hicolor \
-	$(NULL)
-
-public_icons = \
-	hicolor_apps_16x16_gnome-calculator.png \
-	hicolor_apps_22x22_gnome-calculator.png \
-	hicolor_apps_24x24_gnome-calculator.png \
-	hicolor_apps_32x32_gnome-calculator.png \
-	hicolor_apps_48x48_gnome-calculator.png \
-	hicolor_apps_256x256_gnome-calculator.png \
-	hicolor_apps_512x512_gnome-calculator.png \
-	hicolor_apps_scalable_gnome-calculator-symbolic.svg \
-	$(NULL)
-
-icon16dir=$(datadir)/icons/hicolor/16x16/apps
-icon22dir=$(datadir)/icons/hicolor/22x22/apps
-icon24dir=$(datadir)/icons/hicolor/24x24/apps
-icon32dir=$(datadir)/icons/hicolor/32x32/apps
-icon48dir=$(datadir)/icons/hicolor/48x48/apps
-icon256dir=$(datadir)/icons/hicolor/256x256/apps
-icon512dir=$(datadir)/icons/hicolor/512x512/apps
-iconscalabledir=$(datadir)/icons/hicolor/scalable/apps
-
-icon16_DATA = hicolor/16x16/apps/gnome-calculator.png
-icon22_DATA = hicolor/22x22/apps/gnome-calculator.png
-icon24_DATA = hicolor/24x24/apps/gnome-calculator.png
-icon32_DATA = hicolor/32x32/apps/gnome-calculator.png
-icon48_DATA = hicolor/48x48/apps/gnome-calculator.png
-icon256_DATA = hicolor/256x256/apps/gnome-calculator.png
-icon512_DATA = hicolor/512x512/apps/gnome-calculator.png
-iconscalable_DATA = hicolor/scalable/apps/gnome-calculator-symbolic.svg
-
-noinst_DATA = \
-	gnome-calculator-src.svg \
-	$(NULL)
-
-EXTRA_DIST = \
-	$(icon16_DATA)	\
-	$(icon22_DATA)	\
-	$(icon24_DATA)	\
-	$(icon32_DATA)	\
-	$(icon48_DATA)	\
-	$(icon256_DATA)	\
-	$(icon512_DATA)	\
-	$(iconscalable_DATA)	\
-	$(noinst_DATA)		\
-	$(NULL)
-
-###############################################################################
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t
-
-update-icon-cache:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		for theme in $(public_icons_themes); do \
-			$(gtk_update_icon_cache) $(datadir)/icons/$$theme; \
-		done; \
-	else \
-		echo "*** Icon cache not updated.  After (un)install, run this:"; \
-		for theme in $(public_icons_themes); do \
-			echo "***   $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
-		done; \
-	fi
-
-install-data-local: update-icon-cache
-
-uninstall-local: update-icon-cache
-
--include $(top_srcdir)/git.mk
diff --git a/data/meson.build b/data/meson.build
index a221dc4..55e8e42 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,7 +1,7 @@
 # Icons
 install_subdir('icons',
   install_dir: join_paths(get_option('datadir')),
-  exclude_files: [ 'Makefile', 'Makefile.in', 'Makefile.am', 'gnome-calculator-src.svg' ],
+  exclude_files: [ 'gnome-calculator-src.svg' ],
 )
 
 # Desktop file
diff --git a/data/org.gnome.Calculator.appdata.xml.in b/data/org.gnome.Calculator.appdata.xml.in
index 0c6318a..4542965 100644
--- a/data/org.gnome.Calculator.appdata.xml.in
+++ b/data/org.gnome.Calculator.appdata.xml.in
@@ -60,8 +60,37 @@
     <kudo>UserDocs</kudo>
   </kudos>
   <developer_name>The GNOME Project</developer_name>
-  <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-calculator</url>
+  <url type="bugtracker">https://gitlab.gnome.org/GNOME/gnome-system-monitor/issues</url>
   <url type="donation">http://www.gnome.org/friends/</url>
   <url type="help">https://help.gnome.org/users/gnome-calculator/stable/</url>
   <translation type="gettext">gnome-calculator</translation>
+  <content_rating type="oars-1.1">
+    <content_attribute id="violence-cartoon">none</content_attribute>
+    <content_attribute id="violence-fantasy">none</content_attribute>
+    <content_attribute id="violence-realistic">none</content_attribute>
+    <content_attribute id="violence-bloodshed">none</content_attribute>
+    <content_attribute id="violence-sexual">none</content_attribute>
+    <content_attribute id="violence-desecration">none</content_attribute>
+    <content_attribute id="violence-slavery">none</content_attribute>
+    <content_attribute id="violence-worship">none</content_attribute>
+    <content_attribute id="drugs-alcohol">none</content_attribute>
+    <content_attribute id="drugs-narcotics">none</content_attribute>
+    <content_attribute id="drugs-tobacco">none</content_attribute>
+    <content_attribute id="sex-nudity">none</content_attribute>
+    <content_attribute id="sex-themes">none</content_attribute>
+    <content_attribute id="sex-homosexuality">none</content_attribute>
+    <content_attribute id="sex-prostitution">none</content_attribute>
+    <content_attribute id="sex-adultery">none</content_attribute>
+    <content_attribute id="sex-appearance">none</content_attribute>
+    <content_attribute id="language-profanity">none</content_attribute>
+    <content_attribute id="language-humor">none</content_attribute>
+    <content_attribute id="language-discrimination">none</content_attribute>
+    <content_attribute id="social-chat">none</content_attribute>
+    <content_attribute id="social-info">none</content_attribute>
+    <content_attribute id="social-audio">none</content_attribute>
+    <content_attribute id="social-location">none</content_attribute>
+    <content_attribute id="social-contacts">none</content_attribute>
+    <content_attribute id="money-purchasing">none</content_attribute>
+    <content_attribute id="money-gambling">none</content_attribute>
+  </content_rating>
 </component>
diff --git a/debian/changelog b/debian/changelog
index c4bbeae..3d761b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+gnome-calculator (3.29.91-1) experimental; urgency=medium
+
+  * New upstream version
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 14 Aug 2018 16:42:48 +0200
+
+gnome-calculator (3.29.90-1) experimental; urgency=medium
+
+  * New upstream release
+  * debian/control*, gbp.conf: Update for experimental (3.29 series)
+
+ -- Andrea Azzarone <andrea.azzarone@canonical.com>  Tue, 07 Aug 2018 13:17:23 +0300
+
+gnome-calculator (3.28.2-1) unstable; urgency=medium
+
+  [ Andrea Azzarone ]
+  * New upstream release
+
+  [ Iain Lane ]
+  * Set Rules-Requires-Root to "no" - we don't need to be root to build.
+  * Set Standards-Version to 4.1.5
+
+ -- Andrea Azzarone <andrea.azzarone@canonical.com>  Fri, 27 Jul 2018 22:13:29 +0200
+
 gnome-calculator (1:3.28.1-1ubuntu1) bionic; urgency=medium
 
   * Sync with Debian. Remaining change:
diff --git a/debian/control b/debian/control
index 7faf4df..1d05fdf 100644
--- a/debian/control
+++ b/debian/control
@@ -20,12 +20,13 @@ Build-Depends: appstream-util,
                libsoup2.4-dev (>= 2.42),
                libmpc-dev,
                libmpfr-dev
-Standards-Version: 4.1.4
+Standards-Version: 4.1.5
 XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-calculator
-XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-calculator.git
+XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-calculator.git -b debian/experimental
 Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-calculator
 Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-calculator
 Homepage: https://wiki.gnome.org/Apps/Calculator
+Rules-Requires-Root: no
 
 Package: gnome-calculator
 Architecture: any
diff --git a/debian/control.in b/debian/control.in
index 522dc74..e0698cc 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -16,12 +16,13 @@ Build-Depends: appstream-util,
                libsoup2.4-dev (>= 2.42),
                libmpc-dev,
                libmpfr-dev
-Standards-Version: 4.1.4
+Standards-Version: 4.1.5
 XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-calculator
-XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-calculator.git
+XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-calculator.git -b debian/experimental
 Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-calculator
 Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-calculator
 Homepage: https://wiki.gnome.org/Apps/Calculator
+Rules-Requires-Root: no
 
 Package: gnome-calculator
 Architecture: any
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 1faabe6..35b7bb2 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
 debian-branch=ubuntu/master
+pristine-tar = True
 upstream-branch=upstream/latest
 debian-tag=ubuntu/%(version)s
 upstream-vcs-tag=%(version)s
-pristine-tar=True
diff --git a/debian/watch b/debian/watch
index ac38817..35b7b17 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=4
-https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \
+https://download.gnome.org/sources/@PACKAGE@/([\d\.]+)/ \
 	@PACKAGE@@ANY_VERSION@\.tar\.xz
diff --git a/git.mk b/git.mk
deleted file mode 100644
index 90de80f..0000000
--- a/git.mk
+++ /dev/null
@@ -1,400 +0,0 @@
-# git.mk, a small Makefile to autogenerate .gitignore files
-# for autotools-based projects.
-#
-# Copyright 2009, Red Hat, Inc.
-# Copyright 2010,2011,2012,2013 Behdad Esfahbod
-# Written by Behdad Esfahbod
-#
-# Copying and distribution of this file, with or without modification,
-# is permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-#
-# The latest version of this file can be downloaded from:
-GIT_MK_URL = https://raw.githubusercontent.com/behdad/git.mk/master/git.mk
-#
-# Bugs, etc, should be reported upstream at:
-#   https://github.com/behdad/git.mk
-#
-# To use in your project, import this file in your git repo's toplevel,
-# then do "make -f git.mk".  This modifies all Makefile.am files in
-# your project to -include git.mk.  Remember to add that line to new
-# Makefile.am files you create in your project, or just rerun the
-# "make -f git.mk".
-#
-# This enables automatic .gitignore generation.  If you need to ignore
-# more files, add them to the GITIGNOREFILES variable in your Makefile.am.
-# But think twice before doing that.  If a file has to be in .gitignore,
-# chances are very high that it's a generated file and should be in one
-# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES.
-#
-# The only case that you need to manually add a file to GITIGNOREFILES is
-# when remove files in one of mostlyclean-local, clean-local, distclean-local,
-# or maintainer-clean-local make targets.
-#
-# Note that for files like editor backup, etc, there are better places to
-# ignore them.  See "man gitignore".
-#
-# If "make maintainer-clean" removes the files but they are not recognized
-# by this script (that is, if "git status" shows untracked files still), send
-# me the output of "git status" as well as your Makefile.am and Makefile for
-# the directories involved and I'll diagnose.
-#
-# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
-# Makefile.am.sample in the git.mk git repo.
-#
-# Don't EXTRA_DIST this file.  It is supposed to only live in git clones,
-# not tarballs.  It serves no useful purpose in tarballs and clutters the
-# build dir.
-#
-# This file knows how to handle autoconf, automake, libtool, gtk-doc,
-# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu, appdata,
-# appstream, hotdoc.
-#
-# This makefile provides the following targets:
-#
-# - all: "make all" will build all gitignore files.
-# - gitignore: makes all gitignore files in the current dir and subdirs.
-# - .gitignore: make gitignore file for the current dir.
-# - gitignore-recurse: makes all gitignore files in the subdirs.
-#
-# KNOWN ISSUES:
-#
-# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the
-#   submodule doesn't find us.  If you have configure.{in,ac} files in
-#   subdirs, add a proxy git.mk file in those dirs that simply does:
-#   "include $(top_srcdir)/../git.mk".  Add more ..'s to your taste.
-#   And add those files to git.  See vte/gnome-pty-helper/git.mk for
-#   example.
-#
-
-
-
-###############################################################################
-# Variables user modules may want to add to toplevel MAINTAINERCLEANFILES:
-###############################################################################
-
-#
-# Most autotools-using modules should be fine including this variable in their
-# toplevel MAINTAINERCLEANFILES:
-GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
-	$(srcdir)/aclocal.m4 \
-	$(srcdir)/autoscan.log \
-	$(srcdir)/configure.scan \
-	`AUX_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' ./configure.ac); \
-	 test "x$$AUX_DIR" = "x$(srcdir)/" && AUX_DIR=$(srcdir); \
-	 for x in \
-		ar-lib \
-		compile \
-		config.guess \
-		config.rpath \
-		config.sub \
-		depcomp \
-		install-sh \
-		ltmain.sh \
-		missing \
-		mkinstalldirs \
-		test-driver \
-		ylwrap \
-	 ; do echo "$$AUX_DIR/$$x"; done` \
-	`cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \
-	head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done`
-#
-# All modules should also be fine including the following variable, which
-# removes automake-generated Makefile.in files:
-GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \
-	`cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' ./configure.ac | \
-	while read f; do \
-	  case $$f in Makefile|*/Makefile) \
-	    test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \
-	done`
-#
-# Modules that use libtool and use  AC_CONFIG_MACRO_DIR() may also include this,
-# though it's harmless to include regardless.
-GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \
-	`MACRO_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_MACRO_DIR:$$1' ./configure.ac); \
-	 if test "x$$MACRO_DIR" != "x$(srcdir)/"; then \
-		for x in \
-			libtool.m4 \
-			ltoptions.m4 \
-			ltsugar.m4 \
-			ltversion.m4 \
-			lt~obsolete.m4 \
-		; do echo "$$MACRO_DIR/$$x"; done; \
-	 fi`
-#
-# Modules that use gettext and use  AC_CONFIG_MACRO_DIR() may also include this,
-# though it's harmless to include regardless.
-GITIGNORE_MAINTAINERCLEANFILES_M4_GETTEXT = \
-	`MACRO_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_MACRO_DIR:$$1' ./configure.ac); \
-	if test "x$$MACRO_DIR" != "x$(srcdir)/"; then	\
-		for x in				\
-			codeset.m4			\
-			extern-inline.m4		\
-			fcntl-o.m4			\
-			gettext.m4			\
-			glibc2.m4			\
-			glibc21.m4			\
-			iconv.m4			\
-			intdiv0.m4			\
-			intl.m4				\
-			intldir.m4			\
-			intlmacosx.m4			\
-			intmax.m4			\
-			inttypes-pri.m4			\
-			inttypes_h.m4			\
-			lcmessage.m4			\
-			lib-ld.m4			\
-			lib-link.m4			\
-			lib-prefix.m4			\
-			lock.m4				\
-			longlong.m4			\
-			nls.m4				\
-			po.m4				\
-			printf-posix.m4			\
-			progtest.m4			\
-			size_max.m4			\
-			stdint_h.m4			\
-			threadlib.m4			\
-			uintmax_t.m4			\
-			visibility.m4			\
-			wchar_t.m4			\
-			wint_t.m4			\
-			xsize.m4			\
-		; do echo "$$MACRO_DIR/$$x"; done; \
-	fi`
-
-
-
-###############################################################################
-# Default rule is to install ourselves in all Makefile.am files:
-###############################################################################
-
-git-all: git-mk-install
-
-git-mk-install:
-	@echo "Installing git makefile"
-	@any_failed=; \
-		find "`test -z "$(top_srcdir)" && echo . || echo "$(top_srcdir)"`" -name Makefile.am | while read x; do \
-		if grep 'include .*/git.mk' $$x >/dev/null; then \
-			echo "$$x already includes git.mk"; \
-		else \
-			failed=; \
-			echo "Updating $$x"; \
-			{ cat $$x; \
-			  echo ''; \
-			  echo '-include $$(top_srcdir)/git.mk'; \
-			} > $$x.tmp || failed=1; \
-			if test x$$failed = x; then \
-				mv $$x.tmp $$x || failed=1; \
-			fi; \
-			if test x$$failed = x; then : else \
-				echo "Failed updating $$x"; >&2 \
-				any_failed=1; \
-			fi; \
-	fi; done; test -z "$$any_failed"
-
-git-mk-update:
-	wget $(GIT_MK_URL) -O $(top_srcdir)/git.mk
-
-.PHONY: git-all git-mk-install git-mk-update
-
-
-
-###############################################################################
-# Actual .gitignore generation:
-###############################################################################
-
-$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk $(top_srcdir)/configure.ac
-	@echo "git.mk: Generating $@"
-	@{ \
-		if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
-			for x in \
-				$(DOC_MODULE)-decl-list.txt \
-				$(DOC_MODULE)-decl.txt \
-				tmpl/$(DOC_MODULE)-unused.sgml \
-				"tmpl/*.bak" \
-				$(REPORT_FILES) \
-				$(DOC_MODULE).pdf \
-				xml html \
-			; do echo "/$$x"; done; \
-			FLAVOR=$$(cd $(top_srcdir); $(AUTOCONF) --trace 'GTK_DOC_CHECK:$$2' ./configure.ac); \
-			case $$FLAVOR in *no-tmpl*) echo /tmpl;; esac; \
-			if echo "$(SCAN_OPTIONS)" | grep -q "\-\-rebuild-types"; then \
-				echo "/$(DOC_MODULE).types"; \
-			fi; \
-			if echo "$(SCAN_OPTIONS)" | grep -q "\-\-rebuild-sections"; then \
-				echo "/$(DOC_MODULE)-sections.txt"; \
-			fi; \
-			if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-				for x in \
-					$(SETUP_FILES) \
-					$(DOC_MODULE).types \
-				; do echo "/$$x"; done; \
-			fi; \
-		fi; \
-		if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
-			for lc in $(DOC_LINGUAS); do \
-				for x in \
-					$(if $(DOC_MODULE),$(DOC_MODULE).xml) \
-					$(DOC_PAGES) \
-					$(DOC_INCLUDES) \
-				; do echo "/$$lc/$$x"; done; \
-			done; \
-			for x in \
-				$(_DOC_OMF_ALL) \
-				$(_DOC_DSK_ALL) \
-				$(_DOC_HTML_ALL) \
-				$(_DOC_MOFILES) \
-				$(DOC_H_FILE) \
-				"*/.xml2po.mo" \
-				"*/*.omf.out" \
-			; do echo /$$x; done; \
-		fi; \
-		if test "x$(HOTDOC)" = x; then :; else \
-			$(foreach project, $(HOTDOC_PROJECTS),echo "/$(call HOTDOC_TARGET,$(project))"; \
-				echo "/$(shell $(call HOTDOC_PROJECT_COMMAND,$(project)) --get-conf-path output)" ; \
-				echo "/$(shell $(call HOTDOC_PROJECT_COMMAND,$(project)) --get-private-folder)" ; \
-			) \
-			for x in \
-				.hotdoc.d \
-			; do echo "/$$x"; done; \
-		fi; \
-		if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \
-			for lc in $(HELP_LINGUAS); do \
-				for x in \
-					$(HELP_FILES) \
-					"$$lc.stamp" \
-					"$$lc.mo" \
-				; do echo "/$$lc/$$x"; done; \
-			done; \
-		fi; \
-		if test "x$(gsettings_SCHEMAS)" = x; then :; else \
-			for x in \
-				$(gsettings_SCHEMAS:.xml=.valid) \
-				$(gsettings__enum_file) \
-			; do echo "/$$x"; done; \
-		fi; \
-		if test "x$(appdata_XML)" = x; then :; else \
-			for x in \
-				$(appdata_XML:.xml=.valid) \
-			; do echo "/$$x"; done; \
-		fi; \
-		if test "x$(appstream_XML)" = x; then :; else \
-			for x in \
-				$(appstream_XML:.xml=.valid) \
-			; do echo "/$$x"; done; \
-		fi; \
-		if test -f $(srcdir)/po/Makefile.in.in; then \
-			for x in \
-				ABOUT-NLS \
-				po/Makefile.in.in \
-				po/Makefile.in.in~ \
-				po/Makefile.in \
-				po/Makefile \
-				po/Makevars.template \
-				po/POTFILES \
-				po/Rules-quot \
-				po/stamp-it \
-				po/stamp-po \
-				po/.intltool-merge-cache \
-				"po/*.gmo" \
-				"po/*.header" \
-				"po/*.mo" \
-				"po/*.sed" \
-				"po/*.sin" \
-				po/$(GETTEXT_PACKAGE).pot \
-				intltool-extract.in \
-				intltool-merge.in \
-				intltool-update.in \
-			; do echo "/$$x"; done; \
-		fi; \
-		if test -f $(srcdir)/configure; then \
-			for x in \
-				autom4te.cache \
-				configure \
-				config.h \
-				stamp-h1 \
-				libtool \
-				config.lt \
-			; do echo "/$$x"; done; \
-		fi; \
-		if test "x$(DEJATOOL)" = x; then :; else \
-			for x in \
-				$(DEJATOOL) \
-			; do echo "/$$x.sum"; echo "/$$x.log"; done; \
-			echo /site.exp; \
-		fi; \
-		if test "x$(am__dirstamp)" = x; then :; else \
-			echo "$(am__dirstamp)"; \
-		fi; \
-		if test "x$(findstring libtool,$(LTCOMPILE))" = x -a "x$(findstring libtool,$(LTCXXCOMPILE))" = x -a "x$(GTKDOC_RUN)" = x; then :; else \
-			for x in \
-				"*.lo" \
-				".libs" "_libs" \
-			; do echo "$$x"; done; \
-		fi; \
-		for x in \
-			.gitignore \
-			$(GITIGNOREFILES) \
-			$(CLEANFILES) \
-			$(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \
-			$(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \
-			$(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \
-			so_locations \
-			$(MOSTLYCLEANFILES) \
-			$(TEST_LOGS) \
-			$(TEST_LOGS:.log=.trs) \
-			$(TEST_SUITE_LOG) \
-			$(TESTS:=.test) \
-			"*.gcda" \
-			"*.gcno" \
-			$(DISTCLEANFILES) \
-			$(am__CONFIG_DISTCLEAN_FILES) \
-			$(CONFIG_CLEAN_FILES) \
-			TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
-			"*.tab.c" \
-			$(MAINTAINERCLEANFILES) \
-			$(BUILT_SOURCES) \
-			$(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \
-			$(filter %_vala.stamp,$(DIST_COMMON)) \
-			$(filter %.vapi,$(DIST_COMMON)) \
-			$(filter $(addprefix %,$(notdir $(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))))),$(DIST_COMMON)) \
-			Makefile \
-			Makefile.in \
-			"*.orig" \
-			"*.rej" \
-			"*.bak" \
-			"*~" \
-			".*.sw[nop]" \
-			".dirstamp" \
-		; do echo "/$$x"; done; \
-		for x in \
-			"*.$(OBJEXT)" \
-			$(DEPDIR) \
-		; do echo "$$x"; done; \
-	} | \
-	sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
-	sed 's@/[.]/@/@g' | \
-	LC_ALL=C sort | uniq > $@.tmp && \
-	mv $@.tmp $@;
-
-all: $(srcdir)/.gitignore gitignore-recurse-maybe
-gitignore: $(srcdir)/.gitignore gitignore-recurse
-
-gitignore-recurse-maybe:
-	@for subdir in $(DIST_SUBDIRS); do \
-	  case " $(SUBDIRS) " in \
-	    *" $$subdir "*) :;; \
-	    *) test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir");; \
-	  esac; \
-	done
-gitignore-recurse:
-	@for subdir in $(DIST_SUBDIRS); do \
-	    test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir"); \
-	done
-
-maintainer-clean: gitignore-clean
-gitignore-clean:
-	-rm -f $(srcdir)/.gitignore
-
-.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
diff --git a/gnome-calculator.doap b/gnome-calculator.doap
index 8b9c3f7..92a3ff4 100644
--- a/gnome-calculator.doap
+++ b/gnome-calculator.doap
@@ -9,7 +9,13 @@
   <homepage rdf:resource="https://wiki.gnome.org/Apps/Calculator" />
   <mailing-list rdf:resource="https://mail.gnome.org/mailman/listinfo/gcalctool-list" />
   <download-page rdf:resource="http://download.gnome.org/sources/gnome-calculator/" />
-  <bug-database rdf:resource="https://bugzilla.gnome.org/browse.cgi?product=gnome-calculator" />
+  <bug-database rdf:resource="https://gitlab.gnome.org/GNOME/gnome-calculator/issues" />
+  <repository>
+    <GitRepository>
+        <location rdf:resource="https://gitlab.gnome.org/GNOME/gnome-calculator.git" />
+        <browse rdf:resource="https://gitlab.gnome.org/GNOME/gnome-calculator" />
+    </GitRepository>
+  </repository>
   <category rdf:resource="http://api.gnome.org/doap-extensions#core-apps" />
   <programming-language>Vala</programming-language>
   <description xml:lang="en">Calculator is an application that solves mathematical equations and is suitable as a default application in a Desktop environment</description>
diff --git a/help/Makefile.am b/help/Makefile.am
deleted file mode 100644
index 3e703f2..0000000
--- a/help/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-@YELP_HELP_RULES@
-HELP_ID = gnome-calculator
-
-HELP_MEDIA = figures/logo32.png
-
-HELP_FILES = absolute.page \
-             base.page \
-             boolean.page \
-             complex.page \
-             conv-base.page \
-             conv-character.page \
-             conv-currency.page \
-             conv-length.page \
-             conv-time.page \
-             conv-weight.page \
-             equation.page \
-             factorial.page \
-             factorize.page \
-             financial.page \
-             functions.page \
-             history.page \
-             index.page \
-             keyboard.page \
-             legal.xml \
-             logarithm.page \
-             modulus.page \
-             mouse.page \
-             number-display.page \
-             percentage.page \
-             power.page \
-             scientific.page \
-             superscript.page \
-             trigonometry.page \
-             variables.page
-
-EXTRA_DIST = LINGUAS
-
-HELP_LINGUAS = bg ca cs de el es eu fi fr gl hu it ja ko lv oc pl pt pt_BR ro ru sl sv te zh_CN zh_HK zh_TW
-
--include $(top_srcdir)/git.mk
diff --git a/help/pl/pl.po b/help/pl/pl.po
index e1dc3e1..1683e3f 100644
--- a/help/pl/pl.po
+++ b/help/pl/pl.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-calculator-help\n"
-"POT-Creation-Date: 2018-01-26 19:29+0000\n"
-"PO-Revision-Date: 2018-02-08 02:18+0100\n"
+"POT-Creation-Date: 2018-07-02 06:09+0000\n"
+"PO-Revision-Date: 2018-08-01 03:25+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -403,12 +403,12 @@ msgstr "Przeliczanie jednostek czasu musi być wykonywane za pomocą klawiatury.
 #. (itstool) path: page/title
 #: C/conv-weight.page:9
 msgid "Mass"
-msgstr "Waga"
+msgstr "Masa"
 
 #. (itstool) path: page/p
 #: C/conv-weight.page:11
 msgid "To convert between mass use the <em>in</em> operator."
-msgstr "Aby przeliczyć między jednostkami wagi, użyj operatora <em>na</em>."
+msgstr "Aby przeliczyć między jednostkami masy, użyj operatora <em>na</em>."
 
 #. (itstool) path: example/p
 #: C/conv-weight.page:15
@@ -418,7 +418,7 @@ msgstr "1 kg na funty"
 #. (itstool) path: note/p
 #: C/conv-weight.page:20
 msgid "Mass conversions must be performed using the keyboard."
-msgstr "Przeliczanie jednostek wagi musi być wykonywane za pomocą klawiatury."
+msgstr "Przeliczanie jednostek masy musi być wykonywane za pomocą klawiatury."
 
 #. (itstool) path: info/title
 #: C/equation.page:7
@@ -1227,7 +1227,7 @@ msgid ""
 "are a number of modes that can be selected from the <gui>Mode</gui> menu."
 msgstr ""
 "Wszystkie równania mogą być wprowadzane za pomocą myszy. Wszystkie przyciski "
-"są dostępne w różnych <gui>Trybach</gui>."
+"są dostępne w różnych <gui>trybach</gui>."
 
 #. (itstool) path: td/p
 #: C/mouse.page:17
diff --git a/lib/Makefile.am b/lib/Makefile.am
deleted file mode 100644
index 82b328f..0000000
--- a/lib/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-pkglib_LTLIBRARIES = libcalculator.la
-
-AM_CPPFLAGS = \
-	-w \
-	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
-	$(LIBCALCULATOR_CFLAGS)
-
-libcalculator_la_SOURCES = \
-	$(top_builddir)/vapi/mpfr.vapi \
-	mpfr-glue.vala \
-	$(top_builddir)/vapi/mpc.vapi \
-	currency.vala \
-	equation.vala \
-	equation-lexer.vala \
-	equation-parser.vala \
-	financial.vala \
-	function-manager.vala \
-	math-equation.vala \
-	math-function.vala \
-	math-variables.vala \
-	number.vala \
-	serializer.vala \
-	unit.vala
-
-libcalculator_la_VALAFLAGS = \
-	--target-glib $(GLIB_REQUIRED) \
-	--pkg posix \
-	--pkg gtksourceview-3.0 \
-	--pkg libxml-2.0 \
-	--pkg libsoup-2.4 \
-	--header=libcalculator.h \
-	--vapi=libcalculator.vapi
-
-libcalculator_la_LDFLAGS = -avoid-version -no-undefined
-
-libcalculator_la_LIBADD = \
-	$(LIBCALCULATOR_LIBS) \
-	-lgmp \
-	-lm \
-	-lmpfr \
-	-lmpc
-
-EXTRA_DIST = \
-	libcalculator.h \
-	libcalculator.vapi
-
-MAINTAINERCLEANFILES = \
-	libcalculator.h \
-	libcalculator.vapi
-
--include $(top_srcdir)/git.mk
diff --git a/lib/currency.vala b/lib/currency.vala
index e29ddcd..d2f6d7a 100644
--- a/lib/currency.vala
+++ b/lib/currency.vala
@@ -77,7 +77,7 @@ public class CurrencyManager : Object
         default_currency_manager.currencies.append (new Currency ("SGD", _("Singapore Dollar"), "$"));
         default_currency_manager.currencies.append (new Currency ("THB", _("Thai Baht"), "฿"));
         default_currency_manager.currencies.append (new Currency ("TND", _("Tunisian Dinar"), "ت.د"));
-        default_currency_manager.currencies.append (new Currency ("TRY", _("New Turkish Lira"), "TL"));
+        default_currency_manager.currencies.append (new Currency ("TRY", _("Turkish Lira"), "₺"));
         default_currency_manager.currencies.append (new Currency ("TTD", _("T&T Dollar (TTD)"), "$"));
         default_currency_manager.currencies.append (new Currency ("USD", _("US Dollar"), "$"));
         default_currency_manager.currencies.append (new Currency ("UYU", _("Uruguayan Peso"), "$"));
@@ -166,55 +166,55 @@ public class CurrencyManager : Object
     {
         var name_map = new HashTable <string, string> (str_hash, str_equal);
         name_map.insert ("Euro", "EUR");
-        name_map.insert ("Japanese Yen", "JPY");
-        name_map.insert ("U.K. Pound Sterling", "GBP");
-        name_map.insert ("U.S. Dollar", "USD");
-        name_map.insert ("Algerian Dinar", "DZD");
-        name_map.insert ("Australian Dollar", "AUD");
-        name_map.insert ("Bahrain Dinar", "BHD");
-        name_map.insert ("Botswana Pula", "BWP");
-        name_map.insert ("Brazilian Real", "BRL");
-        name_map.insert ("Brunei Dollar", "BND");
-        name_map.insert ("Canadian Dollar", "CAD");
-        name_map.insert ("Chilean Peso", "CLP");
-        name_map.insert ("Chinese Yuan", "CNY");
-        name_map.insert ("Colombian Peso", "COP");
-        name_map.insert ("Czech Koruna", "CZK");
-        name_map.insert ("Danish Krone", "DKK");
-        name_map.insert ("Hungarian Forint", "HUF");
-        name_map.insert ("Icelandic Krona", "ISK");
-        name_map.insert ("Indian Rupee", "INR");
-        name_map.insert ("Indonesian Rupiah", "IDR");
-        name_map.insert ("Iranian Rial", "IRR");
-        name_map.insert ("Israeli New Sheqel", "ILS");
-        name_map.insert ("Kazakhstani Tenge", "KZT");
-        name_map.insert ("Korean Won", "KRW");
-        name_map.insert ("Kuwaiti Dinar", "KWD");
-        name_map.insert ("Libyan Dinar", "LYD");
-        name_map.insert ("Malaysian Ringgit", "MYR");
-        name_map.insert ("Mauritian Rupee", "MUR");
-        name_map.insert ("Mexican Peso", "MXN");
-        name_map.insert ("Nepalese Rupee", "NPR");
-        name_map.insert ("New Zealand Dollar", "NZD");
-        name_map.insert ("Norwegian Krone", "NOK");
-        name_map.insert ("Rial Omani", "OMR");
-        name_map.insert ("Pakistani Rupee", "PKR");
-        name_map.insert ("Nuevo Sol", "PEN");
-        name_map.insert ("Philippine Peso", "PHP");
-        name_map.insert ("Polish Zloty", "PLN");
-        name_map.insert ("Qatar Riyal", "QAR");
-        name_map.insert ("Russian Ruble", "RUB");
-        name_map.insert ("Saudi Arabian Riyal", "SAR");
-        name_map.insert ("Singapore Dollar", "SGD");
-        name_map.insert ("South African Rand", "ZAR");
-        name_map.insert ("Sri Lanka Rupee", "LKR");
-        name_map.insert ("Swedish Krona", "SEK");
-        name_map.insert ("Swiss Franc", "CHF");
-        name_map.insert ("Thai Baht", "THB");
-        name_map.insert ("Trinidad And Tobago Dollar", "TTD");
-        name_map.insert ("Tunisian Dinar", "TND");
-        name_map.insert ("U.A.E. Dirham", "AED");
-        name_map.insert ("Peso Uruguayo", "UYU");
+        name_map.insert ("Japanese yen", "JPY");
+        name_map.insert ("U.K. pound", "GBP");
+        name_map.insert ("U.S. dollar", "USD");
+        name_map.insert ("Algerian dinar", "DZD");
+        name_map.insert ("Australian dollar", "AUD");
+        name_map.insert ("Bahrain dinar", "BHD");
+        name_map.insert ("Botswana pula", "BWP");
+        name_map.insert ("Brazilian real", "BRL");
+        name_map.insert ("Brunei dollar", "BND");
+        name_map.insert ("Canadian dollar", "CAD");
+        name_map.insert ("Chilean peso", "CLP");
+        name_map.insert ("Chinese yuan", "CNY");
+        name_map.insert ("Colombian peso", "COP");
+        name_map.insert ("Czech koruna", "CZK");
+        name_map.insert ("Danish krone", "DKK");
+        name_map.insert ("Hungarian forint", "HUF");
+        name_map.insert ("Icelandic krona", "ISK");
+        name_map.insert ("Indian rupee", "INR");
+        name_map.insert ("Indonesian rupiah", "IDR");
+        name_map.insert ("Iranian rial", "IRR");
+        name_map.insert ("Israeli New Shekel", "ILS");
+        name_map.insert ("Kazakhstani tenge", "KZT");
+        name_map.insert ("Korean won", "KRW");
+        name_map.insert ("Kuwaiti dinar", "KWD");
+        name_map.insert ("Libyan dinar", "LYD");
+        name_map.insert ("Malaysian ringgit", "MYR");
+        name_map.insert ("Mauritian rupee", "MUR");
+        name_map.insert ("Mexican peso", "MXN");
+        name_map.insert ("Nepalese rupee", "NPR");
+        name_map.insert ("New Zealand dollar", "NZD");
+        name_map.insert ("Norwegian krone", "NOK");
+        name_map.insert ("Omani rial", "OMR");
+        name_map.insert ("Pakistani rupee", "PKR");
+        name_map.insert ("Peruvian sol", "PEN");
+        name_map.insert ("Philippine peso", "PHP");
+        name_map.insert ("Polish zloty", "PLN");
+        name_map.insert ("Qatari riyal", "QAR");
+        name_map.insert ("Russian ruble", "RUB");
+        name_map.insert ("Saudi Arabian riyal", "SAR");
+        name_map.insert ("Singapore dollar", "SGD");
+        name_map.insert ("South African rand", "ZAR");
+        name_map.insert ("Sri Lankan rupee", "LKR");
+        name_map.insert ("Swedish krona", "SEK");
+        name_map.insert ("Swiss franc", "CHF");
+        name_map.insert ("Thai baht", "THB");
+        name_map.insert ("Trinidadian dollar", "TTD");
+        name_map.insert ("Tunisian dinar", "TND");
+        name_map.insert ("U.A.E. dirham", "AED");
+        name_map.insert ("Uruguayan peso", "UYU");
         name_map.insert ("Bolivar Fuerte", "VEF");
 
         var filename = get_imf_rate_filepath ();
diff --git a/lib/unit.vala b/lib/unit.vala
index 66347d5..0bba560 100644
--- a/lib/unit.vala
+++ b/lib/unit.vala
@@ -30,7 +30,7 @@ public class UnitManager : Object
         var length_category = default_unit_manager.add_category ("length", _("Length"));
         var area_category = default_unit_manager.add_category ("area", _("Area"));
         var volume_category = default_unit_manager.add_category ("volume", _("Volume"));
-        var weight_category = default_unit_manager.add_category ("weight", _("Weight"));
+        var weight_category = default_unit_manager.add_category ("weight", _("Mass"));
         var duration_category = default_unit_manager.add_category ("duration", _("Duration"));
         var temperature_category = default_unit_manager.add_category ("temperature", _("Temperature"));
         var digitalstorage_category = default_unit_manager.add_category ("digitalstorage", _("Digital Storage"));
diff --git a/meson.build b/meson.build
index a2003e3..d429a7a 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('gnome-calculator', ['c', 'vala'],
-  version: '3.28.0',
-  meson_version: '>= 0.37',
+  version: '3.29.91',
+  meson_version: '>= 0.42',
   license: 'GPLv3+',
 )
 
diff --git a/org.gnome.Calculator.json b/org.gnome.Calculator.json
index 9230307..171d58c 100644
--- a/org.gnome.Calculator.json
+++ b/org.gnome.Calculator.json
@@ -19,8 +19,8 @@
         "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
     ],
     "build-options" : {
-        "cflags": "-O2 -g",
-        "cxxflags": "-O2 -g"
+        "cflags": "-O2 -g -w",
+        "cxxflags": "-O2 -g -w"
     },
     "cleanup": ["/include", "/lib/pkgconfig",
                 "/share/pkgconfig", "/share/aclocal",
@@ -36,18 +36,21 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "http://www.mpfr.org/mpfr-3.1.3/mpfr-3.1.3.tar.xz",
-                    "sha256": "6835a08bd992c8257641791e9a6a2b35b02336c8de26d0a8577953747e514a16"
+                    "url": "http://www.mpfr.org/mpfr-4.0.1/mpfr-4.0.1.tar.xz",
+                    "sha256": "67874a60826303ee2fb6affc6dc0ddd3e749e9bfcb4c8655e3953d0458a6e16e"
                 }
             ]
         },
         {
             "name": "mpc",
+            "config-opts" : [
+                "--with-mpfr=/app"
+            ],
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://ftp.gnu.org/gnu/mpc/mpc-1.0.2.tar.gz",
-                    "sha256": "b561f54d8a479cee3bc891ee52735f18ff86712ba30f036f8b8537bae380c488"
+                    "url": "https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz",
+                    "sha256": "6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e"
                 }
             ]
         },
@@ -56,17 +59,18 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "git://git.gnome.org/gtksourceview",
+                    "url": "https://gitlab.gnome.org/GNOME/gtksourceview.git",
                     "branch": "gnome-3-24"
                 }
             ]
         },
         {
             "name": "gnome-calculator",
+            "buildsystem": "meson",
             "sources": [
                 {
                     "type": "git",
-                    "url": "git://git.gnome.org/gnome-calculator"
+                    "url": "https://gitlab.gnome.org/GNOME/gnome-calculator.git"
                 }
             ]
         }
diff --git a/po/Makevars b/po/Makevars
deleted file mode 100644
index 8275209..0000000
--- a/po/Makevars
+++ /dev/null
@@ -1,78 +0,0 @@
-# Makefile variables for PO directory in any package using GNU gettext.
-
-# Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
-
-# These two variables depend on the location of this directory.
-subdir = po
-top_builddir = ..
-
-# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --add-comments
-
-# This is the copyright holder that gets inserted into the header of the
-# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
-# package.  (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.)  Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright.  The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
-COPYRIGHT_HOLDER = GNOME Calculator contributors
-
-# This tells whether or not to prepend "GNU " prefix to the package
-# name that gets inserted into the header of the $(DOMAIN).pot file.
-# Possible values are "yes", "no", or empty.  If it is empty, try to
-# detect it automatically by scanning the files in $(top_srcdir) for
-# "GNU packagename" string.
-PACKAGE_GNU = no
-
-# This is the email address or URL to which the translators shall report
-# bugs in the untranslated strings:
-# - Strings which are not entire sentences, see the maintainer guidelines
-#   in the GNU gettext documentation, section 'Preparing Strings'.
-# - Strings which use unclear terms or require additional context to be
-#   understood.
-# - Strings which make invalid assumptions about notation of date, time or
-#   money.
-# - Pluralisation problems.
-# - Incorrect English spelling.
-# - Incorrect formatting.
-# It can be your email address, or a mailing list address where translators
-# can write to without being subscribed, or the URL of a web page through
-# which the translators can contact you.
-MSGID_BUGS_ADDRESS = https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-calculator&keywords=I18N+L10N&component=general
-
-# This is the list of locale categories, beyond LC_MESSAGES, for which the
-# message catalogs shall be used.  It is usually empty.
-EXTRA_LOCALE_CATEGORIES =
-
-# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
-# context.  Possible values are "yes" and "no".  Set this to yes if the
-# package uses functions taking also a message context, like pgettext(), or
-# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
-USE_MSGCTXT = yes
-
-# These options get passed to msgmerge.
-# Useful options are in particular:
-#   --previous            to keep previous msgids of translated messages,
-#   --quiet               to reduce the verbosity.
-MSGMERGE_OPTIONS =
-
-# These options get passed to msginit.
-# If you want to disable line wrapping when writing PO files, add
-# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
-# MSGINIT_OPTIONS.
-MSGINIT_OPTIONS =
-
-# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
-# has changed.  Possible values are "yes" and "no".  Set this to no if
-# the POT file is checked in the repository and the version control
-# program ignores timestamps.
-PO_DEPENDS_ON_POT = no
-
-# This tells whether or not to forcibly update $(DOMAIN).pot and
-# regenerate PO files on "make dist".  Possible values are "yes" and
-# "no".  Set this to no if the POT file and PO files are maintained
-# externally.
-DIST_DEPENDS_ON_UPDATE_PO = no
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c20d113..d7bf686 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -11,7 +11,6 @@ src/math-function-popover.ui
 src/math-variable-popover.ui
 src/math-window.ui
 src/math-shortcuts.ui
-src/menu.ui
 data/org.gnome.calculator.gschema.xml
 lib/currency.vala
 lib/equation-lexer.vala
diff --git a/po/ca.po b/po/ca.po
index d938d5a..524c135 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -11,10 +11,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gcalctool\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"calculator&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2018-03-01 18:44+0000\n"
-"PO-Revision-Date: 2018-01-22 00:39+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-calculator/"
+"issues\n"
+"POT-Creation-Date: 2018-07-05 16:06+0000\n"
+"PO-Revision-Date: 2018-07-08 09:17+0200\n"
 "Last-Translator: Gil Forcada Codinachs <gil.gnome@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "Language: ca\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #: src/buttons-advanced.ui:17 src/buttons-programming.ui:2143
 msgid "Inverse [Ctrl+I]"
@@ -747,8 +747,8 @@ msgid "The GNOME Project"
 msgstr "El projecte GNOME"
 
 #. Program name in the about dialog
-#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:48
-#: src/gnome-calculator.vala:81 src/gnome-calculator.vala:339
+#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:80
+#: src/gnome-calculator.vala:81 src/gnome-calculator.vala:327
 msgid "Calculator"
 msgstr "Calculadora"
 
@@ -807,7 +807,28 @@ msgstr "Mode de programació"
 msgid "Keyboard Mode"
 msgstr "Mode del teclat"
 
-#: src/math-window.ui:88
+#: src/math-window.ui:49
+msgid "New Window"
+msgstr "Finestra nova"
+
+#. Title of preferences dialog
+#: src/math-window.ui:56 src/math-preferences.vala:30
+msgid "Preferences"
+msgstr "Preferències"
+
+#: src/math-window.ui:63
+msgid "_Keyboard Shortcuts"
+msgstr "_Dreceres de teclat"
+
+#: src/math-window.ui:68
+msgid "Help"
+msgstr "Ajuda"
+
+#: src/math-window.ui:73
+msgid "About"
+msgstr "Quant a"
+
+#: src/math-window.ui:120
 msgid "Menu"
 msgstr "Menú"
 
@@ -931,31 +952,6 @@ msgctxt "shortcut window"
 msgid "Switch to hexadecimal"
 msgstr "Commuta a hexadecimal"
 
-#: src/menu.ui:7
-msgid "New Window"
-msgstr "Finestra nova"
-
-#. Title of preferences dialog
-#: src/menu.ui:14 src/math-preferences.vala:30
-msgid "Preferences"
-msgstr "Preferències"
-
-#: src/menu.ui:21
-msgid "_Keyboard Shortcuts"
-msgstr "_Dreceres de teclat"
-
-#: src/menu.ui:26
-msgid "Help"
-msgstr "Ajuda"
-
-#: src/menu.ui:31
-msgid "About"
-msgstr "Quant a"
-
-#: src/menu.ui:35
-msgid "Quit"
-msgstr "Surt"
-
 #: data/org.gnome.calculator.gschema.xml:25
 msgid "Accuracy value"
 msgstr "Valor de precisió"
@@ -1282,8 +1278,8 @@ msgid "Tunisian Dinar"
 msgstr "Dinar tunisià"
 
 #: lib/currency.vala:80
-msgid "New Turkish Lira"
-msgstr "Nova lira turca"
+msgid "Turkish Lira"
+msgstr "Lira turca"
 
 #: lib/currency.vala:81
 msgid "T&T Dollar (TTD)"
@@ -1505,8 +1501,8 @@ msgid "Volume"
 msgstr "Volum"
 
 #: lib/unit.vala:33
-msgid "Weight"
-msgstr "Pes"
+msgid "Mass"
+msgstr "Massa"
 
 #: lib/unit.vala:34
 msgid "Duration"
@@ -2795,24 +2791,24 @@ msgid "Show release version"
 msgstr "Mostra la versió de publicació"
 
 #. Translators: Error message displayed when unable to launch help browser
-#: src/gnome-calculator.vala:303
+#: src/gnome-calculator.vala:291
 msgid "Unable to open help file"
 msgstr "No s'ha pogut obrir el fitxer d'ajuda"
 
 #. The translator credits. Please translate this with your name (s).
-#: src/gnome-calculator.vala:334
+#: src/gnome-calculator.vala:322
 msgid "translator-credits"
 msgstr ""
 "Blanca Biosca <b_biosca@hotmail.com>\n"
 "Josep Puigdemont <josep.puigdemont@gmail.com>\n"
 "Joan Duran <jodufi@gmail.com>"
 
-#: src/gnome-calculator.vala:340
+#: src/gnome-calculator.vala:328
 msgid "About Calculator"
 msgstr "Quant a la Calculadora"
 
 #. Short description in the about dialog
-#: src/gnome-calculator.vala:348
+#: src/gnome-calculator.vala:336
 msgid "Calculator with financial and scientific modes."
 msgstr "Calculadora amb mode financer i científic."
 
@@ -2897,6 +2893,12 @@ msgstr "64 bits"
 msgid "_Quit"
 msgstr "_Surt"
 
+#~ msgid "Quit"
+#~ msgstr "Surt"
+
+#~ msgid "Weight"
+#~ msgstr "Pes"
+
 #~ msgid "accessories-calculator"
 #~ msgstr "accessories-calculator"
 
diff --git a/po/de.po b/po/de.po
index 502b763..06f0047 100644
--- a/po/de.po
+++ b/po/de.po
@@ -17,8 +17,8 @@
 # Ich bin nicht sicher, in welchem Umfang man Knopfnamen bedenkenlos
 # übersetzen darf. Bitte CHECKen.
 #
-# Christian Neumair chrisatgnome-de.org, 2003, 2004.
-# Hendrik Richter <hendrikr@gnome.org>, 2005, 2006, 2007.
+# Christian Neumair chrisatgnome-de.org, 2003-2004.
+# Hendrik Richter <hendrikr@gnome.org>, 2005-2007.
 # Frank Arnold <frank@scirocco-5v-turbo.de>, 2005.
 # Jochen Skulj <jochen@jochenskulj.de>
 # Andre Klapper <ak-47@gmx.net>, 2008.
@@ -27,16 +27,16 @@
 # Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de>, 2011.
 # Hendrik Knackstedt <kn.hendrik@gmail.com>, 2012.
 # Wolfgang Stöggl <c72578@yahoo.de>, 2012-2014, 2017.
-# Christian Kirbach <christian.kirbach@gmail.com>, 2009-2012, 2013.
-# Simon Linden <xhi2018@gmail.com>, 2013, 2014.
+# Christian Kirbach <christian.kirbach@gmail.com>, 2009-2013.
+# Simon Linden <xhi2018@gmail.com>, 2013-2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gcalctool\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"calculator&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2018-01-29 12:08+0000\n"
-"PO-Revision-Date: 2018-02-04 14:32+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-calculator/"
+"issues\n"
+"POT-Creation-Date: 2018-07-24 22:53+0000\n"
+"PO-Revision-Date: 2018-08-04 19:29+0200\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
@@ -44,7 +44,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.0.9\n"
 "X-Project-Style: gnome\n"
 
 #: src/buttons-advanced.ui:17 src/buttons-programming.ui:2143
@@ -778,8 +778,8 @@ msgid "The GNOME Project"
 msgstr "Das GNOME-Projekt"
 
 #. Program name in the about dialog
-#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:48
-#: src/gnome-calculator.vala:81 src/gnome-calculator.vala:339
+#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:80
+#: src/gnome-calculator.vala:81 src/gnome-calculator.vala:330
 msgid "Calculator"
 msgstr "Taschenrechner"
 
@@ -790,7 +790,6 @@ msgstr "Taschenrechner;Rechner;Arithmetisch;Wissenschaftlich;Finanztechnisch;"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Calculator.desktop.in:9
-#| msgid "Calculator"
 msgid "gnome-calculator"
 msgstr "gnome-calculator"
 
@@ -819,27 +818,48 @@ msgstr "Variablenname"
 msgid "Store value into existing or new variable"
 msgstr "Wert in vorhandener oder neuer Variable speichern"
 
-#: src/math-window.ui:20 src/math-window.vala:88
+#: src/math-window.ui:20 src/math-window.vala:92
 msgid "Basic Mode"
 msgstr "Standardmodus"
 
-#: src/math-window.ui:25 src/math-window.vala:93
+#: src/math-window.ui:25 src/math-window.vala:97
 msgid "Advanced Mode"
 msgstr "Erweiterter Modus"
 
-#: src/math-window.ui:30 src/math-window.vala:98
+#: src/math-window.ui:30 src/math-window.vala:102
 msgid "Financial Mode"
 msgstr "Finanztechnischer Modus"
 
-#: src/math-window.ui:35 src/math-window.vala:103
+#: src/math-window.ui:35 src/math-window.vala:107
 msgid "Programming Mode"
 msgstr "Programmier-Modus"
 
-#: src/math-window.ui:40 src/math-window.vala:108
+#: src/math-window.ui:40 src/math-window.vala:112
 msgid "Keyboard Mode"
 msgstr "Tastaturmodus"
 
-#: src/math-window.ui:88
+#: src/math-window.ui:49
+msgid "New Window"
+msgstr "Neues Fenster"
+
+#. Title of preferences dialog
+#: src/math-window.ui:56 src/math-preferences.vala:30
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: src/math-window.ui:63
+msgid "_Keyboard Shortcuts"
+msgstr "_Tastenkombinationen"
+
+#: src/math-window.ui:68
+msgid "Help"
+msgstr "Hilfe"
+
+#: src/math-window.ui:73
+msgid "About"
+msgstr "Info"
+
+#: src/math-window.ui:120
 msgid "Menu"
 msgstr "Menü"
 
@@ -963,31 +983,6 @@ msgctxt "shortcut window"
 msgid "Switch to hexadecimal"
 msgstr "In Hexadezimalmodus wechseln"
 
-#: src/menu.ui:7
-msgid "New Window"
-msgstr "Neues Fenster"
-
-#. Title of preferences dialog
-#: src/menu.ui:14 src/math-preferences.vala:30
-msgid "Preferences"
-msgstr "Einstellungen"
-
-#: src/menu.ui:21
-msgid "_Keyboard Shortcuts"
-msgstr "_Tastenkombinationen"
-
-#: src/menu.ui:26
-msgid "Help"
-msgstr "Hilfe"
-
-#: src/menu.ui:31
-msgid "About"
-msgstr "Info"
-
-#: src/menu.ui:35
-msgid "Quit"
-msgstr "Beenden"
-
 #: data/org.gnome.calculator.gschema.xml:25
 msgid "Accuracy value"
 msgstr "Genauigkeitswert"
@@ -1314,8 +1309,8 @@ msgid "Tunisian Dinar"
 msgstr "Tunesische Dinar"
 
 #: lib/currency.vala:80
-msgid "New Turkish Lira"
-msgstr "Neue türkische Lira"
+msgid "Turkish Lira"
+msgstr "Türkische Lira"
 
 #: lib/currency.vala:81
 msgid "T&T Dollar (TTD)"
@@ -1522,7 +1517,7 @@ msgstr "Boolesches NICHT ist nur für positive Ganzzahlen definiert"
 msgid "Shift is only possible on integer values"
 msgstr "Verschiebung ist nur mit Ganzzahlen möglich"
 
-#: lib/serializer.vala:332
+#: lib/serializer.vala:342
 msgid "Overflow: the result couldn’t be calculated"
 msgstr "Überlauf: Das Ergebnis kann nicht berechnet werden"
 
@@ -1543,8 +1538,8 @@ msgid "Volume"
 msgstr "Volumen"
 
 #: lib/unit.vala:33
-msgid "Weight"
-msgstr "Gewicht"
+msgid "Mass"
+msgstr "Masse"
 
 #: lib/unit.vala:34
 msgid "Duration"
@@ -2857,12 +2852,12 @@ msgid "Show release version"
 msgstr "Version anzeigen"
 
 #. Translators: Error message displayed when unable to launch help browser
-#: src/gnome-calculator.vala:303
+#: src/gnome-calculator.vala:294
 msgid "Unable to open help file"
 msgstr "Die Hilfedatei konnte nicht geöffnet werden"
 
 #. The translator credits. Please translate this with your name (s).
-#: src/gnome-calculator.vala:334
+#: src/gnome-calculator.vala:325
 msgid "translator-credits"
 msgstr ""
 "Christian Neumair <chris@gnome-de.org>\n"
@@ -2873,12 +2868,12 @@ msgstr ""
 "Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de>\n"
 "Jakob Kramer <jakob.kramer@gmx.de>"
 
-#: src/gnome-calculator.vala:340
+#: src/gnome-calculator.vala:331
 msgid "About Calculator"
 msgstr "Info zu Taschenrechner"
 
 #. Short description in the about dialog
-#: src/gnome-calculator.vala:348
+#: src/gnome-calculator.vala:339
 msgid "Calculator with financial and scientific modes."
 msgstr "Ein Taschenrechner mit finanztechnischem und wissenschaftlichem Modus."
 
@@ -2959,6 +2954,6 @@ msgstr "32 Bit"
 msgid "64 bits"
 msgstr "64 Bit"
 
-#: src/math-window.vala:134
+#: src/math-window.vala:138
 msgid "_Quit"
 msgstr "_Beenden"
diff --git a/po/es.po b/po/es.po
index 6b87302..7759069 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,17 +11,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gcalctool.master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"calculator&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2018-01-29 12:08+0000\n"
-"PO-Revision-Date: 2018-02-21 17:12+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-calculator/"
+"issues\n"
+"POT-Creation-Date: 2018-07-24 22:53+0000\n"
+"PO-Revision-Date: 2018-07-27 13:15+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: es <gnome-es-list@gnome.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/buttons-advanced.ui:17 src/buttons-programming.ui:2143
@@ -748,8 +748,8 @@ msgid "The GNOME Project"
 msgstr "El Proyecto GNOME"
 
 #. Program name in the about dialog
-#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:48
-#: src/gnome-calculator.vala:81 src/gnome-calculator.vala:339
+#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:80
+#: src/gnome-calculator.vala:81 src/gnome-calculator.vala:330
 msgid "Calculator"
 msgstr "Calculadora"
 
@@ -760,7 +760,7 @@ msgstr "cálculo;aritmética;científica;financiera;"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Calculator.desktop.in:9
-#| msgid "Calculator"
+#| msgid "org.gnome.Calculator"
 msgid "gnome-calculator"
 msgstr "gnome-calculator"
 
@@ -789,27 +789,48 @@ msgstr "Nombre de la variable"
 msgid "Store value into existing or new variable"
 msgstr "Guardar valor en una variable nueva o que ya exista"
 
-#: src/math-window.ui:20 src/math-window.vala:88
+#: src/math-window.ui:20 src/math-window.vala:92
 msgid "Basic Mode"
 msgstr "Modo básico"
 
-#: src/math-window.ui:25 src/math-window.vala:93
+#: src/math-window.ui:25 src/math-window.vala:97
 msgid "Advanced Mode"
 msgstr "Modo avanzado"
 
-#: src/math-window.ui:30 src/math-window.vala:98
+#: src/math-window.ui:30 src/math-window.vala:102
 msgid "Financial Mode"
 msgstr "Modo financiero"
 
-#: src/math-window.ui:35 src/math-window.vala:103
+#: src/math-window.ui:35 src/math-window.vala:107
 msgid "Programming Mode"
 msgstr "Modo de programación"
 
-#: src/math-window.ui:40 src/math-window.vala:108
+#: src/math-window.ui:40 src/math-window.vala:112
 msgid "Keyboard Mode"
 msgstr "Modo del teclado"
 
-#: src/math-window.ui:88
+#: src/math-window.ui:49
+msgid "New Window"
+msgstr "Ventana nueva"
+
+#. Title of preferences dialog
+#: src/math-window.ui:56 src/math-preferences.vala:30
+msgid "Preferences"
+msgstr "Preferencias"
+
+#: src/math-window.ui:63
+msgid "_Keyboard Shortcuts"
+msgstr "Atajos del _teclado"
+
+#: src/math-window.ui:68
+msgid "Help"
+msgstr "Ayuda"
+
+#: src/math-window.ui:73
+msgid "About"
+msgstr "Acerca de"
+
+#: src/math-window.ui:120
 msgid "Menu"
 msgstr "Menú"
 
@@ -834,7 +855,6 @@ msgid "Open help"
 msgstr "Abrir la ayuda"
 
 #: src/math-shortcuts.ui:41
-#| msgid "Clear entry"
 msgctxt "shortcut window"
 msgid "Clear history"
 msgstr "Limpiar histórico"
@@ -934,31 +954,6 @@ msgctxt "shortcut window"
 msgid "Switch to hexadecimal"
 msgstr "Cambiar a hexadecimal"
 
-#: src/menu.ui:7
-msgid "New Window"
-msgstr "Ventana nueva"
-
-#. Title of preferences dialog
-#: src/menu.ui:14 src/math-preferences.vala:30
-msgid "Preferences"
-msgstr "Preferencias"
-
-#: src/menu.ui:21
-msgid "_Keyboard Shortcuts"
-msgstr "Atajos del _teclado"
-
-#: src/menu.ui:26
-msgid "Help"
-msgstr "Ayuda"
-
-#: src/menu.ui:31
-msgid "About"
-msgstr "Acerca de"
-
-#: src/menu.ui:35
-msgid "Quit"
-msgstr "Salir"
-
 #: data/org.gnome.calculator.gschema.xml:25
 msgid "Accuracy value"
 msgstr "Valor de precisión"
@@ -1285,7 +1280,7 @@ msgid "Tunisian Dinar"
 msgstr "Dinar tunecino"
 
 #: lib/currency.vala:80
-msgid "New Turkish Lira"
+msgid "Turkish Lira"
 msgstr "Lira turca"
 
 #: lib/currency.vala:81
@@ -1490,8 +1485,7 @@ msgstr "El NOT booleano sólo está definido para números enteros positivos"
 msgid "Shift is only possible on integer values"
 msgstr "El desplazamiento sólo es posible en valores enteros"
 
-#: lib/serializer.vala:332
-#| msgid "Overflow: the result couldn't be calculated"
+#: lib/serializer.vala:342
 msgid "Overflow: the result couldn’t be calculated"
 msgstr "Desbordamiento: no se pudo calcular el resultado"
 
@@ -1512,8 +1506,8 @@ msgid "Volume"
 msgstr "Volumen"
 
 #: lib/unit.vala:33
-msgid "Weight"
-msgstr "Peso"
+msgid "Mass"
+msgstr "Masa"
 
 #: lib/unit.vala:34
 msgid "Duration"
@@ -2802,24 +2796,24 @@ msgid "Show release version"
 msgstr "Mostrar el número de versión"
 
 #. Translators: Error message displayed when unable to launch help browser
-#: src/gnome-calculator.vala:303
+#: src/gnome-calculator.vala:294
 msgid "Unable to open help file"
 msgstr "No se pudo abrir el archivo de ayuda"
 
 #. The translator credits. Please translate this with your name (s).
-#: src/gnome-calculator.vala:334
+#: src/gnome-calculator.vala:325
 msgid "translator-credits"
 msgstr ""
 "Jorge González <jorgegonz@svn.gnome.org>, 2007-2009\n"
 "Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2006\n"
 "Germán Poo-Caamaño <gpoo@ubiobio.cl>, 2003"
 
-#: src/gnome-calculator.vala:340
+#: src/gnome-calculator.vala:331
 msgid "About Calculator"
 msgstr "Acerca de Calculadora"
 
 #. Short description in the about dialog
-#: src/gnome-calculator.vala:348
+#: src/gnome-calculator.vala:339
 msgid "Calculator with financial and scientific modes."
 msgstr "Calculadora con modos científico y financiero."
 
@@ -2900,10 +2894,16 @@ msgstr "32 bits"
 msgid "64 bits"
 msgstr "64 bits"
 
-#: src/math-window.vala:134
+#: src/math-window.vala:138
 msgid "_Quit"
 msgstr "_Salir"
 
+#~ msgid "Quit"
+#~ msgstr "Salir"
+
+#~ msgid "Weight"
+#~ msgstr "Peso"
+
 #~ msgid "accessories-calculator"
 #~ msgstr "accessories-calculator"
 
diff --git a/po/fr.po b/po/fr.po
index ab85ec1..1a29f7d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -19,10 +19,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-calculator master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"calculator&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2018-01-29 12:08+0000\n"
-"PO-Revision-Date: 2018-02-27 11:09+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-calculator/"
+"issues\n"
+"POT-Creation-Date: 2018-07-24 22:53+0000\n"
+"PO-Revision-Date: 2018-08-09 18:32+0200\n"
 "Last-Translator: Guillaume Bernard <associations@guillaume-bernard.fr>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "Language: fr\n"
@@ -759,8 +759,8 @@ msgid "The GNOME Project"
 msgstr "Le projet GNOME"
 
 #. Program name in the about dialog
-#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:48
-#: src/gnome-calculator.vala:81 src/gnome-calculator.vala:339
+#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:80
+#: src/gnome-calculator.vala:81 src/gnome-calculator.vala:330
 msgid "Calculator"
 msgstr "Calculatrice"
 
@@ -771,7 +771,6 @@ msgstr "calcul;arithmétique;scientifique;finances;financier;"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Calculator.desktop.in:9
-#| msgid "Calculator"
 msgid "gnome-calculator"
 msgstr "gnome-calculator"
 
@@ -801,27 +800,48 @@ msgid "Store value into existing or new variable"
 msgstr ""
 "Enregistrer la valeur dans une variable existante ou en créer une nouvelle"
 
-#: src/math-window.ui:20 src/math-window.vala:88
+#: src/math-window.ui:20 src/math-window.vala:92
 msgid "Basic Mode"
 msgstr "Mode basique"
 
-#: src/math-window.ui:25 src/math-window.vala:93
+#: src/math-window.ui:25 src/math-window.vala:97
 msgid "Advanced Mode"
 msgstr "Mode avancé"
 
-#: src/math-window.ui:30 src/math-window.vala:98
+#: src/math-window.ui:30 src/math-window.vala:102
 msgid "Financial Mode"
 msgstr "Mode financier"
 
-#: src/math-window.ui:35 src/math-window.vala:103
+#: src/math-window.ui:35 src/math-window.vala:107
 msgid "Programming Mode"
 msgstr "Mode programmation"
 
-#: src/math-window.ui:40 src/math-window.vala:108
+#: src/math-window.ui:40 src/math-window.vala:112
 msgid "Keyboard Mode"
 msgstr "Mode clavier"
 
-#: src/math-window.ui:88
+#: src/math-window.ui:49
+msgid "New Window"
+msgstr "Nouvelle fenêtre"
+
+#. Title of preferences dialog
+#: src/math-window.ui:56 src/math-preferences.vala:30
+msgid "Preferences"
+msgstr "Préférences"
+
+#: src/math-window.ui:63
+msgid "_Keyboard Shortcuts"
+msgstr "Raccourcis _clavier"
+
+#: src/math-window.ui:68
+msgid "Help"
+msgstr "Aide"
+
+#: src/math-window.ui:73
+msgid "About"
+msgstr "À propos"
+
+#: src/math-window.ui:120
 msgid "Menu"
 msgstr "Menu"
 
@@ -945,32 +965,6 @@ msgctxt "shortcut window"
 msgid "Switch to hexadecimal"
 msgstr "Basculer vers la représentation hexadécimale"
 
-#: src/menu.ui:7
-msgid "New Window"
-msgstr "Nouvelle fenêtre"
-
-#. Title of preferences dialog
-#: src/menu.ui:14 src/math-preferences.vala:30
-msgid "Preferences"
-msgstr "Préférences"
-
-#: src/menu.ui:21
-msgid "_Keyboard Shortcuts"
-msgstr "Raccourcis _clavier"
-
-#: src/menu.ui:26
-msgid "Help"
-msgstr "Aide"
-
-#: src/menu.ui:31
-msgid "About"
-msgstr "À propos"
-
-# approx 1 liter not exact measure
-#: src/menu.ui:35
-msgid "Quit"
-msgstr "Quitter"
-
 #: data/org.gnome.calculator.gschema.xml:25
 msgid "Accuracy value"
 msgstr "Précision"
@@ -1298,8 +1292,8 @@ msgid "Tunisian Dinar"
 msgstr "Dinar tunisien"
 
 #: lib/currency.vala:80
-msgid "New Turkish Lira"
-msgstr "Nouvelle livre turque"
+msgid "Turkish Lira"
+msgstr "Livre turque"
 
 #: lib/currency.vala:81
 msgid "T&T Dollar (TTD)"
@@ -1505,7 +1499,7 @@ msgstr "Le NOT (NON) booléen n’est défini que pour des entiers positifs"
 msgid "Shift is only possible on integer values"
 msgstr "Le décalage n’est possible que sur des valeurs entières"
 
-#: lib/serializer.vala:332
+#: lib/serializer.vala:342
 msgid "Overflow: the result couldn’t be calculated"
 msgstr "Débordement : le résultat n’a pas pu être calculé"
 
@@ -1526,7 +1520,7 @@ msgid "Volume"
 msgstr "Volume"
 
 #: lib/unit.vala:33
-msgid "Weight"
+msgid "Mass"
 msgstr "Masse"
 
 #: lib/unit.vala:34
@@ -2818,12 +2812,12 @@ msgid "Show release version"
 msgstr "Afficher les informations de version"
 
 #. Translators: Error message displayed when unable to launch help browser
-#: src/gnome-calculator.vala:303
+#: src/gnome-calculator.vala:294
 msgid "Unable to open help file"
 msgstr "Impossible d’ouvrir le fichier d’aide"
 
 #. The translator credits. Please translate this with your name (s).
-#: src/gnome-calculator.vala:334
+#: src/gnome-calculator.vala:325
 msgid "translator-credits"
 msgstr ""
 "Laurent Richard <laurent.richard@lilit.be>\n"
@@ -2840,12 +2834,12 @@ msgstr ""
 "Julien Hardelin <jhardlin@orange.fr>\n"
 "Guillaume Bernard <contact.guib@laposte.net>"
 
-#: src/gnome-calculator.vala:340
+#: src/gnome-calculator.vala:331
 msgid "About Calculator"
 msgstr "À propos de Calculatrice"
 
 #. Short description in the about dialog
-#: src/gnome-calculator.vala:348
+#: src/gnome-calculator.vala:339
 msgid "Calculator with financial and scientific modes."
 msgstr "Calculatrice avec des modes financiers et scientifiques."
 
@@ -2927,6 +2921,13 @@ msgid "64 bits"
 msgstr "64 bits"
 
 # approx 1 liter not exact measure
-#: src/math-window.vala:134
+#: src/math-window.vala:138
 msgid "_Quit"
 msgstr "_Quitter"
+
+# approx 1 liter not exact measure
+#~ msgid "Quit"
+#~ msgstr "Quitter"
+
+#~ msgid "Weight"
+#~ msgstr "Masse"
diff --git a/po/it.po b/po/it.po
index 3aa7eca..c09d723 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1185,7 +1185,7 @@ msgstr "Rupia indiana"
 
 #: lib/currency.vala:53
 msgid "Iranian Rial"
-msgstr "Real brasiliano"
+msgstr "Rial iraniano"
 
 #: lib/currency.vala:54
 msgid "Icelandic Krona"
diff --git a/po/lt.po b/po/lt.po
index 014bc14..f6a5594 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,16 +8,16 @@
 # Gintautas Miliauskas <gintas@akl.lt>, 2006, 2007, 2008.
 # Rimas Kudelis <rq@akl.lt>, 2010.
 # Algimantas Margevičius <margevicius.algimantas@gmail.com>, 2012.
-# Aurimas Černius <aurisc4@gmail.com>, 2010, 2013, 2014, 2015, 2016, 2017.
+# Aurimas Černius <aurisc4@gmail.com>, 2010, 2013, 2014, 2015, 2016, 2017, 2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: lt\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"calculator&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2018-02-26 16:10+0000\n"
-"PO-Revision-Date: 2018-02-28 01:52+0200\n"
-"Last-Translator: Moo\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-calculator/"
+"issues\n"
+"POT-Creation-Date: 2018-07-24 22:53+0000\n"
+"PO-Revision-Date: 2018-08-11 20:58+0300\n"
+"Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
 "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
 "%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 2.0.4\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
 #: src/buttons-advanced.ui:17 src/buttons-programming.ui:2143
 msgid "Inverse [Ctrl+I]"
@@ -748,8 +748,8 @@ msgid "The GNOME Project"
 msgstr "GNOME projektas"
 
 #. Program name in the about dialog
-#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:48
-#: src/gnome-calculator.vala:81 src/gnome-calculator.vala:339
+#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:80
+#: src/gnome-calculator.vala:81 src/gnome-calculator.vala:330
 msgid "Calculator"
 msgstr "Skaičiuotuvas"
 
@@ -788,27 +788,48 @@ msgstr "Kintamojo vardas"
 msgid "Store value into existing or new variable"
 msgstr "Įrašyti reikšmę į esamą ar naują kintamąjį"
 
-#: src/math-window.ui:20 src/math-window.vala:88
+#: src/math-window.ui:20 src/math-window.vala:92
 msgid "Basic Mode"
 msgstr "Paprasta veiksena"
 
-#: src/math-window.ui:25 src/math-window.vala:93
+#: src/math-window.ui:25 src/math-window.vala:97
 msgid "Advanced Mode"
 msgstr "Išplėstinė veiksena"
 
-#: src/math-window.ui:30 src/math-window.vala:98
+#: src/math-window.ui:30 src/math-window.vala:102
 msgid "Financial Mode"
 msgstr "Finansinė veiksena"
 
-#: src/math-window.ui:35 src/math-window.vala:103
+#: src/math-window.ui:35 src/math-window.vala:107
 msgid "Programming Mode"
 msgstr "Programavimo veiksena"
 
-#: src/math-window.ui:40 src/math-window.vala:108
+#: src/math-window.ui:40 src/math-window.vala:112
 msgid "Keyboard Mode"
 msgstr "Klaviatūros veiksena"
 
-#: src/math-window.ui:88
+#: src/math-window.ui:49
+msgid "New Window"
+msgstr "Naujas langas"
+
+#. Title of preferences dialog
+#: src/math-window.ui:56 src/math-preferences.vala:30
+msgid "Preferences"
+msgstr "Nuostatos"
+
+#: src/math-window.ui:63
+msgid "_Keyboard Shortcuts"
+msgstr "_Klaviatūros trumpiniai"
+
+#: src/math-window.ui:68
+msgid "Help"
+msgstr "Žinynas"
+
+#: src/math-window.ui:73
+msgid "About"
+msgstr "Apie"
+
+#: src/math-window.ui:120
 msgid "Menu"
 msgstr "Meniu"
 
@@ -932,31 +953,6 @@ msgctxt "shortcut window"
 msgid "Switch to hexadecimal"
 msgstr "Įjungti šešioliktainę"
 
-#: src/menu.ui:7
-msgid "New Window"
-msgstr "Naujas langas"
-
-#. Title of preferences dialog
-#: src/menu.ui:14 src/math-preferences.vala:30
-msgid "Preferences"
-msgstr "Nuostatos"
-
-#: src/menu.ui:21
-msgid "_Keyboard Shortcuts"
-msgstr "_Klaviatūros trumpiniai"
-
-#: src/menu.ui:26
-msgid "Help"
-msgstr "Žinynas"
-
-#: src/menu.ui:31
-msgid "About"
-msgstr "Apie"
-
-#: src/menu.ui:35
-msgid "Quit"
-msgstr "Baigti"
-
 #: data/org.gnome.calculator.gschema.xml:25
 msgid "Accuracy value"
 msgstr "Tikslumo reikšmė"
@@ -1280,8 +1276,9 @@ msgid "Tunisian Dinar"
 msgstr "Tuniso dinaras"
 
 #: lib/currency.vala:80
-msgid "New Turkish Lira"
-msgstr "Naujoji Turkijos lira"
+#| msgid "New Turkish Lira"
+msgid "Turkish Lira"
+msgstr "Turkijos lira"
 
 #: lib/currency.vala:81
 msgid "T&T Dollar (TTD)"
@@ -1504,8 +1501,8 @@ msgid "Volume"
 msgstr "Reikšmė"
 
 #: lib/unit.vala:33
-msgid "Weight"
-msgstr "Svoris"
+msgid "Mass"
+msgstr "Masė"
 
 #: lib/unit.vala:34
 msgid "Duration"
@@ -2794,12 +2791,12 @@ msgid "Show release version"
 msgstr "Rodyti leidimo versiją"
 
 #. Translators: Error message displayed when unable to launch help browser
-#: src/gnome-calculator.vala:303
+#: src/gnome-calculator.vala:294
 msgid "Unable to open help file"
 msgstr "Nepavyko atverti žinyno failo"
 
 #. The translator credits. Please translate this with your name (s).
-#: src/gnome-calculator.vala:334
+#: src/gnome-calculator.vala:325
 msgid "translator-credits"
 msgstr ""
 "Algimantas Markevičius <margevicius.algimantas@gmail.com>\n"
@@ -2811,12 +2808,12 @@ msgstr ""
 "Tomas Kuliavas <tokul@users.sourceforge.net>\n"
 "Gediminas Paulauskas <menesis@chatsubo.lt>"
 
-#: src/gnome-calculator.vala:340
+#: src/gnome-calculator.vala:331
 msgid "About Calculator"
 msgstr "Apie skaičiuotuvą"
 
 #. Short description in the about dialog
-#: src/gnome-calculator.vala:348
+#: src/gnome-calculator.vala:339
 msgid "Calculator with financial and scientific modes."
 msgstr "Skaičiuotuvas su finansiniais bei moksliniais priedais"
 
@@ -2898,10 +2895,16 @@ msgstr "32 bitai"
 msgid "64 bits"
 msgstr "64 bitai"
 
-#: src/math-window.vala:134
+#: src/math-window.vala:138
 msgid "_Quit"
 msgstr "_Išeiti"
 
+#~ msgid "Quit"
+#~ msgstr "Baigti"
+
+#~ msgid "Weight"
+#~ msgstr "Svoris"
+
 #~ msgid "accessories-calculator"
 #~ msgstr "accessories-calculator"
 
diff --git a/po/pl.po b/po/pl.po
index 328ca8d..6871dcb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,10 +11,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-calculator\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"calculator&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2018-01-29 12:08+0000\n"
-"PO-Revision-Date: 2018-02-08 02:11+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-calculator/"
+"issues\n"
+"POT-Creation-Date: 2018-07-24 22:53+0000\n"
+"PO-Revision-Date: 2018-08-01 03:22+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -746,8 +746,8 @@ msgid "The GNOME Project"
 msgstr "Projekt GNOME"
 
 #. Program name in the about dialog
-#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:48
-#: src/gnome-calculator.vala:81 src/gnome-calculator.vala:339
+#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:80
+#: src/gnome-calculator.vala:81 src/gnome-calculator.vala:330
 msgid "Calculator"
 msgstr "Kalkulator"
 
@@ -786,27 +786,48 @@ msgstr "Nazwa zmiennej"
 msgid "Store value into existing or new variable"
 msgstr "Przechowuje wartość w istniejącej lub nowej zmiennej"
 
-#: src/math-window.ui:20 src/math-window.vala:88
+#: src/math-window.ui:20 src/math-window.vala:92
 msgid "Basic Mode"
-msgstr "Tryb podstawowy"
+msgstr "Podstawowy"
 
-#: src/math-window.ui:25 src/math-window.vala:93
+#: src/math-window.ui:25 src/math-window.vala:97
 msgid "Advanced Mode"
-msgstr "Tryb zaawansowany"
+msgstr "Zaawansowany"
 
-#: src/math-window.ui:30 src/math-window.vala:98
+#: src/math-window.ui:30 src/math-window.vala:102
 msgid "Financial Mode"
-msgstr "Tryb finansowy"
+msgstr "Finansowy"
 
-#: src/math-window.ui:35 src/math-window.vala:103
+#: src/math-window.ui:35 src/math-window.vala:107
 msgid "Programming Mode"
-msgstr "Tryb programistyczny"
+msgstr "Programistyczny"
 
-#: src/math-window.ui:40 src/math-window.vala:108
+#: src/math-window.ui:40 src/math-window.vala:112
 msgid "Keyboard Mode"
-msgstr "Tryb klawiatury"
+msgstr "Klawiatura"
+
+#: src/math-window.ui:49
+msgid "New Window"
+msgstr "Nowe okno"
+
+#. Title of preferences dialog
+#: src/math-window.ui:56 src/math-preferences.vala:30
+msgid "Preferences"
+msgstr "Preferencje"
+
+#: src/math-window.ui:63
+msgid "_Keyboard Shortcuts"
+msgstr "_Skróty klawiszowe"
+
+#: src/math-window.ui:68
+msgid "Help"
+msgstr "Pomoc"
 
-#: src/math-window.ui:88
+#: src/math-window.ui:73
+msgid "About"
+msgstr "O programie"
+
+#: src/math-window.ui:120
 msgid "Menu"
 msgstr "Menu"
 
@@ -930,31 +951,6 @@ msgctxt "shortcut window"
 msgid "Switch to hexadecimal"
 msgstr "Przełączenie na system szesnastkowy"
 
-#: src/menu.ui:7
-msgid "New Window"
-msgstr "Nowe okno"
-
-#. Title of preferences dialog
-#: src/menu.ui:14 src/math-preferences.vala:30
-msgid "Preferences"
-msgstr "Preferencje"
-
-#: src/menu.ui:21
-msgid "_Keyboard Shortcuts"
-msgstr "_Skróty klawiszowe"
-
-#: src/menu.ui:26
-msgid "Help"
-msgstr "Pomoc"
-
-#: src/menu.ui:31
-msgid "About"
-msgstr "O programie"
-
-#: src/menu.ui:35
-msgid "Quit"
-msgstr "Zakończ"
-
 #: data/org.gnome.calculator.gschema.xml:25
 msgid "Accuracy value"
 msgstr "Wartość dokładności"
@@ -1017,7 +1013,7 @@ msgstr "Używane jednostki kątowe"
 
 #: data/org.gnome.calculator.gschema.xml:62
 msgid "Button mode"
-msgstr "Tryb przycisku"
+msgstr "Tryb przycisków"
 
 #: data/org.gnome.calculator.gschema.xml:63
 msgid "The button mode"
@@ -1280,8 +1276,8 @@ msgid "Tunisian Dinar"
 msgstr "dinar tunezyjski"
 
 #: lib/currency.vala:80
-msgid "New Turkish Lira"
-msgstr "nowa lira turecka"
+msgid "Turkish Lira"
+msgstr "lira turecka"
 
 #: lib/currency.vala:81
 msgid "T&T Dollar (TTD)"
@@ -1484,7 +1480,7 @@ msgstr "Zmienna NIE jest określona tylko dla dodatnich liczb całkowitych"
 msgid "Shift is only possible on integer values"
 msgstr "Przesunięcie jest możliwe tylko na wartościach całkowitych"
 
-#: lib/serializer.vala:332
+#: lib/serializer.vala:342
 msgid "Overflow: the result couldn’t be calculated"
 msgstr "Przepełnienie: nie można obliczyć wyniku"
 
@@ -1505,8 +1501,8 @@ msgid "Volume"
 msgstr "Objętość"
 
 #: lib/unit.vala:33
-msgid "Weight"
-msgstr "Waga"
+msgid "Mass"
+msgstr "Masa"
 
 #: lib/unit.vala:34
 msgid "Duration"
@@ -2795,12 +2791,12 @@ msgid "Show release version"
 msgstr "Wyświetla wersję wydania"
 
 #. Translators: Error message displayed when unable to launch help browser
-#: src/gnome-calculator.vala:303
+#: src/gnome-calculator.vala:294
 msgid "Unable to open help file"
 msgstr "Nie można otworzyć pliku pomocy"
 
 #. The translator credits. Please translate this with your name (s).
-#: src/gnome-calculator.vala:334
+#: src/gnome-calculator.vala:325
 msgid "translator-credits"
 msgstr ""
 "Artur Flinta <aflinta@at.kernel.pl>, 2003-2006\n"
@@ -2810,12 +2806,12 @@ msgstr ""
 "Paweł Żołnowski <pawel@zolnowski.name>, 2014-2015\n"
 "Aviary.pl <community-poland@mozilla.org>, 2007-2018"
 
-#: src/gnome-calculator.vala:340
+#: src/gnome-calculator.vala:331
 msgid "About Calculator"
 msgstr "O kalkulatorze"
 
 #. Short description in the about dialog
-#: src/gnome-calculator.vala:348
+#: src/gnome-calculator.vala:339
 msgid "Calculator with financial and scientific modes."
 msgstr "Kalkulator z trybem finansowym i naukowym."
 
@@ -2897,6 +2893,6 @@ msgstr "32 bity"
 msgid "64 bits"
 msgstr "64 bity"
 
-#: src/math-window.vala:134
+#: src/math-window.vala:138
 msgid "_Quit"
 msgstr "Za_kończ"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4d34e5d..391e7a1 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -20,21 +20,22 @@
 # Enrico Nicoletto <liverig@gmail.com>, 2010, 2011, 2013, 2014.
 # Fábio Nogueira <deb-user-ba@ubuntu.com>, 2014, 2016.
 # Rafael Fontenelle <rafaelff@gnome.org>, 2013, 2017, 2018.
+# Bruno Lopes da Silva <brunolopesbldsb@gmail.com>, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-calculator\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"calculator&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2018-01-29 12:08+0000\n"
-"PO-Revision-Date: 2018-02-16 16:38-0200\n"
-"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-calculator/"
+"issues\n"
+"POT-Creation-Date: 2018-07-24 22:53+0000\n"
+"PO-Revision-Date: 2018-08-01 06:57-0300\n"
+"Last-Translator: Bruno Lopes da Silva <brunolopesbldsb@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Virtaal 1.0.0-beta1\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
 #: src/buttons-advanced.ui:17 src/buttons-programming.ui:2143
@@ -631,7 +632,6 @@ msgid "Hexadecimal"
 msgstr "Hexadecimal"
 
 #: src/buttons-programming.ui:1298
-#| msgid "Natural Logarithm"
 msgid "Binary Logarithm"
 msgstr "Logaritmo binário"
 
@@ -773,8 +773,8 @@ msgid "The GNOME Project"
 msgstr "O Projeto GNOME"
 
 #. Program name in the about dialog
-#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:48
-#: src/gnome-calculator.vala:81 src/gnome-calculator.vala:339
+#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:80
+#: src/gnome-calculator.vala:81 src/gnome-calculator.vala:330
 msgid "Calculator"
 msgstr "Calculadora"
 
@@ -787,7 +787,7 @@ msgstr ""
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Calculator.desktop.in:9
-#| msgid "Calculator"
+#| msgid "org.gnome.Calculator"
 msgid "gnome-calculator"
 msgstr "gnome-calculator"
 
@@ -816,27 +816,48 @@ msgstr "Nome da variável"
 msgid "Store value into existing or new variable"
 msgstr "Armazena valor em uma variável existente ou nova"
 
-#: src/math-window.ui:20 src/math-window.vala:88
+#: src/math-window.ui:20 src/math-window.vala:92
 msgid "Basic Mode"
 msgstr "Modo básico"
 
-#: src/math-window.ui:25 src/math-window.vala:93
+#: src/math-window.ui:25 src/math-window.vala:97
 msgid "Advanced Mode"
 msgstr "Modo avançado"
 
-#: src/math-window.ui:30 src/math-window.vala:98
+#: src/math-window.ui:30 src/math-window.vala:102
 msgid "Financial Mode"
 msgstr "Modo financeiro"
 
-#: src/math-window.ui:35 src/math-window.vala:103
+#: src/math-window.ui:35 src/math-window.vala:107
 msgid "Programming Mode"
 msgstr "Modo programável"
 
-#: src/math-window.ui:40 src/math-window.vala:108
+#: src/math-window.ui:40 src/math-window.vala:112
 msgid "Keyboard Mode"
 msgstr "Modo de teclado"
 
-#: src/math-window.ui:88
+#: src/math-window.ui:49
+msgid "New Window"
+msgstr "Nova janela"
+
+#. Title of preferences dialog
+#: src/math-window.ui:56 src/math-preferences.vala:30
+msgid "Preferences"
+msgstr "Preferências"
+
+#: src/math-window.ui:63
+msgid "_Keyboard Shortcuts"
+msgstr "_Atalhos de teclado"
+
+#: src/math-window.ui:68
+msgid "Help"
+msgstr "Ajuda"
+
+#: src/math-window.ui:73
+msgid "About"
+msgstr "Sobre"
+
+#: src/math-window.ui:120
 msgid "Menu"
 msgstr "Menu"
 
@@ -861,7 +882,6 @@ msgid "Open help"
 msgstr "Abre a ajuda"
 
 #: src/math-shortcuts.ui:41
-#| msgid "No redo history"
 msgctxt "shortcut window"
 msgid "Clear history"
 msgstr "Limpa o histórico"
@@ -961,31 +981,6 @@ msgctxt "shortcut window"
 msgid "Switch to hexadecimal"
 msgstr "Alterna para hexadecimal"
 
-#: src/menu.ui:7
-msgid "New Window"
-msgstr "Nova janela"
-
-#. Title of preferences dialog
-#: src/menu.ui:14 src/math-preferences.vala:30
-msgid "Preferences"
-msgstr "Preferências"
-
-#: src/menu.ui:21
-msgid "_Keyboard Shortcuts"
-msgstr "_Atalhos de teclado"
-
-#: src/menu.ui:26
-msgid "Help"
-msgstr "Ajuda"
-
-#: src/menu.ui:31
-msgid "About"
-msgstr "Sobre"
-
-#: src/menu.ui:35
-msgid "Quit"
-msgstr "Sair"
-
 #: data/org.gnome.calculator.gschema.xml:25
 msgid "Accuracy value"
 msgstr "Valor de precisão"
@@ -1319,8 +1314,8 @@ msgid "Tunisian Dinar"
 msgstr "Dinar tunisiano"
 
 #: lib/currency.vala:80
-msgid "New Turkish Lira"
-msgstr "Nova lira turca"
+msgid "Turkish Lira"
+msgstr "Lira turca"
 
 # Referência: http://pt.wikipedia.org/wiki/D%C3%B3lar_de_Trindade_e_Tobago
 #: lib/currency.vala:81
@@ -1529,8 +1524,7 @@ msgstr "O NÃO booleano (NOT) é definido apenas para números inteiros positivo
 msgid "Shift is only possible on integer values"
 msgstr "A alternância só é possível para valores inteiros"
 
-#: lib/serializer.vala:332
-#| msgid "Overflow: the result couldn't be calculated"
+#: lib/serializer.vala:342
 msgid "Overflow: the result couldn’t be calculated"
 msgstr "Estouro de capacidade: o resultado não pôde ser calculado"
 
@@ -1551,8 +1545,8 @@ msgid "Volume"
 msgstr "Volume"
 
 #: lib/unit.vala:33
-msgid "Weight"
-msgstr "Peso"
+msgid "Mass"
+msgstr "Massa"
 
 #: lib/unit.vala:34
 msgid "Duration"
@@ -1833,7 +1827,7 @@ msgstr "milímetro,milímetros,milimetro,milimetros,mm"
 
 #: lib/unit.vala:56
 msgid "Micrometers"
-msgstr "Micrometros"
+msgstr "Micrômetros"
 
 #: lib/unit.vala:56
 #, c-format
@@ -2139,8 +2133,6 @@ msgstr "Pedra"
 
 #: lib/unit.vala:76
 #, c-format
-#| msgctxt "unit-format"
-#| msgid "%s s"
 msgctxt "unit-format"
 msgid "%s st"
 msgstr "%s st"
@@ -2859,12 +2851,12 @@ msgid "Show release version"
 msgstr "Mostra a versão de lançamento"
 
 #. Translators: Error message displayed when unable to launch help browser
-#: src/gnome-calculator.vala:303
+#: src/gnome-calculator.vala:294
 msgid "Unable to open help file"
 msgstr "Não foi possível abrir o arquivo de ajuda"
 
 #. The translator credits. Please translate this with your name (s).
-#: src/gnome-calculator.vala:334
+#: src/gnome-calculator.vala:325
 msgid "translator-credits"
 msgstr ""
 "Alexandre Folle de Menezes <afmenez@terra.com.br>, 2003.\n"
@@ -2883,12 +2875,12 @@ msgstr ""
 "Enrico Nicoletto <liverig@gmail.com>, 2010-2014.\n"
 "Rafael Fontenelle <rafaelff@gnome.org>, 2013, 2017, 2018."
 
-#: src/gnome-calculator.vala:340
+#: src/gnome-calculator.vala:331
 msgid "About Calculator"
 msgstr "Sobre a calculadora"
 
 #. Short description in the about dialog
-#: src/gnome-calculator.vala:348
+#: src/gnome-calculator.vala:339
 msgid "Calculator with financial and scientific modes."
 msgstr "Calculadora com modos financeiro e científico."
 
@@ -2969,10 +2961,16 @@ msgstr "32 bits"
 msgid "64 bits"
 msgstr "64 bits"
 
-#: src/math-window.vala:134
+#: src/math-window.vala:138
 msgid "_Quit"
 msgstr "_Sair"
 
+#~ msgid "Quit"
+#~ msgstr "Sair"
+
+#~ msgid "Weight"
+#~ msgstr "Peso"
+
 #~ msgid "accessories-calculator"
 #~ msgstr "accessories-calculator"
 
diff --git a/po/ro.po b/po/ro.po
index 6f31458..6051c94 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,123 +8,320 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gcalctool\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gcalct"
-"ool&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-03-11 06:56+0000\n"
-"PO-Revision-Date: 2011-03-14 01:18+0200\n"
-"Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-calculator/"
+"issues\n"
+"POT-Creation-Date: 2018-07-05 16:06+0000\n"
+"PO-Revision-Date: 2018-07-17 18:48+0300\n"
+"Last-Translator: Florentina Mușat <florentina.musat.28 [at] gmail [dot] "
+"com>\n"
 "Language-Team: Romanian Gnome Team <gnomero-list@lists.sourceforge.net>\n"
 "Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
-"20)) ? 1 : 2);;\n"
-"X-Generator: Virtaal 0.6.1\n"
+"20)) ? 1 : 2);\n"
+"X-Generator: Poedit 2.0.9\n"
 
-#. The label on the memory button
-#: ../data/buttons-advanced.ui.h:2 ../data/buttons-financial.ui.h:2
-#| msgid "<i>x</i>!"
-msgid "<i>x</i>"
-msgstr "<i>x</i>"
+#: src/buttons-advanced.ui:17 src/buttons-programming.ui:2143
+msgid "Inverse [Ctrl+I]"
+msgstr "Inversa [Ctrl+I]"
+
+#. Accessible name for the inverse button
+#: src/buttons-advanced.ui:22 src/buttons-programming.ui:2148
+msgid "Inverse"
+msgstr "Inversa"
+
+#: src/buttons-advanced.ui:47 src/buttons-programming.ui:1277
+msgid "Factorize [Ctrl+F]"
+msgstr "Factorizează [Ctrl+F]"
+
+#. Accessible name for the factorize button
+#: src/buttons-advanced.ui:51 src/buttons-programming.ui:1281
+msgid "Factorize"
+msgstr "Factorizează"
+
+#: src/buttons-advanced.ui:66 src/buttons-programming.ui:2116
+msgid "Factorial [!]"
+msgstr "Factorial [!]"
+
+#. Accessible name for the factorial button
+#: src/buttons-advanced.ui:71 src/buttons-programming.ui:2121
+msgid "Factorial"
+msgstr "Factorial"
+
+#: src/buttons-advanced.ui:95
+msgid "Imaginary Component"
+msgstr "Componenta imaginară"
+
+#: src/buttons-advanced.ui:247 src/buttons-basic.ui:130
+#: src/buttons-financial.ui:2037 src/buttons-programming.ui:1377
+msgid "Divide [/]"
+msgstr "Împărțire [/]"
+
+#: src/buttons-advanced.ui:359 src/buttons-basic.ui:258
+#: src/buttons-financial.ui:2165 src/buttons-programming.ui:1414
+msgid "Multiply [*]"
+msgstr "Înmulțire [*]"
+
+#: src/buttons-advanced.ui:376 src/buttons-basic.ui:275
+#: src/buttons-financial.ui:2182 src/buttons-programming.ui:1431
+msgid "Subtract [-]"
+msgstr "Scădere [-]"
+
+#: src/buttons-advanced.ui:392 src/buttons-basic.ui:291
+#: src/buttons-financial.ui:2198 src/buttons-programming.ui:1447
+msgid "Add [+]"
+msgstr "Adunare [+]"
 
 #. Label on the solve button (clicking this solves the displayed calculation)
-#: ../data/buttons-advanced.ui.h:4 ../data/buttons-basic.ui.h:2
-#: ../data/buttons-financial.ui.h:4 ../data/buttons-programming.ui.h:2
+#: src/buttons-advanced.ui:403 src/buttons-basic.ui:302
+#: src/buttons-financial.ui:2209 src/buttons-programming.ui:1458
 msgid "="
 msgstr "="
 
+#: src/buttons-advanced.ui:409 src/buttons-basic.ui:308
+#: src/buttons-financial.ui:2215 src/buttons-programming.ui:1464
+msgid "Calculate Result"
+msgstr "Calculează rezultatul"
+
+#: src/buttons-advanced.ui:427 src/buttons-basic.ui:361
+#: src/buttons-financial.ui:2268 src/buttons-programming.ui:1482
+msgid "Clear Display [Escape]"
+msgstr "Șterge afișajul [Escape]"
+
+#: src/buttons-advanced.ui:441 src/buttons-programming.ui:1782
+msgid "Subscript mode [Alt]"
+msgstr "Mod indice [Alt]"
+
+#. Accessible name for the subscript mode button
+#: src/buttons-advanced.ui:446 src/buttons-programming.ui:1787
+msgid "Subscript"
+msgstr "Indice"
+
+#: src/buttons-advanced.ui:468 src/buttons-programming.ui:1809
+msgid "Superscript mode [Ctrl]"
+msgstr "Mod exponent [Ctrl]"
+
+#. Accessible name for the superscript mode button
+#: src/buttons-advanced.ui:473 src/buttons-programming.ui:1814
+msgid "Superscript"
+msgstr "Exponent"
+
+#: src/buttons-advanced.ui:495
+msgid "Scientific exponent [Ctrl+E]"
+msgstr "Exponent științific [Ctrl+E]"
+
+#. Accessible name for the scientific exponent button
+#: src/buttons-advanced.ui:499
+msgid "Scientific Exponent"
+msgstr "Exponent științific"
+
+#: src/buttons-advanced.ui:522 src/buttons-programming.ui:1947
+msgid "Modulus divide"
+msgstr "Împărțire modulo"
+
+#: src/buttons-advanced.ui:538 src/buttons-basic.ui:328
+#: src/buttons-financial.ui:2235 src/buttons-programming.ui:1964
+msgid "Start Group [(]"
+msgstr "Începutul grupului [(]"
+
+#: src/buttons-advanced.ui:555 src/buttons-basic.ui:345
+#: src/buttons-financial.ui:2252 src/buttons-programming.ui:1980
+msgid "End Group [)]"
+msgstr "Sfârșitul grupului [)]"
+
+#. Accessible name for the memory button
+#. Accessible name for the memory value button
+#: src/buttons-advanced.ui:570 src/buttons-advanced.ui:573
+#: src/buttons-financial.ui:1854 src/buttons-financial.ui:1857
+#: src/buttons-programming.ui:1852
+msgid "Memory"
+msgstr "Memorie"
+
+#. The label on the memory button
+#: src/buttons-advanced.ui:582 src/buttons-financial.ui:1869
+#: src/buttons-programming.ui:1865
+msgid "x"
+msgstr "x"
+
+#: src/buttons-advanced.ui:617 src/buttons-programming.ui:1314
+msgid "Absolute Value [|]"
+msgstr "Modul [|]"
+
 #. Accessible name for the absolute value button
-#: ../data/buttons-advanced.ui.h:6 ../data/buttons-programming.ui.h:4
+#: src/buttons-advanced.ui:622 src/buttons-programming.ui:1319
 msgid "Absolute Value"
 msgstr "Valoare absolută"
 
+#: src/buttons-advanced.ui:646
+msgid "Real Component"
+msgstr "Componenta reală"
+
+#: src/buttons-advanced.ui:663
+msgid "Complex conjugate"
+msgstr "Conjugatul complexului"
+
+#: src/buttons-advanced.ui:680
+msgid "Complex argument"
+msgstr "Argumentul complexului"
+
+#: src/buttons-advanced.ui:697
+msgid "Natural Logarithm"
+msgstr "Logaritm natural"
+
+#: src/buttons-advanced.ui:713 src/buttons-financial.ui:1908
+#: src/buttons-programming.ui:1260
+msgid "Logarithm"
+msgstr "Logaritm"
+
+#: src/buttons-advanced.ui:728 src/buttons-financial.ui:2470
+#: src/buttons-programming.ui:2171
+msgid "Exponent [^ or **]"
+msgstr "Exponent [^ sau **]"
+
 #. Accessible name for the exponentiation (x to the power of y) button
-#: ../data/buttons-advanced.ui.h:8 ../data/buttons-basic.ui.h:4
-#: ../data/buttons-financial.ui.h:38 ../data/buttons-programming.ui.h:8
+#: src/buttons-advanced.ui:733 src/buttons-basic.ui:396
+#: src/buttons-financial.ui:2475 src/buttons-programming.ui:2176
 msgid "Exponent"
 msgstr "Exponent"
 
-#. Accessible name for the factorial button
-#: ../data/buttons-advanced.ui.h:10 ../data/buttons-programming.ui.h:10
-msgid "Factorial"
-msgstr "Factorial"
+#: src/buttons-advanced.ui:757 src/buttons-financial.ui:2499
+#: src/buttons-programming.ui:1244
+msgid "Root [Ctrl+R]"
+msgstr "Rădăcină [Ctrl+R]"
 
-#. Accessible name for the factorize button
-#: ../data/buttons-advanced.ui.h:12 ../data/buttons-programming.ui.h:12
-msgid "Factorize"
-msgstr "Factorizează"
+#: src/buttons-advanced.ui:773 src/buttons-basic.ui:419
+#: src/buttons-financial.ui:2450
+msgid "Undo [Ctrl+Z]"
+msgstr "Anulează [Ctrl+Z]"
 
-#. Accessible name for the inverse button
-#: ../data/buttons-advanced.ui.h:14 ../data/buttons-programming.ui.h:18
-msgid "Inverse"
-msgstr "Inversa"
+#: src/buttons-advanced.ui:793
+msgid "Pi [Ctrl+P]"
+msgstr "Pi [Ctrl+P]"
 
-#. Accessible name for the memory button
-#. Accessible name for the memory value button
-#. Tooltip for the memory button
-#: ../data/buttons-advanced.ui.h:16 ../data/buttons-financial.ui.h:50
-#: ../src/math-buttons.c:231
-msgid "Memory"
-msgstr "Memorie"
+#: src/buttons-advanced.ui:816
+msgid "Euler’s Number"
+msgstr "Numărul lui Euler"
 
-#. Accessible name for the scientific exponent button
-#: ../data/buttons-advanced.ui.h:18
-msgid "Scientific Exponent"
-msgstr "Exponent științific"
+#: src/buttons-advanced.ui:846
+msgid "Cosine"
+msgstr "Cosinus"
+
+#: src/buttons-advanced.ui:861
+msgid "Sine"
+msgstr "Sinus"
+
+#: src/buttons-advanced.ui:876
+msgid "Tangent"
+msgstr "Tangentă"
+
+#: src/buttons-advanced.ui:891
+msgid "Hyperbolic Sine"
+msgstr "Sinus hiperbolic"
+
+#: src/buttons-advanced.ui:907
+msgid "Hyperbolic Cosine"
+msgstr "Cosinus hiperbolic"
+
+#: src/buttons-advanced.ui:923
+msgid "Hyperbolic Tangent"
+msgstr "Tangentă hiperbolică"
+
+#: src/buttons-advanced.ui:946
+msgid "Additional Functions"
+msgstr "Funcții suplimentare"
 
 #. Accessible name for the store value button
-#: ../data/buttons-advanced.ui.h:20 ../data/buttons-programming.ui.h:24
+#: src/buttons-advanced.ui:949 src/buttons-programming.ui:1855
 msgid "Store"
 msgstr "Stocare"
 
-#. Accessible name for the subscript mode button
-#: ../data/buttons-advanced.ui.h:22 ../data/buttons-programming.ui.h:26
-msgid "Subscript"
-msgstr "Indice"
+#: src/buttons-basic.ui:222 src/buttons-financial.ui:2129
+msgid "Percentage [%]"
+msgstr "Procentaj [%]"
 
-#. Accessible name for the superscript mode button
-#: ../data/buttons-advanced.ui.h:24 ../data/buttons-programming.ui.h:28
-msgid "Superscript"
-msgstr "Exponent"
+#: src/buttons-basic.ui:377
+msgid "Square root [Ctrl+R]"
+msgstr "Rădăcină pătrată [Ctrl+R]"
+
+#: src/buttons-basic.ui:392
+msgid "Square [Ctrl+2]"
+msgstr "Pătrat [Ctrl+2]"
+
+#. Title of Compounding Term dialog
+#: src/buttons-financial.ui:8 src/buttons-financial.ui:2284
+msgid "Compounding Term"
+msgstr "Termen compus"
 
+#: src/buttons-financial.ui:22 src/buttons-financial.ui:205
+#: src/buttons-financial.ui:388 src/buttons-financial.ui:571
+#: src/buttons-financial.ui:723 src/buttons-financial.ui:907
+#: src/buttons-financial.ui:1091 src/buttons-financial.ui:1275
+#: src/buttons-financial.ui:1459 src/buttons-financial.ui:1674
+#: src/buttons-programming.ui:2301
+msgid "_Cancel"
+msgstr "_Anulează"
+
+#. Compounding Term Dialog: Calculate button
+#. Double-Declining Depreciation Dialog: Calculate button
+#. Future Value Dialog: Calculate button
+#. Gross Profit Margin Dialog: Calculate button
+#. Periodic Payment Dialog: Calculate button
+#. Present Value Dialog: Calculate button
+#. Periodic Interest Rate Dialog: Calculate button
+#. Straight-Line Depreciation Dialog: Calculate button
+#. Sum-of-the-Years’-Digits Depreciation Dialog: Calculate result button
 #. Payment Period Dialog: Button to calculate result
-#: ../data/buttons-financial.ui.h:6
+#: src/buttons-financial.ui:37 src/buttons-financial.ui:220
+#: src/buttons-financial.ui:403 src/buttons-financial.ui:586
+#: src/buttons-financial.ui:738 src/buttons-financial.ui:922
+#: src/buttons-financial.ui:1106 src/buttons-financial.ui:1290
+#: src/buttons-financial.ui:1474 src/buttons-financial.ui:1689
 msgid "C_alculate"
 msgstr "C_alculează"
 
-#. Gross Profit Margin Dialog: Label before cost input
-#: ../data/buttons-financial.ui.h:8
-msgid "C_ost:"
-msgstr "C_ost:"
+#. Compounding Term Dialog: Label before present value input
+#. Periodic Interest Rate Dialog: Label before present value input
+#: src/buttons-financial.ui:117 src/buttons-financial.ui:1172
+msgid "Present _Value:"
+msgstr "_Valoare prezentă:"
 
-#. Periodic Payment Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:10
-msgid ""
-"Calculates the amount of the periodic payment of a loan, where payments are "
-"made at the end of each payment period. "
-msgstr ""
-"Calculează plata periodică a unui împrumut, când plata este efectuată la "
-"sfârșitul fiecărei perioade de plată."
+#. Compounding Term Dialog: Label before periodic interest rate input
+#. Future Value Dialog: Label before periodic interest rate input
+#. Periodic Payment Dialog: Label before periodic interest rate input
+#. Present Value Dialog: Label before periodic interest rate input
+#. Payment Period Dialog: Label before periodic interest rate input
+#: src/buttons-financial.ui:133 src/buttons-financial.ui:468
+#: src/buttons-financial.ui:804 src/buttons-financial.ui:988
+#: src/buttons-financial.ui:1769
+msgid "Periodic Interest _Rate:"
+msgstr "_Rata de dobândă periodică:"
 
-#. Sum-of-the-Years'-Digits Depreciation Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:12
+#. Compounding Term Dialog: Description of calculation
+#: src/buttons-financial.ui:149
 msgid ""
-"Calculates the depreciation allowance on an asset for a specified period of "
-"time, using the Sum-of-the-Years'-Digits method. This method of depreciation "
-"accelerates the rate of depreciation, so that more depreciation expense "
-"occurs in earlier periods than in later ones. The useful life is the number "
-"of periods, typically years, over which an asset is depreciated. "
+"Calculates the number of compounding periods necessary to increase an "
+"investment of present value to a future value, at a fixed interest rate per "
+"compounding period."
 msgstr ""
-"Calculează indemnizația de amortizare pe un activ pentru o anumită perioadă "
-"de timp, utilizând metoda, folosind metoda sumei cifrelor anilor („SOFTY”). "
-"Această metodă de amortizare accelerează rata amortizării, astfel încât "
-"consumul are loc în perioadele de timp recente decât în cele de mai târziu. "
-"Durata de viață utilă este numărul de perioade, de obicei ani, în care un "
-"activ este amortizat."
+"Calculează numărul de perioade de compunere necesar pentru a crește o "
+"investiție de valoarea actuală la o valoare viitoare, la o rată fixă a "
+"dobânzii pe perioada de compunere."
+
+#. Compounding Term Dialog: Label before future value input
+#. Periodic Interest Rate Dialog: Label before future value input
+#: src/buttons-financial.ui:163 src/buttons-financial.ui:1156
+msgid "_Future Value:"
+msgstr "Valoare _viitoare:"
+
+#. Title of Double-Declining Depreciation dialog
+#: src/buttons-financial.ui:191
+msgid "Double-Declining Depreciation"
+msgstr "Amortizare dublu-regresivă"
 
 #. Double-Declining Depreciation Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:14
+#: src/buttons-financial.ui:255
 msgid ""
 "Calculates the depreciation allowance on an asset for a specified period of "
 "time, using the double-declining balance method."
@@ -132,8 +329,33 @@ msgstr ""
 "Calculează indemnizația de amortizare pe un activ pentru o anumită perioadă "
 "de timp, utilizând metoda balanței dublu-declin."
 
+#. Double-Declining Depreciation Dialog: Label before cost input
+#. Gross Profit Margin Dialog: Label before cost input
+#: src/buttons-financial.ui:269 src/buttons-financial.ui:635
+msgid "C_ost:"
+msgstr "C_ost:"
+
+#. Double-Declining Depreciation Dialog: Label before life input
+#. Straight-Line Depreciation Dialog: Label before life input
+#. Sum-of-the-Years’-Digits Depreciation Dialog: Label before life input
+#: src/buttons-financial.ui:285 src/buttons-financial.ui:1357
+#: src/buttons-financial.ui:1525
+msgid "_Life:"
+msgstr "_Viață:"
+
+#. Double-Declining Depreciation Dialog: Label before period input
+#. Sum-of-the-Years’-Digits Depreciation Dialog: Label before period input
+#: src/buttons-financial.ui:331 src/buttons-financial.ui:1509
+msgid "_Period:"
+msgstr "_Perioadă:"
+
+#. Title of Future Value dialog
+#: src/buttons-financial.ui:374 src/buttons-financial.ui:2316
+msgid "Future Value"
+msgstr "Valoare viitoare"
+
 #. Future Value Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:16
+#: src/buttons-financial.ui:438
 msgid ""
 "Calculates the future value of an investment based on a series of equal "
 "payments at a periodic interest rate over the number of payment periods in "
@@ -143,50 +365,27 @@ msgstr ""
 "egale cu o rată periodică a dobânzii peste numărul de perioade de plată din "
 "termen."
 
-#. Compounding Term Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:18
-msgid ""
-"Calculates the number of compounding periods necessary to increase an "
-"investment of present value to a future value, at a fixed interest rate per "
-"compounding period."
-msgstr ""
-"Calculează numărul de perioade de compunere necesar pentru a crește o "
-"investiție de valoarea actuală la o valoare viitoare, la o rată fixă a "
-"dobânzii pe perioada de compunere."
-
-#. Payment Period Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:20
-msgid ""
-"Calculates the number of payment periods that are necessary during the term "
-"of an ordinary annuity, to accumulate a future value, at a periodic interest "
-"rate."
-msgstr ""
-"Calculează numărul de perioade de plată care sunt necesare într-o perioadă "
-"de anuitate obișnuită, pentru a acumula o valoare viitoare, cu o dobândă "
-"periodică."
+#. Future Value Dialog: Label before periodic payment input
+#. Present Value Dialog: Label before periodic payment input
+#. Payment Period Dialog: Label before periodic payment input
+#: src/buttons-financial.ui:452 src/buttons-financial.ui:972
+#: src/buttons-financial.ui:1801
+msgid "_Periodic Payment:"
+msgstr "_Plată periodică:"
 
-#. Periodic Interest Rate Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:22
-msgid ""
-"Calculates the periodic interest necessary to increase an investment to a "
-"future value, over the number of compounding periods. "
-msgstr ""
-"Calculează dobânda periodică necesară pentru a crește o investiție la o "
-"valoare viitoare, peste numărul de perioade de compunere."
+#. Future Value Dialog: Label before number of periods input
+#. Present Value Dialog: Label before number of periods input
+#: src/buttons-financial.ui:484 src/buttons-financial.ui:1004
+msgid "_Number of Periods:"
+msgstr "_Număr de perioade:"
 
-#. Present Value Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:24
-msgid ""
-"Calculates the present value of an investment based on a series of equal "
-"payments discounted at a periodic interest rate over the number of payment "
-"periods in the term. "
-msgstr ""
-"Calculează valoarea actuală a unei investiții pe baza unei serii de plăți "
-"egale actualizate la o rată a dobânzii periodice peste numărul de perioade "
-"de plată din termen."
+#. Title of Gross Profit Margin dialog
+#: src/buttons-financial.ui:557 src/buttons-financial.ui:2434
+msgid "Gross Profit Margin"
+msgstr "Marjă de profit brut"
 
 #. Gross Profit Margin Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:26
+#: src/buttons-financial.ui:621
 msgid ""
 "Calculates the resale price of a product, based on the product cost and the "
 "wanted gross profit margin."
@@ -194,11 +393,88 @@ msgstr ""
 "Calculează prețul de revânzare al unui produs pe baza costului produsului și "
 "a marjei brute de profit dorite."
 
-#. Straight-Line Depreciation Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:28
-msgid ""
-"Calculates the straight-line depreciation of an asset for one period. The "
-"straight-line method of depreciation divides the depreciable cost evenly "
+#. Gross Profit Margin Dialog: Label before margin input
+#: src/buttons-financial.ui:651
+msgid "_Margin:"
+msgstr "_Margine:"
+
+#. Title of Periodic Payment dialog
+#: src/buttons-financial.ui:709 src/buttons-financial.ui:2417
+msgid "Periodic Payment"
+msgstr "Plată periodică"
+
+#. Periodic Payment Dialog: Description of calculation
+#: src/buttons-financial.ui:774
+msgid ""
+"Calculates the amount of the periodic payment of a loan, where payments are "
+"made at the end of each payment period. "
+msgstr ""
+"Calculează plata periodică a unui împrumut, când plata este efectuată la "
+"sfârșitul fiecărei perioade de plată. "
+
+#. Periodic Payment Dialog: Label before principal input
+#: src/buttons-financial.ui:788
+msgid "_Principal:"
+msgstr "_Principal:"
+
+#. Periodic Payment Dialog: Label before term input
+#. Periodic Interest Rate Dialog: Label before term input
+#: src/buttons-financial.ui:820 src/buttons-financial.ui:1188
+msgid "_Term:"
+msgstr "_Termen:"
+
+#. Title of Present Value dialog
+#: src/buttons-financial.ui:893 src/buttons-financial.ui:2400
+msgid "Present Value"
+msgstr "Valoare prezentă"
+
+#. Present Value Dialog: Description of calculation
+#: src/buttons-financial.ui:958
+msgid ""
+"Calculates the present value of an investment based on a series of equal "
+"payments discounted at a periodic interest rate over the number of payment "
+"periods in the term. "
+msgstr ""
+"Calculează valoarea actuală a unei investiții pe baza unei serii de plăți "
+"egale actualizate la o rată a dobânzii periodice peste numărul de perioade "
+"de plată din termen. "
+
+#. Title of Periodic Interest Rate dialog
+#: src/buttons-financial.ui:1077 src/buttons-financial.ui:2383
+msgid "Periodic Interest Rate"
+msgstr "Rata de dobândă periodică"
+
+#. Periodic Interest Rate Dialog: Description of calculation
+#: src/buttons-financial.ui:1142
+msgid ""
+"Calculates the periodic interest necessary to increase an investment to a "
+"future value, over the number of compounding periods. "
+msgstr ""
+"Calculează dobânda periodică necesară pentru a crește o investiție la o "
+"valoare viitoare, peste numărul de perioade de compunere. "
+
+#. Title of Straight-Line Depreciation dialog
+#: src/buttons-financial.ui:1261
+msgid "Straight-Line Depreciation"
+msgstr "Amortizare în linie dreaptă"
+
+#. Straight-Line Depreciation Dialog: Label before cost input
+#. Sum-of-the-Years’-Digits Depreciation Dialog: Label before cost input
+#: src/buttons-financial.ui:1325 src/buttons-financial.ui:1557
+msgid "_Cost:"
+msgstr "_Cost:"
+
+#. Straight-Line Depreciation Dialog: Label before salvage input
+#. Sum-of-the-Years’-Digits Depreciation Dialog: Label before salvage input
+#: src/buttons-financial.ui:1341 src/buttons-financial.ui:1541
+msgid "_Salvage:"
+msgstr "_Valoare reziduală:"
+
+#. Straight-Line Depreciation Dialog: Description of calculation
+#: src/buttons-financial.ui:1419
+msgid ""
+"Calculates the straight-line depreciation of an asset for one period. The "
+"straight-line method of depreciation divides the depreciable cost evenly "
 "over the useful life of an asset. The useful life is the number of periods, "
 "typically years, over which an asset is depreciated. "
 msgstr ""
@@ -206,2132 +482,2642 @@ msgstr ""
 "Metoda în linie dreaptă de amortizare a costurilor împarte costurile "
 "amortizabile în mod egal pe durata de viață utilă a unui activ. Durata de "
 "viață utilă este numărul de perioade, de obicei de ani, peste care un activ "
-"se amortizează."
+"se amortizează. "
 
-#. Title of Compounding Term dialog
-#. Tooltip for the compounding term button
-#: ../data/buttons-financial.ui.h:30 ../src/math-buttons.c:255
-msgid "Compounding Term"
-msgstr "Termen compus"
+#. Title of Sum-of-the-Years’-Digits Depreciation dialog
+#: src/buttons-financial.ui:1445
+msgid "Sum-of-the-Years’-Digits Depreciation"
+msgstr "Amortizare prin metoda sumei cifrelor anilor („SOFTY”)"
+
+#. Sum-of-the-Years’-Digits Depreciation Dialog: Description of calculation
+#: src/buttons-financial.ui:1634
+msgid ""
+"Calculates the depreciation allowance on an asset for a specified period of "
+"time, using the Sum-of-the-Years’-Digits method. This method of depreciation "
+"accelerates the rate of depreciation, so that more depreciation expense "
+"occurs in earlier periods than in later ones. The useful life is the number "
+"of periods, typically years, over which an asset is depreciated. "
+msgstr ""
+"Calculează indemnizația de amortizare pe un activ pentru o anumită perioadă "
+"de timp, utilizând metoda sumei cifrelor anilor („SOFTY”). Această metodă de "
+"amortizare accelerează rata amortizării, astfel încât consumul are loc în "
+"perioadele de timp recente decât în cele de mai târziu. Durata de viață "
+"utilă este numărul de perioade, de obicei ani, în care un activ este "
+"amortizat. "
+
+#. Title of Payment Period dialog
+#: src/buttons-financial.ui:1660
+msgid "Payment Period"
+msgstr "Perioadă plată"
+
+#. Payment Period Dialog: Label before future value input
+#: src/buttons-financial.ui:1785
+msgid "Future _Value:"
+msgstr "_Valore viitoare:"
+
+#. Payment Period Dialog: Description of calculation
+#: src/buttons-financial.ui:1818
+msgid ""
+"Calculates the number of payment periods that are necessary during the term "
+"of an ordinary annuity, to accumulate a future value, at a periodic interest "
+"rate."
+msgstr ""
+"Calculează numărul de perioade de plată care sunt necesare într-o perioadă "
+"de anuitate obișnuită, pentru a acumula o valoare viitoare, cu o dobândă "
+"periodică."
 
 #. Calculates the number of compounding periods necessary to increase an investment of present value pv to a future value of fv, at a fixed interest rate of int per compounding period. See also: http://en.wikipedia.org/wiki/Compound_interest
-#: ../data/buttons-financial.ui.h:32
+#: src/buttons-financial.ui:2278
 msgid "Ctrm"
 msgstr "TrmC"
 
 #. Calculates the depreciation allowance on an asset for a specified period of time, using the double-declining balance method. See also: http://en.wikipedia.org/wiki/Depreciation
-#: ../data/buttons-financial.ui.h:34
+#: src/buttons-financial.ui:2294
 msgid "Ddb"
 msgstr "Amd"
 
-#. Title of Double-Declining Depreciation dialog
-#: ../data/buttons-financial.ui.h:36
-msgid "Double-Declining Depreciation"
+#: src/buttons-financial.ui:2300
+msgid "Double Declining Depreciation"
 msgstr "Amortizare dublu-regresivă"
 
-#. Title of Future Value dialog
-#. Tooltip for the future value button
-#: ../data/buttons-financial.ui.h:40 ../src/math-buttons.c:261
-msgid "Future Value"
-msgstr "Valoare viitoare"
-
-#. Payment Period Dialog: Label before future value input
-#: ../data/buttons-financial.ui.h:42
-msgid "Future _Value:"
-msgstr "_Valore viitoare:"
-
 #. Calculates the future value of an investment based on a series of equal payments, each of amount pmt, at a periodic interest rate of int, over the number of payment periods in the term. See also: http://en.wikipedia.org/wiki/Future_value
-#: ../data/buttons-financial.ui.h:44
+#: src/buttons-financial.ui:2310
 msgid "Fv"
 msgstr "Vv"
 
-#. Calculates the resale price of a product, based on the product cost and the wanted gross profit margin. See also: http://en.wikipedia.org/wiki/Gross_profit_margin
-#: ../data/buttons-financial.ui.h:46
-msgid "Gpm"
-msgstr "Mpb"
-
-#. Title of Gross Profit Margin dialog
-#. Tooltip for the gross profit margin button
-#: ../data/buttons-financial.ui.h:48 ../src/math-buttons.c:282
-msgid "Gross Profit Margin"
-msgstr "Marjă de profit brut"
-
-#. Title of Payment Period dialog
-#: ../data/buttons-financial.ui.h:52
-msgid "Payment Period"
-msgstr "Perioadă plată"
-
-#. Title of Periodic Interest Rate dialog
-#. Tooltip for the periodic interest rate button
-#: ../data/buttons-financial.ui.h:54 ../src/math-buttons.c:273
-msgid "Periodic Interest Rate"
-msgstr "Rata de dobândă periodică"
-
-#. Payment Period Dialog: Label before periodic interest rate input
-#: ../data/buttons-financial.ui.h:56
-msgid "Periodic Interest _Rate:"
-msgstr "_Rata de dobândă periodică:"
+#. Calculates the number of payment periods that are necessary during the term of an ordinary annuity, to accumulate a future value of fv, at a periodic interest rate of int. Each payment is equal to amount pmt. See also: http://en.wikipedia.org/wiki/Annuity_(finance_theory)
+#: src/buttons-financial.ui:2326
+msgid "Term"
+msgstr "TrmR"
 
-#. Title of Periodic Payment dialog
-#. Tooltip for the periodic payment button
-#: ../data/buttons-financial.ui.h:58 ../src/math-buttons.c:279
-msgid "Periodic Payment"
-msgstr "Plată periodică"
+#: src/buttons-financial.ui:2332
+msgid "Financial Term"
+msgstr "Termen financiar"
 
-#. Calculates the amount of the periodic payment of a loan, where payments are made at the end of each payment period. See also: http://en.wikipedia.org/wiki/Amortization_schedule
-#: ../data/buttons-financial.ui.h:60
-msgid "Pmt"
-msgstr "Pp"
+#. Calculates the depreciation allowance on an asset for a specified period of time, using the Sum-Of-The-Years’-Digits method. This method of depreciation accelerates the rate of depreciation, so that more depreciation expense occurs in earlier periods than in later ones. The depreciable cost is cost - salvage. The useful life is the number of periods, typically years, over which an asset is depreciated. See also: http://en.wikipedia.org/wiki/Depreciation
+#: src/buttons-financial.ui:2343
+msgid "Syd"
+msgstr "Sca"
 
-#. Title of Present Value dialog
-#. Tooltip for the present value button
-#: ../data/buttons-financial.ui.h:62 ../src/math-buttons.c:276
-msgid "Present Value"
-msgstr "Valoare prezentă"
+#: src/buttons-financial.ui:2349
+msgid "Sum of the Years Digits Depreciation"
+msgstr "Amortizare prin metoda sumei cifrelor anilor („SOFTY”)"
 
-#. Periodic Interest Rate Dialog: Label before present value input
-#: ../data/buttons-financial.ui.h:64
-msgid "Present _Value:"
-msgstr "_Valoare prezentă:"
+#. Calculates the straight-line depreciation of an asset for one period. The depreciable cost is cost - salvage. The straight-line method of depreciation divides the depreciable cost evenly over the useful life of an asset. The useful life is the number of periods, typically years, over which an asset is depreciated. See also: http://en.wikipedia.org/wiki/Depreciation
+#: src/buttons-financial.ui:2360
+msgid "Sln"
+msgstr "Ald"
 
-#. Calculates the present value of an investment based on a series of equal payments, each of amount pmt, discounted at a periodic interest rate of int, over the number of payment periods in the term. See also: http://en.wikipedia.org/wiki/Present_value
-#: ../data/buttons-financial.ui.h:66
-msgid "Pv"
-msgstr "Vp"
+#: src/buttons-financial.ui:2366
+msgid "Straight Line Depreciation"
+msgstr "Amortizare în linie dreaptă"
 
 #. Calculates the periodic interest necessary to increase an investment of present value pv to a future value of fv, over the number of compounding periods in term. See also: http://en.wikipedia.org/wiki/Interest
-#: ../data/buttons-financial.ui.h:68
+#: src/buttons-financial.ui:2377
 msgid "Rate"
 msgstr "Rată"
 
-#. Calculates the straight-line depreciation of an asset for one period. The depreciable cost is cost - salvage. The straight-line method of depreciation divides the depreciable cost evenly over the useful life of an asset. The useful life is the number of periods, typically years, over which an asset is depreciated. See also: http://en.wikipedia.org/wiki/Depreciation
-#: ../data/buttons-financial.ui.h:70
-msgid "Sln"
-msgstr "Ald"
+#. Calculates the present value of an investment based on a series of equal payments, each of amount pmt, discounted at a periodic interest rate of int, over the number of payment periods in the term. See also: http://en.wikipedia.org/wiki/Present_value
+#: src/buttons-financial.ui:2394
+msgid "Pv"
+msgstr "Vp"
 
-#. Title of Straight-Line Depreciation dialog
-#: ../data/buttons-financial.ui.h:72
-msgid "Straight-Line Depreciation"
-msgstr "Amortizare în linie dreaptă"
+#. Calculates the amount of the periodic payment of a loan, where payments are made at the end of each payment period. See also: http://en.wikipedia.org/wiki/Amortization_schedule
+#: src/buttons-financial.ui:2411
+msgid "Pmt"
+msgstr "Pp"
 
-#. Title of Sum-of-the-Years'-Digits Depreciation dialog
-#: ../data/buttons-financial.ui.h:74
-msgid "Sum-of-the-Years'-Digits Depreciation"
-msgstr "Amortizare prin metoda sumei cifrelor anilor („SOFTY”)"
+#. Calculates the resale price of a product, based on the product cost and the wanted gross profit margin. See also: http://en.wikipedia.org/wiki/Gross_profit_margin
+#: src/buttons-financial.ui:2428
+msgid "Gpm"
+msgstr "Mpb"
 
-#. Calculates the depreciation allowance on an asset for a specified period of time, using the Sum-Of-The-Years'-Digits method. This method of depreciation accelerates the rate of depreciation, so that more depreciation expense occurs in earlier periods than in later ones. The depreciable cost is cost - salvage. The useful life is the number of periods, typically years, over which an asset is depreciated. See also: http://en.wikipedia.org/wiki/Depreciation
-#: ../data/buttons-financial.ui.h:76
-msgid "Syd"
-msgstr "Sca"
+#: src/buttons-programming.ui:17
+msgid "Binary"
+msgstr "Binar"
 
-#. Calculates the number of payment periods that are necessary during the term of an ordinary annuity, to accumulate a future value of fv, at a periodic interest rate of int. Each payment is equal to amount pmt. See also: http://en.wikipedia.org/wiki/Annuity_(finance_theory)
-#: ../data/buttons-financial.ui.h:78
-msgid "Term"
-msgstr "TrmR"
+#: src/buttons-programming.ui:18
+msgid "Octal"
+msgstr "Octal"
 
-#. Sum-of-the-Years'-Digits Depreciation Dialog: Label before cost input
-#: ../data/buttons-financial.ui.h:80
-msgid "_Cost:"
-msgstr "_Cost:"
+#: src/buttons-programming.ui:19
+msgid "Decimal"
+msgstr "Zecimal"
 
-#. Periodic Interest Rate Dialog: Label before future value input
-#: ../data/buttons-financial.ui.h:82
-msgid "_Future Value:"
-msgstr "Valoare _viitoare:"
+#: src/buttons-programming.ui:20
+msgid "Hexadecimal"
+msgstr "Hexazecimal"
 
-#. Sum-of-the-Years'-Digits Depreciation Dialog: Label before life input
-#: ../data/buttons-financial.ui.h:84
-msgid "_Life:"
-msgstr "_Viață:"
+#: src/buttons-programming.ui:1298
+msgid "Binary Logarithm"
+msgstr "Logaritm binar"
 
-#. Gross Profit Margin Dialog: Label before margin input
-#: ../data/buttons-financial.ui.h:86
-msgid "_Margin:"
-msgstr "_Margine:"
+#: src/buttons-programming.ui:1343
+msgid "Integer Component"
+msgstr "Partea întreagă"
 
-#. Present Value Dialog: Label before number of periods input
-#: ../data/buttons-financial.ui.h:88
-msgid "_Number of Periods:"
-msgstr "_Număr de perioade:"
+#: src/buttons-programming.ui:1360
+msgid "Fractional Component"
+msgstr "Partea fracționară"
 
-#. Sum-of-the-Years'-Digits Depreciation Dialog: Label before period input
-#: ../data/buttons-financial.ui.h:90
-msgid "_Period:"
-msgstr "_Perioadă:"
+#: src/buttons-programming.ui:1896
+msgid "Boolean Exclusive OR"
+msgstr "SAU exclusiv logic"
 
-#. Payment Period Dialog: Label before periodic payment input
-#: ../data/buttons-financial.ui.h:92
-msgid "_Periodic Payment:"
-msgstr "_Plată periodică:"
+#: src/buttons-programming.ui:1913
+msgid "Boolean OR"
+msgstr "SAU logic"
 
-#. Periodic Payment Dialog: Label before principal input
-#: ../data/buttons-financial.ui.h:94
-msgid "_Principal:"
-msgstr "_Principal:"
+#: src/buttons-programming.ui:1930
+msgid "Boolean AND"
+msgstr "ȘI logic"
 
-#. Sum-of-the-Years'-Digits Depreciation Dialog: Label before salvage input
-#: ../data/buttons-financial.ui.h:96
-msgid "_Salvage:"
-msgstr "_Valoare reziduală:"
+#. Accessible name for the shift left button
+#: src/buttons-programming.ui:1994 src/buttons-programming.ui:1997
+msgid "Shift Left"
+msgstr "Deplasează la stânga"
 
-#. Periodic Interest Rate Dialog: Label before term input
-#: ../data/buttons-financial.ui.h:98
-msgid "_Term:"
-msgstr "_Termen:"
+#. Accessible name for the shift right button
+#: src/buttons-programming.ui:2037 src/buttons-programming.ui:2040
+msgid "Shift Right"
+msgstr "Deplasează la dreapta"
 
-#. Insert ASCII dialog: Label before character entry
-#: ../data/buttons-programming.ui.h:6
-msgid "Ch_aracter:"
-msgstr "C_aracter:"
+#. Title of insert character code dialog
+#: src/buttons-programming.ui:2081 src/buttons-programming.ui:2254
+msgid "Insert Character Code"
+msgstr "Introducere cod caracter"
 
 #. Accessible name for the insert character button
-#: ../data/buttons-programming.ui.h:14
+#: src/buttons-programming.ui:2085
 msgid "Insert Character"
 msgstr "Introdu un caracter"
 
-#. Title of insert character code dialog
-#. Tooltip for the insert character code button
-#: ../data/buttons-programming.ui.h:16 ../src/math-buttons.c:234
-msgid "Insert Character Code"
-msgstr "Introducere cod caracter"
+#: src/buttons-programming.ui:2101
+msgid "Boolean NOT"
+msgstr "NU logic"
 
-#. Accessible name for the shift left button
-#. Tooltip for the shift left button
-#: ../data/buttons-programming.ui.h:20 ../src/math-buttons.c:249
-msgid "Shift Left"
-msgstr "Deplasează la stânga"
+#: src/buttons-programming.ui:2200
+msgid "Ones’ Complement"
+msgstr "Complement față de 1"
 
-#. Accessible name for the shift right button
-#. Tooltip for the shift right button
-#: ../data/buttons-programming.ui.h:22 ../src/math-buttons.c:252
-msgid "Shift Right"
-msgstr "Deplasează la dreapta"
+#: src/buttons-programming.ui:2217
+msgid "Two’s Complement"
+msgstr "Complement față de 2"
+
+#. Insert ASCII dialog: Label before character entry
+#: src/buttons-programming.ui:2267
+msgid "Ch_aracter:"
+msgstr "C_aracter:"
 
 #. Insert ASCII dialog: Button to insert selected character
-#: ../data/buttons-programming.ui.h:30
+#: src/buttons-programming.ui:2316
 msgid "_Insert"
 msgstr "_Introdu"
 
-#. The label on the memory button
-#: ../data/buttons-programming.ui.h:32
-#| msgid "x2"
-msgid "x"
-msgstr "x"
-
-#. Word size combo: 16 bits
-#: ../data/preferences.ui.h:2
-msgid "16-bit"
-msgstr "16 biți"
+#: data/org.gnome.Calculator.appdata.xml.in:7
+msgid "GNOME Calculator"
+msgstr "Calculator GNOME"
 
-#. Word size combo: 32 bits
-#: ../data/preferences.ui.h:4
-msgid "32-bit"
-msgstr "32 biți"
+#: data/org.gnome.Calculator.appdata.xml.in:8
+#: data/org.gnome.Calculator.desktop.in:4
+msgid "Perform arithmetic, scientific or financial calculations"
+msgstr "Efectuează calcule aritmetice, științifice și financiare"
 
-#. Word size combo: 64 bits
-#: ../data/preferences.ui.h:6
-msgid "64-bit"
-msgstr "64 biți"
+#: data/org.gnome.Calculator.appdata.xml.in:10
+msgid ""
+"GNOME Calculator is an application that solves mathematical equations. "
+"Though it at first appears to be a simple calculator with only basic "
+"arithmetic operations, you can switch into Advanced, Financial, or "
+"Programming mode to find a surprising set of capabilities."
+msgstr ""
+"Calculator GNOME este o aplicație care rezolvă ecuații matematice. Deși la "
+"început pare a fi un calculator simplu care deține doar operațiile "
+"aritmetice de bază, puteți comuta la modul avansat, financiar sau de "
+"programare pentru a găsi un set surprinzător de capacități."
 
-#. Word size combo: 8 bits
-#: ../data/preferences.ui.h:8
-msgid "8-bit"
-msgstr "8 biți"
+#: data/org.gnome.Calculator.appdata.xml.in:16
+msgid ""
+"The Advanced calculator supports many operations, including: logarithms, "
+"factorials, trigonometric and hyperbolic functions, modulus division, "
+"complex numbers, random number generation, prime factorization and unit "
+"conversions."
+msgstr ""
+"Calculatorul avansat suportă multe operații, inclusiv: logaritmi, "
+"factoriale, funcții trigonometrice și hiperbolice, împărțirea cu rest, "
+"numere complexe, generare de numere aleatorii, factorizare de numere prime "
+"și conversii de unitate."
 
-#. Preferences dialog: Label for display format combo box
-#: ../data/preferences.ui.h:10
-msgid "Number _Format:"
-msgstr "_Format număr:"
+#: data/org.gnome.Calculator.appdata.xml.in:22
+msgid ""
+"Financial mode supports several computations, including periodic interest "
+"rate, present and future value, double declining and straight line "
+"depreciation, and many others."
+msgstr ""
+"Modul financiar suportă calculări diverse, inclusiv rata dobânzi periodice, "
+"valoarea curentă și viitoare, amortizarea dublu-regresivă și pe linie "
+"dreaptă, și multe altele."
 
-#. Title of preferences dialog
-#: ../data/preferences.ui.h:11 ../src/math-preferences.c:239
-msgid "Preferences"
-msgstr "Preferințe"
+#: data/org.gnome.Calculator.appdata.xml.in:27
+msgid ""
+"Programming mode supports conversion between common bases (binary, octal, "
+"decimal, and hexadecimal), boolean algebra, one’s and two’s complementation, "
+"character to character code conversion, and more."
+msgstr ""
+"Modul de programare suportă conversia între bazele comune (binar, octal, "
+"zecimal, și hexazecimal), algebră logică, complement față de unu și doi, "
+"conversie de cod caracter cu caracter, și multe altele."
 
-#. Preferences dialog: label for show thousands separator check button
-#: ../data/preferences.ui.h:13
-msgid "Show _thousands separators"
-msgstr "Arată separa_torii miilor"
+#: data/org.gnome.Calculator.appdata.xml.in:36
+msgid "GNOME Calculator in Basic Mode"
+msgstr "Calculator GNOME în modul de bază"
 
-#. Preferences dialog: label for show trailing zeroes check button
-#: ../data/preferences.ui.h:15
-msgid "Show trailing _zeroes"
-msgstr "Arată _zerouri după virgulă"
+#: data/org.gnome.Calculator.appdata.xml.in:40
+msgid "GNOME Calculator in Advanced Mode"
+msgstr "Calculator GNOME în modul avansat"
 
-#. Preferences dialog: label for word size combo box
-#: ../data/preferences.ui.h:17
-msgid "Word _size:"
-msgstr "Dimen_siunea cuvântului:"
+#: data/org.gnome.Calculator.appdata.xml.in:44
+msgid "GNOME Calculator in Financial Mode"
+msgstr "Calculator GNOME în modul financiar"
 
-#. Preferences dialog: Label for angle unit combo box
-#: ../data/preferences.ui.h:19
-msgid "_Angle units:"
-msgstr "Unități ung_hi:"
+#: data/org.gnome.Calculator.appdata.xml.in:48
+msgid "GNOME Calculator in Programming Mode"
+msgstr "Calculator GNOME în modul programare"
+
+#: data/org.gnome.Calculator.appdata.xml.in:62
+msgid "The GNOME Project"
+msgstr "Proiectul GNOME"
 
-#. Title of main window
-#: ../data/gcalctool.desktop.in.h:1 ../src/math-window.c:522
+#. Program name in the about dialog
+#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:80
+#: src/gnome-calculator.vala:81 src/gnome-calculator.vala:327
 msgid "Calculator"
 msgstr "Calculator"
 
-#: ../data/gcalctool.desktop.in.h:2
-msgid "Perform arithmetic, scientific or financial calculations"
-msgstr "Efectuează calcule aritmetice, științifice și financiare"
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/org.gnome.Calculator.desktop.in:6
+msgid "calculation;arithmetic;scientific;financial;"
+msgstr ""
+"calculation;arithmetic;scientific;financial;calculare;aritmetic;științific;"
+"financiar;calculator;"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:1
-msgid "Accuracy value"
-msgstr "Valoarea preciziei"
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/org.gnome.Calculator.desktop.in:9
+msgid "gnome-calculator"
+msgstr "gnome-calculator"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:2
-msgid "Angle units"
-msgstr "Unități unghi"
+#: src/math-converter.ui:16
+msgid "Switch conversion units"
+msgstr "Comută unitățile de conversie"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:3
-msgid "Button mode"
-msgstr "Mod buton"
+#: src/math-converter.ui:29
+msgid " in "
+msgstr " în "
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:4
-msgid "Currency of the current calculation"
-msgstr "Moneda calculului curent"
+#: src/math-converter.ui:108
+msgctxt "convertion equals label"
+msgid "="
+msgstr "="
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:5
-msgid "Currency to convert the current calculation into"
-msgstr "Moneda în care să se convertească calculul curent"
+#: src/math-function-popover.ui:33
+msgid "New function"
+msgstr "Funcție nouă"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:6
-msgid ""
-"Indicates whether any trailing zeroes after the numeric point should be "
-"shown in the display value."
-msgstr "Indică dacă se afișează zerouri după virgulă."
+#: src/math-variable-popover.ui:37
+msgid "Variable name"
+msgstr "Nume variabilă"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:7
-msgid "Indicates whether thousands separators are shown in large numbers."
-msgstr "Indică dacă se afișează separatorii de mii în numere mari."
+#: src/math-variable-popover.ui:51
+msgid "Store value into existing or new variable"
+msgstr "Stochează valoarea într-o variabilă existentă sau nouă"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:8
-msgid "Number format"
-msgstr "Format număr"
+#: src/math-window.ui:20 src/math-window.vala:88
+msgid "Basic Mode"
+msgstr "Mod de bază"
+
+#: src/math-window.ui:25 src/math-window.vala:93
+msgid "Advanced Mode"
+msgstr "Mod avansat"
+
+#: src/math-window.ui:30 src/math-window.vala:98
+msgid "Financial Mode"
+msgstr "Mod financiar"
+
+#: src/math-window.ui:35 src/math-window.vala:103
+msgid "Programming Mode"
+msgstr "Mod programare"
+
+#: src/math-window.ui:40 src/math-window.vala:108
+msgid "Keyboard Mode"
+msgstr "Mod tastatură"
+
+#: src/math-window.ui:49
+msgid "New Window"
+msgstr "Fereastră nouă"
+
+#. Title of preferences dialog
+#: src/math-window.ui:56 src/math-preferences.vala:30
+msgid "Preferences"
+msgstr "Preferințe"
+
+#: src/math-window.ui:63
+msgid "_Keyboard Shortcuts"
+msgstr "S_curtături tastatură"
+
+#: src/math-window.ui:68
+msgid "Help"
+msgstr "Ajutor"
+
+#: src/math-window.ui:73
+msgid "About"
+msgstr "Despre"
+
+#: src/math-window.ui:120
+msgid "Menu"
+msgstr "Meniu"
+
+#: src/math-shortcuts.ui:15
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Generale"
+
+#: src/math-shortcuts.ui:20
+msgctxt "shortcut window"
+msgid "Open a new window"
+msgstr "Deschide o fereastră nouă"
+
+#: src/math-shortcuts.ui:27
+msgctxt "shortcut window"
+msgid "Close current window"
+msgstr "Închide fereastra curentă"
+
+#: src/math-shortcuts.ui:34
+msgctxt "shortcut window"
+msgid "Open help"
+msgstr "Deschide ajutorul"
+
+#: src/math-shortcuts.ui:41
+msgctxt "shortcut window"
+msgid "Clear history"
+msgstr "Șterge istoricul"
+
+#: src/math-shortcuts.ui:48
+msgctxt "shortcut window"
+msgid "Quit the application"
+msgstr "Ieșire din aplicație"
+
+#: src/math-shortcuts.ui:56
+msgctxt "shortcut window"
+msgid "Switching modes"
+msgstr "Comutare de moduri"
+
+#: src/math-shortcuts.ui:61
+msgctxt "shortcut window"
+msgid "Switch to Basic mode"
+msgstr "Comută la modul de bază"
+
+#: src/math-shortcuts.ui:68
+msgctxt "shortcut window"
+msgid "Switch to Advanced mode"
+msgstr "Comută la modul avansat"
+
+#: src/math-shortcuts.ui:75
+msgctxt "shortcut window"
+msgid "Switch to Financial mode"
+msgstr "Comută la modul financiar"
+
+#: src/math-shortcuts.ui:82
+msgctxt "shortcut window"
+msgid "Switch to Programming mode"
+msgstr "Comută la modul programare"
+
+#: src/math-shortcuts.ui:89
+msgctxt "shortcut window"
+msgid "Switch to Keyboard mode"
+msgstr "Comută la modul tastatură"
+
+#: src/math-shortcuts.ui:97
+msgctxt "shortcut window"
+msgid "Keyboard entry"
+msgstr "Intrare tastatură"
+
+#: src/math-shortcuts.ui:102
+msgctxt "shortcut window"
+msgid "Multiply (×)"
+msgstr "Înmulțește (×)"
+
+#: src/math-shortcuts.ui:109
+msgctxt "shortcut window"
+msgid "Divide (÷)"
+msgstr "Împarte (÷)"
+
+#: src/math-shortcuts.ui:116
+msgctxt "shortcut window"
+msgid "Square root (√)"
+msgstr "Rădăcină pătrată (√)"
+
+#: src/math-shortcuts.ui:123
+msgctxt "shortcut window"
+msgid "Inverse"
+msgstr "Inversă"
+
+#: src/math-shortcuts.ui:130
+msgctxt "shortcut window"
+msgid "Pi (π)"
+msgstr "Pi (π)"
+
+#: src/math-shortcuts.ui:137
+msgctxt "shortcut window"
+msgid "Enter numbers in scientific format"
+msgstr "Introducere de numere în format științific"
+
+#: src/math-shortcuts.ui:145
+msgctxt "shortcut window"
+msgid "Programming mode"
+msgstr "Mod programare"
+
+#: src/math-shortcuts.ui:150
+msgctxt "shortcut window"
+msgid "Switch to binary"
+msgstr "Comută la binar"
+
+#: src/math-shortcuts.ui:157
+msgctxt "shortcut window"
+msgid "Switch to octal"
+msgstr "Comută la octal"
+
+#: src/math-shortcuts.ui:164
+msgctxt "shortcut window"
+msgid "Switch to decimal"
+msgstr "Comută la zecimal"
+
+#: src/math-shortcuts.ui:171
+msgctxt "shortcut window"
+msgid "Switch to hexadecimal"
+msgstr "Comută la hexazecimal"
+
+#: data/org.gnome.calculator.gschema.xml:25
+msgid "Accuracy value"
+msgstr "Valoarea preciziei"
+
+#: data/org.gnome.calculator.gschema.xml:26
+msgid "The number of digits displayed after the numeric point"
+msgstr "Numărul de cifre afișate după virgulă"
+
+#: data/org.gnome.calculator.gschema.xml:31
+msgid "Word size"
+msgstr "Dimensiunea cuvântului"
+
+#: data/org.gnome.calculator.gschema.xml:32
+msgid "The size of the words used in bitwise operations"
+msgstr "Dimensiunea cuvintelor folosite în operațiile binare"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:9
+#: data/org.gnome.calculator.gschema.xml:37
 msgid "Numeric Base"
 msgstr "Bază numerică"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:10
+#: data/org.gnome.calculator.gschema.xml:38
+msgid "The numeric base"
+msgstr "Baza numerică"
+
+#: data/org.gnome.calculator.gschema.xml:42
 msgid "Show Thousands Separators"
 msgstr "Afișează separatorii de mii"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:11
+#: data/org.gnome.calculator.gschema.xml:43
+msgid "Indicates whether thousands separators are shown in large numbers."
+msgstr "Indică dacă se afișează separatorii de mii în numere mari."
+
+#: data/org.gnome.calculator.gschema.xml:47
 msgid "Show Trailing Zeroes"
 msgstr "Afișează zerouri după virgulă"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:12
-msgid "Source currency"
-msgstr "Monedă sursă"
+#: data/org.gnome.calculator.gschema.xml:48
+msgid ""
+"Indicates whether any trailing zeroes after the numeric point should be "
+"shown in the display value."
+msgstr "Indică dacă se afișează zerouri după virgulă."
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:13
-msgid "Source units"
-msgstr "Unități sursă"
+#: data/org.gnome.calculator.gschema.xml:52
+msgid "Number format"
+msgstr "Format număr"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:14
-msgid "Target currency"
-msgstr "Monedă destinație"
+#: data/org.gnome.calculator.gschema.xml:53
+msgid "The format to display numbers in"
+msgstr "Formatul în care se afișează numerele"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:15
-msgid "Target units"
-msgstr "Unități destinație"
+#: data/org.gnome.calculator.gschema.xml:57
+msgid "Angle units"
+msgstr "Unități unghi"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:16
+#: data/org.gnome.calculator.gschema.xml:58
 msgid "The angle units to use"
 msgstr "Unitățile de măsurare a unghiului de utilizat"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:17
+#: data/org.gnome.calculator.gschema.xml:62
+msgid "Button mode"
+msgstr "Mod buton"
+
+#: data/org.gnome.calculator.gschema.xml:63
 msgid "The button mode"
 msgstr "Mod buton"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:18
-msgid "The format to display numbers in"
-msgstr "Formatul în care se afișează numerele"
+#: data/org.gnome.calculator.gschema.xml:67
+msgid "Source currency"
+msgstr "Monedă sursă"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:19
-msgid "The number of digits displayed after the numeric point"
-msgstr "Numărul de cifre afișate după virgulă"
+#: data/org.gnome.calculator.gschema.xml:68
+msgid "Currency of the current calculation"
+msgstr "Moneda calculului curent"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:20
-msgid "The numeric base"
-msgstr "Baza numerică"
+#: data/org.gnome.calculator.gschema.xml:72
+msgid "Target currency"
+msgstr "Monedă destinație"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:21
-msgid "The size of the words used in bitwise operations"
-msgstr "Dimensiunea cuvintelor folosite în operațiile binare"
+#: data/org.gnome.calculator.gschema.xml:73
+msgid "Currency to convert the current calculation into"
+msgstr "Moneda în care să se convertească calculul curent"
+
+#: data/org.gnome.calculator.gschema.xml:77
+msgid "Source units"
+msgstr "Unități sursă"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:22
+#: data/org.gnome.calculator.gschema.xml:78
 msgid "Units of the current calculation"
 msgstr "Unitățile calculului curent"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:23
+#: data/org.gnome.calculator.gschema.xml:82
+msgid "Target units"
+msgstr "Unități destinație"
+
+#: data/org.gnome.calculator.gschema.xml:83
 msgid "Units to convert the current calculation into"
 msgstr "Unitățile în care să se convertească calculul curent"
 
-#: ../data/org.gnome.gcalctool.gschema.xml.in.h:24
-msgid "Word size"
-msgstr "Dimensiunea cuvântului"
+#: data/org.gnome.calculator.gschema.xml:87
+msgid "Internal precision"
+msgstr "Precizie internă"
+
+#: data/org.gnome.calculator.gschema.xml:88
+msgid "The internal precision used with the MPFR library"
+msgstr "Precizia internă utilizată cu biblioteca MPFR"
 
-#: ../src/currency-manager.c:20
+#: data/org.gnome.calculator.gschema.xml:92
+msgid "Window position"
+msgstr "Poziție fereastră"
+
+#: data/org.gnome.calculator.gschema.xml:93
+msgid "Window position (x and y) of the last closed window."
+msgstr "Poziția ferestrei (x și y) a ultimei ferestre închise."
+
+#: lib/currency.vala:28
 msgid "UAE Dirham"
 msgstr "Dirham Emiratele Arabe Unite"
 
-#: ../src/currency-manager.c:21
-#| msgid "Australian dollar"
+#: lib/currency.vala:29
 msgid "Australian Dollar"
 msgstr "Dolar australian"
 
-#: ../src/currency-manager.c:22
-#| msgid "Bulgarian lev"
+#: lib/currency.vala:30
 msgid "Bulgarian Lev"
 msgstr "Levă bulgară"
 
-#: ../src/currency-manager.c:23
-#| msgid "Bahraini dinar"
+#: lib/currency.vala:31
 msgid "Bahraini Dinar"
 msgstr "Dinar bahrain"
 
-#: ../src/currency-manager.c:24
-#| msgid "Brunei dollar"
+#: lib/currency.vala:32
 msgid "Brunei Dollar"
 msgstr "Dolar brunei"
 
-#: ../src/currency-manager.c:25
-#| msgid "Brazilian real"
+#: lib/currency.vala:33
 msgid "Brazilian Real"
 msgstr "Real brazilian"
 
-#: ../src/currency-manager.c:26
-#| msgid "Botswana pula"
+#: lib/currency.vala:34
 msgid "Botswana Pula"
 msgstr "Pula botswaneză"
 
-#: ../src/currency-manager.c:27
-#| msgid "Canadian dollar"
+#: lib/currency.vala:35
 msgid "Canadian Dollar"
 msgstr "Dolar canadian"
 
-#: ../src/currency-manager.c:28
-#| msgid "Swiss franc"
+#: lib/currency.vala:36
+msgid "CFA Franc"
+msgstr "Franc CFA"
+
+#: lib/currency.vala:37
 msgid "Swiss Franc"
 msgstr "Franc elvețian"
 
-#: ../src/currency-manager.c:29
-#| msgid "Chilean peso"
+#: lib/currency.vala:38
 msgid "Chilean Peso"
 msgstr "Peso chilian"
 
-#: ../src/currency-manager.c:30
-#| msgid "Chinese yuan renminbi"
+#: lib/currency.vala:39
 msgid "Chinese Yuan"
 msgstr "Yuan chinezesc"
 
-#: ../src/currency-manager.c:31
-#| msgid "Colombian peso"
+#: lib/currency.vala:40
 msgid "Colombian Peso"
 msgstr "Peso columbian"
 
-#: ../src/currency-manager.c:32
-#| msgid "Czech koruna"
+#: lib/currency.vala:41
 msgid "Czech Koruna"
 msgstr "Coroană cehă"
 
-#: ../src/currency-manager.c:33
-#| msgid "Danish krone"
+#: lib/currency.vala:42
 msgid "Danish Krone"
 msgstr "Coroană daneză"
 
-#: ../src/currency-manager.c:34
-#| msgid "Algerian dinar"
+#: lib/currency.vala:43
 msgid "Algerian Dinar"
 msgstr "Dinar algerian"
 
-#: ../src/currency-manager.c:35
-#| msgid "Estonian kroon"
+#: lib/currency.vala:44
 msgid "Estonian Kroon"
 msgstr "Coroană estoniană"
 
-#: ../src/currency-manager.c:36
+#: lib/currency.vala:45
 msgid "Euro"
 msgstr "Euro"
 
-#: ../src/currency-manager.c:37
-#| msgid "Pound sterling"
-msgid "Pound Sterling"
-msgstr "Liră sterlină"
+#: lib/currency.vala:46
+msgid "British Pound Sterling"
+msgstr "Liră sterlină britanică"
 
-#: ../src/currency-manager.c:38
-#| msgid "Hong Kong dollar"
+#: lib/currency.vala:47
 msgid "Hong Kong Dollar"
 msgstr "Dolar Hong Kong"
 
-#: ../src/currency-manager.c:39
-#| msgid "Croatian kuna"
+#: lib/currency.vala:48
 msgid "Croatian Kuna"
 msgstr "Kună croată"
 
-#: ../src/currency-manager.c:40
-#| msgid "Hungarian forint"
+#: lib/currency.vala:49
 msgid "Hungarian Forint"
 msgstr "Forint maghiar"
 
-#: ../src/currency-manager.c:41
-#| msgid "Indonesian rupiah"
+#: lib/currency.vala:50
 msgid "Indonesian Rupiah"
 msgstr "Rupie indoneziană"
 
-#: ../src/currency-manager.c:42
-#| msgid "Israeli new shekel"
+#: lib/currency.vala:51
 msgid "Israeli New Shekel"
 msgstr "Shekel nou israelian"
 
-#: ../src/currency-manager.c:43
-#| msgid "Indian rupee"
+#: lib/currency.vala:52
 msgid "Indian Rupee"
 msgstr "Rupie indiană"
 
-#: ../src/currency-manager.c:44
-#| msgid "Iranian rial"
+#: lib/currency.vala:53
 msgid "Iranian Rial"
 msgstr "Rial iranian"
 
-#: ../src/currency-manager.c:45
-#| msgid "Icelandic krona"
+#: lib/currency.vala:54
 msgid "Icelandic Krona"
 msgstr "Coroană islandeză"
 
-#: ../src/currency-manager.c:46
-#| msgid "Japanese yen"
+#: lib/currency.vala:55
 msgid "Japanese Yen"
 msgstr "Yen japonez"
 
-#: ../src/currency-manager.c:47
-#| msgid "South Korean won"
+#: lib/currency.vala:56
 msgid "South Korean Won"
 msgstr "Won sud-coreean"
 
-#: ../src/currency-manager.c:48
-#| msgid "Kuwaiti dinar"
+#: lib/currency.vala:57
 msgid "Kuwaiti Dinar"
 msgstr "Dinar kuweitian"
 
-#: ../src/currency-manager.c:49
-#| msgid "Kazakhstani tenge"
+#: lib/currency.vala:58
 msgid "Kazakhstani Tenge"
 msgstr "Tenge kazahă"
 
-#: ../src/currency-manager.c:50
-#| msgid "Sri Lankan rupee"
+#: lib/currency.vala:59
 msgid "Sri Lankan Rupee"
 msgstr "Rupie Sri Lanka"
 
-#: ../src/currency-manager.c:51
-#| msgid "Lithuanian litas"
-msgid "Lithuanian Litas"
-msgstr "Litas lituanian"
-
-#: ../src/currency-manager.c:52
-#| msgid "Latvian lats"
-msgid "Latvian Lats"
-msgstr "Lat leton"
-
-#: ../src/currency-manager.c:53
-#| msgid "Libyan dinar"
+#: lib/currency.vala:60
 msgid "Libyan Dinar"
 msgstr "Dinar libian"
 
-#: ../src/currency-manager.c:54
-#| msgid "Mauritian rupee"
+#: lib/currency.vala:61
 msgid "Mauritian Rupee"
 msgstr "Rupie mauritiană"
 
-#: ../src/currency-manager.c:55
-#| msgid "Mexican peso"
+#: lib/currency.vala:62
 msgid "Mexican Peso"
 msgstr "Peso mexican"
 
-#: ../src/currency-manager.c:56
-#| msgid "Malaysian ringgit"
+#: lib/currency.vala:63
 msgid "Malaysian Ringgit"
 msgstr "Ringgit malaiezian"
 
-#: ../src/currency-manager.c:57
-#| msgid "Norwegian krone"
+#: lib/currency.vala:64
 msgid "Norwegian Krone"
 msgstr "Coroană norvegiană"
 
-#: ../src/currency-manager.c:58
-#| msgid "Nepalese rupee"
+#: lib/currency.vala:65
 msgid "Nepalese Rupee"
 msgstr "Rupie nepaleză"
 
-#: ../src/currency-manager.c:59
-#| msgid "New Zealand dollar"
+#: lib/currency.vala:66
 msgid "New Zealand Dollar"
 msgstr "Dolar neozeelandez"
 
-#: ../src/currency-manager.c:60
-#| msgid "Omani rial"
+#: lib/currency.vala:67
 msgid "Omani Rial"
 msgstr "Rial Oman"
 
-#: ../src/currency-manager.c:61
-#| msgid "Peruvian nuevo sol"
+#: lib/currency.vala:68
 msgid "Peruvian Nuevo Sol"
 msgstr "Nuevo sol peruvian"
 
-#: ../src/currency-manager.c:62
-#| msgid "Philippine peso"
+#: lib/currency.vala:69
 msgid "Philippine Peso"
 msgstr "Peso filipinez"
 
-#: ../src/currency-manager.c:63
-#| msgid "Pakistani rupee"
+#: lib/currency.vala:70
 msgid "Pakistani Rupee"
 msgstr "Rupie pakistaneză"
 
-#: ../src/currency-manager.c:64
-#| msgid "Polish zloty"
+#: lib/currency.vala:71
 msgid "Polish Zloty"
 msgstr "Zolt polonez"
 
-#: ../src/currency-manager.c:65
-#| msgid "Qatari riyal"
+#: lib/currency.vala:72
 msgid "Qatari Riyal"
 msgstr "Rial qatarez"
 
-#: ../src/currency-manager.c:66
-#| msgid "New Romanian leu"
+#: lib/currency.vala:73
 msgid "New Romanian Leu"
 msgstr "Leu nou românesc"
 
-#: ../src/currency-manager.c:67
-#| msgid "Russian rouble"
+#: lib/currency.vala:74
 msgid "Russian Rouble"
 msgstr "Rublă rusească"
 
-#: ../src/currency-manager.c:68
-#| msgid "Saudi riyal"
+#: lib/currency.vala:75
 msgid "Saudi Riyal"
 msgstr "Rial saudit"
 
-#: ../src/currency-manager.c:69
-#| msgid "Swedish krona"
+#: lib/currency.vala:76
 msgid "Swedish Krona"
 msgstr "Coroană suedeză"
 
-#: ../src/currency-manager.c:70
-#| msgid "Singapore dollar"
+#: lib/currency.vala:77
 msgid "Singapore Dollar"
 msgstr "Dolar singaporez"
 
-#: ../src/currency-manager.c:71
-#| msgid "Thai baht"
+#: lib/currency.vala:78
 msgid "Thai Baht"
 msgstr "Baht tailandez"
 
-#: ../src/currency-manager.c:72
-#| msgid "Tunisian dinar"
+#: lib/currency.vala:79
 msgid "Tunisian Dinar"
 msgstr "Dinar tunisian"
 
-#: ../src/currency-manager.c:73
-#| msgid "New Turkish lira"
-msgid "New Turkish Lira"
-msgstr "Liră turcească nouă"
+#: lib/currency.vala:80
+msgid "Turkish Lira"
+msgstr "Liră turcească"
 
-#: ../src/currency-manager.c:74
+#: lib/currency.vala:81
 msgid "T&T Dollar (TTD)"
 msgstr "Dolar T&T (TTD)"
 
-#: ../src/currency-manager.c:75
-#| msgid "US dollar"
+#: lib/currency.vala:82
 msgid "US Dollar"
 msgstr "Dolar american"
 
-#: ../src/currency-manager.c:76
-#| msgid "Uruguayan peso"
+#: lib/currency.vala:83
 msgid "Uruguayan Peso"
 msgstr "Peso uruguayan"
 
-#: ../src/currency-manager.c:77
-#| msgid "Venezuelan bolívar"
+#: lib/currency.vala:84
 msgid "Venezuelan Bolívar"
 msgstr "Bolivar venezuelan"
 
-#: ../src/currency-manager.c:78
-#| msgid "South African rand"
+#: lib/currency.vala:85
 msgid "South African Rand"
 msgstr "Rand sud african"
 
-#. Description on how to use gcalctool displayed on command-line
-#: ../src/gcalctool.c:85
-#, c-format
-msgid ""
-"Usage:\n"
-"  %s — Perform mathematical calculations"
-msgstr ""
-"Utilizare:\n"
-"  %s – Execută calcule matematice"
+#: lib/equation-parser.vala:717 lib/number.vala:429
+msgid "The zeroth root of a number is undefined"
+msgstr "Rădăcina zero a unui număr nu este definită"
 
-#. Description on gcalctool command-line help options displayed on command-line
-#: ../src/gcalctool.c:93
-#, c-format
-msgid ""
-"Help Options:\n"
-"  -v, --version                   Show release version\n"
-"  -h, -?, --help                  Show help options\n"
-"  --help-all                      Show all help options\n"
-"  --help-gtk                      Show GTK+ options"
-msgstr ""
-"Opțiuni de ajutor\n"
-"  -v, --version                   Arată versiunea ediției\n"
-"  -h, -?, --help                  Arată opțiuni de ajutor\n"
-"  --help-all                      Arată toate opțiunile de ajutor\n"
-"  --help-gtk                      Arată opțiunile de ajutor GTK+"
+#: lib/financial.vala:114
+msgid "Error: the number of periods must be positive"
+msgstr "Eroare: numărul de perioade trebuie să fie pozitiv"
 
-#. Description on gcalctool command-line GTK+ options displayed on command-line
-#: ../src/gcalctool.c:104
-#, c-format
-msgid ""
-"GTK+ Options:\n"
-"  --class=CLASS                   Program class as used by the window "
-"manager\n"
-"  --name=NAME                     Program name as used by the window "
-"manager\n"
-"  --screen=SCREEN                 X screen to use\n"
-"  --sync                          Make X calls synchronous\n"
-"  --gtk-module=MODULES            Load additional GTK+ modules\n"
-"  --g-fatal-warnings              Make all warnings fatal"
-msgstr ""
-"Opțiuni GTK+:\n"
-"  --class=CLASS                   Clasa de program folosită de "
-"administratorul de ferestre\n"
-"  --name=NAME                     Nume program folosit de administratorul de "
-"ferestre\n"
-"  --screen=SCREEN                 Ecranul X folosit\n"
-"  --sync                          Efectuează apeluri X sincrone\n"
-"  --gtk-module=MODULES            Încarcă module GTK+ adiționale\n"
-"  --g-fatal-warnings              Consideră toate avertismentele fatale"
-
-#. Description on gcalctool application options displayed on command-line
-#: ../src/gcalctool.c:118
-#, c-format
-#| msgid ""
-#| "Application Options:\n"
-#| "  -u, --unittest                  Perform unit tests\n"
-#| "  -s, --solve <equation>          Solve the given equation"
-msgid ""
-"Application Options:\n"
-"  -s, --solve <equation>          Solve the given equation"
-msgstr ""
-"Opțiuni aplicație:\n"
-"  -s, --solve <ecuație>           Rezolvă ecuația dată"
+#. Digits localized for the given language
+#: lib/math-equation.vala:171
+msgid "0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F"
+msgstr "0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F"
 
-#. Error printed to stderr when user uses --solve argument without an equation
-#: ../src/gcalctool.c:162
-#, c-format
-msgid "Argument --solve requires an equation to solve"
-msgstr "Argumentul --solve necesită o ecuație de rezolvat"
+#. Error shown when trying to undo with no undo history
+#: lib/math-equation.vala:523
+msgid "No undo history"
+msgstr "Nu există istoric pentru anulări"
 
-#. Error printed to stderr when user provides an unknown command-line argument
-#: ../src/gcalctool.c:172
-#, c-format
-msgid "Unknown argument '%s'"
-msgstr "Argument necunoscut „%s”"
+#. Error shown when trying to redo with no redo history
+#: lib/math-equation.vala:544
+msgid "No redo history"
+msgstr "Nu există istoric pentru refaceri"
 
-#. Tooltip for the Pi button
-#: ../src/math-buttons.c:103
-msgid "Pi [Ctrl+P]"
-msgstr "Pi [Ctrl+P]"
+#: lib/math-equation.vala:775
+msgid "No sane value to store"
+msgstr "Nu există o valoare validă de stocat"
 
-#. Tooltip for the Euler's Number button
-#: ../src/math-buttons.c:106
-msgid "Euler’s Number"
-msgstr "Numărul lui Euler"
+#. Error displayed to user when they perform a bitwise operation on numbers greater than the current word
+#: lib/math-equation.vala:968
+msgid "Overflow. Try a bigger word size"
+msgstr "Depășire. Încercați cu o lungime mai mare a cuvântului"
 
-#. Tooltip for the subscript button
-#: ../src/math-buttons.c:111
-msgid "Subscript mode [Alt]"
-msgstr "Mod indice [Alt]"
+#. Error displayed to user when they an unknown variable is entered
+#: lib/math-equation.vala:973
+#, c-format
+msgid "Unknown variable “%s”"
+msgstr "Variabilă necunoscută „%s”"
 
-#. Tooltip for the superscript button
-#: ../src/math-buttons.c:114
-msgid "Superscript mode [Ctrl]"
-msgstr "Mod exponent [Ctrl]"
+#. Error displayed to user when an unknown function is entered
+#: lib/math-equation.vala:980
+#, c-format
+msgid "Function “%s” is not defined"
+msgstr "Funcția „%s” nu este definită"
 
-#. Tooltip for the scientific exponent button
-#: ../src/math-buttons.c:117
-msgid "Scientific exponent [Ctrl+E]"
-msgstr "Exponent științific [Ctrl+E]"
+#. Error displayed to user when an conversion with unknown units is attempted
+#: lib/math-equation.vala:987
+msgid "Unknown conversion"
+msgstr "Conversie necunoscută"
 
-#. Tooltip for the add button
-#: ../src/math-buttons.c:120
-msgid "Add [+]"
-msgstr "Adunare [+]"
+#. should always be run
+#: lib/math-equation.vala:997
+#, c-format
+msgid "%s"
+msgstr "%s"
 
-#. Tooltip for the subtract button
-#: ../src/math-buttons.c:123
-msgid "Subtract [-]"
-msgstr "Scădere [-]"
+#. Unknown error.
+#. Error displayed to user when they enter an invalid calculation
+#: lib/math-equation.vala:1002 lib/math-equation.vala:1007
+msgid "Malformed expression"
+msgstr "Expresie eronată"
 
-#. Tooltip for the multiply button
-#: ../src/math-buttons.c:126
-msgid "Multiply [*]"
-msgstr "Înmulțire [*]"
+#: lib/math-equation.vala:1018
+msgid "Calculating"
+msgstr "Se calculează"
 
-#. Tooltip for the divide button
-#: ../src/math-buttons.c:129
-msgid "Divide [/]"
-msgstr "Împărțire [/]"
+#. Error displayed when trying to factorize a non-integer value
+#: lib/math-equation.vala:1211
+msgid "Need an integer to factorize"
+msgstr "Este nevoie de un întreg pentru factorizare"
 
-#. Tooltip for the modulus divide button
-#: ../src/math-buttons.c:132
-msgid "Modulus divide"
-msgstr "Împărțire modulo"
+#. This message is displayed in the status bar when a bit shift operation is performed and the display does not contain a number
+#: lib/math-equation.vala:1265
+msgid "No sane value to bitwise shift"
+msgstr "Nu este valoare bună pentru deplasare binară"
 
-#. Tooltip for the additional functions button
-#: ../src/math-buttons.c:135
-msgid "Additional Functions"
-msgstr "Funcții suplimentare"
+#. Message displayed when cannot toggle bit in display
+#: lib/math-equation.vala:1279
+msgid "Displayed value not an integer"
+msgstr "Valoarea afișată nu este un întreg"
 
-#. Tooltip for the exponent button
-#: ../src/math-buttons.c:138
-msgid "Exponent [^ or **]"
-msgstr "Exponent [^ sau **]"
+#. Translators: Error displayed when underflow error occured
+#: lib/number.vala:196
+msgid "Underflow error"
+msgstr "Eroare de subapreciere"
 
-#. Tooltip for the square button
-#: ../src/math-buttons.c:141
-msgid "Square [Ctrl+2]"
-msgstr "Pătrat [Ctrl+2]"
+#. Translators: Error displayed when overflow error occured
+#: lib/number.vala:201
+msgid "Overflow error"
+msgstr "Eroare de depășire"
 
-#. Tooltip for the percentage button
-#: ../src/math-buttons.c:144
-msgid "Percentage [%]"
-msgstr "Procentaj [%]"
+#. Translators: Error display when attempting to take argument of zero
+#: lib/number.vala:251
+msgid "Argument not defined for zero"
+msgstr "Argumentul nu este definit pentru zero"
 
-#. Tooltip for the factorial button
-#: ../src/math-buttons.c:147
-msgid "Factorial [!]"
-msgstr "Factorial [!]"
+#. Translators: Error displayed when attempted to raise 0 to a negative re_exponent
+#: lib/number.vala:367 lib/number.vala:397
+msgid "The power of zero is undefined for a negative exponent"
+msgstr "Puterea lui zero nu este definită pentru exponenți negativi"
 
-#. Tooltip for the absolute value button
-#: ../src/math-buttons.c:150
-msgid "Absolute value [|]"
-msgstr "Valoare absolută [|]"
+#. Translators: Error displayed when attempted to raise 0 to power of zero
+#: lib/number.vala:375 lib/number.vala:405
+msgid "Zero raised to zero is undefined"
+msgstr "Zero ridicat la puterea zero nu este definit"
 
-#. Tooltip for the complex argument component button
-#: ../src/math-buttons.c:153
-msgid "Complex argument"
-msgstr "Argumentul complexului"
+#. Translators: Error displayed when attempting to take logarithm of zero
+#: lib/number.vala:459 lib/number.vala:490
+msgid "Logarithm of zero is undefined"
+msgstr "Logaritmul lui zero nu este definit"
 
-#. Tooltip for the complex conjugate button
-#: ../src/math-buttons.c:156
-msgid "Complex conjugate"
-msgstr "Conjugatul complexului"
+#. Translators: Error displayed when attempted take the factorial of a negative or complex number
+#: lib/number.vala:512
+msgid "Factorial is only defined for non-negative real numbers"
+msgstr "Factorialul este definit doar pentru numere reale pozitive"
 
-#. Tooltip for the root button
-#: ../src/math-buttons.c:159
-msgid "Root [Ctrl+R]"
-msgstr "Rădăcină [Ctrl+R]"
+#. Translators: Error displayed attempted to divide by zero
+#: lib/number.vala:572
+msgid "Division by zero is undefined"
+msgstr "Împărțirea la zero nu este definită"
 
-#. Tooltip for the square root button
-#: ../src/math-buttons.c:162
-msgid "Square root [Ctrl+R]"
-msgstr "Rădăcină pătrată [Ctrl+R]"
+#. Translators: Error displayed when attemping to do a modulus division on non-integer numbers
+#: lib/number.vala:593
+msgid "Modulus division is only defined for integers"
+msgstr "Împărțirea modulo este definită doar pentru întregi"
 
-#. Tooltip for the logarithm button
-#: ../src/math-buttons.c:165
-msgid "Logarithm"
-msgstr "Logaritm"
+#. Translators: Error displayed when tangent value is undefined
+#: lib/number.vala:666
+msgid ""
+"Tangent is undefined for angles that are multiples of π (180°) from π∕2 (90°)"
+msgstr ""
+"Tangenta nu este definită pentru unghiuri care sunt cu multipli de π (180°) "
+"de la π∕2 (90°)"
 
-#. Tooltip for the natural logarithm button
-#: ../src/math-buttons.c:168
-msgid "Natural Logarithm"
-msgstr "Logaritm natural"
+#. Translators: Error displayed when inverse sine value is undefined
+#: lib/number.vala:685
+msgid "Inverse sine is undefined for values outside [-1, 1]"
+msgstr ""
+"Inversa sinusului nu este definită pentru valori în afara intervalului [-1, "
+"1]"
 
-#. Tooltip for the sine button
-#: ../src/math-buttons.c:171
-msgid "Sine"
-msgstr "Sinus"
+#. Translators: Error displayed when inverse cosine value is undefined
+#: lib/number.vala:702
+msgid "Inverse cosine is undefined for values outside [-1, 1]"
+msgstr ""
+"Inversa cosinusului nu este definită pentru valori în afara intervalului "
+"[-1, 1]"
 
-#. Tooltip for the cosine button
-#: ../src/math-buttons.c:174
-msgid "Cosine"
-msgstr "Cosinus"
+#. Translators: Error displayed when inverse hyperbolic cosine value is undefined
+#: lib/number.vala:763
+msgid "Inverse hyperbolic cosine is undefined for values less than one"
+msgstr ""
+"Inversa cosinusului hiperbolic nu este definită pentru valori mai mici decât "
+"unu"
 
-#. Tooltip for the tangent button
-#: ../src/math-buttons.c:177
-msgid "Tangent"
-msgstr "Tangentă"
-
-#. Tooltip for the hyperbolic sine button
-#: ../src/math-buttons.c:180
-msgid "Hyperbolic Sine"
-msgstr "Sinus hiperbolic"
-
-#. Tooltip for the hyperbolic cosine button
-#: ../src/math-buttons.c:183
-msgid "Hyperbolic Cosine"
-msgstr "Cosinus hiperbolic"
+#. Translators: Error displayed when inverse hyperbolic tangent value is undefined
+#: lib/number.vala:779
+msgid "Inverse hyperbolic tangent is undefined for values outside [-1, 1]"
+msgstr ""
+"Inversa tangentei hiperbolice nu este definită pentru valori în afara "
+"intervalului [-1, 1]"
 
-#. Tooltip for the hyperbolic tangent button
-#: ../src/math-buttons.c:186
-msgid "Hyperbolic Tangent"
-msgstr "Tangentă hiperbolică"
+#. Translators: Error displayed when boolean AND attempted on non-integer values
+#: lib/number.vala:795
+msgid "Boolean AND is only defined for positive integers"
+msgstr "ȘI logic este definit doar pentru numere naturale pozitive"
 
-#. Tooltip for the inverse button
-#: ../src/math-buttons.c:189
-msgid "Inverse [Ctrl+I]"
-msgstr "Inversa [Ctrl+I]"
+#. Translators: Error displayed when boolean OR attempted on non-integer values
+#: lib/number.vala:807
+msgid "Boolean OR is only defined for positive integers"
+msgstr "SAU logic este definit doar pentru numere naturale pozitive"
 
-#. Tooltip for the boolean AND button
-#: ../src/math-buttons.c:192
-msgid "Boolean AND"
-msgstr "ȘI logic"
+#. Translators: Error displayed when boolean XOR attempted on non-integer values
+#: lib/number.vala:819
+msgid "Boolean XOR is only defined for positive integers"
+msgstr "SAU exclusiv logic este definit doar pentru numere naturale pozitive"
 
-#. Tooltip for the boolean OR button
-#: ../src/math-buttons.c:195
-msgid "Boolean OR"
-msgstr "SAU logic"
+#. Translators: Error displayed when boolean XOR attempted on non-integer values
+#: lib/number.vala:831
+msgid "Boolean NOT is only defined for positive integers"
+msgstr "NU logic este definit doar pentru numere naturale pozitive"
 
-#. Tooltip for the exclusive OR button
-#: ../src/math-buttons.c:198
-msgid "Boolean Exclusive OR"
-msgstr "SAU exclusiv logic"
+#. Translators: Error displayed when bit shift attempted on non-integer values
+#: lib/number.vala:854
+msgid "Shift is only possible on integer values"
+msgstr "Deplasarea este posibilă doar pentru valori întregi"
 
-#. Tooltip for the boolean NOT button
-#: ../src/math-buttons.c:201
-msgid "Boolean NOT"
-msgstr "NU logic"
+#: lib/serializer.vala:342
+msgid "Overflow: the result couldn’t be calculated"
+msgstr "Depășire: nu s-a putut calcula rezultatul"
 
-#. Tooltip for the integer component button
-#: ../src/math-buttons.c:204 ../src/math-buttons.c:1036
-msgid "Integer Component"
-msgstr "Partea întreagă"
+#: lib/unit.vala:29
+msgid "Angle"
+msgstr "Unghi"
 
-#. Tooltip for the fractional component button
-#: ../src/math-buttons.c:207 ../src/math-buttons.c:1038
-msgid "Fractional Component"
-msgstr "Partea fracționară"
+#: lib/unit.vala:30
+msgid "Length"
+msgstr "Lungime"
 
-#. Tooltip for the real component button
-#: ../src/math-buttons.c:210
-msgid "Real Component"
-msgstr "Componenta reală"
+#: lib/unit.vala:31
+msgid "Area"
+msgstr "Arie"
 
-#. Tooltip for the imaginary component button
-#: ../src/math-buttons.c:213
-msgid "Imaginary Component"
-msgstr "Componenta imaginară"
+#: lib/unit.vala:32
+msgid "Volume"
+msgstr "Volum"
 
-#. Tooltip for the ones' complement button
-#: ../src/math-buttons.c:216
-#| msgid "Ones Complement"
-msgid "Ones' Complement"
-msgstr "Complement față de 1"
+#: lib/unit.vala:33
+msgid "Mass"
+msgstr "Masă"
 
-#. Tooltip for the two's complement button
-#: ../src/math-buttons.c:219
-#| msgid "Twos Complement"
-msgid "Two's Complement"
-msgstr "Complement față de 2"
+#: lib/unit.vala:34
+msgid "Duration"
+msgstr "Durată"
 
-#. Tooltip for the truncate button
-#: ../src/math-buttons.c:222
-msgid "Truncate"
-msgstr "Trunchiază"
+#: lib/unit.vala:35
+msgid "Temperature"
+msgstr "Temperatură"
 
-#. Tooltip for the start group button
-#: ../src/math-buttons.c:225
-msgid "Start Group [(]"
-msgstr "Începutul grupului [(]"
+#: lib/unit.vala:36
+msgid "Digital Storage"
+msgstr "Stocare digitală"
 
-#. Tooltip for the end group button
-#: ../src/math-buttons.c:228
-msgid "End Group [)]"
-msgstr "Sfârșitul grupului [)]"
+#. FIXME: Approximations of 1/(units in a circle), therefore, 360 deg != 400 grads
+#. Preferences dialog: Angle unit combo box: Use degrees for trigonometric calculations
+#: lib/unit.vala:39 src/math-preferences.vala:144
+msgid "Degrees"
+msgstr "Grade"
 
-#. Tooltip for the solve button
-#: ../src/math-buttons.c:237
-msgid "Calculate Result"
-msgstr "Calculează rezultatul"
+#: lib/unit.vala:39
+#, c-format
+msgctxt "unit-format"
+msgid "%s degrees"
+msgstr "%s grade"
 
-#. Tooltip for the factor button
-#: ../src/math-buttons.c:240
-msgid "Factorize [Ctrl+F]"
-msgstr "Factorizează [Ctrl+F]"
+#: lib/unit.vala:39
+msgctxt "unit-symbols"
+msgid "degree,degrees,deg"
+msgstr "grad,grade,grd"
 
-#. Tooltip for the clear button
-#: ../src/math-buttons.c:243
-msgid "Clear Display [Escape]"
-msgstr "Șterge afișajul [Escape]"
+#. Preferences dialog: Angle unit combo box: Use radians for trigonometric calculations
+#: lib/unit.vala:40 src/math-preferences.vala:148
+msgid "Radians"
+msgstr "Radiani"
 
-#. Tooltip for the undo button
-#: ../src/math-buttons.c:246
-msgid "Undo [Ctrl+Z]"
-msgstr "Anulează [Ctrl+Z]"
+#: lib/unit.vala:40
+#, c-format
+msgctxt "unit-format"
+msgid "%s radians"
+msgstr "%s radiani"
 
-#. Tooltip for the double declining depreciation button
-#: ../src/math-buttons.c:258
-msgid "Double Declining Depreciation"
-msgstr "Amortizare dublă în declin"
+#: lib/unit.vala:40
+msgctxt "unit-symbols"
+msgid "radian,radians,rad"
+msgstr "radian,radiani,rad"
 
-#. Tooltip for the financial term button
-#: ../src/math-buttons.c:264
-msgid "Financial Term"
-msgstr "Termen financiar"
+#. Preferences dialog: Angle unit combo box: Use gradians for trigonometric calculations
+#: lib/unit.vala:41 src/math-preferences.vala:152
+msgid "Gradians"
+msgstr "Gradiani"
 
-#. Tooltip for the sum of the years digits depreciation button
-#: ../src/math-buttons.c:267
-msgid "Sum of the Years Digits Depreciation"
-msgstr "Amortizare prin metoda sumei cifrelor anilor („SOFTY”)"
+#: lib/unit.vala:41
+#, c-format
+msgctxt "unit-format"
+msgid "%s gradians"
+msgstr "%s gradiani"
 
-#. Tooltip for the straight line depreciation button
-#: ../src/math-buttons.c:270
-msgid "Straight Line Depreciation"
-msgstr "Amortizare în linie dreaptă"
+#: lib/unit.vala:41
+msgctxt "unit-symbols"
+msgid "gradian,gradians,grad"
+msgstr "gradian,gradiani,gradian"
 
-#. Number display mode combo: Binary, e.g. 10011010010₂
-#: ../src/math-buttons.c:660
-msgid "Binary"
-msgstr "Binar"
+#: lib/unit.vala:42
+msgid "Parsecs"
+msgstr "Parseci"
 
-#. Number display mode combo: Octal, e.g. 2322₈
-#: ../src/math-buttons.c:664
-msgid "Octal"
-msgstr "Octal"
+#: lib/unit.vala:42
+#, c-format
+msgctxt "unit-format"
+msgid "%s pc"
+msgstr "%s pc"
 
-#. Number display mode combo: Decimal, e.g. 1234
-#: ../src/math-buttons.c:668
-msgid "Decimal"
-msgstr "Zecimal"
+#: lib/unit.vala:42
+msgctxt "unit-symbols"
+msgid "parsec,parsecs,pc"
+msgstr "parsec,parseci,pc"
 
-#. Number display mode combo: Hexadecimal, e.g. 4D2₁₆
-#: ../src/math-buttons.c:672
-msgid "Hexadecimal"
-msgstr "Hexazecimal"
+#: lib/unit.vala:43
+msgid "Light Years"
+msgstr "Ani lumină"
 
-#. Left Shift Popup: Menu item to shift left by n places (n < 10)
-#. Right Shift Popup: Menu item to shift right by n places (n < 10)
-#: ../src/math-buttons.c:946 ../src/math-buttons.c:990
+#: lib/unit.vala:43
 #, c-format
-msgid "_%d place"
-msgid_plural "_%d places"
-msgstr[0] "_%d poziție"
-msgstr[1] "_%d poziții"
-msgstr[2] "_%d de poziții"
+msgctxt "unit-format"
+msgid "%s ly"
+msgstr "%s al"
 
-#. Left Shift Popup: Menu item to shift left by n places (n >= 10)
-#. Right Shift Popup: Menu item to shift right by n places (n >= 10)
-#: ../src/math-buttons.c:950 ../src/math-buttons.c:994
-#, c-format
-msgid "%d place"
-msgid_plural "%d places"
-msgstr[0] "o poziție"
-msgstr[1] "%d poziții"
-msgstr[2] "%d de poziții"
+#: lib/unit.vala:43
+msgctxt "unit-symbols"
+msgid "lightyear,lightyears,ly"
+msgstr "an lumină,ani lumină,al"
 
-#. Tooltip for the round button
-#: ../src/math-buttons.c:1040
-msgid "Round"
-msgstr "Rotunjire"
+#: lib/unit.vala:44
+msgid "Astronomical Units"
+msgstr "Unități astronomice"
 
-#. Tooltip for the floor button
-#: ../src/math-buttons.c:1042
-msgid "Floor"
-msgstr "Parte întreagă inferioară"
+#: lib/unit.vala:44
+#, c-format
+msgctxt "unit-format"
+msgid "%s au"
+msgstr "%s ua"
 
-#. Tooltip for the ceiling button
-#: ../src/math-buttons.c:1044
-msgid "Ceiling"
-msgstr "Parte întreagă superioară"
+#: lib/unit.vala:44
+msgctxt "unit-symbols"
+msgid "au"
+msgstr "au,ua"
 
-#. Tooltip for the ceiling button
-#: ../src/math-buttons.c:1046
-msgid "Sign"
-msgstr "Semn"
+#: lib/unit.vala:45
+msgid "Nautical Miles"
+msgstr "Mile marine"
 
-#. Label that is displayed between the two conversion combo boxes, e.g. "[degrees] in [radians]"
-#: ../src/math-converter.c:359
-msgid " in "
-msgstr " în "
+#: lib/unit.vala:45
+#, c-format
+msgctxt "unit-format"
+msgid "%s nmi"
+msgstr "%s nmi"
 
-#. Error shown when trying to undo with no undo history
-#: ../src/math-equation.c:461
-msgid "No undo history"
-msgstr "Nu există istoric pentru anulări"
+#: lib/unit.vala:45
+msgctxt "unit-symbols"
+msgid "nmi"
+msgstr "nmi"
 
-#. Error shown when trying to redo with no redo history
-#: ../src/math-equation.c:486
-msgid "No redo history"
-msgstr "Nu există istoric pentru refaceri"
+#: lib/unit.vala:46
+msgid "Miles"
+msgstr "Mile"
 
-#: ../src/math-equation.c:875
-msgid "No sane value to store"
-msgstr "Nu există o valoare validă de stocat"
+#: lib/unit.vala:46
+#, c-format
+msgctxt "unit-format"
+msgid "%s mi"
+msgstr "%s mi"
 
-#. Error displayed to user when they perform a bitwise operation on numbers greater than the current word
-#: ../src/math-equation.c:1140
-msgid "Overflow. Try a bigger word size"
-msgstr "Depășire. Încercați cu o lungime mai mare a cuvântului"
+#: lib/unit.vala:46
+msgctxt "unit-symbols"
+msgid "mile,miles,mi"
+msgstr "milă,mile,mi"
 
-#. Error displayed to user when they an unknown variable is entered
-#: ../src/math-equation.c:1145
-#, c-format
-msgid "Unknown variable '%s'"
-msgstr "Variabilă necunoscută „%s”"
+#: lib/unit.vala:47
+msgid "Kilometers"
+msgstr "Kilometeri"
 
-#. Error displayed to user when an unknown function is entered
-#: ../src/math-equation.c:1150
+#: lib/unit.vala:47
 #, c-format
-msgid "Function '%s' is not defined"
-msgstr "Funcția „%s” nu este definită"
+msgctxt "unit-format"
+msgid "%s km"
+msgstr "%s km"
 
-#. Error displayed to user when an conversion with unknown units is attempted
-#: ../src/math-equation.c:1155
-msgid "Unknown conversion"
-msgstr "Conversie necunoscută"
+#: lib/unit.vala:47
+msgctxt "unit-symbols"
+msgid "kilometer,kilometers,km,kms"
+msgstr "kilometru,kilometri,km"
 
-#. Error displayed to user when they enter an invalid calculation
-#: ../src/math-equation.c:1164
-msgid "Malformed expression"
-msgstr "Expresie eronată"
+#: lib/unit.vala:48
+msgid "Cables"
+msgstr "Cabluri"
 
-#. Error displayed when trying to factorize a non-integer value
-#: ../src/math-equation.c:1296
-msgid "Need an integer to factorize"
-msgstr "Este nevoie de un întreg pentru factorizare"
+#: lib/unit.vala:48
+#, c-format
+msgctxt "unit-format"
+msgid "%s cb"
+msgstr "%s cb"
 
-#. This message is displayed in the status bar when a bit
-#. shift operation is performed and the display does not contain a number
-#: ../src/math-equation.c:1363
-msgid "No sane value to bitwise shift"
-msgstr "Nu este valoare bună pentru deplasare binară"
+#: lib/unit.vala:48
+msgctxt "unit-symbols"
+msgid "cable,cables,cb"
+msgstr "cablu,cabluri,cb"
 
-#. Message displayed when cannot toggle bit in display
-#: ../src/math-equation.c:1392
-msgid "Displayed value not an integer"
-msgstr "Valoarea afișată nu este un întreg"
+#: lib/unit.vala:49
+msgid "Fathoms"
+msgstr "Stânjeni"
 
-#. Digits localized for the given language
-#: ../src/math-equation.c:1815
-msgid "0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F"
-msgstr "0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F"
+#: lib/unit.vala:49
+#, c-format
+msgctxt "unit-format"
+msgid "%s ftm"
+msgstr "%s stej"
 
-#. Label on close button in preferences dialog
-#: ../src/math-preferences.c:244
-msgid "_Close"
-msgstr "În_chide"
+#: lib/unit.vala:49
+msgctxt "unit-symbols"
+msgid "fathom,fathoms,ftm"
+msgstr "stânjen,stânjeni,stej"
 
-#. Preferences dialog: Angle unit combo box: Use degrees for trigonometric calculations
-#. FIXME: Approximations of 1/(units in a circle), therefore, 360 deg != 400 grads
-#: ../src/math-preferences.c:254 ../src/unit-manager.c:43
-msgid "Degrees"
-msgstr "Grade"
+#: lib/unit.vala:50
+msgid "Meters"
+msgstr "Metri"
 
-#. Preferences dialog: Angle unit combo box: Use radians for trigonometric calculations
-#: ../src/math-preferences.c:258 ../src/unit-manager.c:44
-msgid "Radians"
-msgstr "Radiani"
+#: lib/unit.vala:50
+#, c-format
+msgctxt "unit-format"
+msgid "%s m"
+msgstr "%s m"
 
-#. Preferences dialog: Angle unit combo box: Use gradians for trigonometric calculations
-#: ../src/math-preferences.c:262 ../src/unit-manager.c:45
-msgid "Gradians"
-msgstr "Gradiani"
+#: lib/unit.vala:50
+msgctxt "unit-symbols"
+msgid "meter,meters,m"
+msgstr "metru,metri,m"
 
-#. Number display mode combo: Automatic, e.g. 1234 (or scientific for large number 1.234×10^99)
-#: ../src/math-preferences.c:272
-msgid "Automatic"
-msgstr "Automat"
+#: lib/unit.vala:51
+msgid "Yards"
+msgstr "Yarzi"
 
-#. Number display mode combo: Fixed, e.g. 1234
-#: ../src/math-preferences.c:276
-msgid "Fixed"
-msgstr "Fix"
+#: lib/unit.vala:51
+#, c-format
+msgctxt "unit-format"
+msgid "%s yd"
+msgstr "%s yd"
 
-#. Number display mode combo: Scientific, e.g. 1.234×10^3
-#: ../src/math-preferences.c:280
-msgid "Scientific"
-msgstr "Științific"
+#: lib/unit.vala:51
+msgctxt "unit-symbols"
+msgid "yard,yards,yd"
+msgstr "yard,yarzi,yd"
 
-#. Number display mode combo: Engineering, e.g. 1.234k
-#: ../src/math-preferences.c:284
-msgid "Engineering"
-msgstr "Ingineresc"
+#: lib/unit.vala:52
+msgid "Feet"
+msgstr "Picioare"
 
-#. Label used in preferences dialog.  The %d is replaced by a spinbutton
-#: ../src/math-preferences.c:295
+#: lib/unit.vala:52
 #, c-format
-msgid "Show %d decimal _places"
-msgstr "Arată %d cifre du_pă virgulă"
+msgctxt "unit-format"
+msgid "%s ft"
+msgstr "%s ft"
 
-#. Translators: Error message displayed when unable to launch help browser
-#: ../src/math-window.c:171
-msgid "Unable to open help file"
-msgstr "Nu s-a putut deschide fișierul de ajutor"
+#: lib/unit.vala:52
+msgctxt "unit-symbols"
+msgid "foot,feet,ft"
+msgstr "picior,picioare,ft"
 
-#. The translator credits. Please translate this with your name(s).
-#: ../src/math-window.c:203
-msgid "translator-credits"
-msgstr ""
-"Mișu Moldovan <dumol@gnome.ro>\n"
-"Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
-"Daniel Șerbănescu <cyber19rider@gmail.com>\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Adi Roiban https://launchpad.net/~adiroiban\n"
-"  Adrian Harabulă https://launchpad.net/~opensoft\n"
-"  Ionuț Jula https://launchpad.net/~ionutjula\n"
-"  Lucian Adrian Grijincu https://launchpad.net/~lucian.grijincu\n"
-"  Mircea MITU https://launchpad.net/~mache\n"
-"  Mișu Moldovan https://launchpad.net/~dumol-gnome"
+#: lib/unit.vala:53
+msgid "Inches"
+msgstr "Țoli"
 
-#. The license this software is under (GPL2+)
-#: ../src/math-window.c:206
-msgid ""
-"Gcalctool is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
-"\n"
-"Gcalctool is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with Gcalctool; if not, write to the Free Software Foundation, Inc.,\n"
-"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
-msgstr ""
-"Gcalctool este software liber; îl puteți redistribui și/sau modifica în "
-"conformitate cu termenii Licenței Publice Generale GNU așa cum este "
-"publicată de Free Software Foundation; fie versiunea 2 a Licenței, fie (la "
-"latitudinea dumneavoastră) orice versiune ulterioară.\n"
-"\n"
-"Gcalctool este distribuit cu speranța că va fi util, dar FĂRĂ NICI O "
-"GARANȚIE, fără garanție implicită de vandabilitate și conformitate unui "
-"anumit scop. Citiți Licența Publică Generală GNU pentru detalii.\n"
-"\n"
-"Ar trebui să fi primit o copie a Licenței Publice Generale GNU împreună cu "
-"acest program; dacă nu, scrieți la Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA"
+#: lib/unit.vala:53
+#, c-format
+msgctxt "unit-format"
+msgid "%s in"
+msgstr "%s in"
 
-#. Program name in the about dialog
-#: ../src/math-window.c:223
-msgid "Gcalctool"
-msgstr "Gcalctool"
+#: lib/unit.vala:53
+msgctxt "unit-symbols"
+msgid "inch,inches,in"
+msgstr "țol,țoli,in"
 
-#. Copyright notice in the about dialog
-#: ../src/math-window.c:227
-msgid "© 1986–2010 The Gcalctool authors"
-msgstr "© 1986–2010 autorii Gcalctool"
+#: lib/unit.vala:54
+msgid "Centimeters"
+msgstr "Centimetri"
 
-#. Short description in the about dialog
-#: ../src/math-window.c:231
-msgid "Calculator with financial and scientific modes."
-msgstr "Calculator cu mod financiar și științific."
+#: lib/unit.vala:54
+#, c-format
+msgctxt "unit-format"
+msgid "%s cm"
+msgstr "%s cm"
 
-#. Calculator menu
-#: ../src/math-window.c:357
-msgid "_Calculator"
-msgstr "_Calculator"
-
-#. Mode menu
-#: ../src/math-window.c:359
-msgid "_Mode"
-msgstr "_Mod"
-
-#. Help menu label
-#: ../src/math-window.c:361
-msgid "_Help"
-msgstr "_Ajutor"
-
-#. Basic menu label
-#: ../src/math-window.c:363
-msgid "_Basic"
-msgstr "_Standard"
-
-#. Advanced menu label
-#: ../src/math-window.c:365
-msgid "_Advanced"
-msgstr "_Avansat"
-
-#. Financial menu label
-#: ../src/math-window.c:367
-msgid "_Financial"
-msgstr "_Financiar"
-
-#. Programming menu label
-#: ../src/math-window.c:369
-msgid "_Programming"
-msgstr "_Programare"
-
-#. Help>Contents menu label
-#: ../src/math-window.c:371
-msgid "_Contents"
-msgstr "_Conținut"
+#: lib/unit.vala:54
+msgctxt "unit-symbols"
+msgid "centimeter,centimeters,cm,cms"
+msgstr "centimetru,centimetri,cm"
 
-#. Translators: Error displayed when boolean AND attempted on non-integer values
-#: ../src/mp-binary.c:122
-msgid "Boolean AND is only defined for positive integers"
-msgstr "ȘI logic este definit doar pentru numere naturale pozitive"
+#: lib/unit.vala:55
+msgid "Millimeters"
+msgstr "Milimetri"
 
-#. Translators: Error displayed when boolean OR attempted on non-integer values
-#: ../src/mp-binary.c:135
-msgid "Boolean OR is only defined for positive integers"
-msgstr "SAU logic este definit doar pentru numere naturale pozitive"
+#: lib/unit.vala:55
+#, c-format
+msgctxt "unit-format"
+msgid "%s mm"
+msgstr "%s mm"
 
-#. Translators: Error displayed when boolean XOR attempted on non-integer values
-#: ../src/mp-binary.c:148
-msgid "Boolean XOR is only defined for positive integers"
-msgstr "SAU exclusiv logic este definit doar pentru numere naturale pozitive"
+#: lib/unit.vala:55
+msgctxt "unit-symbols"
+msgid "millimeter,millimeters,mm"
+msgstr "milimetru,milimetri,mm"
 
-#. Translators: Error displayed when boolean XOR attempted on non-integer values
-#: ../src/mp-binary.c:163
-msgid "Boolean NOT is only defined for positive integers"
-msgstr "NU logic este definit doar pentru numere naturale pozitive"
+#: lib/unit.vala:56
+msgid "Micrometers"
+msgstr "Micrometri"
 
-#. Translators: Error displayed when bit shift attempted on non-integer values
-#: ../src/mp-binary.c:194
-msgid "Shift is only possible on integer values"
-msgstr "Deplasarea este posibilă doar pentru valori întregi"
+#: lib/unit.vala:56
+#, c-format
+msgctxt "unit-format"
+msgid "%s μm"
+msgstr "%s μm"
 
-#. Translators: Error display when attempting to take argument of zero
-#: ../src/mp.c:156
-msgid "Argument not defined for zero"
-msgstr "Argumentul nu este definit pentru zero"
+#: lib/unit.vala:56
+msgctxt "unit-symbols"
+msgid "micrometer,micrometers,um"
+msgstr "micrometru,micrometri,um"
 
-#: ../src/mp.c:307
-msgid "Overflow: the result couldn't be calculated"
-msgstr "Depășire: rezultatul nu a putut fi calculat"
+#: lib/unit.vala:57
+msgid "Nanometers"
+msgstr "Nanometri"
 
-#. Translators: Error displayed attempted to divide by zero
-#: ../src/mp.c:652 ../src/mp.c:684 ../src/mp.c:1618
-msgid "Division by zero is undefined"
-msgstr "Împărțirea la zero nu este definită"
+#: lib/unit.vala:57
+#, c-format
+msgctxt "unit-format"
+msgid "%s nm"
+msgstr "%s nm"
 
-#. Translators: Error displayed when attempting to take logarithm of zero
-#: ../src/mp.c:1289 ../src/mp.c:1326
-msgid "Logarithm of zero is undefined"
-msgstr "Logaritmul lui zero nu este definit"
+#: lib/unit.vala:57
+msgctxt "unit-symbols"
+msgid "nanometer,nanometers,nm"
+msgstr "nanometru,nanometri,nm"
 
-#. Translators: Error displayed when attempted to raise 0 to a negative exponent
-#: ../src/mp.c:1691 ../src/mp.c:2006
-msgid "The power of zero is undefined for a negative exponent"
-msgstr "Puterea lui zero nu este definită pentru exponenți negativi"
+#: lib/unit.vala:58
+msgid "Desktop Publishing Point"
+msgstr "Punct de publicare desktop"
+
+#: lib/unit.vala:58 lib/unit.vala:68
+#, c-format
+msgctxt "unit-format"
+msgid "%s pt"
+msgstr "%s pt"
+
+#: lib/unit.vala:58
+msgctxt "unit-symbols"
+msgid "point,pt,points,pts"
+msgstr "punct,pt,puncte,pts"
+
+#: lib/unit.vala:59
+msgid "Hectares"
+msgstr "Hectare"
+
+#: lib/unit.vala:59
+#, c-format
+msgctxt "unit-format"
+msgid "%s ha"
+msgstr "%s ha"
+
+#: lib/unit.vala:59
+msgctxt "unit-symbols"
+msgid "hectare,hectares,ha"
+msgstr "hectar,hectare,ha"
+
+#: lib/unit.vala:60
+msgid "Acres"
+msgstr "Acri"
 
-#: ../src/mp.c:1716
-msgid "Reciprocal of zero is undefined"
-msgstr "Reciprocul lui zero nu este definit"
+#: lib/unit.vala:60
+#, c-format
+msgctxt "unit-format"
+msgid "%s acres"
+msgstr "%s acri"
+
+#: lib/unit.vala:60
+msgctxt "unit-symbols"
+msgid "acre,acres"
+msgstr "acru,acri,ac"
+
+#: lib/unit.vala:61
+msgid "Square Meters"
+msgstr "Metri pătrați"
+
+#: lib/unit.vala:61
+#, c-format
+msgctxt "unit-format"
+msgid "%s m²"
+msgstr "%s m²"
+
+#: lib/unit.vala:61
+msgctxt "unit-symbols"
+msgid "m²"
+msgstr "m²"
+
+#: lib/unit.vala:62
+msgid "Square Centimeters"
+msgstr "Centimetri pătrați"
+
+#: lib/unit.vala:62
+#, c-format
+msgctxt "unit-format"
+msgid "%s cm²"
+msgstr "%s cm²"
+
+#: lib/unit.vala:62
+msgctxt "unit-symbols"
+msgid "cm²"
+msgstr "cm²"
+
+#: lib/unit.vala:63
+msgid "Square Millimeters"
+msgstr "Milimetri pătrați"
+
+#: lib/unit.vala:63
+#, c-format
+msgctxt "unit-format"
+msgid "%s mm²"
+msgstr "%s mm²"
 
-#: ../src/mp.c:1801
-msgid "Root must be non-zero"
-msgstr "Rădăcina trebuie să fie nenulă"
+#: lib/unit.vala:63
+msgctxt "unit-symbols"
+msgid "mm²"
+msgstr "mm²"
+
+#: lib/unit.vala:64
+msgid "Cubic Meters"
+msgstr "Metri cubi"
+
+#: lib/unit.vala:64
+#, c-format
+msgctxt "unit-format"
+msgid "%s m³"
+msgstr "%s m³"
+
+#: lib/unit.vala:64
+msgctxt "unit-symbols"
+msgid "m³"
+msgstr "m³"
+
+#: lib/unit.vala:65
+msgid "Gallons"
+msgstr "Galoane"
 
-#: ../src/mp.c:1819
-msgid "Negative root of zero is undefined"
-msgstr "Rădăcina negativă a lui zero este nedefinită"
+#: lib/unit.vala:65
+#, c-format
+msgctxt "unit-format"
+msgid "%s gal"
+msgstr "%s gal"
+
+#: lib/unit.vala:65
+msgctxt "unit-symbols"
+msgid "gallon,gallons,gal"
+msgstr "galon,galoane,gal"
 
-#: ../src/mp.c:1825
-msgid "nth root of negative number is undefined for even n"
-msgstr "a n-a rădăcină a unui număr negativ nu este definită pentru n par"
+#: lib/unit.vala:66
+msgid "Liters"
+msgstr "Litri"
+
+#: lib/unit.vala:66
+#, c-format
+msgctxt "unit-format"
+msgid "%s L"
+msgstr "%s l"
+
+#: lib/unit.vala:66
+msgctxt "unit-symbols"
+msgid "litre,litres,liter,liters,L"
+msgstr "litru,litri,l"
+
+#: lib/unit.vala:67
+msgid "Quarts"
+msgstr "Quart (sferturi de galon)"
+
+#: lib/unit.vala:67
+#, c-format
+msgctxt "unit-format"
+msgid "%s qt"
+msgstr "%s qt"
+
+#: lib/unit.vala:67
+msgctxt "unit-symbols"
+msgid "quart,quarts,qt"
+msgstr "quart,quarți,qt"
+
+#: lib/unit.vala:68
+msgid "Pints"
+msgstr "Pinte"
+
+#: lib/unit.vala:68
+msgctxt "unit-symbols"
+msgid "pint,pints,pt"
+msgstr "pintă,pinte,pt"
+
+#: lib/unit.vala:69
+msgid "Milliliters"
+msgstr "Mililitri"
+
+#: lib/unit.vala:69
+#, c-format
+msgctxt "unit-format"
+msgid "%s mL"
+msgstr "%s ml"
+
+#: lib/unit.vala:69
+msgctxt "unit-symbols"
+msgid "millilitre,millilitres,milliliter,milliliters,mL,cm³"
+msgstr "mililitru, mililitri,ml,cm³"
+
+#: lib/unit.vala:70
+msgid "Microliters"
+msgstr "Microlitri"
+
+#: lib/unit.vala:70
+#, c-format
+msgctxt "unit-format"
+msgid "%s μL"
+msgstr "%s μL"
+
+#: lib/unit.vala:70
+msgctxt "unit-symbols"
+msgid "mm³,μL,uL"
+msgstr "mm³,μL,uL"
+
+#: lib/unit.vala:71
+msgid "Tonnes"
+msgstr "Tone"
+
+#: lib/unit.vala:71
+#, c-format
+msgctxt "unit-format"
+msgid "%s T"
+msgstr "%s T"
+
+#: lib/unit.vala:71
+msgctxt "unit-symbols"
+msgid "tonne,tonnes"
+msgstr "tonă,tone"
+
+#: lib/unit.vala:72
+msgid "Kilograms"
+msgstr "Kilograme"
+
+#: lib/unit.vala:72
+#, c-format
+msgctxt "unit-format"
+msgid "%s kg"
+msgstr "%s kg"
+
+#: lib/unit.vala:72
+msgctxt "unit-symbols"
+msgid "kilogram,kilograms,kilogramme,kilogrammes,kg,kgs"
+msgstr "kilogram,kilograme,kg"
 
-#. Translators: Error displayed when attempted take the factorial of a fractional number
-#: ../src/mp.c:1946
-msgid "Factorial is only defined for natural numbers"
-msgstr "Factorialul este definit doar pentru numere naturale"
+#: lib/unit.vala:73
+msgid "Pounds"
+msgstr "Livre"
 
-#. Translators: Error displayed when attemping to do a modulus division on non-integer numbers
-#: ../src/mp.c:1966
-msgid "Modulus division is only defined for integers"
-msgstr "Împărțirea modulo este definită doar pentru întregi"
+#: lib/unit.vala:73
+#, c-format
+msgctxt "unit-format"
+msgid "%s lb"
+msgstr "%s lb"
 
-#. Translators: Error displayed when tangent value is undefined
-#: ../src/mp-trigonometric.c:318
-msgid ""
-"Tangent is undefined for angles that are multiples of π (180°) from π∕2 (90°)"
-msgstr ""
-"Tangenta nu este definită pentru unghiuri care sunt cu multipli de π (180°) "
-"de la π∕2 (90°)"
+#: lib/unit.vala:73
+msgctxt "unit-symbols"
+msgid "pound,pounds,lb"
+msgstr "livra,livre,lb"
 
-#. Translators: Error displayed when inverse sine value is undefined
-#: ../src/mp-trigonometric.c:363
-msgid "Inverse sine is undefined for values outside [-1, 1]"
-msgstr ""
-"Inversa sinusului nu este definită pentru valori în afara intervalului [-1, "
-"1]"
+#: lib/unit.vala:74
+msgid "Ounces"
+msgstr "Uncii"
 
-#. Translators: Error displayed when inverse cosine value is undefined
-#: ../src/mp-trigonometric.c:380
-msgid "Inverse cosine is undefined for values outside [-1, 1]"
-msgstr ""
-"Inversa cosinusului nu este definită pentru valori în afara intervalului "
-"[-1, 1]"
+#: lib/unit.vala:74
+#, c-format
+msgctxt "unit-format"
+msgid "%s oz"
+msgstr "%s oz"
 
-#. Translators: Error displayed when inverse hyperbolic cosine value is undefined
-#: ../src/mp-trigonometric.c:599
-msgid "Inverse hyperbolic cosine is undefined for values less than one"
-msgstr ""
-"Inversa cosinusului hiperbolic nu este definită pentru valori mai mici decât "
-"unu"
+#: lib/unit.vala:74
+msgctxt "unit-symbols"
+msgid "ounce,ounces,oz"
+msgstr "uncie,uncii,oz"
 
-#. Translators: Error displayed when inverse hyperbolic tangent value is undefined
-#: ../src/mp-trigonometric.c:623
-msgid "Inverse hyperbolic tangent is undefined for values outside [-1, 1]"
-msgstr ""
-"Inversa tangentei hiperbolice nu este definită pentru valori în afara "
-"intervalului [-1, 1]"
+#: lib/unit.vala:75
+msgid "Grams"
+msgstr "Grame"
 
-#: ../src/unit-manager.c:43
+#: lib/unit.vala:75
 #, c-format
-#| msgid "Degrees"
 msgctxt "unit-format"
-msgid "%s degrees"
-msgstr "%s grade"
+msgid "%s g"
+msgstr "%s g"
 
-#: ../src/unit-manager.c:43
+#: lib/unit.vala:75
 msgctxt "unit-symbols"
-msgid "degree,degrees,deg"
-msgstr "grad,grade,grd"
+msgid "gram,grams,gramme,grammes,g"
+msgstr "gram,grame,g"
+
+#: lib/unit.vala:76
+msgid "Stone"
+msgstr "Stone"
 
-#: ../src/unit-manager.c:44
+#: lib/unit.vala:76
 #, c-format
-#| msgid "Gradians"
 msgctxt "unit-format"
-msgid "%s radians"
-msgstr "%s radiani"
+msgid "%s st"
+msgstr "%s st"
 
-#: ../src/unit-manager.c:44
+#: lib/unit.vala:76
 msgctxt "unit-symbols"
-msgid "radian,radians,rad"
-msgstr "radian,radiani,rad"
+msgid "stone,st,stones"
+msgstr "stone,st,stones"
+
+#: lib/unit.vala:77
+msgid "Years"
+msgstr "Ani"
 
-#: ../src/unit-manager.c:45
+#: lib/unit.vala:77
 #, c-format
-#| msgid "Gradians"
 msgctxt "unit-format"
-msgid "%s gradians"
-msgstr "%s gradiani"
+msgid "%s years"
+msgstr "%s ani"
 
-#: ../src/unit-manager.c:45
+#: lib/unit.vala:77
 msgctxt "unit-symbols"
-msgid "gradian,gradians,grad"
-msgstr "gradian,gradiani,gradian"
+msgid "year,years"
+msgstr "an,ani"
 
-#: ../src/unit-manager.c:46
-#| msgid "Paste"
-msgid "Parsecs"
-msgstr "Parseci"
+#: lib/unit.vala:78
+msgid "Days"
+msgstr "Zile"
 
-#: ../src/unit-manager.c:46
+#: lib/unit.vala:78
 #, c-format
-#| msgid "%d place"
-#| msgid_plural "%d places"
 msgctxt "unit-format"
-msgid "%s pc"
-msgstr "%s pc"
+msgid "%s days"
+msgstr "%s zile"
 
-#: ../src/unit-manager.c:46
+#: lib/unit.vala:78
 msgctxt "unit-symbols"
-msgid "parsec,parsecs,pc"
-msgstr "parsec,parseci,pc"
+msgid "day,days"
+msgstr "zi,zile"
 
-#: ../src/unit-manager.c:47
-msgid "Light Years"
-msgstr "Ani lumină"
+#: lib/unit.vala:79
+msgid "Hours"
+msgstr "Ore"
 
-#: ../src/unit-manager.c:47
+#: lib/unit.vala:79
 #, c-format
 msgctxt "unit-format"
-msgid "%s ly"
-msgstr "%s al"
+msgid "%s hours"
+msgstr "%s ore"
 
-#: ../src/unit-manager.c:47
+#: lib/unit.vala:79
 msgctxt "unit-symbols"
-msgid "lightyear,lightyears,ly"
-msgstr "an lumină,ani lumină,al"
+msgid "hour,hours"
+msgstr "oră,ore"
 
-#: ../src/unit-manager.c:48
-msgid "Astronomical Units"
-msgstr "Unități astronomice"
+#: lib/unit.vala:80
+msgid "Minutes"
+msgstr "Minute"
 
-#: ../src/unit-manager.c:48
+#: lib/unit.vala:80
 #, c-format
 msgctxt "unit-format"
-msgid "%s au"
-msgstr "%s ua"
+msgid "%s minutes"
+msgstr "%s minute"
 
-#: ../src/unit-manager.c:48
+#: lib/unit.vala:80
 msgctxt "unit-symbols"
-msgid "au"
-msgstr "au,ua"
+msgid "minute,minutes"
+msgstr "minut,minute"
 
-#: ../src/unit-manager.c:49
-msgid "Nautical Miles"
-msgstr "Mile marine"
+#: lib/unit.vala:81
+msgid "Seconds"
+msgstr "Secunde"
 
-#: ../src/unit-manager.c:49 ../src/unit-manager.c:61
+#: lib/unit.vala:81
 #, c-format
 msgctxt "unit-format"
-msgid "%s nm"
-msgstr "%s nm"
+msgid "%s s"
+msgstr "%s s"
 
-#: ../src/unit-manager.c:49
+#: lib/unit.vala:81
 msgctxt "unit-symbols"
-msgid "nm"
-msgstr "nm"
+msgid "second,seconds,s"
+msgstr "secundă,secunde,s"
 
-#: ../src/unit-manager.c:50
-msgid "Miles"
-msgstr "Mile"
+#: lib/unit.vala:82
+msgid "Milliseconds"
+msgstr "Milisecunde"
 
-#: ../src/unit-manager.c:50
+#: lib/unit.vala:82
 #, c-format
 msgctxt "unit-format"
-msgid "%s mi"
-msgstr "%s mi"
+msgid "%s ms"
+msgstr "%s ms"
 
-#: ../src/unit-manager.c:50
+#: lib/unit.vala:82
 msgctxt "unit-symbols"
-msgid "mile,miles,mi"
-msgstr "milă,mile,mi"
+msgid "millisecond,milliseconds,ms"
+msgstr "milisecundă,milisecunde,ms"
 
-#: ../src/unit-manager.c:51
-msgid "Kilometers"
-msgstr "Kilometeri"
+#: lib/unit.vala:83
+msgid "Microseconds"
+msgstr "Microsecunde"
 
-#: ../src/unit-manager.c:51
+#: lib/unit.vala:83
 #, c-format
 msgctxt "unit-format"
-msgid "%s km"
-msgstr "%s km"
+msgid "%s μs"
+msgstr "%s μs"
 
-#: ../src/unit-manager.c:51
+#: lib/unit.vala:83
 msgctxt "unit-symbols"
-msgid "kilometer,kilometers,km,kms"
-msgstr "kilometru,kilometri,km"
+msgid "microsecond,microseconds,us,μs"
+msgstr "microsecundă,microsecunde,us,μs"
 
-#: ../src/unit-manager.c:52
-msgid "Cables"
-msgstr "Cabluri"
+#: lib/unit.vala:84
+msgid "Celsius"
+msgstr "Celsius"
 
-#: ../src/unit-manager.c:52
+#: lib/unit.vala:84
 #, c-format
 msgctxt "unit-format"
-msgid "%s cb"
-msgstr "%s cb"
+msgid "%s ˚C"
+msgstr "%s ˚C"
 
-#: ../src/unit-manager.c:52
+#: lib/unit.vala:84
 msgctxt "unit-symbols"
-msgid "cable,cables,cb"
-msgstr "cablu,cabluri,cb"
+msgid "degC,˚C,C,c,Celsius,celsius"
+msgstr "degC,˚C,C,c,Celsius,celsius"
 
-#: ../src/unit-manager.c:53
-msgid "Fathoms"
-msgstr "Stânjeni"
+#: lib/unit.vala:85
+msgid "Fahrenheit"
+msgstr "Fahrenheit"
 
-#: ../src/unit-manager.c:53
+#: lib/unit.vala:85
 #, c-format
 msgctxt "unit-format"
-msgid "%s ftm"
-msgstr "%s stej"
+msgid "%s ˚F"
+msgstr "%s ˚F"
 
-#: ../src/unit-manager.c:53
+#: lib/unit.vala:85
 msgctxt "unit-symbols"
-msgid "fathom,fathoms,ftm"
-msgstr "stânjen,stânjeni,stej"
+msgid "degF,˚F,F,f,Fahrenheit,fahrenheit"
+msgstr "degF,˚F,F,f,Fahrenheit,fahrenheit"
 
-#: ../src/unit-manager.c:54
-msgid "Meters"
-msgstr "Metri"
+#: lib/unit.vala:86
+msgid "Kelvin"
+msgstr "Kelvin"
 
-#: ../src/unit-manager.c:54
+#: lib/unit.vala:86
 #, c-format
 msgctxt "unit-format"
-msgid "%s m"
-msgstr "%s m"
+msgid "%s K"
+msgstr "%s K"
 
-#: ../src/unit-manager.c:54
+#: lib/unit.vala:86
 msgctxt "unit-symbols"
-msgid "meter,meters,m"
-msgstr "metru,metri,m"
+msgid "k,K,Kelvin,kelvin"
+msgstr "k,K,Kelvin,kelvin"
 
-#: ../src/unit-manager.c:55
-msgid "Yards"
-msgstr "Yarzi"
+#: lib/unit.vala:87
+msgid "Rankine"
+msgstr "Rankine"
 
-#: ../src/unit-manager.c:55
+#: lib/unit.vala:87
 #, c-format
 msgctxt "unit-format"
-msgid "%s yd"
-msgstr "%s yd"
+msgid "%s ˚R"
+msgstr "%s ˚R"
 
-#: ../src/unit-manager.c:55
+#: lib/unit.vala:87
 msgctxt "unit-symbols"
-msgid "yard,yards,yd"
-msgstr "yard,yarzi,yd"
+msgid "degR,˚R,˚Ra,r,R,Rankine,rankine"
+msgstr "degR,˚R,˚Ra,r,R,Rankine,rankine"
 
-#: ../src/unit-manager.c:56
-msgid "Feet"
-msgstr "Picioare"
+#. We use IEC prefix for digital storage units. i.e. 1 kB = 1 KiloByte = 1000 bytes, and 1 KiB = 1 kibiByte = 1024 bytes
+#: lib/unit.vala:89
+msgid "Bits"
+msgstr "Biți"
 
-#: ../src/unit-manager.c:56
+#: lib/unit.vala:89
 #, c-format
 msgctxt "unit-format"
-msgid "%s ft"
-msgstr "%s ft"
+msgid "%s b"
+msgstr "%s b"
 
-#: ../src/unit-manager.c:56
+#: lib/unit.vala:89
 msgctxt "unit-symbols"
-msgid "foot,feet,ft"
-msgstr "picior,picioare,ft"
+msgid "bit,bits,b"
+msgstr "bit,biți,b"
 
-#: ../src/unit-manager.c:57
-#| msgid "Inverse"
-msgid "Inches"
-msgstr "Țoli"
+#: lib/unit.vala:90
+msgid "Bytes"
+msgstr "Octeți"
 
-#: ../src/unit-manager.c:57
+#: lib/unit.vala:90
 #, c-format
-#| msgid "sin"
 msgctxt "unit-format"
-msgid "%s in"
-msgstr "%s in"
+msgid "%s B"
+msgstr "%s B"
 
-#: ../src/unit-manager.c:57
+#: lib/unit.vala:90
 msgctxt "unit-symbols"
-msgid "inch,inches,in"
-msgstr "țol,țoli,in"
+msgid "byte,bytes,B"
+msgstr "octet,octeți,B"
 
-#: ../src/unit-manager.c:58
-#| msgid "_Contents"
-msgid "Centimeters"
-msgstr "Centimetri"
+#: lib/unit.vala:91
+msgid "Nibbles"
+msgstr "Nibbles"
 
-#: ../src/unit-manager.c:58
+#: lib/unit.vala:91
 #, c-format
 msgctxt "unit-format"
-msgid "%s cm"
-msgstr "%s cm"
+msgid "%s nibble"
+msgstr "%s nibble"
 
-#: ../src/unit-manager.c:58
+#: lib/unit.vala:91
 msgctxt "unit-symbols"
-msgid "centimeter,centimeters,cm,cms"
-msgstr "centimetru,centimetri,cm"
+msgid "nibble,nibbles"
+msgstr "nibble,nibbles"
 
-#: ../src/unit-manager.c:59
-msgid "Millimeters"
-msgstr "Milimetri"
+#. The SI symbol for kilo is k, however we also allow "KB" and "Kb", as they are widely used and accepted.
+#: lib/unit.vala:93
+msgid "Kilobits"
+msgstr "Kilobiți"
 
-#: ../src/unit-manager.c:59
+#: lib/unit.vala:93
 #, c-format
 msgctxt "unit-format"
-msgid "%s mm"
-msgstr "%s mm"
+msgid "%s kb"
+msgstr "%s kb"
 
-#: ../src/unit-manager.c:59
+#: lib/unit.vala:93
 msgctxt "unit-symbols"
-msgid "millimeter,millimeters,mm"
-msgstr "milimetru,milimetri,mm"
+msgid "kilobit,kilobits,kb,Kb"
+msgstr "kilobit,kilobiți,kb,Kb"
 
-#: ../src/unit-manager.c:60
-msgid "Micrometers"
-msgstr "Micrometri"
+#: lib/unit.vala:94
+msgid "Kilobytes"
+msgstr "Kiloocteți"
 
-#: ../src/unit-manager.c:60
+#: lib/unit.vala:94
 #, c-format
 msgctxt "unit-format"
-msgid "%s μm"
-msgstr "%s μm"
+msgid "%s kB"
+msgstr "%s kB"
 
-#: ../src/unit-manager.c:60
+#: lib/unit.vala:94
 msgctxt "unit-symbols"
-msgid "micrometer,micrometers,um"
-msgstr "micrometru,micrometri,um"
+msgid "kilobyte,kilobytes,kB,KB"
+msgstr "kilooctet,kiloocteți,kB,KB"
 
-#: ../src/unit-manager.c:61
-msgid "Nanometers"
-msgstr "Nanometri"
+#: lib/unit.vala:95
+msgid "Kibibits"
+msgstr "Kibibiți"
+
+#: lib/unit.vala:95
+#, c-format
+msgctxt "unit-format"
+msgid "%s Kib"
+msgstr "%s Kib"
 
-#: ../src/unit-manager.c:61
+#: lib/unit.vala:95
 msgctxt "unit-symbols"
-msgid "nanometer,nanometers"
-msgstr "nanometru,nanometri,nm"
+msgid "kibibit,kibibits,Kib"
+msgstr "kibibit,kibibiți,Kib"
 
-#: ../src/unit-manager.c:62
-msgid "Hectares"
-msgstr "Hectare"
+#: lib/unit.vala:96
+msgid "Kibibytes"
+msgstr "Kibiocteți"
 
-#: ../src/unit-manager.c:62
+#: lib/unit.vala:96
 #, c-format
 msgctxt "unit-format"
-msgid "%s ha"
-msgstr "%s ha"
+msgid "%s KiB"
+msgstr "%s KiB"
 
-#: ../src/unit-manager.c:62
+#: lib/unit.vala:96
 msgctxt "unit-symbols"
-msgid "hectare,hectares,ha"
-msgstr "hectar,hectare,ha"
+msgid "kibibyte,kibibytes,KiB"
+msgstr "kibioctet,kibiocteți,KiB"
 
-#: ../src/unit-manager.c:63
-msgid "Acres"
-msgstr "Acri"
+#: lib/unit.vala:97
+msgid "Megabits"
+msgstr "Megabiți"
 
-#: ../src/unit-manager.c:63
+#: lib/unit.vala:97
 #, c-format
-#| msgid "%d place"
-#| msgid_plural "%d places"
 msgctxt "unit-format"
-msgid "%s acres"
-msgstr "%s acri"
+msgid "%s Mb"
+msgstr "%s Mb"
 
-#: ../src/unit-manager.c:63
+#: lib/unit.vala:97
 msgctxt "unit-symbols"
-msgid "acre,acres"
-msgstr "acru,acri,ac"
+msgid "megabit,megabits,Mb"
+msgstr "megabit,megabiți,Mb"
 
-#: ../src/unit-manager.c:64
-#| msgid "Square root"
-msgid "Square Meter"
-msgstr "Metru pătrat"
+#: lib/unit.vala:98
+msgid "Megabytes"
+msgstr "Megaocteți"
 
-#: ../src/unit-manager.c:64
+#: lib/unit.vala:98
 #, c-format
 msgctxt "unit-format"
-msgid "%s m²"
-msgstr "%s m²"
+msgid "%s MB"
+msgstr "%s MB"
 
-#: ../src/unit-manager.c:64
+#: lib/unit.vala:98
 msgctxt "unit-symbols"
-msgid "m²"
-msgstr "m²"
+msgid "megabyte,megabytes,MB"
+msgstr "megaoctet,megaocteți,MB"
 
-#: ../src/unit-manager.c:65
-#| msgid "Square [Ctrl+2]"
-msgid "Square Centimeter"
-msgstr "Centimetru pătrat"
+#: lib/unit.vala:99
+msgid "Mebibits"
+msgstr "Mebibiți"
 
-#: ../src/unit-manager.c:65
+#: lib/unit.vala:99
 #, c-format
 msgctxt "unit-format"
-msgid "%s cm²"
-msgstr "%s cm²"
+msgid "%s Mib"
+msgstr "%s Mib"
 
-#: ../src/unit-manager.c:65
+#: lib/unit.vala:99
 msgctxt "unit-symbols"
-msgid "cm²"
-msgstr "cm²"
+msgid "mebibit,mebibits,Mib"
+msgstr "mebibit,mebibiți,Mib"
 
-#: ../src/unit-manager.c:66
-msgid "Square Millimeter"
-msgstr "Milimetru pătrat"
+#: lib/unit.vala:100
+msgid "Mebibytes"
+msgstr "Mebiocteți"
 
-#: ../src/unit-manager.c:66
+#: lib/unit.vala:100
 #, c-format
 msgctxt "unit-format"
-msgid "%s mm²"
-msgstr "%s mm²"
+msgid "%s MiB"
+msgstr "%s MiB"
 
-#: ../src/unit-manager.c:66
+#: lib/unit.vala:100
 msgctxt "unit-symbols"
-msgid "mm²"
-msgstr "mm²"
+msgid "mebibyte,mebibytes,MiB"
+msgstr "mebioctet,mebiocteți,MiB"
 
-#: ../src/unit-manager.c:67
-msgid "Cubic Meters"
-msgstr "Metri cubi"
+#: lib/unit.vala:101
+msgid "Gigabits"
+msgstr "Gigabiți"
 
-#: ../src/unit-manager.c:67
+#: lib/unit.vala:101
 #, c-format
 msgctxt "unit-format"
-msgid "%s m³"
-msgstr "%s m³"
+msgid "%s Gb"
+msgstr "%s Gb"
 
-#: ../src/unit-manager.c:67
+#: lib/unit.vala:101
 msgctxt "unit-symbols"
-msgid "m³"
-msgstr "m³"
+msgid "gigabit,gigabits,Gb"
+msgstr "gigabit,gigabiți,Gb"
 
-#: ../src/unit-manager.c:68
-msgid "Gallons"
-msgstr "Galoane"
+#: lib/unit.vala:102
+msgid "Gigabytes"
+msgstr "Gigaocteți"
 
-#: ../src/unit-manager.c:68
+#: lib/unit.vala:102
 #, c-format
 msgctxt "unit-format"
-msgid "%s gal"
-msgstr "%s gal"
+msgid "%s GB"
+msgstr "%s GB"
 
-#: ../src/unit-manager.c:68
+#: lib/unit.vala:102
 msgctxt "unit-symbols"
-msgid "gallon,gallons,gal"
-msgstr "galon,galoane,gal"
+msgid "gigabyte,gigabytes,GB"
+msgstr "gigaoctet,gigaocteți,GB"
 
-#: ../src/unit-manager.c:69
-msgid "Litres"
-msgstr "Litri"
+#: lib/unit.vala:103
+msgid "Gibibits"
+msgstr "Gibibiți"
 
-#: ../src/unit-manager.c:69
+#: lib/unit.vala:103
 #, c-format
 msgctxt "unit-format"
-msgid "%s L"
-msgstr "%s l"
+msgid "%s Gib"
+msgstr "%s Gib"
 
-#: ../src/unit-manager.c:69
+#: lib/unit.vala:103
 msgctxt "unit-symbols"
-msgid "litre,litres,liter,liters,L"
-msgstr "litru,litri,l"
+msgid "gibibit,gibibits,Gib"
+msgstr "gibibit,gibibiți,Gib"
 
-#: ../src/unit-manager.c:70
-msgid "Quarts"
-msgstr "Quart (sferturi de galon)"
+#: lib/unit.vala:104
+msgid "Gibibytes"
+msgstr "Gibiocteți"
 
-#: ../src/unit-manager.c:70
+#: lib/unit.vala:104
 #, c-format
 msgctxt "unit-format"
-msgid "%s qt"
-msgstr "%s qt"
+msgid "%s GiB"
+msgstr "%s GiB"
 
-#: ../src/unit-manager.c:70
+#: lib/unit.vala:104
 msgctxt "unit-symbols"
-msgid "quart,quarts,qt"
-msgstr "quart,quarți,qt"
+msgid "gibibyte,gibibytes,GiB"
+msgstr "gibioctet,gibiocteți,GiB"
 
-#: ../src/unit-manager.c:71
-msgid "Pints"
-msgstr "Pinte"
+#: lib/unit.vala:105
+msgid "Terabits"
+msgstr "Terabiți"
 
-#: ../src/unit-manager.c:71
+#: lib/unit.vala:105
 #, c-format
 msgctxt "unit-format"
-msgid "%s pt"
-msgstr "%s pt"
+msgid "%s Tb"
+msgstr "%s Tb"
 
-#: ../src/unit-manager.c:71
+#: lib/unit.vala:105
 msgctxt "unit-symbols"
-msgid "pint,pints,pt"
-msgstr "pintă,pinte,pt"
+msgid "terabit,terabits,Tb"
+msgstr "terabit,terabiți,Tb"
 
-#: ../src/unit-manager.c:72
-msgid "Millilitres"
-msgstr "Mililitri"
+#: lib/unit.vala:106
+msgid "Terabytes"
+msgstr "Teraocteți"
 
-#: ../src/unit-manager.c:72
+#: lib/unit.vala:106
 #, c-format
 msgctxt "unit-format"
-msgid "%s mL"
-msgstr "%s ml"
+msgid "%s TB"
+msgstr "%s TB"
 
-#: ../src/unit-manager.c:72
+#: lib/unit.vala:106
 msgctxt "unit-symbols"
-msgid "millilitre,millilitres,milliliter,milliliters,mL,cm³"
-msgstr "mililitru, mililitri,ml,cm³"
+msgid "terabyte,terabytes,TB"
+msgstr "teraoctet,teraocteți,TB"
 
-#: ../src/unit-manager.c:73
-msgid "Microlitre"
-msgstr "Microlitri"
+#: lib/unit.vala:107
+msgid "Tebibits"
+msgstr "Tebibiți"
 
-#: ../src/unit-manager.c:73
+#: lib/unit.vala:107
 #, c-format
 msgctxt "unit-format"
-msgid "%s μL"
-msgstr "%s μL"
+msgid "%s Tib"
+msgstr "%s Tib"
 
-#: ../src/unit-manager.c:73
+#: lib/unit.vala:107
 msgctxt "unit-symbols"
-msgid "mm³,μL,uL"
-msgstr "mm³,μL,uL"
+msgid "tebibit,tebibits,Tib"
+msgstr "tebibit,tebibiți,Tib"
 
-#: ../src/unit-manager.c:74
-msgid "Tonnes"
-msgstr "Tone"
+#: lib/unit.vala:108
+msgid "Tebibytes"
+msgstr "Tebiocteți"
 
-#: ../src/unit-manager.c:74
+#: lib/unit.vala:108
 #, c-format
 msgctxt "unit-format"
-msgid "%s T"
-msgstr "%s T"
+msgid "%s TiB"
+msgstr "%s TiB"
 
-#: ../src/unit-manager.c:74
+#: lib/unit.vala:108
 msgctxt "unit-symbols"
-msgid "tonne,tonnes"
-msgstr "tonă,tone"
+msgid "tebibyte,tebibytes,TiB"
+msgstr "tebioctet,tebiocteți,TiB"
 
-#: ../src/unit-manager.c:75
-msgid "Kilograms"
-msgstr "Kilograme"
+#: lib/unit.vala:109
+msgid "Petabits"
+msgstr "Petabiți"
 
-#: ../src/unit-manager.c:75
+#: lib/unit.vala:109
 #, c-format
 msgctxt "unit-format"
-msgid "%s kg"
-msgstr "%s kg"
+msgid "%s Pb"
+msgstr "%s Pb"
 
-#: ../src/unit-manager.c:75
+#: lib/unit.vala:109
 msgctxt "unit-symbols"
-msgid "kilogram,kilograms,kilogramme,kilogrammes,kg,kgs"
-msgstr "kilogram,kilograme,kg"
+msgid "petabit,petabits,Pb"
+msgstr "petabit,petabiți,Pb"
 
-#: ../src/unit-manager.c:76
-#| msgid "Round"
-msgid "Pounds"
-msgstr "Livre"
+#: lib/unit.vala:110
+msgid "Petabytes"
+msgstr "Petaocteți"
 
-#: ../src/unit-manager.c:76
+#: lib/unit.vala:110
 #, c-format
 msgctxt "unit-format"
-msgid "%s lb"
-msgstr "%s lb"
+msgid "%s PB"
+msgstr "%s PB"
 
-#: ../src/unit-manager.c:76
+#: lib/unit.vala:110
 msgctxt "unit-symbols"
-msgid "pound,pounds,lb"
-msgstr "livra,livre,lb"
+msgid "petabyte,petabytes,PB"
+msgstr "petaoctet,petaocteți,PB"
 
-#: ../src/unit-manager.c:77
-msgid "Ounces"
-msgstr "Uncii"
+#: lib/unit.vala:111
+msgid "Pebibits"
+msgstr "Pebibiți"
 
-#: ../src/unit-manager.c:77
+#: lib/unit.vala:111
 #, c-format
 msgctxt "unit-format"
-msgid "%s oz"
-msgstr "%s oz"
+msgid "%s Pib"
+msgstr "%s Pib"
 
-#: ../src/unit-manager.c:77
+#: lib/unit.vala:111
 msgctxt "unit-symbols"
-msgid "ounce,ounces,oz"
-msgstr "uncie,uncii,oz"
+msgid "pebibit,pebibits,Pib"
+msgstr "pebibit,pebibiți,Pib"
 
-#: ../src/unit-manager.c:78
-#| msgid "Gradians"
-msgid "Grams"
-msgstr "Grame"
+#: lib/unit.vala:112
+msgid "Pebibytes"
+msgstr "Pebiocteți"
 
-#: ../src/unit-manager.c:78
+#: lib/unit.vala:112
 #, c-format
 msgctxt "unit-format"
-msgid "%s g"
-msgstr "%s g"
+msgid "%s PiB"
+msgstr "%s PiB"
 
-#: ../src/unit-manager.c:78
+#: lib/unit.vala:112
 msgctxt "unit-symbols"
-msgid "gram,grams,gramme,grammes,g"
-msgstr "gram,grame,g"
+msgid "pebibyte,pebibytes,PiB"
+msgstr "pebioctet,pebiocteți,PiB"
 
-#: ../src/unit-manager.c:79
-#| msgid "Clear"
-msgid "Years"
-msgstr "Ani"
+#: lib/unit.vala:113
+msgid "Exabits"
+msgstr "Exabiți"
 
-#: ../src/unit-manager.c:79
+#: lib/unit.vala:113 lib/unit.vala:117
 #, c-format
 msgctxt "unit-format"
-msgid "%s years"
-msgstr "%s ani"
+msgid "%s Eb"
+msgstr "%s Eb"
 
-#: ../src/unit-manager.c:79
+#: lib/unit.vala:113
 msgctxt "unit-symbols"
-msgid "year,years"
-msgstr "an,ani"
+msgid "exabit,exabits,Eb"
+msgstr "exabit,exabiți,Eb"
 
-#: ../src/unit-manager.c:80
-msgid "Days"
-msgstr "Zile"
+#: lib/unit.vala:114
+msgid "Exabytes"
+msgstr "Exaocteți"
 
-#: ../src/unit-manager.c:80
+#: lib/unit.vala:114 lib/unit.vala:118
 #, c-format
 msgctxt "unit-format"
-msgid "%s days"
-msgstr "%s zile"
+msgid "%s EB"
+msgstr "%s EB"
 
-#: ../src/unit-manager.c:80
+#: lib/unit.vala:114
 msgctxt "unit-symbols"
-msgid "day,days"
-msgstr "zi,zile"
+msgid "exabyte,exabytes,EB"
+msgstr "exaoctet,exaocteți,EB"
 
-#: ../src/unit-manager.c:81
-msgid "Hours"
-msgstr "Ore"
+#: lib/unit.vala:115
+msgid "Exbibits"
+msgstr "Exbibiți"
 
-#: ../src/unit-manager.c:81
+#: lib/unit.vala:115
 #, c-format
 msgctxt "unit-format"
-msgid "%s hours"
-msgstr "%s ore"
+msgid "%s Eib"
+msgstr "%s Eib"
 
-#: ../src/unit-manager.c:81
+#: lib/unit.vala:115
 msgctxt "unit-symbols"
-msgid "hour,hours"
-msgstr "oră,ore"
+msgid "exbibit,exbibits,Eib"
+msgstr "exbibit,exbibiți,Eib"
 
-#: ../src/unit-manager.c:82
-msgid "Minutes"
-msgstr "Minute"
+#: lib/unit.vala:116
+msgid "Exbibytes"
+msgstr "Exbiocteți"
 
-#: ../src/unit-manager.c:82
+#: lib/unit.vala:116
 #, c-format
 msgctxt "unit-format"
-msgid "%s minutes"
-msgstr "%s minute"
+msgid "%s EiB"
+msgstr "%s EiB"
 
-#: ../src/unit-manager.c:82
+#: lib/unit.vala:116
 msgctxt "unit-symbols"
-msgid "minute,minutes"
-msgstr "minut,minute"
+msgid "exbibyte,exbibytes,EiB"
+msgstr "exbioctet,exbiocteți,EiB"
 
-#: ../src/unit-manager.c:83
-#| msgid "cos"
-msgid "Seconds"
-msgstr "Secunde"
+#: lib/unit.vala:117
+msgid "Zettabits"
+msgstr "Zettabiți"
 
-#: ../src/unit-manager.c:83
-#, c-format
-msgctxt "unit-format"
-msgid "%s s"
-msgstr "%s s"
+#: lib/unit.vala:117
+msgctxt "unit-symbols"
+msgid "zettabit,zettabits,Zb"
+msgstr "zettabit,zettabiți,Zb"
+
+#: lib/unit.vala:118
+msgid "Zettabytes"
+msgstr "Zettaocteți"
 
-#: ../src/unit-manager.c:83
+#: lib/unit.vala:118
 msgctxt "unit-symbols"
-msgid "second,seconds,s"
-msgstr "secundă,secunde,s"
+msgid "zettabyte,zettabytes,ZB"
+msgstr "zettaoctet,zettaocteți,ZB"
 
-#: ../src/unit-manager.c:84
-msgid "Milliseconds"
-msgstr "Milisecunde"
+#: lib/unit.vala:119
+msgid "Zebibits"
+msgstr "Zebibiți"
 
-#: ../src/unit-manager.c:84
+#: lib/unit.vala:119
 #, c-format
 msgctxt "unit-format"
-msgid "%s ms"
-msgstr "%s ms"
+msgid "%s Zib"
+msgstr "%s Zib"
 
-#: ../src/unit-manager.c:84
+#: lib/unit.vala:119
 msgctxt "unit-symbols"
-msgid "millisecond,milliseconds,ms"
-msgstr "milisecundă,milisecunde,ms"
+msgid "zebibit,zebibits,Zib"
+msgstr "zebibit,zebibiți,Zib"
 
-#: ../src/unit-manager.c:85
-msgid "Microseconds"
-msgstr "Microsecunde"
+#: lib/unit.vala:120
+msgid "Zebibytes"
+msgstr "Zebiocteți"
 
-#: ../src/unit-manager.c:85
+#: lib/unit.vala:120
 #, c-format
 msgctxt "unit-format"
-msgid "%s μs"
-msgstr "%s μs"
+msgid "%s ZiB"
+msgstr "%s ZiB"
 
-#: ../src/unit-manager.c:85
+#: lib/unit.vala:120
 msgctxt "unit-symbols"
-msgid "microsecond,microseconds,us"
-msgstr "microsecundă,microsecunde,us"
+msgid "zebibyte,zebibytes,ZiB"
+msgstr "zebioctet,zebiocteți,ZiB"
 
-#: ../src/unit-manager.c:86
-msgid "Celsius"
-msgstr "Celsius"
+#: lib/unit.vala:121
+msgid "Yottabits"
+msgstr "Yottabiți"
 
-#: ../src/unit-manager.c:86
+#: lib/unit.vala:121
 #, c-format
 msgctxt "unit-format"
-msgid "%s˚C"
-msgstr "%s˚C"
+msgid "%s Yb"
+msgstr "%s Yb"
 
-#: ../src/unit-manager.c:86
+#: lib/unit.vala:121
 msgctxt "unit-symbols"
-msgid "degC,˚C"
-msgstr "gradC,degC,˚C"
+msgid "yottabit,yottabits,Yb"
+msgstr "yottabit,yottabiți,Yb"
 
-#: ../src/unit-manager.c:87
-msgid "Farenheit"
-msgstr "Farenheit"
+#: lib/unit.vala:122
+msgid "Yottabytes"
+msgstr "Yottaocteți"
 
-#: ../src/unit-manager.c:87
+#: lib/unit.vala:122
 #, c-format
 msgctxt "unit-format"
-msgid "%s˚F"
-msgstr "%s˚F"
+msgid "%s YB"
+msgstr "%s YB"
 
-#: ../src/unit-manager.c:87
+#: lib/unit.vala:122
 msgctxt "unit-symbols"
-msgid "degF,˚F"
-msgstr "gradF,degF,˚F"
+msgid "yottabyte,yottabytes,YB"
+msgstr "yottaoctet,yottaocteți,YB"
 
-#: ../src/unit-manager.c:88
-#| msgid "Ceiling"
-msgid "Kelvin"
-msgstr "Kelvin"
+#: lib/unit.vala:123
+msgid "Yobibits"
+msgstr "Yobibiți"
 
-#: ../src/unit-manager.c:88
+#: lib/unit.vala:123
 #, c-format
 msgctxt "unit-format"
-msgid "%s˚K"
-msgstr "%s˚K"
+msgid "%s Yib"
+msgstr "%s Yib"
 
-#: ../src/unit-manager.c:88
+#: lib/unit.vala:123
 msgctxt "unit-symbols"
-msgid "degK,˚K"
-msgstr "gradK,degK,˚K"
+msgid "yobibit,yobibits,Yib"
+msgstr "yobibit,yobibiți,Yib"
 
-#: ../src/unit-manager.c:89
-msgid "Rankine"
-msgstr "Rankine"
+#: lib/unit.vala:124
+msgid "Yobibytes"
+msgstr "Yobiocteți"
 
-#: ../src/unit-manager.c:89
+#: lib/unit.vala:124
 #, c-format
 msgctxt "unit-format"
-msgid "%s˚R"
-msgstr "%s˚R"
+msgid "%s YiB"
+msgstr "%s YiB"
 
-#: ../src/unit-manager.c:89
+#: lib/unit.vala:124
 msgctxt "unit-symbols"
-msgid "degR,˚R"
-msgstr "gradR,degR,˚R"
+msgid "yobibyte,yobibytes,YiB"
+msgstr "yobioctet,yobiocteți,YiB"
 
-#: ../src/unit-manager.c:98
-#| msgid "Angle units"
-msgid "Angle"
-msgstr "Unghi"
+#: lib/unit.vala:126
+msgid "Currency"
+msgstr "Monedă"
 
-#: ../src/unit-manager.c:99
-msgid "Length"
-msgstr "Lungime"
+#. Translators: result of currency conversion, %s is the symbol, %%s is the placeholder for amount, i.e.: USD100
+#: lib/unit.vala:132
+#, c-format
+msgid "%s%%s"
+msgstr "%%s%s"
 
-#: ../src/unit-manager.c:100
-msgid "Area"
-msgstr "Arie"
+#: src/gnome-calculator.vala:24
+msgid "Start in given mode"
+msgstr "Începe în modul dat"
 
-#: ../src/unit-manager.c:101
-#| msgid "Value"
-msgid "Volume"
-msgstr "Volum"
+#: src/gnome-calculator.vala:25
+msgid "Solve given equation"
+msgstr "Rezolvă ecuația dată"
 
-#: ../src/unit-manager.c:102
-msgid "Weight"
-msgstr "Greutate"
+#: src/gnome-calculator.vala:26
+msgid "Start with given equation"
+msgstr "Începe cu ecuația dată"
 
-#: ../src/unit-manager.c:103
-msgid "Duration"
-msgstr "Durată"
+#: src/gnome-calculator.vala:27
+msgid "Show release version"
+msgstr "Afișează versiunea de lansare"
 
-#: ../src/unit-manager.c:104
-msgid "Temperature"
-msgstr "Temperatură"
+#. Translators: Error message displayed when unable to launch help browser
+#: src/gnome-calculator.vala:291
+msgid "Unable to open help file"
+msgstr "Nu s-a putut deschide fișierul de ajutor"
 
-#: ../src/unit-manager.c:116
-#| msgid "Source currency"
-msgid "Currency"
-msgstr "Monedă"
+#. The translator credits. Please translate this with your name (s).
+#: src/gnome-calculator.vala:322
+msgid "translator-credits"
+msgstr ""
+"Mișu Moldovan <dumol@gnome.ro>\n"
+"Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
+"Daniel Șerbănescu <cyber19rider@gmail.com>\n"
+"Florentina Mușat <florentina.musat.28 [at] gmail [dot] com>, 2018\n"
+"\n"
+"Launchpad Contributions:\n"
+"  Adi Roiban https://launchpad.net/~adiroiban\n"
+"  Adrian Harabulă https://launchpad.net/~opensoft\n"
+"  Ionuț Jula https://launchpad.net/~ionutjula\n"
+"  Lucian Adrian Grijincu https://launchpad.net/~lucian.grijincu\n"
+"  Mircea MITU https://launchpad.net/~mache\n"
+"  Mișu Moldovan https://launchpad.net/~dumol-gnome"
 
-#. Translators: result of currency conversion, %s is the symbol, %%s is the placeholder for amount, i.e.: USD100
-#: ../src/unit-manager.c:126
+#: src/gnome-calculator.vala:328
+msgid "About Calculator"
+msgstr "Despre calculator"
+
+#. Short description in the about dialog
+#: src/gnome-calculator.vala:336
+msgid "Calculator with financial and scientific modes."
+msgstr "Calculator cu mod financiar și științific."
+
+#: src/math-buttons.vala:464
 #, c-format
-#| msgid "%s%s = %s%s"
-msgid "%s%%s"
-msgstr "%%s%s"
+msgid "%d place"
+msgid_plural "%d places"
+msgstr[0] "o poziție"
+msgstr[1] "%d poziții"
+msgstr[2] "%d de poziții"
+
+#. Preferences dialog: Label for number format combo box
+#: src/math-preferences.vala:43
+msgid "Number _Format:"
+msgstr "_Format număr:"
+
+#. Number display mode combo: Automatic, e.g. 1234 (or scientific for large number 1.234×10^99)
+#: src/math-preferences.vala:60
+msgid "Automatic"
+msgstr "Automat"
+
+#. Number display mode combo: Fixed, e.g. 1234
+#: src/math-preferences.vala:64
+msgid "Fixed"
+msgstr "Fix"
+
+#. Number display mode combo: Scientific, e.g. 1.234×10^3
+#: src/math-preferences.vala:68
+msgid "Scientific"
+msgstr "Științific"
+
+#. Number display mode combo: Engineering, e.g. 1.234k
+#: src/math-preferences.vala:72
+msgid "Engineering"
+msgstr "Ingineresc"
+
+#. Preferences dialog: label for show trailing zeroes check button
+#: src/math-preferences.vala:89
+msgid "Number of _decimals"
+msgstr "Număr de _zecimale"
+
+#. Preferences dialog: label for show trailing zeroes switch
+#: src/math-preferences.vala:101
+msgid "Trailing _zeroes"
+msgstr "_Zerouri după virgulă"
+
+#. Preferences dialog: label for show show thousands separator switch
+#: src/math-preferences.vala:114
+msgid "_Thousands separators"
+msgstr "Separa_tori de mii"
+
+#. Preferences dialog: Label for angle unit combo box
+#: src/math-preferences.vala:128
+msgid "_Angle units:"
+msgstr "Unități ung_hi:"
+
+#. Preferences dialog: Label for word size combo box
+#: src/math-preferences.vala:158
+msgid "Word _size:"
+msgstr "Dimen_siunea cuvântului:"
+
+#. Word size combo: 8 bits
+#: src/math-preferences.vala:172
+msgid "8 bits"
+msgstr "8 biți"
+
+#. Word size combo: 16 bits
+#: src/math-preferences.vala:174
+msgid "16 bits"
+msgstr "16 biți"
+
+#. Word size combo: 32 bits
+#: src/math-preferences.vala:176
+msgid "32 bits"
+msgstr "32 de biți"
+
+#. Word size combo: 64 bits
+#: src/math-preferences.vala:178
+msgid "64 bits"
+msgstr "64 de biți"
+
+#: src/math-window.vala:134
+msgid "_Quit"
+msgstr "_Ieșire"
+
+#~ msgid "Quit"
+#~ msgstr "Ieșire"
+
+#~ msgid "Weight"
+#~ msgstr "Greutate"
+
+#~| msgid "<i>x</i>!"
+#~ msgid "<i>x</i>"
+#~ msgstr "<i>x</i>"
+
+#~ msgid "16-bit"
+#~ msgstr "16 biți"
+
+#~ msgid "32-bit"
+#~ msgstr "32 biți"
+
+#~ msgid "64-bit"
+#~ msgstr "64 biți"
+
+#~ msgid "8-bit"
+#~ msgstr "8 biți"
+
+#~| msgid "Lithuanian litas"
+#~ msgid "Lithuanian Litas"
+#~ msgstr "Litas lituanian"
+
+#~| msgid "Latvian lats"
+#~ msgid "Latvian Lats"
+#~ msgstr "Lat leton"
+
+#~ msgid ""
+#~ "Usage:\n"
+#~ "  %s — Perform mathematical calculations"
+#~ msgstr ""
+#~ "Utilizare:\n"
+#~ "  %s – Execută calcule matematice"
+
+#~ msgid ""
+#~ "Help Options:\n"
+#~ "  -v, --version                   Show release version\n"
+#~ "  -h, -?, --help                  Show help options\n"
+#~ "  --help-all                      Show all help options\n"
+#~ "  --help-gtk                      Show GTK+ options"
+#~ msgstr ""
+#~ "Opțiuni de ajutor\n"
+#~ "  -v, --version                   Arată versiunea ediției\n"
+#~ "  -h, -?, --help                  Arată opțiuni de ajutor\n"
+#~ "  --help-all                      Arată toate opțiunile de ajutor\n"
+#~ "  --help-gtk                      Arată opțiunile de ajutor GTK+"
+
+#~ msgid ""
+#~ "GTK+ Options:\n"
+#~ "  --class=CLASS                   Program class as used by the window "
+#~ "manager\n"
+#~ "  --name=NAME                     Program name as used by the window "
+#~ "manager\n"
+#~ "  --screen=SCREEN                 X screen to use\n"
+#~ "  --sync                          Make X calls synchronous\n"
+#~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
+#~ "  --g-fatal-warnings              Make all warnings fatal"
+#~ msgstr ""
+#~ "Opțiuni GTK+:\n"
+#~ "  --class=CLASS                   Clasa de program folosită de "
+#~ "administratorul de ferestre\n"
+#~ "  --name=NAME                     Nume program folosit de administratorul "
+#~ "de ferestre\n"
+#~ "  --screen=SCREEN                 Ecranul X folosit\n"
+#~ "  --sync                          Efectuează apeluri X sincrone\n"
+#~ "  --gtk-module=MODULES            Încarcă module GTK+ adiționale\n"
+#~ "  --g-fatal-warnings              Consideră toate avertismentele fatale"
+
+#~| msgid ""
+#~| "Application Options:\n"
+#~| "  -u, --unittest                  Perform unit tests\n"
+#~| "  -s, --solve <equation>          Solve the given equation"
+#~ msgid ""
+#~ "Application Options:\n"
+#~ "  -s, --solve <equation>          Solve the given equation"
+#~ msgstr ""
+#~ "Opțiuni aplicație:\n"
+#~ "  -s, --solve <ecuație>           Rezolvă ecuația dată"
+
+#~ msgid "Argument --solve requires an equation to solve"
+#~ msgstr "Argumentul --solve necesită o ecuație de rezolvat"
+
+#~ msgid "Unknown argument '%s'"
+#~ msgstr "Argument necunoscut „%s”"
+
+#~ msgid "Truncate"
+#~ msgstr "Trunchiază"
+
+#~ msgid "_%d place"
+#~ msgid_plural "_%d places"
+#~ msgstr[0] "_%d poziție"
+#~ msgstr[1] "_%d poziții"
+#~ msgstr[2] "_%d de poziții"
+
+#~ msgid "Round"
+#~ msgstr "Rotunjire"
+
+#~ msgid "Floor"
+#~ msgstr "Parte întreagă inferioară"
+
+#~ msgid "Ceiling"
+#~ msgstr "Parte întreagă superioară"
+
+#~ msgid "Sign"
+#~ msgstr "Semn"
+
+#~ msgid "_Close"
+#~ msgstr "În_chide"
+
+#~ msgid "Show %d decimal _places"
+#~ msgstr "Arată %d cifre du_pă virgulă"
+
+#~ msgid ""
+#~ "Gcalctool is free software; you can redistribute it and/or modify\n"
+#~ "it under the terms of the GNU General Public License as published by\n"
+#~ "the Free Software Foundation; either version 2 of the License, or\n"
+#~ "(at your option) any later version.\n"
+#~ "\n"
+#~ "Gcalctool is distributed in the hope that it will be useful,\n"
+#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "GNU General Public License for more details.\n"
+#~ "\n"
+#~ "You should have received a copy of the GNU General Public License\n"
+#~ "along with Gcalctool; if not, write to the Free Software Foundation, "
+#~ "Inc.,\n"
+#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
+#~ msgstr ""
+#~ "Gcalctool este software liber; îl puteți redistribui și/sau modifica în "
+#~ "conformitate cu termenii Licenței Publice Generale GNU așa cum este "
+#~ "publicată de Free Software Foundation; fie versiunea 2 a Licenței, fie "
+#~ "(la latitudinea dumneavoastră) orice versiune ulterioară.\n"
+#~ "\n"
+#~ "Gcalctool este distribuit cu speranța că va fi util, dar FĂRĂ NICI O "
+#~ "GARANȚIE, fără garanție implicită de vandabilitate și conformitate unui "
+#~ "anumit scop. Citiți Licența Publică Generală GNU pentru detalii.\n"
+#~ "\n"
+#~ "Ar trebui să fi primit o copie a Licenței Publice Generale GNU împreună "
+#~ "cu acest program; dacă nu, scrieți la Free Software Foundation, Inc., 51 "
+#~ "Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA"
+
+#~ msgid "Gcalctool"
+#~ msgstr "Gcalctool"
+
+#~ msgid "© 1986–2010 The Gcalctool authors"
+#~ msgstr "© 1986–2010 autorii Gcalctool"
+
+#~ msgid "_Calculator"
+#~ msgstr "_Calculator"
+
+#~ msgid "_Mode"
+#~ msgstr "_Mod"
+
+#~ msgid "_Basic"
+#~ msgstr "_Standard"
+
+#~ msgid "_Financial"
+#~ msgstr "_Financiar"
+
+#~ msgid "_Programming"
+#~ msgstr "_Programare"
+
+#~ msgid "_Contents"
+#~ msgstr "_Conținut"
+
+#~ msgid "Root must be non-zero"
+#~ msgstr "Rădăcina trebuie să fie nenulă"
+
+#~ msgid "Negative root of zero is undefined"
+#~ msgstr "Rădăcina negativă a lui zero este nedefinită"
+
+#~ msgid "Litres"
+#~ msgstr "Litri"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s˚C"
+#~ msgstr "%s˚C"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "degC,˚C"
+#~ msgstr "gradC,degC,˚C"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s˚F"
+#~ msgstr "%s˚F"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "degF,˚F"
+#~ msgstr "gradF,degF,˚F"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s˚K"
+#~ msgstr "%s˚K"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "degK,˚K"
+#~ msgstr "gradK,degK,˚K"
+
+#~ msgctxt "unit-format"
+#~ msgid "%s˚R"
+#~ msgstr "%s˚R"
+
+#~ msgctxt "unit-symbols"
+#~ msgid "degR,˚R"
+#~ msgstr "gradR,degR,˚R"
 
 #~ msgid "Recall"
 #~ msgstr "Reține"
@@ -2354,9 +3140,6 @@ msgstr "%%s%s"
 #~ msgid "Insert Variable"
 #~ msgstr "Introdu o variabilă"
 
-#~ msgid "No variables defined"
-#~ msgstr "Nicio variabilă definită"
-
 #~ msgid "&#x2190; R"
 #~ msgstr "&#x2190; R"
 
@@ -2544,18 +3327,9 @@ msgstr "%%s%s"
 #~ msgid "No redo steps"
 #~ msgstr "Nu există istoric pentru refaceri"
 
-#~ msgid "Calculator — Advanced"
-#~ msgstr "Calculator – Avansat"
-
-#~ msgid "Calculator — Financial"
-#~ msgstr "Calculator – Financiar"
-
 #~ msgid "Calculator — Scientific"
 #~ msgstr "Calculator – Științific"
 
-#~ msgid "Calculator — Programming"
-#~ msgstr "Calculator — Programare"
-
 #~ msgid "Error loading user interface"
 #~ msgstr "Eroare la încărcarea intefeței utilizator"
 
@@ -2591,9 +3365,6 @@ msgstr "%%s%s"
 #~ msgid "Square root is undefined for negative values"
 #~ msgstr "Rădăcina pătrată nu este definită pentru valori negative"
 
-#~ msgid "%"
-#~ msgstr "%"
-
 #~ msgid "&#x221A;"
 #~ msgstr "&#x221A;"
 
@@ -2760,18 +3531,12 @@ msgstr "%%s%s"
 #~ msgid "Add"
 #~ msgstr "Adună"
 
-#~ msgid "Advanced"
-#~ msgstr "Avansat"
-
 #~ msgid "B"
 #~ msgstr "B"
 
 #~ msgid "Backspace"
 #~ msgstr "Backspace"
 
-#~ msgid "Basic"
-#~ msgstr "Standard"
-
 #~ msgid "Bitwise AND [&]"
 #~ msgstr "Bitwise AND [&]"
 
@@ -2805,9 +3570,6 @@ msgstr "%%s%s"
 #~ msgid "Clear displayed value and any partial calculation [Shift Delete]"
 #~ msgstr "Șterge valoarea afișată și orice alt calcul parțial [Shift Delete]"
 
-#~ msgid "Clear entry"
-#~ msgstr "Șterge intrarea"
-
 #~ msgid "Click a _value or description to edit it:"
 #~ msgstr "Click pe o _valoare ori descriere pentru a o edita:"
 
@@ -2829,9 +3591,6 @@ msgstr "%%s%s"
 #~ msgid "D"
 #~ msgstr "D"
 
-#~ msgid "Divide"
-#~ msgstr "Divide"
-
 #~ msgid "Double-declining depreciation"
 #~ msgstr "Amortizare prin metoda dublei declinații"
 
@@ -2943,9 +3702,6 @@ msgstr "%%s%s"
 #~ msgid "Mod"
 #~ msgstr "Modulo"
 
-#~ msgid "Multiply"
-#~ msgstr "Înmulțește"
-
 #~ msgid "NOT"
 #~ msgstr "NEGAȚIE"
 
@@ -3012,12 +3768,6 @@ msgstr "%%s%s"
 #~ msgid "Present value [p]"
 #~ msgstr "Valoare prezentă [p]"
 
-#~ msgid "Programming"
-#~ msgstr "Programare"
-
-#~ msgid "Quit the calculator"
-#~ msgstr "Închidere calculator"
-
 #~ msgid "Random number in the range 0.0 to 1.0 [?]"
 #~ msgstr "Număr aleator între 0 și 1 [?]"
 
@@ -3042,18 +3792,12 @@ msgstr "%%s%s"
 #~ msgid "Right bracket"
 #~ msgstr "Paranteză la dreapta"
 
-#~ msgid "Set Precision"
-#~ msgstr "Setare precizie"
-
 #~ msgid "Set display type to engineering format"
 #~ msgstr "Setează tipul de afișare la formatul ingineresc"
 
 #~ msgid "Set display type to fixed-point format"
 #~ msgstr "Setează tipul de afișare la formatul în virgulă fixă"
 
-#~ msgid "Set display type to scientific format"
-#~ msgstr "Setează tipul de afișare la formatul științific"
-
 #~ msgid "Set hyperbolic option for trigonometric functions"
 #~ msgstr "Definiți opțiunea hiperbolică pentru funcții trigonometrice"
 
@@ -3231,9 +3975,6 @@ msgstr "%%s%s"
 #~ msgid "%s: accuracy should be in the range 0-%d\n"
 #~ msgstr "%s: precizia trebuie să fie între 0 și %d\n"
 
-#~ msgid "Malformed function"
-#~ msgstr "Funcție eronată"
-
 #~ msgid "No sane value to convert"
 #~ msgstr "Nici o valoare nu poate fi convertită"
 
@@ -3375,9 +4116,6 @@ msgstr "%%s%s"
 #~ msgid "Kilometer-to-mile conversion factor"
 #~ msgstr "Factor de conversie km -> mile"
 
-#~ msgid "square root of 2"
-#~ msgstr "rădăcină pătrată din 2"
-
 #~ msgid "π"
 #~ msgstr "π"
 
diff --git a/po/sl.po b/po/sl.po
index becec0e..d16e508 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,15 +4,15 @@
 #
 # Andraž Tori <andraz.tori1@guest.arnes.si>, 2002.
 # Matic Žgur <mr.zgur@gmail.com>, 2006–2007.
-# Matej Urbančič <mateju@svn.gnome.org>, 2007–2018.
+# Matej Urbančič <mateju@svn.gnome.org>, + 2007–2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-calculator master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"calculator&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2018-03-10 13:36+0000\n"
-"PO-Revision-Date: 2018-03-10 20:49+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-calculator/"
+"issues\n"
+"POT-Creation-Date: 2018-08-01 13:44+0000\n"
+"PO-Revision-Date: 2018-08-03 12:15+0200\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: sl_SI\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 2.0.4\n"
+"X-Generator: Poedit 2.0.6\n"
 
 # G:1 K:0 O:1
 #: src/buttons-advanced.ui:17 src/buttons-programming.ui:2143
@@ -57,7 +57,7 @@ msgstr "Fakulteta"
 
 #: src/buttons-advanced.ui:95
 msgid "Imaginary Component"
-msgstr "Navidezna enota"
+msgstr "Imaginarna komponenta"
 
 #: src/buttons-advanced.ui:247 src/buttons-basic.ui:130
 #: src/buttons-financial.ui:2037 src/buttons-programming.ui:1377
@@ -169,7 +169,7 @@ msgstr "Absolutna vrednost"
 
 #: src/buttons-advanced.ui:646
 msgid "Real Component"
-msgstr "Realna enota"
+msgstr "Realna komponenta"
 
 #: src/buttons-advanced.ui:663
 msgid "Complex conjugate"
@@ -781,8 +781,8 @@ msgstr "Projekt GNOME"
 
 # G:1 K:0 O:0
 #. Program name in the about dialog
-#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:48
-#: src/gnome-calculator.vala:81 src/gnome-calculator.vala:339
+#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:80
+#: src/gnome-calculator.vala:81 src/gnome-calculator.vala:330
 msgid "Calculator"
 msgstr "Računalo"
 
@@ -796,7 +796,6 @@ msgstr ""
 # G:1 K:0 O:0
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Calculator.desktop.in:9
-#| msgid "Calculator"
 msgid "gnome-calculator"
 msgstr "gnome-calculator"
 
@@ -826,29 +825,50 @@ msgid "Store value into existing or new variable"
 msgstr "Shrani vrednost v obstoječo ali pa novo spremenljivko"
 
 # G:0 K:1 O:0
-#: src/math-window.ui:20 src/math-window.vala:88
+#: src/math-window.ui:20 src/math-window.vala:92
 msgid "Basic Mode"
 msgstr "Osnovni"
 
 # G:0 K:1 O:0
-#: src/math-window.ui:25 src/math-window.vala:93
+#: src/math-window.ui:25 src/math-window.vala:97
 msgid "Advanced Mode"
 msgstr "Znanstveni"
 
 # G:0 K:1 O:0
-#: src/math-window.ui:30 src/math-window.vala:98
+#: src/math-window.ui:30 src/math-window.vala:102
 msgid "Financial Mode"
 msgstr "Finančni"
 
-#: src/math-window.ui:35 src/math-window.vala:103
+#: src/math-window.ui:35 src/math-window.vala:107
 msgid "Programming Mode"
 msgstr "Programerski"
 
-#: src/math-window.ui:40 src/math-window.vala:108
+#: src/math-window.ui:40 src/math-window.vala:112
 msgid "Keyboard Mode"
 msgstr "Način tipkovnice"
 
-#: src/math-window.ui:88
+#: src/math-window.ui:49
+msgid "New Window"
+msgstr "Novo okno"
+
+#. Title of preferences dialog
+#: src/math-window.ui:56 src/math-preferences.vala:30
+msgid "Preferences"
+msgstr "Možnosti"
+
+#: src/math-window.ui:63
+msgid "_Keyboard Shortcuts"
+msgstr "_Tipkovne bližnjice‫"
+
+#: src/math-window.ui:68
+msgid "Help"
+msgstr "Pomoč"
+
+#: src/math-window.ui:73
+msgid "About"
+msgstr "O programu"
+
+#: src/math-window.ui:120
 msgid "Menu"
 msgstr "Meni"
 
@@ -977,31 +997,6 @@ msgctxt "shortcut window"
 msgid "Switch to hexadecimal"
 msgstr "Preklopi na šestnajstiški sistem"
 
-#: src/menu.ui:7
-msgid "New Window"
-msgstr "Novo okno"
-
-#. Title of preferences dialog
-#: src/menu.ui:14 src/math-preferences.vala:30
-msgid "Preferences"
-msgstr "Možnosti"
-
-#: src/menu.ui:21
-msgid "_Keyboard Shortcuts"
-msgstr "_Tipkovne bližnjice‫"
-
-#: src/menu.ui:26
-msgid "Help"
-msgstr "Pomoč"
-
-#: src/menu.ui:31
-msgid "About"
-msgstr "O programu"
-
-#: src/menu.ui:35
-msgid "Quit"
-msgstr "Končaj"
-
 # G:0 K:0 O:9
 #: data/org.gnome.calculator.gschema.xml:25
 msgid "Accuracy value"
@@ -1017,7 +1012,7 @@ msgstr "Velikost besede"
 
 #: data/org.gnome.calculator.gschema.xml:32
 msgid "The size of the words used in bitwise operations"
-msgstr "Velikost besed uporabljenih pri bitnih opravilih."
+msgstr "Velikost besed, uporabljenih pri bitnih opravilih."
 
 #: data/org.gnome.calculator.gschema.xml:37
 msgid "Numeric Base"
@@ -1098,7 +1093,7 @@ msgstr "Vrednost trenutne enote"
 
 #: data/org.gnome.calculator.gschema.xml:82
 msgid "Target units"
-msgstr "CIljne enote"
+msgstr "Ciljne enote"
 
 #: data/org.gnome.calculator.gschema.xml:83
 msgid "Units to convert the current calculation into"
@@ -1329,8 +1324,8 @@ msgid "Tunisian Dinar"
 msgstr "tunizijski dinar"
 
 #: lib/currency.vala:80
-msgid "New Turkish Lira"
-msgstr "turška nova lira"
+msgid "Turkish Lira"
+msgstr "turška lira"
 
 #: lib/currency.vala:81
 msgid "T&T Dollar (TTD)"
@@ -1498,7 +1493,7 @@ msgstr "Inverzni kosinus ni določen za vrednosti izven območja [-1, 1]"
 #. Translators: Error displayed when inverse hyperbolic cosine value is undefined
 #: lib/number.vala:763
 msgid "Inverse hyperbolic cosine is undefined for values less than one"
-msgstr "Inverzni hiperbolični kosinus ni določen za vrednosti manjše od ena"
+msgstr "Inverzni hiperbolični kosinus ni določen za vrednosti, manjše od ena"
 
 #. Translators: Error displayed when inverse hyperbolic tangent value is undefined
 #: lib/number.vala:779
@@ -1552,8 +1547,8 @@ msgid "Volume"
 msgstr "Prostornina"
 
 #: lib/unit.vala:33
-msgid "Weight"
-msgstr "Teža"
+msgid "Mass"
+msgstr "Masa"
 
 #: lib/unit.vala:34
 msgid "Duration"
@@ -1565,13 +1560,13 @@ msgstr "Temperatura"
 
 #: lib/unit.vala:36
 msgid "Digital Storage"
-msgstr "Digitalno shranjevanje"
+msgstr "Predpone velikosti"
 
 #. FIXME: Approximations of 1/(units in a circle), therefore, 360 deg != 400 grads
 #. Preferences dialog: Angle unit combo box: Use degrees for trigonometric calculations
 #: lib/unit.vala:39 src/math-preferences.vala:144
 msgid "Degrees"
-msgstr "Stopinje"
+msgstr "stopinje"
 
 #: lib/unit.vala:39
 #, c-format
@@ -1587,7 +1582,7 @@ msgstr "stopinja,stopinj,˚"
 #. Preferences dialog: Angle unit combo box: Use radians for trigonometric calculations
 #: lib/unit.vala:40 src/math-preferences.vala:148
 msgid "Radians"
-msgstr "Radiani"
+msgstr "radiani"
 
 #: lib/unit.vala:40
 #, c-format
@@ -1603,7 +1598,7 @@ msgstr "radian,radiani,rad"
 #. Preferences dialog: Angle unit combo box: Use gradians for trigonometric calculations
 #: lib/unit.vala:41 src/math-preferences.vala:152
 msgid "Gradians"
-msgstr "Gradiani"
+msgstr "gradiani"
 
 #: lib/unit.vala:41
 #, c-format
@@ -1648,7 +1643,7 @@ msgstr "svetlobno leto, svetlobnih let,sl"
 
 #: lib/unit.vala:44
 msgid "Astronomical Units"
-msgstr "Astronomske enote"
+msgstr "astronomske enote"
 
 #: lib/unit.vala:44
 #, c-format
@@ -1663,7 +1658,7 @@ msgstr "ae"
 
 #: lib/unit.vala:45
 msgid "Nautical Miles"
-msgstr "pomorska milje"
+msgstr "pomorske milje"
 
 #: lib/unit.vala:45
 #, c-format
@@ -1723,7 +1718,7 @@ msgstr "kabel,kabla,kb,cb"
 
 #: lib/unit.vala:49
 msgid "Fathoms"
-msgstr "seženj"
+msgstr "sežnji"
 
 #: lib/unit.vala:49
 #, c-format
@@ -1858,7 +1853,7 @@ msgstr "nanometer,nanometri,nm"
 
 #: lib/unit.vala:58
 msgid "Desktop Publishing Point"
-msgstr "Točka objave namizja"
+msgstr "tipografske točke"
 
 #: lib/unit.vala:58 lib/unit.vala:68
 #, c-format
@@ -1948,7 +1943,7 @@ msgstr "mm²"
 
 #: lib/unit.vala:64
 msgid "Cubic Meters"
-msgstr "kubični meter"
+msgstr "kubični metri"
 
 #: lib/unit.vala:64
 #, c-format
@@ -1963,7 +1958,7 @@ msgstr "m³"
 
 #: lib/unit.vala:65
 msgid "Gallons"
-msgstr "galona"
+msgstr "galone"
 
 #: lib/unit.vala:65
 #, c-format
@@ -1978,7 +1973,7 @@ msgstr "galona,galone,gal"
 
 #: lib/unit.vala:66
 msgid "Liters"
-msgstr "Litri"
+msgstr "litri"
 
 #: lib/unit.vala:66
 #, c-format
@@ -1993,7 +1988,7 @@ msgstr "liter,litri,L"
 
 #: lib/unit.vala:67
 msgid "Quarts"
-msgstr "kvart"
+msgstr "kvarti"
 
 #: lib/unit.vala:67
 #, c-format
@@ -2122,7 +2117,7 @@ msgstr "gram,grami,g"
 
 #: lib/unit.vala:76
 msgid "Stone"
-msgstr "Kamen"
+msgstr "kamni"
 
 #: lib/unit.vala:76
 #, c-format
@@ -2303,7 +2298,7 @@ msgstr "degR,˚R,˚Ra,r,R,Rankine,rankine"
 #. We use IEC prefix for digital storage units. i.e. 1 kB = 1 KiloByte = 1000 bytes, and 1 KiB = 1 kibiByte = 1024 bytes
 #: lib/unit.vala:89
 msgid "Bits"
-msgstr "Biti"
+msgstr "biti"
 
 #: lib/unit.vala:89
 #, c-format
@@ -2318,7 +2313,7 @@ msgstr "bit,biti,b"
 
 #: lib/unit.vala:90
 msgid "Bytes"
-msgstr "BajtiBajti"
+msgstr "bajti"
 
 #: lib/unit.vala:90
 #, c-format
@@ -2333,7 +2328,7 @@ msgstr "bajt,bajti,B"
 
 #: lib/unit.vala:91
 msgid "Nibbles"
-msgstr "Polbajt"
+msgstr "polbajt"
 
 #: lib/unit.vala:91
 #, c-format
@@ -2349,7 +2344,7 @@ msgstr "polbajt,polbajti"
 #. The SI symbol for kilo is k, however we also allow "KB" and "Kb", as they are widely used and accepted.
 #: lib/unit.vala:93
 msgid "Kilobits"
-msgstr "Kilobiti"
+msgstr "kilobiti"
 
 #: lib/unit.vala:93
 #, c-format
@@ -2364,7 +2359,7 @@ msgstr "kilobit,kilobiti,kb,Kb"
 
 #: lib/unit.vala:94
 msgid "Kilobytes"
-msgstr "Kilobajti"
+msgstr "kilobajti"
 
 #: lib/unit.vala:94
 #, c-format
@@ -2379,7 +2374,7 @@ msgstr "kilobajt,kilobajti,kB,KB"
 
 #: lib/unit.vala:95
 msgid "Kibibits"
-msgstr "Kibibiti"
+msgstr "kibibiti"
 
 #: lib/unit.vala:95
 #, c-format
@@ -2394,7 +2389,7 @@ msgstr "kibibit,kibibiti,Kib"
 
 #: lib/unit.vala:96
 msgid "Kibibytes"
-msgstr "Kibibajti"
+msgstr "kibibajti"
 
 #: lib/unit.vala:96
 #, c-format
@@ -2409,7 +2404,7 @@ msgstr "kibibajt,kibibajti,KiB"
 
 #: lib/unit.vala:97
 msgid "Megabits"
-msgstr "Megabiti"
+msgstr "megabiti"
 
 #: lib/unit.vala:97
 #, c-format
@@ -2424,7 +2419,7 @@ msgstr "megabit,megabiti,Mb"
 
 #: lib/unit.vala:98
 msgid "Megabytes"
-msgstr "Megabajti"
+msgstr "megabajti"
 
 #: lib/unit.vala:98
 #, c-format
@@ -2439,7 +2434,7 @@ msgstr "megabajt,megabajti,MB"
 
 #: lib/unit.vala:99
 msgid "Mebibits"
-msgstr "Mebibiti"
+msgstr "mebibiti"
 
 #: lib/unit.vala:99
 #, c-format
@@ -2454,7 +2449,7 @@ msgstr "mebibit,mebibiti,Mib"
 
 #: lib/unit.vala:100
 msgid "Mebibytes"
-msgstr "Mebibajti"
+msgstr "mebibajti"
 
 #: lib/unit.vala:100
 #, c-format
@@ -2469,7 +2464,7 @@ msgstr "mebibajt,mebibajti,MiB"
 
 #: lib/unit.vala:101
 msgid "Gigabits"
-msgstr "Gigabiti"
+msgstr "gigabiti"
 
 #: lib/unit.vala:101
 #, c-format
@@ -2484,7 +2479,7 @@ msgstr "gigabit,gigabiti,Gb"
 
 #: lib/unit.vala:102
 msgid "Gigabytes"
-msgstr "Gigabajti"
+msgstr "gigabajti"
 
 #: lib/unit.vala:102
 #, c-format
@@ -2499,7 +2494,7 @@ msgstr "gigabajt,gigabajti,GB"
 
 #: lib/unit.vala:103
 msgid "Gibibits"
-msgstr "Gibibiti"
+msgstr "gibibiti"
 
 #: lib/unit.vala:103
 #, c-format
@@ -2514,7 +2509,7 @@ msgstr "gibibit,gibibiti,Gib"
 
 #: lib/unit.vala:104
 msgid "Gibibytes"
-msgstr "Gibibajti"
+msgstr "gibibajti"
 
 #: lib/unit.vala:104
 #, c-format
@@ -2529,7 +2524,7 @@ msgstr "gibibajt,gibibajti,GiB"
 
 #: lib/unit.vala:105
 msgid "Terabits"
-msgstr "Terabiti"
+msgstr "terabiti"
 
 #: lib/unit.vala:105
 #, c-format
@@ -2544,7 +2539,7 @@ msgstr "terabit,terabiti,Tb"
 
 #: lib/unit.vala:106
 msgid "Terabytes"
-msgstr "Terabajti"
+msgstr "terabajti"
 
 #: lib/unit.vala:106
 #, c-format
@@ -2559,7 +2554,7 @@ msgstr "terabajt,terabajti,TB"
 
 #: lib/unit.vala:107
 msgid "Tebibits"
-msgstr "Tebibiti"
+msgstr "tebibiti"
 
 #: lib/unit.vala:107
 #, c-format
@@ -2574,7 +2569,7 @@ msgstr "tebibit,tebibiti,Tib"
 
 #: lib/unit.vala:108
 msgid "Tebibytes"
-msgstr "Tebibajti"
+msgstr "tebibajti"
 
 #: lib/unit.vala:108
 #, c-format
@@ -2589,7 +2584,7 @@ msgstr "tebibajt,tebibajti,TiB"
 
 #: lib/unit.vala:109
 msgid "Petabits"
-msgstr "Petabiti"
+msgstr "petabiti"
 
 #: lib/unit.vala:109
 #, c-format
@@ -2604,7 +2599,7 @@ msgstr "petabit,petabiti,Pb"
 
 #: lib/unit.vala:110
 msgid "Petabytes"
-msgstr "Petabajti"
+msgstr "petabajti"
 
 #: lib/unit.vala:110
 #, c-format
@@ -2619,7 +2614,7 @@ msgstr "petabajt,petabajti,PB"
 
 #: lib/unit.vala:111
 msgid "Pebibits"
-msgstr "Pebibiti"
+msgstr "pebibiti"
 
 #: lib/unit.vala:111
 #, c-format
@@ -2634,7 +2629,7 @@ msgstr "pebibit,pebibiti,Pib"
 
 #: lib/unit.vala:112
 msgid "Pebibytes"
-msgstr "Pebibajti"
+msgstr "pebibajti"
 
 #: lib/unit.vala:112
 #, c-format
@@ -2649,7 +2644,7 @@ msgstr "pebibajt,pebibajti,PiB"
 
 #: lib/unit.vala:113
 msgid "Exabits"
-msgstr "Wxabiti"
+msgstr "exabiti"
 
 #: lib/unit.vala:113 lib/unit.vala:117
 #, c-format
@@ -2664,7 +2659,7 @@ msgstr "eksabit,eksabiti,Eb"
 
 #: lib/unit.vala:114
 msgid "Exabytes"
-msgstr "Eksabajti"
+msgstr "eksabajti"
 
 #: lib/unit.vala:114 lib/unit.vala:118
 #, c-format
@@ -2679,7 +2674,7 @@ msgstr "eksabajti,eksabajti,EB"
 
 #: lib/unit.vala:115
 msgid "Exbibits"
-msgstr "Eksbibiti"
+msgstr "eksbibiti"
 
 #: lib/unit.vala:115
 #, c-format
@@ -2694,7 +2689,7 @@ msgstr "eksbibit,eksbibiti,Eib"
 
 #: lib/unit.vala:116
 msgid "Exbibytes"
-msgstr "Eksbibajti"
+msgstr "eksbibajti"
 
 #: lib/unit.vala:116
 #, c-format
@@ -2709,7 +2704,7 @@ msgstr "eksbibajt,eksbibajti,EiB"
 
 #: lib/unit.vala:117
 msgid "Zettabits"
-msgstr "Zetabiti"
+msgstr "zetabiti"
 
 #: lib/unit.vala:117
 msgctxt "unit-symbols"
@@ -2718,7 +2713,7 @@ msgstr "zetabit,zetabiti,Zb"
 
 #: lib/unit.vala:118
 msgid "Zettabytes"
-msgstr "Zetabajti"
+msgstr "zetabajti"
 
 #: lib/unit.vala:118
 msgctxt "unit-symbols"
@@ -2727,7 +2722,7 @@ msgstr "zetabajt,zetabajti,ZB"
 
 #: lib/unit.vala:119
 msgid "Zebibits"
-msgstr "Zebibiti"
+msgstr "zebibiti"
 
 #: lib/unit.vala:119
 #, c-format
@@ -2742,7 +2737,7 @@ msgstr "zebibit,zebibiti,Zib"
 
 #: lib/unit.vala:120
 msgid "Zebibytes"
-msgstr "Zebibajti"
+msgstr "zebibajti"
 
 #: lib/unit.vala:120
 #, c-format
@@ -2757,7 +2752,7 @@ msgstr "zebibajt,zebibajti,ZiB"
 
 #: lib/unit.vala:121
 msgid "Yottabits"
-msgstr "Jotabiti"
+msgstr "jotabiti"
 
 #: lib/unit.vala:121
 #, c-format
@@ -2772,7 +2767,7 @@ msgstr "jotabit,jotabiti,Yb"
 
 #: lib/unit.vala:122
 msgid "Yottabytes"
-msgstr "Jotabajti"
+msgstr "jotabajti"
 
 #: lib/unit.vala:122
 #, c-format
@@ -2787,7 +2782,7 @@ msgstr "jotabajt,jotabajti,YB"
 
 #: lib/unit.vala:123
 msgid "Yobibits"
-msgstr "Jobibiti"
+msgstr "jobibiti"
 
 #: lib/unit.vala:123
 #, c-format
@@ -2802,7 +2797,7 @@ msgstr "jobibiti,jobibiti,Yib"
 
 #: lib/unit.vala:124
 msgid "Yobibytes"
-msgstr "Jobibajti"
+msgstr "jobibajti"
 
 #: lib/unit.vala:124
 #, c-format
@@ -2842,12 +2837,12 @@ msgid "Show release version"
 msgstr "Pokaži različico objave"
 
 #. Translators: Error message displayed when unable to launch help browser
-#: src/gnome-calculator.vala:303
+#: src/gnome-calculator.vala:294
 msgid "Unable to open help file"
 msgstr "Ni mogoče odpreti datoteke pomoči"
 
 #. The translator credits. Please translate this with your name (s).
-#: src/gnome-calculator.vala:334
+#: src/gnome-calculator.vala:325
 msgid "translator-credits"
 msgstr ""
 "Matej Urbančič <mateju@svn.gnome.org>\n"
@@ -2855,12 +2850,12 @@ msgstr ""
 "Matic Žgur"
 
 # G:1 K:0 O:0
-#: src/gnome-calculator.vala:340
+#: src/gnome-calculator.vala:331
 msgid "About Calculator"
 msgstr "O Računalu"
 
 #. Short description in the about dialog
-#: src/gnome-calculator.vala:348
+#: src/gnome-calculator.vala:339
 msgid "Calculator with financial and scientific modes."
 msgstr "Računalo z različnimi načini delovanja."
 
@@ -2944,10 +2939,16 @@ msgstr "32 bitna"
 msgid "64 bits"
 msgstr "64 bitna"
 
-#: src/math-window.vala:134
+#: src/math-window.vala:138
 msgid "_Quit"
 msgstr "_Končaj"
 
+#~ msgid "Quit"
+#~ msgstr "Končaj"
+
+#~ msgid "Weight"
+#~ msgstr "Teža"
+
 #~ msgid "accessories-calculator"
 #~ msgstr "accessories-calculator"
 
diff --git a/po/tr.po b/po/tr.po
index 4de9503..c8e9f04 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,17 +8,17 @@
 # İşbaran Akçayır <isbaran@gmail.com>, 2015.
 # Muhammet Kara <muhammetk@gmail.com>, 2011, 2012, 2013, 2014, 2015.
 # Çağatay Yiğit Şahin <cyigitsahin@outlook.com>, 2017.
-# Emin Tufan Çetin <etcetin@gmail.com>, 2017, 2018.
 # Çağrı Dolaz <dolazcagri@gmail.com>, 2018.
+# Emin Tufan Çetin <etcetin@gmail.com>, 2017, 2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gcalctool\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"calculator&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2018-02-17 01:17+0000\n"
-"PO-Revision-Date: 2018-02-18 15:19+0200\n"
-"Last-Translator: Çağrı Dolaz <dolazcagri@gmail.com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-calculator/"
+"issues\n"
+"POT-Creation-Date: 2018-07-24 22:53+0000\n"
+"PO-Revision-Date: 2018-08-12 09:45+0300\n"
+"Last-Translator: Emin Tufan Çetin <etcetin@gmail.com>\n"
 "Language-Team: Türkçe <gnome-turk@gnome.org>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
@@ -752,8 +752,8 @@ msgid "The GNOME Project"
 msgstr "GNOME Projesi"
 
 #. Program name in the about dialog
-#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:48
-#: src/gnome-calculator.vala:81 src/gnome-calculator.vala:339
+#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:80
+#: src/gnome-calculator.vala:81 src/gnome-calculator.vala:330
 msgid "Calculator"
 msgstr "Hesap Makinesi"
 
@@ -792,27 +792,48 @@ msgstr "Değişken adı"
 msgid "Store value into existing or new variable"
 msgstr "Değeri mevcut veya yeni değişkene sakla"
 
-#: src/math-window.ui:20 src/math-window.vala:88
+#: src/math-window.ui:20 src/math-window.vala:92
 msgid "Basic Mode"
 msgstr "Basit Kip"
 
-#: src/math-window.ui:25 src/math-window.vala:93
+#: src/math-window.ui:25 src/math-window.vala:97
 msgid "Advanced Mode"
 msgstr "Gelişmiş Kip"
 
-#: src/math-window.ui:30 src/math-window.vala:98
+#: src/math-window.ui:30 src/math-window.vala:102
 msgid "Financial Mode"
 msgstr "Finansal Kip"
 
-#: src/math-window.ui:35 src/math-window.vala:103
+#: src/math-window.ui:35 src/math-window.vala:107
 msgid "Programming Mode"
 msgstr "Programlama Kipi"
 
-#: src/math-window.ui:40 src/math-window.vala:108
+#: src/math-window.ui:40 src/math-window.vala:112
 msgid "Keyboard Mode"
 msgstr "Klavye Kipi"
 
-#: src/math-window.ui:88
+#: src/math-window.ui:49
+msgid "New Window"
+msgstr "Yeni Pencere"
+
+#. Title of preferences dialog
+#: src/math-window.ui:56 src/math-preferences.vala:30
+msgid "Preferences"
+msgstr "Tercihler"
+
+#: src/math-window.ui:63
+msgid "_Keyboard Shortcuts"
+msgstr "_Klavye Kısayolları"
+
+#: src/math-window.ui:68
+msgid "Help"
+msgstr "Yardım"
+
+#: src/math-window.ui:73
+msgid "About"
+msgstr "Hakkında"
+
+#: src/math-window.ui:120
 msgid "Menu"
 msgstr "Menü"
 
@@ -936,31 +957,6 @@ msgctxt "shortcut window"
 msgid "Switch to hexadecimal"
 msgstr "Onaltılık tabana geç"
 
-#: src/menu.ui:7
-msgid "New Window"
-msgstr "Yeni Pencere"
-
-#. Title of preferences dialog
-#: src/menu.ui:14 src/math-preferences.vala:30
-msgid "Preferences"
-msgstr "Tercihler"
-
-#: src/menu.ui:21
-msgid "_Keyboard Shortcuts"
-msgstr "_Klavye Kısayolları"
-
-#: src/menu.ui:26
-msgid "Help"
-msgstr "Yardım"
-
-#: src/menu.ui:31
-msgid "About"
-msgstr "Hakkında"
-
-#: src/menu.ui:35
-msgid "Quit"
-msgstr "Çıkış"
-
 #: data/org.gnome.calculator.gschema.xml:25
 msgid "Accuracy value"
 msgstr "Doğruluk değeri"
@@ -1287,8 +1283,9 @@ msgid "Tunisian Dinar"
 msgstr "Tunus Dinarı"
 
 #: lib/currency.vala:80
-msgid "New Turkish Lira"
-msgstr "Yeni Türk Lirası"
+#| msgid "New Turkish Lira"
+msgid "Turkish Lira"
+msgstr "Türk Lirası"
 
 #: lib/currency.vala:81
 msgid "T&T Dollar (TTD)"
@@ -1511,8 +1508,8 @@ msgid "Volume"
 msgstr "Hacim"
 
 #: lib/unit.vala:33
-msgid "Weight"
-msgstr "Ağırlık"
+msgid "Mass"
+msgstr "Kütle"
 
 #: lib/unit.vala:34
 msgid "Duration"
@@ -1648,7 +1645,7 @@ msgstr "%s mi"
 #: lib/unit.vala:46
 msgctxt "unit-symbols"
 msgid "mile,miles,mi"
-msgstr "mil, mil, mi"
+msgstr "mil,mil,mi"
 
 #: lib/unit.vala:47
 msgid "Kilometers"
@@ -2801,24 +2798,24 @@ msgid "Show release version"
 msgstr "Dağıtım sürümünü göster"
 
 #. Translators: Error message displayed when unable to launch help browser
-#: src/gnome-calculator.vala:303
+#: src/gnome-calculator.vala:294
 msgid "Unable to open help file"
 msgstr "Yardım dosyası açılamıyor"
 
 #. The translator credits. Please translate this with your name (s).
-#: src/gnome-calculator.vala:334
+#: src/gnome-calculator.vala:325
 msgid "translator-credits"
 msgstr ""
 "Barış Çiçek <baris@teamforce.name.tr>\n"
 "Burçin Dönmez <bdonmez@cisunix.unh.edu>\n"
 "Muhammet Kara <muhammet.k@gmail.com>"
 
-#: src/gnome-calculator.vala:340
+#: src/gnome-calculator.vala:331
 msgid "About Calculator"
 msgstr "Hesap Makinesi Hakkında"
 
 #. Short description in the about dialog
-#: src/gnome-calculator.vala:348
+#: src/gnome-calculator.vala:339
 msgid "Calculator with financial and scientific modes."
 msgstr "Ekonomi ve bilim kipli hesap makinesi."
 
@@ -2898,10 +2895,16 @@ msgstr "32-bit"
 msgid "64 bits"
 msgstr "64-bit"
 
-#: src/math-window.vala:134
+#: src/math-window.vala:138
 msgid "_Quit"
 msgstr "_Çıkış"
 
+#~ msgid "Quit"
+#~ msgstr "Çıkış"
+
+#~ msgid "Weight"
+#~ msgstr "Ağırlık"
+
 #~ msgid "accessories-calculator"
 #~ msgstr "accessories-calculator"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d4aaaff..4ad462d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,8 +1,7 @@
-# translation of gcalctool.HEAD.po to Simplified Chinese.
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+# Chinese (China) translation for gcalctool.
+# Copyright (C) 2003-2018 gcalctool's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gcalctool package.
 # arccos <boyermoore@gmail.com>，2009.
-#
 # Funda Wang <fundawang@linux.net.cn>, 2003, 2004.
 # Shaodong Di <gnuyhlfh@gmail.com>, 2008.
 # 甘露(Gan Lu) <rhythm.gan@gmail.com>, 2009.
@@ -17,28 +16,30 @@
 # Tong Hui <tonghuix@gmail.com>, 2013.
 # zhouxiaobo <zhouxiaobo500@hotmail.com>, 2014, 2015.
 # Jeff Bai <jeffbai@aosc.xyz>, 2015, 2016.
+# Dingzhong Chen <wsxy162@@gmail.com>, 2018.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gcalctool master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "calculator&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-07-06 22:58+0000\n"
-"PO-Revision-Date: 2017-10-21 20:04+0800\n"
-"Last-Translator: liushuyu <liushuyu011@gmail.com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"POT-Creation-Date: 2018-03-01 18:44+0000\n"
+"PO-Revision-Date: 2018-03-03 22:48+0800\n"
+"Last-Translator: Dingzhong Chen <wsxy162@@gmail.com>\n"
+"Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.0.1\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
-#: src/buttons-advanced.ui:17 src/buttons-programming.ui:2148
+#: src/buttons-advanced.ui:17 src/buttons-programming.ui:2143
 msgid "Inverse [Ctrl+I]"
 msgstr "反函数或倒数 [Ctrl+I]"
 
 #. Accessible name for the inverse button
-#: src/buttons-advanced.ui:22 src/buttons-programming.ui:2153
+#: src/buttons-advanced.ui:22 src/buttons-programming.ui:2148
 msgid "Inverse"
 msgstr "倒数或反函数"
 
@@ -51,12 +52,12 @@ msgstr "质因数分解 [Ctrl+F]"
 msgid "Factorize"
 msgstr "质因数分解"
 
-#: src/buttons-advanced.ui:66 src/buttons-programming.ui:2121
+#: src/buttons-advanced.ui:66 src/buttons-programming.ui:2116
 msgid "Factorial [!]"
 msgstr "阶乘 [!]"
 
 #. Accessible name for the factorial button
-#: src/buttons-advanced.ui:71 src/buttons-programming.ui:2126
+#: src/buttons-advanced.ui:71 src/buttons-programming.ui:2121
 msgid "Factorial"
 msgstr "阶乘"
 
@@ -100,150 +101,150 @@ msgstr "计算结果"
 msgid "Clear Display [Escape]"
 msgstr "清除显示 [Escape]"
 
-#: src/buttons-advanced.ui:446 src/buttons-programming.ui:1787
+#: src/buttons-advanced.ui:441 src/buttons-programming.ui:1782
 msgid "Subscript mode [Alt]"
 msgstr "下标模式 [Alt]"
 
 #. Accessible name for the subscript mode button
-#: src/buttons-advanced.ui:451 src/buttons-programming.ui:1792
+#: src/buttons-advanced.ui:446 src/buttons-programming.ui:1787
 msgid "Subscript"
 msgstr "下标"
 
-#: src/buttons-advanced.ui:473 src/buttons-programming.ui:1814
+#: src/buttons-advanced.ui:468 src/buttons-programming.ui:1809
 msgid "Superscript mode [Ctrl]"
 msgstr "上标模式 [Ctrl]"
 
 #. Accessible name for the superscript mode button
-#: src/buttons-advanced.ui:478 src/buttons-programming.ui:1819
+#: src/buttons-advanced.ui:473 src/buttons-programming.ui:1814
 msgid "Superscript"
 msgstr "上标"
 
-#: src/buttons-advanced.ui:500
+#: src/buttons-advanced.ui:495
 msgid "Scientific exponent [Ctrl+E]"
 msgstr "科学记数法 [Ctrl+E]"
 
 #. Accessible name for the scientific exponent button
-#: src/buttons-advanced.ui:504
+#: src/buttons-advanced.ui:499
 msgid "Scientific Exponent"
 msgstr "科学计数法"
 
-#: src/buttons-advanced.ui:527 src/buttons-programming.ui:1952
+#: src/buttons-advanced.ui:522 src/buttons-programming.ui:1947
 msgid "Modulus divide"
 msgstr "求余数"
 
-#: src/buttons-advanced.ui:543 src/buttons-basic.ui:328
-#: src/buttons-financial.ui:2235 src/buttons-programming.ui:1969
+#: src/buttons-advanced.ui:538 src/buttons-basic.ui:328
+#: src/buttons-financial.ui:2235 src/buttons-programming.ui:1964
 msgid "Start Group [(]"
 msgstr "开始组 [(]"
 
-#: src/buttons-advanced.ui:560 src/buttons-basic.ui:345
-#: src/buttons-financial.ui:2252 src/buttons-programming.ui:1985
+#: src/buttons-advanced.ui:555 src/buttons-basic.ui:345
+#: src/buttons-financial.ui:2252 src/buttons-programming.ui:1980
 msgid "End Group [)]"
 msgstr "结束组 [)]"
 
 #. Accessible name for the memory button
 #. Accessible name for the memory value button
-#: src/buttons-advanced.ui:575 src/buttons-advanced.ui:578
+#: src/buttons-advanced.ui:570 src/buttons-advanced.ui:573
 #: src/buttons-financial.ui:1854 src/buttons-financial.ui:1857
-#: src/buttons-programming.ui:1857
+#: src/buttons-programming.ui:1852
 msgid "Memory"
 msgstr "记忆"
 
 #. The label on the memory button
-#: src/buttons-advanced.ui:587 src/buttons-financial.ui:1869
-#: src/buttons-programming.ui:1870
+#: src/buttons-advanced.ui:582 src/buttons-financial.ui:1869
+#: src/buttons-programming.ui:1865
 msgid "x"
 msgstr "记忆"
 
-#: src/buttons-advanced.ui:622 src/buttons-programming.ui:1314
+#: src/buttons-advanced.ui:617 src/buttons-programming.ui:1314
 msgid "Absolute Value [|]"
 msgstr "绝对值 [|]"
 
 #. Accessible name for the absolute value button
-#: src/buttons-advanced.ui:627 src/buttons-programming.ui:1319
+#: src/buttons-advanced.ui:622 src/buttons-programming.ui:1319
 msgid "Absolute Value"
 msgstr "绝对值"
 
-#: src/buttons-advanced.ui:651
+#: src/buttons-advanced.ui:646
 msgid "Real Component"
 msgstr "实数部分"
 
-#: src/buttons-advanced.ui:668
+#: src/buttons-advanced.ui:663
 msgid "Complex conjugate"
 msgstr "复共轭"
 
-#: src/buttons-advanced.ui:685
+#: src/buttons-advanced.ui:680
 msgid "Complex argument"
 msgstr "复变量"
 
-#: src/buttons-advanced.ui:702 src/buttons-programming.ui:1298
+#: src/buttons-advanced.ui:697
 msgid "Natural Logarithm"
 msgstr "自然对数(以 e 为底)"
 
-#: src/buttons-advanced.ui:718 src/buttons-financial.ui:1908
+#: src/buttons-advanced.ui:713 src/buttons-financial.ui:1908
 #: src/buttons-programming.ui:1260
 msgid "Logarithm"
 msgstr "常用对数(以 10 为底)"
 
-#: src/buttons-advanced.ui:733 src/buttons-financial.ui:2476
-#: src/buttons-programming.ui:2176
+#: src/buttons-advanced.ui:728 src/buttons-financial.ui:2470
+#: src/buttons-programming.ui:2171
 msgid "Exponent [^ or **]"
 msgstr "乘方 [^ 或 **]"
 
 #. Accessible name for the exponentiation (x to the power of y) button
-#: src/buttons-advanced.ui:738 src/buttons-basic.ui:401
-#: src/buttons-financial.ui:2481 src/buttons-programming.ui:2181
+#: src/buttons-advanced.ui:733 src/buttons-basic.ui:396
+#: src/buttons-financial.ui:2475 src/buttons-programming.ui:2176
 msgid "Exponent"
 msgstr "X^Y"
 
-#: src/buttons-advanced.ui:762 src/buttons-financial.ui:2505
+#: src/buttons-advanced.ui:757 src/buttons-financial.ui:2499
 #: src/buttons-programming.ui:1244
 msgid "Root [Ctrl+R]"
 msgstr "根 [Ctrl+R]"
 
-#: src/buttons-advanced.ui:778 src/buttons-basic.ui:424
-#: src/buttons-financial.ui:2456
+#: src/buttons-advanced.ui:773 src/buttons-basic.ui:419
+#: src/buttons-financial.ui:2450
 msgid "Undo [Ctrl+Z]"
 msgstr "撤销 [Ctrl+Z]"
 
-#: src/buttons-advanced.ui:798
+#: src/buttons-advanced.ui:793
 msgid "Pi [Ctrl+P]"
 msgstr "圆周率 [Ctrl+P]"
 
-#: src/buttons-advanced.ui:821
+#: src/buttons-advanced.ui:816
 msgid "Euler’s Number"
 msgstr "欧拉数"
 
-#: src/buttons-advanced.ui:851
+#: src/buttons-advanced.ui:846
 msgid "Cosine"
 msgstr "余弦"
 
-#: src/buttons-advanced.ui:866
+#: src/buttons-advanced.ui:861
 msgid "Sine"
 msgstr "正弦"
 
-#: src/buttons-advanced.ui:881
+#: src/buttons-advanced.ui:876
 msgid "Tangent"
 msgstr "正切"
 
-#: src/buttons-advanced.ui:896
+#: src/buttons-advanced.ui:891
 msgid "Hyperbolic Sine"
 msgstr "双曲正弦"
 
-#: src/buttons-advanced.ui:912
+#: src/buttons-advanced.ui:907
 msgid "Hyperbolic Cosine"
 msgstr "双曲余弦"
 
-#: src/buttons-advanced.ui:928
+#: src/buttons-advanced.ui:923
 msgid "Hyperbolic Tangent"
 msgstr "双曲正切"
 
-#: src/buttons-advanced.ui:951
+#: src/buttons-advanced.ui:946
 msgid "Additional Functions"
 msgstr "附加函数"
 
 #. Accessible name for the store value button
-#: src/buttons-advanced.ui:954 src/buttons-programming.ui:1860
+#: src/buttons-advanced.ui:949 src/buttons-programming.ui:1855
 msgid "Store"
 msgstr "存储"
 
@@ -251,16 +252,16 @@ msgstr "存储"
 msgid "Percentage [%]"
 msgstr "百分数 [%]"
 
-#: src/buttons-basic.ui:382
+#: src/buttons-basic.ui:377
 msgid "Square root [Ctrl+R]"
 msgstr "平方根 [Ctrl+R]"
 
-#: src/buttons-basic.ui:397
+#: src/buttons-basic.ui:392
 msgid "Square [Ctrl+2]"
 msgstr "平方 [Ctrl+2]"
 
 #. Title of Compounding Term dialog
-#: src/buttons-financial.ui:8 src/buttons-financial.ui:2290
+#: src/buttons-financial.ui:8 src/buttons-financial.ui:2284
 msgid "Compounding Term"
 msgstr "复利期数"
 
@@ -269,7 +270,7 @@ msgstr "复利期数"
 #: src/buttons-financial.ui:723 src/buttons-financial.ui:907
 #: src/buttons-financial.ui:1091 src/buttons-financial.ui:1275
 #: src/buttons-financial.ui:1459 src/buttons-financial.ui:1674
-#: src/buttons-programming.ui:2306
+#: src/buttons-programming.ui:2301
 msgid "_Cancel"
 msgstr "取消（_C）"
 
@@ -355,7 +356,7 @@ msgid "_Period:"
 msgstr "期(_P)："
 
 #. Title of Future Value dialog
-#: src/buttons-financial.ui:374 src/buttons-financial.ui:2322
+#: src/buttons-financial.ui:374 src/buttons-financial.ui:2316
 msgid "Future Value"
 msgstr "未来值"
 
@@ -382,7 +383,7 @@ msgid "_Number of Periods:"
 msgstr "期数(_N)："
 
 #. Title of Gross Profit Margin dialog
-#: src/buttons-financial.ui:557 src/buttons-financial.ui:2440
+#: src/buttons-financial.ui:557 src/buttons-financial.ui:2434
 msgid "Gross Profit Margin"
 msgstr "毛利率"
 
@@ -399,7 +400,7 @@ msgid "_Margin:"
 msgstr "利率(_M)："
 
 #. Title of Periodic Payment dialog
-#: src/buttons-financial.ui:709 src/buttons-financial.ui:2423
+#: src/buttons-financial.ui:709 src/buttons-financial.ui:2417
 msgid "Periodic Payment"
 msgstr "每期付款额"
 
@@ -422,7 +423,7 @@ msgid "_Term:"
 msgstr "期限(_T)："
 
 #. Title of Present Value dialog
-#: src/buttons-financial.ui:893 src/buttons-financial.ui:2406
+#: src/buttons-financial.ui:893 src/buttons-financial.ui:2400
 msgid "Present Value"
 msgstr "现值"
 
@@ -435,7 +436,7 @@ msgid ""
 msgstr "计算基于一系列平等付款的投资现值在付款周期的周期利率数字上的折现。    "
 
 #. Title of Periodic Interest Rate dialog
-#: src/buttons-financial.ui:1077 src/buttons-financial.ui:2389
+#: src/buttons-financial.ui:1077 src/buttons-financial.ui:2383
 msgid "Periodic Interest Rate"
 msgstr "每期利率"
 
@@ -510,68 +511,68 @@ msgid ""
 msgstr "计算期限内普通年金积累到某一未来值需要的付款期数，按某一每期利率。"
 
 #. Calculates the number of compounding periods necessary to increase an investment of present value pv to a future value of fv, at a fixed interest rate of int per compounding period. See also: http://en.wikipedia.org/wiki/Compound_interest
-#: src/buttons-financial.ui:2284
+#: src/buttons-financial.ui:2278
 msgid "Ctrm"
 msgstr "复利"
 
 #. Calculates the depreciation allowance on an asset for a specified period of time, using the double-declining balance method. See also: http://en.wikipedia.org/wiki/Depreciation
-#: src/buttons-financial.ui:2300
+#: src/buttons-financial.ui:2294
 msgid "Ddb"
 msgstr "Ddb"
 
-#: src/buttons-financial.ui:2306
+#: src/buttons-financial.ui:2300
 msgid "Double Declining Depreciation"
 msgstr "双倍余额递减折旧"
 
 #. Calculates the future value of an investment based on a series of equal payments, each of amount pmt, at a periodic interest rate of int, over the number of payment periods in the term. See also: http://en.wikipedia.org/wiki/Future_value
-#: src/buttons-financial.ui:2316
+#: src/buttons-financial.ui:2310
 msgid "Fv"
 msgstr "Fv"
 
 #. Calculates the number of payment periods that are necessary during the term of an ordinary annuity, to accumulate a future value of fv, at a periodic interest rate of int. Each payment is equal to amount pmt. See also: http://en.wikipedia.org/wiki/Annuity_(finance_theory)
-#: src/buttons-financial.ui:2332
+#: src/buttons-financial.ui:2326
 msgid "Term"
 msgstr "期数"
 
-#: src/buttons-financial.ui:2338
+#: src/buttons-financial.ui:2332
 msgid "Financial Term"
 msgstr "财务"
 
 #. Calculates the depreciation allowance on an asset for a specified period of time, using the Sum-Of-The-Years’-Digits method. This method of depreciation accelerates the rate of depreciation, so that more depreciation expense occurs in earlier periods than in later ones. The depreciable cost is cost - salvage. The useful life is the number of periods, typically years, over which an asset is depreciated. See also: http://en.wikipedia.org/wiki/Depreciation
-#: src/buttons-financial.ui:2349
+#: src/buttons-financial.ui:2343
 msgid "Syd"
 msgstr "Syd"
 
-#: src/buttons-financial.ui:2355
+#: src/buttons-financial.ui:2349
 msgid "Sum of the Years Digits Depreciation"
 msgstr "年数总和法折旧"
 
 #. Calculates the straight-line depreciation of an asset for one period. The depreciable cost is cost - salvage. The straight-line method of depreciation divides the depreciable cost evenly over the useful life of an asset. The useful life is the number of periods, typically years, over which an asset is depreciated. See also: http://en.wikipedia.org/wiki/Depreciation
-#: src/buttons-financial.ui:2366
+#: src/buttons-financial.ui:2360
 msgid "Sln"
 msgstr "Sln"
 
-#: src/buttons-financial.ui:2372
+#: src/buttons-financial.ui:2366
 msgid "Straight Line Depreciation"
 msgstr "直线折旧"
 
 #. Calculates the periodic interest necessary to increase an investment of present value pv to a future value of fv, over the number of compounding periods in term. See also: http://en.wikipedia.org/wiki/Interest
-#: src/buttons-financial.ui:2383
+#: src/buttons-financial.ui:2377
 msgid "Rate"
 msgstr "利率"
 
 #. Calculates the present value of an investment based on a series of equal payments, each of amount pmt, discounted at a periodic interest rate of int, over the number of payment periods in the term. See also: http://en.wikipedia.org/wiki/Present_value
-#: src/buttons-financial.ui:2400
+#: src/buttons-financial.ui:2394
 msgid "Pv"
 msgstr "Pv"
 
 #. Calculates the amount of the periodic payment of a loan, where payments are made at the end of each payment period. See also: http://en.wikipedia.org/wiki/Amortization_schedule
-#: src/buttons-financial.ui:2417
+#: src/buttons-financial.ui:2411
 msgid "Pmt"
 msgstr "Pmt"
 
 #. Calculates the resale price of a product, based on the product cost and the wanted gross profit margin. See also: http://en.wikipedia.org/wiki/Gross_profit_margin
-#: src/buttons-financial.ui:2434
+#: src/buttons-financial.ui:2428
 msgid "Gpm"
 msgstr "Gpm"
 
@@ -591,6 +592,10 @@ msgstr "十进制"
 msgid "Hexadecimal"
 msgstr "十六进制"
 
+#: src/buttons-programming.ui:1298
+msgid "Binary Logarithm"
+msgstr "二进制对数"
+
 #: src/buttons-programming.ui:1343
 msgid "Integer Component"
 msgstr "整数部分"
@@ -599,57 +604,57 @@ msgstr "整数部分"
 msgid "Fractional Component"
 msgstr "小数部分"
 
-#: src/buttons-programming.ui:1901
+#: src/buttons-programming.ui:1896
 msgid "Boolean Exclusive OR"
 msgstr "逻辑异或"
 
-#: src/buttons-programming.ui:1918
+#: src/buttons-programming.ui:1913
 msgid "Boolean OR"
 msgstr "逻辑或"
 
-#: src/buttons-programming.ui:1935
+#: src/buttons-programming.ui:1930
 msgid "Boolean AND"
 msgstr "逻辑与"
 
 #. Accessible name for the shift left button
-#: src/buttons-programming.ui:1999 src/buttons-programming.ui:2002
+#: src/buttons-programming.ui:1994 src/buttons-programming.ui:1997
 msgid "Shift Left"
 msgstr "左移"
 
 #. Accessible name for the shift right button
-#: src/buttons-programming.ui:2042 src/buttons-programming.ui:2045
+#: src/buttons-programming.ui:2037 src/buttons-programming.ui:2040
 msgid "Shift Right"
 msgstr "右移"
 
 #. Title of insert character code dialog
-#: src/buttons-programming.ui:2086 src/buttons-programming.ui:2259
+#: src/buttons-programming.ui:2081 src/buttons-programming.ui:2254
 msgid "Insert Character Code"
 msgstr "插入字符编码"
 
 #. Accessible name for the insert character button
-#: src/buttons-programming.ui:2090
+#: src/buttons-programming.ui:2085
 msgid "Insert Character"
 msgstr "插入字符"
 
-#: src/buttons-programming.ui:2106
+#: src/buttons-programming.ui:2101
 msgid "Boolean NOT"
 msgstr "逻辑非"
 
-#: src/buttons-programming.ui:2205
+#: src/buttons-programming.ui:2200
 msgid "Ones’ Complement"
 msgstr "反码"
 
-#: src/buttons-programming.ui:2222
+#: src/buttons-programming.ui:2217
 msgid "Two’s Complement"
 msgstr "二进制补码"
 
 #. Insert ASCII dialog: Label before character entry
-#: src/buttons-programming.ui:2272
+#: src/buttons-programming.ui:2267
 msgid "Ch_aracter:"
 msgstr "字符(_A)："
 
 #. Insert ASCII dialog: Button to insert selected character
-#: src/buttons-programming.ui:2321
+#: src/buttons-programming.ui:2316
 msgid "_Insert"
 msgstr "插入(_I)"
 
@@ -722,7 +727,7 @@ msgstr "GNOME 项目"
 
 #. Program name in the about dialog
 #: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:48
-#: src/gnome-calculator.vala:80 src/gnome-calculator.vala:332
+#: src/gnome-calculator.vala:81 src/gnome-calculator.vala:339
 msgid "Calculator"
 msgstr "计算器"
 
@@ -733,8 +738,9 @@ msgstr "calculation;arithmetic;scientific;financial;计算;算术;科学;财务;
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: data/org.gnome.Calculator.desktop.in:9
-msgid "accessories-calculator"
-msgstr "accessories-calculator"
+#| msgid "Calculator"
+msgid "gnome-calculator"
+msgstr "gnome-calculator"
 
 #: src/math-converter.ui:16
 msgid "Switch conversion units"
@@ -761,23 +767,23 @@ msgstr "变量名称"
 msgid "Store value into existing or new variable"
 msgstr "将数值存入现有或新的变量"
 
-#: src/math-window.ui:20 src/math-window.vala:82
+#: src/math-window.ui:20 src/math-window.vala:88
 msgid "Basic Mode"
 msgstr "基本模式"
 
-#: src/math-window.ui:25 src/math-window.vala:87
+#: src/math-window.ui:25 src/math-window.vala:93
 msgid "Advanced Mode"
 msgstr "高级模式"
 
-#: src/math-window.ui:30 src/math-window.vala:92
+#: src/math-window.ui:30 src/math-window.vala:98
 msgid "Financial Mode"
 msgstr "财务模式"
 
-#: src/math-window.ui:35 src/math-window.vala:97
+#: src/math-window.ui:35 src/math-window.vala:103
 msgid "Programming Mode"
 msgstr "编程模式"
 
-#: src/math-window.ui:40 src/math-window.vala:102
+#: src/math-window.ui:40 src/math-window.vala:108
 msgid "Keyboard Mode"
 msgstr "键盘模式"
 
@@ -807,95 +813,100 @@ msgstr "打开帮助"
 
 #: src/math-shortcuts.ui:41
 msgctxt "shortcut window"
+msgid "Clear history"
+msgstr "清除历史"
+
+#: src/math-shortcuts.ui:48
+msgctxt "shortcut window"
 msgid "Quit the application"
 msgstr "退出程序"
 
-#: src/math-shortcuts.ui:49
+#: src/math-shortcuts.ui:56
 msgctxt "shortcut window"
 msgid "Switching modes"
 msgstr "切换模式"
 
-#: src/math-shortcuts.ui:54
+#: src/math-shortcuts.ui:61
 msgctxt "shortcut window"
 msgid "Switch to Basic mode"
 msgstr "切换到基本模式"
 
-#: src/math-shortcuts.ui:61
+#: src/math-shortcuts.ui:68
 msgctxt "shortcut window"
 msgid "Switch to Advanced mode"
 msgstr "高级模式"
 
-#: src/math-shortcuts.ui:68
+#: src/math-shortcuts.ui:75
 msgctxt "shortcut window"
 msgid "Switch to Financial mode"
 msgstr "切换到财务模式"
 
-#: src/math-shortcuts.ui:75
+#: src/math-shortcuts.ui:82
 msgctxt "shortcut window"
 msgid "Switch to Programming mode"
 msgstr "切换到编程模式"
 
-#: src/math-shortcuts.ui:82
+#: src/math-shortcuts.ui:89
 msgctxt "shortcut window"
 msgid "Switch to Keyboard mode"
 msgstr "切换到键盘模式"
 
-#: src/math-shortcuts.ui:90
+#: src/math-shortcuts.ui:97
 msgctxt "shortcut window"
 msgid "Keyboard entry"
 msgstr "键盘输入"
 
-#: src/math-shortcuts.ui:95
+#: src/math-shortcuts.ui:102
 msgctxt "shortcut window"
 msgid "Multiply (×)"
 msgstr "相乘 (×)"
 
-#: src/math-shortcuts.ui:102
+#: src/math-shortcuts.ui:109
 msgctxt "shortcut window"
 msgid "Divide (÷)"
 msgstr "除以 (÷)"
 
-#: src/math-shortcuts.ui:109
+#: src/math-shortcuts.ui:116
 msgctxt "shortcut window"
 msgid "Square root (√)"
 msgstr "平方根 (√)"
 
-#: src/math-shortcuts.ui:116
+#: src/math-shortcuts.ui:123
 msgctxt "shortcut window"
 msgid "Inverse"
 msgstr "转换为反角"
 
-#: src/math-shortcuts.ui:123
+#: src/math-shortcuts.ui:130
 msgctxt "shortcut window"
 msgid "Pi (π)"
 msgstr "圆周率 (π)"
 
-#: src/math-shortcuts.ui:130
+#: src/math-shortcuts.ui:137
 msgctxt "shortcut window"
 msgid "Enter numbers in scientific format"
 msgstr "以科学计数法输入数字"
 
-#: src/math-shortcuts.ui:138
+#: src/math-shortcuts.ui:145
 msgctxt "shortcut window"
 msgid "Programming mode"
 msgstr "编程模式"
 
-#: src/math-shortcuts.ui:143
+#: src/math-shortcuts.ui:150
 msgctxt "shortcut window"
 msgid "Switch to binary"
 msgstr "切换至二进制"
 
-#: src/math-shortcuts.ui:150
+#: src/math-shortcuts.ui:157
 msgctxt "shortcut window"
 msgid "Switch to octal"
 msgstr "切换至八进制"
 
-#: src/math-shortcuts.ui:157
+#: src/math-shortcuts.ui:164
 msgctxt "shortcut window"
 msgid "Switch to decimal"
 msgstr "切换至十进制"
 
-#: src/math-shortcuts.ui:164
+#: src/math-shortcuts.ui:171
 msgctxt "shortcut window"
 msgid "Switch to hexadecimal"
 msgstr "切换到十六进制"
@@ -1450,9 +1461,9 @@ msgstr "逻辑非运算只对正整数定义"
 msgid "Shift is only possible on integer values"
 msgstr "只能对整数值进行移位运算"
 
-#: lib/serializer.vala:332
-msgid "Precision error"
-msgstr "精度错误"
+#: lib/serializer.vala:342
+msgid "Overflow: the result couldn’t be calculated"
+msgstr "溢出：该结果无法计算"
 
 #: lib/unit.vala:29
 msgid "Angle"
@@ -2040,692 +2051,709 @@ msgid "gram,grams,gramme,grammes,g"
 msgstr "gram,grams,gramme,grammes,g"
 
 #: lib/unit.vala:76
+msgid "Stone"
+msgstr "英石"
+
+#: lib/unit.vala:76
+#, c-format
+#| msgctxt "unit-format"
+#| msgid "%s s"
+msgctxt "unit-format"
+msgid "%s st"
+msgstr "%s st"
+
+#: lib/unit.vala:76
+msgctxt "unit-symbols"
+msgid "stone,st,stones"
+msgstr "stone,st,stones"
+
+#: lib/unit.vala:77
 msgid "Years"
 msgstr "年"
 
-#: lib/unit.vala:76
+#: lib/unit.vala:77
 #, c-format
 msgctxt "unit-format"
 msgid "%s years"
 msgstr "%s years"
 
-#: lib/unit.vala:76
+#: lib/unit.vala:77
 msgctxt "unit-symbols"
 msgid "year,years"
 msgstr "year,years"
 
-#: lib/unit.vala:77
+#: lib/unit.vala:78
 msgid "Days"
 msgstr "天"
 
-#: lib/unit.vala:77
+#: lib/unit.vala:78
 #, c-format
 msgctxt "unit-format"
 msgid "%s days"
 msgstr "%s days"
 
-#: lib/unit.vala:77
+#: lib/unit.vala:78
 msgctxt "unit-symbols"
 msgid "day,days"
 msgstr "day,days"
 
-#: lib/unit.vala:78
+#: lib/unit.vala:79
 msgid "Hours"
 msgstr "时"
 
-#: lib/unit.vala:78
+#: lib/unit.vala:79
 #, c-format
 msgctxt "unit-format"
 msgid "%s hours"
 msgstr "%s hours"
 
-#: lib/unit.vala:78
+#: lib/unit.vala:79
 msgctxt "unit-symbols"
 msgid "hour,hours"
 msgstr "hour,hours"
 
-#: lib/unit.vala:79
+#: lib/unit.vala:80
 msgid "Minutes"
 msgstr "分"
 
-#: lib/unit.vala:79
+#: lib/unit.vala:80
 #, c-format
 msgctxt "unit-format"
 msgid "%s minutes"
 msgstr "%s minutes"
 
-#: lib/unit.vala:79
+#: lib/unit.vala:80
 msgctxt "unit-symbols"
 msgid "minute,minutes"
 msgstr "minute,minutes"
 
-#: lib/unit.vala:80
+#: lib/unit.vala:81
 msgid "Seconds"
 msgstr "秒"
 
-#: lib/unit.vala:80
+#: lib/unit.vala:81
 #, c-format
 msgctxt "unit-format"
 msgid "%s s"
 msgstr "%s s"
 
-#: lib/unit.vala:80
+#: lib/unit.vala:81
 msgctxt "unit-symbols"
 msgid "second,seconds,s"
 msgstr "second,seconds,s"
 
-#: lib/unit.vala:81
+#: lib/unit.vala:82
 msgid "Milliseconds"
 msgstr "毫秒"
 
-#: lib/unit.vala:81
+#: lib/unit.vala:82
 #, c-format
 msgctxt "unit-format"
 msgid "%s ms"
 msgstr "%s ms"
 
-#: lib/unit.vala:81
+#: lib/unit.vala:82
 msgctxt "unit-symbols"
 msgid "millisecond,milliseconds,ms"
 msgstr "millisecond,milliseconds,ms"
 
-#: lib/unit.vala:82
+#: lib/unit.vala:83
 msgid "Microseconds"
 msgstr "微秒"
 
-#: lib/unit.vala:82
+#: lib/unit.vala:83
 #, c-format
 msgctxt "unit-format"
 msgid "%s μs"
 msgstr "%s μs"
 
-#: lib/unit.vala:82
+#: lib/unit.vala:83
 msgctxt "unit-symbols"
 msgid "microsecond,microseconds,us,μs"
 msgstr "microsecond,microseconds,us,μs"
 
-#: lib/unit.vala:83
+#: lib/unit.vala:84
 msgid "Celsius"
 msgstr "摄氏度"
 
-#: lib/unit.vala:83
+#: lib/unit.vala:84
 #, c-format
 msgctxt "unit-format"
 msgid "%s ˚C"
 msgstr "%s ˚C"
 
-#: lib/unit.vala:83
+#: lib/unit.vala:84
 msgctxt "unit-symbols"
 msgid "degC,˚C,C,c,Celsius,celsius"
 msgstr "˚C,C,c,摄氏度"
 
 # should be Fahrenheit?
-#: lib/unit.vala:84
+#: lib/unit.vala:85
 msgid "Fahrenheit"
 msgstr "华氏度"
 
-#: lib/unit.vala:84
+#: lib/unit.vala:85
 #, c-format
 msgctxt "unit-format"
 msgid "%s ˚F"
 msgstr "%s ˚F"
 
-#: lib/unit.vala:84
+#: lib/unit.vala:85
 msgctxt "unit-symbols"
 msgid "degF,˚F,F,f,Fahrenheit,fahrenheit"
 msgstr "˚F,F,f,华氏度"
 
-#: lib/unit.vala:85
+#: lib/unit.vala:86
 msgid "Kelvin"
 msgstr "开尔文"
 
-#: lib/unit.vala:85
+#: lib/unit.vala:86
 #, c-format
 msgctxt "unit-format"
 msgid "%s K"
 msgstr "%s K"
 
-#: lib/unit.vala:85
+#: lib/unit.vala:86
 msgctxt "unit-symbols"
 msgid "k,K,Kelvin,kelvin"
 msgstr "k,K,开尔文"
 
-#: lib/unit.vala:86
+#: lib/unit.vala:87
 msgid "Rankine"
 msgstr "兰金"
 
-#: lib/unit.vala:86
+#: lib/unit.vala:87
 #, c-format
 msgctxt "unit-format"
 msgid "%s ˚R"
 msgstr "%s ˚R"
 
-#: lib/unit.vala:86
+#: lib/unit.vala:87
 msgctxt "unit-symbols"
 msgid "degR,˚R,˚Ra,r,R,Rankine,rankine"
 msgstr "degR,˚R,˚Ra,r,R,Rankine,rankine"
 
 #. We use IEC prefix for digital storage units. i.e. 1 kB = 1 KiloByte = 1000 bytes, and 1 KiB = 1 kibiByte = 1024 bytes
-#: lib/unit.vala:88
+#: lib/unit.vala:89
 msgid "Bits"
 msgstr "位"
 
-#: lib/unit.vala:88
+#: lib/unit.vala:89
 #, c-format
 msgctxt "unit-format"
 msgid "%s b"
 msgstr "%s b"
 
-#: lib/unit.vala:88
+#: lib/unit.vala:89
 msgctxt "unit-symbols"
 msgid "bit,bits,b"
 msgstr "位,位,b"
 
-#: lib/unit.vala:89
+#: lib/unit.vala:90
 msgid "Bytes"
 msgstr "字节"
 
-#: lib/unit.vala:89
+#: lib/unit.vala:90
 #, c-format
 msgctxt "unit-format"
 msgid "%s B"
 msgstr "%s B"
 
-#: lib/unit.vala:89
+#: lib/unit.vala:90
 msgctxt "unit-symbols"
 msgid "byte,bytes,B"
 msgstr "字节,字节,字节,B"
 
-#: lib/unit.vala:90
+#: lib/unit.vala:91
 msgid "Nibbles"
 msgstr "Nibbles"
 
-#: lib/unit.vala:90
+#: lib/unit.vala:91
 #, c-format
 msgctxt "unit-format"
 msgid "%s nibble"
 msgstr "%s nibble"
 
-#: lib/unit.vala:90
+#: lib/unit.vala:91
 msgctxt "unit-symbols"
 msgid "nibble,nibbles"
 msgstr "nibble,nibbles"
 
 #. The SI symbol for kilo is k, however we also allow "KB" and "Kb", as they are widely used and accepted.
-#: lib/unit.vala:92
+#: lib/unit.vala:93
 msgid "Kilobits"
 msgstr "千位"
 
-#: lib/unit.vala:92
+#: lib/unit.vala:93
 #, c-format
 msgctxt "unit-format"
 msgid "%s kb"
 msgstr "%s kb"
 
-#: lib/unit.vala:92
+#: lib/unit.vala:93
 msgctxt "unit-symbols"
 msgid "kilobit,kilobits,kb,Kb"
 msgstr "千位,千位,kb,Kb"
 
-#: lib/unit.vala:93
+#: lib/unit.vala:94
 msgid "Kilobytes"
 msgstr "千字节"
 
-#: lib/unit.vala:93
+#: lib/unit.vala:94
 #, c-format
 msgctxt "unit-format"
 msgid "%s kB"
 msgstr "%s kB"
 
-#: lib/unit.vala:93
+#: lib/unit.vala:94
 msgctxt "unit-symbols"
 msgid "kilobyte,kilobytes,kB,KB"
 msgstr "千字节,千字节,kb,Kb"
 
-#: lib/unit.vala:94
+#: lib/unit.vala:95
 msgid "Kibibits"
 msgstr "Kibibits"
 
-#: lib/unit.vala:94
+#: lib/unit.vala:95
 #, c-format
 msgctxt "unit-format"
 msgid "%s Kib"
 msgstr "%s Kib"
 
-#: lib/unit.vala:94
+#: lib/unit.vala:95
 msgctxt "unit-symbols"
 msgid "kibibit,kibibits,Kib"
 msgstr "kibibit,kibibits,Kib"
 
-#: lib/unit.vala:95
+#: lib/unit.vala:96
 msgid "Kibibytes"
 msgstr "Kibibytes"
 
-#: lib/unit.vala:95
+#: lib/unit.vala:96
 #, c-format
 msgctxt "unit-format"
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: lib/unit.vala:95
+#: lib/unit.vala:96
 msgctxt "unit-symbols"
 msgid "kibibyte,kibibytes,KiB"
 msgstr "kibibyte,kibibytes,KiB"
 
-#: lib/unit.vala:96
+#: lib/unit.vala:97
 msgid "Megabits"
 msgstr "兆位"
 
-#: lib/unit.vala:96
+#: lib/unit.vala:97
 #, c-format
 msgctxt "unit-format"
 msgid "%s Mb"
 msgstr "%s Mb"
 
-#: lib/unit.vala:96
+#: lib/unit.vala:97
 msgctxt "unit-symbols"
 msgid "megabit,megabits,Mb"
 msgstr "兆位,兆位,Mb"
 
-#: lib/unit.vala:97
+#: lib/unit.vala:98
 msgid "Megabytes"
 msgstr "兆字节"
 
-#: lib/unit.vala:97
+#: lib/unit.vala:98
 #, c-format
 msgctxt "unit-format"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: lib/unit.vala:97
+#: lib/unit.vala:98
 msgctxt "unit-symbols"
 msgid "megabyte,megabytes,MB"
 msgstr "兆字节,兆字节,MB"
 
-#: lib/unit.vala:98
+#: lib/unit.vala:99
 msgid "Mebibits"
 msgstr "Mebibits"
 
-#: lib/unit.vala:98
+#: lib/unit.vala:99
 #, c-format
 msgctxt "unit-format"
 msgid "%s Mib"
 msgstr "%s Mib"
 
-#: lib/unit.vala:98
+#: lib/unit.vala:99
 msgctxt "unit-symbols"
 msgid "mebibit,mebibits,Mib"
 msgstr "mebibit,mebibits,Mib"
 
-#: lib/unit.vala:99
+#: lib/unit.vala:100
 msgid "Mebibytes"
 msgstr "Mebibytes"
 
-#: lib/unit.vala:99
+#: lib/unit.vala:100
 #, c-format
 msgctxt "unit-format"
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: lib/unit.vala:99
+#: lib/unit.vala:100
 msgctxt "unit-symbols"
 msgid "mebibyte,mebibytes,MiB"
 msgstr "mebibyte,mebibytes,MiB"
 
-#: lib/unit.vala:100
+#: lib/unit.vala:101
 msgid "Gigabits"
 msgstr "吉位"
 
-#: lib/unit.vala:100
+#: lib/unit.vala:101
 #, c-format
 msgctxt "unit-format"
 msgid "%s Gb"
 msgstr "%s Gb"
 
-#: lib/unit.vala:100
+#: lib/unit.vala:101
 msgctxt "unit-symbols"
 msgid "gigabit,gigabits,Gb"
 msgstr "吉位,吉位,Gb"
 
-#: lib/unit.vala:101
+#: lib/unit.vala:102
 msgid "Gigabytes"
 msgstr "吉字节"
 
-#: lib/unit.vala:101
+#: lib/unit.vala:102
 #, c-format
 msgctxt "unit-format"
 msgid "%s GB"
 msgstr "%s GB"
 
-#: lib/unit.vala:101
+#: lib/unit.vala:102
 msgctxt "unit-symbols"
 msgid "gigabyte,gigabytes,GB"
 msgstr "吉字节,吉字节,GB"
 
-#: lib/unit.vala:102
+#: lib/unit.vala:103
 msgid "Gibibits"
 msgstr "Gibibits"
 
-#: lib/unit.vala:102
+#: lib/unit.vala:103
 #, c-format
 msgctxt "unit-format"
 msgid "%s Gib"
 msgstr "%s Gib"
 
-#: lib/unit.vala:102
+#: lib/unit.vala:103
 msgctxt "unit-symbols"
 msgid "gibibit,gibibits,Gib"
 msgstr "gibibit,gibibits,Gib"
 
-#: lib/unit.vala:103
+#: lib/unit.vala:104
 msgid "Gibibytes"
 msgstr "Gibibytes"
 
-#: lib/unit.vala:103
+#: lib/unit.vala:104
 #, c-format
 msgctxt "unit-format"
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: lib/unit.vala:103
+#: lib/unit.vala:104
 msgctxt "unit-symbols"
 msgid "gibibyte,gibibytes,GiB"
 msgstr "gibibyte,gibibytes,GiB"
 
-#: lib/unit.vala:104
+#: lib/unit.vala:105
 msgid "Terabits"
 msgstr "太位"
 
-#: lib/unit.vala:104
+#: lib/unit.vala:105
 #, c-format
 msgctxt "unit-format"
 msgid "%s Tb"
 msgstr "%s Tb"
 
-#: lib/unit.vala:104
+#: lib/unit.vala:105
 msgctxt "unit-symbols"
 msgid "terabit,terabits,Tb"
 msgstr "太位,太位,Tb"
 
-#: lib/unit.vala:105
+#: lib/unit.vala:106
 msgid "Terabytes"
 msgstr "太字节"
 
-#: lib/unit.vala:105
+#: lib/unit.vala:106
 #, c-format
 msgctxt "unit-format"
 msgid "%s TB"
 msgstr "%s TB"
 
-#: lib/unit.vala:105
+#: lib/unit.vala:106
 msgctxt "unit-symbols"
 msgid "terabyte,terabytes,TB"
 msgstr "太字节,太字节,Tb"
 
-#: lib/unit.vala:106
+#: lib/unit.vala:107
 msgid "Tebibits"
 msgstr "Tebibits"
 
-#: lib/unit.vala:106
+#: lib/unit.vala:107
 #, c-format
 msgctxt "unit-format"
 msgid "%s Tib"
 msgstr "%s Tib"
 
-#: lib/unit.vala:106
+#: lib/unit.vala:107
 msgctxt "unit-symbols"
 msgid "tebibit,tebibits,Tib"
 msgstr "tebibit,tebibits,Tib"
 
-#: lib/unit.vala:107
+#: lib/unit.vala:108
 msgid "Tebibytes"
 msgstr "Tebibytes"
 
-#: lib/unit.vala:107
+#: lib/unit.vala:108
 #, c-format
 msgctxt "unit-format"
 msgid "%s TiB"
 msgstr "%s TiB"
 
-#: lib/unit.vala:107
+#: lib/unit.vala:108
 msgctxt "unit-symbols"
 msgid "tebibyte,tebibytes,TiB"
 msgstr "tebibyte,tebibytes,TiB"
 
-#: lib/unit.vala:108
+#: lib/unit.vala:109
 msgid "Petabits"
 msgstr "拍位"
 
-#: lib/unit.vala:108
+#: lib/unit.vala:109
 #, c-format
 msgctxt "unit-format"
 msgid "%s Pb"
 msgstr "%s Pb"
 
-#: lib/unit.vala:108
+#: lib/unit.vala:109
 msgctxt "unit-symbols"
 msgid "petabit,petabits,Pb"
 msgstr "拍位,拍位,Pb"
 
-#: lib/unit.vala:109
+#: lib/unit.vala:110
 msgid "Petabytes"
 msgstr "拍字节"
 
-#: lib/unit.vala:109
+#: lib/unit.vala:110
 #, c-format
 msgctxt "unit-format"
 msgid "%s PB"
 msgstr "%s PB"
 
-#: lib/unit.vala:109
+#: lib/unit.vala:110
 msgctxt "unit-symbols"
 msgid "petabyte,petabytes,PB"
 msgstr "拍字节,拍字节,PB"
 
-#: lib/unit.vala:110
+#: lib/unit.vala:111
 msgid "Pebibits"
 msgstr "Pebibits"
 
-#: lib/unit.vala:110
+#: lib/unit.vala:111
 #, c-format
 msgctxt "unit-format"
 msgid "%s Pib"
 msgstr "%s Pib"
 
-#: lib/unit.vala:110
+#: lib/unit.vala:111
 msgctxt "unit-symbols"
 msgid "pebibit,pebibits,Pib"
 msgstr "pebibit,pebibits,Pib"
 
-#: lib/unit.vala:111
+#: lib/unit.vala:112
 msgid "Pebibytes"
 msgstr "Pebibytes"
 
-#: lib/unit.vala:111
+#: lib/unit.vala:112
 #, c-format
 msgctxt "unit-format"
 msgid "%s PiB"
 msgstr "%s PiB"
 
-#: lib/unit.vala:111
+#: lib/unit.vala:112
 msgctxt "unit-symbols"
 msgid "pebibyte,pebibytes,PiB"
 msgstr "pebibyte,pebibytes,PiB"
 
-#: lib/unit.vala:112
+#: lib/unit.vala:113
 msgid "Exabits"
 msgstr "艾位"
 
-#: lib/unit.vala:112 lib/unit.vala:116
+#: lib/unit.vala:113 lib/unit.vala:117
 #, c-format
 msgctxt "unit-format"
 msgid "%s Eb"
 msgstr "%s Eb"
 
-#: lib/unit.vala:112
+#: lib/unit.vala:113
 msgctxt "unit-symbols"
 msgid "exabit,exabits,Eb"
 msgstr "艾位,艾位,Eb"
 
-#: lib/unit.vala:113
+#: lib/unit.vala:114
 msgid "Exabytes"
 msgstr "艾字节"
 
-#: lib/unit.vala:113 lib/unit.vala:117
+#: lib/unit.vala:114 lib/unit.vala:118
 #, c-format
 msgctxt "unit-format"
 msgid "%s EB"
 msgstr "%s EB"
 
-#: lib/unit.vala:113
+#: lib/unit.vala:114
 msgctxt "unit-symbols"
 msgid "exabyte,exabytes,EB"
 msgstr "艾字节,艾字节,EB"
 
-#: lib/unit.vala:114
+#: lib/unit.vala:115
 msgid "Exbibits"
 msgstr "Exbibits"
 
-#: lib/unit.vala:114
+#: lib/unit.vala:115
 #, c-format
 msgctxt "unit-format"
 msgid "%s Eib"
 msgstr "%s Eib"
 
-#: lib/unit.vala:114
+#: lib/unit.vala:115
 msgctxt "unit-symbols"
 msgid "exbibit,exbibits,Eib"
 msgstr "exbibit,exbibits,Eib"
 
-#: lib/unit.vala:115
+#: lib/unit.vala:116
 msgid "Exbibytes"
 msgstr "Exbibytes"
 
-#: lib/unit.vala:115
+#: lib/unit.vala:116
 #, c-format
 msgctxt "unit-format"
 msgid "%s EiB"
 msgstr "%s EiB"
 
-#: lib/unit.vala:115
+#: lib/unit.vala:116
 msgctxt "unit-symbols"
 msgid "exbibyte,exbibytes,EiB"
 msgstr "exbibyte,exbibytes,EiB"
 
-#: lib/unit.vala:116
+#: lib/unit.vala:117
 msgid "Zettabits"
 msgstr "泽位"
 
-#: lib/unit.vala:116
+#: lib/unit.vala:117
 msgctxt "unit-symbols"
 msgid "zettabit,zettabits,Zb"
 msgstr "泽位,泽位,Zb"
 
-#: lib/unit.vala:117
+#: lib/unit.vala:118
 msgid "Zettabytes"
 msgstr "泽字节"
 
-#: lib/unit.vala:117
+#: lib/unit.vala:118
 msgctxt "unit-symbols"
 msgid "zettabyte,zettabytes,ZB"
 msgstr "泽字节,泽字节,ZB"
 
-#: lib/unit.vala:118
+#: lib/unit.vala:119
 msgid "Zebibits"
 msgstr "Zebibits"
 
-#: lib/unit.vala:118
+#: lib/unit.vala:119
 #, c-format
 msgctxt "unit-format"
 msgid "%s Zib"
 msgstr "%s Zib"
 
-#: lib/unit.vala:118
+#: lib/unit.vala:119
 msgctxt "unit-symbols"
 msgid "zebibit,zebibits,Zib"
 msgstr "zebibit,zebibits,Zib"
 
-#: lib/unit.vala:119
+#: lib/unit.vala:120
 msgid "Zebibytes"
 msgstr "Zebibytes"
 
-#: lib/unit.vala:119
+#: lib/unit.vala:120
 #, c-format
 msgctxt "unit-format"
 msgid "%s ZiB"
 msgstr "%s ZiB"
 
-#: lib/unit.vala:119
+#: lib/unit.vala:120
 msgctxt "unit-symbols"
 msgid "zebibyte,zebibytes,ZiB"
 msgstr "zebibyte,zebibytes,ZiB"
 
-#: lib/unit.vala:120
+#: lib/unit.vala:121
 msgid "Yottabits"
 msgstr "尧位"
 
-#: lib/unit.vala:120
+#: lib/unit.vala:121
 #, c-format
 msgctxt "unit-format"
 msgid "%s Yb"
 msgstr "%s Yb"
 
-#: lib/unit.vala:120
+#: lib/unit.vala:121
 msgctxt "unit-symbols"
 msgid "yottabit,yottabits,Yb"
 msgstr "尧位,尧位,Yb"
 
-#: lib/unit.vala:121
+#: lib/unit.vala:122
 msgid "Yottabytes"
 msgstr "尧字节"
 
-#: lib/unit.vala:121
+#: lib/unit.vala:122
 #, c-format
 msgctxt "unit-format"
 msgid "%s YB"
 msgstr "%s YB"
 
-#: lib/unit.vala:121
+#: lib/unit.vala:122
 msgctxt "unit-symbols"
 msgid "yottabyte,yottabytes,YB"
 msgstr "尧字节,尧字节,YB"
 
-#: lib/unit.vala:122
+#: lib/unit.vala:123
 msgid "Yobibits"
 msgstr "Yobibits"
 
-#: lib/unit.vala:122
+#: lib/unit.vala:123
 #, c-format
 msgctxt "unit-format"
 msgid "%s Yib"
 msgstr "%s Yib"
 
-#: lib/unit.vala:122
+#: lib/unit.vala:123
 msgctxt "unit-symbols"
 msgid "yobibit,yobibits,Yib"
 msgstr "yobibit,yobibits,Yib"
 
-#: lib/unit.vala:123
+#: lib/unit.vala:124
 msgid "Yobibytes"
 msgstr "Yobibytes"
 
-#: lib/unit.vala:123
+#: lib/unit.vala:124
 #, c-format
 msgctxt "unit-format"
 msgid "%s YiB"
 msgstr "%s YiB"
 
-#: lib/unit.vala:123
+#: lib/unit.vala:124
 msgctxt "unit-symbols"
 msgid "yobibyte,yobibytes,YiB"
 msgstr "yobibyte,yobibytes,YiB"
 
-#: lib/unit.vala:125
+#: lib/unit.vala:126
 msgid "Currency"
 msgstr "货币"
 
 #. Translators: result of currency conversion, %s is the symbol, %%s is the placeholder for amount, i.e.: USD100
-#: lib/unit.vala:131
+#: lib/unit.vala:132
 #, c-format
 msgid "%s%%s"
 msgstr "%s%%s"
@@ -2747,12 +2775,12 @@ msgid "Show release version"
 msgstr "显示版本信息"
 
 #. Translators: Error message displayed when unable to launch help browser
-#: src/gnome-calculator.vala:296
+#: src/gnome-calculator.vala:303
 msgid "Unable to open help file"
 msgstr "无法打开帮助文件"
 
 #. The translator credits. Please translate this with your name (s).
-#: src/gnome-calculator.vala:327
+#: src/gnome-calculator.vala:334
 msgid "translator-credits"
 msgstr ""
 "Funda Wang <fundawang@linux.net.cn>, 2003, 2004\n"
@@ -2769,12 +2797,12 @@ msgstr ""
 "zhouxiaobo <zhouxiaobo.500@gmail.com>, 2015\n"
 "Jeff Bai <jeffbai@aosc.xyz>, 2015, 2016"
 
-#: src/gnome-calculator.vala:333
+#: src/gnome-calculator.vala:340
 msgid "About Calculator"
 msgstr "关于计算器"
 
 #. Short description in the about dialog
-#: src/gnome-calculator.vala:341
+#: src/gnome-calculator.vala:348
 msgid "Calculator with financial and scientific modes."
 msgstr "带有财务和科学模式的计算器。"
 
@@ -2854,10 +2882,16 @@ msgstr "32 位"
 msgid "64 bits"
 msgstr "64 位"
 
-#: src/math-window.vala:130
+#: src/math-window.vala:134
 msgid "_Quit"
 msgstr "退出(_Q)"
 
+#~ msgid "accessories-calculator"
+#~ msgstr "accessories-calculator"
+
+#~ msgid "Precision error"
+#~ msgstr "精度错误"
+
 #~ msgid "Reciprocal of zero is undefined"
 #~ msgstr "对零求倒数无意义"
 
@@ -2905,9 +2939,6 @@ msgstr "退出(_Q)"
 #~ msgid "Negative root of zero is undefined"
 #~ msgstr "零的负数次方根无意义"
 
-#~ msgid "Overflow: the result couldn't be calculated"
-#~ msgstr "溢出：该结果无法计算"
-
 #~ msgid "Mode"
 #~ msgstr "模式"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a328314..3ff3132 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,18 +8,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gcaltool 6.1.5\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"calculator&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2018-03-19 17:14+0000\n"
-"PO-Revision-Date: 2018-03-20 22:54+0800\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-calculator/"
+"issues\n"
+"POT-Creation-Date: 2018-07-24 22:53+0000\n"
+"PO-Revision-Date: 2018-08-12 16:01+0800\n"
+"Last-Translator: pan93412 <pan93412@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <community@linuxhall.org>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 1.8.4\n"
 
 #: src/buttons-advanced.ui:17 src/buttons-programming.ui:2143
 msgid "Inverse [Ctrl+I]"
@@ -716,8 +716,8 @@ msgid "The GNOME Project"
 msgstr "GNOME 專案"
 
 #. Program name in the about dialog
-#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:48
-#: src/gnome-calculator.vala:81 src/gnome-calculator.vala:339
+#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:80
+#: src/gnome-calculator.vala:81 src/gnome-calculator.vala:330
 msgid "Calculator"
 msgstr "計算機"
 
@@ -756,27 +756,48 @@ msgstr "變數名稱"
 msgid "Store value into existing or new variable"
 msgstr "將數值儲存到現有或新的變數"
 
-#: src/math-window.ui:20 src/math-window.vala:88
+#: src/math-window.ui:20 src/math-window.vala:92
 msgid "Basic Mode"
 msgstr "基礎模式"
 
-#: src/math-window.ui:25 src/math-window.vala:93
+#: src/math-window.ui:25 src/math-window.vala:97
 msgid "Advanced Mode"
 msgstr "進階模式"
 
-#: src/math-window.ui:30 src/math-window.vala:98
+#: src/math-window.ui:30 src/math-window.vala:102
 msgid "Financial Mode"
 msgstr "金融模式"
 
-#: src/math-window.ui:35 src/math-window.vala:103
+#: src/math-window.ui:35 src/math-window.vala:107
 msgid "Programming Mode"
 msgstr "程式設計模式"
 
-#: src/math-window.ui:40 src/math-window.vala:108
+#: src/math-window.ui:40 src/math-window.vala:112
 msgid "Keyboard Mode"
 msgstr "鍵盤模式"
 
-#: src/math-window.ui:88
+#: src/math-window.ui:49
+msgid "New Window"
+msgstr "新視窗"
+
+#. Title of preferences dialog
+#: src/math-window.ui:56 src/math-preferences.vala:30
+msgid "Preferences"
+msgstr "偏好設定"
+
+#: src/math-window.ui:63
+msgid "_Keyboard Shortcuts"
+msgstr "鍵盤快捷鍵(_K)"
+
+#: src/math-window.ui:68
+msgid "Help"
+msgstr "求助"
+
+#: src/math-window.ui:73
+msgid "About"
+msgstr "關於"
+
+#: src/math-window.ui:120
 msgid "Menu"
 msgstr "選單"
 
@@ -900,31 +921,6 @@ msgctxt "shortcut window"
 msgid "Switch to hexadecimal"
 msgstr "切換到 16 進位"
 
-#: src/menu.ui:7
-msgid "New Window"
-msgstr "新視窗"
-
-#. Title of preferences dialog
-#: src/menu.ui:14 src/math-preferences.vala:30
-msgid "Preferences"
-msgstr "偏好設定"
-
-#: src/menu.ui:21
-msgid "_Keyboard Shortcuts"
-msgstr "鍵盤快捷鍵(_K)"
-
-#: src/menu.ui:26
-msgid "Help"
-msgstr "求助"
-
-#: src/menu.ui:31
-msgid "About"
-msgstr "關於"
-
-#: src/menu.ui:35
-msgid "Quit"
-msgstr "結束"
-
 #: data/org.gnome.calculator.gschema.xml:25
 msgid "Accuracy value"
 msgstr "準確度數值"
@@ -1248,8 +1244,8 @@ msgid "Tunisian Dinar"
 msgstr "突尼西亞第納爾"
 
 #: lib/currency.vala:80
-msgid "New Turkish Lira"
-msgstr "新土耳其里拉"
+msgid "Turkish Lira"
+msgstr "土耳其里拉"
 
 #: lib/currency.vala:81
 msgid "T&T Dollar (TTD)"
@@ -1468,8 +1464,8 @@ msgid "Volume"
 msgstr "體積"
 
 #: lib/unit.vala:33
-msgid "Weight"
-msgstr "重量"
+msgid "Mass"
+msgstr "質量"
 
 #: lib/unit.vala:34
 msgid "Duration"
@@ -2758,12 +2754,12 @@ msgid "Show release version"
 msgstr "顯示釋出版本"
 
 #. Translators: Error message displayed when unable to launch help browser
-#: src/gnome-calculator.vala:303
+#: src/gnome-calculator.vala:294
 msgid "Unable to open help file"
 msgstr "無法開啟求助檔案"
 
 #. The translator credits. Please translate this with your name (s).
-#: src/gnome-calculator.vala:334
+#: src/gnome-calculator.vala:325
 msgid "translator-credits"
 msgstr ""
 "如對翻譯有任何意見，請送一封電子郵件給\n"
@@ -2773,12 +2769,12 @@ msgstr ""
 "Abel Cheung <abel@oaka.org>, 2003, 05, 07\n"
 "Ching-Hung Lin <2billlin@yahoo.com.tw>, 2004"
 
-#: src/gnome-calculator.vala:340
+#: src/gnome-calculator.vala:331
 msgid "About Calculator"
 msgstr "關於計算機"
 
 #. Short description in the about dialog
-#: src/gnome-calculator.vala:348
+#: src/gnome-calculator.vala:339
 msgid "Calculator with financial and scientific modes."
 msgstr "附有財務及科學計算模式的計算機。"
 
@@ -2858,10 +2854,16 @@ msgstr "32 位元"
 msgid "64 bits"
 msgstr "64 位元"
 
-#: src/math-window.vala:134
+#: src/math-window.vala:138
 msgid "_Quit"
 msgstr "離開(_Q)"
 
+#~ msgid "Quit"
+#~ msgstr "結束"
+
+#~ msgid "Weight"
+#~ msgstr "重量"
+
 #~ msgid "accessories-calculator"
 #~ msgstr "accessories-calculator"
 
diff --git a/search-provider/Makefile.am b/search-provider/Makefile.am
deleted file mode 100644
index c4a7f6f..0000000
--- a/search-provider/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-libexec_PROGRAMS = gnome-calculator-search-provider
-
-gnome_calculator_search_provider_SOURCES = \
-	search-provider.vala
-
-gnome_calculator_search_provider_VALAFLAGS = \
-	--pkg posix \
-	--pkg gio-2.0
-
-gnome_calculator_search_provider_CPPFLAGS = \
-	-w \
-	$(SEARCH_PROVIDER_CFLAGS)
-
-gnome_calculator_search_provider_LDADD = \
-	$(SEARCH_PROVIDER_LIBS)
-
-searchproviderdir = $(datadir)/gnome-shell/search-providers
-searchprovider_DATA = org.gnome.Calculator-search-provider.ini
-
-servicedir = $(datadir)/dbus-1/services
-service_DATA = $(service_in_files:.service.in=.service)
-service_in_files = org.gnome.Calculator.SearchProvider.service.in
-
-org.gnome.Calculator.SearchProvider.service: org.gnome.Calculator.SearchProvider.service.in Makefile
-	$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@.tmp && mv $@.tmp $@
-
-EXTRA_DIST = \
-	$(searchprovider_DATA) \
-	$(service_in_files)
-
-CLEANFILES = \
-	$(service_DATA)
-
--include $(top_srcdir)/git.mk
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 37ce3b1..8177823 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -24,10 +24,22 @@ grade: devel # must be 'stable' to release into candidate/stable channels
 confinement: strict
 
 plugs:
-    gnome-3-26-1604:
-      interface: content
-      target: $SNAP/gnome-platform
-      default-provider: gnome-3-26-1604:gnome-3-26-1604
+  gnome-3-26-1604:
+    interface: content
+    target: $SNAP/gnome-platform
+    default-provider: gnome-3-26-1604
+  gtk-3-themes:
+    interface: content
+    target: $SNAP/data-dir/themes
+    default-provider: gtk-common-themes
+  icon-themes:
+    interface: content
+    target: $SNAP/data-dir/icons
+    default-provider: gtk-common-themes
+  sound-themes:
+    interface: content
+    target: $SNAP/data-dir/sounds
+    default-provider: gtk-common-themes
 
 slots:
   # for GtkApplication registration
@@ -55,10 +67,8 @@ parts:
     build-attributes: [no-system-libraries]
     after: [desktop-gnome-platform]
     source: .
-    source-type: git
-    plugin: autotools
-    # workaround the issue described in https://launchpad.net/bugs/1583250
-    configflags: [--prefix=/snap/gnome-calculator/current/usr]
+    plugin: meson
+    meson-parameters: [--prefix=/snap/gnome-calculator/current/usr]
     organize:
       snap/gnome-calculator/current/usr: usr
     build-packages:
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 7c395f7..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,87 +0,0 @@
-bin_PROGRAMS = gnome-calculator gcalccmd
-
-AM_CPPFLAGS = \
-	-DVERSION=\""$(VERSION)"\" \
-	-DLOCALE_DIR=\""$(localedir)"\" \
-	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
-	-w \
-	-I$(top_srcdir)/lib \
-	$(LIBCALCULATOR_CFLAGS)
-
-
-resources_file = gnome-calculator.gresource.xml
-BUILT_SOURCES = resources.c
-
-resources.c: $(resources_file) $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir) $(srcdir)/gnome-calculator.gresource.xml)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
-
-gnome_calculator_SOURCES = \
-	$(top_builddir)/vapi/config.vapi \
-	gnome-calculator.vala \
-	math-buttons.vala \
-	math-converter.vala \
-	math-display.vala \
-	math-preferences.vala \
-	math-function-popover.vala \
-	math-variable-popover.vala \
-	math-window.vala \
-	math-history.vala \
-	$(BUILT_SOURCES)
-
-gnome_calculator_VALAFLAGS = \
-	--target-glib $(GLIB_REQUIRED) \
-	--pkg posix \
-	--pkg gtk+-3.0 \
-	--pkg gtksourceview-3.0 \
-	--pkg libxml-2.0 \
-	--gresources $(resources_file) \
-	$(top_builddir)/lib/libcalculator.vapi \
-	$(top_builddir)/vapi/mpfr.vapi
-
-gnome_calculator_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	$(GNOME_CALCULATOR_CFLAGS)
-
-gnome_calculator_LDADD = \
-	$(GNOME_CALCULATOR_LIBS) \
-	$(top_builddir)/lib/libcalculator.la
-
-
-gcalccmd_SOURCES = \
-	$(top_builddir)/vapi/config.vapi \
-	gcalccmd.vala
-
-gcalccmd_VALAFLAGS = \
-	--target-glib $(GLIB_REQUIRED) \
-	--pkg posix \
-	--pkg gio-2.0 \
-	--pkg gtksourceview-3.0 \
-	--pkg libxml-2.0 \
-	$(top_builddir)/lib/libcalculator.vapi \
-	$(top_builddir)/vapi/mpfr.vapi
-
-gcalccmd_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	$(GCALCCMD_CFLAGS)
-
-gcalccmd_LDADD = \
-	$(GCALCCMD_LIBS) \
-	$(top_builddir)/lib/libcalculator.la
-
-EXTRA_DIST = \
-	buttons-basic.ui \
-	buttons-advanced.ui \
-	buttons-financial.ui \
-	buttons-programming.ui \
-	history-entry.ui \
-	history-view.ui \
-	math-converter.ui \
-	math-function-popover.ui \
-	math-variable-popover.ui \
-	math-window.ui \
-	math-shortcuts.ui \
-	menu.ui \
-	calculator.css \
-	gnome-calculator.gresource.xml
-
--include $(top_srcdir)/git.mk
diff --git a/src/gnome-calculator.gresource.xml b/src/gnome-calculator.gresource.xml
index 403c045..4196d22 100644
--- a/src/gnome-calculator.gresource.xml
+++ b/src/gnome-calculator.gresource.xml
@@ -12,7 +12,6 @@
     <file preprocess="xml-stripblanks">math-variable-popover.ui</file>
     <file preprocess="xml-stripblanks">math-window.ui</file>
     <file preprocess="xml-stripblanks">math-shortcuts.ui</file>
-    <file preprocess="xml-stripblanks">menu.ui</file>
     <file>calculator.css</file>
   </gresource>
 </gresources>
diff --git a/src/gnome-calculator.vala b/src/gnome-calculator.vala
index 9f2549e..7763528 100644
--- a/src/gnome-calculator.vala
+++ b/src/gnome-calculator.vala
@@ -93,18 +93,8 @@ public class Calculator : Gtk.Application
         buttons.programming_base = number_base;
         buttons.mode = button_mode; // FIXME: We load the basic buttons even if we immediately switch to the next type
 
-        var builder = new Gtk.Builder ();
-        try
-        {
-            builder.add_from_resource ("/org/gnome/calculator/menu.ui");
-        }
-        catch (Error e)
-        {
-            error ("Error loading menu UI: %s", e.message);
-        }
-
-        var menu = builder.get_object ("appmenu") as MenuModel;
-        set_app_menu (menu);
+        /* Remove when https://wiki.gnome.org/Initiatives/GnomeGoals/AppMenuRetirement is confirmed */
+        set_app_menu (current_window.primary_menu_button.menu_model);
 
         set_accels_for_action ("win.mode::basic", {"<alt>B"});
         set_accels_for_action ("win.mode::advanced", {"<alt>A"});
@@ -116,6 +106,7 @@ public class Calculator : Gtk.Application
         set_accels_for_action ("win.undo", {"<control>Z"});
         set_accels_for_action ("win.close", {"<control>W"});
         set_accels_for_action ("win.redo", {"<control><shift>Z"});
+        set_accels_for_action ("app.quit", {"<control>Q"});
         return current_window;
     }
 
diff --git a/src/math-window.ui b/src/math-window.ui
index 5d6e97e..71948e8 100644
--- a/src/math-window.ui
+++ b/src/math-window.ui
@@ -43,6 +43,38 @@
       </item>
     </section>
   </menu>
+  <menu id="primary_menu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">New Window</attribute>
+        <attribute name="action">app.newwindow</attribute>
+        <attribute name="accel">&lt;Primary&gt;n</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Preferences</attribute>
+        <attribute name="action">app.preferences</attribute>
+      </item>
+    </section>
+    <section>
+      <attribute name="id">help-section</attribute>
+      <item>
+        <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute>
+        <attribute name="action">app.shortcuts</attribute>
+        <attribute name="accel">&lt;Primary&gt;question</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Help</attribute>
+        <attribute name="action">app.help</attribute>
+        <attribute name="accel">F1</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">About</attribute>
+        <attribute name="action">app.about</attribute>
+      </item>
+    </section>
+  </menu>
   <template class="MathWindow" parent="GtkApplicationWindow">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Calculator</property>
@@ -123,6 +155,28 @@
             </style>
           </object>
         </child>
+        <child>
+          <object class="GtkMenuButton" id="primary_menu_button">
+            <property name="visible">False</property> <!-- Disabled until https://wiki.gnome.org/Initiatives/GnomeGoals/AppMenuRetirement is confirmed -->
+            <property name="can_focus">False</property>
+            <property name="receives_default">False</property>
+            <property name="menu_model">primary_menu</property>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="icon_name">open-menu-symbolic</property>
+                <property name="icon_size">1</property>
+              </object>
+            </child>
+            <style>
+              <class name="image-button"/>
+            </style>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+          </packing>
+        </child>
       </object>
     </child>
   </template>
diff --git a/src/math-window.vala b/src/math-window.vala
index dc244cc..ddb0cae 100644
--- a/src/math-window.vala
+++ b/src/math-window.vala
@@ -31,6 +31,10 @@ public class MathWindow : Gtk.ApplicationWindow
     [GtkChild]
     private MathConverter converter;
 
+    /* Remove when https://wiki.gnome.org/Initiatives/GnomeGoals/AppMenuRetirement is confirmed */
+    [GtkChild]
+    public Gtk.MenuButton primary_menu_button;
+
     private const ActionEntry[] window_entries =
     {
         { "copy", copy_cb, null, null, null },
diff --git a/src/menu.ui b/src/menu.ui
deleted file mode 100644
index 954b9b6..0000000
--- a/src/menu.ui
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <menu id="appmenu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">New Window</attribute>
-        <attribute name="action">app.newwindow</attribute>
-        <attribute name="accel">&lt;Primary&gt;n</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Preferences</attribute>
-        <attribute name="action">app.preferences</attribute>
-      </item>
-    </section>
-    <section>
-      <attribute name="id">help-section</attribute>
-      <item>
-        <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute>
-        <attribute name="action">app.shortcuts</attribute>
-        <attribute name="accel">&lt;Primary&gt;question</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Help</attribute>
-        <attribute name="action">app.help</attribute>
-        <attribute name="accel">F1</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">About</attribute>
-        <attribute name="action">app.about</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Quit</attribute>
-        <attribute name="action">app.quit</attribute>
-        <attribute name="accel">&lt;Primary&gt;q</attribute>
-      </item>
-    </section>
-  </menu>
-</interface>
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index 5b7d0a5..0000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,69 +0,0 @@
-noinst_PROGRAMS = test-number test-equation test-serializer
-TESTS = test-number test-equation test-serializer
-
-AM_CPPFLAGS = \
-	-w \
-	-I$(top_srcdir)/lib \
-	$(LIBCALCULATOR_CFLAGS)
-
-test_number_SOURCES = \
-	test-number.vala
-
-test_number_VALAFLAGS = \
-	--target-glib $(GLIB_REQUIRED) \
-	--pkg posix \
-	--pkg gio-2.0 \
-	--pkg gtksourceview-3.0 \
-	--pkg libxml-2.0 \
-	$(top_builddir)/lib/libcalculator.vapi \
-	$(top_builddir)/vapi/mpfr.vapi
-
-test_number_LDADD = \
-	$(LIBCALCULATOR_LIBS) \
-	-lm \
-	$(top_builddir)/lib/libcalculator.la
-
-test_equation_SOURCES = \
-	test-equation.vala
-
-test_equation_VALAFLAGS = \
-	--target-glib $(GLIB_REQUIRED) \
-	--pkg posix \
-	--pkg gio-2.0 \
-	--pkg gtksourceview-3.0 \
-	--pkg libxml-2.0 \
-	$(top_builddir)/lib/libcalculator.vapi \
-	$(top_builddir)/vapi/mpfr.vapi
-
-test_equation_LDADD = \
-	$(LIBCALCULATOR_LIBS) \
-	-lm \
-	$(top_builddir)/lib/libcalculator.la
-
-test_serializer_SOURCES = \
-	test-serializer.vala
-
-test_serializer_VALAFLAGS = \
-	--target-glib $(GLIB_REQUIRED) \
-	--pkg posix \
-	--pkg gio-2.0 \
-	--pkg gtksourceview-3.0 \
-	--pkg libxml-2.0 \
-	$(top_builddir)/lib/libcalculator.vapi \
-	$(top_builddir)/vapi/mpfr.vapi
-
-test_serializer_LDADD = \
-	$(LIBCALCULATOR_LIBS) \
-	-lm \
-	$(top_builddir)/lib/libcalculator.la
-
-EXTRA_DIST = \
-	steps \
-	common_steps.py \
-	environment.py \
-	advanced_mode.feature \
-	basic_mode.feature \
-	financial_mode.feature \
-	programming_mode.feature
-
--include $(top_srcdir)/git.mk
