Translations ready for pootle

diff --git a/ipypbx.pro b/ipypbx.pro
index f529326..1c5883d 100644 (file)
--- a/ipypbx.pro
+++ b/ipypbx.pro
@@ -1,3 +1,3 @@
-SOURCES = ui/layout.ui
+SOURCES = src/ipypbx/ui.py
 TRANSLATIONS = src/ipypbx/locale/ipypbx_ru.ts src/ipypbx/locale/ipypbx_fi.ts
 

diff --git a/src/ipypbx/locale/ipypbx_fi.qm b/src/ipypbx/locale/ipypbx_fi.qm
index 9dad8df..be651ee 100644 (file)
Binary files a/src/ipypbx/locale/ipypbx_fi.qm and b/src/ipypbx/locale/ipypbx_fi.qm differ

diff --git a/src/ipypbx/locale/ipypbx_fi.ts b/src/ipypbx/locale/ipypbx_fi.ts
index 2ee1791..35c37a5 100644 (file)
--- a/src/ipypbx/locale/ipypbx_fi.ts
+++ b/src/ipypbx/locale/ipypbx_fi.ts
@@ -1,219 +1,184 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="fi_FI">
+<!DOCTYPE TS><TS version="1.1">
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../../ui/layout.ui" line="14"/>
+        <location filename="src/ipypbx/ui.py" line="425"/>
         <source>IPyPBX</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="37"/>
-        <source>Connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ui/layout.ui" line="60"/>
-        <location filename="../../ui/layout.ui" line="180"/>
-        <location filename="../../ui/layout.ui" line="418"/>
+        <location filename="src/ipypbx/ui.py" line="456"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="70"/>
-        <source>Port</source>
+        <location filename="src/ipypbx/ui.py" line="427"/>
+        <source>Local Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="80"/>
-        <source>IP address</source>
+        <location filename="src/ipypbx/ui.py" line="428"/>
+        <source>Freeswitch Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="90"/>
-        <source>Freeswitch Port</source>
+        <location filename="src/ipypbx/ui.py" line="429"/>
+        <source>Local IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="100"/>
+        <location filename="src/ipypbx/ui.py" line="430"/>
         <source>Freeswitch IP Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="112"/>
-        <location filename="../../ui/layout.ui" line="273"/>
-        <location filename="../../ui/layout.ui" line="310"/>
-        <location filename="../../ui/layout.ui" line="385"/>
-        <location filename="../../ui/layout.ui" line="616"/>
+        <location filename="src/ipypbx/ui.py" line="472"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="119"/>
-        <location filename="../../ui/layout.ui" line="280"/>
-        <location filename="../../ui/layout.ui" line="317"/>
-        <location filename="../../ui/layout.ui" line="392"/>
-        <location filename="../../ui/layout.ui" line="623"/>
+        <location filename="src/ipypbx/ui.py" line="473"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="129"/>
-        <source>Clone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ui/layout.ui" line="145"/>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ui/layout.ui" line="160"/>
-        <source>SIP Profiles</source>
+        <location filename="src/ipypbx/ui.py" line="433"/>
+        <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="190"/>
+        <location filename="src/ipypbx/ui.py" line="435"/>
         <source>External RTP IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="200"/>
+        <location filename="src/ipypbx/ui.py" line="436"/>
         <source>External SIP IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="210"/>
+        <location filename="src/ipypbx/ui.py" line="437"/>
         <source>RTP IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="220"/>
+        <location filename="src/ipypbx/ui.py" line="438"/>
         <source>SIP IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="230"/>
+        <location filename="src/ipypbx/ui.py" line="439"/>
         <source>SIP Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="240"/>
+        <location filename="src/ipypbx/ui.py" line="440"/>
         <source>Accept Blind Registration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="247"/>
-        <location filename="../../ui/layout.ui" line="673"/>
+        <location filename="src/ipypbx/ui.py" line="479"/>
         <source>Authenticate Calls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="261"/>
-        <location filename="../../ui/layout.ui" line="353"/>
-        <location filename="../../ui/layout.ui" line="470"/>
-        <location filename="../../ui/layout.ui" line="581"/>
-        <location filename="../../ui/layout.ui" line="663"/>
+        <location filename="src/ipypbx/ui.py" line="478"/>
         <source>Is Active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="632"/>
-        <source>XML Dialplan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ui/layout.ui" line="642"/>
-        <source>Destination Match</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ui/layout.ui" line="656"/>
-        <source>Endpoint</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ui/layout.ui" line="292"/>
-        <source>Domains</source>
+        <location filename="src/ipypbx/ui.py" line="445"/>
+        <source>SIP Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="329"/>
+        <location filename="src/ipypbx/ui.py" line="448"/>
         <source>Host Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="343"/>
-        <location filename="../../ui/layout.ui" line="435"/>
+        <location filename="src/ipypbx/ui.py" line="458"/>
         <source>SIP Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="367"/>
-        <source>Gateways</source>
+        <location filename="src/ipypbx/ui.py" line="451"/>
+        <source>Domains</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="404"/>
+        <location filename="src/ipypbx/ui.py" line="454"/>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="411"/>
-        <location filename="../../ui/layout.ui" line="557"/>
+        <location filename="src/ipypbx/ui.py" line="468"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="428"/>
+        <location filename="src/ipypbx/ui.py" line="457"/>
         <source>Realm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="442"/>
+        <location filename="src/ipypbx/ui.py" line="459"/>
         <source>From Domain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="449"/>
+        <location filename="src/ipypbx/ui.py" line="460"/>
         <source>Expire In Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="456"/>
+        <location filename="src/ipypbx/ui.py" line="461"/>
         <source>Retry In Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="480"/>
+        <location filename="src/ipypbx/ui.py" line="463"/>
         <source>Caller ID In &quot;From&quot; Field</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="531"/>
-        <location filename="../../ui/layout.ui" line="538"/>
-        <source>PushButton</source>
+        <location filename="src/ipypbx/ui.py" line="464"/>
+        <source>Gateways</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/ipypbx/ui.py" line="467"/>
+        <source>User ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="516"/>
+        <location filename="src/ipypbx/ui.py" line="476"/>
+        <source>Domain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/ipypbx/ui.py" line="471"/>
         <source>Endpoints</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="547"/>
-        <source>User ID</source>
+        <location filename="src/ipypbx/ui.py" line="474"/>
+        <source>XML Dialplan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="564"/>
-        <location filename="../../ui/layout.ui" line="649"/>
-        <source>Domain</source>
+        <location filename="src/ipypbx/ui.py" line="475"/>
+        <source>Destination Match</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/ipypbx/ui.py" line="477"/>
+        <source>Endpoint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ui/layout.ui" line="598"/>
+        <location filename="src/ipypbx/ui.py" line="480"/>
         <source>Extensions</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/ipypbx/locale/ipypbx_ru.qm b/src/ipypbx/locale/ipypbx_ru.qm
index 7431612..bf6a644 100644 (file)
Binary files a/src/ipypbx/locale/ipypbx_ru.qm and b/src/ipypbx/locale/ipypbx_ru.qm differ

diff --git a/src/ipypbx/locale/ipypbx_ru.ts b/src/ipypbx/locale/ipypbx_ru.ts
index 4c049b8..35c37a5 100644 (file)
--- a/src/ipypbx/locale/ipypbx_ru.ts
+++ b/src/ipypbx/locale/ipypbx_ru.ts
@@ -1,163 +1,186 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="ru_RU">
+<!DOCTYPE TS><TS version="1.1">
 <context>
     <name>MainWindow</name>
     <message>
-        <source>Connections</source>
+        <location filename="src/ipypbx/ui.py" line="425"/>
+        <source>IPyPBX</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="456"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Port</source>
+        <location filename="src/ipypbx/ui.py" line="427"/>
+        <source>Local Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>IP address</source>
+        <location filename="src/ipypbx/ui.py" line="428"/>
+        <source>Freeswitch Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Freeswitch Port</source>
+        <location filename="src/ipypbx/ui.py" line="429"/>
+        <source>Local IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="430"/>
         <source>Freeswitch IP Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="472"/>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="473"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SIP Profiles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Domains</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PushButton</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Endpoints</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Extensions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IPyPBX</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect</source>
+        <location filename="src/ipypbx/ui.py" line="433"/>
+        <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="435"/>
         <source>External RTP IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="436"/>
         <source>External SIP IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="437"/>
         <source>RTP IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="438"/>
         <source>SIP IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="439"/>
         <source>SIP Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="440"/>
         <source>Accept Blind Registration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="479"/>
         <source>Authenticate Calls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="478"/>
         <source>Is Active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="445"/>
+        <source>SIP Profiles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/ipypbx/ui.py" line="448"/>
         <source>Host Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="458"/>
         <source>SIP Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gateways</source>
+        <location filename="src/ipypbx/ui.py" line="451"/>
+        <source>Domains</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="454"/>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="468"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="457"/>
         <source>Realm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="459"/>
         <source>From Domain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="460"/>
         <source>Expire In Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="461"/>
         <source>Retry In Seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="463"/>
         <source>Caller ID In &quot;From&quot; Field</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="464"/>
+        <source>Gateways</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/ipypbx/ui.py" line="467"/>
         <source>User ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="476"/>
         <source>Domain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="471"/>
+        <source>Endpoints</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/ipypbx/ui.py" line="474"/>
         <source>XML Dialplan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="475"/>
         <source>Destination Match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="src/ipypbx/ui.py" line="477"/>
         <source>Endpoint</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="src/ipypbx/ui.py" line="480"/>
+        <source>Extensions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>

diff --git a/src/ipypbx/main.py b/src/ipypbx/main.py
index 2453783..aeb2478 100644 (file)
--- a/src/ipypbx/main.py
+++ b/src/ipypbx/main.py
@@ -22,7 +22,6 @@ from PyQt4 import QtCore, QtGui, QtSql
 
 
 # Working directory path.
-# NOTE: ~/.ipypbx gives an error - for some reason QT doesn't like the dot?
 PREFIX = os.path.expanduser('~/.ipypbx')
 
 # Database file name.
@@ -65,21 +64,23 @@ def setupDb(prefix=PREFIX, dbname=DB_NAME):
         sys.exit(1)
 
 
-def localize():
+if __name__ == '__main__':
+    app = QtGui.QApplication(sys.argv)
+
     locale = QtCore.QLocale.system().name()
     translator = QtCore.QTranslator()
     
+#    if translator.load("/home/antisvin/dev/git/ipypbx/src/ipypbx/locale/ipypbx_ru.qm"):
     if translator.load("ipypbx_%s" % locale.toLower(), "ipypbx/locale"):
         QtGui.QApplication.installTranslator(translator)
+    else:
+        print locale
+    print translator.translate('MainWindow', 'Name').toUtf8()
 
-    
-if __name__ == '__main__':
-    app = QtGui.QApplication(sys.argv)
     setupDb()
     main = QtGui.QMainWindow()
     views = ui.Ui_MainWindow()
     views.setupUi(main)
-    localize()
     main.show()
 
     for controllerClass in (