Skip to content

Commit 54bb656

Browse files
committed
Merge branch 'develop' of https://github.com/toniebox-reverse-engineering/teddycloud into develop
2 parents d8f051a + 10744ef commit 54bb656

File tree

7 files changed

+869
-134
lines changed

7 files changed

+869
-134
lines changed

contrib/data/www/web/assets/index-TMm-cLxU.js renamed to contrib/data/www/web/assets/index-DcXUC-CU.js

Lines changed: 114 additions & 111 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

contrib/data/www/web/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
-->
1313
<link rel="manifest" href="/web/manifest.json" />
1414
<title>TeddyCloud</title>
15-
<script type="module" crossorigin src="/web/assets/index-TMm-cLxU.js"></script>
15+
<script type="module" crossorigin src="/web/assets/index-DcXUC-CU.js"></script>
1616
<link rel="stylesheet" crossorigin href="/web/assets/index-BU1Nt4kW.css">
1717
</head>
1818
<body>

contrib/data/www/web/translations/de.json

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,8 @@
227227
"items": {
228228
"01certificates": "Zertifikate in einem ESP32-Firmware-Dump extrahieren/injizieren",
229229
"02newServerHost": "Neuen Server-Host festlegen",
230-
"03wifiCredentials": "WLAN-Zugangsdaten festlegen"
230+
"03wifiCredentials": "WLAN-Zugangsdaten festlegen",
231+
"04extractCertificates": "Zertifikate extrahieren und in TeddyCloud ablegen"
231232
},
232233
"title": "ESP32 Box Flashing"
233234
},
@@ -241,7 +242,6 @@
241242
},
242243
"futureFeatures": {
243244
"01firmwareUpdate": "Firmware-Update über TeddyCloud",
244-
"02improvedFlashing": "Verbessertes ESP32 Box Flashing (vollständig über Web GUI, keine Backend-Schritte mehr)",
245245
"03reportUnknownTonies": "Unbekannte Tonies melden",
246246
"04completeTAPIntegration": "Abschluss der TAP-WebFrontend-Integration",
247247
"05completeCustomToniesIntegration": "Abschluss der Integration benutzerdefinierter Tonies im JSON-WebFront (\"Metadaten benutzerdefinierter Tags\")",
@@ -281,7 +281,8 @@
281281
"change": "Sprache ändern",
282282
"english": "EN",
283283
"french": "FR",
284-
"german": "DE"
284+
"german": "DE",
285+
"spanish": "ES"
285286
},
286287
"languageUtil": {
287288
"de-de": "Deutsch",
@@ -417,16 +418,21 @@
417418
"connectingToESP": "Verbinde zum ESP...",
418419
"connectingWriteFlash": "Verbinde zum Schreiben des Flash...",
419420
"downloadFlashFilesHint": "Die Firmware Images sind im Datenverzeichnis deines Servers gespeichert, falls du sie nochmal flashen möchtest. Wenn du deine Firmware Images woanders speichern willst, kannst du sie herunterladen und an einem sicheren Ort ablegen:",
420-
"downloadFlashFilesHintP1": "Du kannst sie manuell ins Verzeichnis /certs/client/ extrahieren. Das kannst du entweder mit teddycloud Executable auf deinem Computer machen oder über die Docker-Shell.",
421-
"downloadFlashFilesHintP2": "Bitte überprüfe den Dateinamen der extrahierten Zertifikate, besonders die Groß- und Kleinschreibung! Ändere sie in Kleinbuchstaben, wenn sie in Großbuchstaben sind.",
422421
"downloadLink": "Download ungepachte Firmware",
423422
"downloadLinkPatched": "Download gepachte Firmware",
424423
"error": "Fehler",
425424
"extractCertificates": "Zertifikate für TeddyCloud extrahieren",
426425
"extractCertificatesAutomaticallyHint": "Klicke den Button \"Zertifikate für TeddyCloud extrahieren\" zum automatischen Extrahieren und Ablegen der Zertifikate in TeddyCloud.",
426+
"extractCertificatesAutomaticallyHint2": "Die Zertifikate werden an bis zu zwei Speicherorten abgelegt: Zuerst im Basisclientzertifikatverzeichnis für TeddyCloud unter ../{{certDir}}/ (falls keine Zertifikate vorhanden sind) und dann im Ordner ../{{certDir}}/{{mac}}.",
427427
"extractCertificatesManually": "Zertifikate manuell extrahieren",
428428
"extractCertificatesManuallyHint": "Du kannst die Zertifikate auch manuell extrahieren, führe dazu die folgenden Schritte durch",
429+
"extractCertificatesManuallyHintP1": "Das kannst du entweder mit teddycloud Executable auf deinem Computer machen oder über die Docker-Shell.",
430+
"extractCertificatesManuallyHintP2": "Bitte überprüfe den Dateinamen der extrahierten Zertifikate, besonders die Groß- und Kleinschreibung! Ändere sie in Kleinbuchstaben, wenn sie in Großbuchstaben sind.",
431+
"extractCertificatesManuallyHintP3": "Für die Einrichtung deiner ersten Toniebox mit TeddyCloud kopiere die Zertifikate in das Verzeichnis der Basis-Client-Zertifikate. TeddyCloud verwendet diese Zertifikate, um sich bei der offiziellen Tonies Cloud zu authentifizieren, sodass Inhalte ohne Interaktion mit der Toniebox heruntergeladen werden können (z.B., wenn du in der Benutzeroberfläche auf 'Download' bei einem Tonie klickst).",
429432
"extractingCertificates": "Zertifikate für TeddyCloud werden extrahiert...",
433+
"extractingCertificates409ResponseForceOverwrite": "Vorhandene Zertifikate überschreiben",
434+
"extractingCertificates409ResponseForceOverwriteConfirmButton": "Dateien überschreiben",
435+
"extractingCertificates409ResponseForceOverwriteContent": "Der erste Versuch, die Zertifikate zu speichern, ist fehlgeschlagen: {{error}}. Möchten Sie die vorhandenen Dateien überschreiben?",
430436
"extractingCertificatesFailed": "Zertifikate aus \"{{file}}\" extrahieren fehlgeschlagen",
431437
"extractingCertificatesSuccessful": "Zertifikate erfolgreich aus \"{{file}}\" extrahiert und in TeddyCloud abgelegt.",
432438
"failedToCommunicate": "Kommunikation fehlgeschlagen:",
@@ -490,6 +496,8 @@
490496
"redirect": "Weiter zu HTTPS",
491497
"title": "ESP32 Box Flashing"
492498
},
499+
"hintLatestFirmware": "Für die Ersteinrichtung deiner Toniebox mit TeddyCloud stelle bitte sicher, dass die neueste Firmware installiert ist. Wenn du dir nicht sicher bist, ob deine Toniebox auf dem neuesten Stand ist, verbinde sie mit der offiziellen Cloud und warte, bis das Firmware-Update abgeschlossen ist.",
500+
"hintLatestFirmwareTitle": "Wichtig",
493501
"lastOnline": "zuletzt online",
494502
"lastPlayedTonie": "Zuletzt gespielter Tonie: ",
495503
"linkToBoxCFW": "Öffne Web Frontend deiner Toniebox",

contrib/data/www/web/translations/en.json

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,6 @@
179179
"uploading": "Uploading..."
180180
}
181181
},
182-
"inputValidator": {
183-
"invalidCharactersDetected": "Your input contains invalid characters, such as {{invalidChar}}"
184-
},
185182
"home": {
186183
"features": {
187184
"currentlyImplementedFeatures": "Currently implemented features",
@@ -230,7 +227,8 @@
230227
"items": {
231228
"01certificates": "extract/inject certificates on a esp32 firmware dump",
232229
"02newServerHost": "set new server host",
233-
"03wifiCredentials": "set WiFi credentials"
230+
"03wifiCredentials": "set WiFi credentials",
231+
"04extractCertificates": "Extract certificates and store in TeddyCloud"
234232
},
235233
"title": "ESP32 Box flashing"
236234
},
@@ -244,7 +242,6 @@
244242
},
245243
"futureFeatures": {
246244
"01firmwareUpdate": "Firmware update through TeddyCloud",
247-
"02improvedFlashing": "Improved ESP32 Box Flashing (completely through Web GUI, no backend steps anymore)",
248245
"03reportUnknownTonies": "Report unknown Tonies",
249246
"04completeTAPIntegration": "Completion of TAP WebFrontend Integration",
250247
"05completeCustomToniesIntegration": "Completion of Custom Tonies Json WebFront Integration (\"Meta data of custom tags\")",
@@ -276,11 +273,15 @@
276273
},
277274
"yourTonies": "Your Tonies"
278275
},
276+
"inputValidator": {
277+
"invalidCharactersDetected": "Your input contains invalid characters, such as {{invalidChar}}"
278+
},
279279
"language": {
280280
"change": "Change language",
281281
"english": "EN",
282282
"french": "FR",
283-
"german": "DE"
283+
"german": "DE",
284+
"spanish": "ES"
284285
},
285286
"languageUtil": {
286287
"de-de": "German",
@@ -416,16 +417,21 @@
416417
"connectingToESP": "Connecting to ESP...",
417418
"connectingWriteFlash": "Connecting to write Flash...",
418419
"downloadFlashFilesHint": "The firmware images are stored in your server's data directory in case you want to reflash them. In case you want to save your firmware images somewhere else, you can download them and move them to a safe place:",
419-
"downloadFlashFilesHintP1": "You can manually extract them into the /certs/client/ directory. You can either do that with the teddycloud executable on your computer or you may do it via the docker shell",
420-
"downloadFlashFilesHintP2": "Please check the filename of the extracted certs, especially the case! Change them to lowercase if they are uppercase.",
421420
"downloadLink": "Download unpatched firmware",
422421
"downloadLinkPatched": "Download patched firmware",
423422
"error": "Error",
424423
"extractCertificates": "Extract Certificates for TeddyCloud",
425424
"extractCertificatesAutomaticallyHint": "Click the button \"Extract certificates for TeddyCloud\" to automatically extract and store the certificates in TeddyCloud.",
425+
"extractCertificatesAutomaticallyHint2": "Certificates will be stored in up to two locations: first, in the base client certificate directory ../{{certDir}}/ for TeddyCloud (if no certificates are already present), and second, in the folder ../{{certDir}}/{{mac}}.",
426426
"extractCertificatesManually": "Extract certificates manually",
427427
"extractCertificatesManuallyHint": "You can also extract the certificates manually by following the steps below.",
428+
"extractCertificatesManuallyHintP1": "You can either do that with the teddycloud executable on your computer or you may do it via the docker shell",
429+
"extractCertificatesManuallyHintP2": "Please check the filename of the extracted certs, especially the case! Change them to lowercase if they are uppercase.",
430+
"extractCertificatesManuallyHintP3": "For your first Toniebox setup with TeddyCloud, copy the certificates into the base client certificates directory. TeddyCloud uses these certificates to authenticate with the official Tonies Cloud, allowing content to be downloaded without Toniebox interaction (e.g., when you click 'Download' on a Tonie in the GUI).",
428431
"extractingCertificates": "Extracting certificates for TeddyCloud...",
432+
"extractingCertificates409ResponseForceOverwrite": "Overwrite existing certificates",
433+
"extractingCertificates409ResponseForceOverwriteConfirmButton": "Overwrite files",
434+
"extractingCertificates409ResponseForceOverwriteContent": "The initial attempt to store certificates failed: {{error}}. Would you like to overwrite the existing files?",
429435
"extractingCertificatesFailed": "Failed to extract certificates from \"{{file}}\"",
430436
"extractingCertificatesSuccessful": "Certificates successfully extracted from \"{{file}}\" and stored in TeddyCloud.",
431437
"failedToCommunicate": "Failed to communicate:",
@@ -489,6 +495,8 @@
489495
"redirect": "Proceed to HTTPS",
490496
"title": "ESP32 Box Flashing"
491497
},
498+
"hintLatestFirmware": "For the initial setup with TeddyCloud of your Toniebox, please ensure it has the latest firmware installed. If you're unsure whether your Toniebox is up to date, connect it to the official cloud and allow some time for the firmware update to complete.",
499+
"hintLatestFirmwareTitle": "Important",
492500
"lastOnline": "last online",
493501
"lastPlayedTonie": "Last played Tonie: ",
494502
"linkToBoxCFW": "Open web interface of Toniebox",

0 commit comments

Comments
 (0)