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.

Per-exercise rest: the copy speaks the wheel's 0:00, not a 0 the row never shows

Duarte Santos52fe8954e130
diff --git a/frontend/src/locales/ar.js b/frontend/src/locales/ar.js
index 48f0d743b..da32ea0f0 100644
--- a/frontend/src/locales/ar.js
+++ b/frontend/src/locales/ar.js
@@ -734,7 +734,7 @@ export default {
'Keep replacement in this group': 'إبقاء البديل في هذه المجموعة',
'Insert after this group': 'إدراج بعد هذه المجموعة',
'Logged sets stay with the original exercise. The replacement will be inserted afterward.': 'تبقى المجموعات المسجلة مع التمرين الأصلي. سيُدرج البديل بعده.',
- 'Rest after each set of this exercise. Leave at 0 to use your default rest timer.': 'الراحة بعد كل مجموعة من هذا التمرين. اتركها 0 لاستخدام مؤقت الراحة الافتراضي.',
+ 'Rest after each set of this exercise. 0:00 means your default rest.': 'الراحة بعد كل مجموعة من هذا التمرين. عند 0:00 تُستخدم راحتك الافتراضية.',
'Import from Hevy': 'استيراد من Hevy',
'Pull your history with a Hevy Pro API key': 'اسحب سجلك باستخدام مفتاح Hevy Pro API',
'Pull your history with a Hevy Pro API key. The key is only used for this import and is not saved.': 'اسحب سجلك باستخدام مفتاح Hevy Pro API. يُستخدم المفتاح لهذا الاستيراد فقط ولا يُحفظ.',
diff --git a/frontend/src/locales/de.js b/frontend/src/locales/de.js
index 49ef5c0fd..d9845433c 100644
--- a/frontend/src/locales/de.js
+++ b/frontend/src/locales/de.js
@@ -203,7 +203,7 @@ export default {
'Remove drop': 'Dropsatz entfernen',
'Remove burst': 'Burst entfernen',
'Rest (s)': 'Pause (s)',
- 'Rest after each set of this exercise. Leave at 0 to use your default rest timer.': 'Pause nach jedem Satz dieser Übung. Auf 0 lassen, um den Standard-Pausen-Timer zu nutzen.',
+ 'Rest after each set of this exercise. 0:00 means your default rest.': 'Pause nach jedem Satz dieser Übung. Bei 0:00 gilt deine Standard-Pause.',
'Drop-set / rest-pause': 'Dropsatz / Rest-Pause',
'Intensifier': 'Intensivierungstechnik',
'None': 'Keine',
diff --git a/frontend/src/locales/es.js b/frontend/src/locales/es.js
index 80609e228..44e48d8c8 100644
--- a/frontend/src/locales/es.js
+++ b/frontend/src/locales/es.js
@@ -195,7 +195,7 @@ export default {
'Remove drop': 'Quitar bajada',
'Remove burst': 'Quitar ráfaga',
'Rest (s)': 'Descanso (s)',
- 'Rest after each set of this exercise. Leave at 0 to use your default rest timer.': 'Descanso tras cada serie de este ejercicio. Déjalo en 0 para usar tu temporizador de descanso por defecto.',
+ 'Rest after each set of this exercise. 0:00 means your default rest.': 'Descanso tras cada serie de este ejercicio. Con 0:00 se usa tu descanso por defecto.',
'Drop-set / rest-pause': 'Series descendentes / rest-pause',
'Intensifier': 'Intensificador',
'None': 'Ninguno',
diff --git a/frontend/src/locales/fr.js b/frontend/src/locales/fr.js
index 5945d5da7..430aaf229 100644
--- a/frontend/src/locales/fr.js
+++ b/frontend/src/locales/fr.js
@@ -195,7 +195,7 @@ export default {
'Remove drop': 'Retirer le drop set',
'Remove burst': 'Retirer la rafale',
'Rest (s)': 'Repos (s)',
- 'Rest after each set of this exercise. Leave at 0 to use your default rest timer.': 'Repos après chaque série de cet exercice. Laisse à 0 pour utiliser ton minuteur de repos par défaut.',
+ 'Rest after each set of this exercise. 0:00 means your default rest.': 'Repos après chaque série de cet exercice. À 0:00, c’est ton repos par défaut.',
'Drop-set / rest-pause': 'Drop-set / rest-pause',
'Intensifier': 'Intensificateur',
'None': 'Aucun',
diff --git a/frontend/src/locales/hi.js b/frontend/src/locales/hi.js
index b6e29c764..29c32b7db 100644
--- a/frontend/src/locales/hi.js
+++ b/frontend/src/locales/hi.js
@@ -195,7 +195,7 @@ export default {
'Remove drop': 'ड्रॉप सेट हटाएं',
'Remove burst': 'बर्स्ट हटाएं',
'Rest (s)': 'आराम (सेकंड)',
- 'Rest after each set of this exercise. Leave at 0 to use your default rest timer.': 'इस एक्सरसाइज़ के हर सेट के बाद आराम। अपना डिफ़ॉल्ट आराम टाइमर इस्तेमाल करने के लिए इसे 0 रहने दें।',
+ 'Rest after each set of this exercise. 0:00 means your default rest.': 'इस एक्सरसाइज़ के हर सेट के बाद आराम। 0:00 पर आपका डिफ़ॉल्ट आराम लागू होता है।',
'Drop-set / rest-pause': 'ड्रॉप सेट / रेस्ट-पॉज़',
'Intensifier': 'इंटेंसिफायर',
'None': 'कोई नहीं',
diff --git a/frontend/src/locales/hu.js b/frontend/src/locales/hu.js
index 2d2648a55..e7f0e2df7 100644
--- a/frontend/src/locales/hu.js
+++ b/frontend/src/locales/hu.js
@@ -868,7 +868,7 @@ export default {
'Keep replacement in this group': 'A csere maradjon ebben a csoportban',
'Insert after this group': 'Beszúrás a csoport után',
'Logged sets stay with the original exercise. The replacement will be inserted afterward.': 'A naplózott sorozatok az eredeti gyakorlatnál maradnak. A csere utána kerül beszúrásra.',
- 'Rest after each set of this exercise. Leave at 0 to use your default rest timer.': 'Pihenő a gyakorlat minden sorozata után. Hagyd 0-n az alapértelmezett pihenőidőzítőhöz.',
+ 'Rest after each set of this exercise. 0:00 means your default rest.': 'Pihenő a gyakorlat minden sorozata után. 0:00 esetén az alapértelmezett pihenőd érvényes.',
'Vibrate': 'Rezgés',
'Weigh in before workouts': 'Súlymérés edzés előtt',
'Asks for your body weight when a workout starts. Off starts the session straight away.': 'Edzés indításakor rákérdez a testsúlyodra. Kikapcsolva az edzés azonnal indul.',
diff --git a/frontend/src/locales/it.js b/frontend/src/locales/it.js
index 98a3087df..433b7661d 100644
--- a/frontend/src/locales/it.js
+++ b/frontend/src/locales/it.js
@@ -195,7 +195,7 @@ export default {
'Remove drop': 'Rimuovi drop set',
'Remove burst': 'Rimuovi burst',
'Rest (s)': 'Recupero (s)',
- 'Rest after each set of this exercise. Leave at 0 to use your default rest timer.': 'Recupero dopo ogni serie di questo esercizio. Lascialo a 0 per usare il timer di riposo predefinito.',
+ 'Rest after each set of this exercise. 0:00 means your default rest.': 'Recupero dopo ogni serie di questo esercizio. A 0:00 vale il tuo recupero predefinito.',
'Drop-set / rest-pause': 'Drop-set / rest-pause',
'Intensifier': 'Intensificatore',
'None': 'Nessuno',
diff --git a/frontend/src/locales/ko.js b/frontend/src/locales/ko.js
index e14068dfb..eae794c71 100644
--- a/frontend/src/locales/ko.js
+++ b/frontend/src/locales/ko.js
@@ -195,7 +195,7 @@ export default {
'Remove drop': '드롭세트 제거',
'Remove burst': '버스트 제거',
'Rest (s)': '휴식(초)',
- 'Rest after each set of this exercise. Leave at 0 to use your default rest timer.': '이 운동의 세트마다 갖는 휴식이에요. 기본 휴식 타이머를 쓰려면 0으로 두세요.',
+ 'Rest after each set of this exercise. 0:00 means your default rest.': '이 운동의 세트마다 갖는 휴식이에요. 0:00이면 기본 휴식을 써요.',
'Drop-set / rest-pause': '드롭세트 / 레스트포즈',
'Intensifier': '강도 기법',
'None': '없음',
diff --git a/frontend/src/locales/pl.js b/frontend/src/locales/pl.js
index 4c3396e7c..df0dd8855 100644
--- a/frontend/src/locales/pl.js
+++ b/frontend/src/locales/pl.js
@@ -195,7 +195,7 @@ export default {
'Remove drop': 'Usuń serię zniżkującą',
'Remove burst': 'Usuń serię rest-pause',
'Rest (s)': 'Odpoczynek (s)',
- 'Rest after each set of this exercise. Leave at 0 to use your default rest timer.': 'Odpoczynek po każdej serii tego ćwiczenia. Zostaw 0, żeby użyć domyślnego minutnika przerwy.',
+ 'Rest after each set of this exercise. 0:00 means your default rest.': 'Odpoczynek po każdej serii tego ćwiczenia. 0:00 oznacza domyślną przerwę.',
'Drop-set / rest-pause': 'Seria zniżkująca / rest-pause',
'Intensifier': 'Technika intensyfikująca',
'None': 'Brak',
diff --git a/frontend/src/locales/pt-BR.js b/frontend/src/locales/pt-BR.js
index bad733265..61973c225 100644
--- a/frontend/src/locales/pt-BR.js
+++ b/frontend/src/locales/pt-BR.js
@@ -728,7 +728,7 @@ export const PT_BR_OVERRIDES = {
'{0}: what’s planned': '{0}: previsto',
// --- per-exercise rest ---
- 'Rest after each set of this exercise. Leave at 0 to use your default rest timer.': 'Descanso depois de cada série deste exercício. Deixe em 0 para usar o temporizador de descanso padrão.',
+ 'Rest after each set of this exercise. 0:00 means your default rest.': 'Descanso depois de cada série deste exercício. Em 0:00 vale o seu descanso padrão.',
'Hevy is rate-limiting requests. Wait a minute and try again': 'O Hevy está limitando as solicitações. Espere um minuto e tente de novo',
'Log a past workout': 'Registrar um treino passado',
'Logged on the usual workout screen, without timers.': 'Registrado na tela de treino habitual, só sem temporizadores.',
diff --git a/frontend/src/locales/pt.js b/frontend/src/locales/pt.js
index 35fd9ad0e..acab23ad0 100644
--- a/frontend/src/locales/pt.js
+++ b/frontend/src/locales/pt.js
@@ -195,7 +195,7 @@ export default {
'Remove drop': 'Remover queda',
'Remove burst': 'Remover rajada',
'Rest (s)': 'Descanso (s)',
- 'Rest after each set of this exercise. Leave at 0 to use your default rest timer.': 'Descanso depois de cada série deste exercício. Deixa a 0 para usares o temporizador de descanso predefinido.',
+ 'Rest after each set of this exercise. 0:00 means your default rest.': 'Descanso depois de cada série deste exercício. Em 0:00 fica o teu descanso predefinido.',
'Drop-set / rest-pause': 'Séries decrescentes / rest-pause',
'Intensifier': 'Intensificador',
'None': 'Nenhum',
diff --git a/frontend/src/locales/ru.js b/frontend/src/locales/ru.js
index 231602722..5ae929465 100644
--- a/frontend/src/locales/ru.js
+++ b/frontend/src/locales/ru.js
@@ -189,7 +189,7 @@ export default {
'Remove drop': 'Убрать дроп-сет',
'Remove burst': 'Убрать серию',
'Rest (s)': 'Отдых (с)',
- 'Rest after each set of this exercise. Leave at 0 to use your default rest timer.': 'Отдых после каждого подхода этого упражнения. Оставь 0, чтобы работал таймер отдыха по умолчанию.',
+ 'Rest after each set of this exercise. 0:00 means your default rest.': 'Отдых после каждого подхода этого упражнения. 0:00 значит твой отдых по умолчанию.',
'Drop-set / rest-pause': 'Дроп-сет / рест-пауза',
'Intensifier': 'Интенсификатор',
'None': 'Нет',
diff --git a/frontend/src/locales/th.js b/frontend/src/locales/th.js
index 20cefdb7b..9528ba5ae 100644
--- a/frontend/src/locales/th.js
+++ b/frontend/src/locales/th.js
@@ -876,7 +876,7 @@ export default {
'Keep replacement in this group': 'เก็บท่าใหม่ไว้ในกลุ่มนี้',
'Insert after this group': 'แทรกหลังกลุ่มนี้',
'Logged sets stay with the original exercise. The replacement will be inserted afterward.': 'เซ็ตที่บันทึกแล้วจะอยู่กับท่าเดิม ท่าใหม่จะถูกแทรกไว้ถัดไป',
- 'Rest after each set of this exercise. Leave at 0 to use your default rest timer.': 'พักหลังแต่ละเซ็ตของท่านี้ ปล่อยไว้ที่ 0 เพื่อใช้ตัวจับเวลาพักค่าเริ่มต้น',
+ 'Rest after each set of this exercise. 0:00 means your default rest.': 'พักหลังแต่ละเซ็ตของท่านี้ ตั้งที่ 0:00 จะใช้เวลาพักค่าเริ่มต้นของคุณ',
'Vibrate': 'การสั่น',
'Weigh in before workouts': 'ชั่งน้ำหนักก่อนออกกำลังกาย',
'Asks for your body weight when a workout starts. Off starts the session straight away.': 'ถามน้ำหนักตัวเมื่อเริ่มออกกำลังกาย ถ้าปิด เซสชันจะเริ่มทันที',
diff --git a/frontend/src/locales/tr.js b/frontend/src/locales/tr.js
index f2ca58b9e..0c3a0e087 100644
--- a/frontend/src/locales/tr.js
+++ b/frontend/src/locales/tr.js
@@ -195,7 +195,7 @@ export default {
'Remove drop': 'Düşüş setini kaldır',
'Remove burst': 'Patlamayı kaldır',
'Rest (s)': 'Dinlenme (sn)',
- 'Rest after each set of this exercise. Leave at 0 to use your default rest timer.': 'Bu egzersizin her setinden sonraki dinlenme. Varsayılan dinlenme sayacını kullanmak için 0 bırak.',
+ 'Rest after each set of this exercise. 0:00 means your default rest.': 'Bu egzersizin her setinden sonraki dinlenme. 0:00’da varsayılan dinlenmen geçerli olur.',
'Drop-set / rest-pause': 'Düşüş seti / rest-pause',
'Intensifier': 'Yoğunlaştırıcı',
'None': 'Yok',
diff --git a/frontend/src/locales/uk.js b/frontend/src/locales/uk.js
index ecbbf23d4..bb669e779 100644
--- a/frontend/src/locales/uk.js
+++ b/frontend/src/locales/uk.js
@@ -177,7 +177,7 @@ export default {
'Remove drop': 'Прибрати дроп-сет',
'Remove burst': 'Прибрати серію',
'Rest (s)': 'Відпочинок (с)',
- 'Rest after each set of this exercise. Leave at 0 to use your default rest timer.': 'Відпочинок після кожного підходу цієї вправи. Залиш 0, щоб працював таймер відпочинку за замовчуванням.',
+ 'Rest after each set of this exercise. 0:00 means your default rest.': 'Відпочинок після кожного підходу цієї вправи. 0:00 означає твій відпочинок за замовчуванням.',
'Drop-set / rest-pause': 'Дроп-сет / рест-пауза',
'Intensifier': 'Інтенсифікатор',
'None': 'Немає',
diff --git a/frontend/src/locales/zh-TW.js b/frontend/src/locales/zh-TW.js
index 338453934..156f2ad73 100644
--- a/frontend/src/locales/zh-TW.js
+++ b/frontend/src/locales/zh-TW.js
@@ -191,7 +191,7 @@ export default {
'Remove drop': '移除遞減組',
'Remove burst': '移除爆發組',
'Rest (s)': '休息(秒)',
- 'Rest after each set of this exercise. Leave at 0 to use your default rest timer.': '此動作每組結束後的休息秒數。保留為 0 則使用預設休息計時器。',
+ 'Rest after each set of this exercise. 0:00 means your default rest.': '此動作每組結束後的休息時間。設為 0:00 即使用預設休息。',
'Drop-set / rest-pause': '遞減組 / 休息暫停組',
'Intensifier': '強化技巧',
'None': '無',
diff --git a/frontend/src/locales/zh.js b/frontend/src/locales/zh.js
index 65f3dd248..0512ab85c 100644
--- a/frontend/src/locales/zh.js
+++ b/frontend/src/locales/zh.js
@@ -195,7 +195,7 @@ export default {
'Remove drop': '移除递减组',
'Remove burst': '移除爆发组',
'Rest (s)': '休息(秒)',
- 'Rest after each set of this exercise. Leave at 0 to use your default rest timer.': '这个动作每组之后的休息时间。留在 0 就使用默认的休息计时。',
+ 'Rest after each set of this exercise. 0:00 means your default rest.': '这个动作每组之后的休息时间。设为 0:00 就用默认休息。',
'Drop-set / rest-pause': '递减组 / 歇息暂停组',
'Intensifier': '强化技巧',
'None': '无',
diff --git a/frontend/src/sheets.config-rest.test.jsx b/frontend/src/sheets.config-rest.test.jsx
index d2f108daa..4695853ed 100644
--- a/frontend/src/sheets.config-rest.test.jsx
+++ b/frontend/src/sheets.config-rest.test.jsx
@@ -41,6 +41,9 @@ describe('exercise settings: rest on the wheel', () => {
const wheel = render(useUI.getState().sheets.at(-1))
expect(wheel.querySelector('h3').textContent).toBe('Rest for this exercise')
expect(wheel.querySelector('.dw-read').textContent).toBe('Default (2:00)')
+ // The copy names the wheel's 0:00, not a "0" the row never shows (QA 10-05).
+ expect(host.textContent).toContain('0:00 means your default rest.')
+ expect(host.textContent).not.toMatch(/Leave at 0/)
// Done keeps 0:00, the default; the value shown stays the default's.
act(() => [...wheel.querySelectorAll('button')].find(b => b.textContent === 'Done').click())
act(() => save(host))
diff --git a/frontend/src/sheets.jsx b/frontend/src/sheets.jsx
index f56d5d62e..a89837ba2 100644
--- a/frontend/src/sheets.jsx
+++ b/frontend/src/sheets.jsx
@@ -1602,12 +1602,12 @@ function ExConfig({ ex, existing, onSave, onDelete, onReplace, close, routine, i
onClick={() => durationSheet({
title: t('Rest for this exercise'), value: c.restSec > 0 ? c.restSec : 0, max: REST_MAX,
off: t('Default ({0})', fmtRest(st.restSec)),
- footer: t('Rest after each set of this exercise. Leave at 0 to use your default rest timer.'),
+ footer: t('Rest after each set of this exercise. 0:00 means your default rest.'),
onDone: v => setC(x => ({ ...x, restSec: v })),
})} />
</div>
<div className="small dim" style={{ marginBottom: 18 }}>
- {t('Rest after each set of this exercise. Leave at 0 to use your default rest timer.')}
+ {t('Rest after each set of this exercise. 0:00 means your default rest.')}
</div>
{/* ---------- bodyweight + per side (issues #31/#32/#33) ---------- */}
{!cardio && <div className="sect-b" style={{ marginBottom: 8 }}>
diff --git a/frontend/src/views/Workout.jsx b/frontend/src/views/Workout.jsx
index cf37aebc9..dff5d4bbb 100644
--- a/frontend/src/views/Workout.jsx
+++ b/frontend/src/views/Workout.jsx
@@ -1184,7 +1184,7 @@ function ActiveWorkout() {
title: t('Rest for this exercise'),
value: entry.target?.restSec > 0 ? entry.target.restSec : 0, max: REST_MAX,
off: t('Default ({0})', fmtRest(state.restSec)),
- footer: t('Rest after each set of this exercise. Leave at 0 to use your default rest timer.'),
+ footer: t('Rest after each set of this exercise. 0:00 means your default rest.'),
onDone: v => update(s => {
const e = s.active?.id === activeId ? s.active.entries?.[idx] : null
if (!e || e.id !== entryId) return