Translation

Lechindianer · Oct 12, 2015 · eaec99c · eaec99c
1 parent 9d52fd9
commit eaec99c
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 39 deletions.
diff --git a/Beerware.png b/Beerware.png
diff --git a/assets/beerware.png b/assets/beerware.png
diff --git a/qml/pages/About.qml b/qml/pages/About.qml
@@ -63,7 +63,7 @@ Page {
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.top: desc.bottom
         anchors.topMargin: Theme.paddingLarge
-        text: qsTr("<b>Copyright</b>: Pascal Schmid <br /><b>License: </b>Beerware (Revision 42)")
+        text: "<b>Copyright</b>: Pascal Schmid <br /><b>License: </b>Beerware (Revision 42)"
         color: Theme.primaryColor
     }
 

diff --git a/qml/pages/BeerModel.qml b/qml/pages/BeerModel.qml
@@ -3,8 +3,8 @@ import QtQuick 2.0
 
 ListModel {
 
-    property string sortColumnNameFirst: "section"
-    property string sortColumnNameSecond: "category" // TODO: Sort categories according to rating
+    property string sortColumnNameFirst: "category"
+    property string sortColumnNameSecond: "rating" // TODO: Sort categories according to rating
 
     function swap(a,b) {
         if (a<b) {

diff --git a/qml/pages/FirstPage.qml b/qml/pages/FirstPage.qml
@@ -10,7 +10,7 @@ Page {
         model: BeerModel { id: beerModel }
         anchors.fill: parent
         header: PageHeader {
-            title: qsTr("Beerware")
+            title: "Beerware"
         }
         section {
             property: 'category'
@@ -25,15 +25,15 @@ Page {
             ListView.onRemove: animateRemoval(listItem)
 
             function remove() {
-                remorseAction("Deleting", function() { beerModel.remove(index) })
+                remorseAction(qsTr("Deleting"), function() { beerModel.remove(index) })
                 DB.removeBeer(beerModel.get(index).name, beerModel.get(index).category)
             }
 
             Component {
                 id: contextMenu
                 ContextMenu {
                     MenuItem {
-                        text: "Remove"
+                        text: qsTr("Remove")
                         onClicked: remove()
                     }
                 }
@@ -51,6 +51,7 @@ Page {
                 id: row
                 width: parent.width / 3
                 anchors.right: parent.right
+                anchors.rightMargin: 5
                 anchors.verticalCenter: parent.verticalCenter
                 GlassItem {
                     color: "white"
@@ -108,7 +109,7 @@ Page {
             }
 
             MenuItem {
-                text: "Add Beer"
+                text: "Add beer"
                 onClicked: {
                     pageStack.push(Qt.resolvedUrl("NewBeer.qml"), {"listModel": beerModel})
                 }
@@ -125,7 +126,7 @@ Page {
 
         ViewPlaceholder {
             id: emptyText
-            text: 'No entries'
+            text: qsTr('No entries')
             enabled: beerModel.count === 0
         }
 

diff --git a/qml/pages/NewBeer.qml b/qml/pages/NewBeer.qml
@@ -31,7 +31,7 @@ Dialog {
             id: beerName
             width: parent.width
             label: qsTr("Beer name")
-            placeholderText: qsTr("New Beer")
+            placeholderText: qsTr("New beer")
             focus: true
             EnterKey.enabled: text.length > 0
             EnterKey.iconSource: "image://theme/icon-m-enter-next"

diff --git a/translations/Beerware-de.ts b/translations/Beerware-de.ts
@@ -1,41 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="de_DE">
 <context>
     <name>About</name>
     <message>
         <source>Rate you favourite beers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Copyright&lt;/b&gt;: Pascal Schmid &lt;br /&gt;&lt;b&gt;License: &lt;/b&gt;Beerware (Revision 42)</source>
-        <translation type="unfinished"></translation>
+        <translation>Bewerte deine Lieblingsbiere</translation>
     </message>
 </context>
 <context>
     <name>FirstPage</name>
     <message>
-        <source>Beerware</source>
-        <translation type="unfinished"></translation>
+        <source>Return to Top</source>
+        <translation>Zum Anfang</translation>
     </message>
     <message>
-        <source>Return to Top</source>
-        <translation type="unfinished"></translation>
+        <source>Deleting</source>
+        <translation>Lösche</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Entfernen</translation>
+    </message>
+    <message>
+        <source>No entries</source>
+        <translation>Keine Einträge</translation>
     </message>
 </context>
 <context>
     <name>NewBeer</name>
     <message>
         <source>Beer name</source>
-        <translation type="unfinished"></translation>
+        <translation>Biername</translation>
     </message>
     <message>
-        <source>New Beer</source>
-        <translation type="unfinished"></translation>
+        <source>Beer type</source>
+        <translation>Biersorte</translation>
     </message>
     <message>
-        <source>Beer type</source>
-        <translation type="unfinished"></translation>
+        <source>New beer</source>
+        <translation>Neues Bier</translation>
     </message>
 </context>
 </TS>
diff --git a/translations/Beerware.ts b/translations/Beerware.ts
@@ -1,41 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="en_US">
 <context>
     <name>About</name>
     <message>
         <source>Rate you favourite beers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Copyright&lt;/b&gt;: Pascal Schmid &lt;br /&gt;&lt;b&gt;License: &lt;/b&gt;Beerware (Revision 42)</source>
-        <translation type="unfinished"></translation>
+        <translation>Rate your favourite beers</translation>
     </message>
 </context>
 <context>
     <name>FirstPage</name>
     <message>
-        <source>Beerware</source>
-        <translation type="unfinished"></translation>
+        <source>Return to Top</source>
+        <translation>Return to top</translation>
     </message>
     <message>
-        <source>Return to Top</source>
-        <translation type="unfinished"></translation>
+        <source>Deleting</source>
+        <translation>Deleting</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remove</translation>
+    </message>
+    <message>
+        <source>No entries</source>
+        <translation>No entries</translation>
     </message>
 </context>
 <context>
     <name>NewBeer</name>
     <message>
         <source>Beer name</source>
-        <translation type="unfinished"></translation>
+        <translation>Beer name</translation>
     </message>
     <message>
-        <source>New Beer</source>
-        <translation type="unfinished"></translation>
+        <source>Beer type</source>
+        <translation>Beer type</translation>
     </message>
     <message>
-        <source>Beer type</source>
-        <translation type="unfinished"></translation>
+        <source>New beer</source>
+        <translation>New beer</translation>
     </message>
 </context>
 </TS>