Merge branch 'master' of https://git.evolution-state-life.de/Evolution-State-Life/Main

resources/[carscripts]/mt_dealerships/configs/vehicles.lua

@@ -453,7 +453,6 @@ local vehicles = { -- Vehicle list, credits to qb-core!
     { model = 'sanchez',       name = 'Sanchez Livery',                brand = 'Maibatsu',        price = 5300,    category = 'motorcycles',    shop = { 'cardealer', 'fmpdm', 'laryscars' } },
     { model = 'sanchez2',      name = 'Sanchez',                       brand = 'Maibatsu',        price = 5300,    category = 'motorcycles',    shop = { 'cardealer', 'fmpdm', 'laryscars' } },
     { model = 'sanctus',       name = 'Sanctus',                       brand = 'LCC',             price = 35000,   category = 'motorcycles',    shop = { 'cardealer', 'fmpdm', 'laryscars' } },
-    { model = 'shotaro',       name = 'Shotaro',                       brand = 'Nagasaki',        price = 320000,  category = 'motorcycles',    shop = { 'cardealer', 'fmpdm', 'laryscars' } },
     { model = 'sovereign',     name = 'Sovereign',                     brand = 'WMC',             price = 8000,    category = 'motorcycles',    shop = { 'cardealer', 'fmpdm', 'laryscars' } },
     { model = 'stryder',       name = 'Stryder',                       brand = 'Nagasaki',        price = 50000,   category = 'motorcycles',    shop = { 'cardealer', 'fmpdm', 'laryscars' } },
     { model = 'thrust',        name = 'Thrust',                        brand = 'Dinka',           price = 22000,   category = 'motorcycles',    shop = { 'cardealer', 'fmpdm', 'laryscars' } },

resources/[inventory]/pl_printer/locales/de.json

@@ -3,7 +3,7 @@
     "copies": "Kopien",
     "image_url": "Bild-URL eingeben",
     "enter_copies": "Anzahl der Kopien eingeben",
-    "prints": "Drucke",
+    "prints": "Drucken",
     "Money_Removed": "Geld vom Bankkonto entfernt: $",
     "not_enough": "Nicht genug Geld"
   }

resources/[phone]/roadphone/addons/jobcalls/config.lua

@@ -131,7 +131,7 @@ JobCalls.Positions = {
     {
         name = "Santoro",
         coords = vector3(162.3750, 268.6166, 109.9737),
-        number = 3131,
+        number = 69,
         needjob = "sud",
         useMarker = true,
         marker = {

resources/[phone]/roadphone/public/static/config/config.json

@@ -86,7 +86,7 @@
         },
         {
             "name": "Santoro Unlimited",
-            "number": 3131,
+            "number": 69,
             "img": "/public/img/service/sud.png",
             "acceptMessage": true
         },