# HG changeset patch
# User Andre Heinecke <andre.heinecke@intevation.de>
# Date 1460727291 -7200
# Node ID f6c53e896008fde83a262e075f67ce7ab163829a
# Parent  7458f113314c6eb35540f8a52b0558e2b064deea# Parent  5354cbda7188eacf5128830e246de409028fbb6b
Merge

diff -r 5354cbda7188 -r f6c53e896008 .hgtags
--- a/.hgtags	Fri Apr 15 15:19:04 2016 +0200
+++ b/.hgtags	Fri Apr 15 15:34:51 2016 +0200
@@ -2,3 +2,5 @@
 0129971c7046fb0f22e89c417c5971dd1f88844e 0.8
 0129971c7046fb0f22e89c417c5971dd1f88844e 0.8
 0000000000000000000000000000000000000000 0.8
+0000000000000000000000000000000000000000 0.8
+ca66763b65247255276d8628fb21535ce1d1dbcb 0.8
diff -r 5354cbda7188 -r f6c53e896008 src/converter.cpp
--- a/src/converter.cpp	Fri Apr 15 15:19:04 2016 +0200
+++ b/src/converter.cpp	Fri Apr 15 15:34:51 2016 +0200
@@ -235,7 +235,7 @@
                     mErrors << "Unparsable number in string: " + choiceMatch.captured();
                 }
                 makeBar(html, percent, doc);
-                xlsx.write(row, 2, percent);
+                xlsx.write(row, 2, percent == 0 ? QVariant() : percent);
                 const QString numStr = choiceMatch.captured("num");
                 const QString numVotesString = QString("%1% | %2 Number of votes").
                            arg(percentStr.isNull() ? QStringLiteral("0") : percentStr).
@@ -256,13 +256,10 @@
                 const QString choice = choiceMatch.captured(1);
                 cursor = choiceMatch.capturedEnd();
                 /* Alternative answer that is just a list of strings */
-                qDebug() << choiceAltEx.captureCount();
-                qDebug() << choiceMatch.captured(2);
-                qDebug() << choiceMatch.capturedTexts();
                 qDebug() << "Caputured unfilled choice: " << choice;
                 html << mChoiceTextStyle.arg(choice.toHtmlEscaped());
                 makeBar(html, 0, doc);
-                xlsx.write(row, 2, 0);
+                xlsx.write(row, 2, QVariant());
                 const QString numVotesString = QStringLiteral("Keine eingegangenen Antworten");
                 html << mChoiceVotesStyle.arg(numVotesString.toHtmlEscaped());
                 xlsx.write(row, 3, numVotesString, mChoiceVotesFmt);
diff -r 5354cbda7188 -r f6c53e896008 src/l10n/main_de_DE.ts
--- a/src/l10n/main_de_DE.ts	Fri Apr 15 15:19:04 2016 +0200
+++ b/src/l10n/main_de_DE.ts	Fri Apr 15 15:34:51 2016 +0200
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="de_DE">
+<TS version="2.0" language="de_DE">
 <context>
     <name></name>
     <message>
@@ -66,7 +66,8 @@
         <location filename="../cconvert_options.h" line="23"/>
         <source>The file type is determined by the extension
 Either: .pdf .html or .xlsx (default)</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Dateityp ist abhaengig von der Dateiendung
+Entweder: .pdf .html oder .xlsx (standard)</translation>
     </message>
     <message>
         <location filename="../cconvert_options.h" line="24"/>