[gnome-calculator] Updated Serbian translation



commit 577669b2d8551ccd4f98cb340d37ce5f99fed433
Author: Мирослав Николић <miroslavnikolic rocketmail com>
Date:   Sun Mar 23 16:35:15 2014 +0100

    Updated Serbian translation

 po/sr.po       | 1047 ++++++++++++++++++++++++++++++++++++++++++++------------
 po/sr latin po | 1047 ++++++++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 1642 insertions(+), 452 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index deed698..9ab3719 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,5 +1,5 @@
 # Serbian translation of gnome-calculator
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2013.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2014.
 # This file is distributed under the same license as the gnome-calculator package.
 # Maintainer: Данило Шеган <dsegan gmx net>
 # Reviewed on 2005-07-18 by: Игор Несторовић <igor prevod org>
@@ -7,14 +7,14 @@
 # Translated on 2010-08-25 by: Бранко Кокановић <branko kokanovic gmail com>
 # Translated on 2011-03-19 by: Бранко Кокановић <branko kokanovic gmail com>
 # Бранко Кокановић <branko kokanovic gmail com>, 2011.
-# Мирослав Николић <miroslavnikolic rocketmail com>, 2011, 2013.
+# Мирослав Николић <miroslavnikolic rocketmail com>, 2011—2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-calculator\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=http:/";
 "/bugzilla.gnome.org/&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-01-09 09:15+0000\n"
-"PO-Revision-Date: 2013-01-18 22:10+0200\n"
+"POT-Creation-Date: 2014-03-23 07:18+0000\n"
+"PO-Revision-Date: 2014-03-23 16:32+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
@@ -65,7 +65,7 @@ msgstr "Научни степен"
 #. Accessible name for the memory value button
 #. Tooltip for the memory button
 #: ../data/buttons-advanced.ui.h:16 ../data/buttons-financial.ui.h:72
-#: ../src/math-buttons.vala:384
+#: ../src/math-buttons.vala:375
 msgid "Memory"
 msgstr "Меморија"
 
@@ -89,11 +89,11 @@ msgstr "Степен"
 #. Accessible name for the store value button
 #: ../data/buttons-advanced.ui.h:24 ../data/buttons-programming.ui.h:12
 msgid "Store"
-msgstr "Сними"
+msgstr "Сачувај"
 
 #. Title of Compounding Term dialog
 #. Tooltip for the compounding term button
-#: ../data/buttons-financial.ui.h:2 ../src/math-buttons.vala:400
+#: ../data/buttons-financial.ui.h:2 ../src/math-buttons.vala:391
 msgid "Compounding Term"
 msgstr "Чинилац састава"
 
@@ -120,7 +120,8 @@ msgid ""
 "compounding period."
 msgstr ""
 "Израчунајте број периода чиниоца потребних за повећање вредности инвестиције "
-"са тренутне на будућу вредност по фиксној каматној стопи по периоду чиниоца."
+"са тренутне на будућу вредност по фиксној каматној стопи по периоду "
+"чиниоца."
 
 #. Periodic Interest Rate Dialog: Label before future value input
 #: ../data/buttons-financial.ui.h:12
@@ -158,7 +159,7 @@ msgstr "_Период:"
 
 #. Title of Future Value dialog
 #. Tooltip for the future value button
-#: ../data/buttons-financial.ui.h:24 ../src/math-buttons.vala:404
+#: ../data/buttons-financial.ui.h:24 ../src/math-buttons.vala:395
 msgid "Future Value"
 msgstr "Будућа вредност"
 
@@ -184,7 +185,7 @@ msgstr "_Број периода:"
 
 #. Title of Gross Profit Margin dialog
 #. Tooltip for the gross profit margin button
-#: ../data/buttons-financial.ui.h:32 ../src/math-buttons.vala:418
+#: ../data/buttons-financial.ui.h:32 ../src/math-buttons.vala:409
 msgid "Gross Profit Margin"
 msgstr "Бруто маржа"
 
@@ -204,7 +205,7 @@ msgstr "_Маржа:"
 
 #. Title of Periodic Payment dialog
 #. Tooltip for the periodic payment button
-#: ../data/buttons-financial.ui.h:38 ../src/math-buttons.vala:416
+#: ../data/buttons-financial.ui.h:38 ../src/math-buttons.vala:407
 msgid "Periodic Payment"
 msgstr "Периодично плаћање"
 
@@ -229,7 +230,7 @@ msgstr "_Рок:"
 
 #. Title of Present Value dialog
 #. Tooltip for the present value button
-#: ../data/buttons-financial.ui.h:46 ../src/math-buttons.vala:414
+#: ../data/buttons-financial.ui.h:46 ../src/math-buttons.vala:405
 msgid "Present Value"
 msgstr "Тренутна вредност"
 
@@ -245,7 +246,7 @@ msgstr ""
 
 #. Title of Periodic Interest Rate dialog
 #. Tooltip for the periodic interest rate button
-#: ../data/buttons-financial.ui.h:50 ../src/math-buttons.vala:412
+#: ../data/buttons-financial.ui.h:50 ../src/math-buttons.vala:403
 msgid "Periodic Interest Rate"
 msgstr "Периодична каматна стопа"
 
@@ -283,7 +284,7 @@ msgid ""
 msgstr ""
 "Израчунајте праволинијско умањење производа за задати период. Метод "
 "праволинијског умањења дели амортизациони трошак производа на цео користан "
-"живот производа. Корисни живот производа је број периода, обично година, "
+"живот производа. Користан живот производа је број периода, обично година, "
 "после кога је производ амортизован. "
 
 #. Title of Sum-of-the-Years'-Digits Depreciation dialog
@@ -301,9 +302,10 @@ msgid ""
 "of periods, typically years, over which an asset is depreciated. "
 msgstr ""
 "Израчунајте амортизационо умањење за одређени период времена користећи метод "
-"збира-цифара-године. Овај метод амортизације увећава стопу амортизације тако "
-"да су трошкови амортизације већи у ранијим периодима времена. Корисни живот "
-"производа је број периода, обично година, за које се производ амортизује. "
+"збира-цифара-године. Овај метод амортизације увећава стопу амортизације "
+"тако да су трошкови амортизације већи у ранијим периодима времена. Користан "
+"живот производа је број периода, обично година, за које се производ "
+"амортизује. "
 
 #. Title of Payment Period dialog
 #: ../data/buttons-financial.ui.h:66
@@ -328,17 +330,17 @@ 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
 #: ../data/buttons-financial.ui.h:78
 msgid "Ctrm"
-msgstr "Цтрм"
+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
 #: ../data/buttons-financial.ui.h:80
 msgid "Ddb"
-msgstr "Ддб"
+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
 #: ../data/buttons-financial.ui.h:82
 msgid "Fv"
-msgstr "Бв"
+msgstr "Бувре"
 
 #. 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:84
@@ -348,12 +350,12 @@ 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
 #: ../data/buttons-financial.ui.h:86
 msgid "Syd"
-msgstr "Зцг"
+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
 #: ../data/buttons-financial.ui.h:88
 msgid "Sln"
-msgstr "Плу"
+msgstr "Прaум"
 
 #. 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:90
@@ -363,40 +365,40 @@ 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
 #: ../data/buttons-financial.ui.h:92
 msgid "Pv"
-msgstr "Тв"
+msgstr "Тревр"
 
 #. 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:94
 msgid "Pmt"
-msgstr "Ппл"
+msgstr "Перпл"
 
 #. 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:96
 msgid "Gpm"
-msgstr "БМ"
+msgstr "Брума"
 
 #. Accessible name for the shift left button
 #. Tooltip for the shift left button
-#: ../data/buttons-programming.ui.h:16 ../src/math-buttons.vala:396
+#: ../data/buttons-programming.ui.h:16 ../src/math-buttons.vala:387
 msgid "Shift Left"
 msgstr "Помери улево"
 
 #. Accessible name for the shift right button
 #. Tooltip for the shift right button
-#: ../data/buttons-programming.ui.h:18 ../src/math-buttons.vala:398
+#: ../data/buttons-programming.ui.h:18 ../src/math-buttons.vala:389
 msgid "Shift Right"
 msgstr "Помери удесно"
 
 #. Accessible name for the insert character button
 #: ../data/buttons-programming.ui.h:20
 msgid "Insert Character"
-msgstr "Убаци Знак"
+msgstr "Убаци знак"
 
 #. Title of insert character code dialog
 #. Tooltip for the insert character code button
-#: ../data/buttons-programming.ui.h:28 ../src/math-buttons.vala:386
+#: ../data/buttons-programming.ui.h:28 ../src/math-buttons.vala:377
 msgid "Insert Character Code"
-msgstr "Убаци код знака"
+msgstr "Убаците код знака"
 
 #. Insert ASCII dialog: Label before character entry
 #: ../data/buttons-programming.ui.h:30
@@ -410,57 +412,142 @@ msgstr "_Уметни"
 
 #. Program name in the about dialog
 #. Title of main window
-#: ../data/gnome-calculator.desktop.in.h:1 ../src/gnome-calculator.vala:265
-#: ../src/math-window.vala:29
+#: ../data/gnome-calculator.desktop.in.h:1 ../src/gnome-calculator.vala:182
+#: ../src/math-window.vala:40
 msgid "Calculator"
 msgstr "Калкулатор"
 
 #: ../data/gnome-calculator.desktop.in.h:2
 msgid "Perform arithmetic, scientific or financial calculations"
-msgstr "Извршите аритметичке, научне или финансијске прорачуне"
+msgstr "Извршавајте аритметичке, научне или финансијске прорачуне"
 
 #: ../data/gnome-calculator.desktop.in.h:3
-#| msgid "Perform arithmetic, scientific or financial calculations"
 msgid "calculation;arithmetic;scientific;financial;"
 msgstr "рачунање;аритметика;наука;финансије;прорачун;"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:1
+#: ../data/gnome-calculator.appdata.xml.in.h:1
+#| msgid "Calculator"
+msgid "GNOME Calculator"
+msgstr "Гномов калкулатор"
+
+#: ../data/gnome-calculator.appdata.xml.in.h:2
+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 ""
+"Гномов калкулатор је програм за решавање математичких једначина. Иако на "
+"први поглед личи на једноставан калкулатор само са основним аритметичким "
+"операцијама, можете да се пребаците на напредан, финансијски, или "
+"програмерски начин рада и да откријете изненађујући скуп могућности."
+
+#: ../data/gnome-calculator.appdata.xml.in.h:3
+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 ""
+"Напредни калкулатор подржава многе операције, укључујући: логаритамске, "
+"факторијелне, тригонометријске и хиперболичке функције, дељење модула, "
+"комплексне бројеве, стварање насумичног броја, факторизацију простог броја и "
+"претварање јединица."
+
+#: ../data/gnome-calculator.appdata.xml.in.h:4
+msgid ""
+"Financial mode supports several computations, including periodic interest "
+"rate, present and future value, double declining and straight line "
+"depreciation, and many others."
+msgstr ""
+"Финансијски начин рада подржава неколико израчунавања, укључујући периодичну "
+"каматну стопу, садашњу и будућу вредност, двоструко опадање и праволинијско "
+"умањење, и многе друге."
+
+#: ../data/gnome-calculator.appdata.xml.in.h:5
+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 ""
+"Програмерски начин рада подржава претварање бројева између општих основа "
+"(бинарних, окталних, децималних и хексадецималних), булову алгебру, "
+"комплемент јединице и двојке, претварање кода знака у знак, и друго."
+
+#. Title of preferences dialog
+#: ../data/menu.ui.h:1 ../src/math-preferences.vala:26
+msgid "Preferences"
+msgstr "Поставке"
+
+#: ../data/menu.ui.h:2
+msgid "Help"
+msgstr "Помоћ"
+
+#: ../data/menu.ui.h:3
+msgid "About"
+msgstr "О програму"
+
+#: ../data/menu.ui.h:4
+msgid "Quit"
+msgstr "Изађи"
+
+#: ../data/menu.ui.h:5 ../src/math-window.vala:109
+#| msgid "Basic"
+msgid "Basic Mode"
+msgstr "Основни начин рада"
+
+#: ../data/menu.ui.h:6 ../src/math-window.vala:114
+#| msgid "Advanced"
+msgid "Advanced Mode"
+msgstr "Напредни начин рада"
+
+#: ../data/menu.ui.h:7 ../src/math-window.vala:119
+#| msgid "Financial Term"
+msgid "Financial Mode"
+msgstr "Финансијски начин рада"
+
+#: ../data/menu.ui.h:8 ../src/math-window.vala:124
+#| msgid "Programming"
+msgid "Programming Mode"
+msgstr "Програмерски начин рада"
+
+#: ../data/org.gnome.calculator.gschema.xml.h:1
 msgid "Accuracy value"
 msgstr "Вредност тачности"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:2
+#: ../data/org.gnome.calculator.gschema.xml.h:2
 msgid "The number of digits displayed after the numeric point"
 msgstr "Број цифара приказан после децималног зареза"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:3
+#: ../data/org.gnome.calculator.gschema.xml.h:3
 msgid "Word size"
 msgstr "Дужина речи"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:4
+#: ../data/org.gnome.calculator.gschema.xml.h:4
 msgid "The size of the words used in bitwise operations"
 msgstr "Дужина речи која се користи за битске операције"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:5
+#: ../data/org.gnome.calculator.gschema.xml.h:5
 msgid "Numeric Base"
 msgstr "Основа броја"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:6
+#: ../data/org.gnome.calculator.gschema.xml.h:6
 msgid "The numeric base"
 msgstr "Бројна основа"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:7
+#: ../data/org.gnome.calculator.gschema.xml.h:7
 msgid "Show Thousands Separators"
 msgstr "Приказивање раздвајача хиљада"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:8
+#: ../data/org.gnome.calculator.gschema.xml.h:8
 msgid "Indicates whether thousands separators are shown in large numbers."
 msgstr "Да ли да се раздвајач хиљада приказује за велике бројеве."
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:9
+#: ../data/org.gnome.calculator.gschema.xml.h:9
 msgid "Show Trailing Zeroes"
 msgstr "Приказивање пратећих нула"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:10
+#: ../data/org.gnome.calculator.gschema.xml.h:10
 msgid ""
 "Indicates whether any trailing zeroes after the numeric point should be "
 "shown in the display value."
@@ -468,59 +555,59 @@ msgstr ""
 "Да ли да се у приказаној вредности приказују пратеће нуле после децималног "
 "зареза."
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:11
+#: ../data/org.gnome.calculator.gschema.xml.h:11
 msgid "Number format"
-msgstr "Облик броја"
+msgstr "Запис броја"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:12
+#: ../data/org.gnome.calculator.gschema.xml.h:12
 msgid "The format to display numbers in"
-msgstr "Облик у коме ће се приказивати бројеви"
+msgstr "Запис у коме ће се приказивати бројеви"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:13
+#: ../data/org.gnome.calculator.gschema.xml.h:13
 msgid "Angle units"
 msgstr "Јединице углова"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:14
+#: ../data/org.gnome.calculator.gschema.xml.h:14
 msgid "The angle units to use"
 msgstr "Јединице углова за коришћење"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:15
+#: ../data/org.gnome.calculator.gschema.xml.h:15
 msgid "Button mode"
 msgstr "Режим дугмета"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:16
+#: ../data/org.gnome.calculator.gschema.xml.h:16
 msgid "The button mode"
 msgstr "Режим дугмета"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:17
+#: ../data/org.gnome.calculator.gschema.xml.h:17
 msgid "Source currency"
 msgstr "Изворна валута"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:18
+#: ../data/org.gnome.calculator.gschema.xml.h:18
 msgid "Currency of the current calculation"
 msgstr "Валута тренутног прорачуна"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:19
+#: ../data/org.gnome.calculator.gschema.xml.h:19
 msgid "Target currency"
 msgstr "Циљна валута"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:20
+#: ../data/org.gnome.calculator.gschema.xml.h:20
 msgid "Currency to convert the current calculation into"
 msgstr "Валута у коју треба претворити прорачун"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:21
+#: ../data/org.gnome.calculator.gschema.xml.h:21
 msgid "Source units"
 msgstr "Изворна јединица"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:22
+#: ../data/org.gnome.calculator.gschema.xml.h:22
 msgid "Units of the current calculation"
 msgstr "Јединица тренутног прорачуна"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:23
+#: ../data/org.gnome.calculator.gschema.xml.h:23
 msgid "Target units"
 msgstr "Циљна јединица"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:24
+#: ../data/org.gnome.calculator.gschema.xml.h:24
 msgid "Units to convert the current calculation into"
 msgstr "Јединица у коју треба претворити прорачун"
 
@@ -768,50 +855,13 @@ msgstr "Јужноафрички ранд"
 msgid "Error: the number of periods must be positive"
 msgstr "Грешка: број периода мора бити позитиван"
 
-#: ../src/gnome-calculator.vala:80
-msgid "Basic"
-msgstr "Основни"
-
-#: ../src/gnome-calculator.vala:81
-msgid "Advanced"
-msgstr "Напредни"
-
-#: ../src/gnome-calculator.vala:82
-msgid "Financial"
-msgstr "Финансијски"
-
-#: ../src/gnome-calculator.vala:83
-msgid "Programming"
-msgstr "Програмерски"
-
-#: ../src/gnome-calculator.vala:84
-msgid "Mode"
-msgstr "Режим"
-
-#. Title of preferences dialog
-#: ../src/gnome-calculator.vala:87 ../src/math-preferences.vala:26
-msgid "Preferences"
-msgstr "Поставке"
-
-#: ../src/gnome-calculator.vala:91
-msgid "About Calculator"
-msgstr "О Калкулатору"
-
-#: ../src/gnome-calculator.vala:92
-msgid "Help"
-msgstr "Помоћ"
-
-#: ../src/gnome-calculator.vala:93
-msgid "Quit"
-msgstr "Изађи"
-
 #. Translators: Error message displayed when unable to launch help browser
-#: ../src/gnome-calculator.vala:228
+#: ../src/gnome-calculator.vala:147
 msgid "Unable to open help file"
 msgstr "Не могу да отворим датотеку помоћи"
 
 #. The translator credits. Please translate this with your name (s).
-#: ../src/gnome-calculator.vala:258
+#: ../src/gnome-calculator.vala:177
 msgid "translator-credits"
 msgstr ""
 "Данило Шеган <danilo prevod org>\n"
@@ -822,297 +872,300 @@ msgstr ""
 "\n"
 "http://prevod.org — превод на српски језик"
 
+#: ../src/gnome-calculator.vala:183
+msgid "About Calculator"
+msgstr "О Калкулатору"
+
 #. Short description in the about dialog
-#: ../src/gnome-calculator.vala:272
+#: ../src/gnome-calculator.vala:190
 msgid "Calculator with financial and scientific modes."
 msgstr "Калкулатор са финансијским и научним начином рада."
 
-#: ../src/gnome-calculator.vala:305
+#: ../src/gnome-calculator.vala:223
 msgid "Solve given equation"
 msgstr "Решава дату једначину"
 
-#: ../src/gnome-calculator.vala:313
+#: ../src/gnome-calculator.vala:231
 msgid "Start with given equation"
 msgstr "Почиње са датом једначином"
 
-#: ../src/gnome-calculator.vala:322
+#: ../src/gnome-calculator.vala:240
 msgid "Show release version"
 msgstr "Приказује издање програма"
 
 #. Configure buttons
 #. Tooltip for the Pi button
-#: ../src/math-buttons.vala:298
+#: ../src/math-buttons.vala:291
 msgid "Pi [Ctrl+P]"
 msgstr "Пи [Ctrl+P]"
 
 #. Tooltip for the Euler's Number button
-#: ../src/math-buttons.vala:300
+#: ../src/math-buttons.vala:293
 msgid "Euler’s Number"
 msgstr "Ојлеров број"
 
 #. Tooltip for the subscript button
-#: ../src/math-buttons.vala:304
+#: ../src/math-buttons.vala:297
 msgid "Subscript mode [Alt]"
 msgstr "Режим индекса [Alt]"
 
 #. Tooltip for the superscript button
-#: ../src/math-buttons.vala:306
+#: ../src/math-buttons.vala:299
 msgid "Superscript mode [Ctrl]"
 msgstr "Режим изложиоца [Ctrl]"
 
 #. Tooltip for the scientific exponent button
-#: ../src/math-buttons.vala:308
+#: ../src/math-buttons.vala:301
 msgid "Scientific exponent [Ctrl+E]"
 msgstr "Научни степен [Ctrl+E]"
 
 #. Tooltip for the add button
-#: ../src/math-buttons.vala:310
+#: ../src/math-buttons.vala:303
 msgid "Add [+]"
 msgstr "Саберите [+]"
 
 #. Tooltip for the subtract button
-#: ../src/math-buttons.vala:312
+#: ../src/math-buttons.vala:305
 msgid "Subtract [-]"
 msgstr "Одузмите [-]"
 
 #. Tooltip for the multiply button
-#: ../src/math-buttons.vala:314
+#: ../src/math-buttons.vala:307
 msgid "Multiply [*]"
 msgstr "Помножите [*]"
 
 #. Tooltip for the divide button
-#: ../src/math-buttons.vala:316
+#: ../src/math-buttons.vala:309
 msgid "Divide [/]"
 msgstr "Поделите [/]"
 
 #. Tooltip for the modulus divide button
-#: ../src/math-buttons.vala:318
+#: ../src/math-buttons.vala:311
 msgid "Modulus divide"
 msgstr "Дељење по модулу"
 
 #. Tooltip for the additional functions button
-#: ../src/math-buttons.vala:320
+#: ../src/math-buttons.vala:313
 msgid "Additional Functions"
 msgstr "Додатне функције"
 
 #. Tooltip for the exponent button
-#: ../src/math-buttons.vala:322
+#: ../src/math-buttons.vala:315
 msgid "Exponent [^ or **]"
 msgstr "Експонент [^ или **]"
 
-#. Tooltip for the square button
-#: ../src/math-buttons.vala:324
-msgid "Square [Ctrl+2]"
-msgstr "Квадрат [Ctrl+2]"
-
 #. Tooltip for the percentage button
-#: ../src/math-buttons.vala:326
+#: ../src/math-buttons.vala:317
 msgid "Percentage [%]"
 msgstr "Проценат [%]"
 
 #. Tooltip for the factorial button
-#: ../src/math-buttons.vala:328
+#: ../src/math-buttons.vala:319
 msgid "Factorial [!]"
 msgstr "Факторијел [!]"
 
 #. Tooltip for the absolute value button
-#: ../src/math-buttons.vala:330
+#: ../src/math-buttons.vala:321
 msgid "Absolute value [|]"
 msgstr "Апсолутна вредност [|]"
 
 #. Tooltip for the complex argument component button
-#: ../src/math-buttons.vala:332
+#: ../src/math-buttons.vala:323
 msgid "Complex argument"
 msgstr "Комплексни аргумент"
 
 #. Tooltip for the complex conjugate button
-#: ../src/math-buttons.vala:334
+#: ../src/math-buttons.vala:325
 msgid "Complex conjugate"
 msgstr "Конјуговано комплексна вредност"
 
 #. Tooltip for the root button
-#: ../src/math-buttons.vala:336
+#: ../src/math-buttons.vala:327
 msgid "Root [Ctrl+R]"
 msgstr "Корен [Ctrl+R]"
 
 #. Tooltip for the square root button
-#: ../src/math-buttons.vala:338
+#: ../src/math-buttons.vala:329
 msgid "Square root [Ctrl+R]"
 msgstr "Квадратни корен [Ctrl+R]"
 
 #. Tooltip for the logarithm button
-#: ../src/math-buttons.vala:340
+#: ../src/math-buttons.vala:331
 msgid "Logarithm"
 msgstr "Логаритам"
 
 #. Tooltip for the natural logarithm button
-#: ../src/math-buttons.vala:342
+#: ../src/math-buttons.vala:333
 msgid "Natural Logarithm"
 msgstr "Природни логаритам"
 
 #. Tooltip for the sine button
-#: ../src/math-buttons.vala:344
+#: ../src/math-buttons.vala:335
 msgid "Sine"
 msgstr "Синус"
 
 #. Tooltip for the cosine button
-#: ../src/math-buttons.vala:346
+#: ../src/math-buttons.vala:337
 msgid "Cosine"
 msgstr "Косинус"
 
 #. Tooltip for the tangent button
-#: ../src/math-buttons.vala:348
+#: ../src/math-buttons.vala:339
 msgid "Tangent"
 msgstr "Тангенс"
 
 #. Tooltip for the hyperbolic sine button
-#: ../src/math-buttons.vala:350
+#: ../src/math-buttons.vala:341
 msgid "Hyperbolic Sine"
 msgstr "Хиперболични синус"
 
 #. Tooltip for the hyperbolic cosine button
-#: ../src/math-buttons.vala:352
+#: ../src/math-buttons.vala:343
 msgid "Hyperbolic Cosine"
 msgstr "Хиперболични косинус"
 
 #. Tooltip for the hyperbolic tangent button
-#: ../src/math-buttons.vala:354
+#: ../src/math-buttons.vala:345
 msgid "Hyperbolic Tangent"
 msgstr "Хиперболични тангенс"
 
 #. Tooltip for the inverse button
-#: ../src/math-buttons.vala:356
+#: ../src/math-buttons.vala:347
 msgid "Inverse [Ctrl+I]"
 msgstr "Реципрочност [Ctrl+I]"
 
 #. Tooltip for the boolean AND button
-#: ../src/math-buttons.vala:358
+#: ../src/math-buttons.vala:349
 msgid "Boolean AND"
 msgstr "Логичко И"
 
 #. Tooltip for the boolean OR button
-#: ../src/math-buttons.vala:360
+#: ../src/math-buttons.vala:351
 msgid "Boolean OR"
 msgstr "Логичко ИЛИ"
 
 #. Tooltip for the exclusive OR button
-#: ../src/math-buttons.vala:362
+#: ../src/math-buttons.vala:353
 msgid "Boolean Exclusive OR"
 msgstr "Логичко ИЛЛИ"
 
 #. Tooltip for the boolean NOT button
-#: ../src/math-buttons.vala:364
+#: ../src/math-buttons.vala:355
 msgid "Boolean NOT"
 msgstr "Логичко НЕ"
 
 #. Tooltip for the integer component button
-#: ../src/math-buttons.vala:366 ../src/math-buttons.vala:809
+#: ../src/math-buttons.vala:357
 msgid "Integer Component"
 msgstr "Целобројни део"
 
 #. Tooltip for the fractional component button
-#: ../src/math-buttons.vala:368 ../src/math-buttons.vala:811
+#: ../src/math-buttons.vala:359
 msgid "Fractional Component"
 msgstr "Разломљени део"
 
 #. Tooltip for the real component button
-#: ../src/math-buttons.vala:370
+#: ../src/math-buttons.vala:361
 msgid "Real Component"
 msgstr "Реални део"
 
 #. Tooltip for the imaginary component button
-#: ../src/math-buttons.vala:372
+#: ../src/math-buttons.vala:363
 msgid "Imaginary Component"
 msgstr "Имагинарни део"
 
 #. Tooltip for the ones' complement button
-#: ../src/math-buttons.vala:374
+#: ../src/math-buttons.vala:365
 msgid "Ones' Complement"
 msgstr "Комплемент јединице"
 
 #. Tooltip for the two's complement button
-#: ../src/math-buttons.vala:376
+#: ../src/math-buttons.vala:367
 msgid "Two's Complement"
 msgstr "Комплемент двојке"
 
 #. Tooltip for the truncate button
-#: ../src/math-buttons.vala:378
+#: ../src/math-buttons.vala:369
 msgid "Truncate"
 msgstr "Одсеците"
 
 #. Tooltip for the start group button
-#: ../src/math-buttons.vala:380
+#: ../src/math-buttons.vala:371
 msgid "Start Group [(]"
 msgstr "Отворите заграду [(]"
 
 #. Tooltip for the end group button
-#: ../src/math-buttons.vala:382
+#: ../src/math-buttons.vala:373
 msgid "End Group [)]"
 msgstr "Затворите заграду [)]"
 
 #. Tooltip for the solve button
-#: ../src/math-buttons.vala:388
+#: ../src/math-buttons.vala:379
 msgid "Calculate Result"
 msgstr "Израчунајте резултат"
 
 #. Tooltip for the factor button
-#: ../src/math-buttons.vala:390
+#: ../src/math-buttons.vala:381
 msgid "Factorize [Ctrl+F]"
 msgstr "Факторишите [Ctrl+F]"
 
 #. Tooltip for the clear button
-#: ../src/math-buttons.vala:392
+#: ../src/math-buttons.vala:383
 msgid "Clear Display [Escape]"
 msgstr "Очистите екран [Escape]"
 
 #. Tooltip for the undo button
-#: ../src/math-buttons.vala:394
+#: ../src/math-buttons.vala:385
 msgid "Undo [Ctrl+Z]"
 msgstr "Опозовите претходну радњу [Ctrl+Z]"
 
 #. Tooltip for the double declining depreciation button
-#: ../src/math-buttons.vala:402
+#: ../src/math-buttons.vala:393
 msgid "Double Declining Depreciation"
 msgstr "Умањење двоструким опадањем"
 
 #. Tooltip for the financial term button
-#: ../src/math-buttons.vala:406
+#: ../src/math-buttons.vala:397
 msgid "Financial Term"
 msgstr "Финансијски израз"
 
 #. Tooltip for the sum of the years digits depreciation button
-#: ../src/math-buttons.vala:408
+#: ../src/math-buttons.vala:399
 msgid "Sum of the Years Digits Depreciation"
 msgstr "Умањење збиром цифара године"
 
 #. Tooltip for the straight line depreciation button
-#: ../src/math-buttons.vala:410
+#: ../src/math-buttons.vala:401
 msgid "Straight Line Depreciation"
 msgstr "Праволинијско умањење"
 
+#: ../src/math-buttons.vala:430
+msgid "Square [Ctrl+2]"
+msgstr "Квадрат [Ctrl+2]"
+
 #. Number display mode combo: Binary, e.g. 10011010010₂
-#: ../src/math-buttons.vala:523
+#: ../src/math-buttons.vala:520
 msgid "Binary"
 msgstr "Бинарно"
 
 #. Number display mode combo: Octal, e.g. 2322₈
-#: ../src/math-buttons.vala:527
+#: ../src/math-buttons.vala:524
 msgid "Octal"
 msgstr "Октално"
 
 #. Number display mode combo: Decimal, e.g. 1234
-#: ../src/math-buttons.vala:531
+#: ../src/math-buttons.vala:528
 msgid "Decimal"
 msgstr "Децимално"
 
 #. Number display mode combo: Hexadecimal, e.g. 4D2₁₆
-#: ../src/math-buttons.vala:535
+#: ../src/math-buttons.vala:532
 msgid "Hexadecimal"
 msgstr "Хексадецимално"
 
 #. 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.vala:740 ../src/math-buttons.vala:777
+#: ../src/math-buttons.vala:741 ../src/math-buttons.vala:778
 #, c-format
 msgid "_%d place"
 msgid_plural "_%d places"
@@ -1123,7 +1176,7 @@ msgstr[3] "_%d место"
 
 #. 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.vala:745 ../src/math-buttons.vala:782
+#: ../src/math-buttons.vala:746 ../src/math-buttons.vala:783
 #, c-format
 msgid "%d place"
 msgid_plural "%d places"
@@ -1132,26 +1185,6 @@ msgstr[1] "%d места"
 msgstr[2] "%d места"
 msgstr[3] "%d место"
 
-#. Tooltip for the round button
-#: ../src/math-buttons.vala:813
-msgid "Round"
-msgstr "Заокружи"
-
-#. Tooltip for the floor button
-#: ../src/math-buttons.vala:815
-msgid "Floor"
-msgstr "Заокружи на доле"
-
-#. Tooltip for the ceiling button
-#: ../src/math-buttons.vala:817
-msgid "Ceiling"
-msgstr "Заокружи на горе"
-
-#. Tooltip for the ceiling button
-#: ../src/math-buttons.vala:819
-msgid "Sign"
-msgstr "Знак"
-
 #. Label that is displayed between the two conversion combo boxes, e.g. "[degrees] in [radians]"
 #: ../src/math-converter.vala:46
 msgid " in "
@@ -1168,69 +1201,68 @@ 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 shown when trying to undo with no undo history
-#: ../src/math-equation.vala:487
+#: ../src/math-equation.vala:482
 msgid "No undo history"
 msgstr "Нема радњи опозивања"
 
 #. Error shown when trying to redo with no redo history
-#: ../src/math-equation.vala:503
+#: ../src/math-equation.vala:499
 msgid "No redo history"
-msgstr "Нема радњи понављања"
+msgstr "Нема радњи враћања"
 
-#: ../src/math-equation.vala:732
+#: ../src/math-equation.vala:729
 msgid "No sane value to store"
 msgstr "Нема разумне вредности за чување"
 
 #. Error displayed to user when they perform a bitwise operation on numbers greater than the current word
-#: ../src/math-equation.vala:888
+#: ../src/math-equation.vala:911
 msgid "Overflow. Try a bigger word size"
 msgstr "Прекорачење. Покушајте са већом дужином речи"
 
 #. Error displayed to user when they an unknown variable is entered
-#: ../src/math-equation.vala:893
+#: ../src/math-equation.vala:916
 #, c-format
 msgid "Unknown variable '%s'"
 msgstr "Непозната променљива „%s“"
 
 #. Error displayed to user when an unknown function is entered
-#: ../src/math-equation.vala:900
+#: ../src/math-equation.vala:923
 #, c-format
 msgid "Function '%s' is not defined"
-msgstr "Функција „%s“ није дефинисана"
+msgstr "Функција „%s“ није одређена"
 
 #. Error displayed to user when an conversion with unknown units is attempted
-#: ../src/math-equation.vala:907
+#: ../src/math-equation.vala:930
 msgid "Unknown conversion"
 msgstr "Непознато претварање"
 
-#: ../src/math-equation.vala:915
+#: ../src/math-equation.vala:938
 #, c-format
-#| msgid "Malformed expression"
 msgid "Malformed expression at token '%s'"
 msgstr "Неисправан израз на „%s“"
 
 #. Unknown error.
 #. Error displayed to user when they enter an invalid calculation
-#: ../src/math-equation.vala:920 ../src/math-equation.vala:925
+#: ../src/math-equation.vala:943 ../src/math-equation.vala:948
 msgid "Malformed expression"
 msgstr "Неисправан израз"
 
-#: ../src/math-equation.vala:936
+#: ../src/math-equation.vala:959
 msgid "Calculating"
 msgstr "Израчунавам"
 
 #. Error displayed when trying to factorize a non-integer value
-#: ../src/math-equation.vala:1063
+#: ../src/math-equation.vala:1086
 msgid "Need an integer to factorize"
 msgstr "За факторисање је потребан цео број"
 
 #. 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.vala:1117
+#: ../src/math-equation.vala:1140
 msgid "No sane value to bitwise shift"
 msgstr "Нема разумне вредности за битско померање"
 
 #. Message displayed when cannot toggle bit in display
-#: ../src/math-equation.vala:1131
+#: ../src/math-equation.vala:1154
 msgid "Displayed value not an integer"
 msgstr "Приказана вредност није цео број"
 
@@ -1326,38 +1358,50 @@ msgstr "32 бита"
 msgid "64 bits"
 msgstr "4 бита"
 
+#: ../src/math-window.vala:137
+#| msgid "Quit"
+msgid "_Quit"
+msgstr "_Изађи"
+
 #. Translators: Error display when attempting to take argument of zero
 #: ../src/number.vala:652
 msgid "Argument not defined for zero"
 msgstr "Аргумент није дефинисан за нулу"
 
 #. Translators: Error displayed when attempted to raise 0 to a negative re_exponent
-#: ../src/number.vala:909 ../src/number.vala:1858
+#: ../src/number.vala:909 ../src/number.vala:1943
 msgid "The power of zero is undefined for a negative exponent"
 msgstr "Степеновање нуле није дефинисано за негативне изложиоце"
 
+#. Translators: Error displayed when attempted to raise 0 to power of zero
+#: ../src/number.vala:917
+#| msgid "Reciprocal of zero is undefined"
+msgid "Zero raised to zero is undefined"
+msgstr "Нула на нултом степену није дефинисана"
+
 #. Translators: Error displayed when attempting to take logarithm of zero
-#: ../src/number.vala:992 ../src/number.vala:1025
+#: ../src/number.vala:1003 ../src/number.vala:1036
 msgid "Logarithm of zero is undefined"
 msgstr "Логаритам нуле није дефинисан"
 
-#. Translators: Error displayed when attempted take the factorial of a fractional number
-#: ../src/number.vala:1043
-msgid "Factorial is only defined for natural numbers"
-msgstr "Факторијел је дефинисан само за природне бројеве"
+#. Translators: Error displayed when attempted take the factorial of a negative or complex number
+#: ../src/number.vala:1058
+#| msgid "Factorial is only defined for natural numbers"
+msgid "Factorial is only defined for non-negative real numbers"
+msgstr "Факторијел је одређен само за не-негативне природне бројеве"
 
 #. Translators: Error displayed attempted to divide by zero
-#: ../src/number.vala:1119 ../src/number.vala:2608
+#: ../src/number.vala:1142 ../src/number.vala:2644
 msgid "Division by zero is undefined"
 msgstr "Дељење нулом није дефинисано"
 
 #. Translators: Error displayed when attemping to do a modulus division on non-integer numbers
-#: ../src/number.vala:1159
+#: ../src/number.vala:1182
 msgid "Modulus division is only defined for integers"
 msgstr "Дељење по модулу је дефинисано само за целе бројеве"
 
 #. Translators: Error displayed when tangent value is undefined
-#: ../src/number.vala:1227
+#: ../src/number.vala:1274
 msgid ""
 "Tangent is undefined for angles that are multiples of π (180°) from π∕2 (90°)"
 msgstr ""
@@ -1365,69 +1409,69 @@ msgstr ""
 "π∕2 (90°)"
 
 #. Translators: Error displayed when inverse sine value is undefined
-#: ../src/number.vala:1265
+#: ../src/number.vala:1312
 msgid "Inverse sine is undefined for values outside [-1, 1]"
 msgstr "Инверзни синус није дефинисан за вредности изван [-1, 1]"
 
 #. Translators: Error displayed when inverse cosine value is undefined
-#: ../src/number.vala:1280
+#: ../src/number.vala:1327
 msgid "Inverse cosine is undefined for values outside [-1, 1]"
 msgstr "Инверзни косинус није дефинисан за вредности изван [-1, 1]"
 
 #. Translators: Error displayed when inverse hyperbolic cosine value is undefined
-#: ../src/number.vala:1477
+#: ../src/number.vala:1524
 msgid "Inverse hyperbolic cosine is undefined for values less than one"
 msgstr ""
 "Инверзни хиперболички косинус није дефинисан за вредности мање од један"
 
 #. Translators: Error displayed when inverse hyperbolic tangent value is undefined
-#: ../src/number.vala:1496
+#: ../src/number.vala:1543
 msgid "Inverse hyperbolic tangent is undefined for values outside [-1, 1]"
 msgstr ""
 "Инверзни хиперболички тангенс није дефинисан за вредности изван [-1, 1]"
 
 #. Translators: Error displayed when boolean AND attempted on non-integer values
-#: ../src/number.vala:1515
+#: ../src/number.vala:1562
 msgid "Boolean AND is only defined for positive integers"
 msgstr "Логичко И је дефинисано само за позитивне целе бројеве"
 
 #. Translators: Error displayed when boolean OR attempted on non-integer values
-#: ../src/number.vala:1527
+#: ../src/number.vala:1574
 msgid "Boolean OR is only defined for positive integers"
 msgstr "Логичко ИЛИ је дефинисано само за позитивне целе бројеве"
 
 #. Translators: Error displayed when boolean XOR attempted on non-integer values
-#: ../src/number.vala:1539
+#: ../src/number.vala:1586
 msgid "Boolean XOR is only defined for positive integers"
 msgstr "Логичко ИЛЛИ је дефинисано само за позитивне целе бројеве"
 
 #. Translators: Error displayed when boolean XOR attempted on non-integer values
-#: ../src/number.vala:1551
+#: ../src/number.vala:1598
 msgid "Boolean NOT is only defined for positive integers"
 msgstr "Логичко НЕ је дефинисано само за позитивне целе бројеве"
 
 #. Translators: Error displayed when bit shift attempted on non-integer values
-#: ../src/number.vala:1574
+#: ../src/number.vala:1621
 msgid "Shift is only possible on integer values"
 msgstr "Померање је могуће само за позитивне целе вредности"
 
-#: ../src/number.vala:1878
+#: ../src/number.vala:1963
 msgid "Root must be non-zero"
 msgstr "Корен мора бити различит од нуле"
 
-#: ../src/number.vala:1895
+#: ../src/number.vala:1980
 msgid "Negative root of zero is undefined"
 msgstr "Негативни корен нуле није дефинисан"
 
-#: ../src/number.vala:1902
+#: ../src/number.vala:1987
 msgid "nth root of negative number is undefined for even n"
 msgstr "n-ти корен негативног броја није дефинисан за парно n"
 
-#: ../src/number.vala:2225
+#: ../src/number.vala:2261
 msgid "Overflow: the result couldn't be calculated"
 msgstr "Прекорачење: резултат се не може израчунати"
 
-#: ../src/number.vala:2553
+#: ../src/number.vala:2589
 msgid "Reciprocal of zero is undefined"
 msgstr "Реципрочна вредност нуле није дефинисана"
 
@@ -1459,182 +1503,712 @@ msgstr "Време"
 msgid "Temperature"
 msgstr "Температура"
 
+#: ../src/unit.vala:38
+#, c-format
+#| msgid "Degrees"
+msgctxt "unit-format"
+msgid "%s degrees"
+msgstr "%s степени"
+
+#: ../src/unit.vala:38
+msgctxt "unit-symbols"
+msgid "degree,degrees,deg"
+msgstr "степен,степена,степени,ст"
+
+#: ../src/unit.vala:39
+#, c-format
+#| msgid "Gradians"
+msgctxt "unit-format"
+msgid "%s radians"
+msgstr "%s радијана"
+
+#: ../src/unit.vala:39
+msgctxt "unit-symbols"
+msgid "radian,radians,rad"
+msgstr "радијан,радијана,рад"
+
+#: ../src/unit.vala:40
+#, c-format
+#| msgid "Gradians"
+msgctxt "unit-format"
+msgid "%s gradians"
+msgstr "%s градијана"
+
+#: ../src/unit.vala:40
+msgctxt "unit-symbols"
+msgid "gradian,gradians,grad"
+msgstr "градијан,градијана,град"
+
 #: ../src/unit.vala:41
 msgid "Parsecs"
 msgstr "Парсеци"
 
+#: ../src/unit.vala:41
+#, c-format
+msgctxt "unit-format"
+msgid "%s pc"
+msgstr "%s пц"
+
+#: ../src/unit.vala:41
+msgctxt "unit-symbols"
+msgid "parsec,parsecs,pc"
+msgstr "парсек,парсека,пц"
+
 #: ../src/unit.vala:42
 msgid "Light Years"
 msgstr "Светлосне године"
 
+#: ../src/unit.vala:42
+#, c-format
+msgctxt "unit-format"
+msgid "%s ly"
+msgstr "%s сг"
+
+#: ../src/unit.vala:42
+msgctxt "unit-symbols"
+msgid "lightyear,lightyears,ly"
+msgstr "светлоснагодина,светлоснегодине,светлоснихгодина,ly"
+
 #: ../src/unit.vala:43
 msgid "Astronomical Units"
 msgstr "Астрономске јединице"
 
+#: ../src/unit.vala:43
+#, c-format
+msgctxt "unit-format"
+msgid "%s au"
+msgstr "%s ај"
+
+#: ../src/unit.vala:43
+msgctxt "unit-symbols"
+msgid "au"
+msgstr "ај"
+
 #: ../src/unit.vala:44
 msgid "Nautical Miles"
 msgstr "Наутичке миље"
 
+#: ../src/unit.vala:44
+#, c-format
+msgctxt "unit-format"
+msgid "%s nmi"
+msgstr "%s нми"
+
+#: ../src/unit.vala:44
+msgctxt "unit-symbols"
+msgid "nmi"
+msgstr "нми"
+
 #: ../src/unit.vala:45
 msgid "Miles"
 msgstr "Миље"
 
+#: ../src/unit.vala:45
+#, c-format
+msgctxt "unit-format"
+msgid "%s mi"
+msgstr "%s ми"
+
+#: ../src/unit.vala:45
+msgctxt "unit-symbols"
+msgid "mile,miles,mi"
+msgstr "миља,миље,миља,mi"
+
 #: ../src/unit.vala:46
 msgid "Kilometers"
 msgstr "Километри"
 
+#: ../src/unit.vala:46
+#, c-format
+msgctxt "unit-format"
+msgid "%s km"
+msgstr "%s km"
+
+#: ../src/unit.vala:46
+msgctxt "unit-symbols"
+msgid "kilometer,kilometers,km,kms"
+msgstr "километар,километра,километара,км,km"
+
 #: ../src/unit.vala:47
 msgid "Cables"
 msgstr "Каблови"
 
+#: ../src/unit.vala:47
+#, c-format
+msgctxt "unit-format"
+msgid "%s cb"
+msgstr "%s cb"
+
+#: ../src/unit.vala:47
+msgctxt "unit-symbols"
+msgid "cable,cables,cb"
+msgstr "кабал,кабла,каблова,cb"
+
 #: ../src/unit.vala:48
 msgid "Fathoms"
 msgstr "Хвати"
 
+#: ../src/unit.vala:48
+#, c-format
+msgctxt "unit-format"
+msgid "%s ftm"
+msgstr "%s ftm"
+
+#: ../src/unit.vala:48
+msgctxt "unit-symbols"
+msgid "fathom,fathoms,ftm"
+msgstr "хват,хвата,хватова,хв,ftm"
+
 #: ../src/unit.vala:49
 msgid "Meters"
 msgstr "Метри"
 
+#: ../src/unit.vala:49
+#, c-format
+msgctxt "unit-format"
+msgid "%s m"
+msgstr "%s m"
+
+#: ../src/unit.vala:49
+#| msgid "Centimeters"
+msgctxt "unit-symbols"
+msgid "meter,meters,m"
+msgstr "метар,метра,метара,м,m"
+
 #: ../src/unit.vala:50
 msgid "Yards"
 msgstr "Јарди"
 
+#: ../src/unit.vala:50
+#, c-format
+msgctxt "unit-format"
+msgid "%s yd"
+msgstr "%s yd"
+
+#: ../src/unit.vala:50
+msgctxt "unit-symbols"
+msgid "yard,yards,yd"
+msgstr "јард,јарда,јарди,yd"
+
 #: ../src/unit.vala:51
 msgid "Feet"
 msgstr "Стопе"
 
+#: ../src/unit.vala:51
+#, c-format
+msgctxt "unit-format"
+msgid "%s ft"
+msgstr "%s ftm"
+
+#: ../src/unit.vala:51
+msgctxt "unit-symbols"
+msgid "foot,feet,ft"
+msgstr "стопа,стопе,стопа,ft"
+
 #: ../src/unit.vala:52
 msgid "Inches"
 msgstr "Инчи"
 
+#: ../src/unit.vala:52
+#, c-format
+msgctxt "unit-format"
+msgid "%s in"
+msgstr "%s in"
+
+#: ../src/unit.vala:52
+msgctxt "unit-symbols"
+msgid "inch,inches,in"
+msgstr "инч,инча,ин,in"
+
 #: ../src/unit.vala:53
 msgid "Centimeters"
 msgstr "Центиметри"
 
+#: ../src/unit.vala:53
+#, c-format
+msgctxt "unit-format"
+msgid "%s cm"
+msgstr "%s cm"
+
+#: ../src/unit.vala:53
+msgctxt "unit-symbols"
+msgid "centimeter,centimeters,cm,cms"
+msgstr "центиметар,центиметра,центиметара,цм,cm"
+
 #: ../src/unit.vala:54
 msgid "Millimeters"
 msgstr "Милиметри"
 
+#: ../src/unit.vala:54
+#, c-format
+msgctxt "unit-format"
+msgid "%s mm"
+msgstr "%s mm"
+
+#: ../src/unit.vala:54
+msgctxt "unit-symbols"
+msgid "millimeter,millimeters,mm"
+msgstr "милиметар,милиметра,милиметара,мм,mm"
+
 #: ../src/unit.vala:55
 msgid "Micrometers"
 msgstr "Микрометри"
 
+#: ../src/unit.vala:55
+#, c-format
+msgctxt "unit-format"
+msgid "%s μm"
+msgstr "%s μm"
+
+#: ../src/unit.vala:55
+msgctxt "unit-symbols"
+msgid "micrometer,micrometers,um"
+msgstr "микрометар,микрометра,микрометара,um"
+
 #: ../src/unit.vala:56
 msgid "Nanometers"
 msgstr "Нанометри"
 
+#: ../src/unit.vala:56
+#, c-format
+msgctxt "unit-format"
+msgid "%s nm"
+msgstr "%s nm"
+
+#: ../src/unit.vala:56
+msgctxt "unit-symbols"
+msgid "nanometer,nanometers,nm"
+msgstr "нанометар,нанометра,нанометара,нм,nm"
+
 #: ../src/unit.vala:57
 msgid "Hectares"
 msgstr "Хектари"
 
+#: ../src/unit.vala:57
+#, c-format
+msgctxt "unit-format"
+msgid "%s ha"
+msgstr "%s ha"
+
+#: ../src/unit.vala:57
+msgctxt "unit-symbols"
+msgid "hectare,hectares,ha"
+msgstr "хектар,хектара, ха,ha"
+
 #: ../src/unit.vala:58
 msgid "Acres"
 msgstr "Акри"
 
+#: ../src/unit.vala:58
+#, c-format
+#| msgid "Acres"
+msgctxt "unit-format"
+msgid "%s acres"
+msgstr "%s акра"
+
+#: ../src/unit.vala:58
+msgctxt "unit-symbols"
+msgid "acre,acres"
+msgstr "акр,акра"
+
 #: ../src/unit.vala:59
 msgid "Square Meters"
 msgstr "Квадратни метри"
 
+#: ../src/unit.vala:59
+#, c-format
+msgctxt "unit-format"
+msgid "%s m²"
+msgstr "%s m²"
+
+#: ../src/unit.vala:59
+msgctxt "unit-symbols"
+msgid "m²"
+msgstr "m²"
+
 #: ../src/unit.vala:60
 msgid "Square Centimeters"
 msgstr "Квадратни центиметри"
 
+#: ../src/unit.vala:60
+#, c-format
+msgctxt "unit-format"
+msgid "%s cm²"
+msgstr "%s cm²"
+
+#: ../src/unit.vala:60
+msgctxt "unit-symbols"
+msgid "cm²"
+msgstr "cm²"
+
 #: ../src/unit.vala:61
 msgid "Square Millimeters"
 msgstr "Квадратни милиметри"
 
+#: ../src/unit.vala:61
+#, c-format
+msgctxt "unit-format"
+msgid "%s mm²"
+msgstr "%s mm²"
+
+#: ../src/unit.vala:61
+msgctxt "unit-symbols"
+msgid "mm²"
+msgstr "mm²"
+
 #: ../src/unit.vala:62
 msgid "Cubic Meters"
 msgstr "Кубни метри"
 
+#: ../src/unit.vala:62
+#, c-format
+msgctxt "unit-format"
+msgid "%s m³"
+msgstr "%s m³"
+
+#: ../src/unit.vala:62
+msgctxt "unit-symbols"
+msgid "m³"
+msgstr "m³"
+
 #: ../src/unit.vala:63
 msgid "Gallons"
 msgstr "Галони"
 
+#: ../src/unit.vala:63
+#, c-format
+msgctxt "unit-format"
+msgid "%s gal"
+msgstr "%s gal"
+
+#: ../src/unit.vala:63
+msgctxt "unit-symbols"
+msgid "gallon,gallons,gal"
+msgstr "галон,галона,gal"
+
 #: ../src/unit.vala:64
-msgid "Litres"
+#| msgid "Meters"
+msgid "Liters"
 msgstr "Литри"
 
+#: ../src/unit.vala:64
+#, c-format
+msgctxt "unit-format"
+msgid "%s L"
+msgstr "%s l"
+
+#: ../src/unit.vala:64
+msgctxt "unit-symbols"
+msgid "litre,litres,liter,liters,L"
+msgstr "литар,литра,литара,Л,l"
+
 #: ../src/unit.vala:65
 msgid "Quarts"
 msgstr "Кварти"
 
+#: ../src/unit.vala:65
+#, c-format
+msgctxt "unit-format"
+msgid "%s qt"
+msgstr "%s qt"
+
+#: ../src/unit.vala:65
+msgctxt "unit-symbols"
+msgid "quart,quarts,qt"
+msgstr "кварт,кварта,квартова,qt"
+
 #: ../src/unit.vala:66
 msgid "Pints"
 msgstr "Пинте"
 
+#: ../src/unit.vala:66
+#, c-format
+msgctxt "unit-format"
+msgid "%s pt"
+msgstr "%s pt"
+
+#: ../src/unit.vala:66
+msgctxt "unit-symbols"
+msgid "pint,pints,pt"
+msgstr "пинта,пинте,пинти,пт,pt"
+
 #: ../src/unit.vala:67
-msgid "Millilitres"
+#| msgid "Millilitres"
+msgid "Milliliters"
 msgstr "Милилитри"
 
+#: ../src/unit.vala:67
+#, c-format
+msgctxt "unit-format"
+msgid "%s mL"
+msgstr "%s ml"
+
+#: ../src/unit.vala:67
+msgctxt "unit-symbols"
+msgid "millilitre,millilitres,milliliter,milliliters,mL,cm³"
+msgstr "милилитар,милилитра,милилитара,мл,ml,cm³"
+
 #: ../src/unit.vala:68
-msgid "Microlitres"
+#| msgid "Microlitres"
+msgid "Microliters"
 msgstr "Микролитри"
 
+#: ../src/unit.vala:68
+#, c-format
+msgctxt "unit-format"
+msgid "%s μL"
+msgstr "%s μl"
+
+#: ../src/unit.vala:68
+msgctxt "unit-symbols"
+msgid "mm³,μL,uL"
+msgstr "mm³,μl,ul"
+
 #: ../src/unit.vala:69
 msgid "Tonnes"
 msgstr "Тоне"
 
+#: ../src/unit.vala:69
+#, c-format
+msgctxt "unit-format"
+msgid "%s T"
+msgstr "%s t"
+
+#: ../src/unit.vala:69
+msgctxt "unit-symbols"
+msgid "tonne,tonnes"
+msgstr "тона,тоне,т,t"
+
 #: ../src/unit.vala:70
 msgid "Kilograms"
 msgstr "Килограми"
 
+#: ../src/unit.vala:70
+#, c-format
+msgctxt "unit-format"
+msgid "%s kg"
+msgstr "%s kg"
+
+#: ../src/unit.vala:70
+msgctxt "unit-symbols"
+msgid "kilogram,kilograms,kilogramme,kilogrammes,kg,kgs"
+msgstr "килограм,килограма,кг,kg"
+
 #: ../src/unit.vala:71
 msgid "Pounds"
 msgstr "Фунте"
 
+#: ../src/unit.vala:71
+#, c-format
+msgctxt "unit-format"
+msgid "%s lb"
+msgstr "%s lb"
+
+#: ../src/unit.vala:71
+msgctxt "unit-symbols"
+msgid "pound,pounds,lb"
+msgstr "фунта,фунте,фунти,lb"
+
 #: ../src/unit.vala:72
 msgid "Ounces"
 msgstr "Унце"
 
+#: ../src/unit.vala:72
+#, c-format
+msgctxt "unit-format"
+msgid "%s oz"
+msgstr "%s oz"
+
+#: ../src/unit.vala:72
+msgctxt "unit-symbols"
+msgid "ounce,ounces,oz"
+msgstr "унца,unce,унци,оз,oz"
+
 #: ../src/unit.vala:73
 msgid "Grams"
 msgstr "Грами"
 
+#: ../src/unit.vala:73
+#, c-format
+msgctxt "unit-format"
+msgid "%s g"
+msgstr "%s g"
+
+#: ../src/unit.vala:73
+msgctxt "unit-symbols"
+msgid "gram,grams,gramme,grammes,g"
+msgstr "грам,грама,г,g"
+
 #: ../src/unit.vala:74
 msgid "Years"
 msgstr "Године"
 
+#: ../src/unit.vala:74
+#, c-format
+#| msgid "Years"
+msgctxt "unit-format"
+msgid "%s years"
+msgstr "%s год."
+
+#: ../src/unit.vala:74
+msgctxt "unit-symbols"
+msgid "year,years"
+msgstr "година,године,година"
+
 #: ../src/unit.vala:75
 msgid "Days"
 msgstr "Дани"
 
+#: ../src/unit.vala:75
+#, c-format
+msgctxt "unit-format"
+msgid "%s days"
+msgstr "%s дана"
+
+#: ../src/unit.vala:75
+msgctxt "unit-symbols"
+msgid "day,days"
+msgstr "дан,дана"
+
 #: ../src/unit.vala:76
 msgid "Hours"
 msgstr "Сати"
 
+#: ../src/unit.vala:76
+#, c-format
+#| msgid "Hours"
+msgctxt "unit-format"
+msgid "%s hours"
+msgstr "%s сати"
+
+#: ../src/unit.vala:76
+msgctxt "unit-symbols"
+msgid "hour,hours"
+msgstr "сат,сата,сати"
+
 #: ../src/unit.vala:77
 msgid "Minutes"
 msgstr "Минути"
 
+#: ../src/unit.vala:77
+#, c-format
+#| msgid "Minutes"
+msgctxt "unit-format"
+msgid "%s minutes"
+msgstr "%s мин."
+
+#: ../src/unit.vala:77
+msgctxt "unit-symbols"
+msgid "minute,minutes"
+msgstr "минут,минута"
+
 #: ../src/unit.vala:78
 msgid "Seconds"
 msgstr "Секунде"
 
+#: ../src/unit.vala:78
+#, c-format
+msgctxt "unit-format"
+msgid "%s s"
+msgstr "%s s"
+
+#: ../src/unit.vala:78
+#| msgid "Microseconds"
+msgctxt "unit-symbols"
+msgid "second,seconds,s"
+msgstr "секунда,секунде,секунди,с,s"
+
 #: ../src/unit.vala:79
 msgid "Milliseconds"
 msgstr "Милисекунде"
 
+#: ../src/unit.vala:79
+#, c-format
+msgctxt "unit-format"
+msgid "%s ms"
+msgstr "%s ms"
+
+#: ../src/unit.vala:79
+msgctxt "unit-symbols"
+msgid "millisecond,milliseconds,ms"
+msgstr "милисекунда,милисекунде,милисенди,мс,ms"
+
 #: ../src/unit.vala:80
 msgid "Microseconds"
 msgstr "Микросекунде"
 
+#: ../src/unit.vala:80
+#, c-format
+msgctxt "unit-format"
+msgid "%s μs"
+msgstr "%s μs"
+
+#: ../src/unit.vala:80
+msgctxt "unit-symbols"
+msgid "microsecond,microseconds,us,μs"
+msgstr "микросекундa,микросекунде,микросекунди,μs"
+
 #: ../src/unit.vala:81
 msgid "Celsius"
 msgstr "Целзијуси"
 
+#: ../src/unit.vala:81
+#, c-format
+msgctxt "unit-format"
+msgid "%s ˚C"
+msgstr "%s ˚C"
+
+#: ../src/unit.vala:81
+msgctxt "unit-symbols"
+msgid "degC,˚C"
+msgstr "степЦ,˚C"
+
 #: ../src/unit.vala:82
-msgid "Farenheit"
+#| msgid "Farenheit"
+msgid "Fahrenheit"
 msgstr "Фаренхајти"
 
+#: ../src/unit.vala:82
+#, c-format
+msgctxt "unit-format"
+msgid "%s ˚F"
+msgstr "%s ˚F"
+
+#: ../src/unit.vala:82
+msgctxt "unit-symbols"
+msgid "degF,˚F"
+msgstr "степФ,˚F"
+
 #: ../src/unit.vala:83
 msgid "Kelvin"
 msgstr "Келвини"
 
+#: ../src/unit.vala:83
+#, c-format
+msgctxt "unit-format"
+msgid "%s K"
+msgstr "%s K"
+
+#: ../src/unit.vala:83
+msgctxt "unit-symbols"
+msgid "K"
+msgstr "K"
+
 #: ../src/unit.vala:84
 msgid "Rankine"
 msgstr "Ранкини"
 
+#: ../src/unit.vala:84
+#, c-format
+msgctxt "unit-format"
+msgid "%s ˚R"
+msgstr "%s ˚R"
+
+#: ../src/unit.vala:84
+msgctxt "unit-symbols"
+msgid "degR,˚R,˚Ra"
+msgstr "степР,˚R,˚Ra"
+
 #: ../src/unit.vala:86
 msgid "Currency"
 msgstr "Валута"
@@ -1644,3 +2218,24 @@ msgstr "Валута"
 #, c-format
 msgid "%s%%s"
 msgstr "%%s%s"
+
+#~ msgid "Financial"
+#~ msgstr "Финансијски"
+
+#~ msgid "Mode"
+#~ msgstr "Режим"
+
+#~ msgid "Round"
+#~ msgstr "Заокружи"
+
+#~ msgid "Floor"
+#~ msgstr "Заокружи на доле"
+
+#~ msgid "Ceiling"
+#~ msgstr "Заокружи на горе"
+
+#~ msgid "Sign"
+#~ msgstr "Знак"
+
+#~ msgid "Litres"
+#~ msgstr "Литри"
diff --git a/po/sr latin po b/po/sr latin po
index c630f79..a6556e3 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -1,5 +1,5 @@
 # Serbian translation of gnome-calculator
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2013.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2014.
 # This file is distributed under the same license as the gnome-calculator package.
 # Maintainer: Danilo Šegan <dsegan gmx net>
 # Reviewed on 2005-07-18 by: Igor Nestorović <igor prevod org>
@@ -7,14 +7,14 @@
 # Translated on 2010-08-25 by: Branko Kokanović <branko kokanovic gmail com>
 # Translated on 2011-03-19 by: Branko Kokanović <branko kokanovic gmail com>
 # Branko Kokanović <branko kokanovic gmail com>, 2011.
-# Miroslav Nikolić <miroslavnikolic rocketmail com>, 2011, 2013.
+# Miroslav Nikolić <miroslavnikolic rocketmail com>, 2011—2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-calculator\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=http:/";
 "/bugzilla.gnome.org/&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-01-09 09:15+0000\n"
-"PO-Revision-Date: 2013-01-18 22:10+0200\n"
+"POT-Creation-Date: 2014-03-23 07:18+0000\n"
+"PO-Revision-Date: 2014-03-23 16:32+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
@@ -65,7 +65,7 @@ msgstr "Naučni stepen"
 #. Accessible name for the memory value button
 #. Tooltip for the memory button
 #: ../data/buttons-advanced.ui.h:16 ../data/buttons-financial.ui.h:72
-#: ../src/math-buttons.vala:384
+#: ../src/math-buttons.vala:375
 msgid "Memory"
 msgstr "Memorija"
 
@@ -89,11 +89,11 @@ msgstr "Stepen"
 #. Accessible name for the store value button
 #: ../data/buttons-advanced.ui.h:24 ../data/buttons-programming.ui.h:12
 msgid "Store"
-msgstr "Snimi"
+msgstr "Sačuvaj"
 
 #. Title of Compounding Term dialog
 #. Tooltip for the compounding term button
-#: ../data/buttons-financial.ui.h:2 ../src/math-buttons.vala:400
+#: ../data/buttons-financial.ui.h:2 ../src/math-buttons.vala:391
 msgid "Compounding Term"
 msgstr "Činilac sastava"
 
@@ -120,7 +120,8 @@ msgid ""
 "compounding period."
 msgstr ""
 "Izračunajte broj perioda činioca potrebnih za povećanje vrednosti investicije "
-"sa trenutne na buduću vrednost po fiksnoj kamatnoj stopi po periodu činioca."
+"sa trenutne na buduću vrednost po fiksnoj kamatnoj stopi po periodu "
+"činioca."
 
 #. Periodic Interest Rate Dialog: Label before future value input
 #: ../data/buttons-financial.ui.h:12
@@ -158,7 +159,7 @@ msgstr "_Period:"
 
 #. Title of Future Value dialog
 #. Tooltip for the future value button
-#: ../data/buttons-financial.ui.h:24 ../src/math-buttons.vala:404
+#: ../data/buttons-financial.ui.h:24 ../src/math-buttons.vala:395
 msgid "Future Value"
 msgstr "Buduća vrednost"
 
@@ -184,7 +185,7 @@ msgstr "_Broj perioda:"
 
 #. Title of Gross Profit Margin dialog
 #. Tooltip for the gross profit margin button
-#: ../data/buttons-financial.ui.h:32 ../src/math-buttons.vala:418
+#: ../data/buttons-financial.ui.h:32 ../src/math-buttons.vala:409
 msgid "Gross Profit Margin"
 msgstr "Bruto marža"
 
@@ -204,7 +205,7 @@ msgstr "_Marža:"
 
 #. Title of Periodic Payment dialog
 #. Tooltip for the periodic payment button
-#: ../data/buttons-financial.ui.h:38 ../src/math-buttons.vala:416
+#: ../data/buttons-financial.ui.h:38 ../src/math-buttons.vala:407
 msgid "Periodic Payment"
 msgstr "Periodično plaćanje"
 
@@ -229,7 +230,7 @@ msgstr "_Rok:"
 
 #. Title of Present Value dialog
 #. Tooltip for the present value button
-#: ../data/buttons-financial.ui.h:46 ../src/math-buttons.vala:414
+#: ../data/buttons-financial.ui.h:46 ../src/math-buttons.vala:405
 msgid "Present Value"
 msgstr "Trenutna vrednost"
 
@@ -245,7 +246,7 @@ msgstr ""
 
 #. Title of Periodic Interest Rate dialog
 #. Tooltip for the periodic interest rate button
-#: ../data/buttons-financial.ui.h:50 ../src/math-buttons.vala:412
+#: ../data/buttons-financial.ui.h:50 ../src/math-buttons.vala:403
 msgid "Periodic Interest Rate"
 msgstr "Periodična kamatna stopa"
 
@@ -283,7 +284,7 @@ msgid ""
 msgstr ""
 "Izračunajte pravolinijsko umanjenje proizvoda za zadati period. Metod "
 "pravolinijskog umanjenja deli amortizacioni trošak proizvoda na ceo koristan "
-"život proizvoda. Korisni život proizvoda je broj perioda, obično godina, "
+"život proizvoda. Koristan život proizvoda je broj perioda, obično godina, "
 "posle koga je proizvod amortizovan. "
 
 #. Title of Sum-of-the-Years'-Digits Depreciation dialog
@@ -301,9 +302,10 @@ msgid ""
 "of periods, typically years, over which an asset is depreciated. "
 msgstr ""
 "Izračunajte amortizaciono umanjenje za određeni period vremena koristeći metod "
-"zbira-cifara-godine. Ovaj metod amortizacije uvećava stopu amortizacije tako "
-"da su troškovi amortizacije veći u ranijim periodima vremena. Korisni život "
-"proizvoda je broj perioda, obično godina, za koje se proizvod amortizuje. "
+"zbira-cifara-godine. Ovaj metod amortizacije uvećava stopu amortizacije "
+"tako da su troškovi amortizacije veći u ranijim periodima vremena. Koristan "
+"život proizvoda je broj perioda, obično godina, za koje se proizvod "
+"amortizuje. "
 
 #. Title of Payment Period dialog
 #: ../data/buttons-financial.ui.h:66
@@ -328,17 +330,17 @@ 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
 #: ../data/buttons-financial.ui.h:78
 msgid "Ctrm"
-msgstr "Ctrm"
+msgstr "Čisas"
 
 #. 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:80
 msgid "Ddb"
-msgstr "Ddb"
+msgstr "Dvoum"
 
 #. 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:82
 msgid "Fv"
-msgstr "Bv"
+msgstr "Buvre"
 
 #. 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:84
@@ -348,12 +350,12 @@ msgstr "Rok"
 #. 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:86
 msgid "Syd"
-msgstr "Zcg"
+msgstr "Umzcg"
 
 #. 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:88
 msgid "Sln"
-msgstr "Plu"
+msgstr "Praum"
 
 #. 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:90
@@ -363,40 +365,40 @@ msgstr "Stopa"
 #. 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:92
 msgid "Pv"
-msgstr "Tv"
+msgstr "Trevr"
 
 #. 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:94
 msgid "Pmt"
-msgstr "Ppl"
+msgstr "Perpl"
 
 #. 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:96
 msgid "Gpm"
-msgstr "BM"
+msgstr "Bruma"
 
 #. Accessible name for the shift left button
 #. Tooltip for the shift left button
-#: ../data/buttons-programming.ui.h:16 ../src/math-buttons.vala:396
+#: ../data/buttons-programming.ui.h:16 ../src/math-buttons.vala:387
 msgid "Shift Left"
 msgstr "Pomeri ulevo"
 
 #. Accessible name for the shift right button
 #. Tooltip for the shift right button
-#: ../data/buttons-programming.ui.h:18 ../src/math-buttons.vala:398
+#: ../data/buttons-programming.ui.h:18 ../src/math-buttons.vala:389
 msgid "Shift Right"
 msgstr "Pomeri udesno"
 
 #. Accessible name for the insert character button
 #: ../data/buttons-programming.ui.h:20
 msgid "Insert Character"
-msgstr "Ubaci Znak"
+msgstr "Ubaci znak"
 
 #. Title of insert character code dialog
 #. Tooltip for the insert character code button
-#: ../data/buttons-programming.ui.h:28 ../src/math-buttons.vala:386
+#: ../data/buttons-programming.ui.h:28 ../src/math-buttons.vala:377
 msgid "Insert Character Code"
-msgstr "Ubaci kod znaka"
+msgstr "Ubacite kod znaka"
 
 #. Insert ASCII dialog: Label before character entry
 #: ../data/buttons-programming.ui.h:30
@@ -410,57 +412,142 @@ msgstr "_Umetni"
 
 #. Program name in the about dialog
 #. Title of main window
-#: ../data/gnome-calculator.desktop.in.h:1 ../src/gnome-calculator.vala:265
-#: ../src/math-window.vala:29
+#: ../data/gnome-calculator.desktop.in.h:1 ../src/gnome-calculator.vala:182
+#: ../src/math-window.vala:40
 msgid "Calculator"
 msgstr "Kalkulator"
 
 #: ../data/gnome-calculator.desktop.in.h:2
 msgid "Perform arithmetic, scientific or financial calculations"
-msgstr "Izvršite aritmetičke, naučne ili finansijske proračune"
+msgstr "Izvršavajte aritmetičke, naučne ili finansijske proračune"
 
 #: ../data/gnome-calculator.desktop.in.h:3
-#| msgid "Perform arithmetic, scientific or financial calculations"
 msgid "calculation;arithmetic;scientific;financial;"
 msgstr "računanje;aritmetika;nauka;finansije;proračun;"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:1
+#: ../data/gnome-calculator.appdata.xml.in.h:1
+#| msgid "Calculator"
+msgid "GNOME Calculator"
+msgstr "Gnomov kalkulator"
+
+#: ../data/gnome-calculator.appdata.xml.in.h:2
+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 ""
+"Gnomov kalkulator je program za rešavanje matematičkih jednačina. Iako na "
+"prvi pogled liči na jednostavan kalkulator samo sa osnovnim aritmetičkim "
+"operacijama, možete da se prebacite na napredan, finansijski, ili "
+"programerski način rada i da otkrijete iznenađujući skup mogućnosti."
+
+#: ../data/gnome-calculator.appdata.xml.in.h:3
+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 ""
+"Napredni kalkulator podržava mnoge operacije, uključujući: logaritamske, "
+"faktorijelne, trigonometrijske i hiperboličke funkcije, deljenje modula, "
+"kompleksne brojeve, stvaranje nasumičnog broja, faktorizaciju prostog broja i "
+"pretvaranje jedinica."
+
+#: ../data/gnome-calculator.appdata.xml.in.h:4
+msgid ""
+"Financial mode supports several computations, including periodic interest "
+"rate, present and future value, double declining and straight line "
+"depreciation, and many others."
+msgstr ""
+"Finansijski način rada podržava nekoliko izračunavanja, uključujući periodičnu "
+"kamatnu stopu, sadašnju i buduću vrednost, dvostruko opadanje i pravolinijsko "
+"umanjenje, i mnoge druge."
+
+#: ../data/gnome-calculator.appdata.xml.in.h:5
+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 ""
+"Programerski način rada podržava pretvaranje brojeva između opštih osnova "
+"(binarnih, oktalnih, decimalnih i heksadecimalnih), bulovu algebru, "
+"komplement jedinice i dvojke, pretvaranje koda znaka u znak, i drugo."
+
+#. Title of preferences dialog
+#: ../data/menu.ui.h:1 ../src/math-preferences.vala:26
+msgid "Preferences"
+msgstr "Postavke"
+
+#: ../data/menu.ui.h:2
+msgid "Help"
+msgstr "Pomoć"
+
+#: ../data/menu.ui.h:3
+msgid "About"
+msgstr "O programu"
+
+#: ../data/menu.ui.h:4
+msgid "Quit"
+msgstr "Izađi"
+
+#: ../data/menu.ui.h:5 ../src/math-window.vala:109
+#| msgid "Basic"
+msgid "Basic Mode"
+msgstr "Osnovni način rada"
+
+#: ../data/menu.ui.h:6 ../src/math-window.vala:114
+#| msgid "Advanced"
+msgid "Advanced Mode"
+msgstr "Napredni način rada"
+
+#: ../data/menu.ui.h:7 ../src/math-window.vala:119
+#| msgid "Financial Term"
+msgid "Financial Mode"
+msgstr "Finansijski način rada"
+
+#: ../data/menu.ui.h:8 ../src/math-window.vala:124
+#| msgid "Programming"
+msgid "Programming Mode"
+msgstr "Programerski način rada"
+
+#: ../data/org.gnome.calculator.gschema.xml.h:1
 msgid "Accuracy value"
 msgstr "Vrednost tačnosti"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:2
+#: ../data/org.gnome.calculator.gschema.xml.h:2
 msgid "The number of digits displayed after the numeric point"
 msgstr "Broj cifara prikazan posle decimalnog zareza"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:3
+#: ../data/org.gnome.calculator.gschema.xml.h:3
 msgid "Word size"
 msgstr "Dužina reči"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:4
+#: ../data/org.gnome.calculator.gschema.xml.h:4
 msgid "The size of the words used in bitwise operations"
 msgstr "Dužina reči koja se koristi za bitske operacije"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:5
+#: ../data/org.gnome.calculator.gschema.xml.h:5
 msgid "Numeric Base"
 msgstr "Osnova broja"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:6
+#: ../data/org.gnome.calculator.gschema.xml.h:6
 msgid "The numeric base"
 msgstr "Brojna osnova"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:7
+#: ../data/org.gnome.calculator.gschema.xml.h:7
 msgid "Show Thousands Separators"
 msgstr "Prikazivanje razdvajača hiljada"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:8
+#: ../data/org.gnome.calculator.gschema.xml.h:8
 msgid "Indicates whether thousands separators are shown in large numbers."
 msgstr "Da li da se razdvajač hiljada prikazuje za velike brojeve."
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:9
+#: ../data/org.gnome.calculator.gschema.xml.h:9
 msgid "Show Trailing Zeroes"
 msgstr "Prikazivanje pratećih nula"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:10
+#: ../data/org.gnome.calculator.gschema.xml.h:10
 msgid ""
 "Indicates whether any trailing zeroes after the numeric point should be "
 "shown in the display value."
@@ -468,59 +555,59 @@ msgstr ""
 "Da li da se u prikazanoj vrednosti prikazuju prateće nule posle decimalnog "
 "zareza."
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:11
+#: ../data/org.gnome.calculator.gschema.xml.h:11
 msgid "Number format"
-msgstr "Oblik broja"
+msgstr "Zapis broja"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:12
+#: ../data/org.gnome.calculator.gschema.xml.h:12
 msgid "The format to display numbers in"
-msgstr "Oblik u kome će se prikazivati brojevi"
+msgstr "Zapis u kome će se prikazivati brojevi"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:13
+#: ../data/org.gnome.calculator.gschema.xml.h:13
 msgid "Angle units"
 msgstr "Jedinice uglova"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:14
+#: ../data/org.gnome.calculator.gschema.xml.h:14
 msgid "The angle units to use"
 msgstr "Jedinice uglova za korišćenje"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:15
+#: ../data/org.gnome.calculator.gschema.xml.h:15
 msgid "Button mode"
 msgstr "Režim dugmeta"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:16
+#: ../data/org.gnome.calculator.gschema.xml.h:16
 msgid "The button mode"
 msgstr "Režim dugmeta"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:17
+#: ../data/org.gnome.calculator.gschema.xml.h:17
 msgid "Source currency"
 msgstr "Izvorna valuta"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:18
+#: ../data/org.gnome.calculator.gschema.xml.h:18
 msgid "Currency of the current calculation"
 msgstr "Valuta trenutnog proračuna"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:19
+#: ../data/org.gnome.calculator.gschema.xml.h:19
 msgid "Target currency"
 msgstr "Ciljna valuta"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:20
+#: ../data/org.gnome.calculator.gschema.xml.h:20
 msgid "Currency to convert the current calculation into"
 msgstr "Valuta u koju treba pretvoriti proračun"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:21
+#: ../data/org.gnome.calculator.gschema.xml.h:21
 msgid "Source units"
 msgstr "Izvorna jedinica"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:22
+#: ../data/org.gnome.calculator.gschema.xml.h:22
 msgid "Units of the current calculation"
 msgstr "Jedinica trenutnog proračuna"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:23
+#: ../data/org.gnome.calculator.gschema.xml.h:23
 msgid "Target units"
 msgstr "Ciljna jedinica"
 
-#: ../data/org.gnome.calculator.gschema.xml.in.h:24
+#: ../data/org.gnome.calculator.gschema.xml.h:24
 msgid "Units to convert the current calculation into"
 msgstr "Jedinica u koju treba pretvoriti proračun"
 
@@ -768,50 +855,13 @@ msgstr "Južnoafrički rand"
 msgid "Error: the number of periods must be positive"
 msgstr "Greška: broj perioda mora biti pozitivan"
 
-#: ../src/gnome-calculator.vala:80
-msgid "Basic"
-msgstr "Osnovni"
-
-#: ../src/gnome-calculator.vala:81
-msgid "Advanced"
-msgstr "Napredni"
-
-#: ../src/gnome-calculator.vala:82
-msgid "Financial"
-msgstr "Finansijski"
-
-#: ../src/gnome-calculator.vala:83
-msgid "Programming"
-msgstr "Programerski"
-
-#: ../src/gnome-calculator.vala:84
-msgid "Mode"
-msgstr "Režim"
-
-#. Title of preferences dialog
-#: ../src/gnome-calculator.vala:87 ../src/math-preferences.vala:26
-msgid "Preferences"
-msgstr "Postavke"
-
-#: ../src/gnome-calculator.vala:91
-msgid "About Calculator"
-msgstr "O Kalkulatoru"
-
-#: ../src/gnome-calculator.vala:92
-msgid "Help"
-msgstr "Pomoć"
-
-#: ../src/gnome-calculator.vala:93
-msgid "Quit"
-msgstr "Izađi"
-
 #. Translators: Error message displayed when unable to launch help browser
-#: ../src/gnome-calculator.vala:228
+#: ../src/gnome-calculator.vala:147
 msgid "Unable to open help file"
 msgstr "Ne mogu da otvorim datoteku pomoći"
 
 #. The translator credits. Please translate this with your name (s).
-#: ../src/gnome-calculator.vala:258
+#: ../src/gnome-calculator.vala:177
 msgid "translator-credits"
 msgstr ""
 "Danilo Šegan <danilo prevod org>\n"
@@ -822,297 +872,300 @@ msgstr ""
 "\n"
 "http://prevod.org — prevod na srpski jezik"
 
+#: ../src/gnome-calculator.vala:183
+msgid "About Calculator"
+msgstr "O Kalkulatoru"
+
 #. Short description in the about dialog
-#: ../src/gnome-calculator.vala:272
+#: ../src/gnome-calculator.vala:190
 msgid "Calculator with financial and scientific modes."
 msgstr "Kalkulator sa finansijskim i naučnim načinom rada."
 
-#: ../src/gnome-calculator.vala:305
+#: ../src/gnome-calculator.vala:223
 msgid "Solve given equation"
 msgstr "Rešava datu jednačinu"
 
-#: ../src/gnome-calculator.vala:313
+#: ../src/gnome-calculator.vala:231
 msgid "Start with given equation"
 msgstr "Počinje sa datom jednačinom"
 
-#: ../src/gnome-calculator.vala:322
+#: ../src/gnome-calculator.vala:240
 msgid "Show release version"
 msgstr "Prikazuje izdanje programa"
 
 #. Configure buttons
 #. Tooltip for the Pi button
-#: ../src/math-buttons.vala:298
+#: ../src/math-buttons.vala:291
 msgid "Pi [Ctrl+P]"
 msgstr "Pi [Ctrl+P]"
 
 #. Tooltip for the Euler's Number button
-#: ../src/math-buttons.vala:300
+#: ../src/math-buttons.vala:293
 msgid "Euler’s Number"
 msgstr "Ojlerov broj"
 
 #. Tooltip for the subscript button
-#: ../src/math-buttons.vala:304
+#: ../src/math-buttons.vala:297
 msgid "Subscript mode [Alt]"
 msgstr "Režim indeksa [Alt]"
 
 #. Tooltip for the superscript button
-#: ../src/math-buttons.vala:306
+#: ../src/math-buttons.vala:299
 msgid "Superscript mode [Ctrl]"
 msgstr "Režim izložioca [Ctrl]"
 
 #. Tooltip for the scientific exponent button
-#: ../src/math-buttons.vala:308
+#: ../src/math-buttons.vala:301
 msgid "Scientific exponent [Ctrl+E]"
 msgstr "Naučni stepen [Ctrl+E]"
 
 #. Tooltip for the add button
-#: ../src/math-buttons.vala:310
+#: ../src/math-buttons.vala:303
 msgid "Add [+]"
 msgstr "Saberite [+]"
 
 #. Tooltip for the subtract button
-#: ../src/math-buttons.vala:312
+#: ../src/math-buttons.vala:305
 msgid "Subtract [-]"
 msgstr "Oduzmite [-]"
 
 #. Tooltip for the multiply button
-#: ../src/math-buttons.vala:314
+#: ../src/math-buttons.vala:307
 msgid "Multiply [*]"
 msgstr "Pomnožite [*]"
 
 #. Tooltip for the divide button
-#: ../src/math-buttons.vala:316
+#: ../src/math-buttons.vala:309
 msgid "Divide [/]"
 msgstr "Podelite [/]"
 
 #. Tooltip for the modulus divide button
-#: ../src/math-buttons.vala:318
+#: ../src/math-buttons.vala:311
 msgid "Modulus divide"
 msgstr "Deljenje po modulu"
 
 #. Tooltip for the additional functions button
-#: ../src/math-buttons.vala:320
+#: ../src/math-buttons.vala:313
 msgid "Additional Functions"
 msgstr "Dodatne funkcije"
 
 #. Tooltip for the exponent button
-#: ../src/math-buttons.vala:322
+#: ../src/math-buttons.vala:315
 msgid "Exponent [^ or **]"
 msgstr "Eksponent [^ ili **]"
 
-#. Tooltip for the square button
-#: ../src/math-buttons.vala:324
-msgid "Square [Ctrl+2]"
-msgstr "Kvadrat [Ctrl+2]"
-
 #. Tooltip for the percentage button
-#: ../src/math-buttons.vala:326
+#: ../src/math-buttons.vala:317
 msgid "Percentage [%]"
 msgstr "Procenat [%]"
 
 #. Tooltip for the factorial button
-#: ../src/math-buttons.vala:328
+#: ../src/math-buttons.vala:319
 msgid "Factorial [!]"
 msgstr "Faktorijel [!]"
 
 #. Tooltip for the absolute value button
-#: ../src/math-buttons.vala:330
+#: ../src/math-buttons.vala:321
 msgid "Absolute value [|]"
 msgstr "Apsolutna vrednost [|]"
 
 #. Tooltip for the complex argument component button
-#: ../src/math-buttons.vala:332
+#: ../src/math-buttons.vala:323
 msgid "Complex argument"
 msgstr "Kompleksni argument"
 
 #. Tooltip for the complex conjugate button
-#: ../src/math-buttons.vala:334
+#: ../src/math-buttons.vala:325
 msgid "Complex conjugate"
 msgstr "Konjugovano kompleksna vrednost"
 
 #. Tooltip for the root button
-#: ../src/math-buttons.vala:336
+#: ../src/math-buttons.vala:327
 msgid "Root [Ctrl+R]"
 msgstr "Koren [Ctrl+R]"
 
 #. Tooltip for the square root button
-#: ../src/math-buttons.vala:338
+#: ../src/math-buttons.vala:329
 msgid "Square root [Ctrl+R]"
 msgstr "Kvadratni koren [Ctrl+R]"
 
 #. Tooltip for the logarithm button
-#: ../src/math-buttons.vala:340
+#: ../src/math-buttons.vala:331
 msgid "Logarithm"
 msgstr "Logaritam"
 
 #. Tooltip for the natural logarithm button
-#: ../src/math-buttons.vala:342
+#: ../src/math-buttons.vala:333
 msgid "Natural Logarithm"
 msgstr "Prirodni logaritam"
 
 #. Tooltip for the sine button
-#: ../src/math-buttons.vala:344
+#: ../src/math-buttons.vala:335
 msgid "Sine"
 msgstr "Sinus"
 
 #. Tooltip for the cosine button
-#: ../src/math-buttons.vala:346
+#: ../src/math-buttons.vala:337
 msgid "Cosine"
 msgstr "Kosinus"
 
 #. Tooltip for the tangent button
-#: ../src/math-buttons.vala:348
+#: ../src/math-buttons.vala:339
 msgid "Tangent"
 msgstr "Tangens"
 
 #. Tooltip for the hyperbolic sine button
-#: ../src/math-buttons.vala:350
+#: ../src/math-buttons.vala:341
 msgid "Hyperbolic Sine"
 msgstr "Hiperbolični sinus"
 
 #. Tooltip for the hyperbolic cosine button
-#: ../src/math-buttons.vala:352
+#: ../src/math-buttons.vala:343
 msgid "Hyperbolic Cosine"
 msgstr "Hiperbolični kosinus"
 
 #. Tooltip for the hyperbolic tangent button
-#: ../src/math-buttons.vala:354
+#: ../src/math-buttons.vala:345
 msgid "Hyperbolic Tangent"
 msgstr "Hiperbolični tangens"
 
 #. Tooltip for the inverse button
-#: ../src/math-buttons.vala:356
+#: ../src/math-buttons.vala:347
 msgid "Inverse [Ctrl+I]"
 msgstr "Recipročnost [Ctrl+I]"
 
 #. Tooltip for the boolean AND button
-#: ../src/math-buttons.vala:358
+#: ../src/math-buttons.vala:349
 msgid "Boolean AND"
 msgstr "Logičko I"
 
 #. Tooltip for the boolean OR button
-#: ../src/math-buttons.vala:360
+#: ../src/math-buttons.vala:351
 msgid "Boolean OR"
 msgstr "Logičko ILI"
 
 #. Tooltip for the exclusive OR button
-#: ../src/math-buttons.vala:362
+#: ../src/math-buttons.vala:353
 msgid "Boolean Exclusive OR"
 msgstr "Logičko ILLI"
 
 #. Tooltip for the boolean NOT button
-#: ../src/math-buttons.vala:364
+#: ../src/math-buttons.vala:355
 msgid "Boolean NOT"
 msgstr "Logičko NE"
 
 #. Tooltip for the integer component button
-#: ../src/math-buttons.vala:366 ../src/math-buttons.vala:809
+#: ../src/math-buttons.vala:357
 msgid "Integer Component"
 msgstr "Celobrojni deo"
 
 #. Tooltip for the fractional component button
-#: ../src/math-buttons.vala:368 ../src/math-buttons.vala:811
+#: ../src/math-buttons.vala:359
 msgid "Fractional Component"
 msgstr "Razlomljeni deo"
 
 #. Tooltip for the real component button
-#: ../src/math-buttons.vala:370
+#: ../src/math-buttons.vala:361
 msgid "Real Component"
 msgstr "Realni deo"
 
 #. Tooltip for the imaginary component button
-#: ../src/math-buttons.vala:372
+#: ../src/math-buttons.vala:363
 msgid "Imaginary Component"
 msgstr "Imaginarni deo"
 
 #. Tooltip for the ones' complement button
-#: ../src/math-buttons.vala:374
+#: ../src/math-buttons.vala:365
 msgid "Ones' Complement"
 msgstr "Komplement jedinice"
 
 #. Tooltip for the two's complement button
-#: ../src/math-buttons.vala:376
+#: ../src/math-buttons.vala:367
 msgid "Two's Complement"
 msgstr "Komplement dvojke"
 
 #. Tooltip for the truncate button
-#: ../src/math-buttons.vala:378
+#: ../src/math-buttons.vala:369
 msgid "Truncate"
 msgstr "Odsecite"
 
 #. Tooltip for the start group button
-#: ../src/math-buttons.vala:380
+#: ../src/math-buttons.vala:371
 msgid "Start Group [(]"
 msgstr "Otvorite zagradu [(]"
 
 #. Tooltip for the end group button
-#: ../src/math-buttons.vala:382
+#: ../src/math-buttons.vala:373
 msgid "End Group [)]"
 msgstr "Zatvorite zagradu [)]"
 
 #. Tooltip for the solve button
-#: ../src/math-buttons.vala:388
+#: ../src/math-buttons.vala:379
 msgid "Calculate Result"
 msgstr "Izračunajte rezultat"
 
 #. Tooltip for the factor button
-#: ../src/math-buttons.vala:390
+#: ../src/math-buttons.vala:381
 msgid "Factorize [Ctrl+F]"
 msgstr "Faktorišite [Ctrl+F]"
 
 #. Tooltip for the clear button
-#: ../src/math-buttons.vala:392
+#: ../src/math-buttons.vala:383
 msgid "Clear Display [Escape]"
 msgstr "Očistite ekran [Escape]"
 
 #. Tooltip for the undo button
-#: ../src/math-buttons.vala:394
+#: ../src/math-buttons.vala:385
 msgid "Undo [Ctrl+Z]"
 msgstr "Opozovite prethodnu radnju [Ctrl+Z]"
 
 #. Tooltip for the double declining depreciation button
-#: ../src/math-buttons.vala:402
+#: ../src/math-buttons.vala:393
 msgid "Double Declining Depreciation"
 msgstr "Umanjenje dvostrukim opadanjem"
 
 #. Tooltip for the financial term button
-#: ../src/math-buttons.vala:406
+#: ../src/math-buttons.vala:397
 msgid "Financial Term"
 msgstr "Finansijski izraz"
 
 #. Tooltip for the sum of the years digits depreciation button
-#: ../src/math-buttons.vala:408
+#: ../src/math-buttons.vala:399
 msgid "Sum of the Years Digits Depreciation"
 msgstr "Umanjenje zbirom cifara godine"
 
 #. Tooltip for the straight line depreciation button
-#: ../src/math-buttons.vala:410
+#: ../src/math-buttons.vala:401
 msgid "Straight Line Depreciation"
 msgstr "Pravolinijsko umanjenje"
 
+#: ../src/math-buttons.vala:430
+msgid "Square [Ctrl+2]"
+msgstr "Kvadrat [Ctrl+2]"
+
 #. Number display mode combo: Binary, e.g. 10011010010₂
-#: ../src/math-buttons.vala:523
+#: ../src/math-buttons.vala:520
 msgid "Binary"
 msgstr "Binarno"
 
 #. Number display mode combo: Octal, e.g. 2322₈
-#: ../src/math-buttons.vala:527
+#: ../src/math-buttons.vala:524
 msgid "Octal"
 msgstr "Oktalno"
 
 #. Number display mode combo: Decimal, e.g. 1234
-#: ../src/math-buttons.vala:531
+#: ../src/math-buttons.vala:528
 msgid "Decimal"
 msgstr "Decimalno"
 
 #. Number display mode combo: Hexadecimal, e.g. 4D2₁₆
-#: ../src/math-buttons.vala:535
+#: ../src/math-buttons.vala:532
 msgid "Hexadecimal"
 msgstr "Heksadecimalno"
 
 #. 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.vala:740 ../src/math-buttons.vala:777
+#: ../src/math-buttons.vala:741 ../src/math-buttons.vala:778
 #, c-format
 msgid "_%d place"
 msgid_plural "_%d places"
@@ -1123,7 +1176,7 @@ msgstr[3] "_%d mesto"
 
 #. 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.vala:745 ../src/math-buttons.vala:782
+#: ../src/math-buttons.vala:746 ../src/math-buttons.vala:783
 #, c-format
 msgid "%d place"
 msgid_plural "%d places"
@@ -1132,26 +1185,6 @@ msgstr[1] "%d mesta"
 msgstr[2] "%d mesta"
 msgstr[3] "%d mesto"
 
-#. Tooltip for the round button
-#: ../src/math-buttons.vala:813
-msgid "Round"
-msgstr "Zaokruži"
-
-#. Tooltip for the floor button
-#: ../src/math-buttons.vala:815
-msgid "Floor"
-msgstr "Zaokruži na dole"
-
-#. Tooltip for the ceiling button
-#: ../src/math-buttons.vala:817
-msgid "Ceiling"
-msgstr "Zaokruži na gore"
-
-#. Tooltip for the ceiling button
-#: ../src/math-buttons.vala:819
-msgid "Sign"
-msgstr "Znak"
-
 #. Label that is displayed between the two conversion combo boxes, e.g. "[degrees] in [radians]"
 #: ../src/math-converter.vala:46
 msgid " in "
@@ -1168,69 +1201,68 @@ 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 shown when trying to undo with no undo history
-#: ../src/math-equation.vala:487
+#: ../src/math-equation.vala:482
 msgid "No undo history"
 msgstr "Nema radnji opozivanja"
 
 #. Error shown when trying to redo with no redo history
-#: ../src/math-equation.vala:503
+#: ../src/math-equation.vala:499
 msgid "No redo history"
-msgstr "Nema radnji ponavljanja"
+msgstr "Nema radnji vraćanja"
 
-#: ../src/math-equation.vala:732
+#: ../src/math-equation.vala:729
 msgid "No sane value to store"
 msgstr "Nema razumne vrednosti za čuvanje"
 
 #. Error displayed to user when they perform a bitwise operation on numbers greater than the current word
-#: ../src/math-equation.vala:888
+#: ../src/math-equation.vala:911
 msgid "Overflow. Try a bigger word size"
 msgstr "Prekoračenje. Pokušajte sa većom dužinom reči"
 
 #. Error displayed to user when they an unknown variable is entered
-#: ../src/math-equation.vala:893
+#: ../src/math-equation.vala:916
 #, c-format
 msgid "Unknown variable '%s'"
 msgstr "Nepoznata promenljiva „%s“"
 
 #. Error displayed to user when an unknown function is entered
-#: ../src/math-equation.vala:900
+#: ../src/math-equation.vala:923
 #, c-format
 msgid "Function '%s' is not defined"
-msgstr "Funkcija „%s“ nije definisana"
+msgstr "Funkcija „%s“ nije određena"
 
 #. Error displayed to user when an conversion with unknown units is attempted
-#: ../src/math-equation.vala:907
+#: ../src/math-equation.vala:930
 msgid "Unknown conversion"
 msgstr "Nepoznato pretvaranje"
 
-#: ../src/math-equation.vala:915
+#: ../src/math-equation.vala:938
 #, c-format
-#| msgid "Malformed expression"
 msgid "Malformed expression at token '%s'"
 msgstr "Neispravan izraz na „%s“"
 
 #. Unknown error.
 #. Error displayed to user when they enter an invalid calculation
-#: ../src/math-equation.vala:920 ../src/math-equation.vala:925
+#: ../src/math-equation.vala:943 ../src/math-equation.vala:948
 msgid "Malformed expression"
 msgstr "Neispravan izraz"
 
-#: ../src/math-equation.vala:936
+#: ../src/math-equation.vala:959
 msgid "Calculating"
 msgstr "Izračunavam"
 
 #. Error displayed when trying to factorize a non-integer value
-#: ../src/math-equation.vala:1063
+#: ../src/math-equation.vala:1086
 msgid "Need an integer to factorize"
 msgstr "Za faktorisanje je potreban ceo broj"
 
 #. 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.vala:1117
+#: ../src/math-equation.vala:1140
 msgid "No sane value to bitwise shift"
 msgstr "Nema razumne vrednosti za bitsko pomeranje"
 
 #. Message displayed when cannot toggle bit in display
-#: ../src/math-equation.vala:1131
+#: ../src/math-equation.vala:1154
 msgid "Displayed value not an integer"
 msgstr "Prikazana vrednost nije ceo broj"
 
@@ -1326,38 +1358,50 @@ msgstr "32 bita"
 msgid "64 bits"
 msgstr "4 bita"
 
+#: ../src/math-window.vala:137
+#| msgid "Quit"
+msgid "_Quit"
+msgstr "_Izađi"
+
 #. Translators: Error display when attempting to take argument of zero
 #: ../src/number.vala:652
 msgid "Argument not defined for zero"
 msgstr "Argument nije definisan za nulu"
 
 #. Translators: Error displayed when attempted to raise 0 to a negative re_exponent
-#: ../src/number.vala:909 ../src/number.vala:1858
+#: ../src/number.vala:909 ../src/number.vala:1943
 msgid "The power of zero is undefined for a negative exponent"
 msgstr "Stepenovanje nule nije definisano za negativne izložioce"
 
+#. Translators: Error displayed when attempted to raise 0 to power of zero
+#: ../src/number.vala:917
+#| msgid "Reciprocal of zero is undefined"
+msgid "Zero raised to zero is undefined"
+msgstr "Nula na nultom stepenu nije definisana"
+
 #. Translators: Error displayed when attempting to take logarithm of zero
-#: ../src/number.vala:992 ../src/number.vala:1025
+#: ../src/number.vala:1003 ../src/number.vala:1036
 msgid "Logarithm of zero is undefined"
 msgstr "Logaritam nule nije definisan"
 
-#. Translators: Error displayed when attempted take the factorial of a fractional number
-#: ../src/number.vala:1043
-msgid "Factorial is only defined for natural numbers"
-msgstr "Faktorijel je definisan samo za prirodne brojeve"
+#. Translators: Error displayed when attempted take the factorial of a negative or complex number
+#: ../src/number.vala:1058
+#| msgid "Factorial is only defined for natural numbers"
+msgid "Factorial is only defined for non-negative real numbers"
+msgstr "Faktorijel je određen samo za ne-negativne prirodne brojeve"
 
 #. Translators: Error displayed attempted to divide by zero
-#: ../src/number.vala:1119 ../src/number.vala:2608
+#: ../src/number.vala:1142 ../src/number.vala:2644
 msgid "Division by zero is undefined"
 msgstr "Deljenje nulom nije definisano"
 
 #. Translators: Error displayed when attemping to do a modulus division on non-integer numbers
-#: ../src/number.vala:1159
+#: ../src/number.vala:1182
 msgid "Modulus division is only defined for integers"
 msgstr "Deljenje po modulu je definisano samo za cele brojeve"
 
 #. Translators: Error displayed when tangent value is undefined
-#: ../src/number.vala:1227
+#: ../src/number.vala:1274
 msgid ""
 "Tangent is undefined for angles that are multiples of π (180°) from π∕2 (90°)"
 msgstr ""
@@ -1365,69 +1409,69 @@ msgstr ""
 "π∕2 (90°)"
 
 #. Translators: Error displayed when inverse sine value is undefined
-#: ../src/number.vala:1265
+#: ../src/number.vala:1312
 msgid "Inverse sine is undefined for values outside [-1, 1]"
 msgstr "Inverzni sinus nije definisan za vrednosti izvan [-1, 1]"
 
 #. Translators: Error displayed when inverse cosine value is undefined
-#: ../src/number.vala:1280
+#: ../src/number.vala:1327
 msgid "Inverse cosine is undefined for values outside [-1, 1]"
 msgstr "Inverzni kosinus nije definisan za vrednosti izvan [-1, 1]"
 
 #. Translators: Error displayed when inverse hyperbolic cosine value is undefined
-#: ../src/number.vala:1477
+#: ../src/number.vala:1524
 msgid "Inverse hyperbolic cosine is undefined for values less than one"
 msgstr ""
 "Inverzni hiperbolički kosinus nije definisan za vrednosti manje od jedan"
 
 #. Translators: Error displayed when inverse hyperbolic tangent value is undefined
-#: ../src/number.vala:1496
+#: ../src/number.vala:1543
 msgid "Inverse hyperbolic tangent is undefined for values outside [-1, 1]"
 msgstr ""
 "Inverzni hiperbolički tangens nije definisan za vrednosti izvan [-1, 1]"
 
 #. Translators: Error displayed when boolean AND attempted on non-integer values
-#: ../src/number.vala:1515
+#: ../src/number.vala:1562
 msgid "Boolean AND is only defined for positive integers"
 msgstr "Logičko I je definisano samo za pozitivne cele brojeve"
 
 #. Translators: Error displayed when boolean OR attempted on non-integer values
-#: ../src/number.vala:1527
+#: ../src/number.vala:1574
 msgid "Boolean OR is only defined for positive integers"
 msgstr "Logičko ILI je definisano samo za pozitivne cele brojeve"
 
 #. Translators: Error displayed when boolean XOR attempted on non-integer values
-#: ../src/number.vala:1539
+#: ../src/number.vala:1586
 msgid "Boolean XOR is only defined for positive integers"
 msgstr "Logičko ILLI je definisano samo za pozitivne cele brojeve"
 
 #. Translators: Error displayed when boolean XOR attempted on non-integer values
-#: ../src/number.vala:1551
+#: ../src/number.vala:1598
 msgid "Boolean NOT is only defined for positive integers"
 msgstr "Logičko NE je definisano samo za pozitivne cele brojeve"
 
 #. Translators: Error displayed when bit shift attempted on non-integer values
-#: ../src/number.vala:1574
+#: ../src/number.vala:1621
 msgid "Shift is only possible on integer values"
 msgstr "Pomeranje je moguće samo za pozitivne cele vrednosti"
 
-#: ../src/number.vala:1878
+#: ../src/number.vala:1963
 msgid "Root must be non-zero"
 msgstr "Koren mora biti različit od nule"
 
-#: ../src/number.vala:1895
+#: ../src/number.vala:1980
 msgid "Negative root of zero is undefined"
 msgstr "Negativni koren nule nije definisan"
 
-#: ../src/number.vala:1902
+#: ../src/number.vala:1987
 msgid "nth root of negative number is undefined for even n"
 msgstr "n-ti koren negativnog broja nije definisan za parno n"
 
-#: ../src/number.vala:2225
+#: ../src/number.vala:2261
 msgid "Overflow: the result couldn't be calculated"
 msgstr "Prekoračenje: rezultat se ne može izračunati"
 
-#: ../src/number.vala:2553
+#: ../src/number.vala:2589
 msgid "Reciprocal of zero is undefined"
 msgstr "Recipročna vrednost nule nije definisana"
 
@@ -1459,182 +1503,712 @@ msgstr "Vreme"
 msgid "Temperature"
 msgstr "Temperatura"
 
+#: ../src/unit.vala:38
+#, c-format
+#| msgid "Degrees"
+msgctxt "unit-format"
+msgid "%s degrees"
+msgstr "%s stepeni"
+
+#: ../src/unit.vala:38
+msgctxt "unit-symbols"
+msgid "degree,degrees,deg"
+msgstr "stepen,stepena,stepeni,st"
+
+#: ../src/unit.vala:39
+#, c-format
+#| msgid "Gradians"
+msgctxt "unit-format"
+msgid "%s radians"
+msgstr "%s radijana"
+
+#: ../src/unit.vala:39
+msgctxt "unit-symbols"
+msgid "radian,radians,rad"
+msgstr "radijan,radijana,rad"
+
+#: ../src/unit.vala:40
+#, c-format
+#| msgid "Gradians"
+msgctxt "unit-format"
+msgid "%s gradians"
+msgstr "%s gradijana"
+
+#: ../src/unit.vala:40
+msgctxt "unit-symbols"
+msgid "gradian,gradians,grad"
+msgstr "gradijan,gradijana,grad"
+
 #: ../src/unit.vala:41
 msgid "Parsecs"
 msgstr "Parseci"
 
+#: ../src/unit.vala:41
+#, c-format
+msgctxt "unit-format"
+msgid "%s pc"
+msgstr "%s pc"
+
+#: ../src/unit.vala:41
+msgctxt "unit-symbols"
+msgid "parsec,parsecs,pc"
+msgstr "parsek,parseka,pc"
+
 #: ../src/unit.vala:42
 msgid "Light Years"
 msgstr "Svetlosne godine"
 
+#: ../src/unit.vala:42
+#, c-format
+msgctxt "unit-format"
+msgid "%s ly"
+msgstr "%s sg"
+
+#: ../src/unit.vala:42
+msgctxt "unit-symbols"
+msgid "lightyear,lightyears,ly"
+msgstr "svetlosnagodina,svetlosnegodine,svetlosnihgodina,ly"
+
 #: ../src/unit.vala:43
 msgid "Astronomical Units"
 msgstr "Astronomske jedinice"
 
+#: ../src/unit.vala:43
+#, c-format
+msgctxt "unit-format"
+msgid "%s au"
+msgstr "%s aj"
+
+#: ../src/unit.vala:43
+msgctxt "unit-symbols"
+msgid "au"
+msgstr "aj"
+
 #: ../src/unit.vala:44
 msgid "Nautical Miles"
 msgstr "Nautičke milje"
 
+#: ../src/unit.vala:44
+#, c-format
+msgctxt "unit-format"
+msgid "%s nmi"
+msgstr "%s nmi"
+
+#: ../src/unit.vala:44
+msgctxt "unit-symbols"
+msgid "nmi"
+msgstr "nmi"
+
 #: ../src/unit.vala:45
 msgid "Miles"
 msgstr "Milje"
 
+#: ../src/unit.vala:45
+#, c-format
+msgctxt "unit-format"
+msgid "%s mi"
+msgstr "%s mi"
+
+#: ../src/unit.vala:45
+msgctxt "unit-symbols"
+msgid "mile,miles,mi"
+msgstr "milja,milje,milja,mi"
+
 #: ../src/unit.vala:46
 msgid "Kilometers"
 msgstr "Kilometri"
 
+#: ../src/unit.vala:46
+#, c-format
+msgctxt "unit-format"
+msgid "%s km"
+msgstr "%s km"
+
+#: ../src/unit.vala:46
+msgctxt "unit-symbols"
+msgid "kilometer,kilometers,km,kms"
+msgstr "kilometar,kilometra,kilometara,km,km"
+
 #: ../src/unit.vala:47
 msgid "Cables"
 msgstr "Kablovi"
 
+#: ../src/unit.vala:47
+#, c-format
+msgctxt "unit-format"
+msgid "%s cb"
+msgstr "%s cb"
+
+#: ../src/unit.vala:47
+msgctxt "unit-symbols"
+msgid "cable,cables,cb"
+msgstr "kabal,kabla,kablova,cb"
+
 #: ../src/unit.vala:48
 msgid "Fathoms"
 msgstr "Hvati"
 
+#: ../src/unit.vala:48
+#, c-format
+msgctxt "unit-format"
+msgid "%s ftm"
+msgstr "%s ftm"
+
+#: ../src/unit.vala:48
+msgctxt "unit-symbols"
+msgid "fathom,fathoms,ftm"
+msgstr "hvat,hvata,hvatova,hv,ftm"
+
 #: ../src/unit.vala:49
 msgid "Meters"
 msgstr "Metri"
 
+#: ../src/unit.vala:49
+#, c-format
+msgctxt "unit-format"
+msgid "%s m"
+msgstr "%s m"
+
+#: ../src/unit.vala:49
+#| msgid "Centimeters"
+msgctxt "unit-symbols"
+msgid "meter,meters,m"
+msgstr "metar,metra,metara,m,m"
+
 #: ../src/unit.vala:50
 msgid "Yards"
 msgstr "Jardi"
 
+#: ../src/unit.vala:50
+#, c-format
+msgctxt "unit-format"
+msgid "%s yd"
+msgstr "%s yd"
+
+#: ../src/unit.vala:50
+msgctxt "unit-symbols"
+msgid "yard,yards,yd"
+msgstr "jard,jarda,jardi,yd"
+
 #: ../src/unit.vala:51
 msgid "Feet"
 msgstr "Stope"
 
+#: ../src/unit.vala:51
+#, c-format
+msgctxt "unit-format"
+msgid "%s ft"
+msgstr "%s ftm"
+
+#: ../src/unit.vala:51
+msgctxt "unit-symbols"
+msgid "foot,feet,ft"
+msgstr "stopa,stope,stopa,ft"
+
 #: ../src/unit.vala:52
 msgid "Inches"
 msgstr "Inči"
 
+#: ../src/unit.vala:52
+#, c-format
+msgctxt "unit-format"
+msgid "%s in"
+msgstr "%s in"
+
+#: ../src/unit.vala:52
+msgctxt "unit-symbols"
+msgid "inch,inches,in"
+msgstr "inč,inča,in,in"
+
 #: ../src/unit.vala:53
 msgid "Centimeters"
 msgstr "Centimetri"
 
+#: ../src/unit.vala:53
+#, c-format
+msgctxt "unit-format"
+msgid "%s cm"
+msgstr "%s cm"
+
+#: ../src/unit.vala:53
+msgctxt "unit-symbols"
+msgid "centimeter,centimeters,cm,cms"
+msgstr "centimetar,centimetra,centimetara,cm,cm"
+
 #: ../src/unit.vala:54
 msgid "Millimeters"
 msgstr "Milimetri"
 
+#: ../src/unit.vala:54
+#, c-format
+msgctxt "unit-format"
+msgid "%s mm"
+msgstr "%s mm"
+
+#: ../src/unit.vala:54
+msgctxt "unit-symbols"
+msgid "millimeter,millimeters,mm"
+msgstr "milimetar,milimetra,milimetara,mm,mm"
+
 #: ../src/unit.vala:55
 msgid "Micrometers"
 msgstr "Mikrometri"
 
+#: ../src/unit.vala:55
+#, c-format
+msgctxt "unit-format"
+msgid "%s μm"
+msgstr "%s μm"
+
+#: ../src/unit.vala:55
+msgctxt "unit-symbols"
+msgid "micrometer,micrometers,um"
+msgstr "mikrometar,mikrometra,mikrometara,um"
+
 #: ../src/unit.vala:56
 msgid "Nanometers"
 msgstr "Nanometri"
 
+#: ../src/unit.vala:56
+#, c-format
+msgctxt "unit-format"
+msgid "%s nm"
+msgstr "%s nm"
+
+#: ../src/unit.vala:56
+msgctxt "unit-symbols"
+msgid "nanometer,nanometers,nm"
+msgstr "nanometar,nanometra,nanometara,nm,nm"
+
 #: ../src/unit.vala:57
 msgid "Hectares"
 msgstr "Hektari"
 
+#: ../src/unit.vala:57
+#, c-format
+msgctxt "unit-format"
+msgid "%s ha"
+msgstr "%s ha"
+
+#: ../src/unit.vala:57
+msgctxt "unit-symbols"
+msgid "hectare,hectares,ha"
+msgstr "hektar,hektara, ha,ha"
+
 #: ../src/unit.vala:58
 msgid "Acres"
 msgstr "Akri"
 
+#: ../src/unit.vala:58
+#, c-format
+#| msgid "Acres"
+msgctxt "unit-format"
+msgid "%s acres"
+msgstr "%s akra"
+
+#: ../src/unit.vala:58
+msgctxt "unit-symbols"
+msgid "acre,acres"
+msgstr "akr,akra"
+
 #: ../src/unit.vala:59
 msgid "Square Meters"
 msgstr "Kvadratni metri"
 
+#: ../src/unit.vala:59
+#, c-format
+msgctxt "unit-format"
+msgid "%s m²"
+msgstr "%s m²"
+
+#: ../src/unit.vala:59
+msgctxt "unit-symbols"
+msgid "m²"
+msgstr "m²"
+
 #: ../src/unit.vala:60
 msgid "Square Centimeters"
 msgstr "Kvadratni centimetri"
 
+#: ../src/unit.vala:60
+#, c-format
+msgctxt "unit-format"
+msgid "%s cm²"
+msgstr "%s cm²"
+
+#: ../src/unit.vala:60
+msgctxt "unit-symbols"
+msgid "cm²"
+msgstr "cm²"
+
 #: ../src/unit.vala:61
 msgid "Square Millimeters"
 msgstr "Kvadratni milimetri"
 
+#: ../src/unit.vala:61
+#, c-format
+msgctxt "unit-format"
+msgid "%s mm²"
+msgstr "%s mm²"
+
+#: ../src/unit.vala:61
+msgctxt "unit-symbols"
+msgid "mm²"
+msgstr "mm²"
+
 #: ../src/unit.vala:62
 msgid "Cubic Meters"
 msgstr "Kubni metri"
 
+#: ../src/unit.vala:62
+#, c-format
+msgctxt "unit-format"
+msgid "%s m³"
+msgstr "%s m³"
+
+#: ../src/unit.vala:62
+msgctxt "unit-symbols"
+msgid "m³"
+msgstr "m³"
+
 #: ../src/unit.vala:63
 msgid "Gallons"
 msgstr "Galoni"
 
+#: ../src/unit.vala:63
+#, c-format
+msgctxt "unit-format"
+msgid "%s gal"
+msgstr "%s gal"
+
+#: ../src/unit.vala:63
+msgctxt "unit-symbols"
+msgid "gallon,gallons,gal"
+msgstr "galon,galona,gal"
+
 #: ../src/unit.vala:64
-msgid "Litres"
+#| msgid "Meters"
+msgid "Liters"
 msgstr "Litri"
 
+#: ../src/unit.vala:64
+#, c-format
+msgctxt "unit-format"
+msgid "%s L"
+msgstr "%s l"
+
+#: ../src/unit.vala:64
+msgctxt "unit-symbols"
+msgid "litre,litres,liter,liters,L"
+msgstr "litar,litra,litara,L,l"
+
 #: ../src/unit.vala:65
 msgid "Quarts"
 msgstr "Kvarti"
 
+#: ../src/unit.vala:65
+#, c-format
+msgctxt "unit-format"
+msgid "%s qt"
+msgstr "%s qt"
+
+#: ../src/unit.vala:65
+msgctxt "unit-symbols"
+msgid "quart,quarts,qt"
+msgstr "kvart,kvarta,kvartova,qt"
+
 #: ../src/unit.vala:66
 msgid "Pints"
 msgstr "Pinte"
 
+#: ../src/unit.vala:66
+#, c-format
+msgctxt "unit-format"
+msgid "%s pt"
+msgstr "%s pt"
+
+#: ../src/unit.vala:66
+msgctxt "unit-symbols"
+msgid "pint,pints,pt"
+msgstr "pinta,pinte,pinti,pt,pt"
+
 #: ../src/unit.vala:67
-msgid "Millilitres"
+#| msgid "Millilitres"
+msgid "Milliliters"
 msgstr "Mililitri"
 
+#: ../src/unit.vala:67
+#, c-format
+msgctxt "unit-format"
+msgid "%s mL"
+msgstr "%s ml"
+
+#: ../src/unit.vala:67
+msgctxt "unit-symbols"
+msgid "millilitre,millilitres,milliliter,milliliters,mL,cm³"
+msgstr "mililitar,mililitra,mililitara,ml,ml,cm³"
+
 #: ../src/unit.vala:68
-msgid "Microlitres"
+#| msgid "Microlitres"
+msgid "Microliters"
 msgstr "Mikrolitri"
 
+#: ../src/unit.vala:68
+#, c-format
+msgctxt "unit-format"
+msgid "%s μL"
+msgstr "%s μl"
+
+#: ../src/unit.vala:68
+msgctxt "unit-symbols"
+msgid "mm³,μL,uL"
+msgstr "mm³,μl,ul"
+
 #: ../src/unit.vala:69
 msgid "Tonnes"
 msgstr "Tone"
 
+#: ../src/unit.vala:69
+#, c-format
+msgctxt "unit-format"
+msgid "%s T"
+msgstr "%s t"
+
+#: ../src/unit.vala:69
+msgctxt "unit-symbols"
+msgid "tonne,tonnes"
+msgstr "tona,tone,t,t"
+
 #: ../src/unit.vala:70
 msgid "Kilograms"
 msgstr "Kilogrami"
 
+#: ../src/unit.vala:70
+#, c-format
+msgctxt "unit-format"
+msgid "%s kg"
+msgstr "%s kg"
+
+#: ../src/unit.vala:70
+msgctxt "unit-symbols"
+msgid "kilogram,kilograms,kilogramme,kilogrammes,kg,kgs"
+msgstr "kilogram,kilograma,kg,kg"
+
 #: ../src/unit.vala:71
 msgid "Pounds"
 msgstr "Funte"
 
+#: ../src/unit.vala:71
+#, c-format
+msgctxt "unit-format"
+msgid "%s lb"
+msgstr "%s lb"
+
+#: ../src/unit.vala:71
+msgctxt "unit-symbols"
+msgid "pound,pounds,lb"
+msgstr "funta,funte,funti,lb"
+
 #: ../src/unit.vala:72
 msgid "Ounces"
 msgstr "Unce"
 
+#: ../src/unit.vala:72
+#, c-format
+msgctxt "unit-format"
+msgid "%s oz"
+msgstr "%s oz"
+
+#: ../src/unit.vala:72
+msgctxt "unit-symbols"
+msgid "ounce,ounces,oz"
+msgstr "unca,unce,unci,oz,oz"
+
 #: ../src/unit.vala:73
 msgid "Grams"
 msgstr "Grami"
 
+#: ../src/unit.vala:73
+#, c-format
+msgctxt "unit-format"
+msgid "%s g"
+msgstr "%s g"
+
+#: ../src/unit.vala:73
+msgctxt "unit-symbols"
+msgid "gram,grams,gramme,grammes,g"
+msgstr "gram,grama,g,g"
+
 #: ../src/unit.vala:74
 msgid "Years"
 msgstr "Godine"
 
+#: ../src/unit.vala:74
+#, c-format
+#| msgid "Years"
+msgctxt "unit-format"
+msgid "%s years"
+msgstr "%s god."
+
+#: ../src/unit.vala:74
+msgctxt "unit-symbols"
+msgid "year,years"
+msgstr "godina,godine,godina"
+
 #: ../src/unit.vala:75
 msgid "Days"
 msgstr "Dani"
 
+#: ../src/unit.vala:75
+#, c-format
+msgctxt "unit-format"
+msgid "%s days"
+msgstr "%s dana"
+
+#: ../src/unit.vala:75
+msgctxt "unit-symbols"
+msgid "day,days"
+msgstr "dan,dana"
+
 #: ../src/unit.vala:76
 msgid "Hours"
 msgstr "Sati"
 
+#: ../src/unit.vala:76
+#, c-format
+#| msgid "Hours"
+msgctxt "unit-format"
+msgid "%s hours"
+msgstr "%s sati"
+
+#: ../src/unit.vala:76
+msgctxt "unit-symbols"
+msgid "hour,hours"
+msgstr "sat,sata,sati"
+
 #: ../src/unit.vala:77
 msgid "Minutes"
 msgstr "Minuti"
 
+#: ../src/unit.vala:77
+#, c-format
+#| msgid "Minutes"
+msgctxt "unit-format"
+msgid "%s minutes"
+msgstr "%s min."
+
+#: ../src/unit.vala:77
+msgctxt "unit-symbols"
+msgid "minute,minutes"
+msgstr "minut,minuta"
+
 #: ../src/unit.vala:78
 msgid "Seconds"
 msgstr "Sekunde"
 
+#: ../src/unit.vala:78
+#, c-format
+msgctxt "unit-format"
+msgid "%s s"
+msgstr "%s s"
+
+#: ../src/unit.vala:78
+#| msgid "Microseconds"
+msgctxt "unit-symbols"
+msgid "second,seconds,s"
+msgstr "sekunda,sekunde,sekundi,s,s"
+
 #: ../src/unit.vala:79
 msgid "Milliseconds"
 msgstr "Milisekunde"
 
+#: ../src/unit.vala:79
+#, c-format
+msgctxt "unit-format"
+msgid "%s ms"
+msgstr "%s ms"
+
+#: ../src/unit.vala:79
+msgctxt "unit-symbols"
+msgid "millisecond,milliseconds,ms"
+msgstr "milisekunda,milisekunde,milisendi,ms,ms"
+
 #: ../src/unit.vala:80
 msgid "Microseconds"
 msgstr "Mikrosekunde"
 
+#: ../src/unit.vala:80
+#, c-format
+msgctxt "unit-format"
+msgid "%s μs"
+msgstr "%s μs"
+
+#: ../src/unit.vala:80
+msgctxt "unit-symbols"
+msgid "microsecond,microseconds,us,μs"
+msgstr "mikrosekunda,mikrosekunde,mikrosekundi,μs"
+
 #: ../src/unit.vala:81
 msgid "Celsius"
 msgstr "Celzijusi"
 
+#: ../src/unit.vala:81
+#, c-format
+msgctxt "unit-format"
+msgid "%s ˚C"
+msgstr "%s ˚C"
+
+#: ../src/unit.vala:81
+msgctxt "unit-symbols"
+msgid "degC,˚C"
+msgstr "stepC,˚C"
+
 #: ../src/unit.vala:82
-msgid "Farenheit"
+#| msgid "Farenheit"
+msgid "Fahrenheit"
 msgstr "Farenhajti"
 
+#: ../src/unit.vala:82
+#, c-format
+msgctxt "unit-format"
+msgid "%s ˚F"
+msgstr "%s ˚F"
+
+#: ../src/unit.vala:82
+msgctxt "unit-symbols"
+msgid "degF,˚F"
+msgstr "stepF,˚F"
+
 #: ../src/unit.vala:83
 msgid "Kelvin"
 msgstr "Kelvini"
 
+#: ../src/unit.vala:83
+#, c-format
+msgctxt "unit-format"
+msgid "%s K"
+msgstr "%s K"
+
+#: ../src/unit.vala:83
+msgctxt "unit-symbols"
+msgid "K"
+msgstr "K"
+
 #: ../src/unit.vala:84
 msgid "Rankine"
 msgstr "Rankini"
 
+#: ../src/unit.vala:84
+#, c-format
+msgctxt "unit-format"
+msgid "%s ˚R"
+msgstr "%s ˚R"
+
+#: ../src/unit.vala:84
+msgctxt "unit-symbols"
+msgid "degR,˚R,˚Ra"
+msgstr "stepR,˚R,˚Ra"
+
 #: ../src/unit.vala:86
 msgid "Currency"
 msgstr "Valuta"
@@ -1644,3 +2218,24 @@ msgstr "Valuta"
 #, c-format
 msgid "%s%%s"
 msgstr "%%s%s"
+
+#~ msgid "Financial"
+#~ msgstr "Finansijski"
+
+#~ msgid "Mode"
+#~ msgstr "Režim"
+
+#~ msgid "Round"
+#~ msgstr "Zaokruži"
+
+#~ msgid "Floor"
+#~ msgstr "Zaokruži na dole"
+
+#~ msgid "Ceiling"
+#~ msgstr "Zaokruži na gore"
+
+#~ msgid "Sign"
+#~ msgstr "Znak"
+
+#~ msgid "Litres"
+#~ msgstr "Litri"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]