Merge remote-tracking branch 'origin/master' into codex/pr157-merge-resolve-692380
# Conflicts: # scripts/playwright-pr-mapping.mjs # src/i18n/generated/da-v2.json # src/i18n/generated/de-v2.json # src/i18n/generated/en-v2.json # src/i18n/generated/no-v2.json # src/i18n/generated/sv-v2.json # src/i18n/source/da/phrases/index.json # src/i18n/source/de/phrases/index.json # src/i18n/source/en/phrases/index.json # src/i18n/source/no/phrases/index.json # src/i18n/source/sv/phrases/index.json # src/views/dashboards/userDashboard/wash/MyWashStart.vue # tests/unit/playwright-pr-mapping.spec.js
This commit is contained in:
Jeppe Bundgaard
@@ -1340,6 +1340,9 @@
|
||||
"title": "@:{'templates.generated.compat.limited_backoffice.prices.title'}",
|
||||
"save": "@:{'templates.generated.compat.limited_backoffice.prices.save'}",
|
||||
"saved": "@:{'templates.generated.compat.limited_backoffice.prices.saved'}",
|
||||
"autosave_saving": "@:{'templates.generated.compat.limited_backoffice.prices.autosave_saving'}",
|
||||
"autosave_pending": "@:{'templates.generated.compat.limited_backoffice.prices.autosave_pending'}",
|
||||
"autosave_saved": "@:{'templates.generated.compat.limited_backoffice.prices.autosave_saved'}",
|
||||
"product": "@:{'templates.generated.compat.limited_backoffice.prices.product'}",
|
||||
"price": "@:{'templates.generated.compat.limited_backoffice.prices.price'}",
|
||||
"price_required": "@:{'templates.generated.compat.limited_backoffice.prices.price_required'}",
|
||||
@@ -1355,6 +1358,14 @@
|
||||
"name": "@:{'templates.generated.compat.limited_backoffice.employees.name'}",
|
||||
"email": "@:{'templates.generated.compat.limited_backoffice.employees.email'}",
|
||||
"user_id": "@:{'templates.generated.compat.limited_backoffice.employees.user_id'}",
|
||||
"phone": "@:{'templates.generated.compat.limited_backoffice.employees.phone'}",
|
||||
"phone_validation": "@:{'templates.generated.compat.limited_backoffice.employees.phone_validation'}",
|
||||
"country_codes": {
|
||||
"denmark": "@:{'templates.generated.compat.limited_backoffice.employees.country_codes.denmark'}",
|
||||
"sweden": "@:{'templates.generated.compat.limited_backoffice.employees.country_codes.sweden'}",
|
||||
"norway": "@:{'templates.generated.compat.limited_backoffice.employees.country_codes.norway'}",
|
||||
"finland": "@:{'templates.generated.compat.limited_backoffice.employees.country_codes.finland'}"
|
||||
},
|
||||
"password": "@:{'templates.generated.compat.limited_backoffice.employees.password'}",
|
||||
"password_create_help": "@:{'templates.generated.compat.limited_backoffice.employees.password_create_help'}",
|
||||
"password_update_help": "@:{'templates.generated.compat.limited_backoffice.employees.password_update_help'}",
|
||||
@@ -3643,17 +3654,17 @@
|
||||
"error_report": {
|
||||
"button": "Rapportera fel",
|
||||
"title": "Rapportera fel",
|
||||
"subtitle": "Skicka aktuell skärm och de senaste feldetaljerna till support.",
|
||||
"subtitle": "Skicka de senaste feldetaljerna till support. En skärmbild bifogas när det är möjligt.",
|
||||
"before_error": "Vad gjorde du innan felet uppstod?",
|
||||
"expected": "Vad förväntade du dig skulle hända?",
|
||||
"actual": "Vad hände faktiskt?",
|
||||
"before_error_placeholder": "Beskriv åtgärden du gjorde, till exempel att öppna ordrar eller välja en kund.",
|
||||
"expected_placeholder": "Beskriv resultatet du förväntade dig att se.",
|
||||
"actual_placeholder": "Beskriv vad du såg i stället, inklusive eventuell feltext.",
|
||||
"consent": "Jag accepterar att aktuell app-skärm, senaste request-fel, Vue-fel, webbläsardetaljer och mina svar samlas in för felsökning.",
|
||||
"consent": "Jag accepterar att senaste request-fel, Vue-fel, webbläsardetaljer, mina svar och en app-skärmbild när det är möjligt samlas in för felsökning.",
|
||||
"submit": "Skicka rapport",
|
||||
"submitted": "Felrapport skickad.",
|
||||
"capture_failed": "Skärmbilden kunde inte tas. Försök igen.",
|
||||
"capture_failed": "Skärmbilden kunde inte tas. Rapporten skickas utan skärmbild.",
|
||||
"submit_failed": "Felrapporten kunde inte skickas.",
|
||||
"required": "Alla fält och godkännande av datainsamling krävs.",
|
||||
"page_subtitle": "Rapporterade skärmar, request-fel och Vue-fel",
|
||||
@@ -4193,6 +4204,15 @@
|
||||
"preview_title": "Preview @:{'words.generated.monthly'} @:{'words.generated.split'}",
|
||||
"success_text": "@:{'words.generated.processed'} {processed} @:{'words.generated.invoice'} @:{'words.generated.collections'}. @.capitalize:{'words.generated.split'} {changed}, @:{'words.generated.skipped'} {skipped}.",
|
||||
"success_title": "@.capitalize:{'words.generated.monthly'} @:{'words.generated.split'} @:{'words.generated.completed'}"
|
||||
},
|
||||
"multi_month_invoice_warning": {
|
||||
"invoice_together": "Fakturera tillsammans",
|
||||
"split_by_month": "Dela upp per månad",
|
||||
"split_error_title": "Månadsuppdelning misslyckades",
|
||||
"split_success_text": "Bearbetade {processed} fakturasamlingar. Delade upp {changed}, hoppade över {skipped}.",
|
||||
"split_success_title": "Månadsuppdelning klar",
|
||||
"text": "Du håller på att fakturera ordrar från flera månader tillsammans ({months}). Ska de delas upp per månad i stället?",
|
||||
"title": "Ordrar från flera månader"
|
||||
}
|
||||
},
|
||||
"invoicing": {
|
||||
@@ -6161,6 +6181,9 @@
|
||||
"title": "@.capitalize:{'words.generated.avdelningspriser'}",
|
||||
"save": "@.capitalize:{'words.generated.spara'} @:{'words.generated.priser'}",
|
||||
"saved": "Priserna @:{'words.generated.har'} @:{'words.generated.sparats'}.",
|
||||
"autosave_saving": "Sparar priser...",
|
||||
"autosave_pending": "Prisandringar vantar.",
|
||||
"autosave_saved": "Alla prisandringar har sparats.",
|
||||
"product": "Produkt",
|
||||
"price": "Avdelningspris",
|
||||
"price_required": "@.capitalize:{'words.generated.alla'} @:{'words.generated.produkter'} @:{'words.generated.maste'} ha ett icke-negativt numeriskt pris.",
|
||||
@@ -6176,6 +6199,14 @@
|
||||
"name": "Namn",
|
||||
"email": "E-post",
|
||||
"user_id": "Användar-ID",
|
||||
"phone": "Telefon",
|
||||
"phone_validation": "Telefonnumret måste vara 4-15 siffror.",
|
||||
"country_codes": {
|
||||
"denmark": "Danmark",
|
||||
"sweden": "Sverige",
|
||||
"norway": "Norge",
|
||||
"finland": "Finland"
|
||||
},
|
||||
"password": "@.capitalize:{'words.generated.losenord'}",
|
||||
"password_create_help": "@.capitalize:{'words.generated.kravs'} @:{'words.generated.for'} nya @:{'words.generated.medarbetare'}. Använd @:{'words.generated.minst'} 8 tecken.",
|
||||
"password_update_help": "Lämna tomt @:{'words.generated.for'} att behålla nuvarande @:{'words.generated.losenord'}.",
|
||||
|
||||
Reference in New Issue
Block a user