Update files after merge

condo4 · May 30, 2018 · 9af3cb6 · 9af3cb6
1 parent 3c9a7be
commit 9af3cb6
Show file tree

Hide file tree

Showing 8 changed files with 347 additions and 346 deletions.
diff --git a/Resources.qrc b/Resources.qrc
@@ -6,5 +6,6 @@
         <file alias="Dollar.png">picture/Dollar.png</file>
         <file alias="GitHub_Logo.png">picture/GitHub_Logo.png</file>
         <file alias="GitHub_Logo_White.png">picture/GitHub_Logo_White.png</file>
+        <file alias="harbour-carbudget.png">icons/86x86/harbour-carbudget.png</file>
     </qresource>
 </RCC>
diff --git a/translations/de_DE.ts b/translations/de_DE.ts
@@ -50,120 +50,120 @@
 <context>
     <name>BudgetView</name>
     <message>
-        <location filename="../qml/pages/BudgetView.qml" line="57"/>
+        <location filename="../qml/pages/BudgetView.qml" line="62"/>
         <source>Consumption</source>
         <translation>Verbrauch</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BudgetView.qml" line="65"/>
-        <location filename="../qml/pages/BudgetView.qml" line="464"/>
+        <location filename="../qml/pages/BudgetView.qml" line="70"/>
+        <location filename="../qml/pages/BudgetView.qml" line="469"/>
         <source>Costs</source>
         <translation>Kosten</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BudgetView.qml" line="82"/>
+        <location filename="../qml/pages/BudgetView.qml" line="87"/>
         <source>Statistics</source>
         <translation>Statistik</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BudgetView.qml" line="515"/>
-        <location filename="../qml/pages/BudgetView.qml" line="674"/>
+        <location filename="../qml/pages/BudgetView.qml" line="520"/>
+        <location filename="../qml/pages/BudgetView.qml" line="679"/>
         <source>Bills:</source>
         <translation>Rechnungen:</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BudgetView.qml" line="483"/>
-        <location filename="../qml/pages/BudgetView.qml" line="642"/>
+        <location filename="../qml/pages/BudgetView.qml" line="488"/>
+        <location filename="../qml/pages/BudgetView.qml" line="647"/>
         <source>Fuel:</source>
         <translation>Kraftstoff:</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BudgetView.qml" line="546"/>
-        <location filename="../qml/pages/BudgetView.qml" line="706"/>
+        <location filename="../qml/pages/BudgetView.qml" line="551"/>
+        <location filename="../qml/pages/BudgetView.qml" line="711"/>
         <source>Tires:</source>
         <translation>Reifen:</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BudgetView.qml" line="577"/>
+        <location filename="../qml/pages/BudgetView.qml" line="582"/>
         <source>Invest:</source>
         <translation>Investition:</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BudgetView.qml" line="354"/>
-        <location filename="../qml/pages/BudgetView.qml" line="598"/>
-        <location filename="../qml/pages/BudgetView.qml" line="759"/>
+        <location filename="../qml/pages/BudgetView.qml" line="359"/>
+        <location filename="../qml/pages/BudgetView.qml" line="603"/>
+        <location filename="../qml/pages/BudgetView.qml" line="764"/>
         <source>Total:</source>
         <translation>Gesamt:</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BudgetView.qml" line="373"/>
+        <location filename="../qml/pages/BudgetView.qml" line="378"/>
         <source>Average:</source>
         <translation>Durchschnitt:</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BudgetView.qml" line="738"/>
+        <location filename="../qml/pages/BudgetView.qml" line="743"/>
         <source>Buying:</source>
         <translation>Kaufpreis:</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BudgetView.qml" line="305"/>
+        <location filename="../qml/pages/BudgetView.qml" line="310"/>
         <source>In Budget</source>
         <translation>In Budget</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BudgetView.qml" line="73"/>
+        <location filename="../qml/pages/BudgetView.qml" line="78"/>
         <source>Fuel price</source>
         <translation>Kraftstoffkosten</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BudgetView.qml" line="180"/>
+        <location filename="../qml/pages/BudgetView.qml" line="185"/>
         <source>Bills: %1%</source>
         <translation>Rechnungen: %1%</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BudgetView.qml" line="208"/>
+        <location filename="../qml/pages/BudgetView.qml" line="213"/>
         <source>Fuel: %1%</source>
         <translation>Kraftstoff: %1%</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BudgetView.qml" line="236"/>
+        <location filename="../qml/pages/BudgetView.qml" line="241"/>
         <source>Tires: %1%</source>
         <translation>Reifen: %1%</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BudgetView.qml" line="264"/>
+        <location filename="../qml/pages/BudgetView.qml" line="269"/>
         <source>Invest: %1%</source>
         <translation>Investition: %1%</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BudgetView.qml" line="286"/>
+        <location filename="../qml/pages/BudgetView.qml" line="291"/>
         <source>Odometer</source>
         <translation>Kilometerstand</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BudgetView.qml" line="340"/>
+        <location filename="../qml/pages/BudgetView.qml" line="345"/>
         <source>Fuel</source>
         <translation>Kraftstoff</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BudgetView.qml" line="386"/>
-        <location filename="../qml/pages/BudgetView.qml" line="412"/>
-        <location filename="../qml/pages/BudgetView.qml" line="438"/>
+        <location filename="../qml/pages/BudgetView.qml" line="391"/>
+        <location filename="../qml/pages/BudgetView.qml" line="417"/>
+        <location filename="../qml/pages/BudgetView.qml" line="443"/>
         <source>%L1 mpg</source>
         <translation>%L1 mpg</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BudgetView.qml" line="399"/>
+        <location filename="../qml/pages/BudgetView.qml" line="404"/>
         <source>Min:</source>
         <translation>Min:</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BudgetView.qml" line="425"/>
+        <location filename="../qml/pages/BudgetView.qml" line="430"/>
         <source>Max:</source>
         <translation>Max:</translation>
     </message>
     <message>
-        <location filename="../qml/pages/BudgetView.qml" line="622"/>
+        <location filename="../qml/pages/BudgetView.qml" line="627"/>
         <source>Costs per 100 %1</source>
         <translation>Kosten je 100 %1</translation>
     </message>
@@ -228,8 +228,8 @@
     </message>
     <message>
         <location filename="../qml/pages/CarCreate.qml" line="95"/>
-        <source>Licence plate</source>
-        <translation>Amtliches Kennzeichen</translation>
+        <source>License plate number</source>
+        <translation type="unfinished">Amtliches Kennzeichen</translation>
     </message>
 </context>
 <context>
@@ -705,57 +705,57 @@
         <translation>Fahrzeugmodel</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings.qml" line="75"/>
-        <source>Model year</source>
-        <translation>Baujahr</translation>
+        <location filename="../qml/pages/Settings.qml" line="76"/>
+        <source>Car manufacture year</source>
+        <translation type="unfinished">Fahrzeugbaujahr</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings.qml" line="88"/>
+        <location filename="../qml/pages/Settings.qml" line="89"/>
         <source>License plate number</source>
         <translation>Amtliches Kennzeichen</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings.qml" line="99"/>
+        <location filename="../qml/pages/Settings.qml" line="101"/>
         <source>Currency</source>
         <translation>Währung</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings.qml" line="111"/>
+        <location filename="../qml/pages/Settings.qml" line="113"/>
         <source>Distance Unit</source>
         <translation>Entfernungseinheit</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings.qml" line="131"/>
+        <location filename="../qml/pages/Settings.qml" line="133"/>
         <source>Consumption Unit</source>
         <translation>Verbrauchseinheit</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings.qml" line="153"/>
+        <location filename="../qml/pages/Settings.qml" line="155"/>
         <source>Number of wheels</source>
         <translation>Anzahl Räder</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings.qml" line="154"/>
+        <location filename="../qml/pages/Settings.qml" line="156"/>
         <source>2, 4, 6 or 8</source>
         <translation>2, 4, 6 oder 8</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings.qml" line="177"/>
+        <location filename="../qml/pages/Settings.qml" line="179"/>
         <source>Buying date</source>
         <translation>Kaufdatum</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings.qml" line="187"/>
+        <location filename="../qml/pages/Settings.qml" line="189"/>
         <source>Buying Price</source>
         <translation>Kaufpreis</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings.qml" line="198"/>
+        <location filename="../qml/pages/Settings.qml" line="200"/>
         <source>Selling Price (est.)</source>
         <translation>(geschaetzter) Verkaufswert</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Settings.qml" line="209"/>
+        <location filename="../qml/pages/Settings.qml" line="211"/>
         <source>Lifetime (in months, est.)</source>
         <translation>Laufzeit (geschätzt in Monaten)</translation>
     </message>
@@ -809,27 +809,27 @@
 <context>
     <name>Statistics</name>
     <message>
-        <location filename="../qml/pages/Statistics.qml" line="57"/>
+        <location filename="../qml/pages/Statistics.qml" line="58"/>
         <source>Consumption</source>
         <translation>Verbrauch</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Statistics.qml" line="65"/>
+        <location filename="../qml/pages/Statistics.qml" line="66"/>
         <source>Costs</source>
         <translation>Rechnungen</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Statistics.qml" line="73"/>
+        <location filename="../qml/pages/Statistics.qml" line="74"/>
         <source>Fuel price</source>
         <translation>Kraftstoffkosten</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Statistics.qml" line="93"/>
+        <location filename="../qml/pages/Statistics.qml" line="94"/>
         <source>Statistics</source>
         <translation>Statistiken</translation>
     </message>
     <message>
-        <location filename="../qml/pages/Statistics.qml" line="99"/>
+        <location filename="../qml/pages/Statistics.qml" line="100"/>
         <source>Distance</source>
         <translation>Entfernung</translation>
     </message>