Merge from BRANCH_1_0.

1 files changed, 245 insertions, 0 deletions

diff --git a/i18n/mk/systemtime.ts b/i18n/mk/systemtime.ts
new file mode 100644
index 0000000..b56f5dd
--- a/dev/null
+++ b/i18n/mk/systemtime.ts
@@ -0,0 +1,245 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FormatTabWidget</name>
+    <message>
+        <source>Time format</source>
+        <translation>Формат на време</translation>
+    </message>
+    <message>
+        <source>hh:mm</source>
+        <translation>сс:мм</translation>
+    </message>
+    <message>
+        <source>D/M hh:mm</source>
+        <translation>Д/М сс:мм</translation>
+    </message>
+    <message>
+        <source>M/D hh:mm</source>
+        <translation>М/Д сс:мм</translation>
+    </message>
+    <message>
+        <source>12/24 hour</source>
+        <translation>12/24 саати</translation>
+    </message>
+    <message>
+        <source>24 hour</source>
+        <translation>24 саати</translation>
+    </message>
+    <message>
+        <source>12 hour</source>
+        <translation>12 саати</translation>
+    </message>
+    <message>
+        <source>Date format</source>
+        <translation>Формат на датим</translation>
+    </message>
+    <message>
+        <source>Weeks start on</source>
+        <translation>Почеток на недела</translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation>Недела</translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation>Понеделник</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>SystemTime</source>
+        <translation>Системско Време</translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation>Време</translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation>Формат</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Подесувања</translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation>Претпостави</translation>
+    </message>
+    <message>
+        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation>Баравте одложување за %1 минута, но само %2 минути поминаа по последното барање &lt;br&gt; Да продолжи?</translation>
+    </message>
+    <message>
+        <source>Continue?</source>
+        <translation>Продолжи?</translation>
+    </message>
+    <message>
+        <source>Running:
+ntpdate </source>
+        <translation>Работи: 
+ntpdate</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Грешка</translation>
+    </message>
+    <message>
+        <source>Error while getting time from network.</source>
+        <translation>Грешка при превземањето на времето од 
+мрежа.</translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation>Грешка со ntpdate</translation>
+    </message>
+    <message>
+        <source>Time Server</source>
+        <translation>Временски Сервер</translation>
+    </message>
+    <message>
+        <source>Error while getting time from
+ server: </source>
+        <translation>Грешка при превземањето на времето од 
+сервер:</translation>
+    </message>
+    <message>
+        <source>%1 seconds</source>
+        <translation>%1 секунди</translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation>Неможе да се поврзе со сервер</translation>
+    </message>
+</context>
+<context>
+    <name>NTPTabWidget</name>
+    <message>
+        <source>Start time</source>
+        <translation>Почетно време</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>н/а</translation>
+    </message>
+    <message>
+        <source>Time shift</source>
+        <translation>Поместување на време</translation>
+    </message>
+    <message>
+        <source>New time</source>
+        <translation>Ново време</translation>
+    </message>
+    <message>
+        <source>Get time from the network</source>
+        <translation>Земи време од мрежа</translation>
+    </message>
+</context>
+<context>
+    <name>PredictTabWidget</name>
+    <message>
+        <source>Predicted time drift</source>
+        <translation>Претпостави поминато време</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>n/a</translation>
+    </message>
+    <message>
+        <source>Estimated shift</source>
+        <translation>Претпоставено поместување</translation>
+    </message>
+    <message>
+        <source>Predicted time</source>
+        <translation>Претпоставено време</translation>
+    </message>
+    <message>
+        <source>Shift [s/h]</source>
+        <translation>Помести [s/h]</translation>
+    </message>
+    <message>
+        <source>Last [h]</source>
+        <translation>Последно [n]</translation>
+    </message>
+    <message>
+        <source>Offset [s]</source>
+        <translation>Поместување [s]</translation>
+    </message>
+    <message>
+        <source>Predict time</source>
+        <translation>Претпостави време</translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation>ПОстави претпоставено време</translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation>s/h</translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation>секунди</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsTabWidget</name>
+    <message>
+        <source>Time server</source>
+        <translation>Временски сервер</translation>
+    </message>
+    <message>
+        <source>minutes between time updates</source>
+        <translation>Минути помеѓу освежувања</translation>
+    </message>
+    <message>
+        <source>minutes between prediction updates</source>
+        <translation>минути помеѓу освежувања на претпоставки</translation>
+    </message>
+    <message>
+        <source>Display time server information</source>
+        <translation>Прикажи информации за сервер</translation>
+    </message>
+    <message>
+        <source>Display time prediction information</source>
+        <translation>Прикажи информации за претпоставки</translation>
+    </message>
+</context>
+<context>
+    <name>TimeTabWidget</name>
+    <message>
+        <source>Hour</source>
+        <translation>Саат</translation>
+    </message>
+    <message>
+        <source>Minute</source>
+        <translation>Минута</translation>
+    </message>
+    <message>
+        <source>AM</source>
+        <translation>АМ</translation>
+    </message>
+    <message>
+        <source>PM</source>
+        <translation>ПМ</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Датум</translation>
+    </message>
+    <message>
+        <source>Time zone</source>
+        <translation>Временска зона</translation>
+    </message>
+    <message>
+        <source>Get time from the network</source>
+        <translation>Земи време од мрежа</translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation>Постави претпоставено време</translation>
+    </message>
+</context>
+</TS>