From 00192e487a12e0ac0bc58bbe81b895fcc2b42cfc Mon Sep 17 00:00:00 2001
From: Carmen <carmen@localhost.localdomain>
Date: Sat, 4 Jan 2020 19:50:04 +0100
Subject: [PATCH 1/2] Fix error in .ts files for building rpm successful

---
 translations/harbour-seaprint-de.ts    |   2 +-
 translations/harbour-seaprint-es.ts    |   2 +-
 translations/harbour-seaprint-fr.ts    |   2 +-
 translations/harbour-seaprint-zh_CN.ts | 156 +++++++++++++++----------
 translations/harbour-seaprint.ts       |   4 +
 5 files changed, 99 insertions(+), 67 deletions(-)

diff --git a/translations/harbour-seaprint-de.ts b/translations/harbour-seaprint-de.ts
index 1351a3e..69bcb0e 100644
--- a/translations/harbour-seaprint-de.ts
+++ b/translations/harbour-seaprint-de.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="de">
 <context>
     <name>AboutPage</name>
     <message>
diff --git a/translations/harbour-seaprint-es.ts b/translations/harbour-seaprint-es.ts
index 19d2213..a72bee4 100644
--- a/translations/harbour-seaprint-es.ts
+++ b/translations/harbour-seaprint-es.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1" language="es_ES">
+<TS version="2.1" language="es">
 <context>
     <name>AboutPage</name>
     <message>
diff --git a/translations/harbour-seaprint-fr.ts b/translations/harbour-seaprint-fr.ts
index de3e574..97ecd40 100644
--- a/translations/harbour-seaprint-fr.ts
+++ b/translations/harbour-seaprint-fr.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="fr">
 <context>
     <name>AboutPage</name>
     <message>
diff --git a/translations/harbour-seaprint-zh_CN.ts b/translations/harbour-seaprint-zh_CN.ts
index d4641b0..1263400 100644
--- a/translations/harbour-seaprint-zh_CN.ts
+++ b/translations/harbour-seaprint-zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="zh_CN">
 <context>
     <name>AboutPage</name>
     <message>
@@ -13,7 +13,7 @@
     </message>
     <message>
         <source>About</source>
-        <translation><关于/translation>
+        <translation>关于</translation>
     </message>
     <message>
         <source>Network printing for Sailfish OS.</source>
@@ -53,12 +53,16 @@
     </message>
     <message>
         <source>French</source>
-        <translation><法语/translation>
+        <translation>法语</translation>
     </message>
     <message>
         <source>Code and Testing - Rudi Timmermans</source>
         <translation type="unfinished">代码及测试 - Rudi Timmermans</translation>
     </message>
+    <message>
+        <source>Spanish</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AddPrinterDialog</name>
@@ -80,54 +84,7 @@
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ChoiceSetting</name>
-    <message>
-        <source>draft</source>
-        <translation>草稿</translation>
-    </message>
-    <message>
-        <source>normal</source>
-        <translation>正常</translation>
-    </message>
-    <message>
-        <source>high</source>
-        <translation>高质量</translation>
-    </message>
-    <message>
-        <source>unknown quality </source>
-        <translation>质量未知</translation>
-    </message>
-    <message>
-        <source>portrait</source>
-        <translation>竖屏</translation>
-    </message>
-    <message>
-        <source>landscape</source>
-        <translation>横屏</translation>
-    </message>
-    <message>
-        <source>reverse landscape</source>
-        <translation>竖屏可旋转</translation>
-    </message>
-    <message>
-        <source>reverse portrait</source>
-        <translation>横屏可旋转</translation>
-    </message>
-    <message>
-        <source>unknown orientation </source>
-        <translation>方向位置</translation>
-    </message>
-    <message>
-        <source>dpi</source>
-        <translation>dpi</translation>
-    </message>
-    <message>
-        <source>dots/cm</source>
-        <translation>点/厘米</translation>
+        <translation type="unfinished">未知</translation>
     </message>
 </context>
 <context>
@@ -163,14 +120,6 @@
         <source>None</source>
         <translation>无</translation>
     </message>
-    <message>
-        <source>About SeaPrint</source>
-        <translation>关于 SeaPrint（海印）</translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation>未知</translation>
-    </message>
     <message>
         <source>View jobs</source>
         <translation>查看作业</translation>
@@ -183,9 +132,13 @@
         <source>Removing printer</source>
         <translation>正在移除打印机</translation>
     </message>
+    <message>
+        <source>About SeaPrint</source>
+        <translation>关于 SeaPrint（海印）</translation>
+    </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>未知</translation>
     </message>
 </context>
 <context>
@@ -241,10 +194,6 @@
         <source>Resolution</source>
         <translation>分辨率</translation>
     </message>
-    <message>
-        <source>Unknown</source>
-        <translation>未知</translation>
-    </message>
     <message>
         <source>Print success: </source>
         <translation>打印成功:</translation>
@@ -254,4 +203,83 @@
         <translation>打印失败:</translation>
     </message>
 </context>
+<context>
+    <name>utils</name>
+    <message>
+        <source>pending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pending-held</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>processing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>processing-stopped</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>canceled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>aborted</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>unknown state </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>draft</source>
+        <translation type="unfinished">草稿</translation>
+    </message>
+    <message>
+        <source>normal</source>
+        <translation type="unfinished">正常</translation>
+    </message>
+    <message>
+        <source>high</source>
+        <translation type="unfinished">高质量</translation>
+    </message>
+    <message>
+        <source>unknown quality </source>
+        <translation type="unfinished">质量未知</translation>
+    </message>
+    <message>
+        <source>portrait</source>
+        <translation type="unfinished">竖屏</translation>
+    </message>
+    <message>
+        <source>landscape</source>
+        <translation type="unfinished">横屏</translation>
+    </message>
+    <message>
+        <source>reverse landscape</source>
+        <translation type="unfinished">竖屏可旋转</translation>
+    </message>
+    <message>
+        <source>reverse portrait</source>
+        <translation type="unfinished">横屏可旋转</translation>
+    </message>
+    <message>
+        <source>unknown orientation </source>
+        <translation type="unfinished">方向位置</translation>
+    </message>
+    <message>
+        <source>dpi</source>
+        <translation type="unfinished">dpi</translation>
+    </message>
+    <message>
+        <source>dots/cm</source>
+        <translation type="unfinished">点/厘米</translation>
+    </message>
+</context>
 </TS>
diff --git a/translations/harbour-seaprint.ts b/translations/harbour-seaprint.ts
index be5a5df..1351a3e 100644
--- a/translations/harbour-seaprint.ts
+++ b/translations/harbour-seaprint.ts
@@ -59,6 +59,10 @@
         <source>Code and Testing - Rudi Timmermans</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Spanish</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AddPrinterDialog</name>

From 7808437dfd45693ecc8dd639ffc5d2e81da2cc41 Mon Sep 17 00:00:00 2001
From: Carmen <carmen@localhost.localdomain>
Date: Sat, 4 Jan 2020 19:58:47 +0100
Subject: [PATCH 2/2] Added new string to translate

---
 qml/pages/utils.js                     | 2 +-
 translations/harbour-seaprint-de.ts    | 4 ++++
 translations/harbour-seaprint-es.ts    | 4 ++++
 translations/harbour-seaprint-fr.ts    | 4 ++++
 translations/harbour-seaprint-zh_CN.ts | 4 ++++
 translations/harbour-seaprint.ts       | 4 ++++
 6 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/qml/pages/utils.js b/qml/pages/utils.js
index ed3e6a5..91a5501 100644
--- a/qml/pages/utils.js
+++ b/qml/pages/utils.js
@@ -13,7 +13,7 @@ function supported_formats(printer)
 
      if(supported.length == 0)
      {
-         supported.push("No relevant formats supported")
+         supported.push(qsTr("No relevant formats supported"))
      }
 
      return supported.join(" ");
diff --git a/translations/harbour-seaprint-de.ts b/translations/harbour-seaprint-de.ts
index 69bcb0e..fff0ee0 100644
--- a/translations/harbour-seaprint-de.ts
+++ b/translations/harbour-seaprint-de.ts
@@ -281,5 +281,9 @@
         <source>dots/cm</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>No relevant formats supported</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/harbour-seaprint-es.ts b/translations/harbour-seaprint-es.ts
index a72bee4..52192a9 100644
--- a/translations/harbour-seaprint-es.ts
+++ b/translations/harbour-seaprint-es.ts
@@ -281,5 +281,9 @@
         <source>dots/cm</source>
         <translation>ppp</translation>
     </message>
+    <message>
+        <source>No relevant formats supported</source>
+        <translation>No hay formatos relevantes compatibles</translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/harbour-seaprint-fr.ts b/translations/harbour-seaprint-fr.ts
index 97ecd40..22cd13e 100644
--- a/translations/harbour-seaprint-fr.ts
+++ b/translations/harbour-seaprint-fr.ts
@@ -281,5 +281,9 @@
         <source>dots/cm</source>
         <translation type="unfinished">pts/cm</translation>
     </message>
+    <message>
+        <source>No relevant formats supported</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/harbour-seaprint-zh_CN.ts b/translations/harbour-seaprint-zh_CN.ts
index 1263400..6559d79 100644
--- a/translations/harbour-seaprint-zh_CN.ts
+++ b/translations/harbour-seaprint-zh_CN.ts
@@ -281,5 +281,9 @@
         <source>dots/cm</source>
         <translation type="unfinished">点/厘米</translation>
     </message>
+    <message>
+        <source>No relevant formats supported</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/harbour-seaprint.ts b/translations/harbour-seaprint.ts
index 1351a3e..4ed5604 100644
--- a/translations/harbour-seaprint.ts
+++ b/translations/harbour-seaprint.ts
@@ -281,5 +281,9 @@
         <source>dots/cm</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>No relevant formats supported</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>