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 v1311-accent: a colour of your own as the accent

Duarte Santos5c725f953e76
diff --cc frontend/src/lib/pt-br-locale.test.js
index 76ee26fe4,451381609..8fa4c3706
--- a/frontend/src/lib/pt-br-locale.test.js
+++ b/frontend/src/lib/pt-br-locale.test.js
@@@ -41,7 -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('1d7322c463c783ff55d8e626a429ed347839eeb6e7039b277c1ae720b375f02a')
- expect(fingerprint, 'pt-PT inheritance changed; review the inherited pt-BR wording').toBe('7ef67d57197521110494281c17de3950176f0db14769a9e953b2e9bff47db8af')
++ expect(fingerprint, 'pt-PT inheritance changed; review the inherited pt-BR wording').toBe('5304c30895afe32bf14334f32497355b645f481f695c582e3b28161a23cba864')
})
test('does not leak European Portuguese UI terms', () => {
diff --cc frontend/src/lib/sync-merge.js
index 59668f4c5,99f41bc35..b15cac1b8
--- a/frontend/src/lib/sync-merge.js
+++ b/frontend/src/lib/sync-merge.js
@@@ -711,8 -613,8 +712,10 @@@ export function mergeStates(a0, b0, { p
if (resetIds) out.resetIds = resetIds
else delete out.resetIds
delete out._rev
+ delete out._wid
+ delete out._wids
+ // The accent fields end up in CSS: whatever either copy brought, only a clean value goes on.
+ sanitizeAccent(out)
return out
}
diff --cc frontend/src/locales/ar.js
index 8a73d3ea8,c6fe5f850..586a1106e
--- a/frontend/src/locales/ar.js
+++ b/frontend/src/locales/ar.js
@@@ -1976,22 -1976,16 +1976,30 @@@ export default
'Copied. One more like that one.': 'تم النسخ. واحدة أخرى مثلها.',
'Keep at least one set, champ': 'أبقِ مجموعة واحدة على الأقل يا بطل',
'Too late, that one’s gone': 'فات الأوان، لقد ذهبت',
+ 'Duplicate': 'تكرار',
+ 'Copied as “{0}”.': 'نُسخ باسم «{0}».',
+ '“{0}” gone.': 'ذهب «{0}».',
+ 'It’s already back.': 'لقد عاد بالفعل.',
+ '“{0}” is out of the loop.': 'خرج «{0}» من الدورة.',
+ '“{0}” left the routine.': 'غادر «{0}» الروتين.',
+ 'Swipe actions': 'إجراءات السحب',
+ 'Sets, routines and the loop: left removes, right copies': 'المجموعات والروتينات والدورة: لليمين إزالة، لليسار نسخ',
'Psst: swipe a set. Left deletes, right copies.': 'نصيحة: اسحب مجموعة. لليمين حذف، لليسار نسخ.',
- 'Swipe on sets': 'السحب على المجموعات',
- 'Left deletes, right copies': 'لليمين حذف، لليسار نسخ',
'Options: copy, remove': 'خيارات: نسخ، إزالة',
+ 'Another device synced while you were importing, so its changes were kept next to the backup.': 'زامن جهاز آخر أثناء الاستيراد، فاحتفظنا بتغييراته إلى جانب النسخة الاحتياطية.',
+ 'Save as a backup file': 'حفظ كملف نسخة احتياطية',
+ 'Add this device\'s plan to your profile?': 'إضافة خطة هذا الجهاز إلى ملفك؟',
+ 'Your plan, notes or gym cards on this device were set up while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': 'أُعدّت خطتك أو ملاحظاتك أو بطاقات النادي على هذا الجهاز أثناء تسجيل الخروج. أضفها إلى ملفك، أو أبقِ الملف كما هو على الخادم.',
+ '{0} routine was made on this device while signed out. Add it to your profile, or keep the profile exactly as it is on the server.': 'أُنشئ {0} روتين على هذا الجهاز أثناء تسجيل الخروج. أضفه إلى ملفك، أو أبقِ الملف كما هو على الخادم.',
+ '{0} routines were made on this device while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': 'أُنشئت {0} روتينات على هذا الجهاز أثناء تسجيل الخروج. أضفها إلى ملفك، أو أبقِ الملف كما هو على الخادم.',
+ 'This device, before signing in': 'هذا الجهاز قبل تسجيل الدخول',
+ 'This device, before the update': 'هذا الجهاز قبل التحديث',
+ 'Your own color': 'لونك الخاص',
+ 'Pick your own color': 'اختر لونك الخاص',
+ 'Change your own color': 'غيّر لونك الخاص',
+ 'A touch lighter in dark mode, so you can still read it.': 'أفتح قليلًا في الوضع الداكن حتى تبقى قراءته سهلة.',
+ 'A touch darker in light mode, so you can still read it.': 'أغمق قليلًا في الوضع الفاتح حتى تبقى قراءته سهلة.',
+ 'Greys show lighter in dark mode, so buttons don’t look switched off.': 'تظهر الألوان الرمادية أفتح في الوضع الداكن، حتى لا تبدو الأزرار مُعطّلة.',
+ 'Greys show darker in light mode, so buttons don’t look switched off.': 'تظهر الألوان الرمادية أغمق في الوضع الفاتح، حتى لا تبدو الأزرار مُعطّلة.',
+ 'custom color picker': 'لون خاص مخصص منتقي الألوان',
}
diff --cc frontend/src/locales/de.js
index d6800c533,db970f184..598e45a83
--- a/frontend/src/locales/de.js
+++ b/frontend/src/locales/de.js
@@@ -1943,22 -1943,16 +1943,30 @@@ export default
'Copied. One more like that one.': 'Kopiert. Noch einer wie der.',
'Keep at least one set, champ': 'Ein Satz bleibt mindestens, Champ',
'Too late, that one’s gone': 'Zu spät, der ist weg',
+ 'Duplicate': 'Duplizieren',
+ 'Copied as “{0}”.': 'Kopiert als „{0}“.',
+ '“{0}” gone.': '„{0}“ ist weg.',
+ 'It’s already back.': 'Ist schon wieder da.',
+ '“{0}” is out of the loop.': '„{0}“ ist raus aus dem Kreislauf.',
+ '“{0}” left the routine.': '„{0}“ hat die Routine verlassen.',
+ 'Swipe actions': 'Wischaktionen',
+ 'Sets, routines and the loop: left removes, right copies': 'Sätze, Routinen und der Kreislauf: links entfernt, rechts kopiert',
'Psst: swipe a set. Left deletes, right copies.': 'Psst: Wisch über einen Satz. Links löscht, rechts kopiert.',
- 'Swipe on sets': 'Wischen auf Sätzen',
- 'Left deletes, right copies': 'Links löscht, rechts kopiert',
'Options: copy, remove': 'Optionen: kopieren, entfernen',
+ 'Another device synced while you were importing, so its changes were kept next to the backup.': 'Ein anderes Gerät hat während des Imports synchronisiert, seine Änderungen bleiben neben dem Backup erhalten.',
+ 'Save as a backup file': 'Als Backup-Datei sichern',
+ 'Add this device\'s plan to your profile?': 'Plan von diesem Gerät zum Profil hinzufügen?',
+ 'Your plan, notes or gym cards on this device were set up while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': 'Plan, Notizen oder Studiokarten auf diesem Gerät wurden ohne Anmeldung angelegt. Zum Profil hinzufügen oder das Profil genau so lassen, wie es auf dem Server ist.',
+ '{0} routine was made on this device while signed out. Add it to your profile, or keep the profile exactly as it is on the server.': '{0} Routine wurde auf diesem Gerät ohne Anmeldung erstellt. Zum Profil hinzufügen oder das Profil genau so lassen, wie es auf dem Server ist.',
+ '{0} routines were made on this device while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': '{0} Routinen wurden auf diesem Gerät ohne Anmeldung erstellt. Zum Profil hinzufügen oder das Profil genau so lassen, wie es auf dem Server ist.',
+ 'This device, before signing in': 'Dieses Gerät, vor der Anmeldung',
+ 'This device, before the update': 'Dieses Gerät, vor dem Update',
+ 'Your own color': 'Deine eigene Farbe',
+ 'Pick your own color': 'Eigene Farbe auswählen',
+ 'Change your own color': 'Eigene Farbe ändern',
+ 'A touch lighter in dark mode, so you can still read it.': 'Im dunklen Modus etwas heller, damit du sie noch lesen kannst.',
+ 'A touch darker in light mode, so you can still read it.': 'Im hellen Modus etwas dunkler, damit du sie noch lesen kannst.',
+ 'Greys show lighter in dark mode, so buttons don’t look switched off.': 'Grautöne werden im dunklen Modus heller, damit Buttons nicht ausgeschaltet wirken.',
+ 'Greys show darker in light mode, so buttons don’t look switched off.': 'Grautöne werden im hellen Modus dunkler, damit Buttons nicht ausgeschaltet wirken.',
+ 'custom color picker': 'eigene Farbe benutzerdefiniert Farbwähler Farbauswahl',
}
diff --cc frontend/src/locales/es.js
index 41f7847ea,91c9c96ef..c7d9e98db
--- a/frontend/src/locales/es.js
+++ b/frontend/src/locales/es.js
@@@ -1923,22 -1923,16 +1923,30 @@@ export default
'Copied. One more like that one.': 'Copiada. Otra igual a esa.',
'Keep at least one set, champ': 'Deja al menos una serie, campeón',
'Too late, that one’s gone': 'Demasiado tarde, ya no está',
+ 'Duplicate': 'Duplicar',
+ 'Copied as “{0}”.': 'Copiada como «{0}».',
+ '“{0}” gone.': '«{0}» ya no está.',
+ 'It’s already back.': 'Ya está de vuelta.',
+ '“{0}” is out of the loop.': '«{0}» sale del bucle.',
+ '“{0}” left the routine.': '«{0}» dejó la rutina.',
+ 'Swipe actions': 'Acciones al deslizar',
+ 'Sets, routines and the loop: left removes, right copies': 'Series, rutinas y el bucle: izquierda quita, derecha copia',
'Psst: swipe a set. Left deletes, right copies.': 'Psst: desliza una serie. Izquierda borra, derecha copia.',
- 'Swipe on sets': 'Deslizar en las series',
- 'Left deletes, right copies': 'Izquierda borra, derecha copia',
'Options: copy, remove': 'Opciones: copiar, quitar',
+ 'Another device synced while you were importing, so its changes were kept next to the backup.': 'Otro dispositivo se sincronizó mientras importabas, así que sus cambios se quedan junto a la copia.',
+ 'Save as a backup file': 'Guardar como archivo de copia',
+ 'Add this device\'s plan to your profile?': '¿Añadir el plan de este dispositivo a tu perfil?',
+ 'Your plan, notes or gym cards on this device were set up while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': 'Tu plan, notas o tarjetas del gimnasio en este dispositivo se crearon sin iniciar sesión. Añádelos a tu perfil o deja el perfil exactamente como está en el servidor.',
+ '{0} routine was made on this device while signed out. Add it to your profile, or keep the profile exactly as it is on the server.': '{0} rutina se creó en este dispositivo sin iniciar sesión. Añádela a tu perfil o deja el perfil exactamente como está en el servidor.',
+ '{0} routines were made on this device while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': '{0} rutinas se crearon en este dispositivo sin iniciar sesión. Añádelas a tu perfil o deja el perfil exactamente como está en el servidor.',
+ 'This device, before signing in': 'Este dispositivo, antes de iniciar sesión',
+ 'This device, before the update': 'Este dispositivo, antes de la actualización',
+ 'Your own color': 'Tu propio color',
+ 'Pick your own color': 'Elige tu propio color',
+ 'Change your own color': 'Cambia tu propio color',
+ 'A touch lighter in dark mode, so you can still read it.': 'Un pelín más claro en modo oscuro, para que se siga leyendo.',
+ 'A touch darker in light mode, so you can still read it.': 'Un pelín más oscuro en modo claro, para que se siga leyendo.',
+ 'Greys show lighter in dark mode, so buttons don’t look switched off.': 'Los grises se ven más claros en modo oscuro, para que los botones no parezcan apagados.',
+ 'Greys show darker in light mode, so buttons don’t look switched off.': 'Los grises se ven más oscuros en modo claro, para que los botones no parezcan apagados.',
+ 'custom color picker': 'color propio personalizado selector de color',
}
diff --cc frontend/src/locales/fr.js
index 1f5e788ed,2d3b3b9ca..0f99a7ae0
--- a/frontend/src/locales/fr.js
+++ b/frontend/src/locales/fr.js
@@@ -1923,22 -1923,16 +1923,30 @@@ export default
'Copied. One more like that one.': 'Copiée. Encore une comme celle-là.',
'Keep at least one set, champ': 'Garde au moins une série, champion',
'Too late, that one’s gone': 'Trop tard, elle est partie',
+ 'Duplicate': 'Dupliquer',
+ 'Copied as “{0}”.': 'Copiée sous « {0} ».',
+ '“{0}” gone.': '« {0} » est partie.',
+ 'It’s already back.': 'Elle est déjà revenue.',
+ '“{0}” is out of the loop.': '« {0} » sort de la boucle.',
+ '“{0}” left the routine.': '« {0} » a quitté la routine.',
+ 'Swipe actions': 'Actions de glissement',
+ 'Sets, routines and the loop: left removes, right copies': 'Séries, routines et boucle : à gauche on retire, à droite on copie',
'Psst: swipe a set. Left deletes, right copies.': 'Psst : glisse une série. Gauche supprime, droite copie.',
- 'Swipe on sets': 'Glisser sur les séries',
- 'Left deletes, right copies': 'Gauche supprime, droite copie',
'Options: copy, remove': 'Options : copier, supprimer',
+ 'Another device synced while you were importing, so its changes were kept next to the backup.': 'Un autre appareil a synchronisé pendant l’import, ses changements sont gardés à côté de la sauvegarde.',
+ 'Save as a backup file': 'Enregistrer comme fichier de sauvegarde',
+ 'Add this device\'s plan to your profile?': 'Ajouter le programme de cet appareil à votre profil ?',
+ 'Your plan, notes or gym cards on this device were set up while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': 'Votre programme, vos notes ou vos cartes de salle sur cet appareil ont été créés sans connexion. Ajoutez-les à votre profil ou gardez le profil exactement tel qu’il est sur le serveur.',
+ '{0} routine was made on this device while signed out. Add it to your profile, or keep the profile exactly as it is on the server.': '{0} routine a été créée sur cet appareil sans connexion. Ajoutez-la à votre profil ou gardez le profil exactement tel qu’il est sur le serveur.',
+ '{0} routines were made on this device while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': '{0} routines ont été créées sur cet appareil sans connexion. Ajoutez-les à votre profil ou gardez le profil exactement tel qu’il est sur le serveur.',
+ 'This device, before signing in': 'Cet appareil, avant la connexion',
+ 'This device, before the update': 'Cet appareil, avant la mise à jour',
+ 'Your own color': 'Ta propre couleur',
+ 'Pick your own color': 'Choisis ta propre couleur',
+ 'Change your own color': 'Change ta propre couleur',
+ 'A touch lighter in dark mode, so you can still read it.': 'Un poil plus claire en mode sombre, pour rester lisible.',
+ 'A touch darker in light mode, so you can still read it.': 'Un poil plus foncée en mode clair, pour rester lisible.',
+ 'Greys show lighter in dark mode, so buttons don’t look switched off.': 'Les gris s’éclaircissent en mode sombre, pour que les boutons n’aient pas l’air éteints.',
+ 'Greys show darker in light mode, so buttons don’t look switched off.': 'Les gris foncent en mode clair, pour que les boutons n’aient pas l’air éteints.',
+ 'custom color picker': 'couleur perso personnalisée sélecteur nuancier',
}
diff --cc frontend/src/locales/hi.js
index 7bd0c4572,245ccd7e3..d63903a2e
--- a/frontend/src/locales/hi.js
+++ b/frontend/src/locales/hi.js
@@@ -1923,22 -1923,16 +1923,30 @@@ export default
'Copied. One more like that one.': 'कॉपी हो गया। एक और बिल्कुल वैसा ही।',
'Keep at least one set, champ': 'कम से कम एक सेट रहने दें, चैंपियन',
'Too late, that one’s gone': 'बहुत देर हो गई, वो जा चुका',
+ 'Duplicate': 'डुप्लिकेट',
+ 'Copied as “{0}”.': '"{0}" नाम से कॉपी हुआ।',
+ '“{0}” gone.': '"{0}" चला गया।',
+ 'It’s already back.': 'वो पहले ही वापस आ गया।',
+ '“{0}” is out of the loop.': '"{0}" चक्र से बाहर।',
+ '“{0}” left the routine.': '"{0}" ने रूटीन छोड़ दिया।',
+ 'Swipe actions': 'स्वाइप ऐक्शन',
+ 'Sets, routines and the loop: left removes, right copies': 'सेट, रूटीन और चक्र: बाएँ हटाता है, दाएँ कॉपी करता है',
'Psst: swipe a set. Left deletes, right copies.': 'सुनिए: किसी सेट को स्वाइप करें। बाएँ हटाता है, दाएँ कॉपी करता है।',
- 'Swipe on sets': 'सेट पर स्वाइप',
- 'Left deletes, right copies': 'बाएँ हटाता है, दाएँ कॉपी करता है',
'Options: copy, remove': 'विकल्प: कॉपी, हटाएँ',
+ 'Another device synced while you were importing, so its changes were kept next to the backup.': 'आयात के दौरान किसी दूसरे डिवाइस ने सिंक किया, इसलिए उसके बदलाव बैकअप के साथ रखे गए।',
+ 'Save as a backup file': 'बैकअप फ़ाइल के रूप में सहेजें',
+ 'Add this device\'s plan to your profile?': 'इस डिवाइस का प्लान अपनी प्रोफ़ाइल में जोड़ें?',
+ 'Your plan, notes or gym cards on this device were set up while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': 'इस डिवाइस पर आपका प्लान, नोट्स या जिम कार्ड बिना साइन इन किए बनाए गए। इन्हें अपनी प्रोफ़ाइल में जोड़ें, या प्रोफ़ाइल को ठीक वैसा ही रखें जैसा सर्वर पर है।',
+ '{0} routine was made on this device while signed out. Add it to your profile, or keep the profile exactly as it is on the server.': '{0} रूटीन इस डिवाइस पर बिना साइन इन किए बनाया गया। इसे अपनी प्रोफ़ाइल में जोड़ें, या प्रोफ़ाइल को ठीक वैसा ही रखें जैसा सर्वर पर है।',
+ '{0} routines were made on this device while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': '{0} रूटीन इस डिवाइस पर बिना साइन इन किए बनाए गए। इन्हें अपनी प्रोफ़ाइल में जोड़ें, या प्रोफ़ाइल को ठीक वैसा ही रखें जैसा सर्वर पर है।',
+ 'This device, before signing in': 'यह डिवाइस, साइन इन से पहले',
+ 'This device, before the update': 'यह डिवाइस, अपडेट से पहले',
+ 'Your own color': 'आपका अपना रंग',
+ 'Pick your own color': 'अपना रंग चुनें',
+ 'Change your own color': 'अपना रंग बदलें',
+ 'A touch lighter in dark mode, so you can still read it.': 'डार्क मोड में थोड़ा हल्का, ताकि पढ़ने में आए।',
+ 'A touch darker in light mode, so you can still read it.': 'लाइट मोड में थोड़ा गहरा, ताकि पढ़ने में आए।',
+ 'Greys show lighter in dark mode, so buttons don’t look switched off.': 'डार्क मोड में ग्रे रंग हल्के दिखते हैं, ताकि बटन बंद जैसे न लगें।',
+ 'Greys show darker in light mode, so buttons don’t look switched off.': 'लाइट मोड में ग्रे रंग गहरे दिखते हैं, ताकि बटन बंद जैसे न लगें।',
+ 'custom color picker': 'अपना रंग कस्टम रंग चुनने वाला',
}
diff --cc frontend/src/locales/hu.js
index 20e2c7140,f3270a60d..711ab7dd4
--- a/frontend/src/locales/hu.js
+++ b/frontend/src/locales/hu.js
@@@ -1926,22 -1926,16 +1926,30 @@@ export default
'Copied. One more like that one.': 'Kimásolva. Még egy ugyanilyen.',
'Keep at least one set, champ': 'Legalább egy sorozat maradjon, bajnok',
'Too late, that one’s gone': 'Késő, az már nincs meg',
+ 'Duplicate': 'Duplikálás',
+ 'Copied as “{0}”.': 'Másolva ezen a néven: „{0}”.',
+ '“{0}” gone.': '„{0}” eltűnt.',
+ 'It’s already back.': 'Már visszajött.',
+ '“{0}” is out of the loop.': '„{0}” kikerült a körből.',
+ '“{0}” left the routine.': '„{0}” kilépett a rutinból.',
+ 'Swipe actions': 'Húzásos műveletek',
+ 'Sets, routines and the loop: left removes, right copies': 'Sorozatok, rutinok és a kör: balra eltávolít, jobbra másol',
'Psst: swipe a set. Left deletes, right copies.': 'Pszt: húzz el egy sorozatot. Balra töröl, jobbra másol.',
- 'Swipe on sets': 'Húzás a sorozatokon',
- 'Left deletes, right copies': 'Balra töröl, jobbra másol',
'Options: copy, remove': 'Lehetőségek: másolás, eltávolítás',
+ 'Another device synced while you were importing, so its changes were kept next to the backup.': 'Egy másik eszköz szinkronizált importálás közben, így a változásai megmaradtak a mentés mellett.',
+ 'Save as a backup file': 'Mentés biztonsági fájlként',
+ 'Add this device\'s plan to your profile?': 'Hozzáadod az eszközön lévő tervet a profilodhoz?',
+ 'Your plan, notes or gym cards on this device were set up while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': 'Az eszközön lévő terved, jegyzeteid vagy kártyáid bejelentkezés nélkül készültek. Add hozzá őket a profilodhoz, vagy hagyd a profilt pontosan úgy, ahogy a szerveren van.',
+ '{0} routine was made on this device while signed out. Add it to your profile, or keep the profile exactly as it is on the server.': '{0} rutin készült ezen az eszközön bejelentkezés nélkül. Add hozzá a profilodhoz, vagy hagyd a profilt pontosan úgy, ahogy a szerveren van.',
+ '{0} routines were made on this device while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': '{0} rutin készült ezen az eszközön bejelentkezés nélkül. Add hozzá őket a profilodhoz, vagy hagyd a profilt pontosan úgy, ahogy a szerveren van.',
+ 'This device, before signing in': 'Ez az eszköz, bejelentkezés előtt',
+ 'This device, before the update': 'Ez az eszköz, a frissítés előtt',
+ 'Your own color': 'Saját színed',
+ 'Pick your own color': 'Válassz saját színt',
+ 'Change your own color': 'Saját szín módosítása',
+ 'A touch lighter in dark mode, so you can still read it.': 'Sötét módban kicsit világosabb, hogy olvasható maradjon.',
+ 'A touch darker in light mode, so you can still read it.': 'Világos módban kicsit sötétebb, hogy olvasható maradjon.',
+ 'Greys show lighter in dark mode, so buttons don’t look switched off.': 'A szürkék sötét módban világosabbak, hogy a gombok ne tűnjenek kikapcsoltnak.',
+ 'Greys show darker in light mode, so buttons don’t look switched off.': 'A szürkék világos módban sötétebbek, hogy a gombok ne tűnjenek kikapcsoltnak.',
+ 'custom color picker': 'saját szín egyéni színválasztó',
}
diff --cc frontend/src/locales/it.js
index eb3b2f22d,125fc9180..bd1169898
--- a/frontend/src/locales/it.js
+++ b/frontend/src/locales/it.js
@@@ -1923,22 -1923,16 +1923,30 @@@ export default
'Copied. One more like that one.': 'Copiata. Un’altra uguale.',
'Keep at least one set, champ': 'Tieni almeno una serie, campione',
'Too late, that one’s gone': 'Troppo tardi, è andata',
+ 'Duplicate': 'Duplica',
+ 'Copied as “{0}”.': 'Copiata come «{0}».',
+ '“{0}” gone.': '«{0}» è andata.',
+ 'It’s already back.': 'È già tornata.',
+ '“{0}” is out of the loop.': '«{0}» esce dal ciclo.',
+ '“{0}” left the routine.': '«{0}» ha lasciato la routine.',
+ 'Swipe actions': 'Azioni con scorrimento',
+ 'Sets, routines and the loop: left removes, right copies': 'Serie, routine e ciclo: a sinistra togli, a destra copi',
'Psst: swipe a set. Left deletes, right copies.': 'Psst: scorri una serie. Sinistra elimina, destra copia.',
- 'Swipe on sets': 'Scorri sulle serie',
- 'Left deletes, right copies': 'Sinistra elimina, destra copia',
'Options: copy, remove': 'Opzioni: copia, rimuovi',
+ 'Another device synced while you were importing, so its changes were kept next to the backup.': 'Un altro dispositivo ha sincronizzato durante l’importazione, quindi le sue modifiche restano accanto al backup.',
+ 'Save as a backup file': 'Salva come file di backup',
+ 'Add this device\'s plan to your profile?': 'Aggiungere il piano di questo dispositivo al tuo profilo?',
+ 'Your plan, notes or gym cards on this device were set up while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': 'Il piano, le note o le tessere della palestra su questo dispositivo sono stati creati senza accesso. Aggiungili al tuo profilo o lascia il profilo esattamente com’è sul server.',
+ '{0} routine was made on this device while signed out. Add it to your profile, or keep the profile exactly as it is on the server.': '{0} routine è stata creata su questo dispositivo senza accesso. Aggiungila al tuo profilo o lascia il profilo esattamente com’è sul server.',
+ '{0} routines were made on this device while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': '{0} routine sono state create su questo dispositivo senza accesso. Aggiungile al tuo profilo o lascia il profilo esattamente com’è sul server.',
+ 'This device, before signing in': 'Questo dispositivo, prima dell’accesso',
+ 'This device, before the update': 'Questo dispositivo, prima dell’aggiornamento',
+ 'Your own color': 'Il tuo colore',
+ 'Pick your own color': 'Scegli il tuo colore',
+ 'Change your own color': 'Cambia il tuo colore',
+ 'A touch lighter in dark mode, so you can still read it.': 'Un filo più chiaro in modalità scura, così resta leggibile.',
+ 'A touch darker in light mode, so you can still read it.': 'Un filo più scuro in modalità chiara, così resta leggibile.',
+ 'Greys show lighter in dark mode, so buttons don’t look switched off.': 'I grigi diventano più chiari in modalità scura, così i pulsanti non sembrano spenti.',
+ 'Greys show darker in light mode, so buttons don’t look switched off.': 'I grigi diventano più scuri in modalità chiara, così i pulsanti non sembrano spenti.',
+ 'custom color picker': 'colore personalizzato proprio selettore colore',
}
diff --cc frontend/src/locales/ko.js
index a3a6caf84,c32038c27..d642385c4
--- a/frontend/src/locales/ko.js
+++ b/frontend/src/locales/ko.js
@@@ -1923,22 -1923,16 +1923,30 @@@ export default
'Copied. One more like that one.': '복사됨. 같은 걸로 하나 더.',
'Keep at least one set, champ': '세트는 하나는 남겨야죠, 챔피언',
'Too late, that one’s gone': '너무 늦었어요, 이미 사라졌어요',
+ 'Duplicate': '복제',
+ 'Copied as “{0}”.': '"{0}"(으)로 복사했어요.',
+ '“{0}” gone.': '"{0}" 삭제됨.',
+ 'It’s already back.': '이미 돌아와 있어요.',
+ '“{0}” is out of the loop.': '"{0}"이(가) 순환에서 빠졌어요.',
+ '“{0}” left the routine.': '"{0}"이(가) 루틴에서 빠졌어요.',
+ 'Swipe actions': '스와이프 동작',
+ 'Sets, routines and the loop: left removes, right copies': '세트, 루틴, 순환: 왼쪽은 제거, 오른쪽은 복사',
'Psst: swipe a set. Left deletes, right copies.': '쉿: 세트를 밀어 보세요. 왼쪽은 삭제, 오른쪽은 복사.',
- 'Swipe on sets': '세트 스와이프',
- 'Left deletes, right copies': '왼쪽은 삭제, 오른쪽은 복사',
'Options: copy, remove': '옵션: 복사, 삭제',
+ 'Another device synced while you were importing, so its changes were kept next to the backup.': '가져오는 동안 다른 기기가 동기화해서, 그 변경 사항도 백업과 함께 남겨 뒀어요.',
+ 'Save as a backup file': '백업 파일로 저장',
+ 'Add this device\'s plan to your profile?': '이 기기의 계획을 프로필에 추가할까요?',
+ 'Your plan, notes or gym cards on this device were set up while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': '로그인하지 않은 상태에서 이 기기에 계획, 메모 또는 헬스장 카드가 만들어졌습니다. 프로필에 추가하거나 서버에 있는 프로필을 그대로 유지하세요.',
+ '{0} routine was made on this device while signed out. Add it to your profile, or keep the profile exactly as it is on the server.': '로그인하지 않은 상태에서 이 기기에 루틴 {0}개가 만들어졌습니다. 프로필에 추가하거나 서버에 있는 프로필을 그대로 유지하세요.',
+ '{0} routines were made on this device while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': '로그인하지 않은 상태에서 이 기기에 루틴 {0}개가 만들어졌습니다. 프로필에 추가하거나 서버에 있는 프로필을 그대로 유지하세요.',
+ 'This device, before signing in': '로그인 전의 이 기기',
+ 'This device, before the update': '업데이트 전의 이 기기',
+ 'Your own color': '나만의 색상',
+ 'Pick your own color': '나만의 색상 고르기',
+ 'Change your own color': '나만의 색상 바꾸기',
+ 'A touch lighter in dark mode, so you can still read it.': '다크 모드에서는 잘 보이도록 살짝 밝게 표시돼요.',
+ 'A touch darker in light mode, so you can still read it.': '라이트 모드에서는 잘 보이도록 살짝 어둡게 표시돼요.',
+ 'Greys show lighter in dark mode, so buttons don’t look switched off.': '다크 모드에서는 버튼이 꺼진 것처럼 보이지 않게 회색을 밝게 표시해요.',
+ 'Greys show darker in light mode, so buttons don’t look switched off.': '라이트 모드에서는 버튼이 꺼진 것처럼 보이지 않게 회색을 어둡게 표시해요.',
+ 'custom color picker': '나만의 색상 사용자 지정 색상 선택기',
}
diff --cc frontend/src/locales/pl.js
index ac37513fd,59962d605..34f453e10
--- a/frontend/src/locales/pl.js
+++ b/frontend/src/locales/pl.js
@@@ -1923,22 -1923,16 +1923,30 @@@ export default
'Copied. One more like that one.': 'Skopiowano. Jeszcze jedna taka sama.',
'Keep at least one set, champ': 'Zostaw choć jedną serię, mistrzu',
'Too late, that one’s gone': 'Za późno, już jej nie ma',
+ 'Duplicate': 'Duplikuj',
+ 'Copied as “{0}”.': 'Skopiowano jako „{0}”.',
+ '“{0}” gone.': '„{0}” zniknęła.',
+ 'It’s already back.': 'Już wróciła.',
+ '“{0}” is out of the loop.': '„{0}” wypada z pętli.',
+ '“{0}” left the routine.': '„{0}” opuszcza rutynę.',
+ 'Swipe actions': 'Akcje przesuwania',
+ 'Sets, routines and the loop: left removes, right copies': 'Serie, rutyny i pętla: w lewo usuwa, w prawo kopiuje',
'Psst: swipe a set. Left deletes, right copies.': 'Psst: przesuń serię. W lewo usuwa, w prawo kopiuje.',
- 'Swipe on sets': 'Przesuwanie serii',
- 'Left deletes, right copies': 'W lewo usuwa, w prawo kopiuje',
'Options: copy, remove': 'Opcje: kopiuj, usuń',
+ 'Another device synced while you were importing, so its changes were kept next to the backup.': 'Inne urządzenie zsynchronizowało się podczas importu, więc jego zmiany zostały obok kopii.',
+ 'Save as a backup file': 'Zapisz jako plik kopii',
+ 'Add this device\'s plan to your profile?': 'Dodać plan z tego urządzenia do profilu?',
+ 'Your plan, notes or gym cards on this device were set up while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': 'Plan, notatki lub karty siłowni na tym urządzeniu powstały bez logowania. Dodaj je do profilu albo zostaw profil dokładnie taki, jaki jest na serwerze.',
+ '{0} routine was made on this device while signed out. Add it to your profile, or keep the profile exactly as it is on the server.': '{0} rutyna powstała na tym urządzeniu bez logowania. Dodaj ją do profilu albo zostaw profil dokładnie taki, jaki jest na serwerze.',
+ '{0} routines were made on this device while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': '{0} rutyn powstało na tym urządzeniu bez logowania. Dodaj je do profilu albo zostaw profil dokładnie taki, jaki jest na serwerze.',
+ 'This device, before signing in': 'To urządzenie, przed zalogowaniem',
+ 'This device, before the update': 'To urządzenie, przed aktualizacją',
+ 'Your own color': 'Twój własny kolor',
+ 'Pick your own color': 'Wybierz własny kolor',
+ 'Change your own color': 'Zmień własny kolor',
+ 'A touch lighter in dark mode, so you can still read it.': 'Odrobinę jaśniejszy w trybie ciemnym, żeby dało się go przeczytać.',
+ 'A touch darker in light mode, so you can still read it.': 'Odrobinę ciemniejszy w trybie jasnym, żeby dało się go przeczytać.',
+ 'Greys show lighter in dark mode, so buttons don’t look switched off.': 'Szarości są jaśniejsze w trybie ciemnym, żeby przyciski nie wyglądały na wyłączone.',
+ 'Greys show darker in light mode, so buttons don’t look switched off.': 'Szarości są ciemniejsze w trybie jasnym, żeby przyciski nie wyglądały na wyłączone.',
+ 'custom color picker': 'własny kolor niestandardowy próbnik wybór koloru',
}
diff --cc frontend/src/locales/pt-BR.js
index 89eb0df90,3b8d27277..5789de61f
--- a/frontend/src/locales/pt-BR.js
+++ b/frontend/src/locales/pt-BR.js
@@@ -1190,20 -1190,15 +1190,27 @@@ export const PT_BR_OVERRIDES =
'Warm-up gone.': 'Aquecimento já era.',
'Keep at least one set, champ': 'Deixe pelo menos uma série, campeão',
'Too late, that one’s gone': 'Tarde demais, já era',
+ 'Copied as “{0}”.': 'Copiada como “{0}”.',
+ '“{0}” gone.': '“{0}” já era.',
+ '“{0}” is out of the loop.': '“{0}” saiu do ciclo.',
+ '“{0}” left the routine.': '“{0}” saiu da rotina.',
+ 'Swipe actions': 'Ações de deslizar',
+ 'Sets, routines and the loop: left removes, right copies': 'Séries, rotinas e o ciclo: esquerda remove, direita copia',
'Psst: swipe a set. Left deletes, right copies.': 'Psiu: deslize uma série. Esquerda exclui, direita copia.',
- 'Left deletes, right copies': 'Esquerda exclui, direita copia',
+ 'Another device synced while you were importing, so its changes were kept next to the backup.': 'Outro dispositivo sincronizou durante a importação, então as alterações dele ficaram junto com o backup.',
+ 'Save as a backup file': 'Salvar como arquivo de backup',
+ 'Add this device\'s plan to your profile?': 'Adicionar o plano deste dispositivo ao seu perfil?',
+ 'Your plan, notes or gym cards on this device were set up while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': 'Seu plano, notas ou cartões da academia neste dispositivo foram criados sem login. Adicione-os ao seu perfil ou mantenha o perfil exatamente como está no servidor.',
+ '{0} routine was made on this device while signed out. Add it to your profile, or keep the profile exactly as it is on the server.': '{0} rotina foi criada neste dispositivo sem login. Adicione-a ao seu perfil ou mantenha o perfil exatamente como está no servidor.',
+ '{0} routines were made on this device while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': '{0} rotinas foram criadas neste dispositivo sem login. Adicione-as ao seu perfil ou mantenha o perfil exatamente como está no servidor.',
+ 'This device, before signing in': 'Este dispositivo, antes do login',
+ 'Your own color': 'Sua própria cor',
+ 'Pick your own color': 'Escolha sua própria cor',
+ 'Change your own color': 'Mude sua própria cor',
+ 'A touch lighter in dark mode, so you can still read it.': 'Um pouco mais clara no modo escuro, para você continuar lendo.',
+ 'A touch darker in light mode, so you can still read it.': 'Um pouco mais escura no modo claro, para você continuar lendo.',
+ 'Greys show lighter in dark mode, so buttons don’t look switched off.': 'Os cinzas ficam mais claros no modo escuro, para os botões não parecerem desligados.',
+ 'Greys show darker in light mode, so buttons don’t look switched off.': 'Os cinzas ficam mais escuros no modo claro, para os botões não parecerem desligados.',
}
export default { ...pt, ...PT_BR_OVERRIDES }
diff --cc frontend/src/locales/pt.js
index 2a73a1898,529c40dfb..1497a8de5
--- a/frontend/src/locales/pt.js
+++ b/frontend/src/locales/pt.js
@@@ -1923,22 -1923,16 +1923,30 @@@ export default
'Copied. One more like that one.': 'Copiada. Mais uma igual.',
'Keep at least one set, champ': 'Fica pelo menos uma série, campeão',
'Too late, that one’s gone': 'Tarde demais, já foi',
+ 'Duplicate': 'Duplicar',
+ 'Copied as “{0}”.': 'Copiada como «{0}».',
+ '“{0}” gone.': '«{0}» já foi.',
+ 'It’s already back.': 'Já voltou.',
+ '“{0}” is out of the loop.': '«{0}» saiu do ciclo.',
+ '“{0}” left the routine.': '«{0}» saiu da rotina.',
+ 'Swipe actions': 'Ações ao deslizar',
+ 'Sets, routines and the loop: left removes, right copies': 'Séries, rotinas e o ciclo: esquerda remove, direita copia',
'Psst: swipe a set. Left deletes, right copies.': 'Psst: desliza uma série. Esquerda elimina, direita copia.',
- 'Swipe on sets': 'Deslizar nas séries',
- 'Left deletes, right copies': 'Esquerda elimina, direita copia',
'Options: copy, remove': 'Opções: copiar, remover',
+ 'Another device synced while you were importing, so its changes were kept next to the backup.': 'Outro dispositivo sincronizou durante a importação, por isso as alterações dele ficaram junto à cópia.',
+ 'Save as a backup file': 'Guardar como ficheiro de cópia',
+ 'Add this device\'s plan to your profile?': 'Adicionar o plano deste dispositivo ao teu perfil?',
+ 'Your plan, notes or gym cards on this device were set up while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': 'O teu plano, notas ou cartões do ginásio neste dispositivo foram criados sem sessão iniciada. Adiciona-os ao teu perfil ou mantém o perfil exatamente como está no servidor.',
+ '{0} routine was made on this device while signed out. Add it to your profile, or keep the profile exactly as it is on the server.': '{0} rotina foi criada neste dispositivo sem sessão iniciada. Adiciona-a ao teu perfil ou mantém o perfil exatamente como está no servidor.',
+ '{0} routines were made on this device while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': '{0} rotinas foram criadas neste dispositivo sem sessão iniciada. Adiciona-as ao teu perfil ou mantém o perfil exatamente como está no servidor.',
+ 'This device, before signing in': 'Este dispositivo, antes de iniciar sessão',
+ 'This device, before the update': 'Este dispositivo, antes da atualização',
+ 'Your own color': 'A tua própria cor',
+ 'Pick your own color': 'Escolhe a tua própria cor',
+ 'Change your own color': 'Muda a tua própria cor',
+ 'A touch lighter in dark mode, so you can still read it.': 'Um pouco mais clara no modo escuro, para continuares a ler.',
+ 'A touch darker in light mode, so you can still read it.': 'Um pouco mais escura no modo claro, para continuares a ler.',
+ 'Greys show lighter in dark mode, so buttons don’t look switched off.': 'Os cinzentos ficam mais claros no modo escuro, para os botões não parecerem desligados.',
+ 'Greys show darker in light mode, so buttons don’t look switched off.': 'Os cinzentos ficam mais escuros no modo claro, para os botões não parecerem desligados.',
+ 'custom color picker': 'cor própria personalizada seletor de cor',
}
diff --cc frontend/src/locales/ru.js
index 8a4072dea,f26a9e6ae..676be772c
--- a/frontend/src/locales/ru.js
+++ b/frontend/src/locales/ru.js
@@@ -1927,22 -1927,16 +1927,30 @@@ export default
'Copied. One more like that one.': 'Скопировано. Ещё один такой же.',
'Keep at least one set, champ': 'Хотя бы один подход оставь, чемпион',
'Too late, that one’s gone': 'Поздно, его уже нет',
+ 'Duplicate': 'Дублировать',
+ 'Copied as “{0}”.': 'Скопировано как «{0}».',
+ '“{0}” gone.': '«{0}» больше нет.',
+ 'It’s already back.': 'Уже на месте.',
+ '“{0}” is out of the loop.': '«{0}» выбывает из круга.',
+ '“{0}” left the routine.': '«{0}» покидает тренировку.',
+ 'Swipe actions': 'Действия свайпом',
+ 'Sets, routines and the loop: left removes, right copies': 'Подходы, тренировки и круг: влево убирает, вправо копирует',
'Psst: swipe a set. Left deletes, right copies.': 'Псс: смахни подход. Влево удаляет, вправо копирует.',
- 'Swipe on sets': 'Свайп по подходам',
- 'Left deletes, right copies': 'Влево удаляет, вправо копирует',
'Options: copy, remove': 'Действия: копировать, удалить',
+ 'Another device synced while you were importing, so its changes were kept next to the backup.': 'Другое устройство синхронизировалось во время импорта, поэтому его изменения сохранены рядом с копией.',
+ 'Save as a backup file': 'Сохранить как файл копии',
+ 'Add this device\'s plan to your profile?': 'Добавить план с этого устройства в профиль?',
+ 'Your plan, notes or gym cards on this device were set up while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': 'План, заметки или карты зала на этом устройстве созданы без входа. Добавьте их в профиль или оставьте профиль ровно таким, как на сервере.',
+ '{0} routine was made on this device while signed out. Add it to your profile, or keep the profile exactly as it is on the server.': '{0} программа создана на этом устройстве без входа. Добавьте её в профиль или оставьте профиль ровно таким, как на сервере.',
+ '{0} routines were made on this device while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': '{0} программ создано на этом устройстве без входа. Добавьте их в профиль или оставьте профиль ровно таким, как на сервере.',
+ 'This device, before signing in': 'Это устройство, до входа',
+ 'This device, before the update': 'Это устройство, до обновления',
+ 'Your own color': 'Свой цвет',
+ 'Pick your own color': 'Выбрать свой цвет',
+ 'Change your own color': 'Изменить свой цвет',
+ 'A touch lighter in dark mode, so you can still read it.': 'В тёмной теме чуть светлее, чтобы его было видно.',
+ 'A touch darker in light mode, so you can still read it.': 'В светлой теме чуть темнее, чтобы его было видно.',
+ 'Greys show lighter in dark mode, so buttons don’t look switched off.': 'Серые оттенки в тёмной теме светлее, чтобы кнопки не казались выключенными.',
+ 'Greys show darker in light mode, so buttons don’t look switched off.': 'Серые оттенки в светлой теме темнее, чтобы кнопки не казались выключенными.',
+ 'custom color picker': 'свой цвет пользовательский палитра выбор цвета',
}
diff --cc frontend/src/locales/th.js
index 3f7a71b02,e184220d0..315e31726
--- a/frontend/src/locales/th.js
+++ b/frontend/src/locales/th.js
@@@ -1934,22 -1934,16 +1934,30 @@@ export default
'Copied. One more like that one.': 'คัดลอกแล้ว อีกเซ็ตแบบเดิมเป๊ะ',
'Keep at least one set, champ': 'เก็บไว้อย่างน้อยหนึ่งเซ็ตนะแชมป์',
'Too late, that one’s gone': 'สายไปแล้ว เซ็ตนั้นไปแล้ว',
+ 'Duplicate': 'ทำสำเนา',
+ 'Copied as “{0}”.': 'คัดลอกเป็น “{0}” แล้ว',
+ '“{0}” gone.': '“{0}” ไปแล้ว',
+ 'It’s already back.': 'กลับมาแล้ว',
+ '“{0}” is out of the loop.': '“{0}” ออกจากการวนรอบแล้ว',
+ '“{0}” left the routine.': '“{0}” ออกจากรูทีนแล้ว',
+ 'Swipe actions': 'การปัดเพื่อสั่งงาน',
+ 'Sets, routines and the loop: left removes, right copies': 'เซ็ต รูทีน และการวนรอบ: ปัดซ้ายลบ ปัดขวาคัดลอก',
'Psst: swipe a set. Left deletes, right copies.': 'ชู่: ปัดเซ็ตได้นะ ซ้ายลบ ขวาคัดลอก',
- 'Swipe on sets': 'ปัดบนเซ็ต',
- 'Left deletes, right copies': 'ซ้ายลบ ขวาคัดลอก',
'Options: copy, remove': 'ตัวเลือก: คัดลอก, ลบ',
+ 'Another device synced while you were importing, so its changes were kept next to the backup.': 'อุปกรณ์อื่นซิงก์ระหว่างที่คุณนำเข้า เลยเก็บการเปลี่ยนแปลงของมันไว้คู่กับข้อมูลสำรอง',
+ 'Save as a backup file': 'บันทึกเป็นไฟล์สำรอง',
+ 'Add this device\'s plan to your profile?': 'เพิ่มแผนจากอุปกรณ์นี้ลงในโปรไฟล์ของคุณหรือไม่',
+ 'Your plan, notes or gym cards on this device were set up while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': 'แผน โน้ต หรือบัตรยิมบนอุปกรณ์นี้ถูกสร้างขณะไม่ได้ลงชื่อเข้าใช้ เพิ่มลงในโปรไฟล์ของคุณ หรือคงโปรไฟล์ไว้ตามที่อยู่บนเซิร์ฟเวอร์',
+ '{0} routine was made on this device while signed out. Add it to your profile, or keep the profile exactly as it is on the server.': 'มีการสร้างรูทีน {0} รายการบนอุปกรณ์นี้ขณะไม่ได้ลงชื่อเข้าใช้ เพิ่มลงในโปรไฟล์ของคุณ หรือคงโปรไฟล์ไว้ตามที่อยู่บนเซิร์ฟเวอร์',
+ '{0} routines were made on this device while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': 'มีการสร้างรูทีน {0} รายการบนอุปกรณ์นี้ขณะไม่ได้ลงชื่อเข้าใช้ เพิ่มลงในโปรไฟล์ของคุณ หรือคงโปรไฟล์ไว้ตามที่อยู่บนเซิร์ฟเวอร์',
+ 'This device, before signing in': 'อุปกรณ์นี้ ก่อนลงชื่อเข้าใช้',
+ 'This device, before the update': 'อุปกรณ์นี้ ก่อนอัปเดต',
+ 'Your own color': 'สีของคุณเอง',
+ 'Pick your own color': 'เลือกสีของคุณเอง',
+ 'Change your own color': 'เปลี่ยนสีของคุณเอง',
+ 'A touch lighter in dark mode, so you can still read it.': 'ในโหมดมืดจะสว่างขึ้นนิดหน่อย จะได้ยังอ่านออก',
+ 'A touch darker in light mode, so you can still read it.': 'ในโหมดสว่างจะเข้มขึ้นนิดหน่อย จะได้ยังอ่านออก',
+ 'Greys show lighter in dark mode, so buttons don’t look switched off.': 'สีเทาจะสว่างขึ้นในโหมดมืด ปุ่มจะได้ไม่ดูเหมือนถูกปิดอยู่',
+ 'Greys show darker in light mode, so buttons don’t look switched off.': 'สีเทาจะเข้มขึ้นในโหมดสว่าง ปุ่มจะได้ไม่ดูเหมือนถูกปิดอยู่',
+ 'custom color picker': 'สีเอง กำหนดเอง ตัวเลือกสี',
}
diff --cc frontend/src/locales/tr.js
index 70335bb5e,d31551a44..42cfabac5
--- a/frontend/src/locales/tr.js
+++ b/frontend/src/locales/tr.js
@@@ -1923,22 -1923,16 +1923,30 @@@ export default
'Copied. One more like that one.': 'Kopyalandı. Aynısından bir tane daha.',
'Keep at least one set, champ': 'En az bir set kalsın, şampiyon',
'Too late, that one’s gone': 'Çok geç, o gitti',
+ 'Duplicate': 'Çoğalt',
+ 'Copied as “{0}”.': '“{0}” olarak kopyalandı.',
+ '“{0}” gone.': '“{0}” gitti.',
+ 'It’s already back.': 'Zaten geri geldi.',
+ '“{0}” is out of the loop.': '“{0}” döngüden çıktı.',
+ '“{0}” left the routine.': '“{0}” rutinden ayrıldı.',
+ 'Swipe actions': 'Kaydırma eylemleri',
+ 'Sets, routines and the loop: left removes, right copies': 'Setler, rutinler ve döngü: sola kaldırır, sağa kopyalar',
'Psst: swipe a set. Left deletes, right copies.': 'Psst: bir seti kaydır. Sola silir, sağa kopyalar.',
- 'Swipe on sets': 'Setlerde kaydırma',
- 'Left deletes, right copies': 'Sola silir, sağa kopyalar',
'Options: copy, remove': 'Seçenekler: kopyala, kaldır',
+ 'Another device synced while you were importing, so its changes were kept next to the backup.': 'İçe aktarırken başka bir cihaz eşitlendi, onun değişiklikleri de yedeğin yanında tutuldu.',
+ 'Save as a backup file': 'Yedek dosyası olarak kaydet',
+ 'Add this device\'s plan to your profile?': 'Bu cihazdaki plan profiline eklensin mi?',
+ 'Your plan, notes or gym cards on this device were set up while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': 'Bu cihazdaki planın, notların veya salon kartların oturum açılmadan oluşturuldu. Bunları profiline ekle ya da profili sunucudaki hâliyle bırak.',
+ '{0} routine was made on this device while signed out. Add it to your profile, or keep the profile exactly as it is on the server.': 'Bu cihazda oturum açılmadan {0} rutin oluşturuldu. Onu profiline ekle ya da profili sunucudaki hâliyle bırak.',
+ '{0} routines were made on this device while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': 'Bu cihazda oturum açılmadan {0} rutin oluşturuldu. Bunları profiline ekle ya da profili sunucudaki hâliyle bırak.',
+ 'This device, before signing in': 'Bu cihaz, oturum açmadan önce',
+ 'This device, before the update': 'Bu cihaz, güncellemeden önce',
+ 'Your own color': 'Kendi rengin',
+ 'Pick your own color': 'Kendi rengini seç',
+ 'Change your own color': 'Kendi rengini değiştir',
+ 'A touch lighter in dark mode, so you can still read it.': 'Karanlık modda biraz daha açık, hâlâ okunabilsin diye.',
+ 'A touch darker in light mode, so you can still read it.': 'Aydınlık modda biraz daha koyu, hâlâ okunabilsin diye.',
+ 'Greys show lighter in dark mode, so buttons don’t look switched off.': 'Griler karanlık modda daha açık görünür, düğmeler kapalıymış gibi durmasın diye.',
+ 'Greys show darker in light mode, so buttons don’t look switched off.': 'Griler aydınlık modda daha koyu görünür, düğmeler kapalıymış gibi durmasın diye.',
+ 'custom color picker': 'kendi renk özel renk seçici',
}
diff --cc frontend/src/locales/uk.js
index f0ae495fd,d96b58337..ee17a3d7c
--- a/frontend/src/locales/uk.js
+++ b/frontend/src/locales/uk.js
@@@ -1920,22 -1920,16 +1920,30 @@@ export default
'Copied. One more like that one.': 'Скопійовано. Ще один такий самий.',
'Keep at least one set, champ': 'Залиш хоча б один підхід, чемпіоне',
'Too late, that one’s gone': 'Запізно, його вже нема',
+ 'Duplicate': 'Дублювати',
+ 'Copied as “{0}”.': 'Скопійовано як «{0}».',
+ '“{0}” gone.': '«{0}» більше нема.',
+ 'It’s already back.': 'Уже на місці.',
+ '“{0}” is out of the loop.': '«{0}» вибуває з кола.',
+ '“{0}” left the routine.': '«{0}» покидає тренування.',
+ 'Swipe actions': 'Дії свайпом',
+ 'Sets, routines and the loop: left removes, right copies': 'Підходи, тренування і коло: ліворуч прибирає, праворуч копіює',
'Psst: swipe a set. Left deletes, right copies.': 'Пс: змахни підхід. Ліворуч видаляє, праворуч копіює.',
- 'Swipe on sets': 'Свайп по підходах',
- 'Left deletes, right copies': 'Ліворуч видаляє, праворуч копіює',
'Options: copy, remove': 'Дії: копіювати, видалити',
+ 'Another device synced while you were importing, so its changes were kept next to the backup.': 'Інший пристрій синхронізувався під час імпорту, тож його зміни збережено поруч із копією.',
+ 'Save as a backup file': 'Зберегти як файл копії',
+ 'Add this device\'s plan to your profile?': 'Додати план із цього пристрою в профіль?',
+ 'Your plan, notes or gym cards on this device were set up while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': 'План, нотатки чи картки залу на цьому пристрої створено без входу. Додай їх у профіль або лиши профіль точно таким, як на сервері.',
+ '{0} routine was made on this device while signed out. Add it to your profile, or keep the profile exactly as it is on the server.': 'На цьому пристрої без входу створено програм: {0}. Додай її в профіль або лиши профіль точно таким, як на сервері.',
+ '{0} routines were made on this device while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': 'На цьому пристрої без входу створено програм: {0}. Додай їх у профіль або лиши профіль точно таким, як на сервері.',
+ 'This device, before signing in': 'Цей пристрій, до входу',
+ 'This device, before the update': 'Цей пристрій, до оновлення',
+ 'Your own color': 'Свій колір',
+ 'Pick your own color': 'Вибрати свій колір',
+ 'Change your own color': 'Змінити свій колір',
+ 'A touch lighter in dark mode, so you can still read it.': 'У темній темі трохи світліший, щоб його було видно.',
+ 'A touch darker in light mode, so you can still read it.': 'У світлій темі трохи темніший, щоб його було видно.',
+ 'Greys show lighter in dark mode, so buttons don’t look switched off.': 'Сірі відтінки в темній темі світліші, щоб кнопки не здавалися вимкненими.',
+ 'Greys show darker in light mode, so buttons don’t look switched off.': 'Сірі відтінки у світлій темі темніші, щоб кнопки не здавалися вимкненими.',
+ 'custom color picker': 'свій колір власний палітра вибір кольору',
}
diff --cc frontend/src/locales/zh-TW.js
index 2068d44d9,5e268a5b7..d3b71e66d
--- a/frontend/src/locales/zh-TW.js
+++ b/frontend/src/locales/zh-TW.js
@@@ -1916,22 -1916,16 +1916,30 @@@ export default
'Copied. One more like that one.': '已複製。再來一組一樣的。',
'Keep at least one set, champ': '至少留一組吧,冠軍',
'Too late, that one’s gone': '太晚了,那組已經沒了',
+ 'Duplicate': '複製一份',
+ 'Copied as “{0}”.': '已複製為「{0}」。',
+ '“{0}” gone.': '「{0}」沒了。',
+ 'It’s already back.': '它已經回來了。',
+ '“{0}” is out of the loop.': '「{0}」已移出循環。',
+ '“{0}” left the routine.': '「{0}」已離開課表。',
+ 'Swipe actions': '滑動操作',
+ 'Sets, routines and the loop: left removes, right copies': '組、課表和循環:左滑移除,右滑複製',
'Psst: swipe a set. Left deletes, right copies.': '偷偷告訴你:滑動一組。左滑刪除,右滑複製。',
- 'Swipe on sets': '在組上滑動',
- 'Left deletes, right copies': '左滑刪除,右滑複製',
'Options: copy, remove': '選項:複製、刪除',
+ 'Another device synced while you were importing, so its changes were kept next to the backup.': '匯入時另一台裝置同步了,所以它的變更也和備份一起保留了。',
+ 'Save as a backup file': '儲存為備份檔案',
+ 'Add this device\'s plan to your profile?': '是否將此裝置上的計畫加入你的個人檔案?',
+ 'Your plan, notes or gym cards on this device were set up while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': '此裝置在未登入狀態下設定了計畫、備註或健身房卡。是否將其加入你的個人檔案,或是維持伺服器上的原本紀錄?',
+ '{0} routine was made on this device while signed out. Add it to your profile, or keep the profile exactly as it is on the server.': '此裝置在未登入狀態下建立了 {0} 個訓練菜單。是否將其加入你的個人檔案,或是維持伺服器上的原本紀錄?',
+ '{0} routines were made on this device while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': '此裝置在未登入狀態下建立了 {0} 個訓練菜單。是否將其加入你的個人檔案,或是維持伺服器上的原本紀錄?',
+ 'This device, before signing in': '此裝置(登入前)',
+ 'This device, before the update': '此裝置(更新前)',
+ 'Your own color': '你自己的顏色',
+ 'Pick your own color': '選擇你自己的顏色',
+ 'Change your own color': '更改你自己的顏色',
+ 'A touch lighter in dark mode, so you can still read it.': '深色模式下會稍微調亮一點,讓你看得清楚。',
+ 'A touch darker in light mode, so you can still read it.': '淺色模式下會稍微調暗一點,讓你看得清楚。',
+ 'Greys show lighter in dark mode, so buttons don’t look switched off.': '深色模式下灰色會調亮一些,免得按鈕看起來像被停用了。',
+ 'Greys show darker in light mode, so buttons don’t look switched off.': '淺色模式下灰色會調暗一些,免得按鈕看起來像被停用了。',
+ 'custom color picker': '自訂顏色 自己的顏色 取色器 調色盤',
}
diff --cc frontend/src/locales/zh.js
index c7346cc6e,c7055b10a..df2bdca1b
--- a/frontend/src/locales/zh.js
+++ b/frontend/src/locales/zh.js
@@@ -1923,22 -1923,16 +1923,30 @@@ export default
'Copied. One more like that one.': '已复制。再来一组一样的。',
'Keep at least one set, champ': '至少留一组吧,冠军',
'Too late, that one’s gone': '太晚了,那组已经没了',
+ 'Duplicate': '复制一份',
+ 'Copied as “{0}”.': '已复制为“{0}”。',
+ '“{0}” gone.': '“{0}”没了。',
+ 'It’s already back.': '它已经回来了。',
+ '“{0}” is out of the loop.': '“{0}”已移出循环。',
+ '“{0}” left the routine.': '“{0}”已离开计划。',
+ 'Swipe actions': '滑动操作',
+ 'Sets, routines and the loop: left removes, right copies': '组、计划和循环:左滑移除,右滑复制',
'Psst: swipe a set. Left deletes, right copies.': '悄悄告诉你:滑动一组。左滑删除,右滑复制。',
- 'Swipe on sets': '在组上滑动',
- 'Left deletes, right copies': '左滑删除,右滑复制',
'Options: copy, remove': '选项:复制、删除',
+ 'Another device synced while you were importing, so its changes were kept next to the backup.': '导入时另一台设备同步了,所以它的更改也和备份一起保留了。',
+ 'Save as a backup file': '保存为备份文件',
+ 'Add this device\'s plan to your profile?': '把此设备上的计划加入你的个人资料?',
+ 'Your plan, notes or gym cards on this device were set up while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': '此设备在未登录时设置了计划、备注或健身房卡。把它们加入你的个人资料,或保持个人资料与服务器上的完全一致。',
+ '{0} routine was made on this device while signed out. Add it to your profile, or keep the profile exactly as it is on the server.': '此设备在未登录时创建了 {0} 个训练计划。把它加入你的个人资料,或保持个人资料与服务器上的完全一致。',
+ '{0} routines were made on this device while signed out. Add them to your profile, or keep the profile exactly as it is on the server.': '此设备在未登录时创建了 {0} 个训练计划。把它们加入你的个人资料,或保持个人资料与服务器上的完全一致。',
+ 'This device, before signing in': '此设备(登录前)',
+ 'This device, before the update': '此设备(更新前)',
+ 'Your own color': '你自己的颜色',
+ 'Pick your own color': '选择你自己的颜色',
+ 'Change your own color': '更改你自己的颜色',
+ 'A touch lighter in dark mode, so you can still read it.': '深色模式下会稍微调亮一点,好让你看得清。',
+ 'A touch darker in light mode, so you can still read it.': '浅色模式下会稍微调暗一点,好让你看得清。',
+ 'Greys show lighter in dark mode, so buttons don’t look switched off.': '深色模式下灰色会调亮一些,免得按钮看起来像被停用了。',
+ 'Greys show darker in light mode, so buttons don’t look switched off.': '浅色模式下灰色会调暗一些,免得按钮看起来像被停用了。',
+ 'custom color picker': '自定义颜色 自己的颜色 取色器 调色板',
}
diff --cc frontend/src/store/useStore.js
index 10df69d5a,974ad855b..537910acf
--- a/frontend/src/store/useStore.js
+++ b/frontend/src/store/useStore.js
@@@ -1023,7 -859,7 +1024,7 @@@ export const useStore = create((set, ge
try { const r = await api('/api/data'); if (r && r.state) ({ state, rev } = r) } catch { /* the first read */ }
}
const takeServer = () => {
-- const copy = Object.assign(clone(DEF), state)
++ const copy = sanitizeAccent(Object.assign(clone(DEF), state))
copy.active = carryActive(get().S, copy)
if (rev != null) adopt(copy, rev)
else { dropSync(); persist(copy, false, false); markOwed(false) }
@@@ -1148,7 -977,7 +1149,7 @@@
try { owner = localStorage.getItem('gym_owner') } catch { /* evicted along with the copy */ }
if (!who || of?.owner !== who || (owner && owner !== who) || of.ts !== (saved._ts || 0)) return
try { if (!owner) localStorage.setItem('gym_owner', who) } catch { /* setUser writes it again */ }
-- persist(Object.assign(clone(DEF), saved), false, false)
++ persist(sanitizeAccent(Object.assign(clone(DEF), saved)), false, false)
dropSync()
markOwed(true)
}
@@@ -1288,44 -1118,19 +1289,44 @@@
// any): the backup's settings and plan, every entry of all of them (mergeStates with the backup
// preferred, in the backup's unit), pushed against that revision like any other change, so a
// workout logged meanwhile elsewhere, or here, is not lost either.
+ //
+ // Either way the backup is a deliberate add-back (lib/sync-merge.js stampRestore): what it holds
+ // stays, though this device or the server recorded it as deleted since, and its settings and
+ // plan are the latest choice, on every device. The replace goes against the revision the check
+ // read (or this copy's own): a change another device synced meanwhile is merged in, not wiped.
importBackup(backup, { mergeWith } = {}) {
+ const cur = get().S
+ const uid = get().user?.id
+ const read = mergeWith?.state ? mergeWith : importRead && importRead.uid === uid ? importRead : null
+ importRead = null
+ const server = read?.state || null
+ const now = Math.max(Date.now(), highestStamp(cur) + 1, highestStamp(server) + 1, highestStamp(backup) + 1)
- const next = Object.assign(clone(DEF), backup)
+ const next = sanitizeAccent(Object.assign(clone(DEF), backup))
- if (!mergeWith?.state || !get().user) { get().replaceState(next, !!get().user); return }
- const others = mergeWith.local ? mergeStates(get().S, mergeWith.state) : mergeWith.state
- const merged = keepReset(get().S, Object.assign(clone(DEF), mergeStates(next, others, { prefer: 'a' })))
+ if (!mergeWith?.state || !uid) {
+ stampRestore(next, [cur, server], now)
+ next._ts = now
+ const at = read?.rev != null ? { rev: read.rev, wid: read.state?._wid } : metaOf().base
+ get().replaceState(next, !!uid, { baseRev: at?.rev ?? null, baseWid: at?.wid })
+ return
+ }
+ const others = mergeWith.local ? mergeStates(cur, mergeWith.state) : mergeWith.state
+ // The merge keeps the backup's reset stamp (prefer); a later one this copy or the server's
+ // holds stays, as it does on a replace.
+ const merged = keepReset(others, keepReset(cur, Object.assign(clone(DEF), mergeStates(next, others, { prefer: 'a' }))))
+ stampRestore(merged, [cur, mergeWith.state, next], now)
+ merged._ts = now
merged.active = next.active || null
persist(merged, true)
- if (mergeWith.rev != null) writeSync(mergeWith.rev, 0)
+ if (mergeWith.rev != null) writeSync(mergeWith.rev, 0, mergeWith.state?._wid)
},
// A replace that is meant to reach the server (backup import, reset) is a deliberate
- // overwrite, not a change to merge: the push it arms goes without a baseRev. It never takes
- // the reset stamp back (keepReset).
- replaceState(S, push = false) { if (push) forceNext = true; persist(keepReset(get().S, clone(S)), push) },
+ // overwrite, not a change to merge: the push it arms goes without a baseRev — or, given one
+ // (an import), against that revision, so a 409 merges what another device wrote since. It
+ // never takes the reset stamp back (keepReset).
+ replaceState(S, push = false, { baseRev = null, baseWid } = {}) {
+ if (push) { if (baseRev != null) replaceRev = { rev: baseRev, wid: baseWid }; else forceNext = true }
+ persist(keepReset(get().S, clone(S)), push)
+ },
// Fires after the moments where losing local data would actually hurt — a workout just
// logged, a routine just edited — not on every keystroke. No-op off mobile or with the
@@@ -1491,8 -1280,7 +1492,8 @@@
const changed = dirty || localChanged(S)
if (!serverMoved) { if (changed) await get().pushState(); else confirmed(S); return }
if (!state) { writeSync(rev, 0); if (hasData(S)) await get().pushState(); return }
+ if (!descends) { mergeInto(S, state, rev); pushPending = false; await get().pushState(); return }
- if (!changed) { const next = Object.assign(clone(DEF), state); next.active = carryActive(S, next); adopt(next, rev); confirmed(get().S); return }
+ if (!changed) { const next = sanitizeAccent(Object.assign(clone(DEF), state)); next.active = carryActive(S, next); adopt(next, rev); confirmed(get().S); return }
mergeInto(S, state, rev)
pushPending = false
await get().pushState()
@@@ -1737,7 -1520,7 +1738,7 @@@
const saved = await nativeLoad()
const S = get().S
if (saved && (!hasData(S) || (saved._ts || 0) >= (S._ts || 0))) {
-- persist(Object.assign(clone(DEF), saved), false, false)
++ persist(sanitizeAccent(Object.assign(clone(DEF), saved)), false, false)
} else if (hasData(S)) {
nativePersist(true) // first run after an update from a file-less version: seed the mirror
}