Skip to content

Commit 25db6e3

Browse files
committed
Merge branch 'docker-version-bug'
2 parents 3e4fc1f + 3e6913f commit 25db6e3

File tree

21 files changed

+21
-21
lines changed

21 files changed

+21
-21
lines changed

.containerversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
33
1+
34

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN --mount=target=/mnt,source=scripts DEBIAN_FRONTEND=noninteractive /mnt/docke
2424
ARG SYS_GOPATH=/opt/go
2525
ENV PATH=${SYS_GOPATH}/bin:/usr/local/go/bin:$PATH
2626

27-
RUN --mount=target=/mnt/Makefile,source=Makefile GOPATH=${SYS_GOPATH} make -C /mnt envinit
27+
RUN --mount=target=/mnt/Makefile,source=Makefile --mount=target=/mnt/version.mk.inc,source=version.mk.inc GOPATH=${SYS_GOPATH} make -C /mnt envinit
2828

2929
ENV PATH=/opt/qt6/6.8.2/gcc_64/bin:/opt/qt6/6.8.2/gcc_64/libexec:$PATH
3030

frontends/web/src/locales/ar/app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1184,4 +1184,4 @@
11841184
"getStarted": "لنبدأ بتثبيت نظام تشغيل جهاز محفظة BitBox02",
11851185
"title": "مرحباً"
11861186
}
1187-
}
1187+
}

frontends/web/src/locales/bg/app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,4 +769,4 @@
769769
"welcome": {
770770
"title": "Добре дошли!"
771771
}
772-
}
772+
}

frontends/web/src/locales/cs/app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1897,4 +1897,4 @@
18971897
"message": "Připojte svůj BitBox a pokračujte poklepáním na stranu.",
18981898
"title": "Vítejte"
18991899
}
1900-
}
1900+
}

frontends/web/src/locales/de/app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1906,4 +1906,4 @@
19061906
"message": "Bitte verbinde deine BitBox und tippen sie auf der Seite an, um fortzufahren.",
19071907
"title": "Willkommen"
19081908
}
1909-
}
1909+
}

frontends/web/src/locales/en/app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1979,4 +1979,4 @@
19791979
"message": "Please connect your BitBox and tap the side to continue.",
19801980
"title": "Welcome"
19811981
}
1982-
}
1982+
}

frontends/web/src/locales/es/app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1897,4 +1897,4 @@
18971897
"message": "Por favor conecta tu BitBox y toca los lados para continuar.",
18981898
"title": "Bienvenido"
18991899
}
1900-
}
1900+
}

frontends/web/src/locales/fa/app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,4 +769,4 @@
769769
"welcome": {
770770
"title": "خوش آمديد"
771771
}
772-
}
772+
}

frontends/web/src/locales/fr/app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1834,4 +1834,4 @@
18341834
"loadingAccounts": "Chargement des comptes",
18351835
"title": "Bienvenue"
18361836
}
1837-
}
1837+
}

0 commit comments

Comments
 (0)