Merge from BRANCH_1_0.

1 files changed, 135 insertions, 0 deletions

diff --git a/i18n/mk/networksettings.ts b/i18n/mk/networksettings.ts
new file mode 100644
index 0000000..cbe4bc1
--- a/dev/null
+++ b/i18n/mk/networksettings.ts
@@ -0,0 +1,135 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AddConnection</name>
+    <message>
+        <source>Add Network Connection</source>
+        <translation>Додади поврзување на мрежа</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Откажи</translation>
+    </message>
+    <message>
+        <source>&amp;Add</source>
+        <translation>&amp;Додај</translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation>Сервиси</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Network Settings</source>
+        <translation>Подесувања на мрежа</translation>
+    </message>
+    <message>
+        <source>Connections</source>
+        <translation>Конекции</translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation>с</translation>
+    </message>
+    <message>
+        <source>t</source>
+        <translation>т</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Име</translation>
+    </message>
+    <message>
+        <source>in</source>
+        <translation>во</translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation>IP</translation>
+    </message>
+    <message>
+        <source>&amp;Add</source>
+        <translation>&amp;Додај</translation>
+    </message>
+    <message>
+        <source>&amp;Information</source>
+        <translation type="obsolete">&amp;Информации</translation>
+    </message>
+    <message>
+        <source>&amp;Configure</source>
+        <translation>&amp;Подеси</translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation>&amp;Отстрани</translation>
+    </message>
+    <message>
+        <source>Profiles</source>
+        <translation>Профили</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation>Сите</translation>
+    </message>
+    <message>
+        <source>&amp;Set Current</source>
+        <translation>&amp;Постави моментален</translation>
+    </message>
+    <message>
+        <source>Current Profile</source>
+        <translation>Моментален профил</translation>
+    </message>
+    <message>
+        <source>New Profile</source>
+        <translation>Нов Профил</translation>
+    </message>
+    <message>
+        <source>A list of network settings to be choosen from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add a new interface to the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Start/Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start and Stop the current interface, gives additional information about the interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure the current interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove the current interface from the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindowImp</name>
+    <message>
+        <source>Disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to remove.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select an interface first.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>