[gnome-calculator] Updated Serbian translation



commit d13462d05cd6b2b43a4f51d3cc3f6c29c3b05516
Author: Мирослав Николић <miroslavnikolic rocketmail com>
Date:   Mon Aug 14 20:38:09 2017 +0200

    Updated Serbian translation

 po/sr.po       | 1296 ++++++++++++++++++++++++++++----------------------------
 po/sr latin po | 1296 ++++++++++++++++++++++++++++----------------------------
 2 files changed, 1310 insertions(+), 1282 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 5776a26..7811061 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,12 +9,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-calculator\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "calculator&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-16 13:16+0000\n"
-"PO-Revision-Date: 2017-02-25 09:22+0200\n"
+"POT-Creation-Date: 2017-06-28 17:41+0000\n"
+"PO-Revision-Date: 2017-08-14 20:37+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic rocketmail com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"Language-Team: српски <gnome-sr googlegroups org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,259 +23,283 @@ msgstr ""
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/buttons-advanced.ui.h:1 ../data/buttons-programming.ui.h:53
+#: src/buttons-advanced.ui:17 src/buttons-programming.ui:2148
 msgid "Inverse [Ctrl+I]"
 msgstr "Реципрочност [Ктрл+I]"
 
 #. Accessible name for the inverse button
-#: ../data/buttons-advanced.ui.h:3 ../data/buttons-programming.ui.h:55
+#: src/buttons-advanced.ui:22 src/buttons-programming.ui:2153
 msgid "Inverse"
 msgstr "Инверзија"
 
-#: ../data/buttons-advanced.ui.h:4 ../data/buttons-programming.ui.h:7
+#: src/buttons-advanced.ui:47 src/buttons-programming.ui:1277
 msgid "Factorize [Ctrl+F]"
 msgstr "Факторишите [Ктрл+F]"
 
 #. Accessible name for the factorize button
-#: ../data/buttons-advanced.ui.h:6 ../data/buttons-programming.ui.h:9
+#: src/buttons-advanced.ui:51 src/buttons-programming.ui:1281
 msgid "Factorize"
 msgstr "Факторизација"
 
-#: ../data/buttons-advanced.ui.h:7 ../data/buttons-programming.ui.h:50
+#: src/buttons-advanced.ui:66 src/buttons-programming.ui:2121
 msgid "Factorial [!]"
 msgstr "Факторијел [!]"
 
 #. Accessible name for the factorial button
-#: ../data/buttons-advanced.ui.h:9 ../data/buttons-programming.ui.h:52
+#: src/buttons-advanced.ui:71 src/buttons-programming.ui:2126
 msgid "Factorial"
 msgstr "Факторијел"
 
-#: ../data/buttons-advanced.ui.h:10
+#: src/buttons-advanced.ui:95
 msgid "Imaginary Component"
 msgstr "Имагинарни део"
 
-#: ../data/buttons-advanced.ui.h:11 ../data/buttons-basic.ui.h:1
-#: ../data/buttons-financial.ui.h:77 ../data/buttons-programming.ui.h:16
+#: src/buttons-advanced.ui:247 src/buttons-basic.ui:130
+#: src/buttons-financial.ui:2037 src/buttons-programming.ui:1377
 msgid "Divide [/]"
 msgstr "Поделите [/]"
 
-#: ../data/buttons-advanced.ui.h:12 ../data/buttons-basic.ui.h:4
-#: ../data/buttons-financial.ui.h:80 ../data/buttons-programming.ui.h:17
+#: src/buttons-advanced.ui:359 src/buttons-basic.ui:258
+#: src/buttons-financial.ui:2165 src/buttons-programming.ui:1414
 msgid "Multiply [*]"
 msgstr "Помножите [*]"
 
-#: ../data/buttons-advanced.ui.h:13 ../data/buttons-basic.ui.h:5
-#: ../data/buttons-financial.ui.h:81 ../data/buttons-programming.ui.h:18
+#: src/buttons-advanced.ui:376 src/buttons-basic.ui:275
+#: src/buttons-financial.ui:2182 src/buttons-programming.ui:1431
 msgid "Subtract [-]"
 msgstr "Одузмите [-]"
 
-#: ../data/buttons-advanced.ui.h:14 ../data/buttons-basic.ui.h:6
-#: ../data/buttons-financial.ui.h:82 ../data/buttons-programming.ui.h:19
+#: src/buttons-advanced.ui:392 src/buttons-basic.ui:291
+#: src/buttons-financial.ui:2198 src/buttons-programming.ui:1447
 msgid "Add [+]"
 msgstr "Саберите [+]"
 
 #. Label on the solve button (clicking this solves the displayed calculation)
-#: ../data/buttons-advanced.ui.h:16 ../data/buttons-basic.ui.h:8
-#: ../data/buttons-financial.ui.h:84 ../data/buttons-programming.ui.h:21
+#: src/buttons-advanced.ui:403 src/buttons-basic.ui:302
+#: src/buttons-financial.ui:2209 src/buttons-programming.ui:1458
 msgid "="
 msgstr "="
 
-#: ../data/buttons-advanced.ui.h:17 ../data/buttons-basic.ui.h:9
-#: ../data/buttons-financial.ui.h:85 ../data/buttons-programming.ui.h:22
+#: src/buttons-advanced.ui:409 src/buttons-basic.ui:308
+#: src/buttons-financial.ui:2215 src/buttons-programming.ui:1464
 msgid "Calculate Result"
 msgstr "Израчунајте резултат"
 
-#: ../data/buttons-advanced.ui.h:18 ../data/buttons-basic.ui.h:12
-#: ../data/buttons-financial.ui.h:88 ../data/buttons-programming.ui.h:23
+#: src/buttons-advanced.ui:427 src/buttons-basic.ui:361
+#: src/buttons-financial.ui:2268 src/buttons-programming.ui:1482
 msgid "Clear Display [Escape]"
 msgstr "Очистите екран [Escape]"
 
-#: ../data/buttons-advanced.ui.h:19 ../data/buttons-programming.ui.h:24
+#: src/buttons-advanced.ui:446 src/buttons-programming.ui:1787
 msgid "Subscript mode [Alt]"
 msgstr "Режим индекса [Алт]"
 
 #. Accessible name for the subscript mode button
-#: ../data/buttons-advanced.ui.h:21 ../data/buttons-programming.ui.h:26
+#: src/buttons-advanced.ui:451 src/buttons-programming.ui:1792
 msgid "Subscript"
 msgstr "Индекс"
 
-#: ../data/buttons-advanced.ui.h:22 ../data/buttons-programming.ui.h:27
+#: src/buttons-advanced.ui:473 src/buttons-programming.ui:1814
 msgid "Superscript mode [Ctrl]"
 msgstr "Режим изложиоца [Ктрл]"
 
 #. Accessible name for the superscript mode button
-#: ../data/buttons-advanced.ui.h:24 ../data/buttons-programming.ui.h:29
+#: src/buttons-advanced.ui:478 src/buttons-programming.ui:1819
 msgid "Superscript"
 msgstr "Изложилац"
 
-#: ../data/buttons-advanced.ui.h:25
+#: src/buttons-advanced.ui:500
 msgid "Scientific exponent [Ctrl+E]"
 msgstr "Научни степен [Ктрл+E]"
 
 #. Accessible name for the scientific exponent button
-#: ../data/buttons-advanced.ui.h:27
+#: src/buttons-advanced.ui:504
 msgid "Scientific Exponent"
 msgstr "Научни степен"
 
-#: ../data/buttons-advanced.ui.h:28 ../data/buttons-programming.ui.h:38
+#: src/buttons-advanced.ui:527 src/buttons-programming.ui:1952
 msgid "Modulus divide"
 msgstr "Дељење по модулу"
 
-#: ../data/buttons-advanced.ui.h:29 ../data/buttons-basic.ui.h:10
-#: ../data/buttons-financial.ui.h:86 ../data/buttons-programming.ui.h:39
+#: src/buttons-advanced.ui:543 src/buttons-basic.ui:328
+#: src/buttons-financial.ui:2235 src/buttons-programming.ui:1969
 msgid "Start Group [(]"
 msgstr "Отворите заграду [(]"
 
-#: ../data/buttons-advanced.ui.h:30 ../data/buttons-basic.ui.h:11
-#: ../data/buttons-financial.ui.h:87 ../data/buttons-programming.ui.h:40
+#: src/buttons-advanced.ui:560 src/buttons-basic.ui:345
+#: src/buttons-financial.ui:2252 src/buttons-programming.ui:1985
 msgid "End Group [)]"
 msgstr "Затворите заграду [)]"
 
 #. Accessible name for the memory button
 #. Accessible name for the memory value button
-#: ../data/buttons-advanced.ui.h:32 ../data/buttons-financial.ui.h:73
-#: ../data/buttons-programming.ui.h:30
+#: src/buttons-advanced.ui:575 src/buttons-advanced.ui:578
+#: src/buttons-financial.ui:1854 src/buttons-financial.ui:1857
+#: src/buttons-programming.ui:1857
 msgid "Memory"
 msgstr "Меморија"
 
 #. The label on the memory button
-#: ../data/buttons-advanced.ui.h:34 ../data/buttons-financial.ui.h:75
-#: ../data/buttons-programming.ui.h:34
+#: src/buttons-advanced.ui:587 src/buttons-financial.ui:1869
+#: src/buttons-programming.ui:1870
 msgid "x"
 msgstr "x"
 
-#: ../data/buttons-advanced.ui.h:35 ../data/buttons-programming.ui.h:11
-#| msgid "Absolute value [|]"
+#: src/buttons-advanced.ui:622 src/buttons-programming.ui:1314
 msgid "Absolute Value [|]"
 msgstr "Апсолутна вредност [|]"
 
 #. Accessible name for the absolute value button
-#: ../data/buttons-advanced.ui.h:37 ../data/buttons-programming.ui.h:13
+#: src/buttons-advanced.ui:627 src/buttons-programming.ui:1319
 msgid "Absolute Value"
 msgstr "Апсолутна вредност"
 
-#: ../data/buttons-advanced.ui.h:38
+#: src/buttons-advanced.ui:651
 msgid "Real Component"
 msgstr "Реални део"
 
-#: ../data/buttons-advanced.ui.h:39
+#: src/buttons-advanced.ui:668
 msgid "Complex conjugate"
 msgstr "Конјуговано комплексна вредност"
 
-#: ../data/buttons-advanced.ui.h:40
+#: src/buttons-advanced.ui:685
 msgid "Complex argument"
 msgstr "Комплексни аргумент"
 
-#: ../data/buttons-advanced.ui.h:41 ../data/buttons-programming.ui.h:10
+#: src/buttons-advanced.ui:702 src/buttons-programming.ui:1298
 msgid "Natural Logarithm"
 msgstr "Природни логаритам"
 
-#: ../data/buttons-advanced.ui.h:42 ../data/buttons-financial.ui.h:76
-#: ../data/buttons-programming.ui.h:6
+#: src/buttons-advanced.ui:718 src/buttons-financial.ui:1908
+#: src/buttons-programming.ui:1260
 msgid "Logarithm"
 msgstr "Логаритам"
 
-#: ../data/buttons-advanced.ui.h:43 ../data/buttons-financial.ui.h:114
-#: ../data/buttons-programming.ui.h:56
+#: src/buttons-advanced.ui:733 src/buttons-financial.ui:2476
+#: src/buttons-programming.ui:2176
 msgid "Exponent [^ or **]"
 msgstr "Експонент [^ или **]"
 
 #. Accessible name for the exponentiation (x to the power of y) button
-#: ../data/buttons-advanced.ui.h:45 ../data/buttons-basic.ui.h:16
-#: ../data/buttons-financial.ui.h:116 ../data/buttons-programming.ui.h:58
+#: src/buttons-advanced.ui:738 src/buttons-basic.ui:401
+#: src/buttons-financial.ui:2481 src/buttons-programming.ui:2181
 msgid "Exponent"
 msgstr "Степен"
 
-#: ../data/buttons-advanced.ui.h:46 ../data/buttons-financial.ui.h:117
-#: ../data/buttons-programming.ui.h:5
+#: src/buttons-advanced.ui:762 src/buttons-financial.ui:2505
+#: src/buttons-programming.ui:1244
 msgid "Root [Ctrl+R]"
 msgstr "Корен [Ктрл+R]"
 
-#: ../data/buttons-advanced.ui.h:47 ../data/buttons-basic.ui.h:17
-#: ../data/buttons-financial.ui.h:113
+#: src/buttons-advanced.ui:778 src/buttons-basic.ui:424
+#: src/buttons-financial.ui:2456
 msgid "Undo [Ctrl+Z]"
 msgstr "Опозовите претходну радњу [Ктрл+Z]"
 
-#: ../data/buttons-advanced.ui.h:48
+#: src/buttons-advanced.ui:798
 msgid "Pi [Ctrl+P]"
 msgstr "Пи [Ктрл+P]"
 
-#: ../data/buttons-advanced.ui.h:49
+#: src/buttons-advanced.ui:821
 msgid "Euler’s Number"
 msgstr "Ојлеров број"
 
-#: ../data/buttons-advanced.ui.h:50
+#: src/buttons-advanced.ui:851
 msgid "Cosine"
 msgstr "Косинус"
 
-#: ../data/buttons-advanced.ui.h:51
+#: src/buttons-advanced.ui:866
 msgid "Sine"
 msgstr "Синус"
 
-#: ../data/buttons-advanced.ui.h:52
+#: src/buttons-advanced.ui:881
 msgid "Tangent"
 msgstr "Тангенс"
 
-#: ../data/buttons-advanced.ui.h:53
+#: src/buttons-advanced.ui:896
 msgid "Hyperbolic Sine"
 msgstr "Хиперболични синус"
 
-#: ../data/buttons-advanced.ui.h:54
+#: src/buttons-advanced.ui:912
 msgid "Hyperbolic Cosine"
 msgstr "Хиперболични косинус"
 
-#: ../data/buttons-advanced.ui.h:55
+#: src/buttons-advanced.ui:928
 msgid "Hyperbolic Tangent"
 msgstr "Хиперболични тангенс"
 
-#: ../data/buttons-advanced.ui.h:56
+#: src/buttons-advanced.ui:951
 msgid "Additional Functions"
 msgstr "Додатне функције"
 
 #. Accessible name for the store value button
-#: ../data/buttons-advanced.ui.h:58 ../data/buttons-programming.ui.h:32
+#: src/buttons-advanced.ui:954 src/buttons-programming.ui:1860
 msgid "Store"
 msgstr "Сачувај"
 
-#: ../data/buttons-basic.ui.h:3 ../data/buttons-financial.ui.h:79
-#, no-c-format
+#: src/buttons-basic.ui:222 src/buttons-financial.ui:2129
 msgid "Percentage [%]"
 msgstr "Проценат [%]"
 
-#: ../data/buttons-basic.ui.h:13
+#: src/buttons-basic.ui:382
 msgid "Square root [Ctrl+R]"
 msgstr "Квадратни корен [Ктрл+R]"
 
-#: ../data/buttons-basic.ui.h:14
+#: src/buttons-basic.ui:397
 msgid "Square [Ctrl+2]"
 msgstr "Квадрат [Ктрл+2]"
 
 #. Title of Compounding Term dialog
-#: ../data/buttons-financial.ui.h:2
+#: src/buttons-financial.ui:8 src/buttons-financial.ui:2290
 msgid "Compounding Term"
 msgstr "Чинилац састава"
 
-#: ../data/buttons-financial.ui.h:3 ../data/buttons-programming.ui.h:63
+#: src/buttons-financial.ui:22 src/buttons-financial.ui:205
+#: src/buttons-financial.ui:388 src/buttons-financial.ui:571
+#: src/buttons-financial.ui:723 src/buttons-financial.ui:907
+#: src/buttons-financial.ui:1091 src/buttons-financial.ui:1275
+#: src/buttons-financial.ui:1459 src/buttons-financial.ui:1674
+#: src/buttons-programming.ui:2306
 msgid "_Cancel"
 msgstr "_Откажи"
 
+#. Compounding Term Dialog: Calculate button
+#. Double-Declining Depreciation Dialog: Calculate button
+#. Future Value Dialog: Calculate button
+#. Gross Profit Margin Dialog: Calculate button
+#. Periodic Payment Dialog: Calculate button
+#. Present Value Dialog: Calculate button
+#. Periodic Interest Rate Dialog: Calculate button
+#. Straight-Line Depreciation Dialog: Calculate button
+#. Sum-of-the-Years’-Digits Depreciation Dialog: Calculate result button
 #. Payment Period Dialog: Button to calculate result
-#: ../data/buttons-financial.ui.h:5
+#: src/buttons-financial.ui:37 src/buttons-financial.ui:220
+#: src/buttons-financial.ui:403 src/buttons-financial.ui:586
+#: src/buttons-financial.ui:738 src/buttons-financial.ui:922
+#: src/buttons-financial.ui:1106 src/buttons-financial.ui:1290
+#: src/buttons-financial.ui:1474 src/buttons-financial.ui:1689
 msgid "C_alculate"
 msgstr "_Израчунај"
 
+#. Compounding Term Dialog: Label before present value input
 #. Periodic Interest Rate Dialog: Label before present value input
-#: ../data/buttons-financial.ui.h:7
+#: src/buttons-financial.ui:117 src/buttons-financial.ui:1172
 msgid "Present _Value:"
 msgstr "Тренутна _вредност:"
 
+#. Compounding Term Dialog: Label before periodic interest rate input
+#. Future Value Dialog: Label before periodic interest rate input
+#. Periodic Payment Dialog: Label before periodic interest rate input
+#. Present Value Dialog: Label before periodic interest rate input
 #. Payment Period Dialog: Label before periodic interest rate input
-#: ../data/buttons-financial.ui.h:9
+#: src/buttons-financial.ui:133 src/buttons-financial.ui:468
+#: src/buttons-financial.ui:804 src/buttons-financial.ui:988
+#: src/buttons-financial.ui:1769
 msgid "Periodic Interest _Rate:"
 msgstr "Периодична _каматна стопа:"
 
 #. Compounding Term Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:11
+#: src/buttons-financial.ui:149
 msgid ""
 "Calculates the number of compounding periods necessary to increase an "
 "investment of present value to a future value, at a fixed interest rate per "
@@ -284,18 +308,19 @@ msgstr ""
 "Израчунајте број периода чиниоца потребних за повећање вредности инвестиције "
 "са тренутне на будућу вредност по фиксној каматној стопи по периоду чиниоца."
 
+#. Compounding Term Dialog: Label before future value input
 #. Periodic Interest Rate Dialog: Label before future value input
-#: ../data/buttons-financial.ui.h:13
+#: src/buttons-financial.ui:163 src/buttons-financial.ui:1156
 msgid "_Future Value:"
 msgstr "_Будућа вредност:"
 
 #. Title of Double-Declining Depreciation dialog
-#: ../data/buttons-financial.ui.h:15
+#: src/buttons-financial.ui:191
 msgid "Double-Declining Depreciation"
 msgstr "Двоструко-опадајуће умањење"
 
 #. Double-Declining Depreciation Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:17
+#: src/buttons-financial.ui:255
 msgid ""
 "Calculates the depreciation allowance on an asset for a specified period of "
 "time, using the double-declining balance method."
@@ -303,28 +328,33 @@ msgstr ""
 "Израчунајте амортизацију производа за одређени временски период користећи "
 "метод двоструко-опадајућег умањења."
 
+#. Double-Declining Depreciation Dialog: Label before cost input
 #. Gross Profit Margin Dialog: Label before cost input
-#: ../data/buttons-financial.ui.h:19
+#: src/buttons-financial.ui:269 src/buttons-financial.ui:635
 msgid "C_ost:"
 msgstr "_Цена:"
 
+#. Double-Declining Depreciation Dialog: Label before life input
+#. Straight-Line Depreciation Dialog: Label before life input
 #. Sum-of-the-Years’-Digits Depreciation Dialog: Label before life input
-#: ../data/buttons-financial.ui.h:21
+#: src/buttons-financial.ui:285 src/buttons-financial.ui:1357
+#: src/buttons-financial.ui:1525
 msgid "_Life:"
 msgstr "_Трајање:"
 
+#. Double-Declining Depreciation Dialog: Label before period input
 #. Sum-of-the-Years’-Digits Depreciation Dialog: Label before period input
-#: ../data/buttons-financial.ui.h:23
+#: src/buttons-financial.ui:331 src/buttons-financial.ui:1509
 msgid "_Period:"
 msgstr "_Период:"
 
 #. Title of Future Value dialog
-#: ../data/buttons-financial.ui.h:25
+#: src/buttons-financial.ui:374 src/buttons-financial.ui:2322
 msgid "Future Value"
 msgstr "Будућа вредност"
 
 #. Future Value Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:27
+#: src/buttons-financial.ui:438
 msgid ""
 "Calculates the future value of an investment based on a series of equal "
 "payments at a periodic interest rate over the number of payment periods in "
@@ -333,23 +363,27 @@ msgstr ""
 "Израчунајте будућу вредност инвестиције на основу низа једнаких плаћања уз "
 "периодичну каматну стопу над одређеним бројем периода плаћања."
 
+#. Future Value Dialog: Label before periodic payment input
+#. Present Value Dialog: Label before periodic payment input
 #. Payment Period Dialog: Label before periodic payment input
-#: ../data/buttons-financial.ui.h:29
+#: src/buttons-financial.ui:452 src/buttons-financial.ui:972
+#: src/buttons-financial.ui:1801
 msgid "_Periodic Payment:"
 msgstr "_Периодично плаћање:"
 
+#. Future Value Dialog: Label before number of periods input
 #. Present Value Dialog: Label before number of periods input
-#: ../data/buttons-financial.ui.h:31
+#: src/buttons-financial.ui:484 src/buttons-financial.ui:1004
 msgid "_Number of Periods:"
 msgstr "_Број периода:"
 
 #. Title of Gross Profit Margin dialog
-#: ../data/buttons-financial.ui.h:33
+#: src/buttons-financial.ui:557 src/buttons-financial.ui:2440
 msgid "Gross Profit Margin"
 msgstr "Бруто маржа"
 
 #. Gross Profit Margin Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:35
+#: src/buttons-financial.ui:621
 msgid ""
 "Calculates the resale price of a product, based on the product cost and the "
 "wanted gross profit margin."
@@ -358,17 +392,17 @@ msgstr ""
 "бруто марже."
 
 #. Gross Profit Margin Dialog: Label before margin input
-#: ../data/buttons-financial.ui.h:37
+#: src/buttons-financial.ui:651
 msgid "_Margin:"
 msgstr "_Маржа:"
 
 #. Title of Periodic Payment dialog
-#: ../data/buttons-financial.ui.h:39
+#: src/buttons-financial.ui:709 src/buttons-financial.ui:2423
 msgid "Periodic Payment"
 msgstr "Периодично плаћање"
 
 #. Periodic Payment Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:41
+#: src/buttons-financial.ui:774
 msgid ""
 "Calculates the amount of the periodic payment of a loan, where payments are "
 "made at the end of each payment period. "
@@ -377,22 +411,23 @@ msgstr ""
 "крају периода плаћања. "
 
 #. Periodic Payment Dialog: Label before principal input
-#: ../data/buttons-financial.ui.h:43
+#: src/buttons-financial.ui:788
 msgid "_Principal:"
 msgstr "_Основа:"
 
+#. Periodic Payment Dialog: Label before term input
 #. Periodic Interest Rate Dialog: Label before term input
-#: ../data/buttons-financial.ui.h:45
+#: src/buttons-financial.ui:820 src/buttons-financial.ui:1188
 msgid "_Term:"
 msgstr "_Рок:"
 
 #. Title of Present Value dialog
-#: ../data/buttons-financial.ui.h:47
+#: src/buttons-financial.ui:893 src/buttons-financial.ui:2406
 msgid "Present Value"
 msgstr "Тренутна вредност"
 
 #. Present Value Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:49
+#: src/buttons-financial.ui:958
 msgid ""
 "Calculates the present value of an investment based on a series of equal "
 "payments discounted at a periodic interest rate over the number of payment "
@@ -402,12 +437,12 @@ msgstr ""
 "по периодичној каматној стопи над датим бројем периода плаћања. "
 
 #. Title of Periodic Interest Rate dialog
-#: ../data/buttons-financial.ui.h:51
+#: src/buttons-financial.ui:1077 src/buttons-financial.ui:2389
 msgid "Periodic Interest Rate"
 msgstr "Периодична каматна стопа"
 
 #. Periodic Interest Rate Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:53
+#: src/buttons-financial.ui:1142
 msgid ""
 "Calculates the periodic interest necessary to increase an investment to a "
 "future value, over the number of compounding periods. "
@@ -416,22 +451,24 @@ msgstr ""
 "инвестиције на будућу вредност над бројем периода чиниоца. "
 
 #. Title of Straight-Line Depreciation dialog
-#: ../data/buttons-financial.ui.h:55
+#: src/buttons-financial.ui:1261
 msgid "Straight-Line Depreciation"
 msgstr "Праволинијско умањење"
 
+#. Straight-Line Depreciation Dialog: Label before cost input
 #. Sum-of-the-Years’-Digits Depreciation Dialog: Label before cost input
-#: ../data/buttons-financial.ui.h:57
+#: src/buttons-financial.ui:1325 src/buttons-financial.ui:1557
 msgid "_Cost:"
 msgstr "_Износ:"
 
+#. Straight-Line Depreciation Dialog: Label before salvage input
 #. Sum-of-the-Years’-Digits Depreciation Dialog: Label before salvage input
-#: ../data/buttons-financial.ui.h:59
+#: src/buttons-financial.ui:1341 src/buttons-financial.ui:1541
 msgid "_Salvage:"
 msgstr "_Крајњи износ:"
 
 #. Straight-Line Depreciation Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:61
+#: src/buttons-financial.ui:1419
 msgid ""
 "Calculates the straight-line depreciation of an asset for one period. The "
 "straight-line method of depreciation divides the depreciable cost evenly "
@@ -444,20 +481,12 @@ msgstr ""
 "после кога је производ амортизован. "
 
 #. Title of Sum-of-the-Years’-Digits Depreciation dialog
-#: ../data/buttons-financial.ui.h:63
-#| msgid "Sum-of-the-Years'-Digits Depreciation"
+#: src/buttons-financial.ui:1445
 msgid "Sum-of-the-Years’-Digits Depreciation"
 msgstr "Умањење збиром-цифара-године"
 
 #. Sum-of-the-Years’-Digits Depreciation Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:65
-#| msgid ""
-#| "Calculates the depreciation allowance on an asset for a specified period "
-#| "of time, using the Sum-of-the-Years'-Digits method. This method of "
-#| "depreciation accelerates the rate of depreciation, so that more "
-#| "depreciation expense occurs in earlier periods than in later ones. The "
-#| "useful life is the number of periods, typically years, over which an "
-#| "asset is depreciated. "
+#: src/buttons-financial.ui:1634
 msgid ""
 "Calculates the depreciation allowance on an asset for a specified period of "
 "time, using the Sum-of-the-Years’-Digits method. This method of depreciation "
@@ -471,17 +500,17 @@ msgstr ""
 "производа је број периода, обично година, за које се производ амортизује. "
 
 #. Title of Payment Period dialog
-#: ../data/buttons-financial.ui.h:67
+#: src/buttons-financial.ui:1660
 msgid "Payment Period"
 msgstr "Период плаћања"
 
 #. Payment Period Dialog: Label before future value input
-#: ../data/buttons-financial.ui.h:69
+#: src/buttons-financial.ui:1785
 msgid "Future _Value:"
 msgstr "Будућа _вредност:"
 
 #. Payment Period Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:71
+#: src/buttons-financial.ui:1818
 msgid ""
 "Calculates the number of payment periods that are necessary during the term "
 "of an ordinary annuity, to accumulate a future value, at a periodic interest "
@@ -491,156 +520,159 @@ 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:90
+#: src/buttons-financial.ui:2284
 msgid "Ctrm"
 msgstr "Чисас"
 
 #. Calculates the depreciation allowance on an asset for a specified period of time, using the 
double-declining balance method. See also: http://en.wikipedia.org/wiki/Depreciation
-#: ../data/buttons-financial.ui.h:92
+#: src/buttons-financial.ui:2300
 msgid "Ddb"
 msgstr "Двоум"
 
-#: ../data/buttons-financial.ui.h:93
+#: src/buttons-financial.ui:2306
 msgid "Double Declining Depreciation"
 msgstr "Умањење двоструким опадањем"
 
 #. Calculates the future value of an investment based on a series of equal payments, each of amount pmt, at 
a periodic interest rate of int, over the number of payment periods in the term. See also: 
http://en.wikipedia.org/wiki/Future_value
-#: ../data/buttons-financial.ui.h:95
+#: src/buttons-financial.ui:2316
 msgid "Fv"
 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:97
+#: src/buttons-financial.ui:2332
 msgid "Term"
 msgstr "Рок"
 
-#: ../data/buttons-financial.ui.h:98
+#: src/buttons-financial.ui:2338
 msgid "Financial Term"
 msgstr "Финансијски израз"
 
 #. Calculates the depreciation allowance on an asset for a specified period of time, using the 
Sum-Of-The-Years’-Digits method. This method of depreciation accelerates the rate of depreciation, so that 
more depreciation expense occurs in earlier periods than in later ones. The depreciable cost is cost - 
salvage. The useful life is the number of periods, typically years, over which an asset is depreciated. See 
also: http://en.wikipedia.org/wiki/Depreciation
-#: ../data/buttons-financial.ui.h:100
+#: src/buttons-financial.ui:2349
 msgid "Syd"
 msgstr "Умзцг"
 
-#: ../data/buttons-financial.ui.h:101
+#: src/buttons-financial.ui:2355
 msgid "Sum of the Years Digits Depreciation"
 msgstr "Умањење збиром цифара године"
 
 #. Calculates the straight-line depreciation of an asset for one period. The depreciable cost is cost - 
salvage. The straight-line method of depreciation divides the depreciable cost evenly over the useful life of 
an asset. The useful life is the number of periods, typically years, over which an asset is depreciated. See 
also: http://en.wikipedia.org/wiki/Depreciation
-#: ../data/buttons-financial.ui.h:103
+#: src/buttons-financial.ui:2366
 msgid "Sln"
 msgstr "Прaум"
 
-#: ../data/buttons-financial.ui.h:104
+#: src/buttons-financial.ui:2372
 msgid "Straight Line Depreciation"
 msgstr "Праволинијско умањење"
 
 #. Calculates the periodic interest necessary to increase an investment of present value pv to a future 
value of fv, over the number of compounding periods in term. See also: http://en.wikipedia.org/wiki/Interest
-#: ../data/buttons-financial.ui.h:106
+#: src/buttons-financial.ui:2383
 msgid "Rate"
 msgstr "Стопа"
 
 #. Calculates the present value of an investment based on a series of equal payments, each of amount pmt, 
discounted at a periodic interest rate of int, over the number of payment periods in the term. See also: 
http://en.wikipedia.org/wiki/Present_value
-#: ../data/buttons-financial.ui.h:108
+#: src/buttons-financial.ui:2400
 msgid "Pv"
 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:110
+#: src/buttons-financial.ui:2417
 msgid "Pmt"
 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:112
+#: src/buttons-financial.ui:2434
 msgid "Gpm"
 msgstr "Брума"
 
-#: ../data/buttons-programming.ui.h:1
+#: src/buttons-programming.ui:17
 msgid "Binary"
 msgstr "Бинарно"
 
-#: ../data/buttons-programming.ui.h:2
+#: src/buttons-programming.ui:18
 msgid "Octal"
 msgstr "Октално"
 
-#: ../data/buttons-programming.ui.h:3
+#: src/buttons-programming.ui:19
 msgid "Decimal"
 msgstr "Децимално"
 
-#: ../data/buttons-programming.ui.h:4
+#: src/buttons-programming.ui:20
 msgid "Hexadecimal"
 msgstr "Хексадецимално"
 
-#: ../data/buttons-programming.ui.h:14
+#: src/buttons-programming.ui:1343
 msgid "Integer Component"
 msgstr "Целобројни део"
 
-#: ../data/buttons-programming.ui.h:15
+#: src/buttons-programming.ui:1360
 msgid "Fractional Component"
 msgstr "Разломљени део"
 
-#: ../data/buttons-programming.ui.h:35
+#: src/buttons-programming.ui:1901
 msgid "Boolean Exclusive OR"
 msgstr "Логичко ИЛЛИ"
 
-#: ../data/buttons-programming.ui.h:36
+#: src/buttons-programming.ui:1918
 msgid "Boolean OR"
 msgstr "Логичко ИЛИ"
 
-#: ../data/buttons-programming.ui.h:37
+#: src/buttons-programming.ui:1935
 msgid "Boolean AND"
 msgstr "Логичко И"
 
 #. Accessible name for the shift left button
-#: ../data/buttons-programming.ui.h:42
+#: src/buttons-programming.ui:1999 src/buttons-programming.ui:2002
 msgid "Shift Left"
 msgstr "Помери улево"
 
 #. Accessible name for the shift right button
-#: ../data/buttons-programming.ui.h:44
+#: src/buttons-programming.ui:2042 src/buttons-programming.ui:2045
 msgid "Shift Right"
 msgstr "Помери удесно"
 
 #. Title of insert character code dialog
-#: ../data/buttons-programming.ui.h:46
+#: src/buttons-programming.ui:2086 src/buttons-programming.ui:2259
 msgid "Insert Character Code"
 msgstr "Убаците код знака"
 
 #. Accessible name for the insert character button
-#: ../data/buttons-programming.ui.h:48
+#: src/buttons-programming.ui:2090
 msgid "Insert Character"
 msgstr "Убаци знак"
 
-#: ../data/buttons-programming.ui.h:49
+#: src/buttons-programming.ui:2106
 msgid "Boolean NOT"
 msgstr "Логичко НЕ"
 
-#: ../data/buttons-programming.ui.h:59
-#| msgid "Ones' Complement"
+#: src/buttons-programming.ui:2205
 msgid "Ones’ Complement"
 msgstr "Комплемент јединице"
 
-#: ../data/buttons-programming.ui.h:60
-#| msgid "Two's Complement"
+#: src/buttons-programming.ui:2222
 msgid "Two’s Complement"
 msgstr "Комплемент двојке"
 
 #. Insert ASCII dialog: Label before character entry
-#: ../data/buttons-programming.ui.h:62
+#: src/buttons-programming.ui:2272
 msgid "Ch_aracter:"
 msgstr "_Знак:"
 
 #. Insert ASCII dialog: Button to insert selected character
-#: ../data/buttons-programming.ui.h:65
+#: src/buttons-programming.ui:2321
 msgid "_Insert"
 msgstr "_Уметни"
 
-#: ../data/org.gnome.Calculator.appdata.xml.in.h:1
+#: data/org.gnome.Calculator.appdata.xml.in:7
 msgid "GNOME Calculator"
 msgstr "Гномов калкулатор"
 
-#: ../data/org.gnome.Calculator.appdata.xml.in.h:2
+#: data/org.gnome.Calculator.appdata.xml.in:8
+#: data/org.gnome.Calculator.desktop.in:4
+msgid "Perform arithmetic, scientific or financial calculations"
+msgstr "Извршавајте аритметичке, научне или финансијске прорачуне"
+
+#: data/org.gnome.Calculator.appdata.xml.in:10
 msgid ""
 "GNOME Calculator is an application that solves mathematical equations. "
 "Though it at first appears to be a simple calculator with only basic "
@@ -652,7 +684,7 @@ msgstr ""
 "операцијама, можете да се пребаците на напредан, финансијски, или "
 "програмерски начин рада и да откријете изненађујући скуп могућности."
 
-#: ../data/org.gnome.Calculator.appdata.xml.in.h:3
+#: data/org.gnome.Calculator.appdata.xml.in:16
 msgid ""
 "The Advanced calculator supports many operations, including: logarithms, "
 "factorials, trigonometric and hyperbolic functions, modulus division, "
@@ -664,7 +696,7 @@ msgstr ""
 "комплексне бројеве, стварање насумичног броја, факторизацију простог броја и "
 "претварање јединица."
 
-#: ../data/org.gnome.Calculator.appdata.xml.in.h:4
+#: data/org.gnome.Calculator.appdata.xml.in:22
 msgid ""
 "Financial mode supports several computations, including periodic interest "
 "rate, present and future value, double declining and straight line "
@@ -674,7 +706,7 @@ msgstr ""
 "каматну стопу, садашњу и будућу вредност, двоструко опадање и праволинијско "
 "умањење, и многе друге."
 
-#: ../data/org.gnome.Calculator.appdata.xml.in.h:5
+#: data/org.gnome.Calculator.appdata.xml.in:27
 msgid ""
 "Programming mode supports conversion between common bases (binary, octal, "
 "decimal, and hexadecimal), boolean algebra, one’s and two’s complementation, "
@@ -684,280 +716,272 @@ msgstr ""
 "(бинарних, окталних, децималних и хексадецималних), булову алгебру, "
 "комплемент јединице и двојке, претварање кода знака у знак, и друго."
 
-#: ../data/org.gnome.Calculator.appdata.xml.in.h:6
-msgid "GNOME Calculator in Basic Mode."
-msgstr "Гномов калкулатор у основном режиму."
+#: data/org.gnome.Calculator.appdata.xml.in:36
+#| msgid "GNOME Calculator in Basic Mode."
+msgid "GNOME Calculator in Basic Mode"
+msgstr "Гномов калкулатор у основном режиму"
 
-#: ../data/org.gnome.Calculator.appdata.xml.in.h:7
-msgid "GNOME Calculator in Advanced Mode."
-msgstr "Гномов калкулатор у напредном режиму."
+#: data/org.gnome.Calculator.appdata.xml.in:40
+#| msgid "GNOME Calculator in Advanced Mode."
+msgid "GNOME Calculator in Advanced Mode"
+msgstr "Гномов калкулатор у напредном режиму"
 
-#: ../data/org.gnome.Calculator.appdata.xml.in.h:8
-msgid "GNOME Calculator in Financial Mode."
-msgstr "Гномов калкулатор у финансијском режиму."
+#: data/org.gnome.Calculator.appdata.xml.in:44
+#| msgid "GNOME Calculator in Financial Mode."
+msgid "GNOME Calculator in Financial Mode"
+msgstr "Гномов калкулатор у финансијском режиму"
 
-#: ../data/org.gnome.Calculator.appdata.xml.in.h:9
-msgid "GNOME Calculator in Programming Mode."
-msgstr "Гномов калкулатор у програмерском режиму."
+#: data/org.gnome.Calculator.appdata.xml.in:48
+#| msgid "GNOME Calculator in Programming Mode."
+msgid "GNOME Calculator in Programming Mode"
+msgstr "Гномов калкулатор у програмерском режиму"
 
-#: ../data/org.gnome.Calculator.appdata.xml.in.h:10
+#: data/org.gnome.Calculator.appdata.xml.in:62
 msgid "The GNOME Project"
 msgstr "Пројекат Гном"
 
 #. Program name in the about dialog
-#: ../data/org.gnome.Calculator.desktop.in.h:1 ../data/math-window.ui.h:6
-#: ../src/gnome-calculator.vala:80 ../src/gnome-calculator.vala:332
+#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:48
+#: src/gnome-calculator.vala:80 src/gnome-calculator.vala:332
 msgid "Calculator"
 msgstr "Калкулатор"
 
-#: ../data/org.gnome.Calculator.desktop.in.h:2
-msgid "Perform arithmetic, scientific or financial calculations"
-msgstr "Извршавајте аритметичке, научне или финансијске прорачуне"
-
-#: ../data/org.gnome.Calculator.desktop.in.h:3
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: data/org.gnome.Calculator.desktop.in:6
 msgid "calculation;arithmetic;scientific;financial;"
 msgstr "рачунање;аритметика;наука;финансије;прорачун;"
 
-#: ../data/math-converter.ui.h:1
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/org.gnome.Calculator.desktop.in:9
+msgid "accessories-calculator"
+msgstr "accessories-calculator"
+
+#: src/math-converter.ui:16
 msgid "Switch conversion units"
 msgstr "Промените јединице претварања"
 
-#: ../data/math-converter.ui.h:2
+#: src/math-converter.ui:29
 msgid " in "
 msgstr " у "
 
-#: ../data/math-converter.ui.h:3
-#| msgid "="
+#: src/math-converter.ui:108
 msgctxt "convertion equals label"
 msgid "="
 msgstr "="
 
-#: ../data/math-function-popover.ui.h:1
+#: src/math-function-popover.ui:33
 msgid "New function"
 msgstr "Нова функција"
 
-#: ../data/math-variable-popover.ui.h:1
+#: src/math-variable-popover.ui:37
 msgid "Variable name"
 msgstr "Назив променљиве"
 
-#: ../data/math-variable-popover.ui.h:2
+#: src/math-variable-popover.ui:51
 msgid "Store value into existing or new variable"
 msgstr "Сачувајте вредност у постојећу или у нову променљиву"
 
-#: ../data/math-window.ui.h:1 ../src/math-window.vala:82
+#: src/math-window.ui:20 src/math-window.vala:82
 msgid "Basic Mode"
 msgstr "Основни начин рада"
 
-#: ../data/math-window.ui.h:2 ../src/math-window.vala:87
+#: src/math-window.ui:25 src/math-window.vala:87
 msgid "Advanced Mode"
 msgstr "Напредни начин рада"
 
-#: ../data/math-window.ui.h:3 ../src/math-window.vala:92
+#: src/math-window.ui:30 src/math-window.vala:92
 msgid "Financial Mode"
 msgstr "Финансијски начин рада"
 
-#: ../data/math-window.ui.h:4 ../src/math-window.vala:97
+#: src/math-window.ui:35 src/math-window.vala:97
 msgid "Programming Mode"
 msgstr "Програмерски начин рада"
 
-#: ../data/math-window.ui.h:5 ../src/math-window.vala:102
+#: src/math-window.ui:40 src/math-window.vala:102
 msgid "Keyboard Mode"
 msgstr "Режим тастатуре"
 
-#: ../data/math-window.ui.h:7
+#: src/math-window.ui:88
 msgid "Menu"
 msgstr "Изборник"
 
-#: ../data/math-shortcuts.ui.h:1
+#: src/math-shortcuts.ui:15
 msgctxt "shortcut window"
 msgid "General"
 msgstr "Опште"
 
-#: ../data/math-shortcuts.ui.h:2
+#: src/math-shortcuts.ui:20
 msgctxt "shortcut window"
 msgid "Open a new window"
 msgstr "Отвара нови прозор"
 
-#: ../data/math-shortcuts.ui.h:3
+#: src/math-shortcuts.ui:27
 msgctxt "shortcut window"
 msgid "Close current window"
 msgstr "Затвара текући прозор"
 
-#: ../data/math-shortcuts.ui.h:4
+#: src/math-shortcuts.ui:34
 msgctxt "shortcut window"
 msgid "Open help"
 msgstr "Отвара помоћ"
 
-#: ../data/math-shortcuts.ui.h:5
+#: src/math-shortcuts.ui:41
 msgctxt "shortcut window"
 msgid "Quit the application"
 msgstr "Излази из програма"
 
-#: ../data/math-shortcuts.ui.h:6
+#: src/math-shortcuts.ui:49
 msgctxt "shortcut window"
 msgid "Switching modes"
 msgstr "Пребацује режиме"
 
-#: ../data/math-shortcuts.ui.h:7
-#| msgid "Basic Mode"
+#: src/math-shortcuts.ui:54
 msgctxt "shortcut window"
 msgid "Switch to Basic mode"
 msgstr "Основни начин рада"
 
-#: ../data/math-shortcuts.ui.h:8
-#| msgid "Advanced Mode"
+#: src/math-shortcuts.ui:61
 msgctxt "shortcut window"
 msgid "Switch to Advanced mode"
 msgstr "Напредни начин рада"
 
-#: ../data/math-shortcuts.ui.h:9
-#| msgid "Financial Mode"
+#: src/math-shortcuts.ui:68
 msgctxt "shortcut window"
 msgid "Switch to Financial mode"
 msgstr "Финансијски начин рада"
 
-#: ../data/math-shortcuts.ui.h:10
-#| msgid "Programming Mode"
+#: src/math-shortcuts.ui:75
 msgctxt "shortcut window"
 msgid "Switch to Programming mode"
 msgstr "Програмерски начин рада"
 
-#: ../data/math-shortcuts.ui.h:11
-#| msgid "Keyboard Mode"
+#: src/math-shortcuts.ui:82
 msgctxt "shortcut window"
 msgid "Switch to Keyboard mode"
 msgstr "Режим тастатуре"
 
-#: ../data/math-shortcuts.ui.h:12
-#| msgid "Keyboard Mode"
+#: src/math-shortcuts.ui:90
 msgctxt "shortcut window"
 msgid "Keyboard entry"
 msgstr "Унос тастатуре"
 
-#: ../data/math-shortcuts.ui.h:13
-#| msgid "Multiply [*]"
+#: src/math-shortcuts.ui:95
 msgctxt "shortcut window"
 msgid "Multiply (×)"
 msgstr "Множење (×)"
 
-#: ../data/math-shortcuts.ui.h:14
-#| msgid "Divide [/]"
+#: src/math-shortcuts.ui:102
 msgctxt "shortcut window"
 msgid "Divide (÷)"
 msgstr "Дељење (÷)"
 
-#: ../data/math-shortcuts.ui.h:15
-#| msgid "Square root [Ctrl+R]"
+#: src/math-shortcuts.ui:109
 msgctxt "shortcut window"
 msgid "Square root (√)"
 msgstr "Квадратни корен [√]"
 
-#: ../data/math-shortcuts.ui.h:16
-#| msgid "Inverse"
+#: src/math-shortcuts.ui:116
 msgctxt "shortcut window"
 msgid "Inverse"
 msgstr "Инверзија"
 
-#: ../data/math-shortcuts.ui.h:17
+#: src/math-shortcuts.ui:123
 msgctxt "shortcut window"
 msgid "Pi (π)"
 msgstr "Пи (π)"
 
-#: ../data/math-shortcuts.ui.h:18
+#: src/math-shortcuts.ui:130
 msgctxt "shortcut window"
 msgid "Enter numbers in scientific format"
 msgstr "Унос бројева у научном формату"
 
-#: ../data/math-shortcuts.ui.h:19
-#| msgid "Programming Mode"
+#: src/math-shortcuts.ui:138
 msgctxt "shortcut window"
 msgid "Programming mode"
 msgstr "Програмерски начин рада"
 
-#: ../data/math-shortcuts.ui.h:20
+#: src/math-shortcuts.ui:143
 msgctxt "shortcut window"
 msgid "Switch to binary"
 msgstr "Бинарни бројеви"
 
-#: ../data/math-shortcuts.ui.h:21
+#: src/math-shortcuts.ui:150
 msgctxt "shortcut window"
 msgid "Switch to octal"
 msgstr "Октални бројеви"
 
-#: ../data/math-shortcuts.ui.h:22
+#: src/math-shortcuts.ui:157
 msgctxt "shortcut window"
 msgid "Switch to decimal"
 msgstr "Децимални бројеви"
 
-#: ../data/math-shortcuts.ui.h:23
-#| msgid "Hexadecimal"
+#: src/math-shortcuts.ui:164
 msgctxt "shortcut window"
 msgid "Switch to hexadecimal"
 msgstr "Хексадецимални бројеви"
 
-#: ../data/menu.ui.h:1
+#: src/menu.ui:7
 msgid "New Window"
 msgstr "Нови прозор"
 
 #. Title of preferences dialog
-#: ../data/menu.ui.h:2 ../src/math-preferences.vala:30
+#: src/menu.ui:14 src/math-preferences.vala:30
 msgid "Preferences"
 msgstr "Поставке"
 
-#: ../data/menu.ui.h:3
-#| msgid "Keyboard Mode"
+#: src/menu.ui:21
 msgid "_Keyboard Shortcuts"
 msgstr "_Пречице тастатуре"
 
-#: ../data/menu.ui.h:4
+#: src/menu.ui:26
 msgid "Help"
 msgstr "Помоћ"
 
-#: ../data/menu.ui.h:5
+#: src/menu.ui:31
 msgid "About"
 msgstr "О програму"
 
-#: ../data/menu.ui.h:6
+#: src/menu.ui:35
 msgid "Quit"
 msgstr "Изађи"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:1
+#: data/org.gnome.calculator.gschema.xml:25
 msgid "Accuracy value"
 msgstr "Вредност тачности"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:2
+#: data/org.gnome.calculator.gschema.xml:26
 msgid "The number of digits displayed after the numeric point"
 msgstr "Број цифара приказан после децималног зареза"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:3
+#: data/org.gnome.calculator.gschema.xml:31
 msgid "Word size"
 msgstr "Дужина речи"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:4
+#: data/org.gnome.calculator.gschema.xml:32
 msgid "The size of the words used in bitwise operations"
 msgstr "Дужина речи која се користи за битске операције"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:5
+#: data/org.gnome.calculator.gschema.xml:37
 msgid "Numeric Base"
 msgstr "Основа броја"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:6
+#: data/org.gnome.calculator.gschema.xml:38
 msgid "The numeric base"
 msgstr "Бројна основа"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:7
+#: data/org.gnome.calculator.gschema.xml:42
 msgid "Show Thousands Separators"
 msgstr "Приказивање раздвајача хиљада"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:8
+#: data/org.gnome.calculator.gschema.xml:43
 msgid "Indicates whether thousands separators are shown in large numbers."
 msgstr "Да ли да се раздвајач хиљада приказује за велике бројеве."
 
-#: ../data/org.gnome.calculator.gschema.xml.h:9
+#: data/org.gnome.calculator.gschema.xml:47
 msgid "Show Trailing Zeroes"
 msgstr "Приказивање пратећих нула"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:10
+#: data/org.gnome.calculator.gschema.xml:48
 msgid ""
 "Indicates whether any trailing zeroes after the numeric point should be "
 "shown in the display value."
@@ -965,441 +989,437 @@ msgstr ""
 "Да ли да се у приказаној вредности приказују пратеће нуле после децималног "
 "зареза."
 
-#: ../data/org.gnome.calculator.gschema.xml.h:11
+#: data/org.gnome.calculator.gschema.xml:52
 msgid "Number format"
 msgstr "Запис броја"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:12
+#: data/org.gnome.calculator.gschema.xml:53
 msgid "The format to display numbers in"
 msgstr "Запис у коме ће се приказивати бројеви"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:13
+#: data/org.gnome.calculator.gschema.xml:57
 msgid "Angle units"
 msgstr "Јединице углова"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:14
+#: data/org.gnome.calculator.gschema.xml:58
 msgid "The angle units to use"
 msgstr "Јединице углова за коришћење"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:15
+#: data/org.gnome.calculator.gschema.xml:62
 msgid "Button mode"
 msgstr "Режим дугмета"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:16
+#: data/org.gnome.calculator.gschema.xml:63
 msgid "The button mode"
 msgstr "Режим дугмета"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:17
+#: data/org.gnome.calculator.gschema.xml:67
 msgid "Source currency"
 msgstr "Изворна валута"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:18
+#: data/org.gnome.calculator.gschema.xml:68
 msgid "Currency of the current calculation"
 msgstr "Валута тренутног прорачуна"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:19
+#: data/org.gnome.calculator.gschema.xml:72
 msgid "Target currency"
 msgstr "Циљна валута"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:20
+#: data/org.gnome.calculator.gschema.xml:73
 msgid "Currency to convert the current calculation into"
 msgstr "Валута у коју треба претворити прорачун"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:21
+#: data/org.gnome.calculator.gschema.xml:77
 msgid "Source units"
 msgstr "Изворна јединица"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:22
+#: data/org.gnome.calculator.gschema.xml:78
 msgid "Units of the current calculation"
 msgstr "Јединица тренутног прорачуна"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:23
+#: data/org.gnome.calculator.gschema.xml:82
 msgid "Target units"
 msgstr "Циљна јединица"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:24
+#: data/org.gnome.calculator.gschema.xml:83
 msgid "Units to convert the current calculation into"
 msgstr "Јединица у коју треба претворити прорачун"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:25
+#: data/org.gnome.calculator.gschema.xml:87
 msgid "Internal precision"
 msgstr "Унутрашња тачност"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:26
+#: data/org.gnome.calculator.gschema.xml:88
 msgid "The internal precision used with the MPFR library"
 msgstr "Унутрашња тачност коришћена са МПФР библиотеком"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:27
+#: data/org.gnome.calculator.gschema.xml:92
 msgid "Window position"
 msgstr "Положај прозора"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:28
+#: data/org.gnome.calculator.gschema.xml:93
 msgid "Window position (x and y) of the last closed window."
 msgstr "Положај прозора (водоравно и усправно) последег затвореног прозора."
 
-#: ../lib/currency.vala:28
+#: lib/currency.vala:28
 msgid "UAE Dirham"
 msgstr "Емиратски дирхам"
 
-#: ../lib/currency.vala:29
+#: lib/currency.vala:29
 msgid "Australian Dollar"
 msgstr "Аустралијски долар"
 
-#: ../lib/currency.vala:30
+#: lib/currency.vala:30
 msgid "Bulgarian Lev"
 msgstr "Бугарски лев"
 
-#: ../lib/currency.vala:31
+#: lib/currency.vala:31
 msgid "Bahraini Dinar"
 msgstr "Бахреински динар"
 
-#: ../lib/currency.vala:32
+#: lib/currency.vala:32
 msgid "Brunei Dollar"
 msgstr "Брунејски долар"
 
-#: ../lib/currency.vala:33
+#: lib/currency.vala:33
 msgid "Brazilian Real"
 msgstr "Бразилски реал"
 
-#: ../lib/currency.vala:34
+#: lib/currency.vala:34
 msgid "Botswana Pula"
 msgstr "Боцванска пула"
 
-#: ../lib/currency.vala:35
+#: lib/currency.vala:35
 msgid "Canadian Dollar"
 msgstr "Канадски долар"
 
-#: ../lib/currency.vala:36
+#: lib/currency.vala:36
 msgid "CFA Franc"
 msgstr "ЦФА франак"
 
-#: ../lib/currency.vala:37
+#: lib/currency.vala:37
 msgid "Swiss Franc"
 msgstr "Швајцарски франак"
 
-#: ../lib/currency.vala:38
+#: lib/currency.vala:38
 msgid "Chilean Peso"
 msgstr "Чилеански пезос"
 
-#: ../lib/currency.vala:39
+#: lib/currency.vala:39
 msgid "Chinese Yuan"
 msgstr "Кинески јуан"
 
-#: ../lib/currency.vala:40
+#: lib/currency.vala:40
 msgid "Colombian Peso"
 msgstr "Колумбијски пезос"
 
-#: ../lib/currency.vala:41
+#: lib/currency.vala:41
 msgid "Czech Koruna"
 msgstr "Чешка круна"
 
-#: ../lib/currency.vala:42
+#: lib/currency.vala:42
 msgid "Danish Krone"
 msgstr "Данска круна"
 
-#: ../lib/currency.vala:43
+#: lib/currency.vala:43
 msgid "Algerian Dinar"
 msgstr "Алжирски динар"
 
-#: ../lib/currency.vala:44
+#: lib/currency.vala:44
 msgid "Estonian Kroon"
 msgstr "Естонска круна"
 
-#: ../lib/currency.vala:45
+#: lib/currency.vala:45
 msgid "Euro"
 msgstr "Евро"
 
-#: ../lib/currency.vala:46
-#| msgid "Pound Sterling"
+#: lib/currency.vala:46
 msgid "British Pound Sterling"
 msgstr "Британска фунта стерлинга"
 
-#: ../lib/currency.vala:47
+#: lib/currency.vala:47
 msgid "Hong Kong Dollar"
 msgstr "Хонгконшки долар"
 
-#: ../lib/currency.vala:48
+#: lib/currency.vala:48
 msgid "Croatian Kuna"
 msgstr "Хрватска куна"
 
-#: ../lib/currency.vala:49
+#: lib/currency.vala:49
 msgid "Hungarian Forint"
 msgstr "Мађарска форинта"
 
-#: ../lib/currency.vala:50
+#: lib/currency.vala:50
 msgid "Indonesian Rupiah"
 msgstr "Индонежанска рупија"
 
-#: ../lib/currency.vala:51
+#: lib/currency.vala:51
 msgid "Israeli New Shekel"
 msgstr "Израелски нови шекел"
 
-#: ../lib/currency.vala:52
+#: lib/currency.vala:52
 msgid "Indian Rupee"
 msgstr "Индијска рупија"
 
-#: ../lib/currency.vala:53
+#: lib/currency.vala:53
 msgid "Iranian Rial"
 msgstr "Ирански ријал"
 
-#: ../lib/currency.vala:54
+#: lib/currency.vala:54
 msgid "Icelandic Krona"
 msgstr "Исландска круна"
 
-#: ../lib/currency.vala:55
+#: lib/currency.vala:55
 msgid "Japanese Yen"
 msgstr "Јапански јен"
 
-#: ../lib/currency.vala:56
+#: lib/currency.vala:56
 msgid "South Korean Won"
 msgstr "Јужнокорејски вон"
 
-#: ../lib/currency.vala:57
+#: lib/currency.vala:57
 msgid "Kuwaiti Dinar"
 msgstr "Кувајтски динар"
 
-#: ../lib/currency.vala:58
+#: lib/currency.vala:58
 msgid "Kazakhstani Tenge"
 msgstr "Казахстански тенге"
 
-#: ../lib/currency.vala:59
+#: lib/currency.vala:59
 msgid "Sri Lankan Rupee"
 msgstr "Шриланканска рупија"
 
-#: ../lib/currency.vala:60
+#: lib/currency.vala:60
 msgid "Libyan Dinar"
 msgstr "Либијски динар"
 
-#: ../lib/currency.vala:61
+#: lib/currency.vala:61
 msgid "Mauritian Rupee"
 msgstr "Маурицијска рупија"
 
-#: ../lib/currency.vala:62
+#: lib/currency.vala:62
 msgid "Mexican Peso"
 msgstr "Мексички пезос"
 
-#: ../lib/currency.vala:63
+#: lib/currency.vala:63
 msgid "Malaysian Ringgit"
 msgstr "Малезијски рингит"
 
-#: ../lib/currency.vala:64
+#: lib/currency.vala:64
 msgid "Norwegian Krone"
 msgstr "Норвешка круна"
 
-#: ../lib/currency.vala:65
+#: lib/currency.vala:65
 msgid "Nepalese Rupee"
 msgstr "Непалска рупија"
 
-#: ../lib/currency.vala:66
+#: lib/currency.vala:66
 msgid "New Zealand Dollar"
 msgstr "Новозеландски долар"
 
-#: ../lib/currency.vala:67
+#: lib/currency.vala:67
 msgid "Omani Rial"
 msgstr "Омански ријал"
 
-#: ../lib/currency.vala:68
+#: lib/currency.vala:68
 msgid "Peruvian Nuevo Sol"
 msgstr "Перуански нови сол"
 
-#: ../lib/currency.vala:69
+#: lib/currency.vala:69
 msgid "Philippine Peso"
 msgstr "Филипински пезос"
 
-#: ../lib/currency.vala:70
+#: lib/currency.vala:70
 msgid "Pakistani Rupee"
 msgstr "Пакистанска рупија"
 
-#: ../lib/currency.vala:71
+#: lib/currency.vala:71
 msgid "Polish Zloty"
 msgstr "Пољски злот"
 
-#: ../lib/currency.vala:72
+#: lib/currency.vala:72
 msgid "Qatari Riyal"
 msgstr "Катарски ријал"
 
-#: ../lib/currency.vala:73
+#: lib/currency.vala:73
 msgid "New Romanian Leu"
 msgstr "Нови румунски леј"
 
-#: ../lib/currency.vala:74
+#: lib/currency.vala:74
 msgid "Russian Rouble"
 msgstr "Руска рубља"
 
-#: ../lib/currency.vala:75
+#: lib/currency.vala:75
 msgid "Saudi Riyal"
 msgstr "Саудијски ријал"
 
-#: ../lib/currency.vala:76
+#: lib/currency.vala:76
 msgid "Swedish Krona"
 msgstr "Шведска круна"
 
-#: ../lib/currency.vala:77
+#: lib/currency.vala:77
 msgid "Singapore Dollar"
 msgstr "Сингапурски долар"
 
-#: ../lib/currency.vala:78
+#: lib/currency.vala:78
 msgid "Thai Baht"
 msgstr "Тајландски бат"
 
-#: ../lib/currency.vala:79
+#: lib/currency.vala:79
 msgid "Tunisian Dinar"
 msgstr "Тунижански динар"
 
-#: ../lib/currency.vala:80
+#: lib/currency.vala:80
 msgid "New Turkish Lira"
 msgstr "Нова турска лира"
 
-#: ../lib/currency.vala:81
+#: lib/currency.vala:81
 msgid "T&T Dollar (TTD)"
 msgstr "T&T долар (TTD)"
 
-#: ../lib/currency.vala:82
+#: lib/currency.vala:82
 msgid "US Dollar"
 msgstr "Амерички долар"
 
-#: ../lib/currency.vala:83
+#: lib/currency.vala:83
 msgid "Uruguayan Peso"
 msgstr "Уругвајски пезос"
 
-#: ../lib/currency.vala:84
+#: lib/currency.vala:84
 msgid "Venezuelan Bolívar"
 msgstr "Венецуелански боливар"
 
-#: ../lib/currency.vala:85
+#: lib/currency.vala:85
 msgid "South African Rand"
 msgstr "Јужноафрички ранд"
 
-#: ../lib/equation-parser.vala:715 ../lib/number.vala:429
-#| msgid "nth root of negative number is undefined for even n"
+#: lib/equation-parser.vala:717 lib/number.vala:429
 msgid "The zeroth root of a number is undefined"
 msgstr "Нулти корен броја није дефинисан"
 
-#: ../lib/financial.vala:114
+#: lib/financial.vala:114
 msgid "Error: the number of periods must be positive"
 msgstr "Грешка: број периода мора бити позитиван"
 
 #. Digits localized for the given language
-#: ../lib/math-equation.vala:171
+#: lib/math-equation.vala:171
 msgid "0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F"
 msgstr "0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F"
 
 #. Error shown when trying to undo with no undo history
-#: ../lib/math-equation.vala:523
+#: lib/math-equation.vala:523
 msgid "No undo history"
 msgstr "Нема радњи опозивања"
 
 #. Error shown when trying to redo with no redo history
-#: ../lib/math-equation.vala:544
+#: lib/math-equation.vala:544
 msgid "No redo history"
 msgstr "Нема радњи враћања"
 
-#: ../lib/math-equation.vala:775
+#: lib/math-equation.vala:775
 msgid "No sane value to store"
 msgstr "Нема разумне вредности за чување"
 
 #. Error displayed to user when they perform a bitwise operation on numbers greater than the current word
-#: ../lib/math-equation.vala:968
+#: lib/math-equation.vala:968
 msgid "Overflow. Try a bigger word size"
 msgstr "Прекорачење. Покушајте са већом дужином речи"
 
 #. Error displayed to user when they an unknown variable is entered
-#: ../lib/math-equation.vala:973
+#: lib/math-equation.vala:973
 #, c-format
-#| msgid "Unknown variable '%s'"
 msgid "Unknown variable “%s”"
 msgstr "Непозната променљива „%s“"
 
 #. Error displayed to user when an unknown function is entered
-#: ../lib/math-equation.vala:980
+#: lib/math-equation.vala:980
 #, c-format
-#| msgid "Function '%s' is not defined"
 msgid "Function “%s” is not defined"
 msgstr "Функција „%s“ није одређена"
 
 #. Error displayed to user when an conversion with unknown units is attempted
-#: ../lib/math-equation.vala:987
+#: lib/math-equation.vala:987
 msgid "Unknown conversion"
 msgstr "Непознато претварање"
 
 #. should always be run
-#: ../lib/math-equation.vala:997
+#: lib/math-equation.vala:997
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. Unknown error.
 #. Error displayed to user when they enter an invalid calculation
-#: ../lib/math-equation.vala:1002 ../lib/math-equation.vala:1007
+#: lib/math-equation.vala:1002 lib/math-equation.vala:1007
 msgid "Malformed expression"
 msgstr "Неисправан израз"
 
-#: ../lib/math-equation.vala:1018
+#: lib/math-equation.vala:1018
 msgid "Calculating"
 msgstr "Израчунавам"
 
 #. Error displayed when trying to factorize a non-integer value
-#: ../lib/math-equation.vala:1211
+#: lib/math-equation.vala:1211
 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
-#: ../lib/math-equation.vala:1265
+#: lib/math-equation.vala:1265
 msgid "No sane value to bitwise shift"
 msgstr "Нема разумне вредности за битско померање"
 
 #. Message displayed when cannot toggle bit in display
-#: ../lib/math-equation.vala:1279
+#: lib/math-equation.vala:1279
 msgid "Displayed value not an integer"
 msgstr "Приказана вредност није цео број"
 
 #. Translators: Error displayed when underflow error occured
-#: ../lib/number.vala:196
+#: lib/number.vala:196
 msgid "Underflow error"
 msgstr "Грешка поткорачења"
 
 #. Translators: Error displayed when overflow error occured
-#: ../lib/number.vala:201
+#: lib/number.vala:201
 msgid "Overflow error"
 msgstr "Грешка прекорачења"
 
 #. Translators: Error display when attempting to take argument of zero
-#: ../lib/number.vala:251
+#: lib/number.vala:251
 msgid "Argument not defined for zero"
 msgstr "Аргумент није дефинисан за нулу"
 
 #. Translators: Error displayed when attempted to raise 0 to a negative re_exponent
-#: ../lib/number.vala:367 ../lib/number.vala:397
+#: lib/number.vala:367 lib/number.vala:397
 msgid "The power of zero is undefined for a negative exponent"
 msgstr "Степеновање нуле није дефинисано за негативне изложиоце"
 
 #. Translators: Error displayed when attempted to raise 0 to power of zero
-#: ../lib/number.vala:375 ../lib/number.vala:405
+#: lib/number.vala:375 lib/number.vala:405
 msgid "Zero raised to zero is undefined"
 msgstr "Нула на нултом степену није дефинисана"
 
 #. Translators: Error displayed when attempting to take logarithm of zero
-#: ../lib/number.vala:459 ../lib/number.vala:490
+#: lib/number.vala:459 lib/number.vala:490
 msgid "Logarithm of zero is undefined"
 msgstr "Логаритам нуле није дефинисан"
 
 #. Translators: Error displayed when attempted take the factorial of a negative or complex number
-#: ../lib/number.vala:512
+#: lib/number.vala:512
 msgid "Factorial is only defined for non-negative real numbers"
 msgstr "Факторијел је одређен само за не-негативне природне бројеве"
 
 #. Translators: Error displayed attempted to divide by zero
-#: ../lib/number.vala:572
+#: lib/number.vala:572
 msgid "Division by zero is undefined"
 msgstr "Дељење нулом није дефинисано"
 
 #. Translators: Error displayed when attemping to do a modulus division on non-integer numbers
-#: ../lib/number.vala:593
+#: lib/number.vala:593
 msgid "Modulus division is only defined for integers"
 msgstr "Дељење по модулу је дефинисано само за целе бројеве"
 
 #. Translators: Error displayed when tangent value is undefined
-#: ../lib/number.vala:666
+#: lib/number.vala:666
 msgid ""
 "Tangent is undefined for angles that are multiples of π (180°) from π∕2 (90°)"
 msgstr ""
@@ -1407,1357 +1427,1354 @@ msgstr ""
 "π∕2 (90°)"
 
 #. Translators: Error displayed when inverse sine value is undefined
-#: ../lib/number.vala:685
+#: lib/number.vala:685
 msgid "Inverse sine is undefined for values outside [-1, 1]"
 msgstr "Инверзни синус није дефинисан за вредности изван [-1, 1]"
 
 #. Translators: Error displayed when inverse cosine value is undefined
-#: ../lib/number.vala:702
+#: lib/number.vala:702
 msgid "Inverse cosine is undefined for values outside [-1, 1]"
 msgstr "Инверзни косинус није дефинисан за вредности изван [-1, 1]"
 
 #. Translators: Error displayed when inverse hyperbolic cosine value is undefined
-#: ../lib/number.vala:763
+#: lib/number.vala:763
 msgid "Inverse hyperbolic cosine is undefined for values less than one"
 msgstr ""
 "Инверзни хиперболички косинус није дефинисан за вредности мање од један"
 
 #. Translators: Error displayed when inverse hyperbolic tangent value is undefined
-#: ../lib/number.vala:779
+#: lib/number.vala:779
 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
-#: ../lib/number.vala:795
+#: lib/number.vala:795
 msgid "Boolean AND is only defined for positive integers"
 msgstr "Логичко И је дефинисано само за позитивне целе бројеве"
 
 #. Translators: Error displayed when boolean OR attempted on non-integer values
-#: ../lib/number.vala:807
+#: lib/number.vala:807
 msgid "Boolean OR is only defined for positive integers"
 msgstr "Логичко ИЛИ је дефинисано само за позитивне целе бројеве"
 
 #. Translators: Error displayed when boolean XOR attempted on non-integer values
-#: ../lib/number.vala:819
+#: lib/number.vala:819
 msgid "Boolean XOR is only defined for positive integers"
 msgstr "Логичко ИЛЛИ је дефинисано само за позитивне целе бројеве"
 
 #. Translators: Error displayed when boolean XOR attempted on non-integer values
-#: ../lib/number.vala:831
+#: lib/number.vala:831
 msgid "Boolean NOT is only defined for positive integers"
 msgstr "Логичко НЕ је дефинисано само за позитивне целе бројеве"
 
 #. Translators: Error displayed when bit shift attempted on non-integer values
-#: ../lib/number.vala:854
+#: lib/number.vala:854
 msgid "Shift is only possible on integer values"
 msgstr "Померање је могуће само за позитивне целе вредности"
 
-#: ../lib/serializer.vala:332
+#: lib/serializer.vala:332
 msgid "Precision error"
 msgstr "Грешка тачности"
 
-#: ../lib/unit.vala:29
+#: lib/unit.vala:29
 msgid "Angle"
 msgstr "Угао"
 
-#: ../lib/unit.vala:30
+#: lib/unit.vala:30
 msgid "Length"
 msgstr "Дужина"
 
-#: ../lib/unit.vala:31
+#: lib/unit.vala:31
 msgid "Area"
 msgstr "Површина"
 
-#: ../lib/unit.vala:32
+#: lib/unit.vala:32
 msgid "Volume"
 msgstr "Запремина"
 
-#: ../lib/unit.vala:33
+#: lib/unit.vala:33
 msgid "Weight"
 msgstr "Тежина"
 
-#: ../lib/unit.vala:34
+#: lib/unit.vala:34
 msgid "Duration"
 msgstr "Време"
 
-#: ../lib/unit.vala:35
+#: lib/unit.vala:35
 msgid "Temperature"
 msgstr "Температура"
 
-#: ../lib/unit.vala:36
+#: lib/unit.vala:36
 msgid "Digital Storage"
 msgstr "Дигитално складиште"
 
 #. FIXME: Approximations of 1/(units in a circle), therefore, 360 deg != 400 grads
 #. Preferences dialog: Angle unit combo box: Use degrees for trigonometric calculations
-#: ../lib/unit.vala:39 ../src/math-preferences.vala:144
+#: lib/unit.vala:39 src/math-preferences.vala:144
 msgid "Degrees"
 msgstr "Степени"
 
-#: ../lib/unit.vala:39
+#: lib/unit.vala:39
 #, c-format
 msgctxt "unit-format"
 msgid "%s degrees"
 msgstr "%s степени"
 
-#: ../lib/unit.vala:39
+#: lib/unit.vala:39
 msgctxt "unit-symbols"
 msgid "degree,degrees,deg"
 msgstr "степен,степена,степени,ст"
 
 #. Preferences dialog: Angle unit combo box: Use radians for trigonometric calculations
-#: ../lib/unit.vala:40 ../src/math-preferences.vala:148
+#: lib/unit.vala:40 src/math-preferences.vala:148
 msgid "Radians"
 msgstr "Радијани"
 
-#: ../lib/unit.vala:40
+#: lib/unit.vala:40
 #, c-format
 msgctxt "unit-format"
 msgid "%s radians"
 msgstr "%s радијана"
 
-#: ../lib/unit.vala:40
+#: lib/unit.vala:40
 msgctxt "unit-symbols"
 msgid "radian,radians,rad"
 msgstr "радијан,радијана,рад"
 
 #. Preferences dialog: Angle unit combo box: Use gradians for trigonometric calculations
-#: ../lib/unit.vala:41 ../src/math-preferences.vala:152
+#: lib/unit.vala:41 src/math-preferences.vala:152
 msgid "Gradians"
 msgstr "Градијани"
 
-#: ../lib/unit.vala:41
+#: lib/unit.vala:41
 #, c-format
 msgctxt "unit-format"
 msgid "%s gradians"
 msgstr "%s градијана"
 
-#: ../lib/unit.vala:41
+#: lib/unit.vala:41
 msgctxt "unit-symbols"
 msgid "gradian,gradians,grad"
 msgstr "градијан,градијана,град"
 
-#: ../lib/unit.vala:42
+#: lib/unit.vala:42
 msgid "Parsecs"
 msgstr "Парсеци"
 
-#: ../lib/unit.vala:42
+#: lib/unit.vala:42
 #, c-format
 msgctxt "unit-format"
 msgid "%s pc"
 msgstr "%s пц"
 
-#: ../lib/unit.vala:42
+#: lib/unit.vala:42
 msgctxt "unit-symbols"
 msgid "parsec,parsecs,pc"
 msgstr "парсек,парсека,пц"
 
-#: ../lib/unit.vala:43
+#: lib/unit.vala:43
 msgid "Light Years"
 msgstr "Светлосне године"
 
-#: ../lib/unit.vala:43
+#: lib/unit.vala:43
 #, c-format
 msgctxt "unit-format"
 msgid "%s ly"
 msgstr "%s сг"
 
-#: ../lib/unit.vala:43
+#: lib/unit.vala:43
 msgctxt "unit-symbols"
 msgid "lightyear,lightyears,ly"
 msgstr "светлоснагодина,светлоснегодине,светлоснихгодина,ly"
 
-#: ../lib/unit.vala:44
+#: lib/unit.vala:44
 msgid "Astronomical Units"
 msgstr "Астрономске јединице"
 
-#: ../lib/unit.vala:44
+#: lib/unit.vala:44
 #, c-format
 msgctxt "unit-format"
 msgid "%s au"
 msgstr "%s ај"
 
-#: ../lib/unit.vala:44
+#: lib/unit.vala:44
 msgctxt "unit-symbols"
 msgid "au"
 msgstr "ај"
 
-#: ../lib/unit.vala:45
+#: lib/unit.vala:45
 msgid "Nautical Miles"
 msgstr "Наутичке миље"
 
-#: ../lib/unit.vala:45
+#: lib/unit.vala:45
 #, c-format
 msgctxt "unit-format"
 msgid "%s nmi"
 msgstr "%s нми"
 
-#: ../lib/unit.vala:45
+#: lib/unit.vala:45
 msgctxt "unit-symbols"
 msgid "nmi"
 msgstr "нми"
 
-#: ../lib/unit.vala:46
+#: lib/unit.vala:46
 msgid "Miles"
 msgstr "Миље"
 
-#: ../lib/unit.vala:46
+#: lib/unit.vala:46
 #, c-format
 msgctxt "unit-format"
 msgid "%s mi"
 msgstr "%s ми"
 
-#: ../lib/unit.vala:46
+#: lib/unit.vala:46
 msgctxt "unit-symbols"
 msgid "mile,miles,mi"
 msgstr "миља,миље,миља,mi"
 
-#: ../lib/unit.vala:47
+#: lib/unit.vala:47
 msgid "Kilometers"
 msgstr "Километри"
 
-#: ../lib/unit.vala:47
+#: lib/unit.vala:47
 #, c-format
 msgctxt "unit-format"
 msgid "%s km"
 msgstr "%s km"
 
-#: ../lib/unit.vala:47
+#: lib/unit.vala:47
 msgctxt "unit-symbols"
 msgid "kilometer,kilometers,km,kms"
 msgstr "километар,километра,километара,км,km"
 
-#: ../lib/unit.vala:48
+#: lib/unit.vala:48
 msgid "Cables"
 msgstr "Каблови"
 
-#: ../lib/unit.vala:48
+#: lib/unit.vala:48
 #, c-format
 msgctxt "unit-format"
 msgid "%s cb"
 msgstr "%s cb"
 
-#: ../lib/unit.vala:48
+#: lib/unit.vala:48
 msgctxt "unit-symbols"
 msgid "cable,cables,cb"
 msgstr "кабал,кабла,каблова,cb"
 
-#: ../lib/unit.vala:49
+#: lib/unit.vala:49
 msgid "Fathoms"
 msgstr "Хвати"
 
-#: ../lib/unit.vala:49
+#: lib/unit.vala:49
 #, c-format
 msgctxt "unit-format"
 msgid "%s ftm"
 msgstr "%s ftm"
 
-#: ../lib/unit.vala:49
+#: lib/unit.vala:49
 msgctxt "unit-symbols"
 msgid "fathom,fathoms,ftm"
 msgstr "хват,хвата,хватова,хв,ftm"
 
-#: ../lib/unit.vala:50
+#: lib/unit.vala:50
 msgid "Meters"
 msgstr "Метри"
 
-#: ../lib/unit.vala:50
+#: lib/unit.vala:50
 #, c-format
 msgctxt "unit-format"
 msgid "%s m"
 msgstr "%s m"
 
-#: ../lib/unit.vala:50
+#: lib/unit.vala:50
 msgctxt "unit-symbols"
 msgid "meter,meters,m"
 msgstr "метар,метра,метара,м,m"
 
-#: ../lib/unit.vala:51
+#: lib/unit.vala:51
 msgid "Yards"
 msgstr "Јарди"
 
-#: ../lib/unit.vala:51
+#: lib/unit.vala:51
 #, c-format
 msgctxt "unit-format"
 msgid "%s yd"
 msgstr "%s yd"
 
-#: ../lib/unit.vala:51
+#: lib/unit.vala:51
 msgctxt "unit-symbols"
 msgid "yard,yards,yd"
 msgstr "јард,јарда,јарди,yd"
 
-#: ../lib/unit.vala:52
+#: lib/unit.vala:52
 msgid "Feet"
 msgstr "Стопе"
 
-#: ../lib/unit.vala:52
+#: lib/unit.vala:52
 #, c-format
 msgctxt "unit-format"
 msgid "%s ft"
 msgstr "%s ftm"
 
-#: ../lib/unit.vala:52
+#: lib/unit.vala:52
 msgctxt "unit-symbols"
 msgid "foot,feet,ft"
 msgstr "стопа,стопе,стопа,ft"
 
-#: ../lib/unit.vala:53
+#: lib/unit.vala:53
 msgid "Inches"
 msgstr "Инчи"
 
-#: ../lib/unit.vala:53
+#: lib/unit.vala:53
 #, c-format
 msgctxt "unit-format"
 msgid "%s in"
 msgstr "%s in"
 
-#: ../lib/unit.vala:53
+#: lib/unit.vala:53
 msgctxt "unit-symbols"
 msgid "inch,inches,in"
 msgstr "инч,инча,ин,in"
 
-#: ../lib/unit.vala:54
+#: lib/unit.vala:54
 msgid "Centimeters"
 msgstr "Центиметри"
 
-#: ../lib/unit.vala:54
+#: lib/unit.vala:54
 #, c-format
 msgctxt "unit-format"
 msgid "%s cm"
 msgstr "%s cm"
 
-#: ../lib/unit.vala:54
+#: lib/unit.vala:54
 msgctxt "unit-symbols"
 msgid "centimeter,centimeters,cm,cms"
 msgstr "центиметар,центиметра,центиметара,цм,cm"
 
-#: ../lib/unit.vala:55
+#: lib/unit.vala:55
 msgid "Millimeters"
 msgstr "Милиметри"
 
-#: ../lib/unit.vala:55
+#: lib/unit.vala:55
 #, c-format
 msgctxt "unit-format"
 msgid "%s mm"
 msgstr "%s mm"
 
-#: ../lib/unit.vala:55
+#: lib/unit.vala:55
 msgctxt "unit-symbols"
 msgid "millimeter,millimeters,mm"
 msgstr "милиметар,милиметра,милиметара,мм,mm"
 
-#: ../lib/unit.vala:56
+#: lib/unit.vala:56
 msgid "Micrometers"
 msgstr "Микрометри"
 
-#: ../lib/unit.vala:56
+#: lib/unit.vala:56
 #, c-format
 msgctxt "unit-format"
 msgid "%s μm"
 msgstr "%s μm"
 
-#: ../lib/unit.vala:56
+#: lib/unit.vala:56
 msgctxt "unit-symbols"
 msgid "micrometer,micrometers,um"
 msgstr "микрометар,микрометра,микрометара,um"
 
-#: ../lib/unit.vala:57
+#: lib/unit.vala:57
 msgid "Nanometers"
 msgstr "Нанометри"
 
-#: ../lib/unit.vala:57
+#: lib/unit.vala:57
 #, c-format
 msgctxt "unit-format"
 msgid "%s nm"
 msgstr "%s nm"
 
-#: ../lib/unit.vala:57
+#: lib/unit.vala:57
 msgctxt "unit-symbols"
 msgid "nanometer,nanometers,nm"
 msgstr "нанометар,нанометра,нанометара,нм,nm"
 
-#: ../lib/unit.vala:58
+#: lib/unit.vala:58
 msgid "Desktop Publishing Point"
 msgstr "Тачка објављивања радне површи"
 
-#: ../lib/unit.vala:58 ../lib/unit.vala:68
+#: lib/unit.vala:58 lib/unit.vala:68
 #, c-format
 msgctxt "unit-format"
 msgid "%s pt"
 msgstr "%s pt"
 
-#: ../lib/unit.vala:58
-#| msgctxt "unit-symbols"
-#| msgid "pint,pints,pt"
+#: lib/unit.vala:58
 msgctxt "unit-symbols"
 msgid "point,pt,points,pts"
 msgstr "пинта,пинте,пинти,пт,pt"
 
-#: ../lib/unit.vala:59
+#: lib/unit.vala:59
 msgid "Hectares"
 msgstr "Хектари"
 
-#: ../lib/unit.vala:59
+#: lib/unit.vala:59
 #, c-format
 msgctxt "unit-format"
 msgid "%s ha"
 msgstr "%s ha"
 
-#: ../lib/unit.vala:59
+#: lib/unit.vala:59
 msgctxt "unit-symbols"
 msgid "hectare,hectares,ha"
 msgstr "хектар,хектара, ха,ha"
 
-#: ../lib/unit.vala:60
+#: lib/unit.vala:60
 msgid "Acres"
 msgstr "Акри"
 
-#: ../lib/unit.vala:60
+#: lib/unit.vala:60
 #, c-format
 msgctxt "unit-format"
 msgid "%s acres"
 msgstr "%s акра"
 
-#: ../lib/unit.vala:60
+#: lib/unit.vala:60
 msgctxt "unit-symbols"
 msgid "acre,acres"
 msgstr "акр,акра"
 
-#: ../lib/unit.vala:61
+#: lib/unit.vala:61
 msgid "Square Meters"
 msgstr "Квадратни метри"
 
-#: ../lib/unit.vala:61
+#: lib/unit.vala:61
 #, c-format
 msgctxt "unit-format"
 msgid "%s m²"
 msgstr "%s m²"
 
-#: ../lib/unit.vala:61
+#: lib/unit.vala:61
 msgctxt "unit-symbols"
 msgid "m²"
 msgstr "m²"
 
-#: ../lib/unit.vala:62
+#: lib/unit.vala:62
 msgid "Square Centimeters"
 msgstr "Квадратни центиметри"
 
-#: ../lib/unit.vala:62
+#: lib/unit.vala:62
 #, c-format
 msgctxt "unit-format"
 msgid "%s cm²"
 msgstr "%s cm²"
 
-#: ../lib/unit.vala:62
+#: lib/unit.vala:62
 msgctxt "unit-symbols"
 msgid "cm²"
 msgstr "cm²"
 
-#: ../lib/unit.vala:63
+#: lib/unit.vala:63
 msgid "Square Millimeters"
 msgstr "Квадратни милиметри"
 
-#: ../lib/unit.vala:63
+#: lib/unit.vala:63
 #, c-format
 msgctxt "unit-format"
 msgid "%s mm²"
 msgstr "%s mm²"
 
-#: ../lib/unit.vala:63
+#: lib/unit.vala:63
 msgctxt "unit-symbols"
 msgid "mm²"
 msgstr "mm²"
 
-#: ../lib/unit.vala:64
+#: lib/unit.vala:64
 msgid "Cubic Meters"
 msgstr "Кубни метри"
 
-#: ../lib/unit.vala:64
+#: lib/unit.vala:64
 #, c-format
 msgctxt "unit-format"
 msgid "%s m³"
 msgstr "%s m³"
 
-#: ../lib/unit.vala:64
+#: lib/unit.vala:64
 msgctxt "unit-symbols"
 msgid "m³"
 msgstr "m³"
 
-#: ../lib/unit.vala:65
+#: lib/unit.vala:65
 msgid "Gallons"
 msgstr "Галони"
 
-#: ../lib/unit.vala:65
+#: lib/unit.vala:65
 #, c-format
 msgctxt "unit-format"
 msgid "%s gal"
 msgstr "%s gal"
 
-#: ../lib/unit.vala:65
+#: lib/unit.vala:65
 msgctxt "unit-symbols"
 msgid "gallon,gallons,gal"
 msgstr "галон,галона,gal"
 
-#: ../lib/unit.vala:66
+#: lib/unit.vala:66
 msgid "Liters"
 msgstr "Литри"
 
-#: ../lib/unit.vala:66
+#: lib/unit.vala:66
 #, c-format
 msgctxt "unit-format"
 msgid "%s L"
 msgstr "%s l"
 
-#: ../lib/unit.vala:66
+#: lib/unit.vala:66
 msgctxt "unit-symbols"
 msgid "litre,litres,liter,liters,L"
 msgstr "литар,литра,литара,Л,l"
 
-#: ../lib/unit.vala:67
+#: lib/unit.vala:67
 msgid "Quarts"
 msgstr "Кварти"
 
-#: ../lib/unit.vala:67
+#: lib/unit.vala:67
 #, c-format
 msgctxt "unit-format"
 msgid "%s qt"
 msgstr "%s qt"
 
-#: ../lib/unit.vala:67
+#: lib/unit.vala:67
 msgctxt "unit-symbols"
 msgid "quart,quarts,qt"
 msgstr "кварт,кварта,квартова,qt"
 
-#: ../lib/unit.vala:68
+#: lib/unit.vala:68
 msgid "Pints"
 msgstr "Пинте"
 
-#: ../lib/unit.vala:68
+#: lib/unit.vala:68
 msgctxt "unit-symbols"
 msgid "pint,pints,pt"
 msgstr "пинта,пинте,пинти,пт,pt"
 
-#: ../lib/unit.vala:69
+#: lib/unit.vala:69
 msgid "Milliliters"
 msgstr "Милилитри"
 
-#: ../lib/unit.vala:69
+#: lib/unit.vala:69
 #, c-format
 msgctxt "unit-format"
 msgid "%s mL"
 msgstr "%s ml"
 
-#: ../lib/unit.vala:69
+#: lib/unit.vala:69
 msgctxt "unit-symbols"
 msgid "millilitre,millilitres,milliliter,milliliters,mL,cm³"
 msgstr "милилитар,милилитра,милилитара,мл,ml,cm³"
 
-#: ../lib/unit.vala:70
+#: lib/unit.vala:70
 msgid "Microliters"
 msgstr "Микролитри"
 
-#: ../lib/unit.vala:70
+#: lib/unit.vala:70
 #, c-format
 msgctxt "unit-format"
 msgid "%s μL"
 msgstr "%s μl"
 
-#: ../lib/unit.vala:70
+#: lib/unit.vala:70
 msgctxt "unit-symbols"
 msgid "mm³,μL,uL"
 msgstr "mm³,μl,ul"
 
-#: ../lib/unit.vala:71
+#: lib/unit.vala:71
 msgid "Tonnes"
 msgstr "Тоне"
 
-#: ../lib/unit.vala:71
+#: lib/unit.vala:71
 #, c-format
 msgctxt "unit-format"
 msgid "%s T"
 msgstr "%s t"
 
-#: ../lib/unit.vala:71
+#: lib/unit.vala:71
 msgctxt "unit-symbols"
 msgid "tonne,tonnes"
 msgstr "тона,тоне,т,t"
 
-#: ../lib/unit.vala:72
+#: lib/unit.vala:72
 msgid "Kilograms"
 msgstr "Килограми"
 
-#: ../lib/unit.vala:72
+#: lib/unit.vala:72
 #, c-format
 msgctxt "unit-format"
 msgid "%s kg"
 msgstr "%s kg"
 
-#: ../lib/unit.vala:72
+#: lib/unit.vala:72
 msgctxt "unit-symbols"
 msgid "kilogram,kilograms,kilogramme,kilogrammes,kg,kgs"
 msgstr "килограм,килограма,кг,kg"
 
-#: ../lib/unit.vala:73
+#: lib/unit.vala:73
 msgid "Pounds"
 msgstr "Фунте"
 
-#: ../lib/unit.vala:73
+#: lib/unit.vala:73
 #, c-format
 msgctxt "unit-format"
 msgid "%s lb"
 msgstr "%s lb"
 
-#: ../lib/unit.vala:73
+#: lib/unit.vala:73
 msgctxt "unit-symbols"
 msgid "pound,pounds,lb"
 msgstr "фунта,фунте,фунти,lb"
 
-#: ../lib/unit.vala:74
+#: lib/unit.vala:74
 msgid "Ounces"
 msgstr "Унце"
 
-#: ../lib/unit.vala:74
+#: lib/unit.vala:74
 #, c-format
 msgctxt "unit-format"
 msgid "%s oz"
 msgstr "%s oz"
 
-#: ../lib/unit.vala:74
+#: lib/unit.vala:74
 msgctxt "unit-symbols"
 msgid "ounce,ounces,oz"
 msgstr "унца,unce,унци,оз,oz"
 
-#: ../lib/unit.vala:75
+#: lib/unit.vala:75
 msgid "Grams"
 msgstr "Грами"
 
-#: ../lib/unit.vala:75
+#: lib/unit.vala:75
 #, c-format
 msgctxt "unit-format"
 msgid "%s g"
 msgstr "%s g"
 
-#: ../lib/unit.vala:75
+#: lib/unit.vala:75
 msgctxt "unit-symbols"
 msgid "gram,grams,gramme,grammes,g"
 msgstr "грам,грама,г,g"
 
-#: ../lib/unit.vala:76
+#: lib/unit.vala:76
 msgid "Years"
 msgstr "Године"
 
-#: ../lib/unit.vala:76
+#: lib/unit.vala:76
 #, c-format
 msgctxt "unit-format"
 msgid "%s years"
 msgstr "%s год."
 
-#: ../lib/unit.vala:76
+#: lib/unit.vala:76
 msgctxt "unit-symbols"
 msgid "year,years"
 msgstr "година,године,година"
 
-#: ../lib/unit.vala:77
+#: lib/unit.vala:77
 msgid "Days"
 msgstr "Дани"
 
-#: ../lib/unit.vala:77
+#: lib/unit.vala:77
 #, c-format
 msgctxt "unit-format"
 msgid "%s days"
 msgstr "%s дана"
 
-#: ../lib/unit.vala:77
+#: lib/unit.vala:77
 msgctxt "unit-symbols"
 msgid "day,days"
 msgstr "дан,дана"
 
-#: ../lib/unit.vala:78
+#: lib/unit.vala:78
 msgid "Hours"
 msgstr "Сати"
 
-#: ../lib/unit.vala:78
+#: lib/unit.vala:78
 #, c-format
 msgctxt "unit-format"
 msgid "%s hours"
 msgstr "%s сати"
 
-#: ../lib/unit.vala:78
+#: lib/unit.vala:78
 msgctxt "unit-symbols"
 msgid "hour,hours"
 msgstr "сат,сата,сати"
 
-#: ../lib/unit.vala:79
+#: lib/unit.vala:79
 msgid "Minutes"
 msgstr "Минути"
 
-#: ../lib/unit.vala:79
+#: lib/unit.vala:79
 #, c-format
 msgctxt "unit-format"
 msgid "%s minutes"
 msgstr "%s мин."
 
-#: ../lib/unit.vala:79
+#: lib/unit.vala:79
 msgctxt "unit-symbols"
 msgid "minute,minutes"
 msgstr "минут,минута"
 
-#: ../lib/unit.vala:80
+#: lib/unit.vala:80
 msgid "Seconds"
 msgstr "Секунде"
 
-#: ../lib/unit.vala:80
+#: lib/unit.vala:80
 #, c-format
 msgctxt "unit-format"
 msgid "%s s"
 msgstr "%s s"
 
-#: ../lib/unit.vala:80
+#: lib/unit.vala:80
 msgctxt "unit-symbols"
 msgid "second,seconds,s"
 msgstr "секунда,секунде,секунди,с,s"
 
-#: ../lib/unit.vala:81
+#: lib/unit.vala:81
 msgid "Milliseconds"
 msgstr "Милисекунде"
 
-#: ../lib/unit.vala:81
+#: lib/unit.vala:81
 #, c-format
 msgctxt "unit-format"
 msgid "%s ms"
 msgstr "%s ms"
 
-#: ../lib/unit.vala:81
+#: lib/unit.vala:81
 msgctxt "unit-symbols"
 msgid "millisecond,milliseconds,ms"
 msgstr "милисекунда,милисекунде,милисенди,мс,ms"
 
-#: ../lib/unit.vala:82
+#: lib/unit.vala:82
 msgid "Microseconds"
 msgstr "Микросекунде"
 
-#: ../lib/unit.vala:82
+#: lib/unit.vala:82
 #, c-format
 msgctxt "unit-format"
 msgid "%s μs"
 msgstr "%s μs"
 
-#: ../lib/unit.vala:82
+#: lib/unit.vala:82
 msgctxt "unit-symbols"
 msgid "microsecond,microseconds,us,μs"
 msgstr "микросекундa,микросекунде,микросекунди,μs"
 
-#: ../lib/unit.vala:83
+#: lib/unit.vala:83
 msgid "Celsius"
 msgstr "Целзијуси"
 
-#: ../lib/unit.vala:83
+#: lib/unit.vala:83
 #, c-format
 msgctxt "unit-format"
 msgid "%s ˚C"
 msgstr "%s ˚C"
 
-#: ../lib/unit.vala:83
+#: lib/unit.vala:83
 msgctxt "unit-symbols"
 msgid "degC,˚C,C,c,Celsius,celsius"
 msgstr "степенЦелзијуса,˚C,Целзијус,целзијус"
 
-#: ../lib/unit.vala:84
+#: lib/unit.vala:84
 msgid "Fahrenheit"
 msgstr "Фаренхајти"
 
-#: ../lib/unit.vala:84
+#: lib/unit.vala:84
 #, c-format
 msgctxt "unit-format"
 msgid "%s ˚F"
 msgstr "%s ˚F"
 
-#: ../lib/unit.vala:84
+#: lib/unit.vala:84
 msgctxt "unit-symbols"
 msgid "degF,˚F,F,f,Fahrenheit,fahrenheit"
 msgstr "степенФаренхајта,˚F,Фаренхајт,фаренхајт"
 
-#: ../lib/unit.vala:85
+#: lib/unit.vala:85
 msgid "Kelvin"
 msgstr "Келвини"
 
-#: ../lib/unit.vala:85
+#: lib/unit.vala:85
 #, c-format
 msgctxt "unit-format"
 msgid "%s K"
 msgstr "%s K"
 
-#: ../lib/unit.vala:85
+#: lib/unit.vala:85
 msgctxt "unit-symbols"
 msgid "k,K,Kelvin,kelvin"
 msgstr "степенКелвина,K,Келвин,келвин"
 
-#: ../lib/unit.vala:86
+#: lib/unit.vala:86
 msgid "Rankine"
 msgstr "Ранкини"
 
-#: ../lib/unit.vala:86
+#: lib/unit.vala:86
 #, c-format
 msgctxt "unit-format"
 msgid "%s ˚R"
 msgstr "%s ˚R"
 
-#: ../lib/unit.vala:86
+#: lib/unit.vala:86
 msgctxt "unit-symbols"
 msgid "degR,˚R,˚Ra,r,R,Rankine,rankine"
 msgstr "степенРанкина,˚R,˚Ra,Ранкин,ранкин"
 
 #. We use IEC prefix for digital storage units. i.e. 1 kB = 1 KiloByte = 1000 bytes, and 1 KiB = 1 kibiByte 
= 1024 bytes
-#: ../lib/unit.vala:88
+#: lib/unit.vala:88
 msgid "Bits"
 msgstr "Бита"
 
-#: ../lib/unit.vala:88
+#: lib/unit.vala:88
 #, c-format
 msgctxt "unit-format"
 msgid "%s b"
 msgstr "%s b"
 
-#: ../lib/unit.vala:88
+#: lib/unit.vala:88
 msgctxt "unit-symbols"
 msgid "bit,bits,b"
 msgstr "бит,бита,битова,b"
 
-#: ../lib/unit.vala:89
+#: lib/unit.vala:89
 msgid "Bytes"
 msgstr "Бајтова"
 
-#: ../lib/unit.vala:89
+#: lib/unit.vala:89
 #, c-format
 msgctxt "unit-format"
 msgid "%s B"
 msgstr "%s B"
 
-#: ../lib/unit.vala:89
+#: lib/unit.vala:89
 msgctxt "unit-symbols"
 msgid "byte,bytes,B"
 msgstr "бајт,бајта,бајтова,В"
 
-#: ../lib/unit.vala:90
+#: lib/unit.vala:90
 msgid "Nibbles"
 msgstr "Полубајта"
 
-#: ../lib/unit.vala:90
+#: lib/unit.vala:90
 #, c-format
 msgctxt "unit-format"
 msgid "%s nibble"
 msgstr "%s полубајта"
 
-#: ../lib/unit.vala:90
+#: lib/unit.vala:90
 msgctxt "unit-symbols"
 msgid "nibble,nibbles"
 msgstr "полубајт,полубајта"
 
 #. The SI symbol for kilo is k, however we also allow "KB" and "Kb", as they are widely used and accepted.
-#: ../lib/unit.vala:92
+#: lib/unit.vala:92
 msgid "Kilobits"
 msgstr "Килобита"
 
-#: ../lib/unit.vala:92
+#: lib/unit.vala:92
 #, c-format
 msgctxt "unit-format"
 msgid "%s kb"
 msgstr "%s kb"
 
-#: ../lib/unit.vala:92
+#: lib/unit.vala:92
 msgctxt "unit-symbols"
 msgid "kilobit,kilobits,kb,Kb"
 msgstr "килобит,килобита,kb,Kb"
 
-#: ../lib/unit.vala:93
+#: lib/unit.vala:93
 msgid "Kilobytes"
 msgstr "Килобајта"
 
-#: ../lib/unit.vala:93
+#: lib/unit.vala:93
 #, c-format
 msgctxt "unit-format"
 msgid "%s kB"
 msgstr "%s kB"
 
-#: ../lib/unit.vala:93
+#: lib/unit.vala:93
 msgctxt "unit-symbols"
 msgid "kilobyte,kilobytes,kB,KB"
 msgstr "килобајт,килобајта,kB,KB"
 
-#: ../lib/unit.vala:94
+#: lib/unit.vala:94
 msgid "Kibibits"
 msgstr "Кибибита"
 
-#: ../lib/unit.vala:94
+#: lib/unit.vala:94
 #, c-format
 msgctxt "unit-format"
 msgid "%s Kib"
 msgstr "%s Kib"
 
-#: ../lib/unit.vala:94
+#: lib/unit.vala:94
 msgctxt "unit-symbols"
 msgid "kibibit,kibibits,Kib"
 msgstr "кибибит,кибибита,Kib"
 
-#: ../lib/unit.vala:95
+#: lib/unit.vala:95
 msgid "Kibibytes"
 msgstr "Кибибајта"
 
-#: ../lib/unit.vala:95
+#: lib/unit.vala:95
 #, c-format
 msgctxt "unit-format"
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: ../lib/unit.vala:95
+#: lib/unit.vala:95
 msgctxt "unit-symbols"
 msgid "kibibyte,kibibytes,KiB"
 msgstr "кибибајт,кибибајта,KiB"
 
-#: ../lib/unit.vala:96
+#: lib/unit.vala:96
 msgid "Megabits"
 msgstr "Мегабита"
 
-#: ../lib/unit.vala:96
+#: lib/unit.vala:96
 #, c-format
 msgctxt "unit-format"
 msgid "%s Mb"
 msgstr "%s Mb"
 
-#: ../lib/unit.vala:96
+#: lib/unit.vala:96
 msgctxt "unit-symbols"
 msgid "megabit,megabits,Mb"
 msgstr "мегабит,мегабита,Mb"
 
-#: ../lib/unit.vala:97
+#: lib/unit.vala:97
 msgid "Megabytes"
 msgstr "Мегабајта"
 
-#: ../lib/unit.vala:97
+#: lib/unit.vala:97
 #, c-format
 msgctxt "unit-format"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: ../lib/unit.vala:97
+#: lib/unit.vala:97
 msgctxt "unit-symbols"
 msgid "megabyte,megabytes,MB"
 msgstr "мегабајт,мегабајта,MB"
 
-#: ../lib/unit.vala:98
+#: lib/unit.vala:98
 msgid "Mebibits"
 msgstr "Мебибита"
 
-#: ../lib/unit.vala:98
+#: lib/unit.vala:98
 #, c-format
 msgctxt "unit-format"
 msgid "%s Mib"
 msgstr "%s Mib"
 
-#: ../lib/unit.vala:98
+#: lib/unit.vala:98
 msgctxt "unit-symbols"
 msgid "mebibit,mebibits,Mib"
 msgstr "мебибит,мебибита,Mib"
 
-#: ../lib/unit.vala:99
+#: lib/unit.vala:99
 msgid "Mebibytes"
 msgstr "Мебибајта"
 
-#: ../lib/unit.vala:99
+#: lib/unit.vala:99
 #, c-format
 msgctxt "unit-format"
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: ../lib/unit.vala:99
+#: lib/unit.vala:99
 msgctxt "unit-symbols"
 msgid "mebibyte,mebibytes,MiB"
 msgstr "мебибајт,мебибајта,MiB"
 
-#: ../lib/unit.vala:100
+#: lib/unit.vala:100
 msgid "Gigabits"
 msgstr "Гигабита"
 
-#: ../lib/unit.vala:100
+#: lib/unit.vala:100
 #, c-format
 msgctxt "unit-format"
 msgid "%s Gb"
 msgstr "%s Gb"
 
-#: ../lib/unit.vala:100
+#: lib/unit.vala:100
 msgctxt "unit-symbols"
 msgid "gigabit,gigabits,Gb"
 msgstr "гигабит,гигабита,Gb"
 
-#: ../lib/unit.vala:101
+#: lib/unit.vala:101
 msgid "Gigabytes"
 msgstr "Гигабајта"
 
-#: ../lib/unit.vala:101
+#: lib/unit.vala:101
 #, c-format
 msgctxt "unit-format"
 msgid "%s GB"
 msgstr "%s GB"
 
-#: ../lib/unit.vala:101
+#: lib/unit.vala:101
 msgctxt "unit-symbols"
 msgid "gigabyte,gigabytes,GB"
 msgstr "гигабајт,гигабајта,GB"
 
-#: ../lib/unit.vala:102
+#: lib/unit.vala:102
 msgid "Gibibits"
 msgstr "Гибибита"
 
-#: ../lib/unit.vala:102
+#: lib/unit.vala:102
 #, c-format
 msgctxt "unit-format"
 msgid "%s Gib"
 msgstr "%s Gib"
 
-#: ../lib/unit.vala:102
+#: lib/unit.vala:102
 msgctxt "unit-symbols"
 msgid "gibibit,gibibits,Gib"
 msgstr "гибибит,гибибита,Gib"
 
-#: ../lib/unit.vala:103
+#: lib/unit.vala:103
 msgid "Gibibytes"
 msgstr "Гибибајта"
 
-#: ../lib/unit.vala:103
+#: lib/unit.vala:103
 #, c-format
 msgctxt "unit-format"
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: ../lib/unit.vala:103
+#: lib/unit.vala:103
 msgctxt "unit-symbols"
 msgid "gibibyte,gibibytes,GiB"
 msgstr "гибибајт,гибибајта,GiB"
 
-#: ../lib/unit.vala:104
+#: lib/unit.vala:104
 msgid "Terabits"
 msgstr "Терабита"
 
-#: ../lib/unit.vala:104
+#: lib/unit.vala:104
 #, c-format
 msgctxt "unit-format"
 msgid "%s Tb"
 msgstr "%s Tb"
 
-#: ../lib/unit.vala:104
+#: lib/unit.vala:104
 msgctxt "unit-symbols"
 msgid "terabit,terabits,Tb"
 msgstr "терабит,терабита,Tb"
 
-#: ../lib/unit.vala:105
+#: lib/unit.vala:105
 msgid "Terabytes"
 msgstr "Терабајта"
 
-#: ../lib/unit.vala:105
+#: lib/unit.vala:105
 #, c-format
 msgctxt "unit-format"
 msgid "%s TB"
 msgstr "%s TB"
 
-#: ../lib/unit.vala:105
+#: lib/unit.vala:105
 msgctxt "unit-symbols"
 msgid "terabyte,terabytes,TB"
 msgstr "терабајт,терабајта,TB"
 
-#: ../lib/unit.vala:106
+#: lib/unit.vala:106
 msgid "Tebibits"
 msgstr "Тебибита"
 
-#: ../lib/unit.vala:106
+#: lib/unit.vala:106
 #, c-format
 msgctxt "unit-format"
 msgid "%s Tib"
 msgstr "%s Tib"
 
-#: ../lib/unit.vala:106
+#: lib/unit.vala:106
 msgctxt "unit-symbols"
 msgid "tebibit,tebibits,Tib"
 msgstr "тебибит,тебибита,Tib"
 
-#: ../lib/unit.vala:107
+#: lib/unit.vala:107
 msgid "Tebibytes"
 msgstr "Тебибајта"
 
-#: ../lib/unit.vala:107
+#: lib/unit.vala:107
 #, c-format
 msgctxt "unit-format"
 msgid "%s TiB"
 msgstr "%s TiB"
 
-#: ../lib/unit.vala:107
+#: lib/unit.vala:107
 msgctxt "unit-symbols"
 msgid "tebibyte,tebibytes,TiB"
 msgstr "тебибајт,тебибајта,TiB"
 
-#: ../lib/unit.vala:108
+#: lib/unit.vala:108
 msgid "Petabits"
 msgstr "Петабита"
 
-#: ../lib/unit.vala:108
+#: lib/unit.vala:108
 #, c-format
 msgctxt "unit-format"
 msgid "%s Pb"
 msgstr "%s Pb"
 
-#: ../lib/unit.vala:108
+#: lib/unit.vala:108
 msgctxt "unit-symbols"
 msgid "petabit,petabits,Pb"
 msgstr "петабит,петабита,Pb"
 
-#: ../lib/unit.vala:109
+#: lib/unit.vala:109
 msgid "Petabytes"
 msgstr "Петабајта"
 
-#: ../lib/unit.vala:109
+#: lib/unit.vala:109
 #, c-format
 msgctxt "unit-format"
 msgid "%s PB"
 msgstr "%s PB"
 
-#: ../lib/unit.vala:109
+#: lib/unit.vala:109
 msgctxt "unit-symbols"
 msgid "petabyte,petabytes,PB"
 msgstr "петабајт,петабајта,PB"
 
-#: ../lib/unit.vala:110
+#: lib/unit.vala:110
 msgid "Pebibits"
 msgstr "Пебибита"
 
-#: ../lib/unit.vala:110
+#: lib/unit.vala:110
 #, c-format
 msgctxt "unit-format"
 msgid "%s Pib"
 msgstr "%s Pib"
 
-#: ../lib/unit.vala:110
+#: lib/unit.vala:110
 msgctxt "unit-symbols"
 msgid "pebibit,pebibits,Pib"
 msgstr "пебибит,пебибита,Pib"
 
-#: ../lib/unit.vala:111
+#: lib/unit.vala:111
 msgid "Pebibytes"
 msgstr "Пебибајта"
 
-#: ../lib/unit.vala:111
+#: lib/unit.vala:111
 #, c-format
 msgctxt "unit-format"
 msgid "%s PiB"
 msgstr "%s PiB"
 
-#: ../lib/unit.vala:111
+#: lib/unit.vala:111
 msgctxt "unit-symbols"
 msgid "pebibyte,pebibytes,PiB"
 msgstr "пебибајт,пебибајта,PiB"
 
-#: ../lib/unit.vala:112
+#: lib/unit.vala:112
 msgid "Exabits"
 msgstr "Ексабита"
 
-#: ../lib/unit.vala:112 ../lib/unit.vala:116
+#: lib/unit.vala:112 lib/unit.vala:116
 #, c-format
 msgctxt "unit-format"
 msgid "%s Eb"
 msgstr "%s Eb"
 
-#: ../lib/unit.vala:112
+#: lib/unit.vala:112
 msgctxt "unit-symbols"
 msgid "exabit,exabits,Eb"
 msgstr "ексабит,ексабита,Eb"
 
-#: ../lib/unit.vala:113
+#: lib/unit.vala:113
 msgid "Exabytes"
 msgstr "Ексабајта"
 
-#: ../lib/unit.vala:113 ../lib/unit.vala:117
+#: lib/unit.vala:113 lib/unit.vala:117
 #, c-format
 msgctxt "unit-format"
 msgid "%s EB"
 msgstr "%s EB"
 
-#: ../lib/unit.vala:113
+#: lib/unit.vala:113
 msgctxt "unit-symbols"
 msgid "exabyte,exabytes,EB"
 msgstr "ексабајт,ексабајта,EB"
 
-#: ../lib/unit.vala:114
+#: lib/unit.vala:114
 msgid "Exbibits"
 msgstr "Ексибибита"
 
-#: ../lib/unit.vala:114
+#: lib/unit.vala:114
 #, c-format
 msgctxt "unit-format"
 msgid "%s Eib"
 msgstr "%s Eib"
 
-#: ../lib/unit.vala:114
+#: lib/unit.vala:114
 msgctxt "unit-symbols"
 msgid "exbibit,exbibits,Eib"
 msgstr "ексбибит,ексбибита,Eib"
 
-#: ../lib/unit.vala:115
+#: lib/unit.vala:115
 msgid "Exbibytes"
 msgstr "Ексибибајта"
 
-#: ../lib/unit.vala:115
+#: lib/unit.vala:115
 #, c-format
 msgctxt "unit-format"
 msgid "%s EiB"
 msgstr "%s EiB"
 
-#: ../lib/unit.vala:115
+#: lib/unit.vala:115
 msgctxt "unit-symbols"
 msgid "exbibyte,exbibytes,EiB"
 msgstr "ексбибајт,ексбибајта,EiB"
 
-#: ../lib/unit.vala:116
+#: lib/unit.vala:116
 msgid "Zettabits"
 msgstr "Зетабита"
 
-#: ../lib/unit.vala:116
+#: lib/unit.vala:116
 msgctxt "unit-symbols"
 msgid "zettabit,zettabits,Zb"
 msgstr "зетабит,зетабита,Zb"
 
-#: ../lib/unit.vala:117
+#: lib/unit.vala:117
 msgid "Zettabytes"
 msgstr "Зетабајта"
 
-#: ../lib/unit.vala:117
+#: lib/unit.vala:117
 msgctxt "unit-symbols"
 msgid "zettabyte,zettabytes,ZB"
 msgstr "зетабајт,зетабајта,ZB"
 
-#: ../lib/unit.vala:118
+#: lib/unit.vala:118
 msgid "Zebibits"
 msgstr "Зебибита"
 
-#: ../lib/unit.vala:118
+#: lib/unit.vala:118
 #, c-format
 msgctxt "unit-format"
 msgid "%s Zib"
 msgstr "%s Zib"
 
-#: ../lib/unit.vala:118
+#: lib/unit.vala:118
 msgctxt "unit-symbols"
 msgid "zebibit,zebibits,Zib"
 msgstr "зебибит,зебибита,Zib"
 
-#: ../lib/unit.vala:119
+#: lib/unit.vala:119
 msgid "Zebibytes"
 msgstr "Зебибајта"
 
-#: ../lib/unit.vala:119
+#: lib/unit.vala:119
 #, c-format
 msgctxt "unit-format"
 msgid "%s ZiB"
 msgstr "%s ZiB"
 
-#: ../lib/unit.vala:119
+#: lib/unit.vala:119
 msgctxt "unit-symbols"
 msgid "zebibyte,zebibytes,ZiB"
 msgstr "зебибајт,зебибајта,ZiB"
 
-#: ../lib/unit.vala:120
+#: lib/unit.vala:120
 msgid "Yottabits"
 msgstr "Јотабита"
 
-#: ../lib/unit.vala:120
+#: lib/unit.vala:120
 #, c-format
 msgctxt "unit-format"
 msgid "%s Yb"
 msgstr "%s Yb"
 
-#: ../lib/unit.vala:120
+#: lib/unit.vala:120
 msgctxt "unit-symbols"
 msgid "yottabit,yottabits,Yb"
 msgstr "јотабит,јотабита,Yb"
 
-#: ../lib/unit.vala:121
+#: lib/unit.vala:121
 msgid "Yottabytes"
 msgstr "Јотабајта"
 
-#: ../lib/unit.vala:121
+#: lib/unit.vala:121
 #, c-format
 msgctxt "unit-format"
 msgid "%s YB"
 msgstr "%s YB"
 
-#: ../lib/unit.vala:121
+#: lib/unit.vala:121
 msgctxt "unit-symbols"
 msgid "yottabyte,yottabytes,YB"
 msgstr "јотабајт,јотабајта,YB"
 
-#: ../lib/unit.vala:122
+#: lib/unit.vala:122
 msgid "Yobibits"
 msgstr "Јобибита"
 
-#: ../lib/unit.vala:122
+#: lib/unit.vala:122
 #, c-format
 msgctxt "unit-format"
 msgid "%s Yib"
 msgstr "%s Yib"
 
-#: ../lib/unit.vala:122
+#: lib/unit.vala:122
 msgctxt "unit-symbols"
 msgid "yobibit,yobibits,Yib"
 msgstr "јобибит,јобибита,Yib"
 
-#: ../lib/unit.vala:123
+#: lib/unit.vala:123
 msgid "Yobibytes"
 msgstr "Јобибајта"
 
-#: ../lib/unit.vala:123
+#: lib/unit.vala:123
 #, c-format
 msgctxt "unit-format"
 msgid "%s YiB"
 msgstr "%s YiB"
 
-#: ../lib/unit.vala:123
+#: lib/unit.vala:123
 msgctxt "unit-symbols"
 msgid "yobibyte,yobibytes,YiB"
 msgstr "јобибајт,јобибајта,YiB"
 
-#: ../lib/unit.vala:125
+#: lib/unit.vala:125
 msgid "Currency"
 msgstr "Валута"
 
 #. Translators: result of currency conversion, %s is the symbol, %%s is the placeholder for amount, i.e.: 
USD100
-#: ../lib/unit.vala:131
+#: lib/unit.vala:131
 #, c-format
 msgid "%s%%s"
 msgstr "%%s%s"
 
-#: ../src/gnome-calculator.vala:24
-#| msgid "Start with given equation"
+#: src/gnome-calculator.vala:24
 msgid "Start in given mode"
 msgstr "Почиње у датом режиму"
 
-#: ../src/gnome-calculator.vala:25
+#: src/gnome-calculator.vala:25
 msgid "Solve given equation"
 msgstr "Решава дату једначину"
 
-#: ../src/gnome-calculator.vala:26
+#: src/gnome-calculator.vala:26
 msgid "Start with given equation"
 msgstr "Почиње са датом једначином"
 
-#: ../src/gnome-calculator.vala:27
+#: src/gnome-calculator.vala:27
 msgid "Show release version"
 msgstr "Приказује издање програма"
 
 #. Translators: Error message displayed when unable to launch help browser
-#: ../src/gnome-calculator.vala:296
+#: src/gnome-calculator.vala:296
 msgid "Unable to open help file"
 msgstr "Не могу да отворим датотеку помоћи"
 
 #. The translator credits. Please translate this with your name (s).
-#: ../src/gnome-calculator.vala:327
+#: src/gnome-calculator.vala:327
 msgid "translator-credits"
 msgstr ""
 "Данило Шеган <danilo prevod org>\n"
@@ -2769,16 +2786,16 @@ msgstr ""
 "\n"
 "http://prevod.org — превод на српски језик"
 
-#: ../src/gnome-calculator.vala:333
+#: src/gnome-calculator.vala:333
 msgid "About Calculator"
 msgstr "О Калкулатору"
 
 #. Short description in the about dialog
-#: ../src/gnome-calculator.vala:341
+#: src/gnome-calculator.vala:341
 msgid "Calculator with financial and scientific modes."
 msgstr "Калкулатор са финансијским и научним начином рада."
 
-#: ../src/math-buttons.vala:464
+#: src/math-buttons.vala:464
 #, c-format
 msgid "%d place"
 msgid_plural "%d places"
@@ -2788,79 +2805,76 @@ msgstr[2] "%d места"
 msgstr[3] "%d место"
 
 #. Preferences dialog: Label for number format combo box
-#: ../src/math-preferences.vala:43
+#: src/math-preferences.vala:43
 msgid "Number _Format:"
 msgstr "_Облик броја:"
 
 #. Number display mode combo: Automatic, e.g. 1234 (or scientific for large number 1.234×10^99)
-#: ../src/math-preferences.vala:60
+#: src/math-preferences.vala:60
 msgid "Automatic"
 msgstr "Аутоматски"
 
 #. Number display mode combo: Fixed, e.g. 1234
-#: ../src/math-preferences.vala:64
+#: src/math-preferences.vala:64
 msgid "Fixed"
 msgstr "Фиксни"
 
 #. Number display mode combo: Scientific, e.g. 1.234×10^3
-#: ../src/math-preferences.vala:68
+#: src/math-preferences.vala:68
 msgid "Scientific"
 msgstr "Научни"
 
 #. Number display mode combo: Engineering, e.g. 1.234k
-#: ../src/math-preferences.vala:72
+#: src/math-preferences.vala:72
 msgid "Engineering"
 msgstr "Инжењерски"
 
 #. Preferences dialog: label for show trailing zeroes check button
-#: ../src/math-preferences.vala:89
-#| msgid "_Number of Periods:"
+#: src/math-preferences.vala:89
 msgid "Number of _decimals"
 msgstr "Број _децимала"
 
 #. Preferences dialog: label for show trailing zeroes switch
-#: ../src/math-preferences.vala:101
-#| msgid "Show trailing _zeroes"
+#: src/math-preferences.vala:101
 msgid "Trailing _zeroes"
 msgstr "Пратеће _нуле"
 
 #. Preferences dialog: label for show show thousands separator switch
-#: ../src/math-preferences.vala:114
-#| msgid "Show _thousands separators"
+#: src/math-preferences.vala:114
 msgid "_Thousands separators"
 msgstr "_Раздвајач хиљада"
 
 #. Preferences dialog: Label for angle unit combo box
-#: ../src/math-preferences.vala:128
+#: src/math-preferences.vala:128
 msgid "_Angle units:"
 msgstr "Јединице _углова:"
 
 #. Preferences dialog: Label for word size combo box
-#: ../src/math-preferences.vala:158
+#: src/math-preferences.vala:158
 msgid "Word _size:"
 msgstr "Дужина _речи:"
 
 #. Word size combo: 8 bits
-#: ../src/math-preferences.vala:172
+#: src/math-preferences.vala:172
 msgid "8 bits"
 msgstr "8 бита"
 
 #. Word size combo: 16 bits
-#: ../src/math-preferences.vala:174
+#: src/math-preferences.vala:174
 msgid "16 bits"
 msgstr "16 бита"
 
 #. Word size combo: 32 bits
-#: ../src/math-preferences.vala:176
+#: src/math-preferences.vala:176
 msgid "32 bits"
 msgstr "32 бита"
 
 #. Word size combo: 64 bits
-#: ../src/math-preferences.vala:178
+#: src/math-preferences.vala:178
 msgid "64 bits"
 msgstr "4 бита"
 
-#: ../src/math-window.vala:130
+#: src/math-window.vala:130
 msgid "_Quit"
 msgstr "_Изађи"
 
diff --git a/po/sr latin po b/po/sr latin po
index 9faf8a4..d1c6e71 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -9,12 +9,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-calculator\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "calculator&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-16 13:16+0000\n"
-"PO-Revision-Date: 2017-02-25 09:22+0200\n"
+"POT-Creation-Date: 2017-06-28 17:41+0000\n"
+"PO-Revision-Date: 2017-08-14 20:37+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic rocketmail com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"Language-Team: srpski <gnome-sr googlegroups org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,259 +23,283 @@ msgstr ""
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/buttons-advanced.ui.h:1 ../data/buttons-programming.ui.h:53
+#: src/buttons-advanced.ui:17 src/buttons-programming.ui:2148
 msgid "Inverse [Ctrl+I]"
 msgstr "Recipročnost [Ktrl+I]"
 
 #. Accessible name for the inverse button
-#: ../data/buttons-advanced.ui.h:3 ../data/buttons-programming.ui.h:55
+#: src/buttons-advanced.ui:22 src/buttons-programming.ui:2153
 msgid "Inverse"
 msgstr "Inverzija"
 
-#: ../data/buttons-advanced.ui.h:4 ../data/buttons-programming.ui.h:7
+#: src/buttons-advanced.ui:47 src/buttons-programming.ui:1277
 msgid "Factorize [Ctrl+F]"
 msgstr "Faktorišite [Ktrl+F]"
 
 #. Accessible name for the factorize button
-#: ../data/buttons-advanced.ui.h:6 ../data/buttons-programming.ui.h:9
+#: src/buttons-advanced.ui:51 src/buttons-programming.ui:1281
 msgid "Factorize"
 msgstr "Faktorizacija"
 
-#: ../data/buttons-advanced.ui.h:7 ../data/buttons-programming.ui.h:50
+#: src/buttons-advanced.ui:66 src/buttons-programming.ui:2121
 msgid "Factorial [!]"
 msgstr "Faktorijel [!]"
 
 #. Accessible name for the factorial button
-#: ../data/buttons-advanced.ui.h:9 ../data/buttons-programming.ui.h:52
+#: src/buttons-advanced.ui:71 src/buttons-programming.ui:2126
 msgid "Factorial"
 msgstr "Faktorijel"
 
-#: ../data/buttons-advanced.ui.h:10
+#: src/buttons-advanced.ui:95
 msgid "Imaginary Component"
 msgstr "Imaginarni deo"
 
-#: ../data/buttons-advanced.ui.h:11 ../data/buttons-basic.ui.h:1
-#: ../data/buttons-financial.ui.h:77 ../data/buttons-programming.ui.h:16
+#: src/buttons-advanced.ui:247 src/buttons-basic.ui:130
+#: src/buttons-financial.ui:2037 src/buttons-programming.ui:1377
 msgid "Divide [/]"
 msgstr "Podelite [/]"
 
-#: ../data/buttons-advanced.ui.h:12 ../data/buttons-basic.ui.h:4
-#: ../data/buttons-financial.ui.h:80 ../data/buttons-programming.ui.h:17
+#: src/buttons-advanced.ui:359 src/buttons-basic.ui:258
+#: src/buttons-financial.ui:2165 src/buttons-programming.ui:1414
 msgid "Multiply [*]"
 msgstr "Pomnožite [*]"
 
-#: ../data/buttons-advanced.ui.h:13 ../data/buttons-basic.ui.h:5
-#: ../data/buttons-financial.ui.h:81 ../data/buttons-programming.ui.h:18
+#: src/buttons-advanced.ui:376 src/buttons-basic.ui:275
+#: src/buttons-financial.ui:2182 src/buttons-programming.ui:1431
 msgid "Subtract [-]"
 msgstr "Oduzmite [-]"
 
-#: ../data/buttons-advanced.ui.h:14 ../data/buttons-basic.ui.h:6
-#: ../data/buttons-financial.ui.h:82 ../data/buttons-programming.ui.h:19
+#: src/buttons-advanced.ui:392 src/buttons-basic.ui:291
+#: src/buttons-financial.ui:2198 src/buttons-programming.ui:1447
 msgid "Add [+]"
 msgstr "Saberite [+]"
 
 #. Label on the solve button (clicking this solves the displayed calculation)
-#: ../data/buttons-advanced.ui.h:16 ../data/buttons-basic.ui.h:8
-#: ../data/buttons-financial.ui.h:84 ../data/buttons-programming.ui.h:21
+#: src/buttons-advanced.ui:403 src/buttons-basic.ui:302
+#: src/buttons-financial.ui:2209 src/buttons-programming.ui:1458
 msgid "="
 msgstr "="
 
-#: ../data/buttons-advanced.ui.h:17 ../data/buttons-basic.ui.h:9
-#: ../data/buttons-financial.ui.h:85 ../data/buttons-programming.ui.h:22
+#: src/buttons-advanced.ui:409 src/buttons-basic.ui:308
+#: src/buttons-financial.ui:2215 src/buttons-programming.ui:1464
 msgid "Calculate Result"
 msgstr "Izračunajte rezultat"
 
-#: ../data/buttons-advanced.ui.h:18 ../data/buttons-basic.ui.h:12
-#: ../data/buttons-financial.ui.h:88 ../data/buttons-programming.ui.h:23
+#: src/buttons-advanced.ui:427 src/buttons-basic.ui:361
+#: src/buttons-financial.ui:2268 src/buttons-programming.ui:1482
 msgid "Clear Display [Escape]"
 msgstr "Očistite ekran [Escape]"
 
-#: ../data/buttons-advanced.ui.h:19 ../data/buttons-programming.ui.h:24
+#: src/buttons-advanced.ui:446 src/buttons-programming.ui:1787
 msgid "Subscript mode [Alt]"
 msgstr "Režim indeksa [Alt]"
 
 #. Accessible name for the subscript mode button
-#: ../data/buttons-advanced.ui.h:21 ../data/buttons-programming.ui.h:26
+#: src/buttons-advanced.ui:451 src/buttons-programming.ui:1792
 msgid "Subscript"
 msgstr "Indeks"
 
-#: ../data/buttons-advanced.ui.h:22 ../data/buttons-programming.ui.h:27
+#: src/buttons-advanced.ui:473 src/buttons-programming.ui:1814
 msgid "Superscript mode [Ctrl]"
 msgstr "Režim izložioca [Ktrl]"
 
 #. Accessible name for the superscript mode button
-#: ../data/buttons-advanced.ui.h:24 ../data/buttons-programming.ui.h:29
+#: src/buttons-advanced.ui:478 src/buttons-programming.ui:1819
 msgid "Superscript"
 msgstr "Izložilac"
 
-#: ../data/buttons-advanced.ui.h:25
+#: src/buttons-advanced.ui:500
 msgid "Scientific exponent [Ctrl+E]"
 msgstr "Naučni stepen [Ktrl+E]"
 
 #. Accessible name for the scientific exponent button
-#: ../data/buttons-advanced.ui.h:27
+#: src/buttons-advanced.ui:504
 msgid "Scientific Exponent"
 msgstr "Naučni stepen"
 
-#: ../data/buttons-advanced.ui.h:28 ../data/buttons-programming.ui.h:38
+#: src/buttons-advanced.ui:527 src/buttons-programming.ui:1952
 msgid "Modulus divide"
 msgstr "Deljenje po modulu"
 
-#: ../data/buttons-advanced.ui.h:29 ../data/buttons-basic.ui.h:10
-#: ../data/buttons-financial.ui.h:86 ../data/buttons-programming.ui.h:39
+#: src/buttons-advanced.ui:543 src/buttons-basic.ui:328
+#: src/buttons-financial.ui:2235 src/buttons-programming.ui:1969
 msgid "Start Group [(]"
 msgstr "Otvorite zagradu [(]"
 
-#: ../data/buttons-advanced.ui.h:30 ../data/buttons-basic.ui.h:11
-#: ../data/buttons-financial.ui.h:87 ../data/buttons-programming.ui.h:40
+#: src/buttons-advanced.ui:560 src/buttons-basic.ui:345
+#: src/buttons-financial.ui:2252 src/buttons-programming.ui:1985
 msgid "End Group [)]"
 msgstr "Zatvorite zagradu [)]"
 
 #. Accessible name for the memory button
 #. Accessible name for the memory value button
-#: ../data/buttons-advanced.ui.h:32 ../data/buttons-financial.ui.h:73
-#: ../data/buttons-programming.ui.h:30
+#: src/buttons-advanced.ui:575 src/buttons-advanced.ui:578
+#: src/buttons-financial.ui:1854 src/buttons-financial.ui:1857
+#: src/buttons-programming.ui:1857
 msgid "Memory"
 msgstr "Memorija"
 
 #. The label on the memory button
-#: ../data/buttons-advanced.ui.h:34 ../data/buttons-financial.ui.h:75
-#: ../data/buttons-programming.ui.h:34
+#: src/buttons-advanced.ui:587 src/buttons-financial.ui:1869
+#: src/buttons-programming.ui:1870
 msgid "x"
 msgstr "x"
 
-#: ../data/buttons-advanced.ui.h:35 ../data/buttons-programming.ui.h:11
-#| msgid "Absolute value [|]"
+#: src/buttons-advanced.ui:622 src/buttons-programming.ui:1314
 msgid "Absolute Value [|]"
 msgstr "Apsolutna vrednost [|]"
 
 #. Accessible name for the absolute value button
-#: ../data/buttons-advanced.ui.h:37 ../data/buttons-programming.ui.h:13
+#: src/buttons-advanced.ui:627 src/buttons-programming.ui:1319
 msgid "Absolute Value"
 msgstr "Apsolutna vrednost"
 
-#: ../data/buttons-advanced.ui.h:38
+#: src/buttons-advanced.ui:651
 msgid "Real Component"
 msgstr "Realni deo"
 
-#: ../data/buttons-advanced.ui.h:39
+#: src/buttons-advanced.ui:668
 msgid "Complex conjugate"
 msgstr "Konjugovano kompleksna vrednost"
 
-#: ../data/buttons-advanced.ui.h:40
+#: src/buttons-advanced.ui:685
 msgid "Complex argument"
 msgstr "Kompleksni argument"
 
-#: ../data/buttons-advanced.ui.h:41 ../data/buttons-programming.ui.h:10
+#: src/buttons-advanced.ui:702 src/buttons-programming.ui:1298
 msgid "Natural Logarithm"
 msgstr "Prirodni logaritam"
 
-#: ../data/buttons-advanced.ui.h:42 ../data/buttons-financial.ui.h:76
-#: ../data/buttons-programming.ui.h:6
+#: src/buttons-advanced.ui:718 src/buttons-financial.ui:1908
+#: src/buttons-programming.ui:1260
 msgid "Logarithm"
 msgstr "Logaritam"
 
-#: ../data/buttons-advanced.ui.h:43 ../data/buttons-financial.ui.h:114
-#: ../data/buttons-programming.ui.h:56
+#: src/buttons-advanced.ui:733 src/buttons-financial.ui:2476
+#: src/buttons-programming.ui:2176
 msgid "Exponent [^ or **]"
 msgstr "Eksponent [^ ili **]"
 
 #. Accessible name for the exponentiation (x to the power of y) button
-#: ../data/buttons-advanced.ui.h:45 ../data/buttons-basic.ui.h:16
-#: ../data/buttons-financial.ui.h:116 ../data/buttons-programming.ui.h:58
+#: src/buttons-advanced.ui:738 src/buttons-basic.ui:401
+#: src/buttons-financial.ui:2481 src/buttons-programming.ui:2181
 msgid "Exponent"
 msgstr "Stepen"
 
-#: ../data/buttons-advanced.ui.h:46 ../data/buttons-financial.ui.h:117
-#: ../data/buttons-programming.ui.h:5
+#: src/buttons-advanced.ui:762 src/buttons-financial.ui:2505
+#: src/buttons-programming.ui:1244
 msgid "Root [Ctrl+R]"
 msgstr "Koren [Ktrl+R]"
 
-#: ../data/buttons-advanced.ui.h:47 ../data/buttons-basic.ui.h:17
-#: ../data/buttons-financial.ui.h:113
+#: src/buttons-advanced.ui:778 src/buttons-basic.ui:424
+#: src/buttons-financial.ui:2456
 msgid "Undo [Ctrl+Z]"
 msgstr "Opozovite prethodnu radnju [Ktrl+Z]"
 
-#: ../data/buttons-advanced.ui.h:48
+#: src/buttons-advanced.ui:798
 msgid "Pi [Ctrl+P]"
 msgstr "Pi [Ktrl+P]"
 
-#: ../data/buttons-advanced.ui.h:49
+#: src/buttons-advanced.ui:821
 msgid "Euler’s Number"
 msgstr "Ojlerov broj"
 
-#: ../data/buttons-advanced.ui.h:50
+#: src/buttons-advanced.ui:851
 msgid "Cosine"
 msgstr "Kosinus"
 
-#: ../data/buttons-advanced.ui.h:51
+#: src/buttons-advanced.ui:866
 msgid "Sine"
 msgstr "Sinus"
 
-#: ../data/buttons-advanced.ui.h:52
+#: src/buttons-advanced.ui:881
 msgid "Tangent"
 msgstr "Tangens"
 
-#: ../data/buttons-advanced.ui.h:53
+#: src/buttons-advanced.ui:896
 msgid "Hyperbolic Sine"
 msgstr "Hiperbolični sinus"
 
-#: ../data/buttons-advanced.ui.h:54
+#: src/buttons-advanced.ui:912
 msgid "Hyperbolic Cosine"
 msgstr "Hiperbolični kosinus"
 
-#: ../data/buttons-advanced.ui.h:55
+#: src/buttons-advanced.ui:928
 msgid "Hyperbolic Tangent"
 msgstr "Hiperbolični tangens"
 
-#: ../data/buttons-advanced.ui.h:56
+#: src/buttons-advanced.ui:951
 msgid "Additional Functions"
 msgstr "Dodatne funkcije"
 
 #. Accessible name for the store value button
-#: ../data/buttons-advanced.ui.h:58 ../data/buttons-programming.ui.h:32
+#: src/buttons-advanced.ui:954 src/buttons-programming.ui:1860
 msgid "Store"
 msgstr "Sačuvaj"
 
-#: ../data/buttons-basic.ui.h:3 ../data/buttons-financial.ui.h:79
-#, no-c-format
+#: src/buttons-basic.ui:222 src/buttons-financial.ui:2129
 msgid "Percentage [%]"
 msgstr "Procenat [%]"
 
-#: ../data/buttons-basic.ui.h:13
+#: src/buttons-basic.ui:382
 msgid "Square root [Ctrl+R]"
 msgstr "Kvadratni koren [Ktrl+R]"
 
-#: ../data/buttons-basic.ui.h:14
+#: src/buttons-basic.ui:397
 msgid "Square [Ctrl+2]"
 msgstr "Kvadrat [Ktrl+2]"
 
 #. Title of Compounding Term dialog
-#: ../data/buttons-financial.ui.h:2
+#: src/buttons-financial.ui:8 src/buttons-financial.ui:2290
 msgid "Compounding Term"
 msgstr "Činilac sastava"
 
-#: ../data/buttons-financial.ui.h:3 ../data/buttons-programming.ui.h:63
+#: src/buttons-financial.ui:22 src/buttons-financial.ui:205
+#: src/buttons-financial.ui:388 src/buttons-financial.ui:571
+#: src/buttons-financial.ui:723 src/buttons-financial.ui:907
+#: src/buttons-financial.ui:1091 src/buttons-financial.ui:1275
+#: src/buttons-financial.ui:1459 src/buttons-financial.ui:1674
+#: src/buttons-programming.ui:2306
 msgid "_Cancel"
 msgstr "_Otkaži"
 
+#. Compounding Term Dialog: Calculate button
+#. Double-Declining Depreciation Dialog: Calculate button
+#. Future Value Dialog: Calculate button
+#. Gross Profit Margin Dialog: Calculate button
+#. Periodic Payment Dialog: Calculate button
+#. Present Value Dialog: Calculate button
+#. Periodic Interest Rate Dialog: Calculate button
+#. Straight-Line Depreciation Dialog: Calculate button
+#. Sum-of-the-Years’-Digits Depreciation Dialog: Calculate result button
 #. Payment Period Dialog: Button to calculate result
-#: ../data/buttons-financial.ui.h:5
+#: src/buttons-financial.ui:37 src/buttons-financial.ui:220
+#: src/buttons-financial.ui:403 src/buttons-financial.ui:586
+#: src/buttons-financial.ui:738 src/buttons-financial.ui:922
+#: src/buttons-financial.ui:1106 src/buttons-financial.ui:1290
+#: src/buttons-financial.ui:1474 src/buttons-financial.ui:1689
 msgid "C_alculate"
 msgstr "_Izračunaj"
 
+#. Compounding Term Dialog: Label before present value input
 #. Periodic Interest Rate Dialog: Label before present value input
-#: ../data/buttons-financial.ui.h:7
+#: src/buttons-financial.ui:117 src/buttons-financial.ui:1172
 msgid "Present _Value:"
 msgstr "Trenutna _vrednost:"
 
+#. Compounding Term Dialog: Label before periodic interest rate input
+#. Future Value Dialog: Label before periodic interest rate input
+#. Periodic Payment Dialog: Label before periodic interest rate input
+#. Present Value Dialog: Label before periodic interest rate input
 #. Payment Period Dialog: Label before periodic interest rate input
-#: ../data/buttons-financial.ui.h:9
+#: src/buttons-financial.ui:133 src/buttons-financial.ui:468
+#: src/buttons-financial.ui:804 src/buttons-financial.ui:988
+#: src/buttons-financial.ui:1769
 msgid "Periodic Interest _Rate:"
 msgstr "Periodična _kamatna stopa:"
 
 #. Compounding Term Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:11
+#: src/buttons-financial.ui:149
 msgid ""
 "Calculates the number of compounding periods necessary to increase an "
 "investment of present value to a future value, at a fixed interest rate per "
@@ -284,18 +308,19 @@ 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."
 
+#. Compounding Term Dialog: Label before future value input
 #. Periodic Interest Rate Dialog: Label before future value input
-#: ../data/buttons-financial.ui.h:13
+#: src/buttons-financial.ui:163 src/buttons-financial.ui:1156
 msgid "_Future Value:"
 msgstr "_Buduća vrednost:"
 
 #. Title of Double-Declining Depreciation dialog
-#: ../data/buttons-financial.ui.h:15
+#: src/buttons-financial.ui:191
 msgid "Double-Declining Depreciation"
 msgstr "Dvostruko-opadajuće umanjenje"
 
 #. Double-Declining Depreciation Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:17
+#: src/buttons-financial.ui:255
 msgid ""
 "Calculates the depreciation allowance on an asset for a specified period of "
 "time, using the double-declining balance method."
@@ -303,28 +328,33 @@ msgstr ""
 "Izračunajte amortizaciju proizvoda za određeni vremenski period koristeći "
 "metod dvostruko-opadajućeg umanjenja."
 
+#. Double-Declining Depreciation Dialog: Label before cost input
 #. Gross Profit Margin Dialog: Label before cost input
-#: ../data/buttons-financial.ui.h:19
+#: src/buttons-financial.ui:269 src/buttons-financial.ui:635
 msgid "C_ost:"
 msgstr "_Cena:"
 
+#. Double-Declining Depreciation Dialog: Label before life input
+#. Straight-Line Depreciation Dialog: Label before life input
 #. Sum-of-the-Years’-Digits Depreciation Dialog: Label before life input
-#: ../data/buttons-financial.ui.h:21
+#: src/buttons-financial.ui:285 src/buttons-financial.ui:1357
+#: src/buttons-financial.ui:1525
 msgid "_Life:"
 msgstr "_Trajanje:"
 
+#. Double-Declining Depreciation Dialog: Label before period input
 #. Sum-of-the-Years’-Digits Depreciation Dialog: Label before period input
-#: ../data/buttons-financial.ui.h:23
+#: src/buttons-financial.ui:331 src/buttons-financial.ui:1509
 msgid "_Period:"
 msgstr "_Period:"
 
 #. Title of Future Value dialog
-#: ../data/buttons-financial.ui.h:25
+#: src/buttons-financial.ui:374 src/buttons-financial.ui:2322
 msgid "Future Value"
 msgstr "Buduća vrednost"
 
 #. Future Value Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:27
+#: src/buttons-financial.ui:438
 msgid ""
 "Calculates the future value of an investment based on a series of equal "
 "payments at a periodic interest rate over the number of payment periods in "
@@ -333,23 +363,27 @@ msgstr ""
 "Izračunajte buduću vrednost investicije na osnovu niza jednakih plaćanja uz "
 "periodičnu kamatnu stopu nad određenim brojem perioda plaćanja."
 
+#. Future Value Dialog: Label before periodic payment input
+#. Present Value Dialog: Label before periodic payment input
 #. Payment Period Dialog: Label before periodic payment input
-#: ../data/buttons-financial.ui.h:29
+#: src/buttons-financial.ui:452 src/buttons-financial.ui:972
+#: src/buttons-financial.ui:1801
 msgid "_Periodic Payment:"
 msgstr "_Periodično plaćanje:"
 
+#. Future Value Dialog: Label before number of periods input
 #. Present Value Dialog: Label before number of periods input
-#: ../data/buttons-financial.ui.h:31
+#: src/buttons-financial.ui:484 src/buttons-financial.ui:1004
 msgid "_Number of Periods:"
 msgstr "_Broj perioda:"
 
 #. Title of Gross Profit Margin dialog
-#: ../data/buttons-financial.ui.h:33
+#: src/buttons-financial.ui:557 src/buttons-financial.ui:2440
 msgid "Gross Profit Margin"
 msgstr "Bruto marža"
 
 #. Gross Profit Margin Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:35
+#: src/buttons-financial.ui:621
 msgid ""
 "Calculates the resale price of a product, based on the product cost and the "
 "wanted gross profit margin."
@@ -358,17 +392,17 @@ msgstr ""
 "bruto marže."
 
 #. Gross Profit Margin Dialog: Label before margin input
-#: ../data/buttons-financial.ui.h:37
+#: src/buttons-financial.ui:651
 msgid "_Margin:"
 msgstr "_Marža:"
 
 #. Title of Periodic Payment dialog
-#: ../data/buttons-financial.ui.h:39
+#: src/buttons-financial.ui:709 src/buttons-financial.ui:2423
 msgid "Periodic Payment"
 msgstr "Periodično plaćanje"
 
 #. Periodic Payment Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:41
+#: src/buttons-financial.ui:774
 msgid ""
 "Calculates the amount of the periodic payment of a loan, where payments are "
 "made at the end of each payment period. "
@@ -377,22 +411,23 @@ msgstr ""
 "kraju perioda plaćanja. "
 
 #. Periodic Payment Dialog: Label before principal input
-#: ../data/buttons-financial.ui.h:43
+#: src/buttons-financial.ui:788
 msgid "_Principal:"
 msgstr "_Osnova:"
 
+#. Periodic Payment Dialog: Label before term input
 #. Periodic Interest Rate Dialog: Label before term input
-#: ../data/buttons-financial.ui.h:45
+#: src/buttons-financial.ui:820 src/buttons-financial.ui:1188
 msgid "_Term:"
 msgstr "_Rok:"
 
 #. Title of Present Value dialog
-#: ../data/buttons-financial.ui.h:47
+#: src/buttons-financial.ui:893 src/buttons-financial.ui:2406
 msgid "Present Value"
 msgstr "Trenutna vrednost"
 
 #. Present Value Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:49
+#: src/buttons-financial.ui:958
 msgid ""
 "Calculates the present value of an investment based on a series of equal "
 "payments discounted at a periodic interest rate over the number of payment "
@@ -402,12 +437,12 @@ msgstr ""
 "po periodičnoj kamatnoj stopi nad datim brojem perioda plaćanja. "
 
 #. Title of Periodic Interest Rate dialog
-#: ../data/buttons-financial.ui.h:51
+#: src/buttons-financial.ui:1077 src/buttons-financial.ui:2389
 msgid "Periodic Interest Rate"
 msgstr "Periodična kamatna stopa"
 
 #. Periodic Interest Rate Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:53
+#: src/buttons-financial.ui:1142
 msgid ""
 "Calculates the periodic interest necessary to increase an investment to a "
 "future value, over the number of compounding periods. "
@@ -416,22 +451,24 @@ msgstr ""
 "investicije na buduću vrednost nad brojem perioda činioca. "
 
 #. Title of Straight-Line Depreciation dialog
-#: ../data/buttons-financial.ui.h:55
+#: src/buttons-financial.ui:1261
 msgid "Straight-Line Depreciation"
 msgstr "Pravolinijsko umanjenje"
 
+#. Straight-Line Depreciation Dialog: Label before cost input
 #. Sum-of-the-Years’-Digits Depreciation Dialog: Label before cost input
-#: ../data/buttons-financial.ui.h:57
+#: src/buttons-financial.ui:1325 src/buttons-financial.ui:1557
 msgid "_Cost:"
 msgstr "_Iznos:"
 
+#. Straight-Line Depreciation Dialog: Label before salvage input
 #. Sum-of-the-Years’-Digits Depreciation Dialog: Label before salvage input
-#: ../data/buttons-financial.ui.h:59
+#: src/buttons-financial.ui:1341 src/buttons-financial.ui:1541
 msgid "_Salvage:"
 msgstr "_Krajnji iznos:"
 
 #. Straight-Line Depreciation Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:61
+#: src/buttons-financial.ui:1419
 msgid ""
 "Calculates the straight-line depreciation of an asset for one period. The "
 "straight-line method of depreciation divides the depreciable cost evenly "
@@ -444,20 +481,12 @@ msgstr ""
 "posle koga je proizvod amortizovan. "
 
 #. Title of Sum-of-the-Years’-Digits Depreciation dialog
-#: ../data/buttons-financial.ui.h:63
-#| msgid "Sum-of-the-Years'-Digits Depreciation"
+#: src/buttons-financial.ui:1445
 msgid "Sum-of-the-Years’-Digits Depreciation"
 msgstr "Umanjenje zbirom-cifara-godine"
 
 #. Sum-of-the-Years’-Digits Depreciation Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:65
-#| msgid ""
-#| "Calculates the depreciation allowance on an asset for a specified period "
-#| "of time, using the Sum-of-the-Years'-Digits method. This method of "
-#| "depreciation accelerates the rate of depreciation, so that more "
-#| "depreciation expense occurs in earlier periods than in later ones. The "
-#| "useful life is the number of periods, typically years, over which an "
-#| "asset is depreciated. "
+#: src/buttons-financial.ui:1634
 msgid ""
 "Calculates the depreciation allowance on an asset for a specified period of "
 "time, using the Sum-of-the-Years’-Digits method. This method of depreciation "
@@ -471,17 +500,17 @@ msgstr ""
 "proizvoda je broj perioda, obično godina, za koje se proizvod amortizuje. "
 
 #. Title of Payment Period dialog
-#: ../data/buttons-financial.ui.h:67
+#: src/buttons-financial.ui:1660
 msgid "Payment Period"
 msgstr "Period plaćanja"
 
 #. Payment Period Dialog: Label before future value input
-#: ../data/buttons-financial.ui.h:69
+#: src/buttons-financial.ui:1785
 msgid "Future _Value:"
 msgstr "Buduća _vrednost:"
 
 #. Payment Period Dialog: Description of calculation
-#: ../data/buttons-financial.ui.h:71
+#: src/buttons-financial.ui:1818
 msgid ""
 "Calculates the number of payment periods that are necessary during the term "
 "of an ordinary annuity, to accumulate a future value, at a periodic interest "
@@ -491,156 +520,159 @@ msgstr ""
 "buduća vrednost po periodičnoj kamatnoj stopi."
 
 #. 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:90
+#: src/buttons-financial.ui:2284
 msgid "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:92
+#: src/buttons-financial.ui:2300
 msgid "Ddb"
 msgstr "Dvoum"
 
-#: ../data/buttons-financial.ui.h:93
+#: src/buttons-financial.ui:2306
 msgid "Double Declining Depreciation"
 msgstr "Umanjenje dvostrukim opadanjem"
 
 #. 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:95
+#: src/buttons-financial.ui:2316
 msgid "Fv"
 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:97
+#: src/buttons-financial.ui:2332
 msgid "Term"
 msgstr "Rok"
 
-#: ../data/buttons-financial.ui.h:98
+#: src/buttons-financial.ui:2338
 msgid "Financial Term"
 msgstr "Finansijski izraz"
 
 #. 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:100
+#: src/buttons-financial.ui:2349
 msgid "Syd"
 msgstr "Umzcg"
 
-#: ../data/buttons-financial.ui.h:101
+#: src/buttons-financial.ui:2355
 msgid "Sum of the Years Digits Depreciation"
 msgstr "Umanjenje zbirom cifara godine"
 
 #. 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:103
+#: src/buttons-financial.ui:2366
 msgid "Sln"
 msgstr "Praum"
 
-#: ../data/buttons-financial.ui.h:104
+#: src/buttons-financial.ui:2372
 msgid "Straight Line Depreciation"
 msgstr "Pravolinijsko umanjenje"
 
 #. 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:106
+#: src/buttons-financial.ui:2383
 msgid "Rate"
 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:108
+#: src/buttons-financial.ui:2400
 msgid "Pv"
 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:110
+#: src/buttons-financial.ui:2417
 msgid "Pmt"
 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:112
+#: src/buttons-financial.ui:2434
 msgid "Gpm"
 msgstr "Bruma"
 
-#: ../data/buttons-programming.ui.h:1
+#: src/buttons-programming.ui:17
 msgid "Binary"
 msgstr "Binarno"
 
-#: ../data/buttons-programming.ui.h:2
+#: src/buttons-programming.ui:18
 msgid "Octal"
 msgstr "Oktalno"
 
-#: ../data/buttons-programming.ui.h:3
+#: src/buttons-programming.ui:19
 msgid "Decimal"
 msgstr "Decimalno"
 
-#: ../data/buttons-programming.ui.h:4
+#: src/buttons-programming.ui:20
 msgid "Hexadecimal"
 msgstr "Heksadecimalno"
 
-#: ../data/buttons-programming.ui.h:14
+#: src/buttons-programming.ui:1343
 msgid "Integer Component"
 msgstr "Celobrojni deo"
 
-#: ../data/buttons-programming.ui.h:15
+#: src/buttons-programming.ui:1360
 msgid "Fractional Component"
 msgstr "Razlomljeni deo"
 
-#: ../data/buttons-programming.ui.h:35
+#: src/buttons-programming.ui:1901
 msgid "Boolean Exclusive OR"
 msgstr "Logičko ILLI"
 
-#: ../data/buttons-programming.ui.h:36
+#: src/buttons-programming.ui:1918
 msgid "Boolean OR"
 msgstr "Logičko ILI"
 
-#: ../data/buttons-programming.ui.h:37
+#: src/buttons-programming.ui:1935
 msgid "Boolean AND"
 msgstr "Logičko I"
 
 #. Accessible name for the shift left button
-#: ../data/buttons-programming.ui.h:42
+#: src/buttons-programming.ui:1999 src/buttons-programming.ui:2002
 msgid "Shift Left"
 msgstr "Pomeri ulevo"
 
 #. Accessible name for the shift right button
-#: ../data/buttons-programming.ui.h:44
+#: src/buttons-programming.ui:2042 src/buttons-programming.ui:2045
 msgid "Shift Right"
 msgstr "Pomeri udesno"
 
 #. Title of insert character code dialog
-#: ../data/buttons-programming.ui.h:46
+#: src/buttons-programming.ui:2086 src/buttons-programming.ui:2259
 msgid "Insert Character Code"
 msgstr "Ubacite kod znaka"
 
 #. Accessible name for the insert character button
-#: ../data/buttons-programming.ui.h:48
+#: src/buttons-programming.ui:2090
 msgid "Insert Character"
 msgstr "Ubaci znak"
 
-#: ../data/buttons-programming.ui.h:49
+#: src/buttons-programming.ui:2106
 msgid "Boolean NOT"
 msgstr "Logičko NE"
 
-#: ../data/buttons-programming.ui.h:59
-#| msgid "Ones' Complement"
+#: src/buttons-programming.ui:2205
 msgid "Ones’ Complement"
 msgstr "Komplement jedinice"
 
-#: ../data/buttons-programming.ui.h:60
-#| msgid "Two's Complement"
+#: src/buttons-programming.ui:2222
 msgid "Two’s Complement"
 msgstr "Komplement dvojke"
 
 #. Insert ASCII dialog: Label before character entry
-#: ../data/buttons-programming.ui.h:62
+#: src/buttons-programming.ui:2272
 msgid "Ch_aracter:"
 msgstr "_Znak:"
 
 #. Insert ASCII dialog: Button to insert selected character
-#: ../data/buttons-programming.ui.h:65
+#: src/buttons-programming.ui:2321
 msgid "_Insert"
 msgstr "_Umetni"
 
-#: ../data/org.gnome.Calculator.appdata.xml.in.h:1
+#: data/org.gnome.Calculator.appdata.xml.in:7
 msgid "GNOME Calculator"
 msgstr "Gnomov kalkulator"
 
-#: ../data/org.gnome.Calculator.appdata.xml.in.h:2
+#: data/org.gnome.Calculator.appdata.xml.in:8
+#: data/org.gnome.Calculator.desktop.in:4
+msgid "Perform arithmetic, scientific or financial calculations"
+msgstr "Izvršavajte aritmetičke, naučne ili finansijske proračune"
+
+#: data/org.gnome.Calculator.appdata.xml.in:10
 msgid ""
 "GNOME Calculator is an application that solves mathematical equations. "
 "Though it at first appears to be a simple calculator with only basic "
@@ -652,7 +684,7 @@ msgstr ""
 "operacijama, možete da se prebacite na napredan, finansijski, ili "
 "programerski način rada i da otkrijete iznenađujući skup mogućnosti."
 
-#: ../data/org.gnome.Calculator.appdata.xml.in.h:3
+#: data/org.gnome.Calculator.appdata.xml.in:16
 msgid ""
 "The Advanced calculator supports many operations, including: logarithms, "
 "factorials, trigonometric and hyperbolic functions, modulus division, "
@@ -664,7 +696,7 @@ msgstr ""
 "kompleksne brojeve, stvaranje nasumičnog broja, faktorizaciju prostog broja i "
 "pretvaranje jedinica."
 
-#: ../data/org.gnome.Calculator.appdata.xml.in.h:4
+#: data/org.gnome.Calculator.appdata.xml.in:22
 msgid ""
 "Financial mode supports several computations, including periodic interest "
 "rate, present and future value, double declining and straight line "
@@ -674,7 +706,7 @@ msgstr ""
 "kamatnu stopu, sadašnju i buduću vrednost, dvostruko opadanje i pravolinijsko "
 "umanjenje, i mnoge druge."
 
-#: ../data/org.gnome.Calculator.appdata.xml.in.h:5
+#: data/org.gnome.Calculator.appdata.xml.in:27
 msgid ""
 "Programming mode supports conversion between common bases (binary, octal, "
 "decimal, and hexadecimal), boolean algebra, one’s and two’s complementation, "
@@ -684,280 +716,272 @@ msgstr ""
 "(binarnih, oktalnih, decimalnih i heksadecimalnih), bulovu algebru, "
 "komplement jedinice i dvojke, pretvaranje koda znaka u znak, i drugo."
 
-#: ../data/org.gnome.Calculator.appdata.xml.in.h:6
-msgid "GNOME Calculator in Basic Mode."
-msgstr "Gnomov kalkulator u osnovnom režimu."
+#: data/org.gnome.Calculator.appdata.xml.in:36
+#| msgid "GNOME Calculator in Basic Mode."
+msgid "GNOME Calculator in Basic Mode"
+msgstr "Gnomov kalkulator u osnovnom režimu"
 
-#: ../data/org.gnome.Calculator.appdata.xml.in.h:7
-msgid "GNOME Calculator in Advanced Mode."
-msgstr "Gnomov kalkulator u naprednom režimu."
+#: data/org.gnome.Calculator.appdata.xml.in:40
+#| msgid "GNOME Calculator in Advanced Mode."
+msgid "GNOME Calculator in Advanced Mode"
+msgstr "Gnomov kalkulator u naprednom režimu"
 
-#: ../data/org.gnome.Calculator.appdata.xml.in.h:8
-msgid "GNOME Calculator in Financial Mode."
-msgstr "Gnomov kalkulator u finansijskom režimu."
+#: data/org.gnome.Calculator.appdata.xml.in:44
+#| msgid "GNOME Calculator in Financial Mode."
+msgid "GNOME Calculator in Financial Mode"
+msgstr "Gnomov kalkulator u finansijskom režimu"
 
-#: ../data/org.gnome.Calculator.appdata.xml.in.h:9
-msgid "GNOME Calculator in Programming Mode."
-msgstr "Gnomov kalkulator u programerskom režimu."
+#: data/org.gnome.Calculator.appdata.xml.in:48
+#| msgid "GNOME Calculator in Programming Mode."
+msgid "GNOME Calculator in Programming Mode"
+msgstr "Gnomov kalkulator u programerskom režimu"
 
-#: ../data/org.gnome.Calculator.appdata.xml.in.h:10
+#: data/org.gnome.Calculator.appdata.xml.in:62
 msgid "The GNOME Project"
 msgstr "Projekat Gnom"
 
 #. Program name in the about dialog
-#: ../data/org.gnome.Calculator.desktop.in.h:1 ../data/math-window.ui.h:6
-#: ../src/gnome-calculator.vala:80 ../src/gnome-calculator.vala:332
+#: data/org.gnome.Calculator.desktop.in:3 src/math-window.ui:48
+#: src/gnome-calculator.vala:80 src/gnome-calculator.vala:332
 msgid "Calculator"
 msgstr "Kalkulator"
 
-#: ../data/org.gnome.Calculator.desktop.in.h:2
-msgid "Perform arithmetic, scientific or financial calculations"
-msgstr "Izvršavajte aritmetičke, naučne ili finansijske proračune"
-
-#: ../data/org.gnome.Calculator.desktop.in.h:3
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: data/org.gnome.Calculator.desktop.in:6
 msgid "calculation;arithmetic;scientific;financial;"
 msgstr "računanje;aritmetika;nauka;finansije;proračun;"
 
-#: ../data/math-converter.ui.h:1
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/org.gnome.Calculator.desktop.in:9
+msgid "accessories-calculator"
+msgstr "accessories-calculator"
+
+#: src/math-converter.ui:16
 msgid "Switch conversion units"
 msgstr "Promenite jedinice pretvaranja"
 
-#: ../data/math-converter.ui.h:2
+#: src/math-converter.ui:29
 msgid " in "
 msgstr " u "
 
-#: ../data/math-converter.ui.h:3
-#| msgid "="
+#: src/math-converter.ui:108
 msgctxt "convertion equals label"
 msgid "="
 msgstr "="
 
-#: ../data/math-function-popover.ui.h:1
+#: src/math-function-popover.ui:33
 msgid "New function"
 msgstr "Nova funkcija"
 
-#: ../data/math-variable-popover.ui.h:1
+#: src/math-variable-popover.ui:37
 msgid "Variable name"
 msgstr "Naziv promenljive"
 
-#: ../data/math-variable-popover.ui.h:2
+#: src/math-variable-popover.ui:51
 msgid "Store value into existing or new variable"
 msgstr "Sačuvajte vrednost u postojeću ili u novu promenljivu"
 
-#: ../data/math-window.ui.h:1 ../src/math-window.vala:82
+#: src/math-window.ui:20 src/math-window.vala:82
 msgid "Basic Mode"
 msgstr "Osnovni način rada"
 
-#: ../data/math-window.ui.h:2 ../src/math-window.vala:87
+#: src/math-window.ui:25 src/math-window.vala:87
 msgid "Advanced Mode"
 msgstr "Napredni način rada"
 
-#: ../data/math-window.ui.h:3 ../src/math-window.vala:92
+#: src/math-window.ui:30 src/math-window.vala:92
 msgid "Financial Mode"
 msgstr "Finansijski način rada"
 
-#: ../data/math-window.ui.h:4 ../src/math-window.vala:97
+#: src/math-window.ui:35 src/math-window.vala:97
 msgid "Programming Mode"
 msgstr "Programerski način rada"
 
-#: ../data/math-window.ui.h:5 ../src/math-window.vala:102
+#: src/math-window.ui:40 src/math-window.vala:102
 msgid "Keyboard Mode"
 msgstr "Režim tastature"
 
-#: ../data/math-window.ui.h:7
+#: src/math-window.ui:88
 msgid "Menu"
 msgstr "Izbornik"
 
-#: ../data/math-shortcuts.ui.h:1
+#: src/math-shortcuts.ui:15
 msgctxt "shortcut window"
 msgid "General"
 msgstr "Opšte"
 
-#: ../data/math-shortcuts.ui.h:2
+#: src/math-shortcuts.ui:20
 msgctxt "shortcut window"
 msgid "Open a new window"
 msgstr "Otvara novi prozor"
 
-#: ../data/math-shortcuts.ui.h:3
+#: src/math-shortcuts.ui:27
 msgctxt "shortcut window"
 msgid "Close current window"
 msgstr "Zatvara tekući prozor"
 
-#: ../data/math-shortcuts.ui.h:4
+#: src/math-shortcuts.ui:34
 msgctxt "shortcut window"
 msgid "Open help"
 msgstr "Otvara pomoć"
 
-#: ../data/math-shortcuts.ui.h:5
+#: src/math-shortcuts.ui:41
 msgctxt "shortcut window"
 msgid "Quit the application"
 msgstr "Izlazi iz programa"
 
-#: ../data/math-shortcuts.ui.h:6
+#: src/math-shortcuts.ui:49
 msgctxt "shortcut window"
 msgid "Switching modes"
 msgstr "Prebacuje režime"
 
-#: ../data/math-shortcuts.ui.h:7
-#| msgid "Basic Mode"
+#: src/math-shortcuts.ui:54
 msgctxt "shortcut window"
 msgid "Switch to Basic mode"
 msgstr "Osnovni način rada"
 
-#: ../data/math-shortcuts.ui.h:8
-#| msgid "Advanced Mode"
+#: src/math-shortcuts.ui:61
 msgctxt "shortcut window"
 msgid "Switch to Advanced mode"
 msgstr "Napredni način rada"
 
-#: ../data/math-shortcuts.ui.h:9
-#| msgid "Financial Mode"
+#: src/math-shortcuts.ui:68
 msgctxt "shortcut window"
 msgid "Switch to Financial mode"
 msgstr "Finansijski način rada"
 
-#: ../data/math-shortcuts.ui.h:10
-#| msgid "Programming Mode"
+#: src/math-shortcuts.ui:75
 msgctxt "shortcut window"
 msgid "Switch to Programming mode"
 msgstr "Programerski način rada"
 
-#: ../data/math-shortcuts.ui.h:11
-#| msgid "Keyboard Mode"
+#: src/math-shortcuts.ui:82
 msgctxt "shortcut window"
 msgid "Switch to Keyboard mode"
 msgstr "Režim tastature"
 
-#: ../data/math-shortcuts.ui.h:12
-#| msgid "Keyboard Mode"
+#: src/math-shortcuts.ui:90
 msgctxt "shortcut window"
 msgid "Keyboard entry"
 msgstr "Unos tastature"
 
-#: ../data/math-shortcuts.ui.h:13
-#| msgid "Multiply [*]"
+#: src/math-shortcuts.ui:95
 msgctxt "shortcut window"
 msgid "Multiply (×)"
 msgstr "Množenje (×)"
 
-#: ../data/math-shortcuts.ui.h:14
-#| msgid "Divide [/]"
+#: src/math-shortcuts.ui:102
 msgctxt "shortcut window"
 msgid "Divide (÷)"
 msgstr "Deljenje (÷)"
 
-#: ../data/math-shortcuts.ui.h:15
-#| msgid "Square root [Ctrl+R]"
+#: src/math-shortcuts.ui:109
 msgctxt "shortcut window"
 msgid "Square root (√)"
 msgstr "Kvadratni koren [√]"
 
-#: ../data/math-shortcuts.ui.h:16
-#| msgid "Inverse"
+#: src/math-shortcuts.ui:116
 msgctxt "shortcut window"
 msgid "Inverse"
 msgstr "Inverzija"
 
-#: ../data/math-shortcuts.ui.h:17
+#: src/math-shortcuts.ui:123
 msgctxt "shortcut window"
 msgid "Pi (π)"
 msgstr "Pi (π)"
 
-#: ../data/math-shortcuts.ui.h:18
+#: src/math-shortcuts.ui:130
 msgctxt "shortcut window"
 msgid "Enter numbers in scientific format"
 msgstr "Unos brojeva u naučnom formatu"
 
-#: ../data/math-shortcuts.ui.h:19
-#| msgid "Programming Mode"
+#: src/math-shortcuts.ui:138
 msgctxt "shortcut window"
 msgid "Programming mode"
 msgstr "Programerski način rada"
 
-#: ../data/math-shortcuts.ui.h:20
+#: src/math-shortcuts.ui:143
 msgctxt "shortcut window"
 msgid "Switch to binary"
 msgstr "Binarni brojevi"
 
-#: ../data/math-shortcuts.ui.h:21
+#: src/math-shortcuts.ui:150
 msgctxt "shortcut window"
 msgid "Switch to octal"
 msgstr "Oktalni brojevi"
 
-#: ../data/math-shortcuts.ui.h:22
+#: src/math-shortcuts.ui:157
 msgctxt "shortcut window"
 msgid "Switch to decimal"
 msgstr "Decimalni brojevi"
 
-#: ../data/math-shortcuts.ui.h:23
-#| msgid "Hexadecimal"
+#: src/math-shortcuts.ui:164
 msgctxt "shortcut window"
 msgid "Switch to hexadecimal"
 msgstr "Heksadecimalni brojevi"
 
-#: ../data/menu.ui.h:1
+#: src/menu.ui:7
 msgid "New Window"
 msgstr "Novi prozor"
 
 #. Title of preferences dialog
-#: ../data/menu.ui.h:2 ../src/math-preferences.vala:30
+#: src/menu.ui:14 src/math-preferences.vala:30
 msgid "Preferences"
 msgstr "Postavke"
 
-#: ../data/menu.ui.h:3
-#| msgid "Keyboard Mode"
+#: src/menu.ui:21
 msgid "_Keyboard Shortcuts"
 msgstr "_Prečice tastature"
 
-#: ../data/menu.ui.h:4
+#: src/menu.ui:26
 msgid "Help"
 msgstr "Pomoć"
 
-#: ../data/menu.ui.h:5
+#: src/menu.ui:31
 msgid "About"
 msgstr "O programu"
 
-#: ../data/menu.ui.h:6
+#: src/menu.ui:35
 msgid "Quit"
 msgstr "Izađi"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:1
+#: data/org.gnome.calculator.gschema.xml:25
 msgid "Accuracy value"
 msgstr "Vrednost tačnosti"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:2
+#: data/org.gnome.calculator.gschema.xml:26
 msgid "The number of digits displayed after the numeric point"
 msgstr "Broj cifara prikazan posle decimalnog zareza"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:3
+#: data/org.gnome.calculator.gschema.xml:31
 msgid "Word size"
 msgstr "Dužina reči"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:4
+#: data/org.gnome.calculator.gschema.xml:32
 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.h:5
+#: data/org.gnome.calculator.gschema.xml:37
 msgid "Numeric Base"
 msgstr "Osnova broja"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:6
+#: data/org.gnome.calculator.gschema.xml:38
 msgid "The numeric base"
 msgstr "Brojna osnova"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:7
+#: data/org.gnome.calculator.gschema.xml:42
 msgid "Show Thousands Separators"
 msgstr "Prikazivanje razdvajača hiljada"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:8
+#: data/org.gnome.calculator.gschema.xml:43
 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.h:9
+#: data/org.gnome.calculator.gschema.xml:47
 msgid "Show Trailing Zeroes"
 msgstr "Prikazivanje pratećih nula"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:10
+#: data/org.gnome.calculator.gschema.xml:48
 msgid ""
 "Indicates whether any trailing zeroes after the numeric point should be "
 "shown in the display value."
@@ -965,441 +989,437 @@ msgstr ""
 "Da li da se u prikazanoj vrednosti prikazuju prateće nule posle decimalnog "
 "zareza."
 
-#: ../data/org.gnome.calculator.gschema.xml.h:11
+#: data/org.gnome.calculator.gschema.xml:52
 msgid "Number format"
 msgstr "Zapis broja"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:12
+#: data/org.gnome.calculator.gschema.xml:53
 msgid "The format to display numbers in"
 msgstr "Zapis u kome će se prikazivati brojevi"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:13
+#: data/org.gnome.calculator.gschema.xml:57
 msgid "Angle units"
 msgstr "Jedinice uglova"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:14
+#: data/org.gnome.calculator.gschema.xml:58
 msgid "The angle units to use"
 msgstr "Jedinice uglova za korišćenje"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:15
+#: data/org.gnome.calculator.gschema.xml:62
 msgid "Button mode"
 msgstr "Režim dugmeta"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:16
+#: data/org.gnome.calculator.gschema.xml:63
 msgid "The button mode"
 msgstr "Režim dugmeta"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:17
+#: data/org.gnome.calculator.gschema.xml:67
 msgid "Source currency"
 msgstr "Izvorna valuta"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:18
+#: data/org.gnome.calculator.gschema.xml:68
 msgid "Currency of the current calculation"
 msgstr "Valuta trenutnog proračuna"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:19
+#: data/org.gnome.calculator.gschema.xml:72
 msgid "Target currency"
 msgstr "Ciljna valuta"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:20
+#: data/org.gnome.calculator.gschema.xml:73
 msgid "Currency to convert the current calculation into"
 msgstr "Valuta u koju treba pretvoriti proračun"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:21
+#: data/org.gnome.calculator.gschema.xml:77
 msgid "Source units"
 msgstr "Izvorna jedinica"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:22
+#: data/org.gnome.calculator.gschema.xml:78
 msgid "Units of the current calculation"
 msgstr "Jedinica trenutnog proračuna"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:23
+#: data/org.gnome.calculator.gschema.xml:82
 msgid "Target units"
 msgstr "Ciljna jedinica"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:24
+#: data/org.gnome.calculator.gschema.xml:83
 msgid "Units to convert the current calculation into"
 msgstr "Jedinica u koju treba pretvoriti proračun"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:25
+#: data/org.gnome.calculator.gschema.xml:87
 msgid "Internal precision"
 msgstr "Unutrašnja tačnost"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:26
+#: data/org.gnome.calculator.gschema.xml:88
 msgid "The internal precision used with the MPFR library"
 msgstr "Unutrašnja tačnost korišćena sa MPFR bibliotekom"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:27
+#: data/org.gnome.calculator.gschema.xml:92
 msgid "Window position"
 msgstr "Položaj prozora"
 
-#: ../data/org.gnome.calculator.gschema.xml.h:28
+#: data/org.gnome.calculator.gschema.xml:93
 msgid "Window position (x and y) of the last closed window."
 msgstr "Položaj prozora (vodoravno i uspravno) posledeg zatvorenog prozora."
 
-#: ../lib/currency.vala:28
+#: lib/currency.vala:28
 msgid "UAE Dirham"
 msgstr "Emiratski dirham"
 
-#: ../lib/currency.vala:29
+#: lib/currency.vala:29
 msgid "Australian Dollar"
 msgstr "Australijski dolar"
 
-#: ../lib/currency.vala:30
+#: lib/currency.vala:30
 msgid "Bulgarian Lev"
 msgstr "Bugarski lev"
 
-#: ../lib/currency.vala:31
+#: lib/currency.vala:31
 msgid "Bahraini Dinar"
 msgstr "Bahreinski dinar"
 
-#: ../lib/currency.vala:32
+#: lib/currency.vala:32
 msgid "Brunei Dollar"
 msgstr "Brunejski dolar"
 
-#: ../lib/currency.vala:33
+#: lib/currency.vala:33
 msgid "Brazilian Real"
 msgstr "Brazilski real"
 
-#: ../lib/currency.vala:34
+#: lib/currency.vala:34
 msgid "Botswana Pula"
 msgstr "Bocvanska pula"
 
-#: ../lib/currency.vala:35
+#: lib/currency.vala:35
 msgid "Canadian Dollar"
 msgstr "Kanadski dolar"
 
-#: ../lib/currency.vala:36
+#: lib/currency.vala:36
 msgid "CFA Franc"
 msgstr "CFA franak"
 
-#: ../lib/currency.vala:37
+#: lib/currency.vala:37
 msgid "Swiss Franc"
 msgstr "Švajcarski franak"
 
-#: ../lib/currency.vala:38
+#: lib/currency.vala:38
 msgid "Chilean Peso"
 msgstr "Čileanski pezos"
 
-#: ../lib/currency.vala:39
+#: lib/currency.vala:39
 msgid "Chinese Yuan"
 msgstr "Kineski juan"
 
-#: ../lib/currency.vala:40
+#: lib/currency.vala:40
 msgid "Colombian Peso"
 msgstr "Kolumbijski pezos"
 
-#: ../lib/currency.vala:41
+#: lib/currency.vala:41
 msgid "Czech Koruna"
 msgstr "Češka kruna"
 
-#: ../lib/currency.vala:42
+#: lib/currency.vala:42
 msgid "Danish Krone"
 msgstr "Danska kruna"
 
-#: ../lib/currency.vala:43
+#: lib/currency.vala:43
 msgid "Algerian Dinar"
 msgstr "Alžirski dinar"
 
-#: ../lib/currency.vala:44
+#: lib/currency.vala:44
 msgid "Estonian Kroon"
 msgstr "Estonska kruna"
 
-#: ../lib/currency.vala:45
+#: lib/currency.vala:45
 msgid "Euro"
 msgstr "Evro"
 
-#: ../lib/currency.vala:46
-#| msgid "Pound Sterling"
+#: lib/currency.vala:46
 msgid "British Pound Sterling"
 msgstr "Britanska funta sterlinga"
 
-#: ../lib/currency.vala:47
+#: lib/currency.vala:47
 msgid "Hong Kong Dollar"
 msgstr "Hongkonški dolar"
 
-#: ../lib/currency.vala:48
+#: lib/currency.vala:48
 msgid "Croatian Kuna"
 msgstr "Hrvatska kuna"
 
-#: ../lib/currency.vala:49
+#: lib/currency.vala:49
 msgid "Hungarian Forint"
 msgstr "Mađarska forinta"
 
-#: ../lib/currency.vala:50
+#: lib/currency.vala:50
 msgid "Indonesian Rupiah"
 msgstr "Indonežanska rupija"
 
-#: ../lib/currency.vala:51
+#: lib/currency.vala:51
 msgid "Israeli New Shekel"
 msgstr "Izraelski novi šekel"
 
-#: ../lib/currency.vala:52
+#: lib/currency.vala:52
 msgid "Indian Rupee"
 msgstr "Indijska rupija"
 
-#: ../lib/currency.vala:53
+#: lib/currency.vala:53
 msgid "Iranian Rial"
 msgstr "Iranski rijal"
 
-#: ../lib/currency.vala:54
+#: lib/currency.vala:54
 msgid "Icelandic Krona"
 msgstr "Islandska kruna"
 
-#: ../lib/currency.vala:55
+#: lib/currency.vala:55
 msgid "Japanese Yen"
 msgstr "Japanski jen"
 
-#: ../lib/currency.vala:56
+#: lib/currency.vala:56
 msgid "South Korean Won"
 msgstr "Južnokorejski von"
 
-#: ../lib/currency.vala:57
+#: lib/currency.vala:57
 msgid "Kuwaiti Dinar"
 msgstr "Kuvajtski dinar"
 
-#: ../lib/currency.vala:58
+#: lib/currency.vala:58
 msgid "Kazakhstani Tenge"
 msgstr "Kazahstanski tenge"
 
-#: ../lib/currency.vala:59
+#: lib/currency.vala:59
 msgid "Sri Lankan Rupee"
 msgstr "Šrilankanska rupija"
 
-#: ../lib/currency.vala:60
+#: lib/currency.vala:60
 msgid "Libyan Dinar"
 msgstr "Libijski dinar"
 
-#: ../lib/currency.vala:61
+#: lib/currency.vala:61
 msgid "Mauritian Rupee"
 msgstr "Mauricijska rupija"
 
-#: ../lib/currency.vala:62
+#: lib/currency.vala:62
 msgid "Mexican Peso"
 msgstr "Meksički pezos"
 
-#: ../lib/currency.vala:63
+#: lib/currency.vala:63
 msgid "Malaysian Ringgit"
 msgstr "Malezijski ringit"
 
-#: ../lib/currency.vala:64
+#: lib/currency.vala:64
 msgid "Norwegian Krone"
 msgstr "Norveška kruna"
 
-#: ../lib/currency.vala:65
+#: lib/currency.vala:65
 msgid "Nepalese Rupee"
 msgstr "Nepalska rupija"
 
-#: ../lib/currency.vala:66
+#: lib/currency.vala:66
 msgid "New Zealand Dollar"
 msgstr "Novozelandski dolar"
 
-#: ../lib/currency.vala:67
+#: lib/currency.vala:67
 msgid "Omani Rial"
 msgstr "Omanski rijal"
 
-#: ../lib/currency.vala:68
+#: lib/currency.vala:68
 msgid "Peruvian Nuevo Sol"
 msgstr "Peruanski novi sol"
 
-#: ../lib/currency.vala:69
+#: lib/currency.vala:69
 msgid "Philippine Peso"
 msgstr "Filipinski pezos"
 
-#: ../lib/currency.vala:70
+#: lib/currency.vala:70
 msgid "Pakistani Rupee"
 msgstr "Pakistanska rupija"
 
-#: ../lib/currency.vala:71
+#: lib/currency.vala:71
 msgid "Polish Zloty"
 msgstr "Poljski zlot"
 
-#: ../lib/currency.vala:72
+#: lib/currency.vala:72
 msgid "Qatari Riyal"
 msgstr "Katarski rijal"
 
-#: ../lib/currency.vala:73
+#: lib/currency.vala:73
 msgid "New Romanian Leu"
 msgstr "Novi rumunski lej"
 
-#: ../lib/currency.vala:74
+#: lib/currency.vala:74
 msgid "Russian Rouble"
 msgstr "Ruska rublja"
 
-#: ../lib/currency.vala:75
+#: lib/currency.vala:75
 msgid "Saudi Riyal"
 msgstr "Saudijski rijal"
 
-#: ../lib/currency.vala:76
+#: lib/currency.vala:76
 msgid "Swedish Krona"
 msgstr "Švedska kruna"
 
-#: ../lib/currency.vala:77
+#: lib/currency.vala:77
 msgid "Singapore Dollar"
 msgstr "Singapurski dolar"
 
-#: ../lib/currency.vala:78
+#: lib/currency.vala:78
 msgid "Thai Baht"
 msgstr "Tajlandski bat"
 
-#: ../lib/currency.vala:79
+#: lib/currency.vala:79
 msgid "Tunisian Dinar"
 msgstr "Tunižanski dinar"
 
-#: ../lib/currency.vala:80
+#: lib/currency.vala:80
 msgid "New Turkish Lira"
 msgstr "Nova turska lira"
 
-#: ../lib/currency.vala:81
+#: lib/currency.vala:81
 msgid "T&T Dollar (TTD)"
 msgstr "T&T dolar (TTD)"
 
-#: ../lib/currency.vala:82
+#: lib/currency.vala:82
 msgid "US Dollar"
 msgstr "Američki dolar"
 
-#: ../lib/currency.vala:83
+#: lib/currency.vala:83
 msgid "Uruguayan Peso"
 msgstr "Urugvajski pezos"
 
-#: ../lib/currency.vala:84
+#: lib/currency.vala:84
 msgid "Venezuelan Bolívar"
 msgstr "Venecuelanski bolivar"
 
-#: ../lib/currency.vala:85
+#: lib/currency.vala:85
 msgid "South African Rand"
 msgstr "Južnoafrički rand"
 
-#: ../lib/equation-parser.vala:715 ../lib/number.vala:429
-#| msgid "nth root of negative number is undefined for even n"
+#: lib/equation-parser.vala:717 lib/number.vala:429
 msgid "The zeroth root of a number is undefined"
 msgstr "Nulti koren broja nije definisan"
 
-#: ../lib/financial.vala:114
+#: lib/financial.vala:114
 msgid "Error: the number of periods must be positive"
 msgstr "Greška: broj perioda mora biti pozitivan"
 
 #. Digits localized for the given language
-#: ../lib/math-equation.vala:171
+#: lib/math-equation.vala:171
 msgid "0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F"
 msgstr "0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F"
 
 #. Error shown when trying to undo with no undo history
-#: ../lib/math-equation.vala:523
+#: lib/math-equation.vala:523
 msgid "No undo history"
 msgstr "Nema radnji opozivanja"
 
 #. Error shown when trying to redo with no redo history
-#: ../lib/math-equation.vala:544
+#: lib/math-equation.vala:544
 msgid "No redo history"
 msgstr "Nema radnji vraćanja"
 
-#: ../lib/math-equation.vala:775
+#: lib/math-equation.vala:775
 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
-#: ../lib/math-equation.vala:968
+#: lib/math-equation.vala:968
 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
-#: ../lib/math-equation.vala:973
+#: lib/math-equation.vala:973
 #, c-format
-#| msgid "Unknown variable '%s'"
 msgid "Unknown variable “%s”"
 msgstr "Nepoznata promenljiva „%s“"
 
 #. Error displayed to user when an unknown function is entered
-#: ../lib/math-equation.vala:980
+#: lib/math-equation.vala:980
 #, c-format
-#| msgid "Function '%s' is not defined"
 msgid "Function “%s” is not defined"
 msgstr "Funkcija „%s“ nije određena"
 
 #. Error displayed to user when an conversion with unknown units is attempted
-#: ../lib/math-equation.vala:987
+#: lib/math-equation.vala:987
 msgid "Unknown conversion"
 msgstr "Nepoznato pretvaranje"
 
 #. should always be run
-#: ../lib/math-equation.vala:997
+#: lib/math-equation.vala:997
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 #. Unknown error.
 #. Error displayed to user when they enter an invalid calculation
-#: ../lib/math-equation.vala:1002 ../lib/math-equation.vala:1007
+#: lib/math-equation.vala:1002 lib/math-equation.vala:1007
 msgid "Malformed expression"
 msgstr "Neispravan izraz"
 
-#: ../lib/math-equation.vala:1018
+#: lib/math-equation.vala:1018
 msgid "Calculating"
 msgstr "Izračunavam"
 
 #. Error displayed when trying to factorize a non-integer value
-#: ../lib/math-equation.vala:1211
+#: lib/math-equation.vala:1211
 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
-#: ../lib/math-equation.vala:1265
+#: lib/math-equation.vala:1265
 msgid "No sane value to bitwise shift"
 msgstr "Nema razumne vrednosti za bitsko pomeranje"
 
 #. Message displayed when cannot toggle bit in display
-#: ../lib/math-equation.vala:1279
+#: lib/math-equation.vala:1279
 msgid "Displayed value not an integer"
 msgstr "Prikazana vrednost nije ceo broj"
 
 #. Translators: Error displayed when underflow error occured
-#: ../lib/number.vala:196
+#: lib/number.vala:196
 msgid "Underflow error"
 msgstr "Greška potkoračenja"
 
 #. Translators: Error displayed when overflow error occured
-#: ../lib/number.vala:201
+#: lib/number.vala:201
 msgid "Overflow error"
 msgstr "Greška prekoračenja"
 
 #. Translators: Error display when attempting to take argument of zero
-#: ../lib/number.vala:251
+#: lib/number.vala:251
 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
-#: ../lib/number.vala:367 ../lib/number.vala:397
+#: lib/number.vala:367 lib/number.vala:397
 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
-#: ../lib/number.vala:375 ../lib/number.vala:405
+#: lib/number.vala:375 lib/number.vala:405
 msgid "Zero raised to zero is undefined"
 msgstr "Nula na nultom stepenu nije definisana"
 
 #. Translators: Error displayed when attempting to take logarithm of zero
-#: ../lib/number.vala:459 ../lib/number.vala:490
+#: lib/number.vala:459 lib/number.vala:490
 msgid "Logarithm of zero is undefined"
 msgstr "Logaritam nule nije definisan"
 
 #. Translators: Error displayed when attempted take the factorial of a negative or complex number
-#: ../lib/number.vala:512
+#: lib/number.vala:512
 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
-#: ../lib/number.vala:572
+#: lib/number.vala:572
 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
-#: ../lib/number.vala:593
+#: lib/number.vala:593
 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
-#: ../lib/number.vala:666
+#: lib/number.vala:666
 msgid ""
 "Tangent is undefined for angles that are multiples of π (180°) from π∕2 (90°)"
 msgstr ""
@@ -1407,1357 +1427,1354 @@ msgstr ""
 "π∕2 (90°)"
 
 #. Translators: Error displayed when inverse sine value is undefined
-#: ../lib/number.vala:685
+#: lib/number.vala:685
 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
-#: ../lib/number.vala:702
+#: lib/number.vala:702
 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
-#: ../lib/number.vala:763
+#: lib/number.vala:763
 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
-#: ../lib/number.vala:779
+#: lib/number.vala:779
 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
-#: ../lib/number.vala:795
+#: lib/number.vala:795
 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
-#: ../lib/number.vala:807
+#: lib/number.vala:807
 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
-#: ../lib/number.vala:819
+#: lib/number.vala:819
 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
-#: ../lib/number.vala:831
+#: lib/number.vala:831
 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
-#: ../lib/number.vala:854
+#: lib/number.vala:854
 msgid "Shift is only possible on integer values"
 msgstr "Pomeranje je moguće samo za pozitivne cele vrednosti"
 
-#: ../lib/serializer.vala:332
+#: lib/serializer.vala:332
 msgid "Precision error"
 msgstr "Greška tačnosti"
 
-#: ../lib/unit.vala:29
+#: lib/unit.vala:29
 msgid "Angle"
 msgstr "Ugao"
 
-#: ../lib/unit.vala:30
+#: lib/unit.vala:30
 msgid "Length"
 msgstr "Dužina"
 
-#: ../lib/unit.vala:31
+#: lib/unit.vala:31
 msgid "Area"
 msgstr "Površina"
 
-#: ../lib/unit.vala:32
+#: lib/unit.vala:32
 msgid "Volume"
 msgstr "Zapremina"
 
-#: ../lib/unit.vala:33
+#: lib/unit.vala:33
 msgid "Weight"
 msgstr "Težina"
 
-#: ../lib/unit.vala:34
+#: lib/unit.vala:34
 msgid "Duration"
 msgstr "Vreme"
 
-#: ../lib/unit.vala:35
+#: lib/unit.vala:35
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: ../lib/unit.vala:36
+#: lib/unit.vala:36
 msgid "Digital Storage"
 msgstr "Digitalno skladište"
 
 #. FIXME: Approximations of 1/(units in a circle), therefore, 360 deg != 400 grads
 #. Preferences dialog: Angle unit combo box: Use degrees for trigonometric calculations
-#: ../lib/unit.vala:39 ../src/math-preferences.vala:144
+#: lib/unit.vala:39 src/math-preferences.vala:144
 msgid "Degrees"
 msgstr "Stepeni"
 
-#: ../lib/unit.vala:39
+#: lib/unit.vala:39
 #, c-format
 msgctxt "unit-format"
 msgid "%s degrees"
 msgstr "%s stepeni"
 
-#: ../lib/unit.vala:39
+#: lib/unit.vala:39
 msgctxt "unit-symbols"
 msgid "degree,degrees,deg"
 msgstr "stepen,stepena,stepeni,st"
 
 #. Preferences dialog: Angle unit combo box: Use radians for trigonometric calculations
-#: ../lib/unit.vala:40 ../src/math-preferences.vala:148
+#: lib/unit.vala:40 src/math-preferences.vala:148
 msgid "Radians"
 msgstr "Radijani"
 
-#: ../lib/unit.vala:40
+#: lib/unit.vala:40
 #, c-format
 msgctxt "unit-format"
 msgid "%s radians"
 msgstr "%s radijana"
 
-#: ../lib/unit.vala:40
+#: lib/unit.vala:40
 msgctxt "unit-symbols"
 msgid "radian,radians,rad"
 msgstr "radijan,radijana,rad"
 
 #. Preferences dialog: Angle unit combo box: Use gradians for trigonometric calculations
-#: ../lib/unit.vala:41 ../src/math-preferences.vala:152
+#: lib/unit.vala:41 src/math-preferences.vala:152
 msgid "Gradians"
 msgstr "Gradijani"
 
-#: ../lib/unit.vala:41
+#: lib/unit.vala:41
 #, c-format
 msgctxt "unit-format"
 msgid "%s gradians"
 msgstr "%s gradijana"
 
-#: ../lib/unit.vala:41
+#: lib/unit.vala:41
 msgctxt "unit-symbols"
 msgid "gradian,gradians,grad"
 msgstr "gradijan,gradijana,grad"
 
-#: ../lib/unit.vala:42
+#: lib/unit.vala:42
 msgid "Parsecs"
 msgstr "Parseci"
 
-#: ../lib/unit.vala:42
+#: lib/unit.vala:42
 #, c-format
 msgctxt "unit-format"
 msgid "%s pc"
 msgstr "%s pc"
 
-#: ../lib/unit.vala:42
+#: lib/unit.vala:42
 msgctxt "unit-symbols"
 msgid "parsec,parsecs,pc"
 msgstr "parsek,parseka,pc"
 
-#: ../lib/unit.vala:43
+#: lib/unit.vala:43
 msgid "Light Years"
 msgstr "Svetlosne godine"
 
-#: ../lib/unit.vala:43
+#: lib/unit.vala:43
 #, c-format
 msgctxt "unit-format"
 msgid "%s ly"
 msgstr "%s sg"
 
-#: ../lib/unit.vala:43
+#: lib/unit.vala:43
 msgctxt "unit-symbols"
 msgid "lightyear,lightyears,ly"
 msgstr "svetlosnagodina,svetlosnegodine,svetlosnihgodina,ly"
 
-#: ../lib/unit.vala:44
+#: lib/unit.vala:44
 msgid "Astronomical Units"
 msgstr "Astronomske jedinice"
 
-#: ../lib/unit.vala:44
+#: lib/unit.vala:44
 #, c-format
 msgctxt "unit-format"
 msgid "%s au"
 msgstr "%s aj"
 
-#: ../lib/unit.vala:44
+#: lib/unit.vala:44
 msgctxt "unit-symbols"
 msgid "au"
 msgstr "aj"
 
-#: ../lib/unit.vala:45
+#: lib/unit.vala:45
 msgid "Nautical Miles"
 msgstr "Nautičke milje"
 
-#: ../lib/unit.vala:45
+#: lib/unit.vala:45
 #, c-format
 msgctxt "unit-format"
 msgid "%s nmi"
 msgstr "%s nmi"
 
-#: ../lib/unit.vala:45
+#: lib/unit.vala:45
 msgctxt "unit-symbols"
 msgid "nmi"
 msgstr "nmi"
 
-#: ../lib/unit.vala:46
+#: lib/unit.vala:46
 msgid "Miles"
 msgstr "Milje"
 
-#: ../lib/unit.vala:46
+#: lib/unit.vala:46
 #, c-format
 msgctxt "unit-format"
 msgid "%s mi"
 msgstr "%s mi"
 
-#: ../lib/unit.vala:46
+#: lib/unit.vala:46
 msgctxt "unit-symbols"
 msgid "mile,miles,mi"
 msgstr "milja,milje,milja,mi"
 
-#: ../lib/unit.vala:47
+#: lib/unit.vala:47
 msgid "Kilometers"
 msgstr "Kilometri"
 
-#: ../lib/unit.vala:47
+#: lib/unit.vala:47
 #, c-format
 msgctxt "unit-format"
 msgid "%s km"
 msgstr "%s km"
 
-#: ../lib/unit.vala:47
+#: lib/unit.vala:47
 msgctxt "unit-symbols"
 msgid "kilometer,kilometers,km,kms"
 msgstr "kilometar,kilometra,kilometara,km,km"
 
-#: ../lib/unit.vala:48
+#: lib/unit.vala:48
 msgid "Cables"
 msgstr "Kablovi"
 
-#: ../lib/unit.vala:48
+#: lib/unit.vala:48
 #, c-format
 msgctxt "unit-format"
 msgid "%s cb"
 msgstr "%s cb"
 
-#: ../lib/unit.vala:48
+#: lib/unit.vala:48
 msgctxt "unit-symbols"
 msgid "cable,cables,cb"
 msgstr "kabal,kabla,kablova,cb"
 
-#: ../lib/unit.vala:49
+#: lib/unit.vala:49
 msgid "Fathoms"
 msgstr "Hvati"
 
-#: ../lib/unit.vala:49
+#: lib/unit.vala:49
 #, c-format
 msgctxt "unit-format"
 msgid "%s ftm"
 msgstr "%s ftm"
 
-#: ../lib/unit.vala:49
+#: lib/unit.vala:49
 msgctxt "unit-symbols"
 msgid "fathom,fathoms,ftm"
 msgstr "hvat,hvata,hvatova,hv,ftm"
 
-#: ../lib/unit.vala:50
+#: lib/unit.vala:50
 msgid "Meters"
 msgstr "Metri"
 
-#: ../lib/unit.vala:50
+#: lib/unit.vala:50
 #, c-format
 msgctxt "unit-format"
 msgid "%s m"
 msgstr "%s m"
 
-#: ../lib/unit.vala:50
+#: lib/unit.vala:50
 msgctxt "unit-symbols"
 msgid "meter,meters,m"
 msgstr "metar,metra,metara,m,m"
 
-#: ../lib/unit.vala:51
+#: lib/unit.vala:51
 msgid "Yards"
 msgstr "Jardi"
 
-#: ../lib/unit.vala:51
+#: lib/unit.vala:51
 #, c-format
 msgctxt "unit-format"
 msgid "%s yd"
 msgstr "%s yd"
 
-#: ../lib/unit.vala:51
+#: lib/unit.vala:51
 msgctxt "unit-symbols"
 msgid "yard,yards,yd"
 msgstr "jard,jarda,jardi,yd"
 
-#: ../lib/unit.vala:52
+#: lib/unit.vala:52
 msgid "Feet"
 msgstr "Stope"
 
-#: ../lib/unit.vala:52
+#: lib/unit.vala:52
 #, c-format
 msgctxt "unit-format"
 msgid "%s ft"
 msgstr "%s ftm"
 
-#: ../lib/unit.vala:52
+#: lib/unit.vala:52
 msgctxt "unit-symbols"
 msgid "foot,feet,ft"
 msgstr "stopa,stope,stopa,ft"
 
-#: ../lib/unit.vala:53
+#: lib/unit.vala:53
 msgid "Inches"
 msgstr "Inči"
 
-#: ../lib/unit.vala:53
+#: lib/unit.vala:53
 #, c-format
 msgctxt "unit-format"
 msgid "%s in"
 msgstr "%s in"
 
-#: ../lib/unit.vala:53
+#: lib/unit.vala:53
 msgctxt "unit-symbols"
 msgid "inch,inches,in"
 msgstr "inč,inča,in,in"
 
-#: ../lib/unit.vala:54
+#: lib/unit.vala:54
 msgid "Centimeters"
 msgstr "Centimetri"
 
-#: ../lib/unit.vala:54
+#: lib/unit.vala:54
 #, c-format
 msgctxt "unit-format"
 msgid "%s cm"
 msgstr "%s cm"
 
-#: ../lib/unit.vala:54
+#: lib/unit.vala:54
 msgctxt "unit-symbols"
 msgid "centimeter,centimeters,cm,cms"
 msgstr "centimetar,centimetra,centimetara,cm,cm"
 
-#: ../lib/unit.vala:55
+#: lib/unit.vala:55
 msgid "Millimeters"
 msgstr "Milimetri"
 
-#: ../lib/unit.vala:55
+#: lib/unit.vala:55
 #, c-format
 msgctxt "unit-format"
 msgid "%s mm"
 msgstr "%s mm"
 
-#: ../lib/unit.vala:55
+#: lib/unit.vala:55
 msgctxt "unit-symbols"
 msgid "millimeter,millimeters,mm"
 msgstr "milimetar,milimetra,milimetara,mm,mm"
 
-#: ../lib/unit.vala:56
+#: lib/unit.vala:56
 msgid "Micrometers"
 msgstr "Mikrometri"
 
-#: ../lib/unit.vala:56
+#: lib/unit.vala:56
 #, c-format
 msgctxt "unit-format"
 msgid "%s μm"
 msgstr "%s μm"
 
-#: ../lib/unit.vala:56
+#: lib/unit.vala:56
 msgctxt "unit-symbols"
 msgid "micrometer,micrometers,um"
 msgstr "mikrometar,mikrometra,mikrometara,um"
 
-#: ../lib/unit.vala:57
+#: lib/unit.vala:57
 msgid "Nanometers"
 msgstr "Nanometri"
 
-#: ../lib/unit.vala:57
+#: lib/unit.vala:57
 #, c-format
 msgctxt "unit-format"
 msgid "%s nm"
 msgstr "%s nm"
 
-#: ../lib/unit.vala:57
+#: lib/unit.vala:57
 msgctxt "unit-symbols"
 msgid "nanometer,nanometers,nm"
 msgstr "nanometar,nanometra,nanometara,nm,nm"
 
-#: ../lib/unit.vala:58
+#: lib/unit.vala:58
 msgid "Desktop Publishing Point"
 msgstr "Tačka objavljivanja radne površi"
 
-#: ../lib/unit.vala:58 ../lib/unit.vala:68
+#: lib/unit.vala:58 lib/unit.vala:68
 #, c-format
 msgctxt "unit-format"
 msgid "%s pt"
 msgstr "%s pt"
 
-#: ../lib/unit.vala:58
-#| msgctxt "unit-symbols"
-#| msgid "pint,pints,pt"
+#: lib/unit.vala:58
 msgctxt "unit-symbols"
 msgid "point,pt,points,pts"
 msgstr "pinta,pinte,pinti,pt,pt"
 
-#: ../lib/unit.vala:59
+#: lib/unit.vala:59
 msgid "Hectares"
 msgstr "Hektari"
 
-#: ../lib/unit.vala:59
+#: lib/unit.vala:59
 #, c-format
 msgctxt "unit-format"
 msgid "%s ha"
 msgstr "%s ha"
 
-#: ../lib/unit.vala:59
+#: lib/unit.vala:59
 msgctxt "unit-symbols"
 msgid "hectare,hectares,ha"
 msgstr "hektar,hektara, ha,ha"
 
-#: ../lib/unit.vala:60
+#: lib/unit.vala:60
 msgid "Acres"
 msgstr "Akri"
 
-#: ../lib/unit.vala:60
+#: lib/unit.vala:60
 #, c-format
 msgctxt "unit-format"
 msgid "%s acres"
 msgstr "%s akra"
 
-#: ../lib/unit.vala:60
+#: lib/unit.vala:60
 msgctxt "unit-symbols"
 msgid "acre,acres"
 msgstr "akr,akra"
 
-#: ../lib/unit.vala:61
+#: lib/unit.vala:61
 msgid "Square Meters"
 msgstr "Kvadratni metri"
 
-#: ../lib/unit.vala:61
+#: lib/unit.vala:61
 #, c-format
 msgctxt "unit-format"
 msgid "%s m²"
 msgstr "%s m²"
 
-#: ../lib/unit.vala:61
+#: lib/unit.vala:61
 msgctxt "unit-symbols"
 msgid "m²"
 msgstr "m²"
 
-#: ../lib/unit.vala:62
+#: lib/unit.vala:62
 msgid "Square Centimeters"
 msgstr "Kvadratni centimetri"
 
-#: ../lib/unit.vala:62
+#: lib/unit.vala:62
 #, c-format
 msgctxt "unit-format"
 msgid "%s cm²"
 msgstr "%s cm²"
 
-#: ../lib/unit.vala:62
+#: lib/unit.vala:62
 msgctxt "unit-symbols"
 msgid "cm²"
 msgstr "cm²"
 
-#: ../lib/unit.vala:63
+#: lib/unit.vala:63
 msgid "Square Millimeters"
 msgstr "Kvadratni milimetri"
 
-#: ../lib/unit.vala:63
+#: lib/unit.vala:63
 #, c-format
 msgctxt "unit-format"
 msgid "%s mm²"
 msgstr "%s mm²"
 
-#: ../lib/unit.vala:63
+#: lib/unit.vala:63
 msgctxt "unit-symbols"
 msgid "mm²"
 msgstr "mm²"
 
-#: ../lib/unit.vala:64
+#: lib/unit.vala:64
 msgid "Cubic Meters"
 msgstr "Kubni metri"
 
-#: ../lib/unit.vala:64
+#: lib/unit.vala:64
 #, c-format
 msgctxt "unit-format"
 msgid "%s m³"
 msgstr "%s m³"
 
-#: ../lib/unit.vala:64
+#: lib/unit.vala:64
 msgctxt "unit-symbols"
 msgid "m³"
 msgstr "m³"
 
-#: ../lib/unit.vala:65
+#: lib/unit.vala:65
 msgid "Gallons"
 msgstr "Galoni"
 
-#: ../lib/unit.vala:65
+#: lib/unit.vala:65
 #, c-format
 msgctxt "unit-format"
 msgid "%s gal"
 msgstr "%s gal"
 
-#: ../lib/unit.vala:65
+#: lib/unit.vala:65
 msgctxt "unit-symbols"
 msgid "gallon,gallons,gal"
 msgstr "galon,galona,gal"
 
-#: ../lib/unit.vala:66
+#: lib/unit.vala:66
 msgid "Liters"
 msgstr "Litri"
 
-#: ../lib/unit.vala:66
+#: lib/unit.vala:66
 #, c-format
 msgctxt "unit-format"
 msgid "%s L"
 msgstr "%s l"
 
-#: ../lib/unit.vala:66
+#: lib/unit.vala:66
 msgctxt "unit-symbols"
 msgid "litre,litres,liter,liters,L"
 msgstr "litar,litra,litara,L,l"
 
-#: ../lib/unit.vala:67
+#: lib/unit.vala:67
 msgid "Quarts"
 msgstr "Kvarti"
 
-#: ../lib/unit.vala:67
+#: lib/unit.vala:67
 #, c-format
 msgctxt "unit-format"
 msgid "%s qt"
 msgstr "%s qt"
 
-#: ../lib/unit.vala:67
+#: lib/unit.vala:67
 msgctxt "unit-symbols"
 msgid "quart,quarts,qt"
 msgstr "kvart,kvarta,kvartova,qt"
 
-#: ../lib/unit.vala:68
+#: lib/unit.vala:68
 msgid "Pints"
 msgstr "Pinte"
 
-#: ../lib/unit.vala:68
+#: lib/unit.vala:68
 msgctxt "unit-symbols"
 msgid "pint,pints,pt"
 msgstr "pinta,pinte,pinti,pt,pt"
 
-#: ../lib/unit.vala:69
+#: lib/unit.vala:69
 msgid "Milliliters"
 msgstr "Mililitri"
 
-#: ../lib/unit.vala:69
+#: lib/unit.vala:69
 #, c-format
 msgctxt "unit-format"
 msgid "%s mL"
 msgstr "%s ml"
 
-#: ../lib/unit.vala:69
+#: lib/unit.vala:69
 msgctxt "unit-symbols"
 msgid "millilitre,millilitres,milliliter,milliliters,mL,cm³"
 msgstr "mililitar,mililitra,mililitara,ml,ml,cm³"
 
-#: ../lib/unit.vala:70
+#: lib/unit.vala:70
 msgid "Microliters"
 msgstr "Mikrolitri"
 
-#: ../lib/unit.vala:70
+#: lib/unit.vala:70
 #, c-format
 msgctxt "unit-format"
 msgid "%s μL"
 msgstr "%s μl"
 
-#: ../lib/unit.vala:70
+#: lib/unit.vala:70
 msgctxt "unit-symbols"
 msgid "mm³,μL,uL"
 msgstr "mm³,μl,ul"
 
-#: ../lib/unit.vala:71
+#: lib/unit.vala:71
 msgid "Tonnes"
 msgstr "Tone"
 
-#: ../lib/unit.vala:71
+#: lib/unit.vala:71
 #, c-format
 msgctxt "unit-format"
 msgid "%s T"
 msgstr "%s t"
 
-#: ../lib/unit.vala:71
+#: lib/unit.vala:71
 msgctxt "unit-symbols"
 msgid "tonne,tonnes"
 msgstr "tona,tone,t,t"
 
-#: ../lib/unit.vala:72
+#: lib/unit.vala:72
 msgid "Kilograms"
 msgstr "Kilogrami"
 
-#: ../lib/unit.vala:72
+#: lib/unit.vala:72
 #, c-format
 msgctxt "unit-format"
 msgid "%s kg"
 msgstr "%s kg"
 
-#: ../lib/unit.vala:72
+#: lib/unit.vala:72
 msgctxt "unit-symbols"
 msgid "kilogram,kilograms,kilogramme,kilogrammes,kg,kgs"
 msgstr "kilogram,kilograma,kg,kg"
 
-#: ../lib/unit.vala:73
+#: lib/unit.vala:73
 msgid "Pounds"
 msgstr "Funte"
 
-#: ../lib/unit.vala:73
+#: lib/unit.vala:73
 #, c-format
 msgctxt "unit-format"
 msgid "%s lb"
 msgstr "%s lb"
 
-#: ../lib/unit.vala:73
+#: lib/unit.vala:73
 msgctxt "unit-symbols"
 msgid "pound,pounds,lb"
 msgstr "funta,funte,funti,lb"
 
-#: ../lib/unit.vala:74
+#: lib/unit.vala:74
 msgid "Ounces"
 msgstr "Unce"
 
-#: ../lib/unit.vala:74
+#: lib/unit.vala:74
 #, c-format
 msgctxt "unit-format"
 msgid "%s oz"
 msgstr "%s oz"
 
-#: ../lib/unit.vala:74
+#: lib/unit.vala:74
 msgctxt "unit-symbols"
 msgid "ounce,ounces,oz"
 msgstr "unca,unce,unci,oz,oz"
 
-#: ../lib/unit.vala:75
+#: lib/unit.vala:75
 msgid "Grams"
 msgstr "Grami"
 
-#: ../lib/unit.vala:75
+#: lib/unit.vala:75
 #, c-format
 msgctxt "unit-format"
 msgid "%s g"
 msgstr "%s g"
 
-#: ../lib/unit.vala:75
+#: lib/unit.vala:75
 msgctxt "unit-symbols"
 msgid "gram,grams,gramme,grammes,g"
 msgstr "gram,grama,g,g"
 
-#: ../lib/unit.vala:76
+#: lib/unit.vala:76
 msgid "Years"
 msgstr "Godine"
 
-#: ../lib/unit.vala:76
+#: lib/unit.vala:76
 #, c-format
 msgctxt "unit-format"
 msgid "%s years"
 msgstr "%s god."
 
-#: ../lib/unit.vala:76
+#: lib/unit.vala:76
 msgctxt "unit-symbols"
 msgid "year,years"
 msgstr "godina,godine,godina"
 
-#: ../lib/unit.vala:77
+#: lib/unit.vala:77
 msgid "Days"
 msgstr "Dani"
 
-#: ../lib/unit.vala:77
+#: lib/unit.vala:77
 #, c-format
 msgctxt "unit-format"
 msgid "%s days"
 msgstr "%s dana"
 
-#: ../lib/unit.vala:77
+#: lib/unit.vala:77
 msgctxt "unit-symbols"
 msgid "day,days"
 msgstr "dan,dana"
 
-#: ../lib/unit.vala:78
+#: lib/unit.vala:78
 msgid "Hours"
 msgstr "Sati"
 
-#: ../lib/unit.vala:78
+#: lib/unit.vala:78
 #, c-format
 msgctxt "unit-format"
 msgid "%s hours"
 msgstr "%s sati"
 
-#: ../lib/unit.vala:78
+#: lib/unit.vala:78
 msgctxt "unit-symbols"
 msgid "hour,hours"
 msgstr "sat,sata,sati"
 
-#: ../lib/unit.vala:79
+#: lib/unit.vala:79
 msgid "Minutes"
 msgstr "Minuti"
 
-#: ../lib/unit.vala:79
+#: lib/unit.vala:79
 #, c-format
 msgctxt "unit-format"
 msgid "%s minutes"
 msgstr "%s min."
 
-#: ../lib/unit.vala:79
+#: lib/unit.vala:79
 msgctxt "unit-symbols"
 msgid "minute,minutes"
 msgstr "minut,minuta"
 
-#: ../lib/unit.vala:80
+#: lib/unit.vala:80
 msgid "Seconds"
 msgstr "Sekunde"
 
-#: ../lib/unit.vala:80
+#: lib/unit.vala:80
 #, c-format
 msgctxt "unit-format"
 msgid "%s s"
 msgstr "%s s"
 
-#: ../lib/unit.vala:80
+#: lib/unit.vala:80
 msgctxt "unit-symbols"
 msgid "second,seconds,s"
 msgstr "sekunda,sekunde,sekundi,s,s"
 
-#: ../lib/unit.vala:81
+#: lib/unit.vala:81
 msgid "Milliseconds"
 msgstr "Milisekunde"
 
-#: ../lib/unit.vala:81
+#: lib/unit.vala:81
 #, c-format
 msgctxt "unit-format"
 msgid "%s ms"
 msgstr "%s ms"
 
-#: ../lib/unit.vala:81
+#: lib/unit.vala:81
 msgctxt "unit-symbols"
 msgid "millisecond,milliseconds,ms"
 msgstr "milisekunda,milisekunde,milisendi,ms,ms"
 
-#: ../lib/unit.vala:82
+#: lib/unit.vala:82
 msgid "Microseconds"
 msgstr "Mikrosekunde"
 
-#: ../lib/unit.vala:82
+#: lib/unit.vala:82
 #, c-format
 msgctxt "unit-format"
 msgid "%s μs"
 msgstr "%s μs"
 
-#: ../lib/unit.vala:82
+#: lib/unit.vala:82
 msgctxt "unit-symbols"
 msgid "microsecond,microseconds,us,μs"
 msgstr "mikrosekunda,mikrosekunde,mikrosekundi,μs"
 
-#: ../lib/unit.vala:83
+#: lib/unit.vala:83
 msgid "Celsius"
 msgstr "Celzijusi"
 
-#: ../lib/unit.vala:83
+#: lib/unit.vala:83
 #, c-format
 msgctxt "unit-format"
 msgid "%s ˚C"
 msgstr "%s ˚C"
 
-#: ../lib/unit.vala:83
+#: lib/unit.vala:83
 msgctxt "unit-symbols"
 msgid "degC,˚C,C,c,Celsius,celsius"
 msgstr "stepenCelzijusa,˚C,Celzijus,celzijus"
 
-#: ../lib/unit.vala:84
+#: lib/unit.vala:84
 msgid "Fahrenheit"
 msgstr "Farenhajti"
 
-#: ../lib/unit.vala:84
+#: lib/unit.vala:84
 #, c-format
 msgctxt "unit-format"
 msgid "%s ˚F"
 msgstr "%s ˚F"
 
-#: ../lib/unit.vala:84
+#: lib/unit.vala:84
 msgctxt "unit-symbols"
 msgid "degF,˚F,F,f,Fahrenheit,fahrenheit"
 msgstr "stepenFarenhajta,˚F,Farenhajt,farenhajt"
 
-#: ../lib/unit.vala:85
+#: lib/unit.vala:85
 msgid "Kelvin"
 msgstr "Kelvini"
 
-#: ../lib/unit.vala:85
+#: lib/unit.vala:85
 #, c-format
 msgctxt "unit-format"
 msgid "%s K"
 msgstr "%s K"
 
-#: ../lib/unit.vala:85
+#: lib/unit.vala:85
 msgctxt "unit-symbols"
 msgid "k,K,Kelvin,kelvin"
 msgstr "stepenKelvina,K,Kelvin,kelvin"
 
-#: ../lib/unit.vala:86
+#: lib/unit.vala:86
 msgid "Rankine"
 msgstr "Rankini"
 
-#: ../lib/unit.vala:86
+#: lib/unit.vala:86
 #, c-format
 msgctxt "unit-format"
 msgid "%s ˚R"
 msgstr "%s ˚R"
 
-#: ../lib/unit.vala:86
+#: lib/unit.vala:86
 msgctxt "unit-symbols"
 msgid "degR,˚R,˚Ra,r,R,Rankine,rankine"
 msgstr "stepenRankina,˚R,˚Ra,Rankin,rankin"
 
 #. We use IEC prefix for digital storage units. i.e. 1 kB = 1 KiloByte = 1000 bytes, and 1 KiB = 1 kibiByte 
= 1024 bytes
-#: ../lib/unit.vala:88
+#: lib/unit.vala:88
 msgid "Bits"
 msgstr "Bita"
 
-#: ../lib/unit.vala:88
+#: lib/unit.vala:88
 #, c-format
 msgctxt "unit-format"
 msgid "%s b"
 msgstr "%s b"
 
-#: ../lib/unit.vala:88
+#: lib/unit.vala:88
 msgctxt "unit-symbols"
 msgid "bit,bits,b"
 msgstr "bit,bita,bitova,b"
 
-#: ../lib/unit.vala:89
+#: lib/unit.vala:89
 msgid "Bytes"
 msgstr "Bajtova"
 
-#: ../lib/unit.vala:89
+#: lib/unit.vala:89
 #, c-format
 msgctxt "unit-format"
 msgid "%s B"
 msgstr "%s B"
 
-#: ../lib/unit.vala:89
+#: lib/unit.vala:89
 msgctxt "unit-symbols"
 msgid "byte,bytes,B"
 msgstr "bajt,bajta,bajtova,V"
 
-#: ../lib/unit.vala:90
+#: lib/unit.vala:90
 msgid "Nibbles"
 msgstr "Polubajta"
 
-#: ../lib/unit.vala:90
+#: lib/unit.vala:90
 #, c-format
 msgctxt "unit-format"
 msgid "%s nibble"
 msgstr "%s polubajta"
 
-#: ../lib/unit.vala:90
+#: lib/unit.vala:90
 msgctxt "unit-symbols"
 msgid "nibble,nibbles"
 msgstr "polubajt,polubajta"
 
 #. The SI symbol for kilo is k, however we also allow "KB" and "Kb", as they are widely used and accepted.
-#: ../lib/unit.vala:92
+#: lib/unit.vala:92
 msgid "Kilobits"
 msgstr "Kilobita"
 
-#: ../lib/unit.vala:92
+#: lib/unit.vala:92
 #, c-format
 msgctxt "unit-format"
 msgid "%s kb"
 msgstr "%s kb"
 
-#: ../lib/unit.vala:92
+#: lib/unit.vala:92
 msgctxt "unit-symbols"
 msgid "kilobit,kilobits,kb,Kb"
 msgstr "kilobit,kilobita,kb,Kb"
 
-#: ../lib/unit.vala:93
+#: lib/unit.vala:93
 msgid "Kilobytes"
 msgstr "Kilobajta"
 
-#: ../lib/unit.vala:93
+#: lib/unit.vala:93
 #, c-format
 msgctxt "unit-format"
 msgid "%s kB"
 msgstr "%s kB"
 
-#: ../lib/unit.vala:93
+#: lib/unit.vala:93
 msgctxt "unit-symbols"
 msgid "kilobyte,kilobytes,kB,KB"
 msgstr "kilobajt,kilobajta,kB,KB"
 
-#: ../lib/unit.vala:94
+#: lib/unit.vala:94
 msgid "Kibibits"
 msgstr "Kibibita"
 
-#: ../lib/unit.vala:94
+#: lib/unit.vala:94
 #, c-format
 msgctxt "unit-format"
 msgid "%s Kib"
 msgstr "%s Kib"
 
-#: ../lib/unit.vala:94
+#: lib/unit.vala:94
 msgctxt "unit-symbols"
 msgid "kibibit,kibibits,Kib"
 msgstr "kibibit,kibibita,Kib"
 
-#: ../lib/unit.vala:95
+#: lib/unit.vala:95
 msgid "Kibibytes"
 msgstr "Kibibajta"
 
-#: ../lib/unit.vala:95
+#: lib/unit.vala:95
 #, c-format
 msgctxt "unit-format"
 msgid "%s KiB"
 msgstr "%s KiB"
 
-#: ../lib/unit.vala:95
+#: lib/unit.vala:95
 msgctxt "unit-symbols"
 msgid "kibibyte,kibibytes,KiB"
 msgstr "kibibajt,kibibajta,KiB"
 
-#: ../lib/unit.vala:96
+#: lib/unit.vala:96
 msgid "Megabits"
 msgstr "Megabita"
 
-#: ../lib/unit.vala:96
+#: lib/unit.vala:96
 #, c-format
 msgctxt "unit-format"
 msgid "%s Mb"
 msgstr "%s Mb"
 
-#: ../lib/unit.vala:96
+#: lib/unit.vala:96
 msgctxt "unit-symbols"
 msgid "megabit,megabits,Mb"
 msgstr "megabit,megabita,Mb"
 
-#: ../lib/unit.vala:97
+#: lib/unit.vala:97
 msgid "Megabytes"
 msgstr "Megabajta"
 
-#: ../lib/unit.vala:97
+#: lib/unit.vala:97
 #, c-format
 msgctxt "unit-format"
 msgid "%s MB"
 msgstr "%s MB"
 
-#: ../lib/unit.vala:97
+#: lib/unit.vala:97
 msgctxt "unit-symbols"
 msgid "megabyte,megabytes,MB"
 msgstr "megabajt,megabajta,MB"
 
-#: ../lib/unit.vala:98
+#: lib/unit.vala:98
 msgid "Mebibits"
 msgstr "Mebibita"
 
-#: ../lib/unit.vala:98
+#: lib/unit.vala:98
 #, c-format
 msgctxt "unit-format"
 msgid "%s Mib"
 msgstr "%s Mib"
 
-#: ../lib/unit.vala:98
+#: lib/unit.vala:98
 msgctxt "unit-symbols"
 msgid "mebibit,mebibits,Mib"
 msgstr "mebibit,mebibita,Mib"
 
-#: ../lib/unit.vala:99
+#: lib/unit.vala:99
 msgid "Mebibytes"
 msgstr "Mebibajta"
 
-#: ../lib/unit.vala:99
+#: lib/unit.vala:99
 #, c-format
 msgctxt "unit-format"
 msgid "%s MiB"
 msgstr "%s MiB"
 
-#: ../lib/unit.vala:99
+#: lib/unit.vala:99
 msgctxt "unit-symbols"
 msgid "mebibyte,mebibytes,MiB"
 msgstr "mebibajt,mebibajta,MiB"
 
-#: ../lib/unit.vala:100
+#: lib/unit.vala:100
 msgid "Gigabits"
 msgstr "Gigabita"
 
-#: ../lib/unit.vala:100
+#: lib/unit.vala:100
 #, c-format
 msgctxt "unit-format"
 msgid "%s Gb"
 msgstr "%s Gb"
 
-#: ../lib/unit.vala:100
+#: lib/unit.vala:100
 msgctxt "unit-symbols"
 msgid "gigabit,gigabits,Gb"
 msgstr "gigabit,gigabita,Gb"
 
-#: ../lib/unit.vala:101
+#: lib/unit.vala:101
 msgid "Gigabytes"
 msgstr "Gigabajta"
 
-#: ../lib/unit.vala:101
+#: lib/unit.vala:101
 #, c-format
 msgctxt "unit-format"
 msgid "%s GB"
 msgstr "%s GB"
 
-#: ../lib/unit.vala:101
+#: lib/unit.vala:101
 msgctxt "unit-symbols"
 msgid "gigabyte,gigabytes,GB"
 msgstr "gigabajt,gigabajta,GB"
 
-#: ../lib/unit.vala:102
+#: lib/unit.vala:102
 msgid "Gibibits"
 msgstr "Gibibita"
 
-#: ../lib/unit.vala:102
+#: lib/unit.vala:102
 #, c-format
 msgctxt "unit-format"
 msgid "%s Gib"
 msgstr "%s Gib"
 
-#: ../lib/unit.vala:102
+#: lib/unit.vala:102
 msgctxt "unit-symbols"
 msgid "gibibit,gibibits,Gib"
 msgstr "gibibit,gibibita,Gib"
 
-#: ../lib/unit.vala:103
+#: lib/unit.vala:103
 msgid "Gibibytes"
 msgstr "Gibibajta"
 
-#: ../lib/unit.vala:103
+#: lib/unit.vala:103
 #, c-format
 msgctxt "unit-format"
 msgid "%s GiB"
 msgstr "%s GiB"
 
-#: ../lib/unit.vala:103
+#: lib/unit.vala:103
 msgctxt "unit-symbols"
 msgid "gibibyte,gibibytes,GiB"
 msgstr "gibibajt,gibibajta,GiB"
 
-#: ../lib/unit.vala:104
+#: lib/unit.vala:104
 msgid "Terabits"
 msgstr "Terabita"
 
-#: ../lib/unit.vala:104
+#: lib/unit.vala:104
 #, c-format
 msgctxt "unit-format"
 msgid "%s Tb"
 msgstr "%s Tb"
 
-#: ../lib/unit.vala:104
+#: lib/unit.vala:104
 msgctxt "unit-symbols"
 msgid "terabit,terabits,Tb"
 msgstr "terabit,terabita,Tb"
 
-#: ../lib/unit.vala:105
+#: lib/unit.vala:105
 msgid "Terabytes"
 msgstr "Terabajta"
 
-#: ../lib/unit.vala:105
+#: lib/unit.vala:105
 #, c-format
 msgctxt "unit-format"
 msgid "%s TB"
 msgstr "%s TB"
 
-#: ../lib/unit.vala:105
+#: lib/unit.vala:105
 msgctxt "unit-symbols"
 msgid "terabyte,terabytes,TB"
 msgstr "terabajt,terabajta,TB"
 
-#: ../lib/unit.vala:106
+#: lib/unit.vala:106
 msgid "Tebibits"
 msgstr "Tebibita"
 
-#: ../lib/unit.vala:106
+#: lib/unit.vala:106
 #, c-format
 msgctxt "unit-format"
 msgid "%s Tib"
 msgstr "%s Tib"
 
-#: ../lib/unit.vala:106
+#: lib/unit.vala:106
 msgctxt "unit-symbols"
 msgid "tebibit,tebibits,Tib"
 msgstr "tebibit,tebibita,Tib"
 
-#: ../lib/unit.vala:107
+#: lib/unit.vala:107
 msgid "Tebibytes"
 msgstr "Tebibajta"
 
-#: ../lib/unit.vala:107
+#: lib/unit.vala:107
 #, c-format
 msgctxt "unit-format"
 msgid "%s TiB"
 msgstr "%s TiB"
 
-#: ../lib/unit.vala:107
+#: lib/unit.vala:107
 msgctxt "unit-symbols"
 msgid "tebibyte,tebibytes,TiB"
 msgstr "tebibajt,tebibajta,TiB"
 
-#: ../lib/unit.vala:108
+#: lib/unit.vala:108
 msgid "Petabits"
 msgstr "Petabita"
 
-#: ../lib/unit.vala:108
+#: lib/unit.vala:108
 #, c-format
 msgctxt "unit-format"
 msgid "%s Pb"
 msgstr "%s Pb"
 
-#: ../lib/unit.vala:108
+#: lib/unit.vala:108
 msgctxt "unit-symbols"
 msgid "petabit,petabits,Pb"
 msgstr "petabit,petabita,Pb"
 
-#: ../lib/unit.vala:109
+#: lib/unit.vala:109
 msgid "Petabytes"
 msgstr "Petabajta"
 
-#: ../lib/unit.vala:109
+#: lib/unit.vala:109
 #, c-format
 msgctxt "unit-format"
 msgid "%s PB"
 msgstr "%s PB"
 
-#: ../lib/unit.vala:109
+#: lib/unit.vala:109
 msgctxt "unit-symbols"
 msgid "petabyte,petabytes,PB"
 msgstr "petabajt,petabajta,PB"
 
-#: ../lib/unit.vala:110
+#: lib/unit.vala:110
 msgid "Pebibits"
 msgstr "Pebibita"
 
-#: ../lib/unit.vala:110
+#: lib/unit.vala:110
 #, c-format
 msgctxt "unit-format"
 msgid "%s Pib"
 msgstr "%s Pib"
 
-#: ../lib/unit.vala:110
+#: lib/unit.vala:110
 msgctxt "unit-symbols"
 msgid "pebibit,pebibits,Pib"
 msgstr "pebibit,pebibita,Pib"
 
-#: ../lib/unit.vala:111
+#: lib/unit.vala:111
 msgid "Pebibytes"
 msgstr "Pebibajta"
 
-#: ../lib/unit.vala:111
+#: lib/unit.vala:111
 #, c-format
 msgctxt "unit-format"
 msgid "%s PiB"
 msgstr "%s PiB"
 
-#: ../lib/unit.vala:111
+#: lib/unit.vala:111
 msgctxt "unit-symbols"
 msgid "pebibyte,pebibytes,PiB"
 msgstr "pebibajt,pebibajta,PiB"
 
-#: ../lib/unit.vala:112
+#: lib/unit.vala:112
 msgid "Exabits"
 msgstr "Eksabita"
 
-#: ../lib/unit.vala:112 ../lib/unit.vala:116
+#: lib/unit.vala:112 lib/unit.vala:116
 #, c-format
 msgctxt "unit-format"
 msgid "%s Eb"
 msgstr "%s Eb"
 
-#: ../lib/unit.vala:112
+#: lib/unit.vala:112
 msgctxt "unit-symbols"
 msgid "exabit,exabits,Eb"
 msgstr "eksabit,eksabita,Eb"
 
-#: ../lib/unit.vala:113
+#: lib/unit.vala:113
 msgid "Exabytes"
 msgstr "Eksabajta"
 
-#: ../lib/unit.vala:113 ../lib/unit.vala:117
+#: lib/unit.vala:113 lib/unit.vala:117
 #, c-format
 msgctxt "unit-format"
 msgid "%s EB"
 msgstr "%s EB"
 
-#: ../lib/unit.vala:113
+#: lib/unit.vala:113
 msgctxt "unit-symbols"
 msgid "exabyte,exabytes,EB"
 msgstr "eksabajt,eksabajta,EB"
 
-#: ../lib/unit.vala:114
+#: lib/unit.vala:114
 msgid "Exbibits"
 msgstr "Eksibibita"
 
-#: ../lib/unit.vala:114
+#: lib/unit.vala:114
 #, c-format
 msgctxt "unit-format"
 msgid "%s Eib"
 msgstr "%s Eib"
 
-#: ../lib/unit.vala:114
+#: lib/unit.vala:114
 msgctxt "unit-symbols"
 msgid "exbibit,exbibits,Eib"
 msgstr "eksbibit,eksbibita,Eib"
 
-#: ../lib/unit.vala:115
+#: lib/unit.vala:115
 msgid "Exbibytes"
 msgstr "Eksibibajta"
 
-#: ../lib/unit.vala:115
+#: lib/unit.vala:115
 #, c-format
 msgctxt "unit-format"
 msgid "%s EiB"
 msgstr "%s EiB"
 
-#: ../lib/unit.vala:115
+#: lib/unit.vala:115
 msgctxt "unit-symbols"
 msgid "exbibyte,exbibytes,EiB"
 msgstr "eksbibajt,eksbibajta,EiB"
 
-#: ../lib/unit.vala:116
+#: lib/unit.vala:116
 msgid "Zettabits"
 msgstr "Zetabita"
 
-#: ../lib/unit.vala:116
+#: lib/unit.vala:116
 msgctxt "unit-symbols"
 msgid "zettabit,zettabits,Zb"
 msgstr "zetabit,zetabita,Zb"
 
-#: ../lib/unit.vala:117
+#: lib/unit.vala:117
 msgid "Zettabytes"
 msgstr "Zetabajta"
 
-#: ../lib/unit.vala:117
+#: lib/unit.vala:117
 msgctxt "unit-symbols"
 msgid "zettabyte,zettabytes,ZB"
 msgstr "zetabajt,zetabajta,ZB"
 
-#: ../lib/unit.vala:118
+#: lib/unit.vala:118
 msgid "Zebibits"
 msgstr "Zebibita"
 
-#: ../lib/unit.vala:118
+#: lib/unit.vala:118
 #, c-format
 msgctxt "unit-format"
 msgid "%s Zib"
 msgstr "%s Zib"
 
-#: ../lib/unit.vala:118
+#: lib/unit.vala:118
 msgctxt "unit-symbols"
 msgid "zebibit,zebibits,Zib"
 msgstr "zebibit,zebibita,Zib"
 
-#: ../lib/unit.vala:119
+#: lib/unit.vala:119
 msgid "Zebibytes"
 msgstr "Zebibajta"
 
-#: ../lib/unit.vala:119
+#: lib/unit.vala:119
 #, c-format
 msgctxt "unit-format"
 msgid "%s ZiB"
 msgstr "%s ZiB"
 
-#: ../lib/unit.vala:119
+#: lib/unit.vala:119
 msgctxt "unit-symbols"
 msgid "zebibyte,zebibytes,ZiB"
 msgstr "zebibajt,zebibajta,ZiB"
 
-#: ../lib/unit.vala:120
+#: lib/unit.vala:120
 msgid "Yottabits"
 msgstr "Jotabita"
 
-#: ../lib/unit.vala:120
+#: lib/unit.vala:120
 #, c-format
 msgctxt "unit-format"
 msgid "%s Yb"
 msgstr "%s Yb"
 
-#: ../lib/unit.vala:120
+#: lib/unit.vala:120
 msgctxt "unit-symbols"
 msgid "yottabit,yottabits,Yb"
 msgstr "jotabit,jotabita,Yb"
 
-#: ../lib/unit.vala:121
+#: lib/unit.vala:121
 msgid "Yottabytes"
 msgstr "Jotabajta"
 
-#: ../lib/unit.vala:121
+#: lib/unit.vala:121
 #, c-format
 msgctxt "unit-format"
 msgid "%s YB"
 msgstr "%s YB"
 
-#: ../lib/unit.vala:121
+#: lib/unit.vala:121
 msgctxt "unit-symbols"
 msgid "yottabyte,yottabytes,YB"
 msgstr "jotabajt,jotabajta,YB"
 
-#: ../lib/unit.vala:122
+#: lib/unit.vala:122
 msgid "Yobibits"
 msgstr "Jobibita"
 
-#: ../lib/unit.vala:122
+#: lib/unit.vala:122
 #, c-format
 msgctxt "unit-format"
 msgid "%s Yib"
 msgstr "%s Yib"
 
-#: ../lib/unit.vala:122
+#: lib/unit.vala:122
 msgctxt "unit-symbols"
 msgid "yobibit,yobibits,Yib"
 msgstr "jobibit,jobibita,Yib"
 
-#: ../lib/unit.vala:123
+#: lib/unit.vala:123
 msgid "Yobibytes"
 msgstr "Jobibajta"
 
-#: ../lib/unit.vala:123
+#: lib/unit.vala:123
 #, c-format
 msgctxt "unit-format"
 msgid "%s YiB"
 msgstr "%s YiB"
 
-#: ../lib/unit.vala:123
+#: lib/unit.vala:123
 msgctxt "unit-symbols"
 msgid "yobibyte,yobibytes,YiB"
 msgstr "jobibajt,jobibajta,YiB"
 
-#: ../lib/unit.vala:125
+#: lib/unit.vala:125
 msgid "Currency"
 msgstr "Valuta"
 
 #. Translators: result of currency conversion, %s is the symbol, %%s is the placeholder for amount, i.e.: 
USD100
-#: ../lib/unit.vala:131
+#: lib/unit.vala:131
 #, c-format
 msgid "%s%%s"
 msgstr "%%s%s"
 
-#: ../src/gnome-calculator.vala:24
-#| msgid "Start with given equation"
+#: src/gnome-calculator.vala:24
 msgid "Start in given mode"
 msgstr "Počinje u datom režimu"
 
-#: ../src/gnome-calculator.vala:25
+#: src/gnome-calculator.vala:25
 msgid "Solve given equation"
 msgstr "Rešava datu jednačinu"
 
-#: ../src/gnome-calculator.vala:26
+#: src/gnome-calculator.vala:26
 msgid "Start with given equation"
 msgstr "Počinje sa datom jednačinom"
 
-#: ../src/gnome-calculator.vala:27
+#: src/gnome-calculator.vala:27
 msgid "Show release version"
 msgstr "Prikazuje izdanje programa"
 
 #. Translators: Error message displayed when unable to launch help browser
-#: ../src/gnome-calculator.vala:296
+#: src/gnome-calculator.vala:296
 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:327
+#: src/gnome-calculator.vala:327
 msgid "translator-credits"
 msgstr ""
 "Danilo Šegan <danilo prevod org>\n"
@@ -2769,16 +2786,16 @@ msgstr ""
 "\n"
 "http://prevod.org — prevod na srpski jezik"
 
-#: ../src/gnome-calculator.vala:333
+#: src/gnome-calculator.vala:333
 msgid "About Calculator"
 msgstr "O Kalkulatoru"
 
 #. Short description in the about dialog
-#: ../src/gnome-calculator.vala:341
+#: src/gnome-calculator.vala:341
 msgid "Calculator with financial and scientific modes."
 msgstr "Kalkulator sa finansijskim i naučnim načinom rada."
 
-#: ../src/math-buttons.vala:464
+#: src/math-buttons.vala:464
 #, c-format
 msgid "%d place"
 msgid_plural "%d places"
@@ -2788,79 +2805,76 @@ msgstr[2] "%d mesta"
 msgstr[3] "%d mesto"
 
 #. Preferences dialog: Label for number format combo box
-#: ../src/math-preferences.vala:43
+#: src/math-preferences.vala:43
 msgid "Number _Format:"
 msgstr "_Oblik broja:"
 
 #. Number display mode combo: Automatic, e.g. 1234 (or scientific for large number 1.234×10^99)
-#: ../src/math-preferences.vala:60
+#: src/math-preferences.vala:60
 msgid "Automatic"
 msgstr "Automatski"
 
 #. Number display mode combo: Fixed, e.g. 1234
-#: ../src/math-preferences.vala:64
+#: src/math-preferences.vala:64
 msgid "Fixed"
 msgstr "Fiksni"
 
 #. Number display mode combo: Scientific, e.g. 1.234×10^3
-#: ../src/math-preferences.vala:68
+#: src/math-preferences.vala:68
 msgid "Scientific"
 msgstr "Naučni"
 
 #. Number display mode combo: Engineering, e.g. 1.234k
-#: ../src/math-preferences.vala:72
+#: src/math-preferences.vala:72
 msgid "Engineering"
 msgstr "Inženjerski"
 
 #. Preferences dialog: label for show trailing zeroes check button
-#: ../src/math-preferences.vala:89
-#| msgid "_Number of Periods:"
+#: src/math-preferences.vala:89
 msgid "Number of _decimals"
 msgstr "Broj _decimala"
 
 #. Preferences dialog: label for show trailing zeroes switch
-#: ../src/math-preferences.vala:101
-#| msgid "Show trailing _zeroes"
+#: src/math-preferences.vala:101
 msgid "Trailing _zeroes"
 msgstr "Prateće _nule"
 
 #. Preferences dialog: label for show show thousands separator switch
-#: ../src/math-preferences.vala:114
-#| msgid "Show _thousands separators"
+#: src/math-preferences.vala:114
 msgid "_Thousands separators"
 msgstr "_Razdvajač hiljada"
 
 #. Preferences dialog: Label for angle unit combo box
-#: ../src/math-preferences.vala:128
+#: src/math-preferences.vala:128
 msgid "_Angle units:"
 msgstr "Jedinice _uglova:"
 
 #. Preferences dialog: Label for word size combo box
-#: ../src/math-preferences.vala:158
+#: src/math-preferences.vala:158
 msgid "Word _size:"
 msgstr "Dužina _reči:"
 
 #. Word size combo: 8 bits
-#: ../src/math-preferences.vala:172
+#: src/math-preferences.vala:172
 msgid "8 bits"
 msgstr "8 bita"
 
 #. Word size combo: 16 bits
-#: ../src/math-preferences.vala:174
+#: src/math-preferences.vala:174
 msgid "16 bits"
 msgstr "16 bita"
 
 #. Word size combo: 32 bits
-#: ../src/math-preferences.vala:176
+#: src/math-preferences.vala:176
 msgid "32 bits"
 msgstr "32 bita"
 
 #. Word size combo: 64 bits
-#: ../src/math-preferences.vala:178
+#: src/math-preferences.vala:178
 msgid "64 bits"
 msgstr "4 bita"
 
-#: ../src/math-window.vala:130
+#: src/math-window.vala:130
 msgid "_Quit"
 msgstr "_Izađi"
 


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