feedc0de/QtZeiterfassung
1
0
Fork 0
Code Issues 28 Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Devel #56

Merged
0xFEEDC0DE64 merged 84 commits from devel into master 2017-12-29 13:34:28 +01:00
Conversation 0 Commits 84 Files Changed 223 +4135 -2648
184 changed files with 4135 additions and 2648 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2ef13fe0ff - Show all commits

36
plugins/presenceplugin/translations/presenceplugin_de.ts
View File

@@ -4,47 +4,31 @@
<context>
<name>PresenceWidget</name>
<message>
<location filename="../presencewidget.cpp" line="32"/>
<location filename="../presencewidget.cpp" line="24"/>
<source>Refresh presence</source>
<translation>Verfügbarkeit aktualisieren</translation>
</message>
<message>
<location filename="../presencewidget.cpp" line="44"/>
<location filename="../presencewidget.cpp" line="46"/>
<location filename="../presencewidget.cpp" line="74"/>
<location filename="../presencewidget.cpp" line="75"/>
<source>%0: %1</source>
<translation>%0: %1</translation>
</message>
<message>
<location filename="../presencewidget.cpp" line="44"/>
<location filename="../presencewidget.cpp" line="74"/>
<source>Available</source>
<translation>Verfügbar</translation>
</message>
<message>
<location filename="../presencewidget.cpp" line="44"/>
<location filename="../presencewidget.cpp" line="46"/>
<location filename="../presencewidget.cpp" line="38"/>
<source>???</source>
<translation>???</translation>
</message>
<message>
<location filename="../presencewidget.cpp" line="46"/>
<location filename="../presencewidget.cpp" line="75"/>
<source>Not available</source>
<translation>Nicht verfügbar</translation>
<location filename="../presencewidget.cpp" line="38"/>
<location filename="../presencewidget.cpp" line="79"/>
<source>%0 available, %1 not available</source>
<translation>%0 verfügbar, %1 nicht verfügbar</translation>
</message>
<message>
<location filename="../presencewidget.cpp" line="59"/>
<location filename="../presencewidget.cpp" line="60"/>
<location filename="../presencewidget.cpp" line="51"/>
<location filename="../presencewidget.cpp" line="52"/>
<source>Could not get presence status!</source>
<translation>Konnte Verfügbarkeit nicht laden!</translation>
</message>
<message>
<location filename="../presencewidget.cpp" line="67"/>
<location filename="../presencewidget.cpp" line="69"/>
<location filename="../presencewidget.cpp" line="76"/>
<source>%0 %1</source>
<translation type="unfinished"></translation>
<translation>%0 %1</translation>
</message>
</context>
</TS>

32
plugins/presenceplugin/translations/presenceplugin_en.ts
View File

@@ -4,45 +4,29 @@
<context>
<name>PresenceWidget</name>
<message>
<location filename="../presencewidget.cpp" line="32"/>
<location filename="../presencewidget.cpp" line="24"/>
<source>Refresh presence</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../presencewidget.cpp" line="44"/>
<location filename="../presencewidget.cpp" line="46"/>
<location filename="../presencewidget.cpp" line="74"/>
<location filename="../presencewidget.cpp" line="75"/>
<source>%0: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../presencewidget.cpp" line="44"/>
<location filename="../presencewidget.cpp" line="74"/>
<source>Available</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../presencewidget.cpp" line="44"/>
<location filename="../presencewidget.cpp" line="46"/>
<location filename="../presencewidget.cpp" line="38"/>
<source>???</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../presencewidget.cpp" line="46"/>
<location filename="../presencewidget.cpp" line="75"/>
<source>Not available</source>
<location filename="../presencewidget.cpp" line="38"/>
<location filename="../presencewidget.cpp" line="79"/>
<source>%0 available, %1 not available</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../presencewidget.cpp" line="59"/>
<location filename="../presencewidget.cpp" line="60"/>
<location filename="../presencewidget.cpp" line="51"/>
<location filename="../presencewidget.cpp" line="52"/>
<source>Could not get presence status!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../presencewidget.cpp" line="67"/>
<location filename="../presencewidget.cpp" line="69"/>
<location filename="../presencewidget.cpp" line="76"/>
<source>%0 %1</source>
<translation type="unfinished"></translation>
</message>

4
plugins/reportsplugin/reportswidget.cpp
View File

@@ -62,7 +62,7 @@ void ReportsWidget::refresh()
return;
}
setText(tr("Balance: %0, Holidays: %0").arg(tr("???")).arg(tr("???")));
setText(tr("Balance: %0, Holidays: %1").arg(tr("???")).arg(tr("???")));
m_actionRefreshReport->setEnabled(false);
m_actionOpenReport->setEnabled(false);
@@ -118,7 +118,7 @@ void ReportsWidget::finished()
}
}
setText(tr("Balance: %0, Holidays: %0").arg(balance).arg(holidays));
setText(tr("Balance: %0, Holidays: %1").arg(balance).arg(holidays));
{
QTemporaryFile file(QDir::temp().absoluteFilePath(QStringLiteral("reportXXXXXX.pdf")));

48
plugins/reportsplugin/translations/reportsplugin_de.ts
View File

@@ -4,68 +4,44 @@
<context>
<name>ReportsWidget</name>
<message>
<location filename="../reportswidget.cpp" line="35"/>
<location filename="../reportswidget.cpp" line="27"/>
<source>Refresh report</source>
<translation>Auswertung aktualisieren</translation>
</message>
<message>
<location filename="../reportswidget.cpp" line="38"/>
<location filename="../reportswidget.cpp" line="32"/>
<source>Open report</source>
<translation>Auswertung öffnen</translation>
</message>
<message>
<location filename="../reportswidget.cpp" line="71"/>
<location filename="../reportswidget.cpp" line="72"/>
<location filename="../reportswidget.cpp" line="101"/>
<location filename="../reportswidget.cpp" line="105"/>
<location filename="../reportswidget.cpp" line="114"/>
<location filename="../reportswidget.cpp" line="117"/>
<source>%0: %1</source>
<translation>%0: %1</translation>
</message>
<message>
<location filename="../reportswidget.cpp" line="71"/>
<location filename="../reportswidget.cpp" line="101"/>
<location filename="../reportswidget.cpp" line="105"/>
<source>Balance</source>
<translation>Gleitzeit</translation>
</message>
<message>
<location filename="../reportswidget.cpp" line="71"/>
<location filename="../reportswidget.cpp" line="72"/>
<location filename="../reportswidget.cpp" line="65"/>
<source>???</source>
<translation>???</translation>
</message>
<message>
<location filename="../reportswidget.cpp" line="72"/>
<location filename="../reportswidget.cpp" line="114"/>
<location filename="../reportswidget.cpp" line="117"/>
<source>Holidays</source>
<translation>Urlaub</translation>
<location filename="../reportswidget.cpp" line="65"/>
<location filename="../reportswidget.cpp" line="121"/>
<source>Balance: %0, Holidays: %1</source>
<translation>Gleitzeit: %0, Urlaub: %1</translation>
</message>
<message>
<location filename="../reportswidget.cpp" line="83"/>
<location filename="../reportswidget.cpp" line="79"/>
<source>Could not load report!</source>
<translation>Konnte Auswertung nicht laden!</translation>
</message>
<message>
<location filename="../reportswidget.cpp" line="101"/>
<source>%0h</source>
<translation>%0h</translation>
</message>
<message>
<location filename="../reportswidget.cpp" line="105"/>
<location filename="../reportswidget.cpp" line="117"/>
<location filename="../reportswidget.cpp" line="102"/>
<location filename="../reportswidget.cpp" line="116"/>
<source>n/a</source>
<translation>n/v</translation>
</message>
<message>
<location filename="../reportswidget.cpp" line="127"/>
<location filename="../reportswidget.cpp" line="128"/>
<source>Could not write report!</source>
<translation>Konnte Auswertung nicht abspeichern!</translation>
</message>
<message>
<location filename="../reportswidget.cpp" line="147"/>
<location filename="../reportswidget.cpp" line="148"/>
<source>Could not launch your default PDF viewer!</source>
<translation>Konnte Standard-PDF-Viewer nicht öffnen!</translation>
</message>

46
plugins/reportsplugin/translations/reportsplugin_en.ts
View File

@@ -4,68 +4,44 @@
<context>
<name>ReportsWidget</name>
<message>
<location filename="../reportswidget.cpp" line="35"/>
<location filename="../reportswidget.cpp" line="27"/>
<source>Refresh report</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../reportswidget.cpp" line="38"/>
<location filename="../reportswidget.cpp" line="32"/>
<source>Open report</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../reportswidget.cpp" line="71"/>
<location filename="../reportswidget.cpp" line="72"/>
<location filename="../reportswidget.cpp" line="101"/>
<location filename="../reportswidget.cpp" line="105"/>
<location filename="../reportswidget.cpp" line="114"/>
<location filename="../reportswidget.cpp" line="117"/>
<source>%0: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../reportswidget.cpp" line="71"/>
<location filename="../reportswidget.cpp" line="101"/>
<location filename="../reportswidget.cpp" line="105"/>
<source>Balance</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../reportswidget.cpp" line="71"/>
<location filename="../reportswidget.cpp" line="72"/>
<location filename="../reportswidget.cpp" line="65"/>
<source>???</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../reportswidget.cpp" line="72"/>
<location filename="../reportswidget.cpp" line="114"/>
<location filename="../reportswidget.cpp" line="117"/>
<source>Holidays</source>
<location filename="../reportswidget.cpp" line="65"/>
<location filename="../reportswidget.cpp" line="121"/>
<source>Balance: %0, Holidays: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../reportswidget.cpp" line="83"/>
<location filename="../reportswidget.cpp" line="79"/>
<source>Could not load report!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../reportswidget.cpp" line="101"/>
<source>%0h</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../reportswidget.cpp" line="105"/>
<location filename="../reportswidget.cpp" line="117"/>
<location filename="../reportswidget.cpp" line="102"/>
<location filename="../reportswidget.cpp" line="116"/>
<source>n/a</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../reportswidget.cpp" line="127"/>
<location filename="../reportswidget.cpp" line="128"/>
<source>Could not write report!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../reportswidget.cpp" line="147"/>
<location filename="../reportswidget.cpp" line="148"/>
<source>Could not launch your default PDF viewer!</source>
<translation type="unfinished"></translation>
</message>