Skip to content

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.

Merge branch 'main' into RIR

Sergey Gorbatenkoe730017f562d
diff --cc frontend/src/locales/ar.js
index e57046f3f,b92f6745e..4f752369e
--- a/frontend/src/locales/ar.js
+++ b/frontend/src/locales/ar.js
@@@ -640,16 -646,13 +646,16 @@@ export default
'average effort': 'متوسط الجهد',
'at {0} {1} or harder': 'عند {0} {1} أو أعلى',
'{0} of {1} finished sets rated': '{0} من {1} مجموعات منتهية مُقيّمة',
+ 'estimated': 'تقديري',
+ '{0} rated · {1} estimated of {2} sets': '{0} مُقيّمة · {1} تقديرية من {2} مجموعات',
+ 'Effort per set is switched off — turn it on in Settings to keep rating.': 'الجهد لكل مجموعة متوقف — فعّله في الإعدادات لمواصلة التقييم.',
'Week by week': 'أسبوعًا بأسبوع',
'Where the sets land': 'أين تقع المجموعات',
- 'Most working sets belong close to failure without living there — half at the floor and half at the top average out to a healthy-looking middle.': 'معظم مجموعات العمل تكون قريبة من الفشل دون الوصول إليه — نصفها عند الأدنى ونصفها عند الأعلى، ومتوسطهما يقع في منتصف يبدو صحيًا.',
+ 'Most working sets belong close to failure, not at it. Half at the floor and half at the top still average out to a healthy-looking middle.': 'معظم مجموعات العمل مكانها قرب الفشل، لا عنده. نصف عند الأدنى ونصف عند الأعلى يعطيان متوسطًا يبدو صحيًا رغم ذلك.',
'Average effort per workout': 'متوسط الجهد لكل تمرين',
- 'A fuller dot means less left in the tank — the same weight at a lower {0} is progress the line alone does not show.': 'النقطة الأكثر امتلاءً تعني أن الاحتياط أقل — نفس الوزن عند {0} أقل يُعد تقدمًا لا يُظهره الخط وحده.',
+ 'A fuller dot means less left in the tank. The same weight at a lower {0} is progress the line alone doesn’t show.': 'النقطة الأكثر امتلاءً تعني أن ما تبقى في الخزان أقل. نفس الوزن عند {0} أقل تقدّم لا يُظهره الخط وحده.',
'Bodyweight': 'وزن الجسم',
- 'No weight to enter — just log the reps.': 'لا وزن لإدخاله — سجّل التكرارات فقط.',
+ 'No weight to enter. Just log the reps.': 'لا وزن لإدخاله. سجّل التكرارات فقط.',
'Ask for a weight on every set.': 'اطلب الوزن في كل مجموعة.',
'For dips or pull-ups with a belt. Progression then follows the weight.': 'لتمارين الغطس أو العقلة مع حزام. عندها يعتمد التدرج على الوزن.',
'Reps per side': 'التكرارات لكل جانب',
diff --cc frontend/src/locales/de.js
index 2e5a753e5,7fdb20e04..1cf874bf3
--- a/frontend/src/locales/de.js
+++ b/frontend/src/locales/de.js
@@@ -819,17 -824,14 +824,17 @@@ export default
'average effort': 'durchschnittliche Anstrengung',
'at {0} {1} or harder': 'bei {0} {1} oder härter',
'{0} of {1} finished sets rated': '{0} von {1} erledigten Sätzen bewertet',
+ 'estimated': 'geschätzt',
+ '{0} rated · {1} estimated of {2} sets': '{0} bewertet · {1} geschätzt von {2} Sätzen',
+ 'Effort per set is switched off — turn it on in Settings to keep rating.': 'Anstrengung pro Satz ist ausgeschaltet — schalte sie in den Einstellungen ein, um weiter zu bewerten.',
'Week by week': 'Woche für Woche',
'Where the sets land': 'Wo die Sätze landen',
- 'Most working sets belong close to failure without living there — half at the floor and half at the top average out to a healthy-looking middle.': 'Die meisten Arbeitssätze gehören nah ans Muskelversagen, ohne dort zu wohnen — die Hälfte ganz unten und die Hälfte ganz oben mittelt sich zu einem gesund aussehenden Mittelwert.',
+ 'Most working sets belong close to failure, not at it. Half at the floor and half at the top still average out to a healthy-looking middle.': 'Die meisten Arbeitssätze gehören nah ans Muskelversagen, nicht direkt dorthin. Die Hälfte ganz unten und die Hälfte ganz oben ergibt im Schnitt trotzdem eine gesund aussehende Mitte.',
'Average effort per workout': 'Durchschnittliche Anstrengung pro Training',
- 'A fuller dot means less left in the tank — the same weight at a lower {0} is progress the line alone does not show.': 'Ein vollerer Punkt heißt: weniger im Tank — dasselbe Gewicht bei niedrigerem {0} ist Fortschritt, den die Linie allein nicht zeigt.',
+ 'A fuller dot means less left in the tank. The same weight at a lower {0} is progress the line alone doesn’t show.': 'Ein vollerer Punkt heißt: weniger im Tank. Dasselbe Gewicht bei niedrigerem {0} ist Fortschritt, den die Linie allein nicht zeigt.',
// --- bodyweight & per side ---
'Bodyweight': 'Körpergewicht',
- 'No weight to enter — just log the reps.': 'Kein Gewicht einzutragen — nur die Wiederholungen.',
+ 'No weight to enter. Just log the reps.': 'Kein Gewicht einzutragen. Einfach die Wiederholungen loggen.',
'Ask for a weight on every set.': 'Bei jedem Satz nach dem Gewicht fragen.',
'For dips or pull-ups with a belt. Progression then follows the weight.': 'Für Dips oder Klimmzüge mit Gürtel. Die Progression folgt dann dem Gewicht.',
'Reps per side': 'Wiederholungen pro Seite',
diff --cc frontend/src/locales/es.js
index cf45b0547,592a333e1..f20f0e7ed
--- a/frontend/src/locales/es.js
+++ b/frontend/src/locales/es.js
@@@ -800,14 -805,11 +805,14 @@@ export default
'average effort': 'esfuerzo medio',
'at {0} {1} or harder': 'a {0} {1} o más duro',
'{0} of {1} finished sets rated': '{0} de {1} series completadas valoradas',
+ 'estimated': 'estimado',
+ '{0} rated · {1} estimated of {2} sets': '{0} valoradas · {1} estimadas de {2} series',
+ 'Effort per set is switched off — turn it on in Settings to keep rating.': 'El esfuerzo por serie está desactivado — actívalo en Ajustes para seguir valorando.',
'Week by week': 'Semana a semana',
'Where the sets land': 'Dónde caen las series',
- 'Most working sets belong close to failure without living there — half at the floor and half at the top average out to a healthy-looking middle.': 'La mayoría de las series efectivas van cerca del fallo sin vivir allí — la mitad abajo y la mitad arriba dan una media que solo parece sana.',
+ 'Most working sets belong close to failure, not at it. Half at the floor and half at the top still average out to a healthy-looking middle.': 'La mayoría de las series efectivas van cerca del fallo, no en él. La mitad abajo y la mitad arriba siguen dando una media que parece sana.',
'Average effort per workout': 'Esfuerzo medio por entrenamiento',
- 'A fuller dot means less left in the tank — the same weight at a lower {0} is progress the line alone does not show.': 'Un punto más lleno significa menos reserva — el mismo peso con un {0} más bajo es progreso que la línea por sí sola no muestra.',
+ 'A fuller dot means less left in the tank. The same weight at a lower {0} is progress the line alone doesn’t show.': 'Un punto más lleno significa menos reserva. El mismo peso con un {0} más bajo es progreso que la línea sola no muestra.',
// --- bodyweight & per side ---
'Bodyweight': 'Peso corporal',
diff --cc frontend/src/locales/fr.js
index 642b0ed6c,a6c2a3d84..1419c5a95
--- a/frontend/src/locales/fr.js
+++ b/frontend/src/locales/fr.js
@@@ -800,14 -805,11 +805,14 @@@ export default
'average effort': 'effort moyen',
'at {0} {1} or harder': 'à {0} {1} ou plus dur',
'{0} of {1} finished sets rated': '{0} séries notées sur {1} terminées',
+ 'estimated': 'estimé',
+ '{0} rated · {1} estimated of {2} sets': '{0} notées · {1} estimées sur {2} séries',
+ 'Effort per set is switched off — turn it on in Settings to keep rating.': 'L’effort par série est désactivé — active-le dans les Réglages pour continuer à noter.',
'Week by week': 'Semaine par semaine',
'Where the sets land': 'Où tombent les séries',
- 'Most working sets belong close to failure without living there — half at the floor and half at the top average out to a healthy-looking middle.': 'La plupart des séries de travail se placent près de l’échec sans y vivre — la moitié tout en bas et la moitié tout en haut donnent une moyenne qui n’a l’air saine que sur le papier.',
+ 'Most working sets belong close to failure, not at it. Half at the floor and half at the top still average out to a healthy-looking middle.': 'La plupart des séries de travail se placent près de l’échec, pas à l’échec. La moitié tout en bas et la moitié tout en haut, ça donne quand même une moyenne qui a l’air saine.',
'Average effort per workout': 'Effort moyen par séance',
- 'A fuller dot means less left in the tank — the same weight at a lower {0} is progress the line alone does not show.': 'Un point plus plein veut dire moins de réserve — le même poids à un {0} plus bas, c’est un progrès que la ligne seule ne montre pas.',
+ 'A fuller dot means less left in the tank. The same weight at a lower {0} is progress the line alone doesn’t show.': 'Un point plus plein veut dire moins de réserve. Le même poids à un {0} plus bas, c’est un progrès que la ligne seule ne montre pas.',
// --- bodyweight & per side ---
'Bodyweight': 'Poids du corps',
diff --cc frontend/src/locales/hi.js
index e17c7fa5c,8c05a4933..a0b1036a2
--- a/frontend/src/locales/hi.js
+++ b/frontend/src/locales/hi.js
@@@ -800,14 -805,11 +805,14 @@@ export default
'average effort': 'औसत मेहनत',
'at {0} {1} or harder': '{0} {1} या उससे कठिन',
'{0} of {1} finished sets rated': '{1} पूरे किए सेट में से {0} आँके गए',
+ 'estimated': 'अनुमानित',
+ '{0} rated · {1} estimated of {2} sets': '{2} सेटों में से {0} रेटेड · {1} अनुमानित',
+ 'Effort per set is switched off — turn it on in Settings to keep rating.': 'हर सेट की मेहनत बंद है — आँकना जारी रखने के लिए सेटिंग्स में चालू करें।',
'Week by week': 'हफ़्ते दर हफ़्ते',
'Where the sets land': 'सेट कहाँ गिरते हैं',
- 'Most working sets belong close to failure without living there — half at the floor and half at the top average out to a healthy-looking middle.': 'ज़्यादातर वर्किंग सेट फेलियर के पास होने चाहिए, पर वहीं बसे नहीं — आधे सबसे नीचे और आधे सबसे ऊपर मिलकर एक ऐसा औसत बनाते हैं जो सिर्फ़ देखने में सेहतमंद लगता है।',
+ 'Most working sets belong close to failure, not at it. Half at the floor and half at the top still average out to a healthy-looking middle.': 'ज़्यादातर वर्किंग सेट फ़ेल्योर के पास होने चाहिए, उस पर नहीं। आधे सबसे नीचे और आधे सबसे ऊपर हों, तब भी औसत बीच में सेहतमंद-सा दिखता है।',
'Average effort per workout': 'हर वर्कआउट की औसत मेहनत',
- 'A fuller dot means less left in the tank — the same weight at a lower {0} is progress the line alone does not show.': 'ज़्यादा भरा बिंदु मतलब टंकी में कम बचा — वही वज़न कम {0} पर उठाना वह प्रगति है जो अकेली लाइन नहीं दिखाती।',
+ 'A fuller dot means less left in the tank. The same weight at a lower {0} is progress the line alone doesn’t show.': 'ज़्यादा भरा बिंदु मतलब टंकी में कम बचा। वही वज़न कम {0} पर उठाना ऐसी प्रगति है जो अकेली लाइन नहीं दिखाती।',
// --- bodyweight & per side ---
'Bodyweight': 'बॉडीवेट',
diff --cc frontend/src/locales/hu.js
index 2ac8e5d68,3b8a3698f..eb808fe71
--- a/frontend/src/locales/hu.js
+++ b/frontend/src/locales/hu.js
@@@ -773,17 -778,14 +778,17 @@@ export default
'average effort': 'átlagos megerőltetés',
'at {0} {1} or harder': '{0} {1} vagy nehezebb szinten',
'{0} of {1} finished sets rated': '{1}-ből {0} befejezett sorozat értékelve',
+ 'estimated': 'becsült',
+ '{0} rated · {1} estimated of {2} sets': '{2} sorozatból {0} értékelt · {1} becsült',
+ 'Effort per set is switched off — turn it on in Settings to keep rating.': 'A Megerőltetés sorozatonként ki van kapcsolva — kapcsold be a Beállításokban a további értékeléshez.',
'Week by week': 'Hétről hétre',
'Where the sets land': 'Hova esnek a sorozatok',
- 'Most working sets belong close to failure without living there — half at the floor and half at the top average out to a healthy-looking middle.': 'A legtöbb munkasorozat közel van a kimerüléshez anélkül, hogy ott élne — fele lent, fele fent, ez egészségesnek tűnő átlagot ad.',
+ 'Most working sets belong close to failure, not at it. Half at the floor and half at the top still average out to a healthy-looking middle.': 'A legtöbb munkasorozat a kimerülés közelébe való, nem bele. Ha fele a legalján, fele a tetején van, az átlag akkor is egészségesnek tűnő középet ad.',
'Average effort per workout': 'Átlagos megerőltetés edzésenként',
- 'A fuller dot means less left in the tank — the same weight at a lower {0} is progress the line alone does not show.': 'Egy teltebb pont kevesebb tartalékot jelent — ugyanaz a súly alacsonyabb {0} mellett olyan fejlődés, amit a vonal önmagában nem mutat.',
+ 'A fuller dot means less left in the tank. The same weight at a lower {0} is progress the line alone doesn’t show.': 'A teltebb pont kevesebb tartalékot jelent. Ugyanaz a súly alacsonyabb {0} mellett olyan fejlődés, amit a vonal magában nem mutat.',
// --- bodyweight & per side ---
'Bodyweight': 'Testsúly',
- 'No weight to enter — just log the reps.': 'Nincs beírandó súly — csak az ismétléseket rögzítsd.',
+ 'No weight to enter. Just log the reps.': 'Nincs beírandó súly. Csak az ismétléseket rögzítsd.',
'Ask for a weight on every set.': 'Kérjen súlyt minden sorozatnál.',
'For dips or pull-ups with a belt. Progression then follows the weight.': 'Övvel végzett tolódzkodáshoz vagy húzódzkodáshoz. A progresszió ekkor a súlyt követi.',
'Reps per side': 'Ismétlés oldalanként',
diff --cc frontend/src/locales/it.js
index 3222e6f7e,81f392217..2f2eac455
--- a/frontend/src/locales/it.js
+++ b/frontend/src/locales/it.js
@@@ -800,14 -805,11 +805,14 @@@ export default
'average effort': 'sforzo medio',
'at {0} {1} or harder': 'a {0} {1} o più duro',
'{0} of {1} finished sets rated': '{0} di {1} serie completate valutate',
+ 'estimated': 'stimato',
+ '{0} rated · {1} estimated of {2} sets': '{0} valutate · {1} stimate su {2} serie',
+ 'Effort per set is switched off — turn it on in Settings to keep rating.': 'Lo sforzo per serie è disattivato — attivalo nelle Impostazioni per continuare a valutare.',
'Week by week': 'Settimana per settimana',
'Where the sets land': 'Dove cadono le serie',
- 'Most working sets belong close to failure without living there — half at the floor and half at the top average out to a healthy-looking middle.': 'La maggior parte delle serie di lavoro sta vicino al cedimento senza viverci — metà in fondo e metà in cima danno una media che sembra sana solo all’apparenza.',
+ 'Most working sets belong close to failure, not at it. Half at the floor and half at the top still average out to a healthy-looking middle.': 'La maggior parte delle serie di lavoro sta vicino al cedimento, non al cedimento. Metà in fondo e metà in cima danno comunque una media dall’aria sana.',
'Average effort per workout': 'Sforzo medio per allenamento',
- 'A fuller dot means less left in the tank — the same weight at a lower {0} is progress the line alone does not show.': 'Un punto più pieno significa meno riserva — lo stesso peso con un {0} più basso è progresso che la linea da sola non mostra.',
+ 'A fuller dot means less left in the tank. The same weight at a lower {0} is progress the line alone doesn’t show.': 'Un punto più pieno significa meno riserva. Lo stesso peso con un {0} più basso è progresso che la linea da sola non mostra.',
// --- bodyweight & per side ---
'Bodyweight': 'Corpo libero',
diff --cc frontend/src/locales/ko.js
index 066e19cd7,fc4f356c8..f278c227b
--- a/frontend/src/locales/ko.js
+++ b/frontend/src/locales/ko.js
@@@ -800,14 -805,11 +805,14 @@@ export default
'average effort': '평균 강도',
'at {0} {1} or harder': '{0} {1} 이상',
'{0} of {1} finished sets rated': '완료한 {1}세트 중 {0}세트 평가됨',
+ 'estimated': '추정치',
+ '{0} rated · {1} estimated of {2} sets': '{2}세트 중 {0} 평가됨 · {1} 추정치',
+ 'Effort per set is switched off — turn it on in Settings to keep rating.': '세트당 강도가 꺼져 있습니다 — 계속 평가하려면 설정에서 켜세요.',
'Week by week': '주별 변화',
'Where the sets land': '세트가 몰리는 곳',
- 'Most working sets belong close to failure without living there — half at the floor and half at the top average out to a healthy-looking middle.': '대부분의 본세트는 실패 지점 가까이에 있어야 하지만 거기 머물면 안 됩니다 — 절반은 바닥에 절반은 꼭대기에 있으면 평균만 건강해 보입니다.',
+ 'Most working sets belong close to failure, not at it. Half at the floor and half at the top still average out to a healthy-looking middle.': '대부분의 본세트는 실패 지점에 가까워야 하지, 실패 지점이면 안 돼요. 절반은 바닥, 절반은 꼭대기여도 평균은 그럴듯해 보이거든요.',
'Average effort per workout': '운동당 평균 강도',
- 'A fuller dot means less left in the tank — the same weight at a lower {0} is progress the line alone does not show.': '점이 진할수록 남은 여력이 적다는 뜻입니다 — 같은 무게를 더 낮은 {0}로 든 것은 선만 봐서는 알 수 없는 발전입니다.',
+ 'A fuller dot means less left in the tank. The same weight at a lower {0} is progress the line alone doesn’t show.': '점이 꽉 찰수록 남은 여력이 적다는 뜻이에요. 같은 무게를 더 낮은 {0}(으)로 들었다면, 선만 봐서는 안 보이는 발전이에요.',
// --- bodyweight & per side ---
'Bodyweight': '맨몸 운동',
diff --cc frontend/src/locales/pl.js
index 3565f3d74,92579d18f..0385eb1d8
--- a/frontend/src/locales/pl.js
+++ b/frontend/src/locales/pl.js
@@@ -800,14 -805,11 +805,14 @@@ export default
'average effort': 'średni wysiłek',
'at {0} {1} or harder': 'przy {0} {1} lub ciężej',
'{0} of {1} finished sets rated': 'ocenione serie: {0} z {1} ukończonych',
+ 'estimated': 'szacunkowo',
+ '{0} rated · {1} estimated of {2} sets': '{0} oceniono · {1} oszacowano z {2} serii',
+ 'Effort per set is switched off — turn it on in Settings to keep rating.': 'Wysiłek na serię jest wyłączony — włącz go w Ustawieniach, aby dalej oceniać.',
'Week by week': 'Tydzień po tygodniu',
'Where the sets land': 'Gdzie lądują serie',
- 'Most working sets belong close to failure without living there — half at the floor and half at the top average out to a healthy-looking middle.': 'Większość serii roboczych należy blisko upadku, ale nie na nim — połowa na dole i połowa na górze uśrednia się do zdrowo wyglądającego środka.',
+ 'Most working sets belong close to failure, not at it. Half at the floor and half at the top still average out to a healthy-looking middle.': 'Większość serii roboczych powinna być blisko upadku, ale nie na nim. Połowa na dole i połowa na górze i tak uśrednia się do zdrowo wyglądającego środka.',
'Average effort per workout': 'Średni wysiłek na trening',
- 'A fuller dot means less left in the tank — the same weight at a lower {0} is progress the line alone does not show.': 'Pełniejsza kropka znaczy mniej zapasu — ten sam ciężar przy niższym {0} to postęp, którego sama linia nie pokazuje.',
+ 'A fuller dot means less left in the tank. The same weight at a lower {0} is progress the line alone doesn’t show.': 'Pełniejsza kropka znaczy mniej zapasu. Ten sam ciężar przy niższym {0} to postęp, którego sama linia nie pokazuje.',
// --- bodyweight & per side ---
'Bodyweight': 'Masa własna',
diff --cc frontend/src/locales/pt.js
index 7c101c0c4,ad06595ac..7822ebd26
--- a/frontend/src/locales/pt.js
+++ b/frontend/src/locales/pt.js
@@@ -800,14 -805,11 +805,14 @@@ export default
'average effort': 'esforço médio',
'at {0} {1} or harder': 'a {0} {1} ou mais duro',
'{0} of {1} finished sets rated': '{0} de {1} séries concluídas avaliadas',
+ 'estimated': 'estimado',
+ '{0} rated · {1} estimated of {2} sets': '{0} avaliadas · {1} estimadas de {2} séries',
+ 'Effort per set is switched off — turn it on in Settings to keep rating.': 'O esforço por série está desligado — liga-o nas Definições para continuares a avaliar.',
'Week by week': 'Semana a semana',
'Where the sets land': 'Onde caem as séries',
- 'Most working sets belong close to failure without living there — half at the floor and half at the top average out to a healthy-looking middle.': 'A maioria das séries de trabalho fica perto da falha sem viver lá — metade no fundo e metade no topo dão uma média que só parece saudável.',
+ 'Most working sets belong close to failure, not at it. Half at the floor and half at the top still average out to a healthy-looking middle.': 'A maioria das séries de trabalho deve ficar perto da falha, não nela. Metade no fundo e metade no topo continuam a dar uma média com ar saudável.',
'Average effort per workout': 'Esforço médio por treino',
- 'A fuller dot means less left in the tank — the same weight at a lower {0} is progress the line alone does not show.': 'Um ponto mais cheio significa menos margem — o mesmo peso com um {0} mais baixo é progresso que a linha sozinha não mostra.',
+ 'A fuller dot means less left in the tank. The same weight at a lower {0} is progress the line alone doesn’t show.': 'Um ponto mais cheio quer dizer menos no depósito. O mesmo peso com um {0} mais baixo é progresso que a linha sozinha não mostra.',
// --- bodyweight & per side ---
'Bodyweight': 'Peso do corpo',
diff --cc frontend/src/locales/ru.js
index 0088c27bd,576e5cbe6..115db73fe
--- a/frontend/src/locales/ru.js
+++ b/frontend/src/locales/ru.js
@@@ -800,14 -787,11 +787,14 @@@ export default
'average effort': 'среднее усилие',
'at {0} {1} or harder': 'при {0} {1} или тяжелее',
'{0} of {1} finished sets rated': 'оценено {0} из {1} выполненных подходов',
+ 'estimated': 'оценочно',
+ '{0} rated · {1} estimated of {2} sets': '{0} оценено · {1} по расчёту из {2} подходов',
+ 'Effort per set is switched off — turn it on in Settings to keep rating.': 'Усилие в подходе выключено — включи его в настройках, чтобы продолжать оценивать.',
'Week by week': 'Неделя за неделей',
'Where the sets land': 'Куда попадают подходы',
- 'Most working sets belong close to failure without living there — half at the floor and half at the top average out to a healthy-looking middle.': 'Большинство рабочих подходов должны идти близко к отказу, но не жить на нём — половина внизу и половина вверху дают среднее, которое лишь выглядит здоровым.',
+ 'Most working sets belong close to failure, not at it. Half at the floor and half at the top still average out to a healthy-looking middle.': 'Большинству рабочих подходов место рядом с отказом, а не в нём. Половина внизу и половина вверху всё равно дают среднее, которое лишь выглядит здоровым.',
'Average effort per workout': 'Среднее усилие за тренировку',
- 'A fuller dot means less left in the tank — the same weight at a lower {0} is progress the line alone does not show.': 'Более плотная точка означает меньше запаса — тот же вес при меньшем {0} это прогресс, которого одна линия не показывает.',
+ 'A fuller dot means less left in the tank. The same weight at a lower {0} is progress the line alone doesn’t show.': 'Более плотная точка означает меньше запаса. Тот же вес при меньшем {0} тоже прогресс, хотя одна линия его не показывает.',
// --- bodyweight & per side ---
'Bodyweight': 'Собственный вес',
diff --cc frontend/src/locales/th.js
index 8d048e0a1,1031f9448..f20774373
--- a/frontend/src/locales/th.js
+++ b/frontend/src/locales/th.js
@@@ -773,17 -778,14 +778,17 @@@ export default
'average effort': 'ความหนักเฉลี่ย',
'at {0} {1} or harder': 'ที่ {0} {1} ขึ้นไป',
'{0} of {1} finished sets rated': 'ให้คะแนนแล้ว {0} จาก {1} เซ็ตที่ทำเสร็จ',
+ 'estimated': 'โดยประมาณ',
+ '{0} rated · {1} estimated of {2} sets': 'ให้คะแนนแล้ว {0} · ประมาณ {1} จาก {2} เซ็ต',
+ 'Effort per set is switched off — turn it on in Settings to keep rating.': 'ปิด “ความหนักต่อเซ็ต” อยู่ — เปิดในตั้งค่าเพื่อให้คะแนนต่อ',
'Week by week': 'รายสัปดาห์',
'Where the sets land': 'เซ็ตส่วนใหญ่อยู่ระดับไหน',
- 'Most working sets belong close to failure without living there — half at the floor and half at the top average out to a healthy-looking middle.': 'เซ็ตส่วนใหญ่ควรอยู่ใกล้จุดหมดแรงโดยไม่ถึงจุดนั้น — ครึ่งหนึ่งอยู่ต่ำสุดและครึ่งหนึ่งอยู่สูงสุด เฉลี่ยแล้วจะออกมาสมดุลดี',
+ 'Most working sets belong close to failure, not at it. Half at the floor and half at the top still average out to a healthy-looking middle.': 'เซ็ตหลักส่วนใหญ่ควรอยู่ใกล้จุดหมดแรง ไม่ใช่ถึงจุดนั้น ครึ่งหนึ่งต่ำสุดกับอีกครึ่งสูงสุด เฉลี่ยแล้วก็ยังดูเหมือนอยู่ตรงกลางสวยๆ อยู่ดี',
'Average effort per workout': 'ความหนักเฉลี่ยต่อครั้ง',
- 'A fuller dot means less left in the tank — the same weight at a lower {0} is progress the line alone does not show.': 'จุดที่เต็มกว่าหมายถึงเหลือแรงน้อยกว่า — น้ำหนักเท่าเดิมที่ {0} ต่ำกว่าคือความคืบหน้าที่กราฟเส้นเพียงอย่างเดียวไม่แสดงให้เห็น',
+ 'A fuller dot means less left in the tank. The same weight at a lower {0} is progress the line alone doesn’t show.': 'จุดที่เต็มกว่าหมายถึงเหลือแรงน้อยกว่า น้ำหนักเท่าเดิมที่ {0} ต่ำกว่าคือความคืบหน้าที่กราฟเส้นอย่างเดียวไม่บอก',
// --- bodyweight & per side ---
'Bodyweight': 'น้ำหนักตัว',
- 'No weight to enter — just log the reps.': 'ไม่ต้องกรอกน้ำหนัก — บันทึกแค่จำนวนครั้ง',
+ 'No weight to enter. Just log the reps.': 'ไม่ต้องกรอกน้ำหนัก บันทึกแค่จำนวนครั้งพอ',
'Ask for a weight on every set.': 'ถามน้ำหนักทุกเซ็ต',
'For dips or pull-ups with a belt. Progression then follows the weight.': 'สำหรับท่าดิปหรือพูลอัพที่ใช้เข็มขัดถ่วงน้ำหนัก การเพิ่มระดับจะอิงตามน้ำหนักแทน',
'Reps per side': 'จำนวนครั้งต่อข้าง',
diff --cc frontend/src/locales/tr.js
index 2814da748,d6fa067cf..d2540cace
--- a/frontend/src/locales/tr.js
+++ b/frontend/src/locales/tr.js
@@@ -800,14 -805,11 +805,14 @@@ export default
'average effort': 'ortalama zorluk',
'at {0} {1} or harder': '{0} {1} veya daha zor',
'{0} of {1} finished sets rated': '{1} tamamlanan setin {0} tanesi puanlandı',
+ 'estimated': 'tahmini',
+ '{0} rated · {1} estimated of {2} sets': '{2} setin {0} tanesi puanlı · {1} tanesi tahmini',
+ 'Effort per set is switched off — turn it on in Settings to keep rating.': 'Set başına zorluk kapalı — puanlamaya devam etmek için Ayarlar’dan aç.',
'Week by week': 'Hafta hafta',
'Where the sets land': 'Setler nereye düşüyor',
- 'Most working sets belong close to failure without living there — half at the floor and half at the top average out to a healthy-looking middle.': 'Çalışma setlerinin çoğu tükenmeye yakın olmalı ama orada yaşamamalı — yarısı en altta yarısı en üstte, ortalaması sağlıklı görünür.',
+ 'Most working sets belong close to failure, not at it. Half at the floor and half at the top still average out to a healthy-looking middle.': 'Çalışma setlerinin çoğu tükenmeye yakın olmalı, tam tükenmede değil. Yarısı en altta, yarısı en üstte olsa da ortalama sağlıklı görünen bir ortaya çıkar.',
'Average effort per workout': 'Antrenman başına ortalama zorluk',
- 'A fuller dot means less left in the tank — the same weight at a lower {0} is progress the line alone does not show.': 'Daha dolu bir nokta depoda daha az kaldı demek — aynı ağırlığı daha düşük {0} ile kaldırmak, çizginin tek başına göstermediği bir ilerlemedir.',
+ 'A fuller dot means less left in the tank. The same weight at a lower {0} is progress the line alone doesn’t show.': 'Daha dolu bir nokta, depoda daha az kaldı demek. Aynı ağırlığı daha düşük {0} ile kaldırmak, çizginin tek başına göstermediği bir ilerleme.',
// --- bodyweight & per side ---
'Bodyweight': 'Vücut ağırlığı',
diff --cc frontend/src/locales/uk.js
index 12dab2f9f,a4a775ede..41ef4258a
--- a/frontend/src/locales/uk.js
+++ b/frontend/src/locales/uk.js
@@@ -609,14 -616,11 +616,14 @@@ export default
'average effort': 'середнє зусилля',
'at {0} {1} or harder': 'при {0} {1} або важче',
'{0} of {1} finished sets rated': 'оцінено {0} з {1} виконаних підходів',
+ 'estimated': 'орієнтовно',
+ '{0} rated · {1} estimated of {2} sets': '{0} оцінено · {1} за розрахунком з {2} підходів',
+ 'Effort per set is switched off — turn it on in Settings to keep rating.': 'Зусилля в підході вимкнено — увімкни його в налаштуваннях, щоб продовжувати оцінювати.',
'Week by week': 'Тиждень за тижнем',
'Where the sets land': 'Куди потрапляють підходи',
- 'Most working sets belong close to failure without living there — half at the floor and half at the top average out to a healthy-looking middle.': 'Більшість робочих підходів мають бути близько до відмови, але не жити там — половина внизу і половина вгорі дають середнє, яке лише виглядає здоровим.',
+ 'Most working sets belong close to failure, not at it. Half at the floor and half at the top still average out to a healthy-looking middle.': 'Більшість робочих підходів мають бути близько до відмови, а не в ній. Половина внизу і половина вгорі в середньому все одно дають середину, яка лише виглядає здоровою.',
'Average effort per workout': 'Середнє зусилля за тренування',
- 'A fuller dot means less left in the tank — the same weight at a lower {0} is progress the line alone does not show.': 'Щільніша крапка означає менше запасу — та сама вага при меншому {0} це прогрес, якого сама лінія не показує.',
+ 'A fuller dot means less left in the tank. The same weight at a lower {0} is progress the line alone doesn’t show.': 'Щільніша крапка означає менше запасу. Та сама вага при нижчому {0} теж прогрес, якого сама лінія не показує.',
// --- bodyweight & per side ---
'Bodyweight': 'Власна вага',
diff --cc frontend/src/locales/zh.js
index 2a0f00562,07765586e..8cf8c8718
--- a/frontend/src/locales/zh.js
+++ b/frontend/src/locales/zh.js
@@@ -800,14 -805,11 +805,14 @@@ export default
'average effort': '平均强度',
'at {0} {1} or harder': '{0} {1} 或更硬',
'{0} of {1} finished sets rated': '{1} 个已完成组中有 {0} 个已评分',
+ 'estimated': '估算',
+ '{0} rated · {1} estimated of {2} sets': '已评分 {0} · 估算 {1},共 {2} 组',
+ 'Effort per set is switched off — turn it on in Settings to keep rating.': '每组强度已关闭——在设置中打开即可继续评分。',
'Week by week': '逐周变化',
'Where the sets land': '组都落在哪里',
- 'Most working sets belong close to failure without living there — half at the floor and half at the top average out to a healthy-looking middle.': '大多数正式组应该接近力竭,但不要一直待在那里——一半在最底、一半在最顶,平均下来只是看着健康。',
+ 'Most working sets belong close to failure, not at it. Half at the floor and half at the top still average out to a healthy-looking middle.': '大多数正式组应该接近力竭,而不是真的力竭。一半在最底、一半在最顶,平均下来照样看着很健康。',
'Average effort per workout': '每次训练的平均强度',
- 'A fuller dot means less left in the tank — the same weight at a lower {0} is progress the line alone does not show.': '点越实,油箱里剩得越少——同样的重量配上更低的 {0},是曲线本身看不出的进步。',
+ 'A fuller dot means less left in the tank. The same weight at a lower {0} is progress the line alone doesn’t show.': '点越实,说明油箱里剩得越少。同样的重量配上更低的 {0},是光看曲线看不出来的进步。',
// --- bodyweight & per side ---
'Bodyweight': '徒手动作',
diff --cc frontend/src/views/Stats.jsx
index 844be3a14,57ea85e53..35715d3f3
--- a/frontend/src/views/Stats.jsx
+++ b/frontend/src/views/Stats.jsx
@@@ -16,11 -16,11 +16,12 @@@ import { fatigueOf, strengthOf, STRENGT
import { strengthExerciseRowsForMuscle } from '../lib/strength-exercises.js'
import { fatigueStateOf } from '../lib/recovery-view.js'
import { e1rmSeries, best1RM } from '../lib/onerm.js'
+ import { maxRepsSeries } from '../lib/pyramid.js'
import {
- hasEffort, displayScale, scaleName, toScale, avgRir, effortSummary, effortWeeks,
- effortHistogram, isHardSet, HARD_RIR
+ hasEffort, hasEstimableEffort, displayScale, scaleName, toScale, avgRir, effortSummary, effortWeeks,
+ effortHistogram, isHardSet, HARD_RIR, MIN_RATED
} from '../lib/effort.js'
+import { anchorsByWorkout, resolveSetRir } from '../lib/recovery.js'
import { Button, Segmented, SelectRow } from '../components/ui.jsx'
import { tappable } from '../lib/use-sheet-keyboard.js'
import { isWarmupRow } from '../lib/workout-model.js'
@@@ -264,13 -310,13 +323,13 @@@ function EffortCard({ S })
const binLabel = b => kind === 'rpe' ? (b.tail ? '≤ 6' : String(10 - b.rir)) : (b.tail ? b.rir + '+' : String(b.rir))
return <div className="card">
- <h2>{t('Effort')} <span className="dim" style={{ textTransform: 'none', letterSpacing: 0 }}>· {t('how close to failure')}</span></h2>
+ <h2>{t('Effort')} <span className="dim" style={{ textTransform: 'none', letterSpacing: 0 }}>· {t('how close to failure')}{estimated ? ' · ' + t('estimated') : ''}</span></h2>
<Segmented className="seg-range" value={win} onChange={setWin}
options={[{ value: 30, label: '30d' }, { value: 90, label: '90d' }, { value: 365, label: '1Y' }, { value: 0, label: t('All') }]} />
- {sum.rated === 0 ? <div className="muted small">{t('No rated sets in this period.')}</div> : <>
+ {sum.rated === 0 && sum.est === 0 ? <div className="muted small">{t('No rated sets in this period.')}</div> : <>
<div className="row between" style={{ alignItems: 'flex-end', gap: 12 }}>
<div>
- <div className="stat-v">{sum.avg == null ? '—' : fmtNum(toScale(kind, sum.avg)) + ' ' + hd}</div>
+ <div className="stat-v">{sum.avg == null ? '–' : fmtNum(toScale(kind, sum.avg)) + ' ' + hd}</div>
<div className="small dim">{t('average effort')}</div>
</div>
<div style={{ textAlign: 'end' }}>
@@@ -278,11 -324,9 +337,11 @@@
<div className="small dim">{t('at {0} {1} or harder', hd, fmtNum(toScale(kind, HARD_RIR)))}</div>
</div>
</div>
- <div className="small dim" style={{ marginTop: 8 }}>{t('{0} of {1} finished sets rated', sum.rated, sum.done)}</div>
+ <div className="small dim" style={{ marginTop: 8 }}>{estimated
+ ? t('{0} rated · {1} estimated of {2} sets', sum.rated, sum.est, sum.done)
+ : t('{0} of {1} finished sets rated', sum.rated, sum.done)}</div>
{effortOf(S) === 'none' && <div className="small" style={{ color: 'var(--yellow)', marginTop: 4 }}>
- {t('Effort per set is switched off — turn it on in Settings to keep rating.')}
+ {t('Effort per set is off. Turn it on in Settings → Workout to keep rating.')}
</div>}
{pts.length > 1 && <>
<h4 className="sec" style={{ marginTop: 12 }}>{t('Week by week')}</h4>
diff --cc frontend/src/views/Stats.recovery.test.jsx
index 966b5b2bb,ea13af4e8..1b66d9b47
--- a/frontend/src/views/Stats.recovery.test.jsx
+++ b/frontend/src/views/Stats.recovery.test.jsx
@@@ -317,35 -312,30 +317,57 @@@ describe('Stats muscle recovery view ru
expect(Math.min(...Object.values(strengthMap.load))).toBe(STRENGTH_FLOOR)
expect(strengthMap.thresholds.at(-1)).toEqual({ at: 1, level: 4 })
})
+
+ it('keeps zero-weight snapshots out of recovery maps and last-trained recency', async () => {
+ resetFixture([workout('zero-mapped', BASE_NOW, [{
+ id: 'deleted-zero-mapped',
+ muscleSnapshot: { n: 'Zero mapped', muscleWeights: { chest: 1, biceps: 0 } },
+ sets: [set(true)],
+ }])])
+ await mountStats()
+
+ expect(lastMap().load).toEqual({ chest: 1 })
+ await click(viewButton('Fatigue'))
+ expect(lastMap().load.chest).toBeGreaterThan(0)
+ expect(lastMap().load.biceps).toBe(0)
+ expect(levelsOf(lastMap().load, lastMap().thresholds).biceps).toBe(0)
+
+ await click(viewButton('Strength'))
+ expect(lastMap().load.chest).toBe(1)
+ expect(lastMap().load.biceps).toBe(STRENGTH_FLOOR)
+ const bicepsRow = [...muscleCard().querySelectorAll('.mrow')]
+ .find(row => row.querySelector('.nm')?.textContent === 'Biceps')
+ expect(bicepsRow.querySelector('.v').textContent).toContain('not trained')
+ })
})
+describe('Stats estimated effort', () => {
+ const effortHead = () => [...container.querySelectorAll('.card h2')]
+ .find(h => h.textContent.trim().startsWith('Effort'))
+
+ it('badges estimated numbers on unrated import history', async () => {
+ resetFixture([workout('unrated', BASE_NOW, [
+ entry('0025', Array.from({ length: 6 }, () => set(true, { w: 80, r: 8 }))),
+ ])])
+ await mountStats()
+ const head = effortHead()
+ expect(head, 'expected an Effort card for estimable history').toBeTruthy()
+ // Six self-anchored sets estimate RIR 0: a real average with an honest badge.
+ expect(head.textContent).toContain('estimated')
+ expect(container.textContent).toContain('0 rated')
+ })
+
+ it('keeps the logged view badge-free on rated history', async () => {
+ resetFixture([workout('rated', BASE_NOW, [
+ entry('0025', Array.from({ length: 6 }, () => set(true, { w: 80, r: 8, rir: 2 }))),
+ ])])
+ await mountStats()
+ const head = effortHead()
+ expect(head, 'expected an Effort card for rated history').toBeTruthy()
+ expect(head.textContent).not.toContain('estimated')
+ })
+})
+
describe('Stats strength exercise rows', () => {
// The rows under "Exercises · <muscle>" are presented as buttons (role, tabIndex, pointer
// cursor) but for a year called a handler that never existed, so every tap threw