Devel #56

Merged
0xFEEDC0DE64 merged 84 commits from devel into master 2017-12-29 13:34:28 +01:00
195 changed files with 4295 additions and 2846 deletions
Showing only changes of commit 6c1a362396 - Show all commits

View File

@@ -13,11 +13,12 @@ mkdir build_QtZeiterfassung
cd build_QtZeiterfassung
qmake ../QtZeiterfassung
make
make install # only needed on first build to copy Qt resources
```
## Launching (on unix)
```
LD_LIBRARY_PATH=../lib ./zeiterfassung # or just use start.sh
./zeiterfassung.sh
```
## Launching (on win32)

View File

@@ -14,12 +14,12 @@
<translation>Lade...</translation>
</message>
<message>
<location filename="../lunchmealdialog.cpp" line="26"/>
<location filename="../lunchmealdialog.cpp" line="18"/>
<source>Lunch meal for %0</source>
<translation>Mittagsmenü vom %0</translation>
</message>
<message>
<location filename="../lunchmealdialog.cpp" line="26"/>
<location filename="../lunchmealdialog.cpp" line="18"/>
<source>dd.MM.yyyy</source>
<translation>dd.MM.yyyy</translation>
</message>
@@ -27,9 +27,15 @@
<context>
<name>LunchMealWidget</name>
<message>
<location filename="../lunchmealwidget.cpp" line="16"/>
<location filename="../lunchmealwidget.cpp" line="22"/>
<source>Lunch meal</source>
<translation>Mittagsmenü</translation>
</message>
<message>
<location filename="../lunchmealwidget.cpp" line="57"/>
<location filename="../lunchmealwidget.cpp" line="58"/>
<source>Could not load lunch meal!</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

View File

@@ -14,12 +14,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../lunchmealdialog.cpp" line="26"/>
<location filename="../lunchmealdialog.cpp" line="18"/>
<source>Lunch meal for %0</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../lunchmealdialog.cpp" line="26"/>
<location filename="../lunchmealdialog.cpp" line="18"/>
<source>dd.MM.yyyy</source>
<translation type="unfinished"></translation>
</message>
@@ -27,9 +27,15 @@
<context>
<name>LunchMealWidget</name>
<message>
<location filename="../lunchmealwidget.cpp" line="16"/>
<location filename="../lunchmealwidget.cpp" line="22"/>
<source>Lunch meal</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../lunchmealwidget.cpp" line="57"/>
<location filename="../lunchmealwidget.cpp" line="58"/>
<source>Could not load lunch meal!</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>