Open-source gym & body-weight tracker, now in the App Store (iPhone + Apple Watch) and as an Android APK. Plan routines, log workouts, see which muscles are trained, import from Strong/Hevy/FitNotes. Self-host it or use it on the phone alone.
JavaScript apple-watchbodyweightdockerfitnessfitness-trackergymhealthiosmcpnodejspasskeysprogressive-web-applicationspwareactself-hostedself-hostingvitewebauthnweightliftingworkout-tracker
Plan edit mode: each minus and handle is named for its routine, and the hint says minus, not red
Duarte Santos9d74f17349b9
diff --git a/frontend/src/lib/pt-br-locale.test.js b/frontend/src/lib/pt-br-locale.test.jsindex 795a6d0c2..d536de3ce 100644--- a/frontend/src/lib/pt-br-locale.test.js+++ b/frontend/src/lib/pt-br-locale.test.js@@ -41,7 +41,7 @@ describe('Brazilian Portuguese locale', () => {// has to be taught is a number nobody reads. What the numbers stood for is asserted above.// If the hash fails, review the changed keys and wording before accepting a new one. From// frontend/: node scripts/pt-br-inheritance-fingerprint.mjs --list- expect(fingerprint, 'pt-PT inheritance changed; review the inherited pt-BR wording').toBe('92dbe6310a34fbbfc181841ba8e9dd8a591a89e6feec512bee8b9bf61676ccf1')+ expect(fingerprint, 'pt-PT inheritance changed; review the inherited pt-BR wording').toBe('12899354b2d8c1a864ebc5aaf65747ca9d5ab8b9cd00e8ad591c5af457085c8b')})test('does not leak European Portuguese UI terms', () => {diff --git a/frontend/src/locales/ar.js b/frontend/src/locales/ar.jsindex b1c52eb38..48f0d743b 100644--- a/frontend/src/locales/ar.js+++ b/frontend/src/locales/ar.js@@ -1837,7 +1837,7 @@ export default {'Want two routines on one day? Tap the day and pick both.': 'روتينان في يوم واحد؟ اضغط على اليوم واختر الاثنين.','The loop': 'الدورة','{0} of {1} done this round.': 'تم {0} من {1} في هذه الجولة.',- 'Drag to reorder. Tap the red button to take one out.': 'اسحب لإعادة الترتيب. اضغط الزر الأحمر لإزالة واحد.',+ 'Drag to reorder. Tap the minus to take one out.': 'اسحب لإعادة الترتيب. اضغط علامة الناقص لإزالة واحد.','Trained out of order? Just pick another routine on Home.': 'تمرنت بغير الترتيب؟ فقط اختر روتينًا آخر في الرئيسية.','Start the loop over': 'ابدأ الدورة من جديد','Start the loop': 'ابدأ الدورة',@@ -1846,7 +1846,7 @@ export default {'Now in Stats, next to Muscle balance': 'الآن في الإحصائيات، بجانب توازن العضلات','Tap to plan something': 'اضغط لتخطيط شيء','Drag to reorder': 'اسحب لإعادة الترتيب',- 'Drag to reorder. Tap the red button to delete.': 'اسحب لإعادة الترتيب. اضغط الزر الأحمر للحذف.',+ 'Drag to reorder. Tap the minus to delete.': 'اسحب لإعادة الترتيب. اضغط علامة الناقص للحذف.','Tap a routine to edit it. Reorder and delete are behind Edit.': 'اضغط على روتين لتعديله. إعادة الترتيب والحذف ضمن تعديل.','Pick one routine, or more to train them together.': 'اختر روتينًا واحدًا، أو أكثر لتتمرنها معًا.','Planned sets per week, from your plan.': 'المجموعات المخططة في الأسبوع، من خطتك.',@@ -1932,4 +1932,7 @@ export default {'Sets, reps, rest, progression': 'المجموعات، التكرارات، الراحة، التقدم','This workout': 'هذا التمرين','Turn on push notifications first.': 'فعّل الإشعارات الفورية أولًا.',+ 'Remove {0}': 'إزالة {0}',+ 'Delete {0}': 'حذف {0}',+ 'Move {0}': 'نقل {0}',}diff --git a/frontend/src/locales/de.js b/frontend/src/locales/de.jsindex f90db2143..49ef5c0fd 100644--- a/frontend/src/locales/de.js+++ b/frontend/src/locales/de.js@@ -1804,7 +1804,7 @@ export default {'Want two routines on one day? Tap the day and pick both.': 'Zwei Routinen an einem Tag? Tippe auf den Tag und wähle beide.','The loop': 'Der Kreislauf','{0} of {1} done this round.': '{0} von {1} in dieser Runde erledigt.',- 'Drag to reorder. Tap the red button to take one out.': 'Ziehen zum Sortieren. Tippe auf den roten Knopf, um eine herauszunehmen.',+ 'Drag to reorder. Tap the minus to take one out.': 'Ziehen zum Sortieren. Tippe auf das Minus, um eine herauszunehmen.','Trained out of order? Just pick another routine on Home.': 'Außer der Reihe trainiert? Wähle auf Start einfach eine andere Routine.','Start the loop over': 'Kreislauf neu beginnen','Start the loop': 'Kreislauf starten',@@ -1813,7 +1813,7 @@ export default {'Now in Stats, next to Muscle balance': 'Jetzt in der Statistik, neben der Muskelbalance','Tap to plan something': 'Tippen, um etwas zu planen','Drag to reorder': 'Ziehen zum Sortieren',- 'Drag to reorder. Tap the red button to delete.': 'Ziehen zum Sortieren. Tippe auf den roten Knopf zum Löschen.',+ 'Drag to reorder. Tap the minus to delete.': 'Ziehen zum Sortieren. Tippe auf das Minus zum Löschen.','Tap a routine to edit it. Reorder and delete are behind Edit.': 'Tippe auf eine Routine, um sie zu bearbeiten. Sortieren und Löschen findest du unter Bearbeiten.','Pick one routine, or more to train them together.': 'Wähle eine Routine, oder mehrere, um sie zusammen zu trainieren.','Planned sets per week, from your plan.': 'Geplante Sätze pro Woche, aus deinem Plan.',@@ -1899,4 +1899,7 @@ export default {'Sets, reps, rest, progression': 'Sätze, Wdh., Pause, Progression','This workout': 'Dieses Training','Turn on push notifications first.': 'Schalte zuerst die Push-Benachrichtigungen ein.',+ 'Remove {0}': '{0} entfernen',+ 'Delete {0}': '{0} löschen',+ 'Move {0}': '{0} verschieben',}diff --git a/frontend/src/locales/es.js b/frontend/src/locales/es.jsindex 6a75fda9b..80609e228 100644--- a/frontend/src/locales/es.js+++ b/frontend/src/locales/es.js@@ -1784,7 +1784,7 @@ export default {'Want two routines on one day? Tap the day and pick both.': '¿Dos rutinas en un día? Toca el día y elige las dos.','The loop': 'El bucle','{0} of {1} done this round.': '{0} de {1} hechas en esta vuelta.',- 'Drag to reorder. Tap the red button to take one out.': 'Arrastra para reordenar. Toca el botón rojo para quitar una.',+ 'Drag to reorder. Tap the minus to take one out.': 'Arrastra para reordenar. Toca el signo menos para quitar una.','Trained out of order? Just pick another routine on Home.': '¿Entrenaste fuera de orden? Elige otra rutina en Inicio y listo.','Start the loop over': 'Empezar el bucle de nuevo','Start the loop': 'Empezar el bucle',@@ -1793,7 +1793,7 @@ export default {'Now in Stats, next to Muscle balance': 'Ahora en Progreso, junto al equilibrio muscular','Tap to plan something': 'Toca para planificar algo','Drag to reorder': 'Arrastra para reordenar',- 'Drag to reorder. Tap the red button to delete.': 'Arrastra para reordenar. Toca el botón rojo para eliminar.',+ 'Drag to reorder. Tap the minus to delete.': 'Arrastra para reordenar. Toca el signo menos para eliminar.','Tap a routine to edit it. Reorder and delete are behind Edit.': 'Toca una rutina para editarla. Reordenar y eliminar están en Editar.','Pick one routine, or more to train them together.': 'Elige una rutina, o varias para entrenarlas juntas.','Planned sets per week, from your plan.': 'Series planificadas por semana, según tu plan.',@@ -1879,4 +1879,7 @@ export default {'Sets, reps, rest, progression': 'Series, reps, descanso, progresión','This workout': 'Este entrenamiento','Turn on push notifications first.': 'Activa primero las notificaciones push.',+ 'Remove {0}': 'Quitar {0}',+ 'Delete {0}': 'Eliminar {0}',+ 'Move {0}': 'Mover {0}',}diff --git a/frontend/src/locales/fr.js b/frontend/src/locales/fr.jsindex c4a27fbe6..5945d5da7 100644--- a/frontend/src/locales/fr.js+++ b/frontend/src/locales/fr.js@@ -1784,7 +1784,7 @@ export default {'Want two routines on one day? Tap the day and pick both.': 'Deux routines le même jour ? Touche le jour et choisis les deux.','The loop': 'La boucle','{0} of {1} done this round.': '{0} sur {1} faites ce tour-ci.',- 'Drag to reorder. Tap the red button to take one out.': 'Fais glisser pour réordonner. Touche le bouton rouge pour en retirer une.',+ 'Drag to reorder. Tap the minus to take one out.': 'Fais glisser pour réordonner. Touche le moins pour en retirer une.','Trained out of order? Just pick another routine on Home.': 'Entraîné dans le désordre ? Choisis simplement une autre routine sur Accueil.','Start the loop over': 'Recommencer la boucle','Start the loop': 'Lancer la boucle',@@ -1793,7 +1793,7 @@ export default {'Now in Stats, next to Muscle balance': 'Maintenant dans Stats, à côté de l’équilibre musculaire','Tap to plan something': 'Touche pour planifier quelque chose','Drag to reorder': 'Fais glisser pour réordonner',- 'Drag to reorder. Tap the red button to delete.': 'Fais glisser pour réordonner. Touche le bouton rouge pour supprimer.',+ 'Drag to reorder. Tap the minus to delete.': 'Fais glisser pour réordonner. Touche le moins pour supprimer.','Tap a routine to edit it. Reorder and delete are behind Edit.': 'Touche une routine pour la modifier. Réordonner et supprimer se trouvent sous Modifier.','Pick one routine, or more to train them together.': 'Choisis une routine, ou plusieurs pour les faire ensemble.','Planned sets per week, from your plan.': 'Séries prévues par semaine, d’après ton plan.',@@ -1879,4 +1879,7 @@ export default {'Sets, reps, rest, progression': 'Séries, reps, repos, progression','This workout': 'Cette séance','Turn on push notifications first.': 'Active d’abord les notifications push.',+ 'Remove {0}': 'Retirer {0}',+ 'Delete {0}': 'Supprimer {0}',+ 'Move {0}': 'Déplacer {0}',}diff --git a/frontend/src/locales/hi.js b/frontend/src/locales/hi.jsindex 5e8c4e824..b6e29c764 100644--- a/frontend/src/locales/hi.js+++ b/frontend/src/locales/hi.js@@ -1784,7 +1784,7 @@ export default {'Want two routines on one day? Tap the day and pick both.': 'एक दिन में दो रूटीन? दिन पर टैप करें और दोनों चुनें।','The loop': 'चक्र','{0} of {1} done this round.': 'इस चक्कर में {1} में से {0} पूरे हुए।',- 'Drag to reorder. Tap the red button to take one out.': 'क्रम बदलने के लिए खींचें। किसी को हटाने के लिए लाल बटन पर टैप करें।',+ 'Drag to reorder. Tap the minus to take one out.': 'क्रम बदलने के लिए खींचें। किसी को हटाने के लिए माइनस पर टैप करें।','Trained out of order? Just pick another routine on Home.': 'क्रम से अलग ट्रेन किया? बस होम पर कोई और रूटीन चुन लें।','Start the loop over': 'चक्र फिर से शुरू करें','Start the loop': 'चक्र शुरू करें',@@ -1793,7 +1793,7 @@ export default {'Now in Stats, next to Muscle balance': 'अब आँकड़े में, मांसपेशी संतुलन के पास','Tap to plan something': 'कुछ प्लान करने के लिए टैप करें','Drag to reorder': 'क्रम बदलने के लिए खींचें',- 'Drag to reorder. Tap the red button to delete.': 'क्रम बदलने के लिए खींचें। हटाने के लिए लाल बटन पर टैप करें।',+ 'Drag to reorder. Tap the minus to delete.': 'क्रम बदलने के लिए खींचें। हटाने के लिए माइनस पर टैप करें।','Tap a routine to edit it. Reorder and delete are behind Edit.': 'किसी रूटीन को संपादित करने के लिए उस पर टैप करें। क्रम बदलना और हटाना संपादित करें में है।','Pick one routine, or more to train them together.': 'एक रूटीन चुनें, या साथ में करने के लिए कई।','Planned sets per week, from your plan.': 'आपके प्लान के अनुसार प्रति सप्ताह नियोजित सेट।',@@ -1879,4 +1879,7 @@ export default {'Sets, reps, rest, progression': 'सेट, रेप्स, आराम, प्रगति','This workout': 'यह वर्कआउट','Turn on push notifications first.': 'पहले पुश सूचनाएँ चालू करें।',+ 'Remove {0}': '{0} हटाएँ',+ 'Delete {0}': '{0} मिटाएँ',+ 'Move {0}': '{0} खिसकाएँ',}diff --git a/frontend/src/locales/hu.js b/frontend/src/locales/hu.jsindex bfd264737..2d2648a55 100644--- a/frontend/src/locales/hu.js+++ b/frontend/src/locales/hu.js@@ -1787,7 +1787,7 @@ export default {'Want two routines on one day? Tap the day and pick both.': 'Két rutin egy napon? Koppints a napra, és válaszd ki mindkettőt.','The loop': 'A kör','{0} of {1} done this round.': '{0} / {1} kész ebben a körben.',- 'Drag to reorder. Tap the red button to take one out.': 'Húzd az átrendezéshez. Koppints a piros gombra, ha egyet kivennél.',+ 'Drag to reorder. Tap the minus to take one out.': 'Húzd az átrendezéshez. Koppints a mínuszra, ha egyet kivennél.','Trained out of order? Just pick another routine on Home.': 'Nem sorrendben edzettél? Válassz egyszerűen másik rutint a Kezdőlapon.','Start the loop over': 'Kör újrakezdése','Start the loop': 'Kör indítása',@@ -1796,7 +1796,7 @@ export default {'Now in Stats, next to Muscle balance': 'Most a Statisztikában, az Izomegyensúly mellett','Tap to plan something': 'Koppints, és tervezz valamit','Drag to reorder': 'Húzd az átrendezéshez',- 'Drag to reorder. Tap the red button to delete.': 'Húzd az átrendezéshez. Koppints a piros gombra a törléshez.',+ 'Drag to reorder. Tap the minus to delete.': 'Húzd az átrendezéshez. Koppints a mínuszra a törléshez.','Tap a routine to edit it. Reorder and delete are behind Edit.': 'Koppints egy rutinra a szerkesztéshez. Átrendezés és törlés a Szerkesztés alatt.','Pick one routine, or more to train them together.': 'Válassz egy rutint, vagy többet, hogy együtt edzd őket.','Planned sets per week, from your plan.': 'Tervezett sorozatok hetente, a terved alapján.',@@ -1882,4 +1882,7 @@ export default {'Sets, reps, rest, progression': 'Sorozatok, ismétlések, pihenő, progresszió','This workout': 'Ez az edzés','Turn on push notifications first.': 'Előbb kapcsold be a push-értesítéseket.',+ 'Remove {0}': '{0} eltávolítása',+ 'Delete {0}': '{0} törlése',+ 'Move {0}': '{0} áthelyezése',}diff --git a/frontend/src/locales/it.js b/frontend/src/locales/it.jsindex 1e4efca03..98a3087df 100644--- a/frontend/src/locales/it.js+++ b/frontend/src/locales/it.js@@ -1784,7 +1784,7 @@ export default {'Want two routines on one day? Tap the day and pick both.': 'Due routine in un giorno? Tocca il giorno e scegli entrambe.','The loop': 'Il ciclo','{0} of {1} done this round.': '{0} di {1} fatte in questo giro.',- 'Drag to reorder. Tap the red button to take one out.': 'Trascina per riordinare. Tocca il pulsante rosso per toglierne una.',+ 'Drag to reorder. Tap the minus to take one out.': 'Trascina per riordinare. Tocca il meno per toglierne una.','Trained out of order? Just pick another routine on Home.': 'Ti sei allenato fuori ordine? Scegli semplicemente un’altra routine in Home.','Start the loop over': 'Ricomincia il ciclo','Start the loop': 'Avvia il ciclo',@@ -1793,7 +1793,7 @@ export default {'Now in Stats, next to Muscle balance': 'Ora in Statistiche, accanto all’equilibrio muscolare','Tap to plan something': 'Tocca per pianificare qualcosa','Drag to reorder': 'Trascina per riordinare',- 'Drag to reorder. Tap the red button to delete.': 'Trascina per riordinare. Tocca il pulsante rosso per eliminare.',+ 'Drag to reorder. Tap the minus to delete.': 'Trascina per riordinare. Tocca il meno per eliminare.','Tap a routine to edit it. Reorder and delete are behind Edit.': 'Tocca una routine per modificarla. Riordina ed elimina sono sotto Modifica.','Pick one routine, or more to train them together.': 'Scegli una routine, o più di una per farle insieme.','Planned sets per week, from your plan.': 'Serie pianificate a settimana, dal tuo piano.',@@ -1879,4 +1879,7 @@ export default {'Sets, reps, rest, progression': 'Serie, rip., recupero, progressione','This workout': 'Questo allenamento','Turn on push notifications first.': 'Attiva prima le notifiche push.',+ 'Remove {0}': 'Togli {0}',+ 'Delete {0}': 'Elimina {0}',+ 'Move {0}': 'Sposta {0}',}diff --git a/frontend/src/locales/ko.js b/frontend/src/locales/ko.jsindex c04c4862d..e14068dfb 100644--- a/frontend/src/locales/ko.js+++ b/frontend/src/locales/ko.js@@ -1784,7 +1784,7 @@ export default {'Want two routines on one day? Tap the day and pick both.': '하루에 루틴 두 개? 요일을 탭하고 둘 다 고르세요.','The loop': '순환','{0} of {1} done this round.': '이번 바퀴에서 {1}개 중 {0}개 완료.',- 'Drag to reorder. Tap the red button to take one out.': '드래그해서 순서를 바꾸세요. 빼려면 빨간 버튼을 탭하세요.',+ 'Drag to reorder. Tap the minus to take one out.': '드래그해서 순서를 바꾸세요. 빼려면 마이너스를 탭하세요.','Trained out of order? Just pick another routine on Home.': '순서와 다르게 운동했나요? 홈에서 다른 루틴을 고르면 돼요.','Start the loop over': '순환 처음부터 다시','Start the loop': '순환 시작',@@ -1793,7 +1793,7 @@ export default {'Now in Stats, next to Muscle balance': '이제 통계의 근육 균형 옆에 있어요','Tap to plan something': '탭해서 계획하기','Drag to reorder': '드래그해서 순서 변경',- 'Drag to reorder. Tap the red button to delete.': '드래그해서 순서를 바꾸세요. 삭제하려면 빨간 버튼을 탭하세요.',+ 'Drag to reorder. Tap the minus to delete.': '드래그해서 순서를 바꾸세요. 삭제하려면 마이너스를 탭하세요.','Tap a routine to edit it. Reorder and delete are behind Edit.': '루틴을 탭하면 편집할 수 있어요. 순서 변경과 삭제는 편집에 있어요.','Pick one routine, or more to train them together.': '루틴 하나를 고르거나, 함께 하려면 여러 개를 고르세요.','Planned sets per week, from your plan.': '플랜에 따른 주간 계획 세트 수.',@@ -1879,4 +1879,7 @@ export default {'Sets, reps, rest, progression': '세트, 반복, 휴식, 진행','This workout': '이번 운동','Turn on push notifications first.': '먼저 푸시 알림을 켜세요.',+ 'Remove {0}': '{0} 빼기',+ 'Delete {0}': '{0} 삭제',+ 'Move {0}': '{0} 이동',}diff --git a/frontend/src/locales/pl.js b/frontend/src/locales/pl.jsindex 4ce362634..4c3396e7c 100644--- a/frontend/src/locales/pl.js+++ b/frontend/src/locales/pl.js@@ -1784,7 +1784,7 @@ export default {'Want two routines on one day? Tap the day and pick both.': 'Dwa plany jednego dnia? Dotknij dnia i wybierz oba.','The loop': 'Pętla','{0} of {1} done this round.': '{0} z {1} zrobione w tej rundzie.',- 'Drag to reorder. Tap the red button to take one out.': 'Przeciągnij, aby zmienić kolejność. Dotknij czerwonego przycisku, aby jeden usunąć.',+ 'Drag to reorder. Tap the minus to take one out.': 'Przeciągnij, aby zmienić kolejność. Dotknij minusa, aby jeden usunąć.','Trained out of order? Just pick another routine on Home.': 'Trenujesz nie po kolei? Po prostu wybierz inny plan na ekranie Start.','Start the loop over': 'Zacznij pętlę od nowa','Start the loop': 'Rozpocznij pętlę',@@ -1793,7 +1793,7 @@ export default {'Now in Stats, next to Muscle balance': 'Teraz w Statystykach, obok równowagi mięśniowej','Tap to plan something': 'Dotknij, aby coś zaplanować','Drag to reorder': 'Przeciągnij, aby zmienić kolejność',- 'Drag to reorder. Tap the red button to delete.': 'Przeciągnij, aby zmienić kolejność. Dotknij czerwonego przycisku, aby usunąć.',+ 'Drag to reorder. Tap the minus to delete.': 'Przeciągnij, aby zmienić kolejność. Dotknij minusa, aby usunąć.','Tap a routine to edit it. Reorder and delete are behind Edit.': 'Dotknij planu, aby go edytować. Zmiana kolejności i usuwanie są pod Edytuj.','Pick one routine, or more to train them together.': 'Wybierz jeden plan albo kilka, aby zrobić je razem.','Planned sets per week, from your plan.': 'Zaplanowane serie na tydzień, z twojego planu.',@@ -1879,4 +1879,7 @@ export default {'Sets, reps, rest, progression': 'Serie, powt., przerwa, progresja','This workout': 'Ten trening','Turn on push notifications first.': 'Najpierw włącz powiadomienia push.',+ 'Remove {0}': 'Usuń {0}',+ 'Delete {0}': 'Usuń {0}',+ 'Move {0}': 'Przenieś {0}',}diff --git a/frontend/src/locales/pt-BR.js b/frontend/src/locales/pt-BR.jsindex dd954da31..bad733265 100644--- a/frontend/src/locales/pt-BR.js+++ b/frontend/src/locales/pt-BR.js@@ -1127,12 +1127,12 @@ export const PT_BR_OVERRIDES = {'The same routines on the same weekdays, every week.': 'As mesmas rotinas nos mesmos dias, toda semana.','How you train': 'Como você treina','Want two routines on one day? Tap the day and pick both.': 'Duas rotinas em um dia? Toque no dia e escolha as duas.',- 'Drag to reorder. Tap the red button to take one out.': 'Arraste para reordenar. Toque no botão vermelho para tirar uma.',+ 'Drag to reorder. Tap the minus to take one out.': 'Arraste para reordenar. Toque no sinal de menos para tirar uma.','Trained out of order? Just pick another routine on Home.': 'Treinou fora de ordem? É só escolher outra rotina no Início.','These count on top of the loop. Tap a day to change or clear it.': 'Contam além do ciclo. Toque em um dia para mudar ou limpar.','Tap to plan something': 'Toque para planejar algo','Drag to reorder': 'Arraste para reordenar',- 'Drag to reorder. Tap the red button to delete.': 'Arraste para reordenar. Toque no botão vermelho para excluir.',+ 'Drag to reorder. Tap the minus to delete.': 'Arraste para reordenar. Toque no sinal de menos para excluir.','Tap a routine to edit it. Reorder and delete are behind Edit.': 'Toque em uma rotina para editar. Reordenar e excluir ficam em Editar.','Pick one routine, or more to train them together.': 'Escolha uma rotina, ou várias para treinar juntas.','Planned sets per week, from your plan.': 'Séries planejadas por semana, a partir do seu plano.',@@ -1165,6 +1165,7 @@ export const PT_BR_OVERRIDES = {'Open Settings → Account → “Pair the mobile app” on the openGym site you’re already signed into, then enter its address and the code shown there.': 'No site openGym em que você já está conectado, abra Configurações → Conta → “Parear o aplicativo”, depois digite o endereço e o código mostrado lá.','Open Settings → Account → “Pair the mobile app” on your openGym site in a browser and enter the new code shown there. What this phone kept is merged into your account.': 'No seu site openGym em um navegador, abra Configurações → Conta → “Parear o aplicativo” e digite o novo código mostrado lá. O que este celular manteve é incorporado à sua conta.','Turn on push notifications first.': 'Ative primeiro as notificações push.',+ 'Delete {0}': 'Excluir {0}',}export default { ...pt, ...PT_BR_OVERRIDES }diff --git a/frontend/src/locales/pt.js b/frontend/src/locales/pt.jsindex 6a96d7cd1..35fd9ad0e 100644--- a/frontend/src/locales/pt.js+++ b/frontend/src/locales/pt.js@@ -1784,7 +1784,7 @@ export default {'Want two routines on one day? Tap the day and pick both.': 'Duas rotinas num dia? Toca no dia e escolhe as duas.','The loop': 'O ciclo','{0} of {1} done this round.': '{0} de {1} feitas nesta volta.',- 'Drag to reorder. Tap the red button to take one out.': 'Arrasta para reordenar. Toca no botão vermelho para tirar uma.',+ 'Drag to reorder. Tap the minus to take one out.': 'Arrasta para reordenar. Toca no sinal de menos para tirar uma.','Trained out of order? Just pick another routine on Home.': 'Treinaste fora de ordem? Escolhe outra rotina no Início e pronto.','Start the loop over': 'Recomeçar o ciclo','Start the loop': 'Iniciar o ciclo',@@ -1793,7 +1793,7 @@ export default {'Now in Stats, next to Muscle balance': 'Agora em Estatísticas, ao lado do equilíbrio muscular','Tap to plan something': 'Toca para planear algo','Drag to reorder': 'Arrasta para reordenar',- 'Drag to reorder. Tap the red button to delete.': 'Arrasta para reordenar. Toca no botão vermelho para eliminar.',+ 'Drag to reorder. Tap the minus to delete.': 'Arrasta para reordenar. Toca no sinal de menos para eliminar.','Tap a routine to edit it. Reorder and delete are behind Edit.': 'Toca numa rotina para a editar. Reordenar e eliminar estão em Editar.','Pick one routine, or more to train them together.': 'Escolhe uma rotina, ou várias para as treinar juntas.','Planned sets per week, from your plan.': 'Séries planeadas por semana, a partir do teu plano.',@@ -1879,4 +1879,7 @@ export default {'Sets, reps, rest, progression': 'Séries, reps, descanso, progressão','This workout': 'Este treino','Turn on push notifications first.': 'Ativa primeiro as notificações push.',+ 'Remove {0}': 'Tirar {0}',+ 'Delete {0}': 'Eliminar {0}',+ 'Move {0}': 'Mover {0}',}diff --git a/frontend/src/locales/ru.js b/frontend/src/locales/ru.jsindex 4bf85ebb0..231602722 100644--- a/frontend/src/locales/ru.js+++ b/frontend/src/locales/ru.js@@ -1788,7 +1788,7 @@ export default {'Want two routines on one day? Tap the day and pick both.': 'Две программы в один день? Нажми на день и выбери обе.','The loop': 'Круг','{0} of {1} done this round.': '{0} из {1} сделано в этом круге.',- 'Drag to reorder. Tap the red button to take one out.': 'Перетащи, чтобы изменить порядок. Нажми красную кнопку, чтобы убрать одну.',+ 'Drag to reorder. Tap the minus to take one out.': 'Перетащи, чтобы изменить порядок. Нажми минус, чтобы убрать одну.','Trained out of order? Just pick another routine on Home.': 'Тренировался не по порядку? Просто выбери другую программу на Главной.','Start the loop over': 'Начать круг заново','Start the loop': 'Начать круг',@@ -1797,7 +1797,7 @@ export default {'Now in Stats, next to Muscle balance': 'Теперь в Статистике, рядом с балансом мышц','Tap to plan something': 'Нажми, чтобы что-то запланировать','Drag to reorder': 'Перетащи, чтобы изменить порядок',- 'Drag to reorder. Tap the red button to delete.': 'Перетащи, чтобы изменить порядок. Нажми красную кнопку, чтобы удалить.',+ 'Drag to reorder. Tap the minus to delete.': 'Перетащи, чтобы изменить порядок. Нажми минус, чтобы удалить.','Tap a routine to edit it. Reorder and delete are behind Edit.': 'Нажми на программу, чтобы изменить её. Порядок и удаление в разделе Изменить.','Pick one routine, or more to train them together.': 'Выбери одну программу или несколько, чтобы делать их вместе.','Planned sets per week, from your plan.': 'Запланированные подходы в неделю по твоему плану.',@@ -1883,4 +1883,7 @@ export default {'Sets, reps, rest, progression': 'Подходы, повторы, отдых, прогрессия','This workout': 'Эта тренировка','Turn on push notifications first.': 'Сначала включи push-уведомления.',+ 'Remove {0}': 'Убрать {0}',+ 'Delete {0}': 'Удалить {0}',+ 'Move {0}': 'Переместить {0}',}diff --git a/frontend/src/locales/th.js b/frontend/src/locales/th.jsindex 189c0d046..20cefdb7b 100644--- a/frontend/src/locales/th.js+++ b/frontend/src/locales/th.js@@ -1795,7 +1795,7 @@ export default {'Want two routines on one day? Tap the day and pick both.': 'อยากได้สองรูทีนในวันเดียว? แตะวันนั้นแล้วเลือกทั้งสอง','The loop': 'การวนรอบ','{0} of {1} done this round.': 'รอบนี้เสร็จแล้ว {0} จาก {1}',- 'Drag to reorder. Tap the red button to take one out.': 'ลากเพื่อจัดลำดับ แตะปุ่มสีแดงเพื่อเอาออกหนึ่งรายการ',+ 'Drag to reorder. Tap the minus to take one out.': 'ลากเพื่อจัดลำดับ แตะเครื่องหมายลบเพื่อเอาออกหนึ่งรายการ','Trained out of order? Just pick another routine on Home.': 'ฝึกไม่ตามลำดับ? แค่เลือกรูทีนอื่นที่หน้าหลัก','Start the loop over': 'เริ่มวนรอบใหม่','Start the loop': 'เริ่มวนรอบ',@@ -1804,7 +1804,7 @@ export default {'Now in Stats, next to Muscle balance': 'ตอนนี้อยู่ในสถิติ ข้างความสมดุลของกล้ามเนื้อ','Tap to plan something': 'แตะเพื่อวางแผน','Drag to reorder': 'ลากเพื่อจัดลำดับ',- 'Drag to reorder. Tap the red button to delete.': 'ลากเพื่อจัดลำดับ แตะปุ่มสีแดงเพื่อลบ',+ 'Drag to reorder. Tap the minus to delete.': 'ลากเพื่อจัดลำดับ แตะเครื่องหมายลบเพื่อลบ','Tap a routine to edit it. Reorder and delete are behind Edit.': 'แตะรูทีนเพื่อแก้ไข การจัดลำดับและการลบอยู่ในแก้ไข','Pick one routine, or more to train them together.': 'เลือกหนึ่งรูทีน หรือหลายรูทีนเพื่อฝึกด้วยกัน','Planned sets per week, from your plan.': 'เซ็ตที่วางแผนต่อสัปดาห์ จากแผนของคุณ',@@ -1890,4 +1890,7 @@ export default {'Sets, reps, rest, progression': 'เซ็ต ครั้ง เวลาพัก การเพิ่มน้ำหนัก','This workout': 'การออกกำลังกายครั้งนี้','Turn on push notifications first.': 'เปิดการแจ้งเตือนแบบพุชก่อน',+ 'Remove {0}': 'เอา {0} ออก',+ 'Delete {0}': 'ลบ {0}',+ 'Move {0}': 'ย้าย {0}',}diff --git a/frontend/src/locales/tr.js b/frontend/src/locales/tr.jsindex 174fb4819..f2ca58b9e 100644--- a/frontend/src/locales/tr.js+++ b/frontend/src/locales/tr.js@@ -1784,7 +1784,7 @@ export default {'Want two routines on one day? Tap the day and pick both.': 'Bir günde iki rutin mi? Güne dokun ve ikisini de seç.','The loop': 'Döngü','{0} of {1} done this round.': 'Bu turda {1} rutinden {0} tanesi bitti.',- 'Drag to reorder. Tap the red button to take one out.': 'Sıralamak için sürükle. Birini çıkarmak için kırmızı düğmeye dokun.',+ 'Drag to reorder. Tap the minus to take one out.': 'Sıralamak için sürükle. Birini çıkarmak için eksiye dokun.','Trained out of order? Just pick another routine on Home.': 'Sırasız mı çalıştın? Ana sayfada başka bir rutin seçmen yeterli.','Start the loop over': 'Döngüyü baştan başlat','Start the loop': 'Döngüyü başlat',@@ -1793,7 +1793,7 @@ export default {'Now in Stats, next to Muscle balance': 'Artık İstatistik’te, Kas dengesinin yanında','Tap to plan something': 'Bir şey planlamak için dokun','Drag to reorder': 'Sıralamak için sürükle',- 'Drag to reorder. Tap the red button to delete.': 'Sıralamak için sürükle. Silmek için kırmızı düğmeye dokun.',+ 'Drag to reorder. Tap the minus to delete.': 'Sıralamak için sürükle. Silmek için eksiye dokun.','Tap a routine to edit it. Reorder and delete are behind Edit.': 'Düzenlemek için bir rutine dokun. Sıralama ve silme Düzenle altında.','Pick one routine, or more to train them together.': 'Bir rutin seç ya da birlikte yapmak için birkaç tane.','Planned sets per week, from your plan.': 'Planına göre haftalık planlanan setler.',@@ -1879,4 +1879,7 @@ export default {'Sets, reps, rest, progression': 'Setler, tekrarlar, dinlenme, ilerleme','This workout': 'Bu antrenman','Turn on push notifications first.': 'Önce anlık bildirimleri aç.',+ 'Remove {0}': '{0} çıkar',+ 'Delete {0}': '{0} sil',+ 'Move {0}': '{0} taşı',}diff --git a/frontend/src/locales/uk.js b/frontend/src/locales/uk.jsindex 24d20ede9..ecbbf23d4 100644--- a/frontend/src/locales/uk.js+++ b/frontend/src/locales/uk.js@@ -1781,7 +1781,7 @@ export default {'Want two routines on one day? Tap the day and pick both.': 'Дві програми в один день? Натисни на день і вибери обидві.','The loop': 'Коло','{0} of {1} done this round.': '{0} з {1} зроблено в цьому колі.',- 'Drag to reorder. Tap the red button to take one out.': 'Перетягни, щоб змінити порядок. Натисни червону кнопку, щоб прибрати одну.',+ 'Drag to reorder. Tap the minus to take one out.': 'Перетягни, щоб змінити порядок. Натисни мінус, щоб прибрати одну.','Trained out of order? Just pick another routine on Home.': 'Тренувався не по черзі? Просто вибери іншу програму на Головній.','Start the loop over': 'Почати коло заново','Start the loop': 'Почати коло',@@ -1790,7 +1790,7 @@ export default {'Now in Stats, next to Muscle balance': 'Тепер у Статистиці, поруч із балансом м’язів','Tap to plan something': 'Натисни, щоб щось запланувати','Drag to reorder': 'Перетягни, щоб змінити порядок',- 'Drag to reorder. Tap the red button to delete.': 'Перетягни, щоб змінити порядок. Натисни червону кнопку, щоб видалити.',+ 'Drag to reorder. Tap the minus to delete.': 'Перетягни, щоб змінити порядок. Натисни мінус, щоб видалити.','Tap a routine to edit it. Reorder and delete are behind Edit.': 'Натисни на програму, щоб змінити її. Порядок і видалення в розділі Змінити.','Pick one routine, or more to train them together.': 'Вибери одну програму або кілька, щоб робити їх разом.','Planned sets per week, from your plan.': 'Заплановані підходи на тиждень за твоїм планом.',@@ -1876,4 +1876,7 @@ export default {'Sets, reps, rest, progression': 'Підходи, повтори, відпочинок, прогресія','This workout': 'Це тренування','Turn on push notifications first.': 'Спершу увімкни push-сповіщення.',+ 'Remove {0}': 'Прибрати {0}',+ 'Delete {0}': 'Видалити {0}',+ 'Move {0}': 'Перемістити {0}',}diff --git a/frontend/src/locales/zh-TW.js b/frontend/src/locales/zh-TW.jsindex abb238d94..338453934 100644--- a/frontend/src/locales/zh-TW.js+++ b/frontend/src/locales/zh-TW.js@@ -1777,7 +1777,7 @@ export default {'Want two routines on one day? Tap the day and pick both.': '一天想練兩個課表?點一下那天,兩個都選。','The loop': '循環','{0} of {1} done this round.': '本輪已完成 {0}/{1}。',- 'Drag to reorder. Tap the red button to take one out.': '拖曳可調整順序。點紅色按鈕可移除一個。',+ 'Drag to reorder. Tap the minus to take one out.': '拖曳可調整順序。點減號可移除一個。','Trained out of order? Just pick another routine on Home.': '沒照順序練?在首頁選另一個課表就好。','Start the loop over': '重新開始循環','Start the loop': '開始循環',@@ -1786,7 +1786,7 @@ export default {'Now in Stats, next to Muscle balance': '現在在數據統計裡,肌群均衡分析旁邊','Tap to plan something': '點一下來安排訓練','Drag to reorder': '拖曳調整順序',- 'Drag to reorder. Tap the red button to delete.': '拖曳可調整順序。點紅色按鈕可刪除。',+ 'Drag to reorder. Tap the minus to delete.': '拖曳可調整順序。點減號可刪除。','Tap a routine to edit it. Reorder and delete are behind Edit.': '點課表即可編輯。調整順序和刪除在「編輯」裡。','Pick one routine, or more to train them together.': '選一個課表,或選多個一起練。','Planned sets per week, from your plan.': '依你的計畫,每週計畫的組數。',@@ -1872,4 +1872,7 @@ export default {'Sets, reps, rest, progression': '組數、次數、休息、漸進','This workout': '本次訓練','Turn on push notifications first.': '請先開啟推播通知。',+ 'Remove {0}': '移除 {0}',+ 'Delete {0}': '刪除 {0}',+ 'Move {0}': '移動 {0}',}diff --git a/frontend/src/locales/zh.js b/frontend/src/locales/zh.jsindex a52d565ab..65f3dd248 100644--- a/frontend/src/locales/zh.js+++ b/frontend/src/locales/zh.js@@ -1784,7 +1784,7 @@ export default {'Want two routines on one day? Tap the day and pick both.': '一天想练两个训练日?点一下那天,两个都选上。','The loop': '循环','{0} of {1} done this round.': '本轮已完成 {0}/{1}。',- 'Drag to reorder. Tap the red button to take one out.': '拖动可调整顺序。点红色按钮可移除一个。',+ 'Drag to reorder. Tap the minus to take one out.': '拖动可调整顺序。点减号可移除一个。','Trained out of order? Just pick another routine on Home.': '没按顺序练?在首页选另一个训练日就行。','Start the loop over': '重新开始循环','Start the loop': '开始循环',@@ -1793,7 +1793,7 @@ export default {'Now in Stats, next to Muscle balance': '现在在统计里,肌肉平衡旁边','Tap to plan something': '点一下来安排训练','Drag to reorder': '拖动调整顺序',- 'Drag to reorder. Tap the red button to delete.': '拖动可调整顺序。点红色按钮可删除。',+ 'Drag to reorder. Tap the minus to delete.': '拖动可调整顺序。点减号可删除。','Tap a routine to edit it. Reorder and delete are behind Edit.': '点训练日即可编辑。调整顺序和删除在“编辑”里。','Pick one routine, or more to train them together.': '选一个训练日,或选多个一起练。','Planned sets per week, from your plan.': '按你的计划,每周计划的组数。',@@ -1879,4 +1879,7 @@ export default {'Sets, reps, rest, progression': '组数、次数、休息、渐进','This workout': '本次训练','Turn on push notifications first.': '请先打开推送通知。',+ 'Remove {0}': '移除 {0}',+ 'Delete {0}': '删除 {0}',+ 'Move {0}': '移动 {0}',}diff --git a/frontend/src/views/Plan.jsx b/frontend/src/views/Plan.jsxindex d9bea800d..035eb223a 100644--- a/frontend/src/views/Plan.jsx+++ b/frontend/src/views/Plan.jsx@@ -215,7 +215,7 @@ function Schedule({ S, update, nav, mode }) {const r = routineOf(id)const item = qv?.items[i]return <div key={id} data-reorder-row className={'item rotation-row' + (item?.state === 'done' ? ' is-done' : '')} style={loopReorder.rowStyle(i)}>- {editing && <button className="plan-minus" aria-label={t('Remove')} title={t('Remove')}+ {editing && <button className="plan-minus" aria-label={t('Remove {0}', r?.name ?? id)} title={t('Remove')}onClick={() => setSeq(seq.filter(x => x !== id))}><Icon name="minus" /></button>}<span className={'plan-order' + (item?.state === 'next' ? ' next' : '')}>{item?.state === 'done' ? <Icon name="check" /> : i + 1}</span><span className="lrow-i"><Icon name={glyphOf(r?.emoji)} /></span>@@ -223,14 +223,14 @@ function Schedule({ S, update, nav, mode }) {<div className="tt">{r?.name ?? id}</div><div className="ss">{item ? stateWord(item) : r ? exCount(r.ex.length) : ''}</div></div>- {editing && seq.length > 1 && <button className="plan-handle" aria-label={t('Drag to reorder')} title={t('Drag to reorder')}+ {editing && seq.length > 1 && <button className="plan-handle" aria-label={t('Move {0}', r?.name ?? id)} title={t('Drag to reorder')}{...loopReorder.handle(i)}><Icon name="chevronsUpDown" /></button>}</div>})}</div> : <div className="empty">{t('No rotation yet. Add routines in the order you want to train them. The first one you haven’t logged stays up next.')}</div>}{seq.length > 0 && <p className="sect-f">{qv ? (qv.waiting ? t('Next pass starts {0}', fmtDate(qv.startsOn, true)) : t('{0} of {1} done this round.', doneCount, qv.items.length)) + ' ' : ''}- {external ? '' : editing ? t('Drag to reorder. Tap the red button to take one out.') : t('Trained out of order? Just pick another routine on Home.')}+ {external ? '' : editing ? t('Drag to reorder. Tap the minus to take one out.') : t('Trained out of order? Just pick another routine on Home.')}</p>}<div className="row" style={{ gap: 8, marginTop: 4, flexWrap: 'wrap' }}>{external && <Button size="sm" variant="tinted" aria-label={t('Use this rotation')} onClick={adopt}>{t('Use this rotation')}</Button>}@@ -301,10 +301,10 @@ function Routines({ S, update, nav }) {{edit? <div className="list routine-list plan-routines is-editing" ref={reorder.listRef}>{routines.map((r, i) =><div key={r.id} data-reorder-row className="item plan-routine" style={reorder.rowStyle(i)}>- <button className="plan-minus" aria-label={t('Delete routine')} title={t('Delete routine')} onClick={() => confirmDelete(r)}><Icon name="minus" /></button>+ <button className="plan-minus" aria-label={t('Delete {0}', r.name)} title={t('Delete routine')} onClick={() => confirmDelete(r)}><Icon name="minus" /></button><span className="lrow-i"><Icon name={glyphOf(r.emoji)} /></span><div className="grow"><div className="tt">{r.name}</div><div className="ss">{sub(r)}</div></div>- {routines.length > 1 && <button className="plan-handle" aria-label={t('Drag to reorder')} title={t('Drag to reorder')}+ {routines.length > 1 && <button className="plan-handle" aria-label={t('Move {0}', r.name)} title={t('Drag to reorder')}{...reorder.handle(i)}><Icon name="chevronsUpDown" /></button>}</div>)}</div>: <div className="list routine-list plan-routines">{routines.map(r => <SwipeToDelete key={r.id} className="item plan-routine"@@ -312,7 +312,7 @@ function Routines({ S, update, nav }) {<span className="lrow-i"><Icon name={glyphOf(r.emoji)} /></span><div className="grow"><div className="tt">{r.name}</div><div className="ss">{sub(r)}</div></div><Icon name="chevronRight" className="chev" /></SwipeToDelete>)}</div>}- <p className="sect-f">{edit ? t('Drag to reorder. Tap the red button to delete.') : t('Tap a routine to edit it. Reorder and delete are behind Edit.')}</p>+ <p className="sect-f">{edit ? t('Drag to reorder. Tap the minus to delete.') : t('Tap a routine to edit it. Reorder and delete are behind Edit.')}</p></> : <><div className="empty"><div className="ico"><Icon name="clipboard" /></div>{t('No routines yet.')}<br />{t('Make one, or grab the starter plan to get going.')}</div><Button icon="clipboard" onClick={starterPlanSheet}>{t('Load starter plan')}</Button>diff --git a/frontend/src/views/Plan.rotation.test.jsx b/frontend/src/views/Plan.rotation.test.jsxindex 09fc73197..a5e3ff758 100644--- a/frontend/src/views/Plan.rotation.test.jsx+++ b/frontend/src/views/Plan.rotation.test.jsx@@ -181,7 +181,10 @@ describe('Plan — the loop', () => {it('removing the last routine hands the schedule back to the weekday plan', () => {mount({ queue: live({ ids: ['a'], rotationId: 'r1' }), rotation: { id: 'r1', sequence: ['a'], label: 'My split' } })click(byLabel('Edit'))- click(rows()[0].querySelector('[aria-label="Remove"]'))+ const minus = rows()[0].querySelector('.plan-minus')+ expect(minus.getAttribute('aria-label')).toBe('Remove ' + routines.find(r => r.id === 'a').name) // named for its routine+ expect(host.textContent).toContain('Drag to reorder. Tap the minus to take one out.')+ click(minus)expect(mocks.S.queue).toBe(null)expect(mocks.S.rotation).toBe(null)expect(mocks.S.scheduleMode).toBe('week')diff --git a/frontend/src/views/Plan.routine-order.test.jsx b/frontend/src/views/Plan.routine-order.test.jsxindex f9eaf7eeb..976bde749 100644--- a/frontend/src/views/Plan.routine-order.test.jsx+++ b/frontend/src/views/Plan.routine-order.test.jsx@@ -58,7 +58,10 @@ describe('routine order', () => {mount()edit()expect(handles().length).toBe(3)- expect(host.querySelectorAll('button[aria-label="Delete routine"]').length).toBe(3)+ // each named for its routine, so a screen reader can tell three of them apart+ expect([...host.querySelectorAll('.plan-minus')].map(b => b.getAttribute('aria-label'))).toEqual(['Delete Push A', 'Delete Pull A', 'Delete Legs A'])+ expect(handles().map(b => b.getAttribute('aria-label'))).toEqual(['Move Push A', 'Move Pull A', 'Move Legs A'])+ expect(host.textContent).toContain('Drag to reorder. Tap the minus to delete.')click(rows()[0])expect(nav).not.toHaveBeenCalled()click(button('Done'))@@ -111,7 +114,7 @@ describe('routine order', () => {it('the red minus deletes only after the confirmation, routine, days and all', () => {mount()edit()- click(rows()[1].querySelector('button[aria-label="Delete routine"]'))+ click(rows()[1].querySelector('button[aria-label="Delete Pull A"]'))expect(stored()).toEqual(['Push A', 'Pull A', 'Legs A'])expect(confirmSheet).toHaveBeenCalledTimes(1)expect(confirmSheet.mock.calls[0][0].message).toContain('Pull A')@@ -125,7 +128,7 @@ describe('routine order', () => {mount()edit()expect(handles()).toEqual([])- expect(host.querySelector('button[aria-label="Delete routine"]')).toBeTruthy()+ expect(host.querySelector('.plan-minus')).toBeTruthy()})it('New routine sits at the top and opens the editor on the new routine', () => {