Merge branch 'master' into lptp1

Did some changes on another computer
alketola · Nov 2, 2016 · 96824db · 96824db
2 parents e607c06 + 46aeb66
commit 96824db
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/qml/pages/help/ostoshelp-de.html b/qml/pages/help/ostoshelp-de.html
@@ -1,6 +1,6 @@
 <html lang="de">
 <head>
-  <title>Ostos - Karren - Hilfe</title>
+  <title>Ostos - Warenkorb - Hilfe</title>
   <link rel="stylesheet" type="text/css" href="helphtml.css">
 </head>
 <body>
@@ -15,7 +15,7 @@
 <H1>Gebrauchanweisung</h1>
 <H2>Einleitung</H2>
 <p>
-"Karren" ist eine Einkaufsliste App.
+"Warenkorb" ist eine Einkaufsliste App.
 Es ist ein handgefertigtes Produkt, dazu man nat&uuml;rlichen Fl&uuml;ss des Einkaufs analysiert gehabt.
 </p>
 <p>

diff --git a/qml/pages/help/ostoshelp-en.html b/qml/pages/help/ostoshelp-en.html
@@ -16,7 +16,7 @@
 <H1>How to use Ostos - Cart</h1>
 <H2>Introduction</H2>
 <p>
-Ostos - you can call it also "Cart" - is a shopping list application, that helps you plan and track your shopping.
+Ostos - you may call it "Cart" - is a shopping list application, that helps you plan and track your shopping.
 It often helps you to avoid unnecessary typing, by offering the last bought items again.
 Those you had hidden won't pop to the top of the list too often, but you can search them by name.
 Ostos has been handcrafted to the purpose over months, analysing the natural flow of shopping.