bluerock/app
bluerock/app
2
0
Fork 0
Code Issues 8 Pull requests Projects Releases 9 Packages 1 Wiki Activity

Merge v0.6.0 and v0.6.1 #29

Merged
dorian merged 30 commits from version/0.5.1 into master 2024-10-17 17:52:37 +02:00
Conversation 1 Commits 30 Files changed 136 +57 -46
5 changed files with 57 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d286a87553 - Show all commits

5
resources/qml/Widgets/RegistrationWidget.qml
View file

@ -101,7 +101,6 @@ DataListView {
}
else {
// an international competition -> get nation
fedName = athleteData["nation"]
}
@ -125,7 +124,9 @@ DataListView {
}
}
selector.appear(selectOptions, qsTrId("#selectCategory"), "<a href=\"blank\">Show results</a>")
selector.appear(selectOptions, qsTrId("#selectCategory"),
//% "Show results"
"<a href=\"blank\">" + qsTrId("#showResults") + "</a>")
}
function filterAthletes(athletes) {

BIN
resources/translations/de.qm
View file

Binary file not shown.

49
resources/translations/de.ts
View file

@ -4,40 +4,40 @@
<context>
<name></name>
<message id="#scanQrCode">
<location filename="../qml/Pages/QrCodeScanPage.qml" line="19"/>
<location filename="../qml/Pages/QrCodeScanPage.qml" line="20"/>
<location filename="../qml/Pages/StartPage.qml" line="120"/>
<source>Scan QR-Code</source>
<translation>QR-Code scannen</translation>
</message>
<message id="#placeQrCodeInCenter">
<location filename="../qml/Pages/QrCodeScanPage.qml" line="34"/>
<location filename="../qml/Pages/QrCodeScanPage.qml" line="39"/>
<source>Place the Code in the center</source>
<translation>Positioniere den Code in der Mitte</translation>
</message>
<message id="#cameraPermissionDenied">
<location filename="../qml/Pages/QrCodeScanPage.qml" line="207"/>
<location filename="../qml/Pages/QrCodeScanPage.qml" line="243"/>
<source>Camera access required</source>
<oldsource>Camera access denied</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="#cameraPermissionDeniedDetails">
<location filename="../qml/Pages/QrCodeScanPage.qml" line="223"/>
<location filename="../qml/Pages/QrCodeScanPage.qml" line="259"/>
<source>blueROCK needs to access your camera in order to scan QR-Codes. It will never record or store any photos or videos.</source>
<oldsource>This app needs to access your camera in order to scan QR-Codes. It will never record or store any photos or videos.</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="#allowAccess">
<location filename="../qml/Pages/QrCodeScanPage.qml" line="232"/>
<location filename="../qml/Pages/QrCodeScanPage.qml" line="268"/>
<source>Allow access</source>
<translation type="unfinished"></translation>
</message>
<message id="#pleaseWait">
<location filename="../qml/Pages/QrCodeScanPage.qml" line="256"/>
<location filename="../qml/Pages/QrCodeScanPage.qml" line="50"/>
<source>Plase wait</source>
<translation>Bitte warten</translation>
</message>
<message id="#invalidQrCode">
<location filename="../qml/Pages/QrCodeScanPage.qml" line="262"/>
<location filename="../qml/Pages/QrCodeScanPage.qml" line="56"/>
<source>Invalid QR-Code</source>
<translation>Ungültiger QR-Code</translation>
</message>
@ -174,33 +174,33 @@
</message>
<message id="#selectCategory">
<location filename="../qml/Widgets/CalendarWidget.qml" line="278"/>
<location filename="../qml/Widgets/RegistrationWidget.qml" line="112"/>
<location filename="../qml/Widgets/RegistrationWidget.qml" line="127"/>
<location filename="../qml/Widgets/ResultWidget.qml" line="169"/>
<source>Select category</source>
<translation>Kategorie auswählen</translation>
</message>
<message id="#age">
<location filename="../qml/Widgets/ProfileWidget.qml" line="194"/>
<location filename="../qml/Widgets/ProfileWidget.qml" line="203"/>
<source>Age</source>
<translation>Alter</translation>
</message>
<message id="#yearOfBirth">
<location filename="../qml/Widgets/ProfileWidget.qml" line="211"/>
<location filename="../qml/Widgets/ProfileWidget.qml" line="220"/>
<source>Year of birth</source>
<translation>Geburtsjahr</translation>
</message>
<message id="#city">
<location filename="../qml/Widgets/ProfileWidget.qml" line="228"/>
<location filename="../qml/Widgets/ProfileWidget.qml" line="237"/>
<source>City</source>
<translation>Stadt</translation>
</message>
<message id="#showBestResults">
<location filename="../qml/Widgets/ProfileWidget.qml" line="271"/>
<location filename="../qml/Widgets/ProfileWidget.qml" line="280"/>
<source>Show best results</source>
<translation>Zeige die besten Ergebnisse</translation>
</message>
<message id="#showAllResults">
<location filename="../qml/Widgets/ProfileWidget.qml" line="273"/>
<location filename="../qml/Widgets/ProfileWidget.qml" line="282"/>
<source>Show all results</source>
<translation>Zeige alle Ergebnisse</translation>
</message>
@ -210,48 +210,53 @@
<translation>(Rangliste)</translation>
</message>
<message id="#registrationHeadline">
<location filename="../qml/Widgets/RegistrationWidget.qml" line="61"/>
<location filename="../qml/Widgets/RegistrationWidget.qml" line="77"/>
<source>(Registration)</source>
<translation>(Registrierung)</translation>
</message>
<message id="#showResults">
<location filename="../qml/Widgets/RegistrationWidget.qml" line="129"/>
<source>Show results</source>
<translation type="unfinished"></translation>
</message>
<message id="#resultsHeadline">
<location filename="../qml/Widgets/ResultWidget.qml" line="136"/>
<source>(Results)</source>
<translation>(Ergebnisse)</translation>
</message>
<message id="#startlistHeadline">
<location filename="../qml/Widgets/StartlistWidget.qml" line="56"/>
<location filename="../qml/Widgets/StartlistWidget.qml" line="82"/>
<location filename="../qml/Widgets/StartlistWidget.qml" line="72"/>
<location filename="../qml/Widgets/StartlistWidget.qml" line="98"/>
<source>(Startlist)</source>
<translation>(Startliste)</translation>
</message>
<message id="#loading">
<location filename="../qml/main.qml" line="551"/>
<location filename="../qml/main.qml" line="552"/>
<source>Loading</source>
<translation>Laden</translation>
</message>
<message id="#noConnectionError">
<location filename="../qml/main.qml" line="665"/>
<location filename="../qml/main.qml" line="666"/>
<source>No connection to server</source>
<translation>Keine Verbindung zum Server</translation>
</message>
<message id="#notFoundError">
<location filename="../qml/main.qml" line="670"/>
<location filename="../qml/main.qml" line="671"/>
<source>Not found</source>
<translation>Nicht gefunden</translation>
</message>
<message id="#noDataError">
<location filename="../qml/main.qml" line="675"/>
<location filename="../qml/main.qml" line="676"/>
<source>No Data</source>
<translation>Keine Daten</translation>
</message>
<message id="#invalidRequestError">
<location filename="../qml/main.qml" line="680"/>
<location filename="../qml/main.qml" line="681"/>
<source>Invalid Request</source>
<translation>Ungültige Anfrage</translation>
</message>
<message id="#unexpectedError">
<location filename="../qml/main.qml" line="686"/>
<location filename="../qml/main.qml" line="687"/>
<source>Unexpected error</source>
<translation>Unerwarteter Fehler</translation>
</message>

BIN
resources/translations/en.qm
View file

Binary file not shown.

49
resources/translations/en.ts
View file

@ -4,40 +4,40 @@
<context>
<name></name>
<message id="#scanQrCode">
<location filename="../qml/Pages/QrCodeScanPage.qml" line="19"/>
<location filename="../qml/Pages/QrCodeScanPage.qml" line="20"/>
<location filename="../qml/Pages/StartPage.qml" line="120"/>
<source>Scan QR-Code</source>
<translation type="unfinished"></translation>
</message>
<message id="#placeQrCodeInCenter">
<location filename="../qml/Pages/QrCodeScanPage.qml" line="34"/>
<location filename="../qml/Pages/QrCodeScanPage.qml" line="39"/>
<source>Place the Code in the center</source>
<translation type="unfinished"></translation>
</message>
<message id="#cameraPermissionDenied">
<location filename="../qml/Pages/QrCodeScanPage.qml" line="207"/>
<location filename="../qml/Pages/QrCodeScanPage.qml" line="243"/>
<source>Camera access required</source>
<oldsource>Camera access denied</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="#cameraPermissionDeniedDetails">
<location filename="../qml/Pages/QrCodeScanPage.qml" line="223"/>
<location filename="../qml/Pages/QrCodeScanPage.qml" line="259"/>
<source>blueROCK needs to access your camera in order to scan QR-Codes. It will never record or store any photos or videos.</source>
<oldsource>This app needs to access your camera in order to scan QR-Codes. It will never record or store any photos or videos.</oldsource>
<translation type="unfinished"></translation>
</message>
<message id="#allowAccess">
<location filename="../qml/Pages/QrCodeScanPage.qml" line="232"/>
<location filename="../qml/Pages/QrCodeScanPage.qml" line="268"/>
<source>Allow access</source>
<translation type="unfinished"></translation>
</message>
<message id="#pleaseWait">
<location filename="../qml/Pages/QrCodeScanPage.qml" line="256"/>
<location filename="../qml/Pages/QrCodeScanPage.qml" line="50"/>
<source>Plase wait</source>
<translation type="unfinished"></translation>
</message>
<message id="#invalidQrCode">
<location filename="../qml/Pages/QrCodeScanPage.qml" line="262"/>
<location filename="../qml/Pages/QrCodeScanPage.qml" line="56"/>
<source>Invalid QR-Code</source>
<translation type="unfinished"></translation>
</message>
@ -170,33 +170,33 @@
</message>
<message id="#selectCategory">
<location filename="../qml/Widgets/CalendarWidget.qml" line="278"/>
<location filename="../qml/Widgets/RegistrationWidget.qml" line="112"/>
<location filename="../qml/Widgets/RegistrationWidget.qml" line="127"/>
<location filename="../qml/Widgets/ResultWidget.qml" line="169"/>
<source>Select category</source>
<translation type="unfinished"></translation>
</message>
<message id="#age">
<location filename="../qml/Widgets/ProfileWidget.qml" line="194"/>
<location filename="../qml/Widgets/ProfileWidget.qml" line="203"/>
<source>Age</source>
<translation type="unfinished"></translation>
</message>
<message id="#yearOfBirth">
<location filename="../qml/Widgets/ProfileWidget.qml" line="211"/>
<location filename="../qml/Widgets/ProfileWidget.qml" line="220"/>
<source>Year of birth</source>
<translation type="unfinished"></translation>
</message>
<message id="#city">
<location filename="../qml/Widgets/ProfileWidget.qml" line="228"/>
<location filename="../qml/Widgets/ProfileWidget.qml" line="237"/>
<source>City</source>
<translation type="unfinished"></translation>
</message>
<message id="#showBestResults">
<location filename="../qml/Widgets/ProfileWidget.qml" line="271"/>
<location filename="../qml/Widgets/ProfileWidget.qml" line="280"/>
<source>Show best results</source>
<translation type="unfinished"></translation>
</message>
<message id="#showAllResults">
<location filename="../qml/Widgets/ProfileWidget.qml" line="273"/>
<location filename="../qml/Widgets/ProfileWidget.qml" line="282"/>
<source>Show all results</source>
<translation type="unfinished"></translation>
</message>
@ -206,48 +206,53 @@
<translation type="unfinished"></translation>
</message>
<message id="#registrationHeadline">
<location filename="../qml/Widgets/RegistrationWidget.qml" line="61"/>
<location filename="../qml/Widgets/RegistrationWidget.qml" line="77"/>
<source>(Registration)</source>
<translation type="unfinished"></translation>
</message>
<message id="#showResults">
<location filename="../qml/Widgets/RegistrationWidget.qml" line="129"/>
<source>Show results</source>
<translation type="unfinished"></translation>
</message>
<message id="#resultsHeadline">
<location filename="../qml/Widgets/ResultWidget.qml" line="136"/>
<source>(Results)</source>
<translation type="unfinished"></translation>
</message>
<message id="#startlistHeadline">
<location filename="../qml/Widgets/StartlistWidget.qml" line="56"/>
<location filename="../qml/Widgets/StartlistWidget.qml" line="82"/>
<location filename="../qml/Widgets/StartlistWidget.qml" line="72"/>
<location filename="../qml/Widgets/StartlistWidget.qml" line="98"/>
<source>(Startlist)</source>
<translation type="unfinished"></translation>
</message>
<message id="#loading">
<location filename="../qml/main.qml" line="551"/>
<location filename="../qml/main.qml" line="552"/>
<source>Loading</source>
<translation type="unfinished"></translation>
</message>
<message id="#noConnectionError">
<location filename="../qml/main.qml" line="665"/>
<location filename="../qml/main.qml" line="666"/>
<source>No connection to server</source>
<translation type="unfinished"></translation>
</message>
<message id="#notFoundError">
<location filename="../qml/main.qml" line="670"/>
<location filename="../qml/main.qml" line="671"/>
<source>Not found</source>
<translation type="unfinished"></translation>
</message>
<message id="#noDataError">
<location filename="../qml/main.qml" line="675"/>
<location filename="../qml/main.qml" line="676"/>
<source>No Data</source>
<translation type="unfinished"></translation>
</message>
<message id="#invalidRequestError">
<location filename="../qml/main.qml" line="680"/>
<location filename="../qml/main.qml" line="681"/>
<source>Invalid Request</source>
<translation type="unfinished"></translation>
</message>
<message id="#unexpectedError">
<location filename="../qml/main.qml" line="686"/>
<location filename="../qml/main.qml" line="687"/>
<source>Unexpected error</source>
<translation type="unfinished"></translation>
</message>