Merge branch 'docker-version-bug'

Beerosagos · Beerosagos · commit 25db6e3a2bd3 · 2025-10-23T14:35:36.000+02:00
diff --git a/.containerversion b/.containerversion
@@ -1 +1 @@
-33
+34
diff --git a/Dockerfile b/Dockerfile
@@ -24,7 +24,7 @@ RUN --mount=target=/mnt,source=scripts DEBIAN_FRONTEND=noninteractive /mnt/docke
 ARG SYS_GOPATH=/opt/go
 ENV PATH=${SYS_GOPATH}/bin:/usr/local/go/bin:$PATH
 
-RUN --mount=target=/mnt/Makefile,source=Makefile GOPATH=${SYS_GOPATH} make -C /mnt envinit
+RUN --mount=target=/mnt/Makefile,source=Makefile --mount=target=/mnt/version.mk.inc,source=version.mk.inc GOPATH=${SYS_GOPATH} make -C /mnt envinit
 
 ENV PATH=/opt/qt6/6.8.2/gcc_64/bin:/opt/qt6/6.8.2/gcc_64/libexec:$PATH
 
diff --git a/frontends/web/src/locales/ar/app.json b/frontends/web/src/locales/ar/app.json
@@ -1184,4 +1184,4 @@
     "getStarted": "لنبدأ بتثبيت نظام تشغيل جهاز محفظة BitBox02",
     "title": "مرحباً"
   }
-}
+}
diff --git a/frontends/web/src/locales/bg/app.json b/frontends/web/src/locales/bg/app.json
@@ -769,4 +769,4 @@
   "welcome": {
     "title": "Добре дошли!"
   }
-}
+}
diff --git a/frontends/web/src/locales/cs/app.json b/frontends/web/src/locales/cs/app.json
@@ -1897,4 +1897,4 @@
     "message": "Připojte svůj BitBox a pokračujte poklepáním na stranu.",
     "title": "Vítejte"
   }
-}
+}
diff --git a/frontends/web/src/locales/de/app.json b/frontends/web/src/locales/de/app.json
@@ -1906,4 +1906,4 @@
     "message": "Bitte verbinde deine BitBox und tippen sie auf der Seite an, um fortzufahren.",
     "title": "Willkommen"
   }
-}
+}
diff --git a/frontends/web/src/locales/en/app.json b/frontends/web/src/locales/en/app.json
@@ -1979,4 +1979,4 @@
     "message": "Please connect your BitBox and tap the side to continue.",
     "title": "Welcome"
   }
-}
+}
diff --git a/frontends/web/src/locales/es/app.json b/frontends/web/src/locales/es/app.json
@@ -1897,4 +1897,4 @@
     "message": "Por favor conecta tu BitBox y toca los lados para continuar.",
     "title": "Bienvenido"
   }
-}
+}
diff --git a/frontends/web/src/locales/fa/app.json b/frontends/web/src/locales/fa/app.json
@@ -769,4 +769,4 @@
   "welcome": {
     "title": "خوش آمديد"
   }
-}
+}
diff --git a/frontends/web/src/locales/fr/app.json b/frontends/web/src/locales/fr/app.json
@@ -1834,4 +1834,4 @@
     "loadingAccounts": "Chargement des comptes",
     "title": "Bienvenue"
   }
-}
+}
diff --git a/frontends/web/src/locales/he/app.json b/frontends/web/src/locales/he/app.json
@@ -879,4 +879,4 @@
   "welcome": {
     "title": "ברוך הבא"
   }
-}
+}
diff --git a/frontends/web/src/locales/hi/app.json b/frontends/web/src/locales/hi/app.json
@@ -769,4 +769,4 @@
   "welcome": {
     "title": "आपका स्वागत हे"
   }
-}
+}
diff --git a/frontends/web/src/locales/it/app.json b/frontends/web/src/locales/it/app.json
@@ -1897,4 +1897,4 @@
     "message": "Connetti il tuo BitBox e tocca il lato per continuare.",
     "title": "Benvenuto"
   }
-}
+}
diff --git a/frontends/web/src/locales/ja/app.json b/frontends/web/src/locales/ja/app.json
@@ -1834,4 +1834,4 @@
     "loadingAccounts": "アカウントを読み込み中",
     "title": "ようこそ"
   }
-}
+}
diff --git a/frontends/web/src/locales/ms/app.json b/frontends/web/src/locales/ms/app.json
@@ -1897,4 +1897,4 @@
     "message": "Sila sambungkan BitBox anda dan ketik bahagian tepi untuk meneruskan.",
     "title": "Selamat datang"
   }
-}
+}
diff --git a/frontends/web/src/locales/nl/app.json b/frontends/web/src/locales/nl/app.json
@@ -1834,4 +1834,4 @@
     "loadingAccounts": "Accounts laden",
     "title": "Welkom"
   }
-}
+}
diff --git a/frontends/web/src/locales/pt/app.json b/frontends/web/src/locales/pt/app.json
@@ -1845,4 +1845,4 @@
     "loadingAccounts": "Carregando contas",
     "title": "Bem-vindo"
   }
-}
+}
diff --git a/frontends/web/src/locales/ru/app.json b/frontends/web/src/locales/ru/app.json
@@ -1142,4 +1142,4 @@
     "getStarted": "Давайте начнем с установки прошивки на ваш BitBox02",
     "title": "Добро пожаловать"
   }
-}
+}
diff --git a/frontends/web/src/locales/sl/app.json b/frontends/web/src/locales/sl/app.json
@@ -1897,4 +1897,4 @@
     "message": "Priključite BitBox in se dotaknite strani naprave.",
     "title": "Dobrodošli"
   }
-}
+}
diff --git a/frontends/web/src/locales/tr/app.json b/frontends/web/src/locales/tr/app.json
@@ -818,4 +818,4 @@
   "welcome": {
     "title": "Hoşgeldiniz"
   }
-}
+}
diff --git a/frontends/web/src/locales/zh/app.json b/frontends/web/src/locales/zh/app.json
@@ -769,4 +769,4 @@
   "welcome": {
     "title": "欢迎"
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1184,4 +1184,4 @@`
`1184`	`1184`	`"getStarted": "لنبدأ بتثبيت نظام تشغيل جهاز محفظة BitBox02",`
`1185`	`1185`	`"title": "مرحباً"`
`1186`	`1186`	`}`
`1187`		`-}`
	`1187`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -769,4 +769,4 @@`
`769`	`769`	`"welcome": {`
`770`	`770`	`"title": "Добре дошли!"`
`771`	`771`	`}`
`772`		`-}`
	`772`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1897,4 +1897,4 @@`
`1897`	`1897`	`"message": "Připojte svůj BitBox a pokračujte poklepáním na stranu.",`
`1898`	`1898`	`"title": "Vítejte"`
`1899`	`1899`	`}`
`1900`		`-}`
	`1900`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1906,4 +1906,4 @@`
`1906`	`1906`	`"message": "Bitte verbinde deine BitBox und tippen sie auf der Seite an, um fortzufahren.",`
`1907`	`1907`	`"title": "Willkommen"`
`1908`	`1908`	`}`
`1909`		`-}`
	`1909`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1979,4 +1979,4 @@`
`1979`	`1979`	`"message": "Please connect your BitBox and tap the side to continue.",`
`1980`	`1980`	`"title": "Welcome"`
`1981`	`1981`	`}`
`1982`		`-}`
	`1982`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1834,4 +1834,4 @@`
`1834`	`1834`	`"loadingAccounts": "Chargement des comptes",`
`1835`	`1835`	`"title": "Bienvenue"`
`1836`	`1836`	`}`
`1837`		`-}`
	`1837`	`+}`