Merge branch 'master' of https://git.bukova.info/repos/git/prodejna

# Conflicts: # shop/receiptsaveform.cpp # shop/shopform.cpp
2017-02-24 21:26:55 +01:00
parent 452d58ac4f 402535c40c
commit abed951e1f
56 changed files with 2480 additions and 159 deletions
@@ -20,7 +20,7 @@
    <message>
        <location filename="../mainwindow.ui" line="14"/>
        <source>MainWindow</source>
-        <translation>Nastaveni</translation>
+        <translation type="unfinished">Prodejna</translation>
    </message>
    <message>
        <location filename="../mainwindow.ui" line="64"/>