Skip to content

Commit 91f70ef

Browse files
RamesTheGenericRamesTheGeneric
authored
Merge branch 'Project-Babble:main' into main
2 parents 829d4cc + f733b12 commit 91f70ef

File tree

22 files changed

+394
-230
lines changed

22 files changed

+394
-230
lines changed

‎BabbleApp/Locale/Afrikaans/locale.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"general.recalibrate": "Recalibrate Address",
1717
"general.recalibrateTooltip": "OSC address we use for recalibrating",
1818
"general.uvcCameraSettings": "UVC Camera Settings",
19-
"general.windowFocus": "Koppelvlak gepauseer",
2019
"general.useRedChannel": "Use Red Channel",
2120
"general.useRedChannelTooltip": "Uses only the red channel for Omnicept capture",
2221
"general.xResolution": "X Resolution",
@@ -152,5 +151,9 @@
152151
"general.theme.system": "System",
153152
"general.theme.light": "Light",
154153
"general.theme.dark": "Dark",
155-
"general.useOSCQuery": "Use OSCQuery"
154+
"general.useOSCQuery": "Use OSCQuery",
155+
"general.windowFocus": "Window Focused",
156+
"general.disableCameraPreview": "Disable camera preview (everywhere)",
157+
"general.oscDelayEnable": "Enable OSC delay",
158+
"general.oscDelaySeconds": "OSC delay in seconds"
156159
}

‎BabbleApp/Locale/Dansk/locale.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"general.recalibrate": "Genkalibrerings adresse",
1717
"general.recalibrateTooltip": "OSC address we use for recalibrating",
1818
"general.uvcCameraSettings": "UVC Camera Settings",
19-
"general.windowFocus": "Grænseflade pausere",
2019
"general.useRedChannel": "Use Red Channel",
2120
"general.useRedChannelTooltip": "Uses only the red channel for Omnicept capture",
2221
"general.xResolution": "X Resolution",
@@ -152,5 +151,9 @@
152151
"general.theme.system": "System",
153152
"general.theme.light": "Light",
154153
"general.theme.dark": "Dark",
155-
"general.useOSCQuery": "Use OSCQuery"
154+
"general.useOSCQuery": "Use OSCQuery",
155+
"general.windowFocus": "Window Focused",
156+
"general.disableCameraPreview": "Disable camera preview (everywhere)",
157+
"general.oscDelayEnable": "Enable OSC delay",
158+
"general.oscDelaySeconds": "OSC delay in seconds"
156159
}

‎BabbleApp/Locale/Deutsch/locale.json

+12-9
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"general.recalibrate": "Neukalibrierung Adresse",
1717
"general.recalibrateTooltip": "OSC-Adresse, die wir zur Neukalibrierung verwenden",
1818
"general.uvcCameraSettings": "UVC-Kameraeinstellungen",
19-
"general.windowFocus": "Schnittstelle pausiert",
2019
"general.useRedChannel": "Roten Farbkanal verwenden",
2120
"general.useRedChannelTooltip": "Verwendet nur den roten Kanal für die Omnicept-Aufnahme",
2221
"general.xResolution": "X-Achsenauflösung",
@@ -41,7 +40,7 @@
4140
"warn.serialCapture": "Problem mit der seriellen Aufnahmequelle. Kamera wurde getrennt, warte auf erneute Verbindung",
4241
"warn.backpressure1": "Aufnahmewarteschlange Rückstau von",
4342
"warn.backpressure2": "Überprüfe auf Absturz oder Timingprobleme im Algorithmus",
44-
"warn.oneEuroValues": "OneEuroFilter Werte müssen eine gültige Zahl sein",
43+
"warn.oneEuroValues": "Ein Euro Filter Werte müssen eine gültige Zahl sein",
4544
"info.moveToTrackingMode": "Wechsel zu Tracking Modus",
4645
"info.moveToROIMode": "Wechsel zu ROI Modus",
4746
"info.setROI": "Setze ROI",
@@ -75,7 +74,7 @@
7574
"algorithm.modelOutputMultiplierTooltip": "Modellausgabemodifikator",
7675
"algorithm.calibrationDeadzone": "Kalibrierungs-Totzone",
7776
"algorithm.calibrationDeadzoneTooltip": "Offset der minimal kalibrierten Werte",
78-
"algorithm.oneEuroFilterParameters": "OneEuroFilter Parameter",
77+
"algorithm.oneEuroFilterParameters": "Ein Euro Filter Parameter",
7978
"algorithm.minFrequencyCutoff": "Minimale Grenzfrequenz",
8079
"algorithm.minFrequencyCutoffTooltip": "",
8180
"algorithm.speedCoefficient": "Geschwindigkeitskoeffizient",
@@ -98,12 +97,12 @@
9897
"camera.horizontalFlipTooltip": "Kamerabild horizontal spiegeln",
9998
"camera.crop": "Bitte legen Sie einen Zuschnitt fest",
10099
"camera.cameraAddress": "Kameraadresse",
101-
"camera.cameraAddressTooltip": "Geben Sie die IP-Adresse oder den UVC-Port Ihrer Kamera ein. (Inklusive dem „http://“)",
100+
"camera.cameraAddressTooltip": "Geben Sie die IP-Adresse oder den UVC - Port Ihrer Kamera ein. (Inklusive dem „http://“)",
102101
"camera.refreshCameraList": "Liste aktualisieren",
103102
"camera.saveAndRestartTracking": "Speichern und Tracking neu starten",
104103
"camera.trackingMode": "Tracking-Modus",
105104
"camera.trackingModeTooltip": "Gehen Sie hierhin, um Ihren Mund zu tracken",
106-
"camera.croppingMode": "Zuschnittmodus",
105+
"camera.croppingMode": "Ausschnitt Modus",
107106
"camera.croppingModeToolTip": "Klicken Sie hier, um Ihren Mund zuzuschneiden",
108107
"camera.waiting": "Warten auf Kameraadresse",
109108
"camera.connecting": "Kamera wird Verbunden",
@@ -125,13 +124,13 @@
125124
"babble.updateTo": "Bitte aktualisieren Sie auf",
126125
"babble.downloadPage": "Download-Seite",
127126
"babble.noToast": "Toast-Benachrichtigungen werden nicht unterstützt",
128-
"babble.noInternet": "Konnte keine Verbindung zum Internet herstellen, Updatesuche übersprungen",
127+
"babble.noInternet": "Konnte keine Verbindung zum Internet herstellen, Update-Suche übersprungen",
129128
"babble.camPage": "Kamera",
130129
"babble.settingsPage": "Einstellungen",
131130
"babble.algoSettingsPage": "Algo-Einstellungen",
132131
"babble.calibrationPage": "Kalibrierung",
133132
"babble.exit": "Babble-App wird beendet",
134-
"calibration.header": "Kalibrierungseinstellungen",
133+
"calibration.header": "Kalibrierung",
135134
"calibration.mode": "Kalibrierungs-Modus",
136135
"calibration.modeTooltip": "Neutral = Beim Starten und Stoppen der Kalibrierung werden nur Mindestwerte festgelegt. Voll = Beim Starten der Kalibrierung werden Mindest- und Höchstwerte basierend auf den aufgezeichneten Werten festgelegt.",
137136
"calibration.left": "Links",
@@ -141,7 +140,7 @@
141140
"calibration.min": "Minimum",
142141
"calibration.max": "Maximum",
143142
"calibration.resetMin": "Minimum zurücksetzen",
144-
"calibration.resetMinTooltip": "Minimumwerte zurücksetzen",
143+
"calibration.resetMinTooltip": "Basiswert zurücksetzen",
145144
"calibration.resetMax": "Maximum zurücksetzen",
146145
"calibration.resetMaxTooltip": "Maximumwerte zurücksetzen",
147146
"calibration.minLeftValue": "Minimale Links-werte",
@@ -152,5 +151,9 @@
152151
"general.theme.system": "System",
153152
"general.theme.light": "Light",
154153
"general.theme.dark": "Dark",
155-
"general.useOSCQuery": "Use OSCQuery"
154+
"general.useOSCQuery": "Use OSCQuery",
155+
"general.windowFocus": "Window Focused",
156+
"general.disableCameraPreview": "Disable camera preview (everywhere)",
157+
"general.oscDelayEnable": "Enable OSC delay",
158+
"general.oscDelaySeconds": "OSC delay in seconds"
156159
}

‎BabbleApp/Locale/English/locale.json

+27-22
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@
99
"general.addressTooltip": "IP address we send OSC data to",
1010
"general.port": "Port",
1111
"general.portTooltip": "OSC port we send data to",
12-
"general.receiver": "Receive functions",
13-
"general.receiverTooltip": "Toggle OSC receive functions",
12+
"general.receiver": "Receiver functions",
13+
"general.receiverTooltip": "Toggle OSC receiver functions",
1414
"general.receiverPort": "Receiver Port",
1515
"general.receiverPortTooltip": "Port we receive OSC data from (used to recalibrate from within VRChat",
1616
"general.recalibrate": "Recalibrate Address",
17-
"general.recalibrateTooltip": "OSC address we use for recalibrating",
17+
"general.recalibrateTooltip": "OSC address we use for recalibration",
1818
"general.uvcCameraSettings": "UVC Camera Settings",
19-
"general.windowFocus": "Interface Paused",
2019
"general.useRedChannel": "Use Red Channel",
2120
"general.useRedChannelTooltip": "Uses only the red channel for Omnicept capture",
2221
"general.xResolution": "X Resolution",
@@ -27,34 +26,31 @@
2726
"general.framerateTooltip": "Capture framerate. Default = 0",
2827
"general.language": "Language Settings",
2928
"general.languageInstructions": "Restart the Babble App to see your changes",
30-
"general.languageTooltip": "Change the language",
29+
"general.languageTooltip": "Change language",
3130
"error.oscPort": "OSC port value must be an integer 0-65535",
3231
"error.oscValue": "OSC port value cannot be empty and must be an integer 0-65535",
33-
"error.notAnInt": "Not an Int",
32+
"error.notAnInt": "Not an Integer",
3433
"error.notAFloat": "Not a Float",
3534
"error.improperTabValue": "Improper tab value",
3635
"error.frame": "Problem while getting frame",
3736
"error.size": "Size of frames to display are of unequal sizes",
3837
"error.capture": "Frame capture issue detected",
39-
"error.winmm": "Failed to load winmm",
40-
"error.modelLoad": "Failed to load model:",
4138
"warn.frameDrop": "Frame drop. Corrupted JPEG",
42-
"warn.captureProblem": "Capture source problem, assuming camera disconnected, waiting for reconnect",
43-
"warn.serialCapture": "Serial capture source problem, assuming camera disconnected, waiting for reconnect",
39+
"warn.captureProblem": "Capture source problem, assuming camera disconnected, waiting to reconnect",
40+
"warn.serialCapture": "Serial capture source problem, assuming camera disconnected, waiting to reconnect",
4441
"warn.backpressure1": "CAPTURE QUEUE BACKPRESSURE OF",
4542
"warn.backpressure2": "CHECK FOR CRASH OR TIMING ISSUES IN ALGORITHM",
4643
"warn.oneEuroValues": "OneEuroFilter values must be a legal number",
47-
"warn.timerRes": "Failed to set timer resolution:",
48-
"info.moveToTrackingMode": "Moving to tracking mode",
49-
"info.moveToROIMode": "Moving to ROI mode",
44+
"info.moveToTrackingMode": "Changing to tracking mode",
45+
"info.moveToROIMode": "Changing to ROI mode",
5046
"info.setROI": "Set ROI",
5147
"info.enabled": "Enabled",
5248
"info.disabled": "Disabled",
5349
"info.newValue": "New value",
5450
"info.discardingSerial": "Discarding the serial buffer",
5551
"info.refreshedCameraList": "Refreshed Camera List",
56-
"info.ETVRConnected": "ETVR Serial Tracker device connected on",
57-
"info.ETVRFailiure": "Failed to connect on",
52+
"info.ETVRConnected": "ETVR Serial Tracker device connected to",
53+
"info.ETVRFailiure": "Failed to connect to",
5854
"info.enterCaptureOne": "Capture source",
5955
"info.enterCaptureTwo": "not found, retrying...",
6056
"info.exitCaptureThread": "Exiting capture thread",
@@ -88,7 +84,7 @@
8884
"camera.rotation": "Rotation",
8985
"camera.rotationTooltip": "Adjust the rotation of your cameras, make them level",
9086
"camera.startCalibration": "Start Calibration",
91-
"camera.startCalibrationTooltip": "Neutural Calibration: Hold a relaxed face, press [Start Calibration] and then press [Stop Calibraion]. \nFull Calibration: Press [Start Calibration] and make as many face movements as you can until it switches back to tracking mode or press [Stop Calibration]",
87+
"camera.startCalibrationTooltip": "Neutral Calibration: Hold a relaxed face, press [Start Calibration] and then press [Stop Calibration]. \nFull Calibration: Press [Start Calibration] and make as many face movements as you can until it switches back to tracking mode or press [Stop Calibration]",
9288
"camera.stopCalibration": "Stop Calibration",
9389
"camera.stopCalibrationTooltip": "Stop calibration manually",
9490
"camera.enableCalibration": "Enable Calibration",
@@ -111,7 +107,7 @@
111107
"camera.waiting": "Waiting for camera address",
112108
"camera.connecting": "Camera Connecting",
113109
"camera.reconnecting": "Camera Reconnecting",
114-
"camera.waitingOnMouthCrop": "Awating Mouth Crop",
110+
"camera.waitingOnMouthCrop": "Awaiting Mouth Crop",
115111
"camera.calibration": "Calibration",
116112
"camera.tracking": "Tracking",
117113
"config.noSettingsFile": "No settings file, using base settings",
@@ -121,17 +117,17 @@
121117
"config.saved": "Config saved successfully",
122118
"babble.latestVersion": "App is the latest version",
123119
"babble.needUpdateOne": "You have app version",
124-
"babble.needUpdateTwo": "installed. Please update to",
125-
"babble.needUpdateThree": "for the newest features",
120+
"babble.needUpdateTwo": "Installed. Please update to",
121+
"babble.needUpdateThree": "For the newest features",
126122
"babble.name": "Babble App",
127123
"babble.updatePresent": "New Update Available",
128124
"babble.updateTo": "Please update to",
129125
"babble.downloadPage": "Download Page",
130126
"babble.noToast": "Toast notifications not supported",
131-
"babble.noInternet": "Internet connection failed, no update check occured",
127+
"babble.noInternet": "Internet connection failed, no update check occurred",
132128
"babble.camPage": "Cam",
133129
"babble.settingsPage": "Settings",
134-
"babble.algoSettingsPage": "Algo Settings",
130+
"babble.algoSettingsPage": "Also Settings",
135131
"babble.calibrationPage": "Calibration",
136132
"babble.exit": "Exiting Babble App",
137133
"calibration.header": "Calibration Settings",
@@ -150,5 +146,14 @@
150146
"calibration.minLeftValue": "Min Left Value",
151147
"calibration.maxLeftValue": "Max Left Value",
152148
"calibration.minRightValue": "Min Right Value",
153-
"calibration.maxRightValue": "Max Right Value"
149+
"calibration.maxRightValue": "Max Right Value",
150+
"general.theme": "Theme",
151+
"general.theme.system": "System",
152+
"general.theme.light": "Light",
153+
"general.theme.dark": "Dark",
154+
"general.useOSCQuery": "Use OSCQuery",
155+
"general.windowFocus": "Window Focused",
156+
"general.disableCameraPreview": "Disable camera preview (everywhere)",
157+
"general.oscDelayEnable": "Enable OSC delay",
158+
"general.oscDelaySeconds": "OSC delay in seconds"
154159
}

‎BabbleApp/Locale/Español/locale.json

+11-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"general.recalibrate": "Dirección de recalibración",
1717
"general.recalibrateTooltip": "Dirección OSC usada para recalibrar",
1818
"general.uvcCameraSettings": "Ajustes de Cámara UVC",
19-
"general.windowFocus": "Interfaz Pausada",
2019
"general.useRedChannel": "Usar Canal Rojo",
2120
"general.useRedChannelTooltip": "Usar solo el canal rojo para capturar con Omnicept",
2221
"general.xResolution": "Resolución X",
@@ -36,15 +35,12 @@
3635
"error.frame": "Problema al obtener fotogramas",
3736
"error.size": "Los tamaños de los fotogramas para mostrar son de dimensiones desiguales",
3837
"error.capture": "Detectado problema en la captura de fotogramas",
39-
"error.winmm": "Error al cargar winmm",
40-
"error.modelLoad": "Error al cargar Modelo:",
4138
"warn.frameDrop": "Pérdida de fotogramas. JPEG dañado",
4239
"warn.captureProblem": "Problema con la fuente de captura, se asume que la cámara está desconectada, esperando reconexión",
4340
"warn.serialCapture": "Problema con la fuente de captura en serie, se asume que la cámara está desconectada, esperando reconexión",
4441
"warn.backpressure1": "PRESIÓN EN LA COLA DE CAPTURA DE",
4542
"warn.backpressure2": "COMPRUEBA POSIBLES PROBLEMAS DE CRASH O TIMING EN EL ALGORITMO",
4643
"warn.oneEuroValues": "Los valores de OneEuroFilter deben ser un número válido",
47-
"warn.timerRes": "Error al establecer la resolución del temporizador:",
4844
"info.moveToTrackingMode": "Cambiando a modo de seguimiento",
4945
"info.moveToROIMode": "Cambiando a modo de ROI",
5046
"info.setROI": "Establecer ROI",
@@ -150,5 +146,14 @@
150146
"calibration.minLeftValue": "Valor Mín Izquierda",
151147
"calibration.maxLeftValue": "Valor Máx Izquierda",
152148
"calibration.minRightValue": "Valor Mín Derecha",
153-
"calibration.maxRightValue": "Valor Máx Derecha"
154-
}
149+
"calibration.maxRightValue": "Valor Máx Derecha",
150+
"general.theme": "Theme",
151+
"general.theme.system": "System",
152+
"general.theme.light": "Light",
153+
"general.theme.dark": "Dark",
154+
"general.useOSCQuery": "Use OSCQuery",
155+
"general.windowFocus": "Window Focused",
156+
"general.disableCameraPreview": "Disable camera preview (everywhere)",
157+
"general.oscDelayEnable": "Enable OSC delay",
158+
"general.oscDelaySeconds": "OSC delay in seconds"
159+
}

‎BabbleApp/Locale/Française/locale.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"general.recalibrate": "Adresse de recalibration",
1717
"general.recalibrateTooltip": "Adresse OSC à utiliser pour la recalibration",
1818
"general.uvcCameraSettings": "Paramètres de la Caméra UVC",
19-
"general.windowFocus": "Interface en pause",
2019
"general.useRedChannel": "Utiliser le canal Rouge",
2120
"general.useRedChannelTooltip": "Utiliser uniquement le canal rouge pour la capture Omnicept",
2221
"general.xResolution": "Résolution X",
@@ -152,5 +151,9 @@
152151
"general.theme.system": "System",
153152
"general.theme.light": "Light",
154153
"general.theme.dark": "Dark",
155-
"general.useOSCQuery": "Use OSCQuery"
154+
"general.useOSCQuery": "Use OSCQuery",
155+
"general.windowFocus": "Window Focused",
156+
"general.disableCameraPreview": "Disable camera preview (everywhere)",
157+
"general.oscDelayEnable": "Enable OSC delay",
158+
"general.oscDelaySeconds": "OSC delay in seconds"
156159
}

‎BabbleApp/Locale/Indonesian/locale.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"general.recalibrate": "Kalibarsi ulang Address",
1717
"general.recalibrateTooltip": "Alamat OSC kami gunakan untuk kalibrasi ulang",
1818
"general.uvcCameraSettings": "Pengaturan Kamera UVC",
19-
"general.windowFocus": "Antarmuka Dijeda",
2019
"general.useRedChannel": "Gunakan Channel Merah",
2120
"general.useRedChannelTooltip": "Hanya menggunakan channel merah untuk Omnicept capture",
2221
"general.xResolution": "X Resolusi",
@@ -152,5 +151,9 @@
152151
"general.theme.system": "Sistem",
153152
"general.theme.light": "Terang",
154153
"general.theme.dark": "Gelap",
155-
"general.useOSCQuery": "Gunakan OSCQuery"
154+
"general.useOSCQuery": "Gunakan OSCQuery",
155+
"general.windowFocus": "Window Focused",
156+
"general.disableCameraPreview": "Disable camera preview (everywhere)",
157+
"general.oscDelayEnable": "Enable OSC delay",
158+
"general.oscDelaySeconds": "OSC delay in seconds"
156159
}

‎BabbleApp/Locale/Italiano/locale.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616
"general.recalibrate": "Ricalibra Indirizzo",
1717
"general.recalibrateTooltip": "Indirizzo OSC che utilizziamo per ricalibrare",
1818
"general.uvcCameraSettings": "Impostazioni Telecamera UVC",
19-
"general.windowFocus": "Interfaccia in pausa",
2019
"general.useRedChannel": "Usa Canale Rosso",
2120
"general.useRedChannelTooltip": "Utilizza solo il canale rosso per la cattura Omnicept",
2221
"general.xResolution": "Risoluzione X",
2322
"general.xResolutionTooltip": "Risoluzione acquisizione X. Predefinito = 0",
2423
"general.yResolution": "Risoluzione Y",
2524
"general.yResolutionTooltip": "Risoluzione acquisizione Y. Predefinito = 0",
26-
"general.framerate": "Frequenza dei fotogrammi\n\n",
25+
"general.framerate": "Frequenza dei fotogrammi",
2726
"general.framerateTooltip": "Acquisisci frequenza dei fotogrammi. Predefinito = 0",
2827
"general.language": "Impostazioni Lingua",
2928
"general.languageInstructions": "Riavvia l'app Babble per vedere i tuoi cambiamenti",
@@ -152,5 +151,9 @@
152151
"general.theme.system": "Sistema",
153152
"general.theme.light": "Chiaro",
154153
"general.theme.dark": "Scuro",
155-
"general.useOSCQuery": "Usa OSCQuery"
154+
"general.useOSCQuery": "Usa OSCQuery",
155+
"general.windowFocus": "Finestra Attiva",
156+
"general.disableCameraPreview": "Disable camera preview (everywhere)",
157+
"general.oscDelayEnable": "Enable OSC delay",
158+
"general.oscDelaySeconds": "OSC delay in seconds"
156159
}

‎BabbleApp/Locale/Nederlands/locale.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"general.recalibrate": "Herkalibratie adres",
1717
"general.recalibrateTooltip": "OSC-adres die we gebruiken voor het herkalibreren",
1818
"general.uvcCameraSettings": "UVC Camera Instellingen",
19-
"general.windowFocus": "Interface Gepauzeerd",
2019
"general.useRedChannel": "Gebruik Rood Kanaal",
2120
"general.useRedChannelTooltip": "Gebruikt alleen het rode kanaal",
2221
"general.xResolution": "X Resolutie",
@@ -152,5 +151,9 @@
152151
"general.theme.system": "System",
153152
"general.theme.light": "Light",
154153
"general.theme.dark": "Dark",
155-
"general.useOSCQuery": "Use OSCQuery"
154+
"general.useOSCQuery": "Use OSCQuery",
155+
"general.windowFocus": "Window Focused",
156+
"general.disableCameraPreview": "Disable camera preview (everywhere)",
157+
"general.oscDelayEnable": "Enable OSC delay",
158+
"general.oscDelaySeconds": "OSC delay in seconds"
156159
}

0 commit comments

Comments
 (0)