diff --git a/maternal-web/app/(auth)/onboarding/page.tsx b/maternal-web/app/(auth)/onboarding/page.tsx
index dce47d7..dc48ed5 100644
--- a/maternal-web/app/(auth)/onboarding/page.tsx
+++ b/maternal-web/app/(auth)/onboarding/page.tsx
@@ -15,14 +15,26 @@ import {
   Alert,
   CircularProgress,
   MenuItem,
+  Card,
+  CardActionArea,
+  CardContent,
+  Radio,
+  RadioGroup,
+  FormControlLabel,
+  FormControl,
+  Grid,
 } from '@mui/material';
-import { ArrowBack, ArrowForward, Check } from '@mui/icons-material';
+import { ArrowBack, ArrowForward, Check, Language, Straighten } from '@mui/icons-material';
 import { motion, AnimatePresence } from 'framer-motion';
 import { useRouter } from 'next/navigation';
 import { useAuth } from '@/lib/auth/AuthContext';
 import { childrenApi } from '@/lib/api/children';
+import { useLocale, MeasurementSystem } from '@/hooks/useLocale';
+import { useTranslation } from '@/hooks/useTranslation';
+import { supportedLanguages } from '@/lib/i18n/config';
+import { usersApi } from '@/lib/api/users';
 
-const steps = ['Welcome', 'Add Child', 'Invite Family', 'Notifications'];
+const steps = ['Welcome', 'Language', 'Measurements', 'Add Child', 'Complete'];
 
 export default function OnboardingPage() {
   const [activeStep, setActiveStep] = useState(0);
diff --git a/maternal-web/app/children/page.tsx b/maternal-web/app/children/page.tsx
index e55a649..9e5642a 100644
--- a/maternal-web/app/children/page.tsx
+++ b/maternal-web/app/children/page.tsx
@@ -216,7 +216,9 @@ export default function ChildrenPage() {
                   >
                     <Card
                       sx={{
-                        height: '100%',
+                        height: '280px', // Fixed height for consistency
+                        minHeight: '280px',
+                        width: '100%',
                         display: 'flex',
                         flexDirection: 'column',
                       }}
diff --git a/maternal-web/app/family/page.tsx b/maternal-web/app/family/page.tsx
index fbe54cd..318d3f9 100644
--- a/maternal-web/app/family/page.tsx
+++ b/maternal-web/app/family/page.tsx
@@ -207,7 +207,7 @@ export default function FamilyPage() {
               {/* Family Share Code */}
               {family && (
                 <Grid item xs={12}>
-                  <Card>
+                  <Card sx={{ minHeight: '140px' }}>
                     <CardContent>
                       <Typography variant="h6" component="h2" fontWeight="600" gutterBottom>
                         {t('shareCode.title')}
@@ -241,7 +241,7 @@ export default function FamilyPage() {
 
               {/* Family Members */}
               <Grid item xs={12}>
-                <Card>
+                <Card sx={{ minHeight: '200px' }}>
                   <CardContent>
                     <Typography variant="h6" fontWeight="600" gutterBottom sx={{ mb: 3 }}>
                       {t('members.title', { count: members.length })}
diff --git a/maternal-web/app/page.tsx b/maternal-web/app/page.tsx
index 6f5f56a..c412704 100644
--- a/maternal-web/app/page.tsx
+++ b/maternal-web/app/page.tsx
@@ -165,7 +165,9 @@ export default function HomePage() {
                     aria-label={t('quickActions.navigateTo', { action: action.label })}
                     sx={{
                       p: 3,
-                      height: '100%',
+                      height: '140px', // Fixed height for consistency
+                      minHeight: '140px', // Ensure minimum height
+                      width: '100%', // Full width of grid container
                       display: 'flex',
                       flexDirection: 'column',
                       alignItems: 'center',
@@ -225,8 +227,10 @@ export default function HomePage() {
                         display: 'flex',
                         flexDirection: 'column',
                         alignItems: 'center',
-                        height: '100%',
-                        minHeight: '120px'
+                        justifyContent: 'center',
+                        height: '120px', // Fixed height for consistency
+                        minHeight: '120px',
+                        width: '100%'
                       }}
                     >
                       <Restaurant sx={{ fontSize: 32, color: 'primary.main', mb: 1 }} aria-hidden="true" />
@@ -245,8 +249,10 @@ export default function HomePage() {
                         display: 'flex',
                         flexDirection: 'column',
                         alignItems: 'center',
-                        height: '100%',
-                        minHeight: '120px'
+                        justifyContent: 'center',
+                        height: '120px', // Fixed height for consistency
+                        minHeight: '120px',
+                        width: '100%'
                       }}
                     >
                       <Hotel sx={{ fontSize: 32, color: 'info.main', mb: 1 }} aria-hidden="true" />
@@ -267,8 +273,10 @@ export default function HomePage() {
                         display: 'flex',
                         flexDirection: 'column',
                         alignItems: 'center',
-                        height: '100%',
-                        minHeight: '120px'
+                        justifyContent: 'center',
+                        height: '120px', // Fixed height for consistency
+                        minHeight: '120px',
+                        width: '100%'
                       }}
                     >
                       <BabyChangingStation sx={{ fontSize: 32, color: 'warning.main', mb: 1 }} aria-hidden="true" />
@@ -287,8 +295,10 @@ export default function HomePage() {
                         display: 'flex',
                         flexDirection: 'column',
                         alignItems: 'center',
-                        height: '100%',
-                        minHeight: '120px'
+                        justifyContent: 'center',
+                        height: '120px', // Fixed height for consistency
+                        minHeight: '120px',
+                        width: '100%'
                       }}
                     >
                       <MedicalServices sx={{ fontSize: 32, color: 'error.main', mb: 1 }} aria-hidden="true" />
diff --git a/maternal-web/app/settings/page.tsx b/maternal-web/app/settings/page.tsx
index 62973b0..93a1d4b 100644
--- a/maternal-web/app/settings/page.tsx
+++ b/maternal-web/app/settings/page.tsx
@@ -129,7 +129,7 @@ export default function SettingsPage() {
         animate={{ opacity: 1, y: 0 }}
         transition={{ duration: 0.4 }}
       >
-        <Card sx={{ mb: 3 }}>
+        <Card sx={{ mb: 3, minHeight: '120px' }}>
           <CardContent>
             <Typography variant="h6" component="h2" fontWeight="600" gutterBottom>
               {t('profile.title')}
@@ -165,7 +165,7 @@ export default function SettingsPage() {
         animate={{ opacity: 1, y: 0 }}
         transition={{ duration: 0.4, delay: 0.05 }}
       >
-        <Card sx={{ mb: 3 }}>
+        <Card sx={{ mb: 3, minHeight: '120px' }}>
           <CardContent>
             <Typography variant="h6" component="h2" fontWeight="600" gutterBottom>
               {t('preferences.title')}
@@ -192,7 +192,7 @@ export default function SettingsPage() {
         animate={{ opacity: 1, y: 0 }}
         transition={{ duration: 0.4, delay: 0.1 }}
       >
-        <Card sx={{ mb: 3 }}>
+        <Card sx={{ mb: 3, minHeight: '120px' }}>
           <CardContent>
             <Typography variant="h6" component="h2" fontWeight="600" gutterBottom>
               {t('notifications.title')}
@@ -229,7 +229,7 @@ export default function SettingsPage() {
         animate={{ opacity: 1, y: 0 }}
         transition={{ duration: 0.4, delay: 0.2 }}
       >
-        <Card sx={{ mb: 3 }}>
+        <Card sx={{ mb: 3, minHeight: '120px' }}>
           <CardContent>
             <Typography variant="h6" component="h2" fontWeight="600" gutterBottom>
               {t('appearance.title')}
diff --git a/maternal-web/app/track/page.tsx b/maternal-web/app/track/page.tsx
index 2188f46..dfd515b 100644
--- a/maternal-web/app/track/page.tsx
+++ b/maternal-web/app/track/page.tsx
@@ -60,7 +60,9 @@ export default function TrackPage() {
               <Grid item xs={12} sm={6} md={3} key={option.title}>
                 <Card
                   sx={{
-                    height: '100%',
+                    height: '180px', // Fixed height for consistency
+                    minHeight: '180px',
+                    width: '100%',
                     bgcolor: option.color,
                     '&:hover': {
                       transform: 'translateY(-4px)',
diff --git a/maternal-web/components/features/analytics/InsightsDashboard.tsx b/maternal-web/components/features/analytics/InsightsDashboard.tsx
index af32bb7..20c7253 100644
--- a/maternal-web/components/features/analytics/InsightsDashboard.tsx
+++ b/maternal-web/components/features/analytics/InsightsDashboard.tsx
@@ -363,8 +363,8 @@ export const InsightsDashboard: React.FC = () => {
                   animate={{ opacity: 1, scale: 1 }}
                   transition={{ duration: 0.3, delay: 0 }}
                 >
-                  <Card sx={{ bgcolor: COLORS.feeding, color: 'white' }}>
-                    <CardContent>
+                  <Card sx={{ bgcolor: COLORS.feeding, color: 'white', height: '160px', minHeight: '160px' }}>
+                    <CardContent sx={{ height: '100%', display: 'flex', flexDirection: 'column', justifyContent: 'center' }}>
                       <Box sx={{ display: 'flex', alignItems: 'center', mb: 1 }}>
                         <Restaurant sx={{ fontSize: 32, mr: 1 }} />
                         <Typography variant="h6" fontWeight="600">
@@ -388,8 +388,8 @@ export const InsightsDashboard: React.FC = () => {
                   animate={{ opacity: 1, scale: 1 }}
                   transition={{ duration: 0.3, delay: 0.1 }}
                 >
-                  <Card sx={{ bgcolor: COLORS.sleep, color: 'white' }}>
-                    <CardContent>
+                  <Card sx={{ bgcolor: COLORS.sleep, color: 'white', height: '160px', minHeight: '160px' }}>
+                    <CardContent sx={{ height: '100%', display: 'flex', flexDirection: 'column', justifyContent: 'center' }}>
                       <Box sx={{ display: 'flex', alignItems: 'center', mb: 1 }}>
                         <Hotel sx={{ fontSize: 32, mr: 1 }} />
                         <Typography variant="h6" fontWeight="600">
@@ -413,8 +413,8 @@ export const InsightsDashboard: React.FC = () => {
                   animate={{ opacity: 1, scale: 1 }}
                   transition={{ duration: 0.3, delay: 0.2 }}
                 >
-                  <Card sx={{ bgcolor: COLORS.diaper, color: 'white' }}>
-                    <CardContent>
+                  <Card sx={{ bgcolor: COLORS.diaper, color: 'white', height: '160px', minHeight: '160px' }}>
+                    <CardContent sx={{ height: '100%', display: 'flex', flexDirection: 'column', justifyContent: 'center' }}>
                       <Box sx={{ display: 'flex', alignItems: 'center', mb: 1 }}>
                         <BabyChangingStation sx={{ fontSize: 32, mr: 1 }} />
                         <Typography variant="h6" fontWeight="600">
@@ -438,8 +438,8 @@ export const InsightsDashboard: React.FC = () => {
                   animate={{ opacity: 1, scale: 1 }}
                   transition={{ duration: 0.3, delay: 0.3 }}
                 >
-                  <Card sx={{ bgcolor: COLORS.milestone, color: 'white' }}>
-                    <CardContent>
+                  <Card sx={{ bgcolor: COLORS.milestone, color: 'white', height: '160px', minHeight: '160px' }}>
+                    <CardContent sx={{ height: '100%', display: 'flex', flexDirection: 'column', justifyContent: 'center' }}>
                       <Box sx={{ display: 'flex', alignItems: 'center', mb: 1 }}>
                         <TrendingUp sx={{ fontSize: 32, mr: 1 }} />
                         <Typography variant="h6" fontWeight="600">
@@ -461,8 +461,8 @@ export const InsightsDashboard: React.FC = () => {
             {/* Charts */}
             <Grid container spacing={3} sx={{ mb: 3 }}>
               <Grid item xs={12} md={6}>
-                <Card>
-                  <CardContent>
+                <Card sx={{ height: '350px', minHeight: '350px' }}>
+                  <CardContent sx={{ height: '100%', display: 'flex', flexDirection: 'column' }}>
                     <Box sx={{ display: 'flex', alignItems: 'center', mb: 2 }}>
                       <Restaurant sx={{ mr: 1, color: COLORS.feeding }} />
                       <Typography variant="h6" fontWeight="600">
@@ -483,8 +483,8 @@ export const InsightsDashboard: React.FC = () => {
               </Grid>
 
               <Grid item xs={12} md={6}>
-                <Card>
-                  <CardContent>
+                <Card sx={{ height: '350px', minHeight: '350px' }}>
+                  <CardContent sx={{ height: '100%', display: 'flex', flexDirection: 'column' }}>
                     <Box sx={{ display: 'flex', alignItems: 'center', mb: 2 }}>
                       <Hotel sx={{ mr: 1, color: COLORS.sleep }} />
                       <Typography variant="h6" fontWeight="600">
@@ -546,8 +546,8 @@ export const InsightsDashboard: React.FC = () => {
               )}
 
               <Grid item xs={12} md={diaperData.length > 0 ? 6 : 12}>
-                <Card>
-                  <CardContent>
+                <Card sx={{ height: '350px', minHeight: '350px' }}>
+                  <CardContent sx={{ height: '100%', display: 'flex', flexDirection: 'column' }}>
                     <Box sx={{ display: 'flex', alignItems: 'center', mb: 2 }}>
                       <Assessment sx={{ mr: 1, color: 'primary.main' }} />
                       <Typography variant="h6" fontWeight="600">
diff --git a/maternal-web/lib/i18n/config.ts b/maternal-web/lib/i18n/config.ts
index 84f09cd..db0e1f9 100644
--- a/maternal-web/lib/i18n/config.ts
+++ b/maternal-web/lib/i18n/config.ts
@@ -12,6 +12,8 @@ import enAuth from '@/locales/en/auth.json';
 import enSettings from '@/locales/en/settings.json';
 import enOnboarding from '@/locales/en/onboarding.json';
 import enErrors from '@/locales/en/errors.json';
+import enFamily from '@/locales/en/family.json';
+import enInsights from '@/locales/en/insights.json';
 
 import esCommon from '@/locales/es/common.json';
 import esDashboard from '@/locales/es/dashboard.json';
@@ -22,6 +24,8 @@ import esAuth from '@/locales/es/auth.json';
 import esSettings from '@/locales/es/settings.json';
 import esOnboarding from '@/locales/es/onboarding.json';
 import esErrors from '@/locales/es/errors.json';
+import esFamily from '@/locales/es/family.json';
+import esInsights from '@/locales/es/insights.json';
 
 import frCommon from '@/locales/fr/common.json';
 import frDashboard from '@/locales/fr/dashboard.json';
@@ -32,6 +36,8 @@ import frAuth from '@/locales/fr/auth.json';
 import frSettings from '@/locales/fr/settings.json';
 import frOnboarding from '@/locales/fr/onboarding.json';
 import frErrors from '@/locales/fr/errors.json';
+import frFamily from '@/locales/fr/family.json';
+import frInsights from '@/locales/fr/insights.json';
 
 import ptCommon from '@/locales/pt/common.json';
 import ptDashboard from '@/locales/pt/dashboard.json';
@@ -42,6 +48,8 @@ import ptAuth from '@/locales/pt/auth.json';
 import ptSettings from '@/locales/pt/settings.json';
 import ptOnboarding from '@/locales/pt/onboarding.json';
 import ptErrors from '@/locales/pt/errors.json';
+import ptFamily from '@/locales/pt/family.json';
+import ptInsights from '@/locales/pt/insights.json';
 
 import zhCommon from '@/locales/zh/common.json';
 import zhDashboard from '@/locales/zh/dashboard.json';
@@ -52,6 +60,32 @@ import zhAuth from '@/locales/zh/auth.json';
 import zhSettings from '@/locales/zh/settings.json';
 import zhOnboarding from '@/locales/zh/onboarding.json';
 import zhErrors from '@/locales/zh/errors.json';
+import zhFamily from '@/locales/zh/family.json';
+import zhInsights from '@/locales/zh/insights.json';
+
+import deCommon from '@/locales/de/common.json';
+import deDashboard from '@/locales/de/dashboard.json';
+import deTracking from '@/locales/de/tracking.json';
+import deChildren from '@/locales/de/children.json';
+import deAi from '@/locales/de/ai.json';
+import deAuth from '@/locales/de/auth.json';
+import deSettings from '@/locales/de/settings.json';
+import deOnboarding from '@/locales/de/onboarding.json';
+import deErrors from '@/locales/de/errors.json';
+import deFamily from '@/locales/de/family.json';
+import deInsights from '@/locales/de/insights.json';
+
+import itCommon from '@/locales/it/common.json';
+import itDashboard from '@/locales/it/dashboard.json';
+import itTracking from '@/locales/it/tracking.json';
+import itChildren from '@/locales/it/children.json';
+import itAi from '@/locales/it/ai.json';
+import itAuth from '@/locales/it/auth.json';
+import itSettings from '@/locales/it/settings.json';
+import itOnboarding from '@/locales/it/onboarding.json';
+import itErrors from '@/locales/it/errors.json';
+import itFamily from '@/locales/it/family.json';
+import itInsights from '@/locales/it/insights.json';
 
 export const resources = {
   en: {
@@ -64,6 +98,8 @@ export const resources = {
     settings: enSettings,
     onboarding: enOnboarding,
     errors: enErrors,
+    family: enFamily,
+    insights: enInsights,
   },
   es: {
     common: esCommon,
@@ -75,6 +111,8 @@ export const resources = {
     settings: esSettings,
     onboarding: esOnboarding,
     errors: esErrors,
+    family: esFamily,
+    insights: esInsights,
   },
   fr: {
     common: frCommon,
@@ -86,6 +124,8 @@ export const resources = {
     settings: frSettings,
     onboarding: frOnboarding,
     errors: frErrors,
+    family: frFamily,
+    insights: frInsights,
   },
   pt: {
     common: ptCommon,
@@ -97,6 +137,8 @@ export const resources = {
     settings: ptSettings,
     onboarding: ptOnboarding,
     errors: ptErrors,
+    family: ptFamily,
+    insights: ptInsights,
   },
   zh: {
     common: zhCommon,
@@ -108,6 +150,34 @@ export const resources = {
     settings: zhSettings,
     onboarding: zhOnboarding,
     errors: zhErrors,
+    family: zhFamily,
+    insights: zhInsights,
+  },
+  de: {
+    common: deCommon,
+    dashboard: deDashboard,
+    tracking: deTracking,
+    children: deChildren,
+    ai: deAi,
+    auth: deAuth,
+    settings: deSettings,
+    onboarding: deOnboarding,
+    errors: deErrors,
+    family: deFamily,
+    insights: deInsights,
+  },
+  it: {
+    common: itCommon,
+    dashboard: itDashboard,
+    tracking: itTracking,
+    children: itChildren,
+    ai: itAi,
+    auth: itAuth,
+    settings: itSettings,
+    onboarding: itOnboarding,
+    errors: itErrors,
+    family: itFamily,
+    insights: itInsights,
   },
 } as const;
 
@@ -119,6 +189,8 @@ export const supportedLanguages = [
   { code: 'fr', name: 'French', nativeName: 'Français' },
   { code: 'pt', name: 'Portuguese', nativeName: 'Português' },
   { code: 'zh', name: 'Chinese', nativeName: '中文' },
+  { code: 'de', name: 'German', nativeName: 'Deutsch' },
+  { code: 'it', name: 'Italian', nativeName: 'Italiano' },
 ] as const;
 
 i18n
@@ -128,7 +200,7 @@ i18n
     resources,
     defaultNS,
     fallbackLng: 'en',
-    supportedLngs: ['en', 'es', 'fr', 'pt', 'zh'],
+    supportedLngs: ['en', 'es', 'fr', 'pt', 'zh', 'de', 'it'],
     interpolation: {
       escapeValue: false, // React already escapes values
     },
diff --git a/maternal-web/locales/de/ai.json b/maternal-web/locales/de/ai.json
new file mode 100644
index 0000000..5f2169b
--- /dev/null
+++ b/maternal-web/locales/de/ai.json
@@ -0,0 +1,107 @@
+{
+  "title": "KI-Assistent",
+  "subtitle": "24/7 Elternunterstützung",
+  "chat": {
+    "placeholder": "Fragen Sie mich alles über Elternschaft...",
+    "send": "Senden",
+    "listening": "Höre zu...",
+    "processing": "Verarbeitung...",
+    "thinking": "Denke nach...",
+    "typing": "KI tippt...",
+    "voiceInput": "Spracheingabe",
+    "textInput": "Texteingabe",
+    "newChat": "Neuer Chat",
+    "clearChat": "Chat löschen",
+    "confirmClear": "Sind Sie sicher, dass Sie diesen Chat löschen möchten?",
+    "noMessages": "Noch keine Nachrichten",
+    "startConversation": "Beginnen Sie ein Gespräch mit Ihrem KI-Assistenten"
+  },
+  "suggestions": {
+    "title": "Vorgeschlagene Fragen",
+    "sleepPattern": "Wie kann ich das Schlafmuster meines Babys verbessern?",
+    "feeding": "Wie viel sollte mein Baby essen?",
+    "development": "Welche Meilensteine sollte ich diesen Monat erwarten?",
+    "health": "Wann sollte ich mir wegen Fieber Sorgen machen?"
+  },
+  "context": {
+    "analyzing": "Analysiere die Muster Ihres Kindes...",
+    "usingRecent": "Verwende aktuelle Aktivitätsdaten",
+    "basedOn": "Basierend auf {{childName}}s Profil"
+  },
+  "disclaimer": {
+    "title": "Wichtiger Hinweis",
+    "message": "Dieser KI-Assistent bietet allgemeine Elternberatung und ist kein Ersatz für professionelle medizinische Beratung. Konsultieren Sie bei medizinischen Anliegen immer Ihren Kinderarzt.",
+    "emergency": "Im Notfall rufen Sie sofort den Rettungsdienst.",
+    "understand": "Verstanden"
+  },
+  "limits": {
+    "dailyLimit": "Tägliches Fragenlimit erreicht",
+    "dailyLimitMessage": "Sie haben Ihr tägliches Limit von {{limit}} Fragen erreicht. Upgraden Sie auf Premium für unbegrenzten Zugang.",
+    "upgrade": "Auf Premium upgraden"
+  },
+  "history": {
+    "title": "Chat-Verlauf",
+    "today": "Heute",
+    "yesterday": "Gestern",
+    "thisWeek": "Diese Woche",
+    "older": "Älter",
+    "noHistory": "Kein Chat-Verlauf",
+    "delete": "Chat löschen",
+    "confirmDelete": "Sind Sie sicher, dass Sie diesen Chat löschen möchten?"
+  },
+  "topics": {
+    "sleep": "Schlaf",
+    "feeding": "Füttern",
+    "development": "Entwicklung",
+    "health": "Gesundheit",
+    "behavior": "Verhalten",
+    "safety": "Sicherheit",
+    "nutrition": "Ernährung",
+    "general": "Allgemein"
+  },
+  "interface": {
+    "assistantTitle": "KI-Elternassistent",
+    "assistantSubtitle": "Fragen Sie mich alles über Elternschaft und Kinderbetreuung",
+    "greeting": "Hallo {{name}}! Wie kann ich Ihnen heute helfen?",
+    "inputPlaceholder": "Fragen Sie mich alles...",
+    "closeDrawer": "Schublade schließen",
+    "moreOptions": "Weitere Optionen",
+    "deleteConversation": "Gespräch löschen",
+    "chatCount": "{{count}} Chat",
+    "chatCount_plural": "{{count}} Chats",
+    "ungrouped": "Nicht gruppiert",
+    "errorMessage": "Entschuldigung, ich habe einen Fehler festgestellt. Bitte versuchen Sie es erneut.",
+    "disclaimerFooter": "Dieser KI-Assistent bietet allgemeine Informationen. Konsultieren Sie immer Gesundheitsfachkräfte für medizinische Beratung.",
+    "deleteDialogTitle": "Gespräch löschen",
+    "deleteDialogMessage": "Sind Sie sicher, dass Sie dieses Gespräch löschen möchten? Diese Aktion kann nicht rückgängig gemacht werden.",
+    "cancel": "Abbrechen",
+    "delete": "Löschen",
+    "moveToGroup": "In Gruppe verschieben",
+    "createNewGroup": "Neue Gruppe erstellen",
+    "groupNameLabel": "Gruppenname",
+    "create": "Erstellen",
+    "suggestedQuestion1": "Wie viel sollte mein Baby mit 3 Monaten schlafen?",
+    "suggestedQuestion2": "Was sind normale Fütterungsmuster?",
+    "suggestedQuestion3": "Wann sollte ich feste Nahrung einführen?",
+    "suggestedQuestion4": "Tipps für eine bessere Schlafroutine",
+    "thinking1": "Sammle Baby-Weisheit...",
+    "thinking2": "Konsultiere die Baby-Bücher...",
+    "thinking3": "Mische die perfekte Antwort...",
+    "thinking4": "Wärme einige Ratschläge auf...",
+    "thinking5": "Bereite deine Wissensflasche vor...",
+    "thinking6": "Zähle kleine Finger und Zehen...",
+    "thinking7": "Verbinde die Bausteine...",
+    "thinking8": "Schaue in die Spielzeugkiste...",
+    "thinking9": "Ordne die Puzzleteile...",
+    "thinking10": "Rühre das Babybrei-Glas um...",
+    "thinking11": "Poliere den Weisheits-Schnuller...",
+    "thinking12": "Schleiche durch die Mittagspause...",
+    "thinking13": "Organisiere die Wickeltasche...",
+    "thinking14": "Verpacke deine Antwort mit Liebe...",
+    "thinking15": "Braue eine warme Tasse Beratung...",
+    "thinking16": "Stricke einige Gedanken zusammen...",
+    "thinking17": "Ordne die Details...",
+    "thinking18": "Streue etwas Zauberpulver...",
+    "thinking19": "Summe ein Schlaflied beim Nachdenken..."
+  }
+}
\ No newline at end of file
diff --git a/maternal-web/locales/de/auth.json b/maternal-web/locales/de/auth.json
new file mode 100644
index 0000000..ec44a52
--- /dev/null
+++ b/maternal-web/locales/de/auth.json
@@ -0,0 +1,88 @@
+{
+  "login": {
+    "title": "Willkommen zurück",
+    "subtitle": "Melden Sie sich in Ihrem Konto an",
+    "email": "E-Mail",
+    "password": "Passwort",
+    "rememberMe": "Angemeldet bleiben",
+    "forgotPassword": "Passwort vergessen?",
+    "submit": "Anmelden",
+    "noAccount": "Haben Sie noch kein Konto?",
+    "signUp": "Registrieren",
+    "or": "Oder",
+    "continueWithGoogle": "Mit Google fortfahren",
+    "continueWithApple": "Mit Apple fortfahren",
+    "biometric": {
+      "useFaceId": "Face ID verwenden",
+      "useTouchId": "Touch ID verwenden",
+      "useFingerprint": "Fingerabdruck verwenden"
+    }
+  },
+  "signup": {
+    "title": "Konto erstellen",
+    "subtitle": "Treten Sie heute Maternal bei",
+    "name": "Vollständiger Name",
+    "email": "E-Mail",
+    "password": "Passwort",
+    "confirmPassword": "Passwort bestätigen",
+    "agreeToTerms": "Ich stimme den {{termsLink}} und der {{privacyLink}} zu",
+    "termsOfService": "Nutzungsbedingungen",
+    "privacyPolicy": "Datenschutzrichtlinie",
+    "submit": "Konto erstellen",
+    "hasAccount": "Haben Sie bereits ein Konto?",
+    "signIn": "Anmelden",
+    "or": "Oder",
+    "continueWithGoogle": "Mit Google fortfahren",
+    "continueWithApple": "Mit Apple fortfahren"
+  },
+  "forgotPassword": {
+    "title": "Passwort zurücksetzen",
+    "subtitle": "Geben Sie Ihre E-Mail ein, um einen Reset-Link zu erhalten",
+    "email": "E-Mail",
+    "submit": "Reset-Link senden",
+    "backToLogin": "Zurück zur Anmeldung",
+    "success": "Reset-Link gesendet! Überprüfen Sie Ihre E-Mail.",
+    "checkEmail": "Wir haben einen Passwort-Reset-Link an {{email}} gesendet"
+  },
+  "resetPassword": {
+    "title": "Neues Passwort erstellen",
+    "subtitle": "Geben Sie Ihr neues Passwort ein",
+    "password": "Neues Passwort",
+    "confirmPassword": "Passwort bestätigen",
+    "submit": "Passwort zurücksetzen",
+    "success": "Passwort erfolgreich zurückgesetzt!",
+    "backToLogin": "Zurück zur Anmeldung"
+  },
+  "verification": {
+    "title": "E-Mail verifizieren",
+    "subtitle": "Wir haben einen Verifizierungscode an {{email}} gesendet",
+    "code": "Verifizierungscode",
+    "submit": "Verifizieren",
+    "resend": "Code erneut senden",
+    "resendIn": "Erneut senden in {{seconds}}s",
+    "success": "E-Mail erfolgreich verifiziert!",
+    "didNotReceive": "Code nicht erhalten?"
+  },
+  "errors": {
+    "invalidEmail": "Bitte geben Sie eine gültige E-Mail-Adresse ein",
+    "invalidPassword": "Das Passwort muss mindestens 8 Zeichen haben",
+    "passwordMismatch": "Passwörter stimmen nicht überein",
+    "emailRequired": "E-Mail ist erforderlich",
+    "passwordRequired": "Passwort ist erforderlich",
+    "nameRequired": "Name ist erforderlich",
+    "termsRequired": "Sie müssen den Bedingungen und der Datenschutzrichtlinie zustimmen",
+    "invalidCredentials": "Ungültige E-Mail oder Passwort",
+    "emailExists": "Ein Konto mit dieser E-Mail existiert bereits",
+    "weakPassword": "Das Passwort ist zu schwach. Bitte verwenden Sie ein stärkeres Passwort.",
+    "networkError": "Netzwerkfehler. Bitte versuchen Sie es erneut.",
+    "unknownError": "Ein Fehler ist aufgetreten. Bitte versuchen Sie es erneut."
+  },
+  "passwordRequirements": {
+    "title": "Das Passwort muss enthalten:",
+    "minLength": "Mindestens 8 Zeichen",
+    "uppercase": "Mindestens einen Großbuchstaben",
+    "lowercase": "Mindestens einen Kleinbuchstaben",
+    "number": "Mindestens eine Zahl",
+    "special": "Mindestens ein Sonderzeichen"
+  }
+}
\ No newline at end of file
diff --git a/maternal-web/locales/de/children.json b/maternal-web/locales/de/children.json
new file mode 100644
index 0000000..4042d4f
--- /dev/null
+++ b/maternal-web/locales/de/children.json
@@ -0,0 +1,50 @@
+{
+  "title": "Kinder",
+  "subtitle": "Verwalten Sie die Kinderprofile Ihrer Familie",
+  "addChild": "Kind hinzufügen",
+  "addFirstChild": "Erstes Kind hinzufügen",
+  "editChild": "Kind bearbeiten",
+  "deleteChild": "Kind löschen",
+  "noChildren": "Noch keine Kinder hinzugefügt",
+  "noChildrenSubtitle": "Fügen Sie Ihr erstes Kind hinzu, um mit der Verfolgung ihrer Aktivitäten zu beginnen",
+  "age": "Alter",
+  "gender": {
+    "male": "Männlich",
+    "female": "Weiblich",
+    "other": "Andere"
+  },
+  "dialog": {
+    "name": "Name",
+    "birthDate": "Geburtsdatum",
+    "gender": "Geschlecht",
+    "photoUrl": "Foto-URL (Optional)",
+    "photoPlaceholder": "https://example.com/photo.jpg",
+    "cancel": "Abbrechen",
+    "add": "Hinzufügen",
+    "update": "Aktualisieren",
+    "saving": "Speichern...",
+    "delete": "Löschen",
+    "deleting": "Löschen...",
+    "confirmDelete": "Löschen bestätigen",
+    "confirmDeleteMessage": "Sind Sie sicher, dass Sie löschen möchten",
+    "confirmDeleteWarning": "Diese Aktion kann nicht rückgängig gemacht werden. Alle zugehörigen Daten werden dauerhaft entfernt.",
+    "validation": {
+      "nameRequired": "Bitte geben Sie einen Namen ein",
+      "birthDateRequired": "Bitte wählen Sie ein Geburtsdatum",
+      "birthDateFuture": "Das Geburtsdatum kann nicht in der Zukunft liegen"
+    }
+  },
+  "errors": {
+    "noFamily": "Keine Familie gefunden. Bitte schließen Sie zuerst das Onboarding ab.",
+    "loadFailed": "Laden der Kinder fehlgeschlagen",
+    "saveFailed": "Speichern des Kindes fehlgeschlagen",
+    "deleteFailed": "Löschen des Kindes fehlgeschlagen",
+    "noFamilyId": "Keine Familien-ID gefunden"
+  },
+  "ageFormat": {
+    "year": "Jahr",
+    "years": "Jahre",
+    "month": "Monat",
+    "months": "Monate"
+  }
+}
\ No newline at end of file
diff --git a/maternal-web/locales/de/common.json b/maternal-web/locales/de/common.json
new file mode 100644
index 0000000..7d0123f
--- /dev/null
+++ b/maternal-web/locales/de/common.json
@@ -0,0 +1,79 @@
+{
+  "appName": "Maternal",
+  "appDescription": "KI-gestützter Kinderbetreuungsassistent",
+  "welcome": "Willkommen",
+  "loading": "Laden...",
+  "save": "Speichern",
+  "cancel": "Abbrechen",
+  "delete": "Löschen",
+  "edit": "Bearbeiten",
+  "add": "Hinzufügen",
+  "close": "Schließen",
+  "confirm": "Bestätigen",
+  "back": "Zurück",
+  "next": "Weiter",
+  "previous": "Vorherige",
+  "finish": "Fertig",
+  "search": "Suchen",
+  "filter": "Filtern",
+  "sort": "Sortieren",
+  "refresh": "Aktualisieren",
+  "retry": "Wiederholen",
+  "continue": "Fortfahren",
+  "submit": "Absenden",
+  "reset": "Zurücksetzen",
+  "clear": "Löschen",
+  "yes": "Ja",
+  "no": "Nein",
+  "ok": "OK",
+  "error": "Fehler",
+  "success": "Erfolg",
+  "warning": "Warnung",
+  "info": "Information",
+  "home": "Startseite",
+  "settings": "Einstellungen",
+  "profile": "Profil",
+  "logout": "Abmelden",
+  "login": "Anmelden",
+  "signup": "Registrieren",
+  "email": "E-Mail",
+  "password": "Passwort",
+  "name": "Name",
+  "date": "Datum",
+  "time": "Zeit",
+  "duration": "Dauer",
+  "notes": "Notizen",
+  "optional": "Optional",
+  "required": "Erforderlich",
+  "units": {
+    "metric": "Metrisch",
+    "imperial": "Imperial"
+  },
+  "measurements": {
+    "weight": "Gewicht",
+    "height": "Größe",
+    "temperature": "Temperatur",
+    "volume": "Volumen"
+  },
+  "navigation": {
+    "home": "Startseite",
+    "dashboard": "Dashboard",
+    "tracking": "Verfolgung",
+    "trackActivity": "Aktivität verfolgen",
+    "track": "Verfolgen",
+    "ai": "KI-Assistent",
+    "aiChat": "KI-Chat",
+    "family": "Familie",
+    "insights": "Einblicke",
+    "children": "Kinder",
+    "settings": "Einstellungen",
+    "logout": "Abmelden"
+  },
+  "connection": {
+    "syncActive": "Echtzeit-Synchronisation aktiv",
+    "syncDisconnected": "Echtzeit-Synchronisation getrennt",
+    "live": "Live",
+    "offline": "Offline",
+    "familyMembersOnline": "{{count}} Familienmitglieder online"
+  }
+}
\ No newline at end of file
diff --git a/maternal-web/locales/de/dashboard.json b/maternal-web/locales/de/dashboard.json
new file mode 100644
index 0000000..e47e1fd
--- /dev/null
+++ b/maternal-web/locales/de/dashboard.json
@@ -0,0 +1,30 @@
+{
+  "welcomeBack": "Willkommen zurück",
+  "welcomeBackWithName": "Willkommen zurück, {{name}}!",
+  "subtitle": "Verfolgen Sie die Aktivitäten Ihres Kindes und erhalten Sie KI-gestützte Einblicke",
+  "quickActions": {
+    "title": "Schnellaktionen",
+    "feeding": "Füttern",
+    "sleep": "Schlaf",
+    "diaper": "Windel",
+    "medicine": "Medizin",
+    "activities": "Aktivitäten",
+    "aiAssistant": "KI-Assistent",
+    "navigateTo": "Navigieren zu {{action}}"
+  },
+  "summary": {
+    "title": "Heutige Zusammenfassung",
+    "titleWithChild": "Heutige Zusammenfassung - {{childName}}",
+    "feedings": "Fütterungen",
+    "sleep": "Schlaf",
+    "diapers": "Windeln",
+    "medications": "Medikamente",
+    "noChild": "Fügen Sie ein Kind hinzu, um mit der Verfolgung zu beginnen",
+    "noActivities": "Heute wurden keine Aktivitäten verfolgt"
+  },
+  "predictions": {
+    "title": "Nächste vorhergesagte Aktivität",
+    "napTime": "Mittagsschlaf in {{minutes}} Minuten",
+    "basedOnPatterns": "Basierend auf den Schlafmustern Ihres Kindes"
+  }
+}
\ No newline at end of file
diff --git a/maternal-web/locales/de/errors.json b/maternal-web/locales/de/errors.json
new file mode 100644
index 0000000..9a7c1a0
--- /dev/null
+++ b/maternal-web/locales/de/errors.json
@@ -0,0 +1,69 @@
+{
+  "general": {
+    "unknown": "Ein unbekannter Fehler ist aufgetreten",
+    "networkError": "Netzwerkfehler. Bitte überprüfen Sie Ihre Verbindung.",
+    "serverError": "Serverfehler. Bitte versuchen Sie es später erneut.",
+    "notFound": "Die angeforderte Ressource wurde nicht gefunden",
+    "unauthorized": "Sie sind nicht berechtigt, diese Aktion auszuführen",
+    "forbidden": "Zugriff verweigert",
+    "validation": "Bitte überprüfen Sie Ihre Eingabe und versuchen Sie es erneut",
+    "timeout": "Zeitüberschreitung. Bitte versuchen Sie es erneut."
+  },
+  "auth": {
+    "invalidCredentials": "Ungültige E-Mail oder Passwort",
+    "emailExists": "Ein Konto mit dieser E-Mail existiert bereits",
+    "emailNotVerified": "Bitte verifizieren Sie Ihre E-Mail-Adresse",
+    "accountLocked": "Ihr Konto wurde gesperrt. Bitte kontaktieren Sie den Support.",
+    "sessionExpired": "Ihre Sitzung ist abgelaufen. Bitte melden Sie sich erneut an.",
+    "weakPassword": "Das Passwort ist zu schwach",
+    "tokenInvalid": "Ungültiger oder abgelaufener Token",
+    "deviceNotTrusted": "Gerät nicht vertrauenswürdig. Bitte verifizieren Sie Ihr Gerät."
+  },
+  "family": {
+    "limitExceeded": "Familiengröße-Limit überschritten",
+    "memberNotFound": "Familienmitglied nicht gefunden",
+    "cannotRemoveSelf": "Sie können sich nicht selbst aus der Familie entfernen",
+    "insufficientPermissions": "Sie haben keine Berechtigung für diese Aktion",
+    "invitationExpired": "Diese Einladung ist abgelaufen",
+    "alreadyMember": "Diese Person ist bereits Familienmitglied"
+  },
+  "child": {
+    "notFound": "Kinderprofil nicht gefunden",
+    "invalidAge": "Ungültiges Alter. Bitte überprüfen Sie das Geburtsdatum.",
+    "limitExceeded": "Sie haben die maximale Anzahl von Kindern erreicht"
+  },
+  "tracking": {
+    "invalidData": "Ungültige Verfolgungsdaten",
+    "futureDate": "Sie können keine Aktivitäten in der Zukunft protokollieren",
+    "duplicateEntry": "Ein ähnlicher Eintrag existiert bereits",
+    "invalidDuration": "Ungültige Dauer",
+    "invalidAmount": "Ungültige Menge"
+  },
+  "ai": {
+    "dailyLimitReached": "Tägliches KI-Fragenlimit erreicht",
+    "contextError": "Fehler beim Laden des Kontexts für KI",
+    "responseError": "Fehler beim Generieren der KI-Antwort",
+    "moderationFlag": "Ihre Nachricht wurde von unserem Content-Moderationssystem markiert"
+  },
+  "offline": {
+    "noConnection": "Keine Internetverbindung",
+    "syncFailed": "Synchronisation der Daten fehlgeschlagen",
+    "pendingChanges": "Sie haben ausstehende Änderungen, die synchronisiert werden müssen"
+  },
+  "validation": {
+    "required": "Dieses Feld ist erforderlich",
+    "invalidEmail": "Bitte geben Sie eine gültige E-Mail-Adresse ein",
+    "invalidPhone": "Bitte geben Sie eine gültige Telefonnummer ein",
+    "invalidDate": "Bitte geben Sie ein gültiges Datum ein",
+    "minLength": "Muss mindestens {{min}} Zeichen haben",
+    "maxLength": "Darf nicht mehr als {{max}} Zeichen haben",
+    "minValue": "Muss mindestens {{min}} sein",
+    "maxValue": "Darf nicht mehr als {{max}} sein",
+    "invalidFormat": "Ungültiges Format",
+    "passwordMismatch": "Passwörter stimmen nicht überein"
+  },
+  "retry": "Wiederholen",
+  "goBack": "Zurück",
+  "contactSupport": "Support kontaktieren",
+  "dismiss": "Verwerfen"
+}
\ No newline at end of file
diff --git a/maternal-web/locales/de/family.json b/maternal-web/locales/de/family.json
new file mode 100644
index 0000000..8dae647
--- /dev/null
+++ b/maternal-web/locales/de/family.json
@@ -0,0 +1,43 @@
+{
+  "pageTitle": "Familie",
+  "pageSubtitle": "Verwalten Sie Ihre Familienmitglieder und teilen Sie den Zugang",
+  "buttons": {
+    "joinFamily": "Familie beitreten",
+    "inviteMember": "Mitglied einladen",
+    "copyCode": "Code kopieren",
+    "inviteFirstMember": "Erstes Mitglied einladen"
+  },
+  "shareCode": {
+    "title": "Familien-Teilungscode",
+    "description": "Teilen Sie diesen Code mit Familienmitgliedern, um ihnen Zugang zu den Daten Ihrer Familie zu geben"
+  },
+  "members": {
+    "title": "Familienmitglieder ({{count}})",
+    "noMembers": "Noch keine Familienmitglieder",
+    "noMembersDescription": "Laden Sie Familienmitglieder ein, um bei der Kinderbetreuung zusammenzuarbeiten",
+    "youLabel": "Sie",
+    "removeAriaLabel": "{{name}} aus der Familie entfernen"
+  },
+  "roles": {
+    "parent": "Elternteil",
+    "caregiver": "Betreuer",
+    "viewer": "Betrachter"
+  },
+  "messages": {
+    "shareCodeCopied": "Teilungscode in die Zwischenablage kopiert!",
+    "shareCodeCopyFailed": "Kopieren des Teilungscodes fehlgeschlagen",
+    "invitationSent": "Einladung erfolgreich gesendet!",
+    "joinedFamily": "Familie erfolgreich beigetreten!",
+    "memberRemoved": "Mitglied erfolgreich entfernt",
+    "noFamilyFound": "Keine Familie gefunden. Bitte schließen Sie zuerst das Onboarding ab.",
+    "failedToLoad": "Laden der Familieninformationen fehlgeschlagen",
+    "noFamilyId": "Keine Familien-ID gefunden",
+    "failedToInvite": "Senden der Einladung fehlgeschlagen",
+    "failedToJoin": "Beitritt zur Familie fehlgeschlagen",
+    "failedToRemove": "Entfernen des Mitglieds fehlgeschlagen"
+  },
+  "placeholders": {
+    "unknownUser": "Unbekannter Benutzer",
+    "noEmail": "Keine E-Mail"
+  }
+}
\ No newline at end of file
diff --git a/maternal-web/locales/de/insights.json b/maternal-web/locales/de/insights.json
new file mode 100644
index 0000000..2a6673c
--- /dev/null
+++ b/maternal-web/locales/de/insights.json
@@ -0,0 +1,73 @@
+{
+  "title": "Einblicke & Analysen",
+  "subtitle": "Verfolgen Sie Muster und erhalten Sie Einblicke in die Aktivitäten Ihres Kindes",
+  "filters": {
+    "child": "Kind",
+    "dateRange": {
+      "7days": "7 Tage",
+      "30days": "30 Tage",
+      "3months": "3 Monate"
+    }
+  },
+  "stats": {
+    "feedings": {
+      "title": "Fütterungen",
+      "subtitle": "Gesamtanzahl"
+    },
+    "sleep": {
+      "title": "Schlaf",
+      "subtitle": "Durchschnitt pro Tag"
+    },
+    "diapers": {
+      "title": "Windeln",
+      "subtitle": "Gesamte Wechsel"
+    },
+    "topActivity": {
+      "title": "Hauptaktivität",
+      "subtitle": "Am häufigsten"
+    }
+  },
+  "charts": {
+    "feedingFrequency": "Fütterungshäufigkeit",
+    "sleepDuration": "Schlafdauer (Stunden)",
+    "diaperChangesByType": "Windelwechsel nach Typ",
+    "activityTimeline": "Aktivitäts-Zeitlinie",
+    "activityDistribution": "Aktivitätsverteilung",
+    "chartLabels": {
+      "feedings": "Fütterungen",
+      "diapers": "Windeln",
+      "sleepHours": "Schlaf (Std.)"
+    }
+  },
+  "recentActivities": {
+    "title": "Aktuelle Aktivitäten (Letzte 20)"
+  },
+  "emptyStates": {
+    "noChildren": {
+      "title": "Keine Kinder hinzugefügt",
+      "message": "Fügen Sie ein Kind hinzu, um Einblicke und Analysen zu sehen",
+      "action": "Kind hinzufügen"
+    },
+    "noActivities": "Keine Aktivitäten für den ausgewählten Zeitraum gefunden. Beginnen Sie mit der Verfolgung von Aktivitäten, um Einblicke zu sehen!"
+  },
+  "errors": {
+    "loadChildren": "Laden der Kinder fehlgeschlagen",
+    "loadActivities": "Laden der Aktivitäten fehlgeschlagen"
+  },
+  "activityTypes": {
+    "feeding": "Fütterung",
+    "sleep": "Schlaf",
+    "diaper": "Windel",
+    "medication": "Medikament",
+    "milestone": "Meilenstein",
+    "note": "Notiz",
+    "none": "Keine"
+  },
+  "diaperTypes": {
+    "wet": "Nass",
+    "dirty": "Schmutzig",
+    "both": "Beides",
+    "dry": "Trocken",
+    "unknown": "Unbekannt"
+  }
+}
\ No newline at end of file
diff --git a/maternal-web/locales/de/onboarding.json b/maternal-web/locales/de/onboarding.json
new file mode 100644
index 0000000..22b206b
--- /dev/null
+++ b/maternal-web/locales/de/onboarding.json
@@ -0,0 +1,99 @@
+{
+  "welcome": {
+    "title": "Willkommen bei Maternal",
+    "subtitle": "Ihr KI-gestützter Kinderbetreuungsassistent",
+    "description": "Verfolgen Sie Aktivitäten, erhalten Sie KI-gestützte Einblicke und koordinieren Sie sich mit Ihrer Familie - alles an einem Ort.",
+    "getStarted": "Loslegen",
+    "skip": "Überspringen"
+  },
+  "language": {
+    "title": "Wählen Sie Ihre Sprache",
+    "subtitle": "Wählen Sie Ihre bevorzugte Sprache",
+    "description": "Sie können dies später in den Einstellungen ändern"
+  },
+  "measurements": {
+    "title": "Maßeinheiten",
+    "subtitle": "Wählen Sie Ihr bevorzugtes Einheitensystem",
+    "description": "Wählen Sie das Messsystem, mit dem Sie sich am wohlsten fühlen. Sie können dies später in den Einstellungen ändern.",
+    "metric": {
+      "title": "Metrisch",
+      "description": "Kilogramm, Zentimeter, Celsius, Milliliter"
+    },
+    "imperial": {
+      "title": "Imperial",
+      "description": "Pfund, Zoll, Fahrenheit, Unzen"
+    }
+  },
+  "profile": {
+    "title": "Erstellen Sie Ihr Profil",
+    "subtitle": "Erzählen Sie uns von sich",
+    "name": "Ihr Name",
+    "email": "E-Mail-Adresse",
+    "password": "Passwort",
+    "confirmPassword": "Passwort bestätigen",
+    "relation": "Beziehung zum Kind",
+    "relations": {
+      "mother": "Mutter",
+      "father": "Vater",
+      "guardian": "Vormund",
+      "caregiver": "Betreuer",
+      "other": "Andere"
+    }
+  },
+  "child": {
+    "title": "Fügen Sie Ihr Kind hinzu",
+    "subtitle": "Beginnen wir mit Ihrem ersten Kind",
+    "name": "Name des Kindes",
+    "dateOfBirth": "Geburtsdatum",
+    "gender": "Geschlecht",
+    "genders": {
+      "male": "Männlich",
+      "female": "Weiblich",
+      "other": "Andere",
+      "preferNotToSay": "Möchte nicht sagen"
+    },
+    "weight": "Aktuelles Gewicht",
+    "height": "Aktuelle Größe",
+    "addAnother": "Weiteres Kind hinzufügen",
+    "skipForNow": "Vorerst überspringen"
+  },
+  "family": {
+    "title": "Familienmitglieder einladen",
+    "subtitle": "Koordinieren Sie sich mit Ihrer Familie",
+    "description": "Laden Sie Familienmitglieder ein, um Aktivitäten gemeinsam zu sehen und zu verfolgen. Sie erhalten eine E-Mail-Einladung.",
+    "email": "E-Mail des Familienmitglieds",
+    "role": "Rolle",
+    "roles": {
+      "parent": "Elternteil",
+      "caregiver": "Betreuer",
+      "viewer": "Betrachter"
+    },
+    "addMember": "Mitglied hinzufügen",
+    "inviteLater": "Später einladen"
+  },
+  "notifications": {
+    "title": "Benachrichtigungen aktivieren",
+    "subtitle": "Bleiben Sie informiert",
+    "description": "Erhalten Sie Erinnerungen für Fütterungen, Schlafzeiten und wichtige Meilensteine.",
+    "push": "Push-Benachrichtigungen",
+    "email": "E-Mail-Benachrichtigungen",
+    "enable": "Benachrichtigungen aktivieren",
+    "skipForNow": "Vorerst überspringen"
+  },
+  "complete": {
+    "title": "Alles bereit!",
+    "subtitle": "Sie sind bereit, mit der Verfolgung zu beginnen",
+    "description": "Beginnen Sie mit der Verfolgung der Aktivitäten Ihres Kindes und erhalten Sie personalisierte KI-gestützte Einblicke.",
+    "startTracking": "Verfolgung starten",
+    "exploreDashboard": "Dashboard erkunden"
+  },
+  "navigation": {
+    "next": "Weiter",
+    "back": "Zurück",
+    "skip": "Überspringen",
+    "finish": "Fertig"
+  },
+  "progress": {
+    "step": "Schritt {{current}} von {{total}}"
+  }
+}
\ No newline at end of file
diff --git a/maternal-web/locales/de/settings.json b/maternal-web/locales/de/settings.json
new file mode 100644
index 0000000..68d4a91
--- /dev/null
+++ b/maternal-web/locales/de/settings.json
@@ -0,0 +1,147 @@
+{
+  "title": "Einstellungen",
+  "account": {
+    "title": "Konto",
+    "profile": "Profil",
+    "email": "E-Mail",
+    "password": "Passwort",
+    "changePassword": "Passwort ändern",
+    "deleteAccount": "Konto löschen",
+    "confirmDelete": "Sind Sie sicher, dass Sie Ihr Konto löschen möchten? Diese Aktion kann nicht rückgängig gemacht werden."
+  },
+  "preferences": {
+    "title": "Einstellungen",
+    "language": "Sprache",
+    "measurementUnits": "Maßeinheiten",
+    "metric": "Metrisch (kg, cm, °C, ml)",
+    "imperial": "Imperial (lb, in, °F, oz)",
+    "timezone": "Zeitzone",
+    "autoDetectTimezone": "Automatisch erkennen",
+    "timezoneUpdated": "Zeitzone erfolgreich aktualisiert",
+    "timezoneAutoDetected": "Zeitzone automatisch erkannt",
+    "dateFormat": "Datumsformat",
+    "timeFormat": "Zeitformat",
+    "12hour": "12-Stunden-Format",
+    "24hour": "24-Stunden-Format",
+    "timeFormatUpdated": "Zeitformat erfolgreich aktualisiert",
+    "theme": "Design",
+    "light": "Hell",
+    "dark": "Dunkel",
+    "auto": "Automatisch (System)"
+  },
+  "notifications": {
+    "title": "Benachrichtigungen",
+    "push": "Push-Benachrichtigungen",
+    "email": "E-Mail-Benachrichtigungen",
+    "feedingReminders": "Fütterungserinnerungen",
+    "sleepReminders": "Schlaferinnerungen",
+    "milestoneAlerts": "Meilenstein-Benachrichtigungen",
+    "familyUpdates": "Familien-Updates",
+    "aiSuggestions": "KI-Vorschläge"
+  },
+  "privacy": {
+    "title": "Datenschutz & Sicherheit",
+    "dataSharing": "Datenfreigabe",
+    "familyAccess": "Familienzugang",
+    "biometric": "Biometrische Authentifizierung",
+    "enableFaceId": "Face ID aktivieren",
+    "enableTouchId": "Touch ID aktivieren",
+    "enableFingerprint": "Fingerabdruck aktivieren",
+    "dataExport": "Daten exportieren",
+    "downloadData": "Ihre Daten herunterladen"
+  },
+  "family": {
+    "title": "Familie",
+    "members": "Familienmitglieder",
+    "inviteMember": "Mitglied einladen",
+    "removeMember": "Mitglied entfernen",
+    "permissions": "Berechtigungen",
+    "role": "Rolle",
+    "roles": {
+      "admin": "Administrator",
+      "parent": "Elternteil",
+      "caregiver": "Betreuer",
+      "viewer": "Betrachter"
+    }
+  },
+  "children": {
+    "title": "Kinder",
+    "addChild": "Kind hinzufügen",
+    "editChild": "Kind bearbeiten",
+    "removeChild": "Kind entfernen",
+    "name": "Name",
+    "dateOfBirth": "Geburtsdatum",
+    "gender": "Geschlecht",
+    "genders": {
+      "male": "Männlich",
+      "female": "Weiblich",
+      "other": "Andere",
+      "preferNotToSay": "Möchte nicht sagen"
+    }
+  },
+  "subscription": {
+    "title": "Abonnement",
+    "plan": "Aktueller Plan",
+    "free": "Kostenlos",
+    "premium": "Premium",
+    "upgradeToPremium": "Auf Premium upgraden",
+    "manageBilling": "Abrechnung verwalten",
+    "cancelSubscription": "Abonnement kündigen",
+    "renewalDate": "Verlängerungsdatum",
+    "features": {
+      "unlimitedAi": "Unbegrenzte KI-Fragen",
+      "familySync": "Familien-Synchronisation",
+      "advancedAnalytics": "Erweiterte Analysen",
+      "exportReports": "Berichte exportieren",
+      "prioritySupport": "Prioritäts-Support"
+    }
+  },
+  "about": {
+    "title": "Über",
+    "version": "Version",
+    "termsOfService": "Nutzungsbedingungen",
+    "privacyPolicy": "Datenschutzrichtlinie",
+    "helpCenter": "Hilfe-Center",
+    "contactSupport": "Support kontaktieren",
+    "rateApp": "App bewerten",
+    "shareApp": "App teilen"
+  },
+  "profile": {
+    "title": "Profilinformationen",
+    "name": "Name",
+    "nameRequired": "Name darf nicht leer sein",
+    "email": "E-Mail",
+    "emailNotEditable": "E-Mail kann nicht geändert werden"
+  },
+  "appearance": {
+    "title": "Erscheinungsbild",
+    "darkMode": "Dunkler Modus (Demnächst)"
+  },
+  "security": {
+    "title": "Sicherheit"
+  },
+  "sessions": {
+    "title": "Sitzungen"
+  },
+  "deviceTrust": {
+    "title": "Gerätevertrauen"
+  },
+  "biometric": {
+    "title": "Biometrische Authentifizierung"
+  },
+  "dataExport": {
+    "title": "Datenexport"
+  },
+  "accountDeletion": {
+    "title": "Kontolöschung"
+  },
+  "accountActions": {
+    "title": "Kontoaktionen",
+    "logout": "Abmelden"
+  },
+  "save": "Einstellungen speichern",
+  "saving": "Speichern...",
+  "saved": "Einstellungen erfolgreich gespeichert!",
+  "cancel": "Abbrechen",
+  "reset": "Auf Standard zurücksetzen"
+}
\ No newline at end of file
diff --git a/maternal-web/locales/de/tracking.json b/maternal-web/locales/de/tracking.json
new file mode 100644
index 0000000..d2c6bfe
--- /dev/null
+++ b/maternal-web/locales/de/tracking.json
@@ -0,0 +1,279 @@
+{
+  "title": "Aktivitätsverfolgung",
+  "trackActivity": "Aktivität verfolgen",
+  "selectActivity": "Wählen Sie eine zu verfolgende Aktivität",
+  "activities": {
+    "feeding": "Füttern",
+    "sleep": "Schlaf",
+    "diaper": "Windel",
+    "medicine": "Medizin",
+    "activity": "Aktivität"
+  },
+  "feeding": {
+    "title": "Füttern",
+    "addFeeding": "Fütterung hinzufügen",
+    "type": "Fütterungsart",
+    "types": {
+      "breast": "Brust",
+      "bottle": "Flasche",
+      "solid": "Feste Nahrung"
+    },
+    "side": "Seite",
+    "sides": {
+      "left": "Links",
+      "right": "Rechts",
+      "both": "Beide"
+    },
+    "amount": "Menge",
+    "duration": "Dauer",
+    "startTime": "Timer starten",
+    "endTime": "Timer stoppen",
+    "reset": "Zurücksetzen",
+    "notes": "Notizen",
+    "bottleType": "Flaschentyp",
+    "bottleTypes": {
+      "formula": "Säuglingsnahrung",
+      "breastmilk": "Muttermilch",
+      "other": "Andere"
+    },
+    "foodDescription": "Nahrungsbeschreibung",
+    "amountDescription": "Mengenbeschreibung",
+    "placeholders": {
+      "amount": "Menge eingeben",
+      "notes": "Notizen zu dieser Fütterung hinzufügen...",
+      "duration": "Oder Dauer manuell eingeben",
+      "foodDescription": "z.B. Reisbrei, Bananenpüree",
+      "amountDescription": "z.B. 1/4 Tasse, 2 Löffel"
+    },
+    "units": {
+      "ml": "ml",
+      "oz": "oz",
+      "minutes": "Minuten"
+    },
+    "validation": {
+      "durationRequired": "Bitte geben Sie die Dauer ein oder verwenden Sie den Timer",
+      "amountRequired": "Bitte geben Sie die Menge ein",
+      "foodRequired": "Bitte geben Sie eine Nahrungsbeschreibung ein"
+    },
+    "success": "Fütterung erfolgreich protokolliert!",
+    "deleted": "Fütterung erfolgreich gelöscht",
+    "recentFeedings": "Aktuelle Fütterungen",
+    "error": {
+      "saveFailed": "Speichern der Fütterung fehlgeschlagen",
+      "deleteFailed": "Löschen der Fütterung fehlgeschlagen"
+    }
+  },
+  "sleep": {
+    "title": "Schlaf",
+    "addSleep": "Schlaf hinzufügen",
+    "logSleep": "Schlaf protokollieren",
+    "startTime": "Schlafbeginn",
+    "endTime": "Schlafende",
+    "duration": "Dauer",
+    "quality": "Qualität",
+    "qualities": {
+      "poor": "Schlecht",
+      "fair": "Mäßig",
+      "good": "Gut",
+      "excellent": "Ausgezeichnet"
+    },
+    "location": "Ort",
+    "locations": {
+      "crib": "Kinderbett",
+      "bed": "Bett",
+      "stroller": "Kinderwagen",
+      "carrier": "Tragetuch",
+      "other": "Andere"
+    },
+    "status": {
+      "title": "Schlafstatus",
+      "completed": "Abgeschlossen (hat Endzeit)",
+      "ongoing": "Laufend (schläft noch)"
+    },
+    "now": "Jetzt",
+    "notes": "Notizen",
+    "placeholders": {
+      "notes": "Notizen zu dieser Schlafsession hinzufügen..."
+    },
+    "recentSleeps": "Aktuelle Schlafzeiten",
+    "success": "Schlaf erfolgreich protokolliert!",
+    "deleted": "Schlaf erfolgreich gelöscht",
+    "ongoing_duration": "Laufend - {{duration}}"
+  },
+  "diaper": {
+    "title": "Windel",
+    "addDiaper": "Windelwechsel hinzufügen",
+    "logDiaper": "Windelwechsel protokollieren",
+    "type": "Typ",
+    "types": {
+      "wet": "Nass",
+      "dirty": "Schmutzig",
+      "both": "Beides",
+      "dry": "Trocken"
+    },
+    "time": "Zeit",
+    "now": "Jetzt",
+    "conditions": {
+      "title": "Zustand",
+      "normal": "Normal",
+      "soft": "Weich",
+      "hard": "Hart",
+      "watery": "Wässrig",
+      "mucus": "Schleim",
+      "blood": "Blut"
+    },
+    "rash": {
+      "title": "Hat Ausschlag",
+      "yes": "Ja",
+      "no": "Nein",
+      "severity": "Ausschlag-Schweregrad",
+      "alert": "Windelausschlag erkannt. Erwägen Sie die Anwendung von Windelcreme und konsultieren Sie Ihren Kinderarzt, wenn es anhält.",
+      "severities": {
+        "mild": "Leicht",
+        "moderate": "Mäßig",
+        "severe": "Schwer"
+      }
+    },
+    "notes": "Notizen",
+    "placeholders": {
+      "notes": "Notizen zu diesem Windelwechsel hinzufügen..."
+    },
+    "recentDiapers": "Aktuelle Windelwechsel",
+    "success": "Windelwechsel erfolgreich protokolliert!",
+    "deleted": "Windelwechsel erfolgreich gelöscht"
+  },
+  "milestone": {
+    "title": "Meilenstein",
+    "addMilestone": "Meilenstein hinzufügen",
+    "category": "Kategorie",
+    "categories": {
+      "physical": "Körperlich",
+      "cognitive": "Kognitiv",
+      "social": "Sozial",
+      "language": "Sprache"
+    },
+    "description": "Beschreibung",
+    "date": "Datum",
+    "notes": "Notizen",
+    "placeholders": {
+      "description": "Meilenstein beschreiben...",
+      "notes": "Zusätzliche Notizen hinzufügen..."
+    }
+  },
+  "health": {
+    "title": "Gesundheit",
+    "addHealth": "Gesundheitseintrag hinzufügen",
+    "type": "Typ",
+    "types": {
+      "temperature": "Temperatur",
+      "medication": "Medikament",
+      "symptom": "Symptom",
+      "doctor": "Arztbesuch"
+    },
+    "temperature": "Temperatur",
+    "medication": "Medikament",
+    "medicineInfo": "Medikamenteninformationen",
+    "medicineName": {
+      "label": "Medikamentenname",
+      "placeholder": "z.B. Paracetamol, Ibuprofen",
+      "required": "Bitte geben Sie den Medikamentennamen ein"
+    },
+    "dosage": {
+      "label": "Dosierung",
+      "placeholder": "z.B. 5, 2.5",
+      "required": "Bitte geben Sie die Dosierung ein"
+    },
+    "unit": "Einheit",
+    "route": {
+      "label": "Verabreichungsweg",
+      "oral": "Oral",
+      "topical": "Äußerlich",
+      "injection": "Injektion",
+      "other": "Andere"
+    },
+    "reason": {
+      "label": "Grund (optional)",
+      "placeholder": "z.B. Fieber, Schmerzen, Allergie"
+    },
+    "logMedicine": "Medikament protokollieren",
+    "recentMedicines": "Aktuelle Medikamente",
+    "success": "Medikament erfolgreich protokolliert!",
+    "error": "Speichern des Medikaments fehlgeschlagen",
+    "deleted": "Medikament erfolgreich gelöscht",
+    "deleteError": "Löschen des Medikaments fehlgeschlagen",
+    "symptom": "Symptom",
+    "severity": "Schweregrad",
+    "severities": {
+      "mild": "Leicht",
+      "moderate": "Mäßig",
+      "severe": "Schwer"
+    },
+    "notes": "Notizen",
+    "placeholders": {
+      "medication": "Medikamentenname",
+      "dosage": "Dosierungsmenge",
+      "symptom": "Symptom beschreiben",
+      "notes": "Notizen hinzufügen..."
+    },
+    "units": {
+      "ml": "ml",
+      "mg": "mg",
+      "tsp": "TL",
+      "tbsp": "EL",
+      "drops": "Tropfen",
+      "tablet": "Tablette(n)",
+      "celsius": "°C",
+      "fahrenheit": "°F"
+    }
+  },
+  "activity": {
+    "title": "Aktivität",
+    "addActivity": "Aktivität hinzufügen",
+    "logActivity": "Aktivität protokollieren",
+    "type": "Aktivitätstyp",
+    "types": {
+      "play": "Spielen",
+      "tummyTime": "Bauchlage",
+      "walk": "Spaziergang",
+      "music": "Musik",
+      "reading": "Lesen",
+      "outdoor": "Spiel im Freien",
+      "other": "Andere"
+    },
+    "duration": "Dauer (Minuten)",
+    "description": "Beschreibung",
+    "notes": "Notizen",
+    "placeholders": {
+      "duration": "Dauer in Minuten eingeben",
+      "description": "Aktivität beschreiben...",
+      "notes": "Notizen hinzufügen..."
+    },
+    "recentActivities": "Aktuelle Aktivitäten",
+    "success": "Aktivität erfolgreich protokolliert!",
+    "deleted": "Aktivität erfolgreich gelöscht"
+  },
+  "common": {
+    "selectChild": "Kind auswählen",
+    "cancel": "Abbrechen",
+    "delete": "Löschen",
+    "loading": "Laden...",
+    "noChildrenAdded": "Keine Kinder hinzugefügt",
+    "noChildrenMessage": "Sie müssen ein Kind hinzufügen, bevor Sie Aktivitäten verfolgen können",
+    "addChild": "Kind hinzufügen",
+    "recentActivities": "Aktuelle Aktivitäten",
+    "error": {
+      "loadChildrenFailed": "Laden der Kinder fehlgeschlagen"
+    }
+  },
+  "quickLog": "Schnellprotokoll",
+  "viewHistory": "Verlauf anzeigen",
+  "editEntry": "Eintrag bearbeiten",
+  "deleteEntry": "Eintrag löschen",
+  "confirmDelete": "Sind Sie sicher, dass Sie diesen Eintrag löschen möchten?",
+  "filterByType": "Nach Typ filtern",
+  "filterByChild": "Nach Kind filtern",
+  "sortByNewest": "Neueste zuerst",
+  "sortByOldest": "Älteste zuerst",
+  "noEntries": "Noch keine Einträge",
+  "addFirstEntry": "Fügen Sie Ihren ersten Eintrag hinzu, um mit der Verfolgung zu beginnen"
+}
\ No newline at end of file
diff --git a/maternal-web/locales/es/ai.json b/maternal-web/locales/es/ai.json
index 37eba91..af01663 100644
--- a/maternal-web/locales/es/ai.json
+++ b/maternal-web/locales/es/ai.json
@@ -1,62 +1,107 @@
 {
-  "title": "AI Assistant",
-  "subtitle": "24/7 Parenting Support",
+  "title": "Asistente IA",
+  "subtitle": "Apoyo de Crianza 24/7",
   "chat": {
-    "placeholder": "Ask me anything about parenting...",
-    "send": "Send",
-    "listening": "Listening...",
-    "processing": "Processing...",
-    "thinking": "Thinking...",
-    "typing": "AI is typing...",
-    "voiceInput": "Voice Input",
-    "textInput": "Text Input",
-    "newChat": "New Chat",
-    "clearChat": "Clear Chat",
-    "confirmClear": "Are you sure you want to clear this chat?",
-    "noMessages": "No messages yet",
-    "startConversation": "Start a conversation with your AI assistant"
+    "placeholder": "Pregúntame cualquier cosa sobre crianza...",
+    "send": "Enviar",
+    "listening": "Escuchando...",
+    "processing": "Procesando...",
+    "thinking": "Pensando...",
+    "typing": "IA está escribiendo...",
+    "voiceInput": "Entrada de Voz",
+    "textInput": "Entrada de Texto",
+    "newChat": "Nueva Conversación",
+    "clearChat": "Limpiar Conversación",
+    "confirmClear": "¿Estás seguro de que quieres limpiar esta conversación?",
+    "noMessages": "Aún no hay mensajes",
+    "startConversation": "Inicia una conversación con tu asistente IA"
   },
   "suggestions": {
-    "title": "Suggested Questions",
-    "sleepPattern": "How can I improve my baby's sleep pattern?",
-    "feeding": "How much should my baby be eating?",
-    "development": "What milestones should I expect this month?",
-    "health": "When should I be concerned about a fever?"
+    "title": "Preguntas Sugeridas",
+    "sleepPattern": "¿Cómo puedo mejorar el patrón de sueño de mi bebé?",
+    "feeding": "¿Cuánto debería estar comiendo mi bebé?",
+    "development": "¿Qué hitos debería esperar este mes?",
+    "health": "¿Cuándo debería preocuparme por la fiebre?"
   },
   "context": {
-    "analyzing": "Analyzing your child's patterns...",
-    "usingRecent": "Using recent activity data",
-    "basedOn": "Based on {{childName}}'s profile"
+    "analyzing": "Analizando los patrones de tu hijo...",
+    "usingRecent": "Usando datos de actividad recientes",
+    "basedOn": "Basado en el perfil de {{childName}}"
   },
   "disclaimer": {
-    "title": "Important Disclaimer",
-    "message": "This AI assistant provides general parenting guidance and is not a substitute for professional medical advice. Always consult with your pediatrician for medical concerns.",
-    "emergency": "In case of emergency, call emergency services immediately.",
-    "understand": "I Understand"
+    "title": "Aviso Importante",
+    "message": "Este asistente IA proporciona orientación general sobre crianza y no es un sustituto del consejo médico profesional. Siempre consulta con tu pediatra para preocupaciones médicas.",
+    "emergency": "En caso de emergencia, llama a los servicios de emergencia inmediatamente.",
+    "understand": "Entiendo"
   },
   "limits": {
-    "dailyLimit": "Daily question limit reached",
-    "dailyLimitMessage": "You've reached your daily limit of {{limit}} questions. Upgrade to premium for unlimited access.",
-    "upgrade": "Upgrade to Premium"
+    "dailyLimit": "Límite diario de preguntas alcanzado",
+    "dailyLimitMessage": "Has alcanzado tu límite diario de {{limit}} preguntas. Actualiza a premium para acceso ilimitado.",
+    "upgrade": "Actualizar a Premium"
   },
   "history": {
-    "title": "Chat History",
-    "today": "Today",
-    "yesterday": "Yesterday",
-    "thisWeek": "This Week",
-    "older": "Older",
-    "noHistory": "No chat history",
-    "delete": "Delete Chat",
-    "confirmDelete": "Are you sure you want to delete this chat?"
+    "title": "Historial de Conversaciones",
+    "today": "Hoy",
+    "yesterday": "Ayer",
+    "thisWeek": "Esta Semana",
+    "older": "Más Antiguo",
+    "noHistory": "Sin historial de conversaciones",
+    "delete": "Eliminar Conversación",
+    "confirmDelete": "¿Estás seguro de que quieres eliminar esta conversación?"
   },
   "topics": {
-    "sleep": "Sleep",
-    "feeding": "Feeding",
-    "development": "Development",
-    "health": "Health",
-    "behavior": "Behavior",
-    "safety": "Safety",
-    "nutrition": "Nutrition",
+    "sleep": "Sueño",
+    "feeding": "Alimentación",
+    "development": "Desarrollo",
+    "health": "Salud",
+    "behavior": "Comportamiento",
+    "safety": "Seguridad",
+    "nutrition": "Nutrición",
     "general": "General"
+  },
+  "interface": {
+    "assistantTitle": "Asistente IA de Crianza",
+    "assistantSubtitle": "Pregúntame cualquier cosa sobre crianza y cuidado infantil",
+    "greeting": "¡Hola {{name}}! ¿Cómo puedo ayudarte hoy?",
+    "inputPlaceholder": "Pregúntame cualquier cosa...",
+    "closeDrawer": "Cerrar cajón",
+    "moreOptions": "Más opciones",
+    "deleteConversation": "Eliminar conversación",
+    "chatCount": "{{count}} conversación",
+    "chatCount_plural": "{{count}} conversaciones",
+    "ungrouped": "Sin agrupar",
+    "errorMessage": "Lo siento, encontré un error. Por favor intenta de nuevo.",
+    "disclaimerFooter": "Este asistente IA proporciona información general. Siempre consulta a profesionales de la salud para consejos médicos.",
+    "deleteDialogTitle": "Eliminar Conversación",
+    "deleteDialogMessage": "¿Estás seguro de que quieres eliminar esta conversación? Esta acción no se puede deshacer.",
+    "cancel": "Cancelar",
+    "delete": "Eliminar",
+    "moveToGroup": "Mover a Grupo",
+    "createNewGroup": "Crear Nuevo Grupo",
+    "groupNameLabel": "Nombre del Grupo",
+    "create": "Crear",
+    "suggestedQuestion1": "¿Cuánto debería dormir mi bebé a los 3 meses?",
+    "suggestedQuestion2": "¿Cuáles son los patrones normales de alimentación?",
+    "suggestedQuestion3": "¿Cuándo debería introducir alimentos sólidos?",
+    "suggestedQuestion4": "Consejos para una mejor rutina de sueño",
+    "thinking1": "Recopilando sabiduría de bebés...",
+    "thinking2": "Consultando los libros de bebés...",
+    "thinking3": "Mezclando la respuesta perfecta...",
+    "thinking4": "Calentando algunos consejos...",
+    "thinking5": "Preparando tu biberón de conocimiento...",
+    "thinking6": "Contando deditos de manos y pies...",
+    "thinking7": "Conectando los bloques de construcción...",
+    "thinking8": "Echando un vistazo a la caja de juguetes...",
+    "thinking9": "Organizando las piezas del rompecabezas...",
+    "thinking10": "Revolviendo el frasco de comida de bebé...",
+    "thinking11": "Puliendo el chupete de la sabiduría...",
+    "thinking12": "Caminando de puntillas por la hora de la siesta...",
+    "thinking13": "Organizando la bolsa de pañales...",
+    "thinking14": "Envolviendo tu respuesta con amor...",
+    "thinking15": "Preparando una taza caliente de orientación...",
+    "thinking16": "Tejiendo algunos pensamientos...",
+    "thinking17": "Arropando los detalles...",
+    "thinking18": "Espolvoreando un poco de polvo mágico...",
+    "thinking19": "Tarareando una canción de cuna mientras pienso..."
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/es/auth.json b/maternal-web/locales/es/auth.json
index b88be82..6dc0ba0 100644
--- a/maternal-web/locales/es/auth.json
+++ b/maternal-web/locales/es/auth.json
@@ -1,88 +1,88 @@
 {
   "login": {
-    "title": "Welcome Back",
-    "subtitle": "Sign in to your account",
-    "email": "Email",
-    "password": "Password",
-    "rememberMe": "Remember me",
-    "forgotPassword": "Forgot password?",
-    "submit": "Sign In",
-    "noAccount": "Don't have an account?",
-    "signUp": "Sign up",
-    "or": "Or",
-    "continueWithGoogle": "Continue with Google",
-    "continueWithApple": "Continue with Apple",
+    "title": "Bienvenido de Vuelta",
+    "subtitle": "Inicia sesión en tu cuenta",
+    "email": "Correo Electrónico",
+    "password": "Contraseña",
+    "rememberMe": "Recordarme",
+    "forgotPassword": "¿Olvidaste tu contraseña?",
+    "submit": "Iniciar Sesión",
+    "noAccount": "¿No tienes una cuenta?",
+    "signUp": "Regístrate",
+    "or": "O",
+    "continueWithGoogle": "Continuar con Google",
+    "continueWithApple": "Continuar con Apple",
     "biometric": {
-      "useFaceId": "Use Face ID",
-      "useTouchId": "Use Touch ID",
-      "useFingerprint": "Use Fingerprint"
+      "useFaceId": "Usar Face ID",
+      "useTouchId": "Usar Touch ID",
+      "useFingerprint": "Usar Huella Digital"
     }
   },
   "signup": {
-    "title": "Create Account",
-    "subtitle": "Join Maternal today",
-    "name": "Full Name",
-    "email": "Email",
-    "password": "Password",
-    "confirmPassword": "Confirm Password",
-    "agreeToTerms": "I agree to the {{termsLink}} and {{privacyLink}}",
-    "termsOfService": "Terms of Service",
-    "privacyPolicy": "Privacy Policy",
-    "submit": "Create Account",
-    "hasAccount": "Already have an account?",
-    "signIn": "Sign in",
-    "or": "Or",
-    "continueWithGoogle": "Continue with Google",
-    "continueWithApple": "Continue with Apple"
+    "title": "Crear Cuenta",
+    "subtitle": "Únete a Maternal hoy",
+    "name": "Nombre Completo",
+    "email": "Correo Electrónico",
+    "password": "Contraseña",
+    "confirmPassword": "Confirmar Contraseña",
+    "agreeToTerms": "Acepto los {{termsLink}} y la {{privacyLink}}",
+    "termsOfService": "Términos de Servicio",
+    "privacyPolicy": "Política de Privacidad",
+    "submit": "Crear Cuenta",
+    "hasAccount": "¿Ya tienes una cuenta?",
+    "signIn": "Iniciar sesión",
+    "or": "O",
+    "continueWithGoogle": "Continuar con Google",
+    "continueWithApple": "Continuar con Apple"
   },
   "forgotPassword": {
-    "title": "Reset Password",
-    "subtitle": "Enter your email to receive a reset link",
-    "email": "Email",
-    "submit": "Send Reset Link",
-    "backToLogin": "Back to login",
-    "success": "Reset link sent! Check your email.",
-    "checkEmail": "We've sent a password reset link to {{email}}"
+    "title": "Restablecer Contraseña",
+    "subtitle": "Ingresa tu correo para recibir un enlace de restablecimiento",
+    "email": "Correo Electrónico",
+    "submit": "Enviar Enlace de Restablecimiento",
+    "backToLogin": "Volver al inicio de sesión",
+    "success": "¡Enlace de restablecimiento enviado! Revisa tu correo.",
+    "checkEmail": "Hemos enviado un enlace de restablecimiento de contraseña a {{email}}"
   },
   "resetPassword": {
-    "title": "Create New Password",
-    "subtitle": "Enter your new password",
-    "password": "New Password",
-    "confirmPassword": "Confirm Password",
-    "submit": "Reset Password",
-    "success": "Password reset successfully!",
-    "backToLogin": "Back to login"
+    "title": "Crear Nueva Contraseña",
+    "subtitle": "Ingresa tu nueva contraseña",
+    "password": "Nueva Contraseña",
+    "confirmPassword": "Confirmar Contraseña",
+    "submit": "Restablecer Contraseña",
+    "success": "¡Contraseña restablecida exitosamente!",
+    "backToLogin": "Volver al inicio de sesión"
   },
   "verification": {
-    "title": "Verify Your Email",
-    "subtitle": "We've sent a verification code to {{email}}",
-    "code": "Verification Code",
-    "submit": "Verify",
-    "resend": "Resend Code",
-    "resendIn": "Resend in {{seconds}}s",
-    "success": "Email verified successfully!",
-    "didNotReceive": "Didn't receive the code?"
+    "title": "Verifica tu Correo",
+    "subtitle": "Hemos enviado un código de verificación a {{email}}",
+    "code": "Código de Verificación",
+    "submit": "Verificar",
+    "resend": "Reenviar Código",
+    "resendIn": "Reenviar en {{seconds}}s",
+    "success": "¡Correo verificado exitosamente!",
+    "didNotReceive": "¿No recibiste el código?"
   },
   "errors": {
-    "invalidEmail": "Please enter a valid email address",
-    "invalidPassword": "Password must be at least 8 characters",
-    "passwordMismatch": "Passwords do not match",
-    "emailRequired": "Email is required",
-    "passwordRequired": "Password is required",
-    "nameRequired": "Name is required",
-    "termsRequired": "You must agree to the terms and privacy policy",
-    "invalidCredentials": "Invalid email or password",
-    "emailExists": "An account with this email already exists",
-    "weakPassword": "Password is too weak. Please use a stronger password.",
-    "networkError": "Network error. Please try again.",
-    "unknownError": "An error occurred. Please try again."
+    "invalidEmail": "Por favor ingresa una dirección de correo válida",
+    "invalidPassword": "La contraseña debe tener al menos 8 caracteres",
+    "passwordMismatch": "Las contraseñas no coinciden",
+    "emailRequired": "El correo es requerido",
+    "passwordRequired": "La contraseña es requerida",
+    "nameRequired": "El nombre es requerido",
+    "termsRequired": "Debes aceptar los términos y la política de privacidad",
+    "invalidCredentials": "Correo o contraseña inválidos",
+    "emailExists": "Ya existe una cuenta con este correo",
+    "weakPassword": "La contraseña es muy débil. Por favor usa una contraseña más fuerte.",
+    "networkError": "Error de red. Por favor intenta de nuevo.",
+    "unknownError": "Ocurrió un error. Por favor intenta de nuevo."
   },
   "passwordRequirements": {
-    "title": "Password must contain:",
-    "minLength": "At least 8 characters",
-    "uppercase": "At least one uppercase letter",
-    "lowercase": "At least one lowercase letter",
-    "number": "At least one number",
-    "special": "At least one special character"
+    "title": "La contraseña debe contener:",
+    "minLength": "Al menos 8 caracteres",
+    "uppercase": "Al menos una letra mayúscula",
+    "lowercase": "Al menos una letra minúscula",
+    "number": "Al menos un número",
+    "special": "Al menos un carácter especial"
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/es/children.json b/maternal-web/locales/es/children.json
index b72364b..1c849be 100644
--- a/maternal-web/locales/es/children.json
+++ b/maternal-web/locales/es/children.json
@@ -13,8 +13,29 @@
     "female": "Femenino",
     "other": "Otro"
   },
+  "dialog": {
+    "name": "Nombre",
+    "birthDate": "Fecha de Nacimiento",
+    "gender": "Género",
+    "photoUrl": "URL de Foto (Opcional)",
+    "photoPlaceholder": "https://example.com/photo.jpg",
+    "cancel": "Cancelar",
+    "add": "Agregar",
+    "update": "Actualizar",
+    "saving": "Guardando...",
+    "delete": "Eliminar",
+    "deleting": "Eliminando...",
+    "confirmDelete": "Confirmar Eliminación",
+    "confirmDeleteMessage": "¿Estás seguro de que quieres eliminar",
+    "confirmDeleteWarning": "Esta acción no se puede deshacer. Todos los datos asociados serán eliminados permanentemente.",
+    "validation": {
+      "nameRequired": "Por favor ingresa un nombre",
+      "birthDateRequired": "Por favor selecciona una fecha de nacimiento",
+      "birthDateFuture": "La fecha de nacimiento no puede estar en el futuro"
+    }
+  },
   "errors": {
-    "noFamily": "No se encontró familia. Por favor completa la incorporación primero.",
+    "noFamily": "No se encontró familia. Por favor completa la configuración inicial primero.",
     "loadFailed": "Error al cargar niños",
     "saveFailed": "Error al guardar niño",
     "deleteFailed": "Error al eliminar niño",
@@ -26,4 +47,4 @@
     "month": "mes",
     "months": "meses"
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/es/common.json b/maternal-web/locales/es/common.json
index ea4e27e..d6751bf 100644
--- a/maternal-web/locales/es/common.json
+++ b/maternal-web/locales/es/common.json
@@ -1,6 +1,6 @@
 {
   "appName": "Maternal",
-  "appDescription": "Asistente de Cuidado Infantil con IA",
+  "appDescription": "Asistente de Cuidado Infantil Impulsado por IA",
   "welcome": "Bienvenido",
   "loading": "Cargando...",
   "save": "Guardar",
@@ -33,10 +33,10 @@
   "home": "Inicio",
   "settings": "Configuración",
   "profile": "Perfil",
-  "logout": "Cerrar sesión",
-  "login": "Iniciar sesión",
+  "logout": "Cerrar Sesión",
+  "login": "Iniciar Sesión",
   "signup": "Registrarse",
-  "email": "Correo electrónico",
+  "email": "Correo Electrónico",
   "password": "Contraseña",
   "name": "Nombre",
   "date": "Fecha",
@@ -44,7 +44,7 @@
   "duration": "Duración",
   "notes": "Notas",
   "optional": "Opcional",
-  "required": "Obligatorio",
+  "required": "Requerido",
   "units": {
     "metric": "Métrico",
     "imperial": "Imperial"
@@ -57,14 +57,14 @@
   },
   "navigation": {
     "home": "Inicio",
-    "dashboard": "Panel",
+    "dashboard": "Panel de Control",
     "tracking": "Seguimiento",
-    "trackActivity": "Registrar Actividad",
-    "track": "Registrar",
+    "trackActivity": "Rastrear Actividad",
+    "track": "Rastrear",
     "ai": "Asistente IA",
     "aiChat": "Chat IA",
     "family": "Familia",
-    "insights": "Análisis",
+    "insights": "Perspectivas",
     "children": "Niños",
     "settings": "Configuración",
     "logout": "Cerrar Sesión"
@@ -73,7 +73,7 @@
     "syncActive": "Sincronización en tiempo real activa",
     "syncDisconnected": "Sincronización en tiempo real desconectada",
     "live": "En Vivo",
-    "offline": "Desconectado",
+    "offline": "Sin Conexión",
     "familyMembersOnline": "{{count}} miembros de la familia en línea"
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/es/dashboard.json b/maternal-web/locales/es/dashboard.json
index 9203a18..da3d4f7 100644
--- a/maternal-web/locales/es/dashboard.json
+++ b/maternal-web/locales/es/dashboard.json
@@ -1,7 +1,7 @@
 {
-  "welcomeBack": "Bienvenido de vuelta",
-  "welcomeBackWithName": "Bienvenido de vuelta, {{name}}!",
-  "subtitle": "Rastrea las actividades de tu hijo y obtén información impulsada por IA",
+  "welcomeBack": "Bienvenido de Vuelta",
+  "welcomeBackWithName": "¡Bienvenido de vuelta, {{name}}!",
+  "subtitle": "Rastrea las actividades de tu hijo y obtén perspectivas impulsadas por IA",
   "quickActions": {
     "title": "Acciones Rápidas",
     "feeding": "Alimentación",
@@ -19,12 +19,12 @@
     "sleep": "Sueño",
     "diapers": "Pañales",
     "medications": "Medicamentos",
-    "noChild": "Agrega un niño para comenzar a rastrear",
-    "noActivities": "No hay actividades rastreadas hoy"
+    "noChild": "Agrega un niño para comenzar el seguimiento",
+    "noActivities": "No se han rastreado actividades hoy"
   },
   "predictions": {
     "title": "Próxima Actividad Predicha",
     "napTime": "Hora de siesta en {{minutes}} minutos",
     "basedOnPatterns": "Basado en los patrones de sueño de tu hijo"
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/es/errors.json b/maternal-web/locales/es/errors.json
index 8f431e2..c9bf7b8 100644
--- a/maternal-web/locales/es/errors.json
+++ b/maternal-web/locales/es/errors.json
@@ -1,69 +1,69 @@
 {
   "general": {
-    "unknown": "An unknown error occurred",
-    "networkError": "Network error. Please check your connection.",
-    "serverError": "Server error. Please try again later.",
-    "notFound": "The requested resource was not found",
-    "unauthorized": "You are not authorized to perform this action",
-    "forbidden": "Access denied",
-    "validation": "Please check your input and try again",
-    "timeout": "Request timed out. Please try again."
+    "unknown": "Ocurrió un error desconocido",
+    "networkError": "Error de red. Por favor verifica tu conexión.",
+    "serverError": "Error del servidor. Por favor intenta más tarde.",
+    "notFound": "No se encontró el recurso solicitado",
+    "unauthorized": "No estás autorizado para realizar esta acción",
+    "forbidden": "Acceso denegado",
+    "validation": "Por favor verifica tu entrada e intenta de nuevo",
+    "timeout": "Se agotó el tiempo de espera. Por favor intenta de nuevo."
   },
   "auth": {
-    "invalidCredentials": "Invalid email or password",
-    "emailExists": "An account with this email already exists",
-    "emailNotVerified": "Please verify your email address",
-    "accountLocked": "Your account has been locked. Please contact support.",
-    "sessionExpired": "Your session has expired. Please sign in again.",
-    "weakPassword": "Password is too weak",
-    "tokenInvalid": "Invalid or expired token",
-    "deviceNotTrusted": "Device not trusted. Please verify your device."
+    "invalidCredentials": "Correo o contraseña inválidos",
+    "emailExists": "Ya existe una cuenta con este correo",
+    "emailNotVerified": "Por favor verifica tu dirección de correo",
+    "accountLocked": "Tu cuenta ha sido bloqueada. Por favor contacta soporte.",
+    "sessionExpired": "Tu sesión ha expirado. Por favor inicia sesión de nuevo.",
+    "weakPassword": "La contraseña es muy débil",
+    "tokenInvalid": "Token inválido o expirado",
+    "deviceNotTrusted": "Dispositivo no confiable. Por favor verifica tu dispositivo."
   },
   "family": {
-    "limitExceeded": "Family size limit exceeded",
-    "memberNotFound": "Family member not found",
-    "cannotRemoveSelf": "You cannot remove yourself from the family",
-    "insufficientPermissions": "You don't have permission to perform this action",
-    "invitationExpired": "This invitation has expired",
-    "alreadyMember": "This person is already a family member"
+    "limitExceeded": "Límite de tamaño de familia excedido",
+    "memberNotFound": "Miembro de familia no encontrado",
+    "cannotRemoveSelf": "No puedes eliminarte a ti mismo de la familia",
+    "insufficientPermissions": "No tienes permisos para realizar esta acción",
+    "invitationExpired": "Esta invitación ha expirado",
+    "alreadyMember": "Esta persona ya es miembro de la familia"
   },
   "child": {
-    "notFound": "Child profile not found",
-    "invalidAge": "Invalid age. Please check the date of birth.",
-    "limitExceeded": "You've reached the maximum number of children"
+    "notFound": "Perfil del niño no encontrado",
+    "invalidAge": "Edad inválida. Por favor verifica la fecha de nacimiento.",
+    "limitExceeded": "Has alcanzado el número máximo de niños"
   },
   "tracking": {
-    "invalidData": "Invalid tracking data",
-    "futureDate": "You cannot log activities in the future",
-    "duplicateEntry": "A similar entry already exists",
-    "invalidDuration": "Invalid duration",
-    "invalidAmount": "Invalid amount"
+    "invalidData": "Datos de seguimiento inválidos",
+    "futureDate": "No puedes registrar actividades en el futuro",
+    "duplicateEntry": "Ya existe una entrada similar",
+    "invalidDuration": "Duración inválida",
+    "invalidAmount": "Cantidad inválida"
   },
   "ai": {
-    "dailyLimitReached": "Daily AI question limit reached",
-    "contextError": "Failed to load context for AI",
-    "responseError": "Failed to generate AI response",
-    "moderationFlag": "Your message was flagged by our content moderation system"
+    "dailyLimitReached": "Límite diario de preguntas IA alcanzado",
+    "contextError": "Error al cargar contexto para IA",
+    "responseError": "Error al generar respuesta IA",
+    "moderationFlag": "Tu mensaje fue marcado por nuestro sistema de moderación de contenido"
   },
   "offline": {
-    "noConnection": "No internet connection",
-    "syncFailed": "Failed to sync data",
-    "pendingChanges": "You have pending changes that need to be synced"
+    "noConnection": "Sin conexión a internet",
+    "syncFailed": "Error al sincronizar datos",
+    "pendingChanges": "Tienes cambios pendientes que necesitan sincronizarse"
   },
   "validation": {
-    "required": "This field is required",
-    "invalidEmail": "Please enter a valid email address",
-    "invalidPhone": "Please enter a valid phone number",
-    "invalidDate": "Please enter a valid date",
-    "minLength": "Must be at least {{min}} characters",
-    "maxLength": "Must be no more than {{max}} characters",
-    "minValue": "Must be at least {{min}}",
-    "maxValue": "Must be no more than {{max}}",
-    "invalidFormat": "Invalid format",
-    "passwordMismatch": "Passwords do not match"
+    "required": "Este campo es requerido",
+    "invalidEmail": "Por favor ingresa una dirección de correo válida",
+    "invalidPhone": "Por favor ingresa un número de teléfono válido",
+    "invalidDate": "Por favor ingresa una fecha válida",
+    "minLength": "Debe tener al menos {{min}} caracteres",
+    "maxLength": "No debe tener más de {{max}} caracteres",
+    "minValue": "Debe ser al menos {{min}}",
+    "maxValue": "No debe ser más de {{max}}",
+    "invalidFormat": "Formato inválido",
+    "passwordMismatch": "Las contraseñas no coinciden"
   },
-  "retry": "Retry",
-  "goBack": "Go Back",
-  "contactSupport": "Contact Support",
-  "dismiss": "Dismiss"
-}
+  "retry": "Reintentar",
+  "goBack": "Volver",
+  "contactSupport": "Contactar Soporte",
+  "dismiss": "Descartar"
+}
\ No newline at end of file
diff --git a/maternal-web/locales/es/family.json b/maternal-web/locales/es/family.json
new file mode 100644
index 0000000..5c7d927
--- /dev/null
+++ b/maternal-web/locales/es/family.json
@@ -0,0 +1,43 @@
+{
+  "pageTitle": "Family",
+  "pageSubtitle": "Manage your family members and share access",
+  "buttons": {
+    "joinFamily": "Join Family",
+    "inviteMember": "Invite Member",
+    "copyCode": "Copy Code",
+    "inviteFirstMember": "Invite First Member"
+  },
+  "shareCode": {
+    "title": "Family Share Code",
+    "description": "Share this code with family members to give them access to your family's data"
+  },
+  "members": {
+    "title": "Family Members ({{count}})",
+    "noMembers": "No family members yet",
+    "noMembersDescription": "Invite family members to collaborate on child care",
+    "youLabel": "You",
+    "removeAriaLabel": "Remove {{name}} from family"
+  },
+  "roles": {
+    "parent": "Parent",
+    "caregiver": "Caregiver",
+    "viewer": "Viewer"
+  },
+  "messages": {
+    "shareCodeCopied": "Share code copied to clipboard!",
+    "shareCodeCopyFailed": "Failed to copy share code",
+    "invitationSent": "Invitation sent successfully!",
+    "joinedFamily": "Successfully joined family!",
+    "memberRemoved": "Member removed successfully",
+    "noFamilyFound": "No family found. Please complete onboarding first.",
+    "failedToLoad": "Failed to load family information",
+    "noFamilyId": "No family ID found",
+    "failedToInvite": "Failed to send invitation",
+    "failedToJoin": "Failed to join family",
+    "failedToRemove": "Failed to remove member"
+  },
+  "placeholders": {
+    "unknownUser": "Unknown User",
+    "noEmail": "No email"
+  }
+}
diff --git a/maternal-web/locales/es/insights.json b/maternal-web/locales/es/insights.json
new file mode 100644
index 0000000..5ab7dbd
--- /dev/null
+++ b/maternal-web/locales/es/insights.json
@@ -0,0 +1,73 @@
+{
+  "title": "Insights & Analytics",
+  "subtitle": "Track patterns and get insights about your child's activities",
+  "filters": {
+    "child": "Child",
+    "dateRange": {
+      "7days": "7 Days",
+      "30days": "30 Days",
+      "3months": "3 Months"
+    }
+  },
+  "stats": {
+    "feedings": {
+      "title": "Feedings",
+      "subtitle": "Total count"
+    },
+    "sleep": {
+      "title": "Sleep",
+      "subtitle": "Average per day"
+    },
+    "diapers": {
+      "title": "Diapers",
+      "subtitle": "Total changes"
+    },
+    "topActivity": {
+      "title": "Top Activity",
+      "subtitle": "Most frequent"
+    }
+  },
+  "charts": {
+    "feedingFrequency": "Feeding Frequency",
+    "sleepDuration": "Sleep Duration (Hours)",
+    "diaperChangesByType": "Diaper Changes by Type",
+    "activityTimeline": "Activity Timeline",
+    "activityDistribution": "Activity Distribution",
+    "chartLabels": {
+      "feedings": "Feedings",
+      "diapers": "Diapers",
+      "sleepHours": "Sleep (hrs)"
+    }
+  },
+  "recentActivities": {
+    "title": "Recent Activities (Last 20)"
+  },
+  "emptyStates": {
+    "noChildren": {
+      "title": "No Children Added",
+      "message": "Add a child to view insights and analytics",
+      "action": "Add Child"
+    },
+    "noActivities": "No activities found for the selected date range. Start tracking activities to see insights!"
+  },
+  "errors": {
+    "loadChildren": "Failed to load children",
+    "loadActivities": "Failed to load activities"
+  },
+  "activityTypes": {
+    "feeding": "Feeding",
+    "sleep": "Sleep",
+    "diaper": "Diaper",
+    "medication": "Medication",
+    "milestone": "Milestone",
+    "note": "Note",
+    "none": "None"
+  },
+  "diaperTypes": {
+    "wet": "Wet",
+    "dirty": "Dirty",
+    "both": "Both",
+    "dry": "Dry",
+    "unknown": "Unknown"
+  }
+}
diff --git a/maternal-web/locales/es/onboarding.json b/maternal-web/locales/es/onboarding.json
index 18e744c..8da9343 100644
--- a/maternal-web/locales/es/onboarding.json
+++ b/maternal-web/locales/es/onboarding.json
@@ -1,99 +1,99 @@
 {
   "welcome": {
-    "title": "Welcome to Maternal",
-    "subtitle": "Your AI-powered child care assistant",
-    "description": "Track activities, get AI-powered insights, and coordinate with your family—all in one place.",
-    "getStarted": "Get Started",
-    "skip": "Skip"
+    "title": "Bienvenido a Maternal",
+    "subtitle": "Tu asistente de cuidado infantil impulsado por IA",
+    "description": "Rastrea actividades, obtén perspectivas impulsadas por IA y coordínate con tu familia, todo en un solo lugar.",
+    "getStarted": "Comenzar",
+    "skip": "Omitir"
   },
   "language": {
-    "title": "Choose Your Language",
-    "subtitle": "Select your preferred language",
-    "description": "You can change this later in settings"
+    "title": "Elige tu Idioma",
+    "subtitle": "Selecciona tu idioma preferido",
+    "description": "Puedes cambiar esto más tarde en configuración"
   },
   "measurements": {
-    "title": "Measurement Units",
-    "subtitle": "Choose your preferred unit system",
-    "description": "Select the measurement system you're most comfortable with. You can change this later in settings.",
+    "title": "Unidades de Medida",
+    "subtitle": "Elige tu sistema de unidades preferido",
+    "description": "Selecciona el sistema de medidas con el que te sientes más cómodo. Puedes cambiar esto más tarde en configuración.",
     "metric": {
-      "title": "Metric",
-      "description": "Kilograms, centimeters, Celsius, milliliters"
+      "title": "Métrico",
+      "description": "Kilogramos, centímetros, Celsius, mililitros"
     },
     "imperial": {
       "title": "Imperial",
-      "description": "Pounds, inches, Fahrenheit, ounces"
+      "description": "Libras, pulgadas, Fahrenheit, onzas"
     }
   },
   "profile": {
-    "title": "Create Your Profile",
-    "subtitle": "Tell us about yourself",
-    "name": "Your Name",
-    "email": "Email Address",
-    "password": "Password",
-    "confirmPassword": "Confirm Password",
-    "relation": "Relation to Child",
+    "title": "Crea tu Perfil",
+    "subtitle": "Cuéntanos sobre ti",
+    "name": "Tu Nombre",
+    "email": "Dirección de Correo",
+    "password": "Contraseña",
+    "confirmPassword": "Confirmar Contraseña",
+    "relation": "Relación con el Niño",
     "relations": {
-      "mother": "Mother",
-      "father": "Father",
-      "guardian": "Guardian",
-      "caregiver": "Caregiver",
-      "other": "Other"
+      "mother": "Madre",
+      "father": "Padre",
+      "guardian": "Tutor",
+      "caregiver": "Cuidador",
+      "other": "Otro"
     }
   },
   "child": {
-    "title": "Add Your Child",
-    "subtitle": "Let's start with your first child",
-    "name": "Child's Name",
-    "dateOfBirth": "Date of Birth",
-    "gender": "Gender",
+    "title": "Agrega tu Niño",
+    "subtitle": "Comencemos con tu primer niño",
+    "name": "Nombre del Niño",
+    "dateOfBirth": "Fecha de Nacimiento",
+    "gender": "Género",
     "genders": {
-      "male": "Male",
-      "female": "Female",
-      "other": "Other",
-      "preferNotToSay": "Prefer not to say"
+      "male": "Masculino",
+      "female": "Femenino",
+      "other": "Otro",
+      "preferNotToSay": "Prefiero no decir"
     },
-    "weight": "Current Weight",
-    "height": "Current Height",
-    "addAnother": "Add Another Child",
-    "skipForNow": "Skip for Now"
+    "weight": "Peso Actual",
+    "height": "Altura Actual",
+    "addAnother": "Agregar Otro Niño",
+    "skipForNow": "Omitir por Ahora"
   },
   "family": {
-    "title": "Invite Family Members",
-    "subtitle": "Coordinate with your family",
-    "description": "Invite family members to view and track activities together. They'll receive an email invitation.",
-    "email": "Family Member's Email",
-    "role": "Role",
+    "title": "Invitar Miembros de la Familia",
+    "subtitle": "Coordínate con tu familia",
+    "description": "Invita a miembros de la familia para ver y rastrear actividades juntos. Recibirán una invitación por correo.",
+    "email": "Correo del Miembro de la Familia",
+    "role": "Rol",
     "roles": {
-      "parent": "Parent",
-      "caregiver": "Caregiver",
-      "viewer": "Viewer"
+      "parent": "Padre/Madre",
+      "caregiver": "Cuidador",
+      "viewer": "Observador"
     },
-    "addMember": "Add Member",
-    "inviteLater": "I'll Invite Later"
+    "addMember": "Agregar Miembro",
+    "inviteLater": "Invitaré Más Tarde"
   },
   "notifications": {
-    "title": "Enable Notifications",
-    "subtitle": "Stay informed",
-    "description": "Get reminders for feedings, sleep times, and important milestones.",
-    "push": "Push Notifications",
-    "email": "Email Notifications",
-    "enable": "Enable Notifications",
-    "skipForNow": "Skip for Now"
+    "title": "Habilitar Notificaciones",
+    "subtitle": "Mantente informado",
+    "description": "Recibe recordatorios para alimentaciones, horarios de sueño e hitos importantes.",
+    "push": "Notificaciones Push",
+    "email": "Notificaciones por Correo",
+    "enable": "Habilitar Notificaciones",
+    "skipForNow": "Omitir por Ahora"
   },
   "complete": {
-    "title": "All Set!",
-    "subtitle": "You're ready to start tracking",
-    "description": "Start tracking your child's activities and get personalized AI-powered insights.",
-    "startTracking": "Start Tracking",
-    "exploreDashboard": "Explore Dashboard"
+    "title": "¡Todo Listo!",
+    "subtitle": "Estás listo para comenzar a rastrear",
+    "description": "Comienza a rastrear las actividades de tu niño y obtén perspectivas personalizadas impulsadas por IA.",
+    "startTracking": "Comenzar Seguimiento",
+    "exploreDashboard": "Explorar Panel de Control"
   },
   "navigation": {
-    "next": "Next",
-    "back": "Back",
-    "skip": "Skip",
-    "finish": "Finish"
+    "next": "Siguiente",
+    "back": "Atrás",
+    "skip": "Omitir",
+    "finish": "Finalizar"
   },
   "progress": {
-    "step": "Step {{current}} of {{total}}"
+    "step": "Paso {{current}} de {{total}}"
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/es/settings.json b/maternal-web/locales/es/settings.json
index 9e7198e..e598ee7 100644
--- a/maternal-web/locales/es/settings.json
+++ b/maternal-web/locales/es/settings.json
@@ -1,108 +1,147 @@
 {
-  "title": "Settings",
+  "title": "Configuración",
   "account": {
-    "title": "Account",
-    "profile": "Profile",
-    "email": "Email",
-    "password": "Password",
-    "changePassword": "Change Password",
-    "deleteAccount": "Delete Account",
-    "confirmDelete": "Are you sure you want to delete your account? This action cannot be undone."
+    "title": "Cuenta",
+    "profile": "Perfil",
+    "email": "Correo Electrónico",
+    "password": "Contraseña",
+    "changePassword": "Cambiar Contraseña",
+    "deleteAccount": "Eliminar Cuenta",
+    "confirmDelete": "¿Estás seguro de que quieres eliminar tu cuenta? Esta acción no se puede deshacer."
   },
   "preferences": {
-    "title": "Preferences",
-    "language": "Language",
-    "measurementUnits": "Measurement Units",
-    "metric": "Metric (kg, cm, °C, ml)",
+    "title": "Preferencias",
+    "language": "Idioma",
+    "measurementUnits": "Unidades de Medida",
+    "metric": "Métrico (kg, cm, °C, ml)",
     "imperial": "Imperial (lb, in, °F, oz)",
-    "dateFormat": "Date Format",
-    "timeFormat": "Time Format",
-    "12hour": "12-hour",
-    "24hour": "24-hour",
-    "theme": "Theme",
-    "light": "Light",
-    "dark": "Dark",
-    "auto": "Auto (System)"
+    "timezone": "Zona Horaria",
+    "autoDetectTimezone": "Detectar Automáticamente",
+    "timezoneUpdated": "Zona horaria actualizada exitosamente",
+    "timezoneAutoDetected": "Zona horaria detectada automáticamente",
+    "dateFormat": "Formato de Fecha",
+    "timeFormat": "Formato de Hora",
+    "12hour": "Formato de 12 horas",
+    "24hour": "Formato de 24 horas",
+    "timeFormatUpdated": "Formato de hora actualizado exitosamente",
+    "theme": "Tema",
+    "light": "Claro",
+    "dark": "Oscuro",
+    "auto": "Automático (Sistema)"
   },
   "notifications": {
-    "title": "Notifications",
-    "push": "Push Notifications",
-    "email": "Email Notifications",
-    "feedingReminders": "Feeding Reminders",
-    "sleepReminders": "Sleep Reminders",
-    "milestoneAlerts": "Milestone Alerts",
-    "familyUpdates": "Family Updates",
-    "aiSuggestions": "AI Suggestions"
+    "title": "Notificaciones",
+    "push": "Notificaciones Push",
+    "email": "Notificaciones por Correo",
+    "feedingReminders": "Recordatorios de Alimentación",
+    "sleepReminders": "Recordatorios de Sueño",
+    "milestoneAlerts": "Alertas de Hitos",
+    "familyUpdates": "Actualizaciones Familiares",
+    "aiSuggestions": "Sugerencias de IA"
   },
   "privacy": {
-    "title": "Privacy & Security",
-    "dataSharing": "Data Sharing",
-    "familyAccess": "Family Access",
-    "biometric": "Biometric Authentication",
-    "enableFaceId": "Enable Face ID",
-    "enableTouchId": "Enable Touch ID",
-    "enableFingerprint": "Enable Fingerprint",
-    "dataExport": "Export Data",
-    "downloadData": "Download Your Data"
+    "title": "Privacidad y Seguridad",
+    "dataSharing": "Compartir Datos",
+    "familyAccess": "Acceso Familiar",
+    "biometric": "Autenticación Biométrica",
+    "enableFaceId": "Habilitar Face ID",
+    "enableTouchId": "Habilitar Touch ID",
+    "enableFingerprint": "Habilitar Huella Digital",
+    "dataExport": "Exportar Datos",
+    "downloadData": "Descargar tus Datos"
   },
   "family": {
-    "title": "Family",
-    "members": "Family Members",
-    "inviteMember": "Invite Member",
-    "removeMember": "Remove Member",
-    "permissions": "Permissions",
-    "role": "Role",
+    "title": "Familia",
+    "members": "Miembros de la Familia",
+    "inviteMember": "Invitar Miembro",
+    "removeMember": "Eliminar Miembro",
+    "permissions": "Permisos",
+    "role": "Rol",
     "roles": {
-      "admin": "Admin",
-      "parent": "Parent",
-      "caregiver": "Caregiver",
-      "viewer": "Viewer"
+      "admin": "Administrador",
+      "parent": "Padre/Madre",
+      "caregiver": "Cuidador",
+      "viewer": "Observador"
     }
   },
   "children": {
-    "title": "Children",
-    "addChild": "Add Child",
-    "editChild": "Edit Child",
-    "removeChild": "Remove Child",
-    "name": "Name",
-    "dateOfBirth": "Date of Birth",
-    "gender": "Gender",
+    "title": "Niños",
+    "addChild": "Agregar Niño",
+    "editChild": "Editar Niño",
+    "removeChild": "Eliminar Niño",
+    "name": "Nombre",
+    "dateOfBirth": "Fecha de Nacimiento",
+    "gender": "Género",
     "genders": {
-      "male": "Male",
-      "female": "Female",
-      "other": "Other",
-      "preferNotToSay": "Prefer not to say"
+      "male": "Masculino",
+      "female": "Femenino",
+      "other": "Otro",
+      "preferNotToSay": "Prefiero no decir"
     }
   },
   "subscription": {
-    "title": "Subscription",
-    "plan": "Current Plan",
-    "free": "Free",
+    "title": "Suscripción",
+    "plan": "Plan Actual",
+    "free": "Gratuito",
     "premium": "Premium",
-    "upgradeToPremium": "Upgrade to Premium",
-    "manageBilling": "Manage Billing",
-    "cancelSubscription": "Cancel Subscription",
-    "renewalDate": "Renewal Date",
+    "upgradeToPremium": "Actualizar a Premium",
+    "manageBilling": "Gestionar Facturación",
+    "cancelSubscription": "Cancelar Suscripción",
+    "renewalDate": "Fecha de Renovación",
     "features": {
-      "unlimitedAi": "Unlimited AI questions",
-      "familySync": "Family sync",
-      "advancedAnalytics": "Advanced analytics",
-      "exportReports": "Export reports",
-      "prioritySupport": "Priority support"
+      "unlimitedAi": "Preguntas IA ilimitadas",
+      "familySync": "Sincronización familiar",
+      "advancedAnalytics": "Análisis avanzados",
+      "exportReports": "Exportar reportes",
+      "prioritySupport": "Soporte prioritario"
     }
   },
   "about": {
-    "title": "About",
-    "version": "Version",
-    "termsOfService": "Terms of Service",
-    "privacyPolicy": "Privacy Policy",
-    "helpCenter": "Help Center",
-    "contactSupport": "Contact Support",
-    "rateApp": "Rate App",
-    "shareApp": "Share App"
+    "title": "Acerca de",
+    "version": "Versión",
+    "termsOfService": "Términos de Servicio",
+    "privacyPolicy": "Política de Privacidad",
+    "helpCenter": "Centro de Ayuda",
+    "contactSupport": "Contactar Soporte",
+    "rateApp": "Calificar App",
+    "shareApp": "Compartir App"
   },
-  "save": "Save Changes",
-  "saved": "Settings saved successfully",
-  "cancel": "Cancel",
-  "reset": "Reset to Default"
-}
+  "profile": {
+    "title": "Información del Perfil",
+    "name": "Nombre",
+    "nameRequired": "El nombre no puede estar vacío",
+    "email": "Correo Electrónico",
+    "emailNotEditable": "El correo no se puede cambiar"
+  },
+  "appearance": {
+    "title": "Apariencia",
+    "darkMode": "Modo Oscuro (Próximamente)"
+  },
+  "security": {
+    "title": "Seguridad"
+  },
+  "sessions": {
+    "title": "Sesiones"
+  },
+  "deviceTrust": {
+    "title": "Confianza del Dispositivo"
+  },
+  "biometric": {
+    "title": "Autenticación Biométrica"
+  },
+  "dataExport": {
+    "title": "Exportación de Datos"
+  },
+  "accountDeletion": {
+    "title": "Eliminación de Cuenta"
+  },
+  "accountActions": {
+    "title": "Acciones de Cuenta",
+    "logout": "Cerrar Sesión"
+  },
+  "save": "Guardar Preferencias",
+  "saving": "Guardando...",
+  "saved": "¡Configuración guardada exitosamente!",
+  "cancel": "Cancelar",
+  "reset": "Restablecer por Defecto"
+}
\ No newline at end of file
diff --git a/maternal-web/locales/es/tracking.json b/maternal-web/locales/es/tracking.json
index ffa244b..e4ef445 100644
--- a/maternal-web/locales/es/tracking.json
+++ b/maternal-web/locales/es/tracking.json
@@ -1,7 +1,7 @@
 {
   "title": "Seguimiento de Actividades",
-  "trackActivity": "Registrar Actividad",
-  "selectActivity": "Selecciona una actividad para registrar",
+  "trackActivity": "Rastrear Actividad",
+  "selectActivity": "Selecciona una actividad para rastrear",
   "activities": {
     "feeding": "Alimentación",
     "sleep": "Sueño",
@@ -10,128 +10,270 @@
     "activity": "Actividad"
   },
   "feeding": {
-    "title": "Feeding",
-    "addFeeding": "Add Feeding",
-    "type": "Feeding Type",
+    "title": "Alimentación",
+    "addFeeding": "Agregar Alimentación",
+    "type": "Tipo de Alimentación",
     "types": {
-      "breast": "Breast",
-      "bottle": "Bottle",
-      "solid": "Solid Food"
+      "breast": "Pecho",
+      "bottle": "Biberón",
+      "solid": "Comida Sólida"
     },
-    "side": "Side",
+    "side": "Lado",
     "sides": {
-      "left": "Left",
-      "right": "Right",
-      "both": "Both"
+      "left": "Izquierdo",
+      "right": "Derecho",
+      "both": "Ambos"
     },
-    "amount": "Amount",
-    "duration": "Duration",
-    "startTime": "Start Time",
-    "endTime": "End Time",
-    "notes": "Notes",
+    "amount": "Cantidad",
+    "duration": "Duración",
+    "startTime": "Iniciar Cronómetro",
+    "endTime": "Detener Cronómetro",
+    "reset": "Reiniciar",
+    "notes": "Notas",
+    "bottleType": "Tipo de Biberón",
+    "bottleTypes": {
+      "formula": "Fórmula",
+      "breastmilk": "Leche Materna",
+      "other": "Otro"
+    },
+    "foodDescription": "Descripción de Comida",
+    "amountDescription": "Descripción de Cantidad",
     "placeholders": {
-      "amount": "Enter amount",
-      "notes": "Add any notes about this feeding..."
+      "amount": "Ingresa cantidad",
+      "notes": "Agrega notas sobre esta alimentación...",
+      "duration": "O ingresa duración manualmente",
+      "foodDescription": "ej., Cereal de arroz, Puré de plátano",
+      "amountDescription": "ej., 1/4 taza, 2 cucharadas"
     },
     "units": {
       "ml": "ml",
       "oz": "oz",
-      "minutes": "minutes"
+      "minutes": "minutos"
+    },
+    "validation": {
+      "durationRequired": "Por favor ingresa duración o usa el cronómetro",
+      "amountRequired": "Por favor ingresa cantidad",
+      "foodRequired": "Por favor ingresa descripción de comida"
+    },
+    "success": "¡Alimentación registrada exitosamente!",
+    "deleted": "Alimentación eliminada exitosamente",
+    "recentFeedings": "Alimentaciones Recientes",
+    "error": {
+      "saveFailed": "Error al guardar alimentación",
+      "deleteFailed": "Error al eliminar alimentación"
     }
   },
   "sleep": {
-    "title": "Sleep",
-    "addSleep": "Add Sleep",
-    "startTime": "Sleep Start",
-    "endTime": "Sleep End",
-    "duration": "Duration",
-    "quality": "Quality",
+    "title": "Sueño",
+    "addSleep": "Agregar Sueño",
+    "logSleep": "Registrar Sueño",
+    "startTime": "Inicio de Sueño",
+    "endTime": "Fin de Sueño",
+    "duration": "Duración",
+    "quality": "Calidad",
     "qualities": {
-      "poor": "Poor",
-      "fair": "Fair",
-      "good": "Good",
-      "excellent": "Excellent"
+      "poor": "Pobre",
+      "fair": "Regular",
+      "good": "Buena",
+      "excellent": "Excelente"
     },
-    "notes": "Notes",
+    "location": "Ubicación",
+    "locations": {
+      "crib": "Cuna",
+      "bed": "Cama",
+      "stroller": "Cochecito",
+      "carrier": "Portabebés",
+      "other": "Otro"
+    },
+    "status": {
+      "title": "Estado del Sueño",
+      "completed": "Completado (tiene hora de fin)",
+      "ongoing": "En curso (aún durmiendo)"
+    },
+    "now": "Ahora",
+    "notes": "Notas",
     "placeholders": {
-      "notes": "Add any notes about this sleep session..."
-    }
+      "notes": "Agrega notas sobre esta sesión de sueño..."
+    },
+    "recentSleeps": "Sueños Recientes",
+    "success": "¡Sueño registrado exitosamente!",
+    "deleted": "Sueño eliminado exitosamente",
+    "ongoing_duration": "En curso - {{duration}}"
   },
   "diaper": {
-    "title": "Diaper",
-    "addDiaper": "Add Diaper Change",
-    "type": "Type",
+    "title": "Pañal",
+    "addDiaper": "Agregar Cambio de Pañal",
+    "logDiaper": "Registrar Cambio de Pañal",
+    "type": "Tipo",
     "types": {
-      "wet": "Wet",
-      "dirty": "Dirty",
-      "both": "Both",
-      "dry": "Dry"
+      "wet": "Mojado",
+      "dirty": "Sucio",
+      "both": "Ambos",
+      "dry": "Seco"
     },
-    "time": "Time",
-    "notes": "Notes",
+    "time": "Hora",
+    "now": "Ahora",
+    "conditions": {
+      "title": "Condiciones",
+      "normal": "Normal",
+      "soft": "Suave",
+      "hard": "Duro",
+      "watery": "Aguado",
+      "mucus": "Mucosidad",
+      "blood": "Sangre"
+    },
+    "rash": {
+      "title": "Tiene Sarpullido",
+      "yes": "Sí",
+      "no": "No",
+      "severity": "Severidad del Sarpullido",
+      "alert": "Sarpullido de pañal detectado. Considera aplicar crema para sarpullido y consultar a tu pediatra si persiste.",
+      "severities": {
+        "mild": "Leve",
+        "moderate": "Moderado",
+        "severe": "Severo"
+      }
+    },
+    "notes": "Notas",
     "placeholders": {
-      "notes": "Add any notes about this diaper change..."
-    }
+      "notes": "Agrega notas sobre este cambio de pañal..."
+    },
+    "recentDiapers": "Cambios de Pañal Recientes",
+    "success": "¡Cambio de pañal registrado exitosamente!",
+    "deleted": "Cambio de pañal eliminado exitosamente"
   },
   "milestone": {
-    "title": "Milestone",
-    "addMilestone": "Add Milestone",
-    "category": "Category",
+    "title": "Hito",
+    "addMilestone": "Agregar Hito",
+    "category": "Categoría",
     "categories": {
-      "physical": "Physical",
-      "cognitive": "Cognitive",
+      "physical": "Físico",
+      "cognitive": "Cognitivo",
       "social": "Social",
-      "language": "Language"
+      "language": "Lenguaje"
     },
-    "description": "Description",
-    "date": "Date",
-    "notes": "Notes",
+    "description": "Descripción",
+    "date": "Fecha",
+    "notes": "Notas",
     "placeholders": {
-      "description": "Describe the milestone...",
-      "notes": "Add any additional notes..."
+      "description": "Describe el hito...",
+      "notes": "Agrega notas adicionales..."
     }
   },
   "health": {
-    "title": "Health",
-    "addHealth": "Add Health Record",
-    "type": "Type",
+    "title": "Salud",
+    "addHealth": "Agregar Registro de Salud",
+    "type": "Tipo",
     "types": {
-      "temperature": "Temperature",
-      "medication": "Medication",
-      "symptom": "Symptom",
-      "doctor": "Doctor Visit"
+      "temperature": "Temperatura",
+      "medication": "Medicamento",
+      "symptom": "Síntoma",
+      "doctor": "Visita al Doctor"
     },
-    "temperature": "Temperature",
-    "medication": "Medication",
-    "dosage": "Dosage",
-    "symptom": "Symptom",
-    "severity": "Severity",
+    "temperature": "Temperatura",
+    "medication": "Medicamento",
+    "medicineInfo": "Información del Medicamento",
+    "medicineName": {
+      "label": "Nombre del Medicamento",
+      "placeholder": "ej., Acetaminofén, Ibuprofeno",
+      "required": "Por favor ingresa nombre del medicamento"
+    },
+    "dosage": {
+      "label": "Dosis",
+      "placeholder": "ej., 5, 2.5",
+      "required": "Por favor ingresa dosis"
+    },
+    "unit": "Unidad",
+    "route": {
+      "label": "Vía",
+      "oral": "Oral",
+      "topical": "Tópica",
+      "injection": "Inyección",
+      "other": "Otra"
+    },
+    "reason": {
+      "label": "Razón (opcional)",
+      "placeholder": "ej., Fiebre, Dolor, Alergia"
+    },
+    "logMedicine": "Registrar Medicamento",
+    "recentMedicines": "Medicamentos Recientes",
+    "success": "¡Medicamento registrado exitosamente!",
+    "error": "Error al guardar medicamento",
+    "deleted": "Medicamento eliminado exitosamente",
+    "deleteError": "Error al eliminar medicamento",
+    "symptom": "Síntoma",
+    "severity": "Severidad",
     "severities": {
-      "mild": "Mild",
-      "moderate": "Moderate",
-      "severe": "Severe"
+      "mild": "Leve",
+      "moderate": "Moderado",
+      "severe": "Severo"
     },
-    "notes": "Notes",
+    "notes": "Notas",
     "placeholders": {
-      "medication": "Medication name",
-      "dosage": "Dosage amount",
-      "symptom": "Describe symptom",
-      "notes": "Add any notes..."
+      "medication": "Nombre del medicamento",
+      "dosage": "Cantidad de dosis",
+      "symptom": "Describe síntoma",
+      "notes": "Agrega notas..."
     },
     "units": {
+      "ml": "ml",
+      "mg": "mg",
+      "tsp": "cdta",
+      "tbsp": "cda",
+      "drops": "gotas",
+      "tablet": "tableta(s)",
       "celsius": "°C",
       "fahrenheit": "°F"
     }
   },
-  "quickLog": "Quick Log",
-  "viewHistory": "View History",
-  "editEntry": "Edit Entry",
-  "deleteEntry": "Delete Entry",
-  "confirmDelete": "Are you sure you want to delete this entry?",
-  "filterByType": "Filter by Type",
-  "filterByChild": "Filter by Child",
-  "sortByNewest": "Newest First",
-  "sortByOldest": "Oldest First",
-  "noEntries": "No entries yet",
-  "addFirstEntry": "Add your first entry to start tracking"
-}
+  "activity": {
+    "title": "Actividad",
+    "addActivity": "Agregar Actividad",
+    "logActivity": "Registrar Actividad",
+    "type": "Tipo de Actividad",
+    "types": {
+      "play": "Juego",
+      "tummyTime": "Tiempo Boca Abajo",
+      "walk": "Paseo",
+      "music": "Música",
+      "reading": "Lectura",
+      "outdoor": "Juego al Aire Libre",
+      "other": "Otro"
+    },
+    "duration": "Duración (minutos)",
+    "description": "Descripción",
+    "notes": "Notas",
+    "placeholders": {
+      "duration": "Ingresa duración en minutos",
+      "description": "Describe la actividad...",
+      "notes": "Agrega notas..."
+    },
+    "recentActivities": "Actividades Recientes",
+    "success": "¡Actividad registrada exitosamente!",
+    "deleted": "Actividad eliminada exitosamente"
+  },
+  "common": {
+    "selectChild": "Seleccionar Niño",
+    "cancel": "Cancelar",
+    "delete": "Eliminar",
+    "loading": "Cargando...",
+    "noChildrenAdded": "No se han Agregado Niños",
+    "noChildrenMessage": "Necesitas agregar un niño antes de poder rastrear actividades",
+    "addChild": "Agregar Niño",
+    "recentActivities": "Actividades Recientes",
+    "error": {
+      "loadChildrenFailed": "Error al cargar niños"
+    }
+  },
+  "quickLog": "Registro Rápido",
+  "viewHistory": "Ver Historial",
+  "editEntry": "Editar Entrada",
+  "deleteEntry": "Eliminar Entrada",
+  "confirmDelete": "¿Estás seguro de que quieres eliminar esta entrada?",
+  "filterByType": "Filtrar por Tipo",
+  "filterByChild": "Filtrar por Niño",
+  "sortByNewest": "Más Reciente Primero",
+  "sortByOldest": "Más Antiguo Primero",
+  "noEntries": "Aún no hay entradas",
+  "addFirstEntry": "Agrega tu primera entrada para comenzar el seguimiento"
+}
\ No newline at end of file
diff --git a/maternal-web/locales/fr/ai.json b/maternal-web/locales/fr/ai.json
index 37eba91..886f510 100644
--- a/maternal-web/locales/fr/ai.json
+++ b/maternal-web/locales/fr/ai.json
@@ -1,62 +1,107 @@
 {
-  "title": "AI Assistant",
-  "subtitle": "24/7 Parenting Support",
+  "title": "Assistant IA",
+  "subtitle": "Support Parental 24h/24 et 7j/7",
   "chat": {
-    "placeholder": "Ask me anything about parenting...",
-    "send": "Send",
-    "listening": "Listening...",
-    "processing": "Processing...",
-    "thinking": "Thinking...",
-    "typing": "AI is typing...",
-    "voiceInput": "Voice Input",
-    "textInput": "Text Input",
-    "newChat": "New Chat",
-    "clearChat": "Clear Chat",
-    "confirmClear": "Are you sure you want to clear this chat?",
-    "noMessages": "No messages yet",
-    "startConversation": "Start a conversation with your AI assistant"
+    "placeholder": "Posez-moi n'importe quelle question sur la parentalité...",
+    "send": "Envoyer",
+    "listening": "Écoute...",
+    "processing": "Traitement...",
+    "thinking": "Réflexion...",
+    "typing": "L'IA tape...",
+    "voiceInput": "Saisie Vocale",
+    "textInput": "Saisie Texte",
+    "newChat": "Nouvelle Conversation",
+    "clearChat": "Effacer la Conversation",
+    "confirmClear": "Êtes-vous sûr de vouloir effacer cette conversation ?",
+    "noMessages": "Aucun message pour le moment",
+    "startConversation": "Commencez une conversation avec votre assistant IA"
   },
   "suggestions": {
-    "title": "Suggested Questions",
-    "sleepPattern": "How can I improve my baby's sleep pattern?",
-    "feeding": "How much should my baby be eating?",
-    "development": "What milestones should I expect this month?",
-    "health": "When should I be concerned about a fever?"
+    "title": "Questions Suggérées",
+    "sleepPattern": "Comment puis-je améliorer le rythme de sommeil de mon bébé ?",
+    "feeding": "Combien mon bébé devrait-il manger ?",
+    "development": "Quels jalons dois-je attendre ce mois-ci ?",
+    "health": "Quand dois-je m'inquiéter de la fièvre ?"
   },
   "context": {
-    "analyzing": "Analyzing your child's patterns...",
-    "usingRecent": "Using recent activity data",
-    "basedOn": "Based on {{childName}}'s profile"
+    "analyzing": "Analyse des habitudes de votre enfant...",
+    "usingRecent": "Utilisation des données d'activité récentes",
+    "basedOn": "Basé sur le profil de {{childName}}"
   },
   "disclaimer": {
-    "title": "Important Disclaimer",
-    "message": "This AI assistant provides general parenting guidance and is not a substitute for professional medical advice. Always consult with your pediatrician for medical concerns.",
-    "emergency": "In case of emergency, call emergency services immediately.",
-    "understand": "I Understand"
+    "title": "Avertissement Important",
+    "message": "Cet assistant IA fournit des conseils généraux sur la parentalité et ne remplace pas les conseils médicaux professionnels. Consultez toujours votre pédiatre pour les préoccupations médicales.",
+    "emergency": "En cas d'urgence, appelez immédiatement les services d'urgence.",
+    "understand": "Je Comprends"
   },
   "limits": {
-    "dailyLimit": "Daily question limit reached",
-    "dailyLimitMessage": "You've reached your daily limit of {{limit}} questions. Upgrade to premium for unlimited access.",
-    "upgrade": "Upgrade to Premium"
+    "dailyLimit": "Limite quotidienne de questions atteinte",
+    "dailyLimitMessage": "Vous avez atteint votre limite quotidienne de {{limit}} questions. Passez à premium pour un accès illimité.",
+    "upgrade": "Passer à Premium"
   },
   "history": {
-    "title": "Chat History",
-    "today": "Today",
-    "yesterday": "Yesterday",
-    "thisWeek": "This Week",
-    "older": "Older",
-    "noHistory": "No chat history",
-    "delete": "Delete Chat",
-    "confirmDelete": "Are you sure you want to delete this chat?"
+    "title": "Historique des Conversations",
+    "today": "Aujourd'hui",
+    "yesterday": "Hier",
+    "thisWeek": "Cette Semaine",
+    "older": "Plus Ancien",
+    "noHistory": "Aucun historique de conversation",
+    "delete": "Supprimer la Conversation",
+    "confirmDelete": "Êtes-vous sûr de vouloir supprimer cette conversation ?"
   },
   "topics": {
-    "sleep": "Sleep",
-    "feeding": "Feeding",
-    "development": "Development",
-    "health": "Health",
-    "behavior": "Behavior",
-    "safety": "Safety",
+    "sleep": "Sommeil",
+    "feeding": "Alimentation",
+    "development": "Développement",
+    "health": "Santé",
+    "behavior": "Comportement",
+    "safety": "Sécurité",
     "nutrition": "Nutrition",
-    "general": "General"
+    "general": "Général"
+  },
+  "interface": {
+    "assistantTitle": "Assistant IA Parental",
+    "assistantSubtitle": "Posez-moi n'importe quelle question sur la parentalité et les soins aux enfants",
+    "greeting": "Bonjour {{name}} ! Comment puis-je vous aider aujourd'hui ?",
+    "inputPlaceholder": "Posez-moi n'importe quelle question...",
+    "closeDrawer": "Fermer le tiroir",
+    "moreOptions": "Plus d'options",
+    "deleteConversation": "Supprimer la conversation",
+    "chatCount": "{{count}} conversation",
+    "chatCount_plural": "{{count}} conversations",
+    "ungrouped": "Non groupé",
+    "errorMessage": "Désolé, j'ai rencontré une erreur. Veuillez réessayer.",
+    "disclaimerFooter": "Cet assistant IA fournit des informations générales. Consultez toujours des professionnels de la santé pour des conseils médicaux.",
+    "deleteDialogTitle": "Supprimer la Conversation",
+    "deleteDialogMessage": "Êtes-vous sûr de vouloir supprimer cette conversation ? Cette action ne peut pas être annulée.",
+    "cancel": "Annuler",
+    "delete": "Supprimer",
+    "moveToGroup": "Déplacer vers le Groupe",
+    "createNewGroup": "Créer un Nouveau Groupe",
+    "groupNameLabel": "Nom du Groupe",
+    "create": "Créer",
+    "suggestedQuestion1": "Combien de temps mon bébé devrait-il dormir à 3 mois ?",
+    "suggestedQuestion2": "Quels sont les rythmes d'alimentation normaux ?",
+    "suggestedQuestion3": "Quand dois-je introduire les aliments solides ?",
+    "suggestedQuestion4": "Conseils pour une meilleure routine de sommeil",
+    "thinking1": "Rassemblement de la sagesse des bébés...",
+    "thinking2": "Consultation des livres pour bébés...",
+    "thinking3": "Préparation de la réponse parfaite...",
+    "thinking4": "Réchauffement de quelques conseils...",
+    "thinking5": "Préparation de votre biberon de connaissances...",
+    "thinking6": "Comptage des petits doigts et orteils...",
+    "thinking7": "Connexion des blocs de construction...",
+    "thinking8": "Coup d'œil dans la boîte à jouets...",
+    "thinking9": "Organisation des pièces du puzzle...",
+    "thinking10": "Mélange du pot de nourriture pour bébé...",
+    "thinking11": "Polissage de la tétine de sagesse...",
+    "thinking12": "Marche sur la pointe des pieds pendant la sieste...",
+    "thinking13": "Organisation du sac à langer...",
+    "thinking14": "Emballage de votre réponse avec amour...",
+    "thinking15": "Préparation d'une tasse chaude de conseils...",
+    "thinking16": "Tricotage de quelques pensées...",
+    "thinking17": "Arrangement des détails...",
+    "thinking18": "Saupoudrage d'un peu de poudre magique...",
+    "thinking19": "Fredonnement d'une berceuse en réfléchissant..."
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/fr/auth.json b/maternal-web/locales/fr/auth.json
index b88be82..8fa5055 100644
--- a/maternal-web/locales/fr/auth.json
+++ b/maternal-web/locales/fr/auth.json
@@ -1,88 +1,88 @@
 {
   "login": {
-    "title": "Welcome Back",
-    "subtitle": "Sign in to your account",
-    "email": "Email",
-    "password": "Password",
-    "rememberMe": "Remember me",
-    "forgotPassword": "Forgot password?",
-    "submit": "Sign In",
-    "noAccount": "Don't have an account?",
-    "signUp": "Sign up",
-    "or": "Or",
-    "continueWithGoogle": "Continue with Google",
-    "continueWithApple": "Continue with Apple",
+    "title": "Bon Retour",
+    "subtitle": "Connectez-vous à votre compte",
+    "email": "E-mail",
+    "password": "Mot de Passe",
+    "rememberMe": "Se souvenir de moi",
+    "forgotPassword": "Mot de passe oublié ?",
+    "submit": "Se Connecter",
+    "noAccount": "Vous n'avez pas de compte ?",
+    "signUp": "S'inscrire",
+    "or": "Ou",
+    "continueWithGoogle": "Continuer avec Google",
+    "continueWithApple": "Continuer avec Apple",
     "biometric": {
-      "useFaceId": "Use Face ID",
-      "useTouchId": "Use Touch ID",
-      "useFingerprint": "Use Fingerprint"
+      "useFaceId": "Utiliser Face ID",
+      "useTouchId": "Utiliser Touch ID",
+      "useFingerprint": "Utiliser l'Empreinte Digitale"
     }
   },
   "signup": {
-    "title": "Create Account",
-    "subtitle": "Join Maternal today",
-    "name": "Full Name",
-    "email": "Email",
-    "password": "Password",
-    "confirmPassword": "Confirm Password",
-    "agreeToTerms": "I agree to the {{termsLink}} and {{privacyLink}}",
-    "termsOfService": "Terms of Service",
-    "privacyPolicy": "Privacy Policy",
-    "submit": "Create Account",
-    "hasAccount": "Already have an account?",
-    "signIn": "Sign in",
-    "or": "Or",
-    "continueWithGoogle": "Continue with Google",
-    "continueWithApple": "Continue with Apple"
+    "title": "Créer un Compte",
+    "subtitle": "Rejoignez Maternal aujourd'hui",
+    "name": "Nom Complet",
+    "email": "E-mail",
+    "password": "Mot de Passe",
+    "confirmPassword": "Confirmer le Mot de Passe",
+    "agreeToTerms": "J'accepte les {{termsLink}} et la {{privacyLink}}",
+    "termsOfService": "Conditions d'Utilisation",
+    "privacyPolicy": "Politique de Confidentialité",
+    "submit": "Créer un Compte",
+    "hasAccount": "Vous avez déjà un compte ?",
+    "signIn": "Se connecter",
+    "or": "Ou",
+    "continueWithGoogle": "Continuer avec Google",
+    "continueWithApple": "Continuer avec Apple"
   },
   "forgotPassword": {
-    "title": "Reset Password",
-    "subtitle": "Enter your email to receive a reset link",
-    "email": "Email",
-    "submit": "Send Reset Link",
-    "backToLogin": "Back to login",
-    "success": "Reset link sent! Check your email.",
-    "checkEmail": "We've sent a password reset link to {{email}}"
+    "title": "Réinitialiser le Mot de Passe",
+    "subtitle": "Entrez votre e-mail pour recevoir un lien de réinitialisation",
+    "email": "E-mail",
+    "submit": "Envoyer le Lien de Réinitialisation",
+    "backToLogin": "Retour à la connexion",
+    "success": "Lien de réinitialisation envoyé ! Vérifiez votre e-mail.",
+    "checkEmail": "Nous avons envoyé un lien de réinitialisation de mot de passe à {{email}}"
   },
   "resetPassword": {
-    "title": "Create New Password",
-    "subtitle": "Enter your new password",
-    "password": "New Password",
-    "confirmPassword": "Confirm Password",
-    "submit": "Reset Password",
-    "success": "Password reset successfully!",
-    "backToLogin": "Back to login"
+    "title": "Créer un Nouveau Mot de Passe",
+    "subtitle": "Entrez votre nouveau mot de passe",
+    "password": "Nouveau Mot de Passe",
+    "confirmPassword": "Confirmer le Mot de Passe",
+    "submit": "Réinitialiser le Mot de Passe",
+    "success": "Mot de passe réinitialisé avec succès !",
+    "backToLogin": "Retour à la connexion"
   },
   "verification": {
-    "title": "Verify Your Email",
-    "subtitle": "We've sent a verification code to {{email}}",
-    "code": "Verification Code",
-    "submit": "Verify",
-    "resend": "Resend Code",
-    "resendIn": "Resend in {{seconds}}s",
-    "success": "Email verified successfully!",
-    "didNotReceive": "Didn't receive the code?"
+    "title": "Vérifiez votre E-mail",
+    "subtitle": "Nous avons envoyé un code de vérification à {{email}}",
+    "code": "Code de Vérification",
+    "submit": "Vérifier",
+    "resend": "Renvoyer le Code",
+    "resendIn": "Renvoyer dans {{seconds}}s",
+    "success": "E-mail vérifié avec succès !",
+    "didNotReceive": "Vous n'avez pas reçu le code ?"
   },
   "errors": {
-    "invalidEmail": "Please enter a valid email address",
-    "invalidPassword": "Password must be at least 8 characters",
-    "passwordMismatch": "Passwords do not match",
-    "emailRequired": "Email is required",
-    "passwordRequired": "Password is required",
-    "nameRequired": "Name is required",
-    "termsRequired": "You must agree to the terms and privacy policy",
-    "invalidCredentials": "Invalid email or password",
-    "emailExists": "An account with this email already exists",
-    "weakPassword": "Password is too weak. Please use a stronger password.",
-    "networkError": "Network error. Please try again.",
-    "unknownError": "An error occurred. Please try again."
+    "invalidEmail": "Veuillez entrer une adresse e-mail valide",
+    "invalidPassword": "Le mot de passe doit contenir au moins 8 caractères",
+    "passwordMismatch": "Les mots de passe ne correspondent pas",
+    "emailRequired": "L'e-mail est requis",
+    "passwordRequired": "Le mot de passe est requis",
+    "nameRequired": "Le nom est requis",
+    "termsRequired": "Vous devez accepter les conditions et la politique de confidentialité",
+    "invalidCredentials": "E-mail ou mot de passe invalide",
+    "emailExists": "Un compte avec cet e-mail existe déjà",
+    "weakPassword": "Le mot de passe est trop faible. Veuillez utiliser un mot de passe plus fort.",
+    "networkError": "Erreur réseau. Veuillez réessayer.",
+    "unknownError": "Une erreur s'est produite. Veuillez réessayer."
   },
   "passwordRequirements": {
-    "title": "Password must contain:",
-    "minLength": "At least 8 characters",
-    "uppercase": "At least one uppercase letter",
-    "lowercase": "At least one lowercase letter",
-    "number": "At least one number",
-    "special": "At least one special character"
+    "title": "Le mot de passe doit contenir :",
+    "minLength": "Au moins 8 caractères",
+    "uppercase": "Au moins une lettre majuscule",
+    "lowercase": "Au moins une lettre minuscule",
+    "number": "Au moins un chiffre",
+    "special": "Au moins un caractère spécial"
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/fr/children.json b/maternal-web/locales/fr/children.json
index c1c97a9..6471567 100644
--- a/maternal-web/locales/fr/children.json
+++ b/maternal-web/locales/fr/children.json
@@ -13,8 +13,29 @@
     "female": "Féminin",
     "other": "Autre"
   },
+  "dialog": {
+    "name": "Nom",
+    "birthDate": "Date de Naissance",
+    "gender": "Genre",
+    "photoUrl": "URL de Photo (Optionnel)",
+    "photoPlaceholder": "https://example.com/photo.jpg",
+    "cancel": "Annuler",
+    "add": "Ajouter",
+    "update": "Mettre à Jour",
+    "saving": "Enregistrement...",
+    "delete": "Supprimer",
+    "deleting": "Suppression...",
+    "confirmDelete": "Confirmer la Suppression",
+    "confirmDeleteMessage": "Êtes-vous sûr de vouloir supprimer",
+    "confirmDeleteWarning": "Cette action ne peut pas être annulée. Toutes les données associées seront supprimées définitivement.",
+    "validation": {
+      "nameRequired": "Veuillez entrer un nom",
+      "birthDateRequired": "Veuillez sélectionner une date de naissance",
+      "birthDateFuture": "La date de naissance ne peut pas être dans le futur"
+    }
+  },
   "errors": {
-    "noFamily": "Aucune famille trouvée. Veuillez d'abord terminer l'intégration.",
+    "noFamily": "Aucune famille trouvée. Veuillez d'abord terminer la configuration initiale.",
     "loadFailed": "Échec du chargement des enfants",
     "saveFailed": "Échec de l'enregistrement de l'enfant",
     "deleteFailed": "Échec de la suppression de l'enfant",
@@ -26,4 +47,4 @@
     "month": "mois",
     "months": "mois"
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/fr/common.json b/maternal-web/locales/fr/common.json
index bd5c13c..4358e30 100644
--- a/maternal-web/locales/fr/common.json
+++ b/maternal-web/locales/fr/common.json
@@ -1,6 +1,6 @@
 {
   "appName": "Maternal",
-  "appDescription": "Assistant de Garde d'Enfants Alimenté par l'IA",
+  "appDescription": "Assistant de Soins Infantiles Alimenté par l'IA",
   "welcome": "Bienvenue",
   "loading": "Chargement...",
   "save": "Enregistrer",
@@ -37,14 +37,14 @@
   "login": "Connexion",
   "signup": "S'inscrire",
   "email": "E-mail",
-  "password": "Mot de passe",
+  "password": "Mot de Passe",
   "name": "Nom",
   "date": "Date",
   "time": "Heure",
   "duration": "Durée",
   "notes": "Notes",
   "optional": "Optionnel",
-  "required": "Obligatoire",
+  "required": "Requis",
   "units": {
     "metric": "Métrique",
     "imperial": "Impérial"
@@ -57,14 +57,14 @@
   },
   "navigation": {
     "home": "Accueil",
-    "dashboard": "Tableau de bord",
+    "dashboard": "Tableau de Bord",
     "tracking": "Suivi",
-    "trackActivity": "Enregistrer l'Activité",
-    "track": "Enregistrer",
+    "trackActivity": "Suivre l'Activité",
+    "track": "Suivre",
     "ai": "Assistant IA",
     "aiChat": "Chat IA",
     "family": "Famille",
-    "insights": "Analyses",
+    "insights": "Aperçus",
     "children": "Enfants",
     "settings": "Paramètres",
     "logout": "Déconnexion"
@@ -76,4 +76,4 @@
     "offline": "Hors Ligne",
     "familyMembersOnline": "{{count}} membres de la famille en ligne"
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/fr/dashboard.json b/maternal-web/locales/fr/dashboard.json
index b7766ce..df1f097 100644
--- a/maternal-web/locales/fr/dashboard.json
+++ b/maternal-web/locales/fr/dashboard.json
@@ -1,7 +1,7 @@
 {
-  "welcomeBack": "Bon retour",
-  "welcomeBackWithName": "Bon retour, {{name}}!",
-  "subtitle": "Suivez les activités de votre enfant et obtenez des informations alimentées par l'IA",
+  "welcomeBack": "Bon Retour",
+  "welcomeBackWithName": "Bon retour, {{name}} !",
+  "subtitle": "Suivez les activités de votre enfant et obtenez des aperçus alimentés par l'IA",
   "quickActions": {
     "title": "Actions Rapides",
     "feeding": "Alimentation",
@@ -27,4 +27,4 @@
     "napTime": "Heure de sieste dans {{minutes}} minutes",
     "basedOnPatterns": "Basé sur les habitudes de sommeil de votre enfant"
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/fr/errors.json b/maternal-web/locales/fr/errors.json
index 8f431e2..0ea5a46 100644
--- a/maternal-web/locales/fr/errors.json
+++ b/maternal-web/locales/fr/errors.json
@@ -1,69 +1,69 @@
 {
   "general": {
-    "unknown": "An unknown error occurred",
-    "networkError": "Network error. Please check your connection.",
-    "serverError": "Server error. Please try again later.",
-    "notFound": "The requested resource was not found",
-    "unauthorized": "You are not authorized to perform this action",
-    "forbidden": "Access denied",
-    "validation": "Please check your input and try again",
-    "timeout": "Request timed out. Please try again."
+    "unknown": "Une erreur inconnue s'est produite",
+    "networkError": "Erreur réseau. Veuillez vérifier votre connexion.",
+    "serverError": "Erreur serveur. Veuillez réessayer plus tard.",
+    "notFound": "La ressource demandée n'a pas été trouvée",
+    "unauthorized": "Vous n'êtes pas autorisé à effectuer cette action",
+    "forbidden": "Accès refusé",
+    "validation": "Veuillez vérifier votre saisie et réessayer",
+    "timeout": "Délai d'attente dépassé. Veuillez réessayer."
   },
   "auth": {
-    "invalidCredentials": "Invalid email or password",
-    "emailExists": "An account with this email already exists",
-    "emailNotVerified": "Please verify your email address",
-    "accountLocked": "Your account has been locked. Please contact support.",
-    "sessionExpired": "Your session has expired. Please sign in again.",
-    "weakPassword": "Password is too weak",
-    "tokenInvalid": "Invalid or expired token",
-    "deviceNotTrusted": "Device not trusted. Please verify your device."
+    "invalidCredentials": "E-mail ou mot de passe invalide",
+    "emailExists": "Un compte avec cet e-mail existe déjà",
+    "emailNotVerified": "Veuillez vérifier votre adresse e-mail",
+    "accountLocked": "Votre compte a été verrouillé. Veuillez contacter le support.",
+    "sessionExpired": "Votre session a expiré. Veuillez vous reconnecter.",
+    "weakPassword": "Le mot de passe est trop faible",
+    "tokenInvalid": "Jeton invalide ou expiré",
+    "deviceNotTrusted": "Appareil non fiable. Veuillez vérifier votre appareil."
   },
   "family": {
-    "limitExceeded": "Family size limit exceeded",
-    "memberNotFound": "Family member not found",
-    "cannotRemoveSelf": "You cannot remove yourself from the family",
-    "insufficientPermissions": "You don't have permission to perform this action",
-    "invitationExpired": "This invitation has expired",
-    "alreadyMember": "This person is already a family member"
+    "limitExceeded": "Limite de taille de famille dépassée",
+    "memberNotFound": "Membre de famille non trouvé",
+    "cannotRemoveSelf": "Vous ne pouvez pas vous retirer de la famille",
+    "insufficientPermissions": "Vous n'avez pas la permission d'effectuer cette action",
+    "invitationExpired": "Cette invitation a expiré",
+    "alreadyMember": "Cette personne est déjà membre de la famille"
   },
   "child": {
-    "notFound": "Child profile not found",
-    "invalidAge": "Invalid age. Please check the date of birth.",
-    "limitExceeded": "You've reached the maximum number of children"
+    "notFound": "Profil d'enfant non trouvé",
+    "invalidAge": "Âge invalide. Veuillez vérifier la date de naissance.",
+    "limitExceeded": "Vous avez atteint le nombre maximum d'enfants"
   },
   "tracking": {
-    "invalidData": "Invalid tracking data",
-    "futureDate": "You cannot log activities in the future",
-    "duplicateEntry": "A similar entry already exists",
-    "invalidDuration": "Invalid duration",
-    "invalidAmount": "Invalid amount"
+    "invalidData": "Données de suivi invalides",
+    "futureDate": "Vous ne pouvez pas enregistrer d'activités dans le futur",
+    "duplicateEntry": "Une entrée similaire existe déjà",
+    "invalidDuration": "Durée invalide",
+    "invalidAmount": "Quantité invalide"
   },
   "ai": {
-    "dailyLimitReached": "Daily AI question limit reached",
-    "contextError": "Failed to load context for AI",
-    "responseError": "Failed to generate AI response",
-    "moderationFlag": "Your message was flagged by our content moderation system"
+    "dailyLimitReached": "Limite quotidienne de questions IA atteinte",
+    "contextError": "Échec du chargement du contexte pour l'IA",
+    "responseError": "Échec de la génération de réponse IA",
+    "moderationFlag": "Votre message a été signalé par notre système de modération de contenu"
   },
   "offline": {
-    "noConnection": "No internet connection",
-    "syncFailed": "Failed to sync data",
-    "pendingChanges": "You have pending changes that need to be synced"
+    "noConnection": "Aucune connexion internet",
+    "syncFailed": "Échec de la synchronisation des données",
+    "pendingChanges": "Vous avez des modifications en attente qui doivent être synchronisées"
   },
   "validation": {
-    "required": "This field is required",
-    "invalidEmail": "Please enter a valid email address",
-    "invalidPhone": "Please enter a valid phone number",
-    "invalidDate": "Please enter a valid date",
-    "minLength": "Must be at least {{min}} characters",
-    "maxLength": "Must be no more than {{max}} characters",
-    "minValue": "Must be at least {{min}}",
-    "maxValue": "Must be no more than {{max}}",
-    "invalidFormat": "Invalid format",
-    "passwordMismatch": "Passwords do not match"
+    "required": "Ce champ est requis",
+    "invalidEmail": "Veuillez entrer une adresse e-mail valide",
+    "invalidPhone": "Veuillez entrer un numéro de téléphone valide",
+    "invalidDate": "Veuillez entrer une date valide",
+    "minLength": "Doit contenir au moins {{min}} caractères",
+    "maxLength": "Ne doit pas dépasser {{max}} caractères",
+    "minValue": "Doit être au moins {{min}}",
+    "maxValue": "Ne doit pas dépasser {{max}}",
+    "invalidFormat": "Format invalide",
+    "passwordMismatch": "Les mots de passe ne correspondent pas"
   },
-  "retry": "Retry",
-  "goBack": "Go Back",
-  "contactSupport": "Contact Support",
-  "dismiss": "Dismiss"
-}
+  "retry": "Réessayer",
+  "goBack": "Retour",
+  "contactSupport": "Contacter le Support",
+  "dismiss": "Ignorer"
+}
\ No newline at end of file
diff --git a/maternal-web/locales/fr/family.json b/maternal-web/locales/fr/family.json
new file mode 100644
index 0000000..5c7d927
--- /dev/null
+++ b/maternal-web/locales/fr/family.json
@@ -0,0 +1,43 @@
+{
+  "pageTitle": "Family",
+  "pageSubtitle": "Manage your family members and share access",
+  "buttons": {
+    "joinFamily": "Join Family",
+    "inviteMember": "Invite Member",
+    "copyCode": "Copy Code",
+    "inviteFirstMember": "Invite First Member"
+  },
+  "shareCode": {
+    "title": "Family Share Code",
+    "description": "Share this code with family members to give them access to your family's data"
+  },
+  "members": {
+    "title": "Family Members ({{count}})",
+    "noMembers": "No family members yet",
+    "noMembersDescription": "Invite family members to collaborate on child care",
+    "youLabel": "You",
+    "removeAriaLabel": "Remove {{name}} from family"
+  },
+  "roles": {
+    "parent": "Parent",
+    "caregiver": "Caregiver",
+    "viewer": "Viewer"
+  },
+  "messages": {
+    "shareCodeCopied": "Share code copied to clipboard!",
+    "shareCodeCopyFailed": "Failed to copy share code",
+    "invitationSent": "Invitation sent successfully!",
+    "joinedFamily": "Successfully joined family!",
+    "memberRemoved": "Member removed successfully",
+    "noFamilyFound": "No family found. Please complete onboarding first.",
+    "failedToLoad": "Failed to load family information",
+    "noFamilyId": "No family ID found",
+    "failedToInvite": "Failed to send invitation",
+    "failedToJoin": "Failed to join family",
+    "failedToRemove": "Failed to remove member"
+  },
+  "placeholders": {
+    "unknownUser": "Unknown User",
+    "noEmail": "No email"
+  }
+}
diff --git a/maternal-web/locales/fr/insights.json b/maternal-web/locales/fr/insights.json
new file mode 100644
index 0000000..5ab7dbd
--- /dev/null
+++ b/maternal-web/locales/fr/insights.json
@@ -0,0 +1,73 @@
+{
+  "title": "Insights & Analytics",
+  "subtitle": "Track patterns and get insights about your child's activities",
+  "filters": {
+    "child": "Child",
+    "dateRange": {
+      "7days": "7 Days",
+      "30days": "30 Days",
+      "3months": "3 Months"
+    }
+  },
+  "stats": {
+    "feedings": {
+      "title": "Feedings",
+      "subtitle": "Total count"
+    },
+    "sleep": {
+      "title": "Sleep",
+      "subtitle": "Average per day"
+    },
+    "diapers": {
+      "title": "Diapers",
+      "subtitle": "Total changes"
+    },
+    "topActivity": {
+      "title": "Top Activity",
+      "subtitle": "Most frequent"
+    }
+  },
+  "charts": {
+    "feedingFrequency": "Feeding Frequency",
+    "sleepDuration": "Sleep Duration (Hours)",
+    "diaperChangesByType": "Diaper Changes by Type",
+    "activityTimeline": "Activity Timeline",
+    "activityDistribution": "Activity Distribution",
+    "chartLabels": {
+      "feedings": "Feedings",
+      "diapers": "Diapers",
+      "sleepHours": "Sleep (hrs)"
+    }
+  },
+  "recentActivities": {
+    "title": "Recent Activities (Last 20)"
+  },
+  "emptyStates": {
+    "noChildren": {
+      "title": "No Children Added",
+      "message": "Add a child to view insights and analytics",
+      "action": "Add Child"
+    },
+    "noActivities": "No activities found for the selected date range. Start tracking activities to see insights!"
+  },
+  "errors": {
+    "loadChildren": "Failed to load children",
+    "loadActivities": "Failed to load activities"
+  },
+  "activityTypes": {
+    "feeding": "Feeding",
+    "sleep": "Sleep",
+    "diaper": "Diaper",
+    "medication": "Medication",
+    "milestone": "Milestone",
+    "note": "Note",
+    "none": "None"
+  },
+  "diaperTypes": {
+    "wet": "Wet",
+    "dirty": "Dirty",
+    "both": "Both",
+    "dry": "Dry",
+    "unknown": "Unknown"
+  }
+}
diff --git a/maternal-web/locales/fr/onboarding.json b/maternal-web/locales/fr/onboarding.json
index 18e744c..3b8e20b 100644
--- a/maternal-web/locales/fr/onboarding.json
+++ b/maternal-web/locales/fr/onboarding.json
@@ -1,99 +1,99 @@
 {
   "welcome": {
-    "title": "Welcome to Maternal",
-    "subtitle": "Your AI-powered child care assistant",
-    "description": "Track activities, get AI-powered insights, and coordinate with your family—all in one place.",
-    "getStarted": "Get Started",
-    "skip": "Skip"
+    "title": "Bienvenue sur Maternal",
+    "subtitle": "Votre assistant de soins infantiles alimenté par l'IA",
+    "description": "Suivez les activités, obtenez des aperçus alimentés par l'IA et coordonnez-vous avec votre famille, le tout en un seul endroit.",
+    "getStarted": "Commencer",
+    "skip": "Ignorer"
   },
   "language": {
-    "title": "Choose Your Language",
-    "subtitle": "Select your preferred language",
-    "description": "You can change this later in settings"
+    "title": "Choisissez Votre Langue",
+    "subtitle": "Sélectionnez votre langue préférée",
+    "description": "Vous pouvez changer cela plus tard dans les paramètres"
   },
   "measurements": {
-    "title": "Measurement Units",
-    "subtitle": "Choose your preferred unit system",
-    "description": "Select the measurement system you're most comfortable with. You can change this later in settings.",
+    "title": "Unités de Mesure",
+    "subtitle": "Choisissez votre système d'unités préféré",
+    "description": "Sélectionnez le système de mesure avec lequel vous êtes le plus à l'aise. Vous pouvez changer cela plus tard dans les paramètres.",
     "metric": {
-      "title": "Metric",
-      "description": "Kilograms, centimeters, Celsius, milliliters"
+      "title": "Métrique",
+      "description": "Kilogrammes, centimètres, Celsius, millilitres"
     },
     "imperial": {
-      "title": "Imperial",
-      "description": "Pounds, inches, Fahrenheit, ounces"
+      "title": "Impérial",
+      "description": "Livres, pouces, Fahrenheit, onces"
     }
   },
   "profile": {
-    "title": "Create Your Profile",
-    "subtitle": "Tell us about yourself",
-    "name": "Your Name",
-    "email": "Email Address",
-    "password": "Password",
-    "confirmPassword": "Confirm Password",
-    "relation": "Relation to Child",
+    "title": "Créez Votre Profil",
+    "subtitle": "Parlez-nous de vous",
+    "name": "Votre Nom",
+    "email": "Adresse E-mail",
+    "password": "Mot de Passe",
+    "confirmPassword": "Confirmer le Mot de Passe",
+    "relation": "Relation avec l'Enfant",
     "relations": {
-      "mother": "Mother",
-      "father": "Father",
-      "guardian": "Guardian",
-      "caregiver": "Caregiver",
-      "other": "Other"
+      "mother": "Mère",
+      "father": "Père",
+      "guardian": "Tuteur",
+      "caregiver": "Soignant",
+      "other": "Autre"
     }
   },
   "child": {
-    "title": "Add Your Child",
-    "subtitle": "Let's start with your first child",
-    "name": "Child's Name",
-    "dateOfBirth": "Date of Birth",
-    "gender": "Gender",
+    "title": "Ajoutez Votre Enfant",
+    "subtitle": "Commençons par votre premier enfant",
+    "name": "Nom de l'Enfant",
+    "dateOfBirth": "Date de Naissance",
+    "gender": "Genre",
     "genders": {
-      "male": "Male",
-      "female": "Female",
-      "other": "Other",
-      "preferNotToSay": "Prefer not to say"
+      "male": "Masculin",
+      "female": "Féminin",
+      "other": "Autre",
+      "preferNotToSay": "Préfère ne pas dire"
     },
-    "weight": "Current Weight",
-    "height": "Current Height",
-    "addAnother": "Add Another Child",
-    "skipForNow": "Skip for Now"
+    "weight": "Poids Actuel",
+    "height": "Taille Actuelle",
+    "addAnother": "Ajouter un Autre Enfant",
+    "skipForNow": "Ignorer pour l'Instant"
   },
   "family": {
-    "title": "Invite Family Members",
-    "subtitle": "Coordinate with your family",
-    "description": "Invite family members to view and track activities together. They'll receive an email invitation.",
-    "email": "Family Member's Email",
-    "role": "Role",
+    "title": "Inviter des Membres de la Famille",
+    "subtitle": "Coordonnez-vous avec votre famille",
+    "description": "Invitez des membres de la famille à voir et suivre les activités ensemble. Ils recevront une invitation par e-mail.",
+    "email": "E-mail du Membre de la Famille",
+    "role": "Rôle",
     "roles": {
       "parent": "Parent",
-      "caregiver": "Caregiver",
-      "viewer": "Viewer"
+      "caregiver": "Soignant",
+      "viewer": "Observateur"
     },
-    "addMember": "Add Member",
-    "inviteLater": "I'll Invite Later"
+    "addMember": "Ajouter un Membre",
+    "inviteLater": "J'Inviterai Plus Tard"
   },
   "notifications": {
-    "title": "Enable Notifications",
-    "subtitle": "Stay informed",
-    "description": "Get reminders for feedings, sleep times, and important milestones.",
-    "push": "Push Notifications",
-    "email": "Email Notifications",
-    "enable": "Enable Notifications",
-    "skipForNow": "Skip for Now"
+    "title": "Activer les Notifications",
+    "subtitle": "Restez informé",
+    "description": "Recevez des rappels pour les repas, les heures de sommeil et les jalons importants.",
+    "push": "Notifications Push",
+    "email": "Notifications E-mail",
+    "enable": "Activer les Notifications",
+    "skipForNow": "Ignorer pour l'Instant"
   },
   "complete": {
-    "title": "All Set!",
-    "subtitle": "You're ready to start tracking",
-    "description": "Start tracking your child's activities and get personalized AI-powered insights.",
-    "startTracking": "Start Tracking",
-    "exploreDashboard": "Explore Dashboard"
+    "title": "Tout est Prêt !",
+    "subtitle": "Vous êtes prêt à commencer le suivi",
+    "description": "Commencez à suivre les activités de votre enfant et obtenez des aperçus personnalisés alimentés par l'IA.",
+    "startTracking": "Commencer le Suivi",
+    "exploreDashboard": "Explorer le Tableau de Bord"
   },
   "navigation": {
-    "next": "Next",
-    "back": "Back",
-    "skip": "Skip",
-    "finish": "Finish"
+    "next": "Suivant",
+    "back": "Retour",
+    "skip": "Ignorer",
+    "finish": "Terminer"
   },
   "progress": {
-    "step": "Step {{current}} of {{total}}"
+    "step": "Étape {{current}} sur {{total}}"
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/fr/settings.json b/maternal-web/locales/fr/settings.json
index 9e7198e..540ed72 100644
--- a/maternal-web/locales/fr/settings.json
+++ b/maternal-web/locales/fr/settings.json
@@ -1,108 +1,147 @@
 {
-  "title": "Settings",
+  "title": "Paramètres",
   "account": {
-    "title": "Account",
-    "profile": "Profile",
-    "email": "Email",
-    "password": "Password",
-    "changePassword": "Change Password",
-    "deleteAccount": "Delete Account",
-    "confirmDelete": "Are you sure you want to delete your account? This action cannot be undone."
+    "title": "Compte",
+    "profile": "Profil",
+    "email": "E-mail",
+    "password": "Mot de Passe",
+    "changePassword": "Changer le Mot de Passe",
+    "deleteAccount": "Supprimer le Compte",
+    "confirmDelete": "Êtes-vous sûr de vouloir supprimer votre compte ? Cette action ne peut pas être annulée."
   },
   "preferences": {
-    "title": "Preferences",
-    "language": "Language",
-    "measurementUnits": "Measurement Units",
-    "metric": "Metric (kg, cm, °C, ml)",
-    "imperial": "Imperial (lb, in, °F, oz)",
-    "dateFormat": "Date Format",
-    "timeFormat": "Time Format",
-    "12hour": "12-hour",
-    "24hour": "24-hour",
-    "theme": "Theme",
-    "light": "Light",
-    "dark": "Dark",
-    "auto": "Auto (System)"
+    "title": "Préférences",
+    "language": "Langue",
+    "measurementUnits": "Unités de Mesure",
+    "metric": "Métrique (kg, cm, °C, ml)",
+    "imperial": "Impérial (lb, in, °F, oz)",
+    "timezone": "Fuseau Horaire",
+    "autoDetectTimezone": "Détection Automatique",
+    "timezoneUpdated": "Fuseau horaire mis à jour avec succès",
+    "timezoneAutoDetected": "Fuseau horaire détecté automatiquement",
+    "dateFormat": "Format de Date",
+    "timeFormat": "Format d'Heure",
+    "12hour": "Format 12 heures",
+    "24hour": "Format 24 heures",
+    "timeFormatUpdated": "Format d'heure mis à jour avec succès",
+    "theme": "Thème",
+    "light": "Clair",
+    "dark": "Sombre",
+    "auto": "Automatique (Système)"
   },
   "notifications": {
     "title": "Notifications",
-    "push": "Push Notifications",
-    "email": "Email Notifications",
-    "feedingReminders": "Feeding Reminders",
-    "sleepReminders": "Sleep Reminders",
-    "milestoneAlerts": "Milestone Alerts",
-    "familyUpdates": "Family Updates",
-    "aiSuggestions": "AI Suggestions"
+    "push": "Notifications Push",
+    "email": "Notifications E-mail",
+    "feedingReminders": "Rappels d'Alimentation",
+    "sleepReminders": "Rappels de Sommeil",
+    "milestoneAlerts": "Alertes de Jalons",
+    "familyUpdates": "Mises à Jour Familiales",
+    "aiSuggestions": "Suggestions IA"
   },
   "privacy": {
-    "title": "Privacy & Security",
-    "dataSharing": "Data Sharing",
-    "familyAccess": "Family Access",
-    "biometric": "Biometric Authentication",
-    "enableFaceId": "Enable Face ID",
-    "enableTouchId": "Enable Touch ID",
-    "enableFingerprint": "Enable Fingerprint",
-    "dataExport": "Export Data",
-    "downloadData": "Download Your Data"
+    "title": "Confidentialité et Sécurité",
+    "dataSharing": "Partage de Données",
+    "familyAccess": "Accès Familial",
+    "biometric": "Authentification Biométrique",
+    "enableFaceId": "Activer Face ID",
+    "enableTouchId": "Activer Touch ID",
+    "enableFingerprint": "Activer l'Empreinte Digitale",
+    "dataExport": "Exporter les Données",
+    "downloadData": "Télécharger Vos Données"
   },
   "family": {
-    "title": "Family",
-    "members": "Family Members",
-    "inviteMember": "Invite Member",
-    "removeMember": "Remove Member",
+    "title": "Famille",
+    "members": "Membres de la Famille",
+    "inviteMember": "Inviter un Membre",
+    "removeMember": "Retirer un Membre",
     "permissions": "Permissions",
-    "role": "Role",
+    "role": "Rôle",
     "roles": {
-      "admin": "Admin",
+      "admin": "Administrateur",
       "parent": "Parent",
-      "caregiver": "Caregiver",
-      "viewer": "Viewer"
+      "caregiver": "Soignant",
+      "viewer": "Observateur"
     }
   },
   "children": {
-    "title": "Children",
-    "addChild": "Add Child",
-    "editChild": "Edit Child",
-    "removeChild": "Remove Child",
-    "name": "Name",
-    "dateOfBirth": "Date of Birth",
-    "gender": "Gender",
+    "title": "Enfants",
+    "addChild": "Ajouter un Enfant",
+    "editChild": "Modifier l'Enfant",
+    "removeChild": "Retirer l'Enfant",
+    "name": "Nom",
+    "dateOfBirth": "Date de Naissance",
+    "gender": "Genre",
     "genders": {
-      "male": "Male",
-      "female": "Female",
-      "other": "Other",
-      "preferNotToSay": "Prefer not to say"
+      "male": "Masculin",
+      "female": "Féminin",
+      "other": "Autre",
+      "preferNotToSay": "Préfère ne pas dire"
     }
   },
   "subscription": {
-    "title": "Subscription",
-    "plan": "Current Plan",
-    "free": "Free",
+    "title": "Abonnement",
+    "plan": "Plan Actuel",
+    "free": "Gratuit",
     "premium": "Premium",
-    "upgradeToPremium": "Upgrade to Premium",
-    "manageBilling": "Manage Billing",
-    "cancelSubscription": "Cancel Subscription",
-    "renewalDate": "Renewal Date",
+    "upgradeToPremium": "Passer à Premium",
+    "manageBilling": "Gérer la Facturation",
+    "cancelSubscription": "Annuler l'Abonnement",
+    "renewalDate": "Date de Renouvellement",
     "features": {
-      "unlimitedAi": "Unlimited AI questions",
-      "familySync": "Family sync",
-      "advancedAnalytics": "Advanced analytics",
-      "exportReports": "Export reports",
-      "prioritySupport": "Priority support"
+      "unlimitedAi": "Questions IA illimitées",
+      "familySync": "Synchronisation familiale",
+      "advancedAnalytics": "Analyses avancées",
+      "exportReports": "Exporter les rapports",
+      "prioritySupport": "Support prioritaire"
     }
   },
   "about": {
-    "title": "About",
+    "title": "À Propos",
     "version": "Version",
-    "termsOfService": "Terms of Service",
-    "privacyPolicy": "Privacy Policy",
-    "helpCenter": "Help Center",
-    "contactSupport": "Contact Support",
-    "rateApp": "Rate App",
-    "shareApp": "Share App"
+    "termsOfService": "Conditions d'Utilisation",
+    "privacyPolicy": "Politique de Confidentialité",
+    "helpCenter": "Centre d'Aide",
+    "contactSupport": "Contacter le Support",
+    "rateApp": "Évaluer l'App",
+    "shareApp": "Partager l'App"
   },
-  "save": "Save Changes",
-  "saved": "Settings saved successfully",
-  "cancel": "Cancel",
-  "reset": "Reset to Default"
-}
+  "profile": {
+    "title": "Informations du Profil",
+    "name": "Nom",
+    "nameRequired": "Le nom ne peut pas être vide",
+    "email": "E-mail",
+    "emailNotEditable": "L'e-mail ne peut pas être modifié"
+  },
+  "appearance": {
+    "title": "Apparence",
+    "darkMode": "Mode Sombre (Bientôt Disponible)"
+  },
+  "security": {
+    "title": "Sécurité"
+  },
+  "sessions": {
+    "title": "Sessions"
+  },
+  "deviceTrust": {
+    "title": "Confiance de l'Appareil"
+  },
+  "biometric": {
+    "title": "Authentification Biométrique"
+  },
+  "dataExport": {
+    "title": "Exportation de Données"
+  },
+  "accountDeletion": {
+    "title": "Suppression de Compte"
+  },
+  "accountActions": {
+    "title": "Actions du Compte",
+    "logout": "Déconnexion"
+  },
+  "save": "Enregistrer les Préférences",
+  "saving": "Enregistrement...",
+  "saved": "Paramètres enregistrés avec succès !",
+  "cancel": "Annuler",
+  "reset": "Réinitialiser par Défaut"
+}
\ No newline at end of file
diff --git a/maternal-web/locales/fr/tracking.json b/maternal-web/locales/fr/tracking.json
index 4771a19..79c4157 100644
--- a/maternal-web/locales/fr/tracking.json
+++ b/maternal-web/locales/fr/tracking.json
@@ -1,6 +1,6 @@
 {
   "title": "Suivi des Activités",
-  "trackActivity": "Enregistrer une Activité",
+  "trackActivity": "Suivre l'Activité",
   "selectActivity": "Sélectionnez une activité à suivre",
   "activities": {
     "feeding": "Alimentation",
@@ -10,128 +10,270 @@
     "activity": "Activité"
   },
   "feeding": {
-    "title": "Feeding",
-    "addFeeding": "Add Feeding",
-    "type": "Feeding Type",
+    "title": "Alimentation",
+    "addFeeding": "Ajouter une Alimentation",
+    "type": "Type d'Alimentation",
     "types": {
-      "breast": "Breast",
-      "bottle": "Bottle",
-      "solid": "Solid Food"
+      "breast": "Sein",
+      "bottle": "Biberon",
+      "solid": "Nourriture Solide"
     },
-    "side": "Side",
+    "side": "Côté",
     "sides": {
-      "left": "Left",
-      "right": "Right",
-      "both": "Both"
+      "left": "Gauche",
+      "right": "Droite",
+      "both": "Les Deux"
     },
-    "amount": "Amount",
-    "duration": "Duration",
-    "startTime": "Start Time",
-    "endTime": "End Time",
+    "amount": "Quantité",
+    "duration": "Durée",
+    "startTime": "Démarrer le Chronomètre",
+    "endTime": "Arrêter le Chronomètre",
+    "reset": "Réinitialiser",
     "notes": "Notes",
+    "bottleType": "Type de Biberon",
+    "bottleTypes": {
+      "formula": "Lait en Poudre",
+      "breastmilk": "Lait Maternel",
+      "other": "Autre"
+    },
+    "foodDescription": "Description de la Nourriture",
+    "amountDescription": "Description de la Quantité",
     "placeholders": {
-      "amount": "Enter amount",
-      "notes": "Add any notes about this feeding..."
+      "amount": "Entrez la quantité",
+      "notes": "Ajoutez des notes sur cette alimentation...",
+      "duration": "Ou entrez la durée manuellement",
+      "foodDescription": "ex., Céréales de riz, Purée de banane",
+      "amountDescription": "ex., 1/4 tasse, 2 cuillères"
     },
     "units": {
       "ml": "ml",
       "oz": "oz",
       "minutes": "minutes"
+    },
+    "validation": {
+      "durationRequired": "Veuillez entrer la durée ou utiliser le chronomètre",
+      "amountRequired": "Veuillez entrer la quantité",
+      "foodRequired": "Veuillez entrer la description de la nourriture"
+    },
+    "success": "Alimentation enregistrée avec succès !",
+    "deleted": "Alimentation supprimée avec succès",
+    "recentFeedings": "Alimentations Récentes",
+    "error": {
+      "saveFailed": "Échec de l'enregistrement de l'alimentation",
+      "deleteFailed": "Échec de la suppression de l'alimentation"
     }
   },
   "sleep": {
-    "title": "Sleep",
-    "addSleep": "Add Sleep",
-    "startTime": "Sleep Start",
-    "endTime": "Sleep End",
-    "duration": "Duration",
-    "quality": "Quality",
+    "title": "Sommeil",
+    "addSleep": "Ajouter un Sommeil",
+    "logSleep": "Enregistrer le Sommeil",
+    "startTime": "Début du Sommeil",
+    "endTime": "Fin du Sommeil",
+    "duration": "Durée",
+    "quality": "Qualité",
     "qualities": {
-      "poor": "Poor",
-      "fair": "Fair",
-      "good": "Good",
-      "excellent": "Excellent"
+      "poor": "Mauvaise",
+      "fair": "Correcte",
+      "good": "Bonne",
+      "excellent": "Excellente"
     },
+    "location": "Emplacement",
+    "locations": {
+      "crib": "Berceau",
+      "bed": "Lit",
+      "stroller": "Poussette",
+      "carrier": "Porte-bébé",
+      "other": "Autre"
+    },
+    "status": {
+      "title": "Statut du Sommeil",
+      "completed": "Terminé (a une heure de fin)",
+      "ongoing": "En cours (dort encore)"
+    },
+    "now": "Maintenant",
     "notes": "Notes",
     "placeholders": {
-      "notes": "Add any notes about this sleep session..."
-    }
+      "notes": "Ajoutez des notes sur cette session de sommeil..."
+    },
+    "recentSleeps": "Sommeils Récents",
+    "success": "Sommeil enregistré avec succès !",
+    "deleted": "Sommeil supprimé avec succès",
+    "ongoing_duration": "En cours - {{duration}}"
   },
   "diaper": {
-    "title": "Diaper",
-    "addDiaper": "Add Diaper Change",
+    "title": "Couche",
+    "addDiaper": "Ajouter un Change de Couche",
+    "logDiaper": "Enregistrer le Change de Couche",
     "type": "Type",
     "types": {
-      "wet": "Wet",
-      "dirty": "Dirty",
-      "both": "Both",
-      "dry": "Dry"
+      "wet": "Mouillée",
+      "dirty": "Sale",
+      "both": "Les Deux",
+      "dry": "Sèche"
+    },
+    "time": "Heure",
+    "now": "Maintenant",
+    "conditions": {
+      "title": "Conditions",
+      "normal": "Normal",
+      "soft": "Mou",
+      "hard": "Dur",
+      "watery": "Liquide",
+      "mucus": "Mucus",
+      "blood": "Sang"
+    },
+    "rash": {
+      "title": "A une Éruption",
+      "yes": "Oui",
+      "no": "Non",
+      "severity": "Sévérité de l'Éruption",
+      "alert": "Érythème fessier détecté. Considérez l'application d'une crème pour érythème fessier et consultez votre pédiatre si cela persiste.",
+      "severities": {
+        "mild": "Léger",
+        "moderate": "Modéré",
+        "severe": "Sévère"
+      }
     },
-    "time": "Time",
     "notes": "Notes",
     "placeholders": {
-      "notes": "Add any notes about this diaper change..."
-    }
+      "notes": "Ajoutez des notes sur ce change de couche..."
+    },
+    "recentDiapers": "Changes de Couche Récents",
+    "success": "Change de couche enregistré avec succès !",
+    "deleted": "Change de couche supprimé avec succès"
   },
   "milestone": {
-    "title": "Milestone",
-    "addMilestone": "Add Milestone",
-    "category": "Category",
+    "title": "Jalon",
+    "addMilestone": "Ajouter un Jalon",
+    "category": "Catégorie",
     "categories": {
-      "physical": "Physical",
-      "cognitive": "Cognitive",
+      "physical": "Physique",
+      "cognitive": "Cognitif",
       "social": "Social",
-      "language": "Language"
+      "language": "Langage"
     },
     "description": "Description",
     "date": "Date",
     "notes": "Notes",
     "placeholders": {
-      "description": "Describe the milestone...",
-      "notes": "Add any additional notes..."
+      "description": "Décrivez le jalon...",
+      "notes": "Ajoutez des notes supplémentaires..."
     }
   },
   "health": {
-    "title": "Health",
-    "addHealth": "Add Health Record",
+    "title": "Santé",
+    "addHealth": "Ajouter un Dossier de Santé",
     "type": "Type",
     "types": {
-      "temperature": "Temperature",
-      "medication": "Medication",
-      "symptom": "Symptom",
-      "doctor": "Doctor Visit"
+      "temperature": "Température",
+      "medication": "Médicament",
+      "symptom": "Symptôme",
+      "doctor": "Visite Médicale"
     },
-    "temperature": "Temperature",
-    "medication": "Medication",
-    "dosage": "Dosage",
-    "symptom": "Symptom",
-    "severity": "Severity",
+    "temperature": "Température",
+    "medication": "Médicament",
+    "medicineInfo": "Informations sur le Médicament",
+    "medicineName": {
+      "label": "Nom du Médicament",
+      "placeholder": "ex., Paracétamol, Ibuprofène",
+      "required": "Veuillez entrer le nom du médicament"
+    },
+    "dosage": {
+      "label": "Dosage",
+      "placeholder": "ex., 5, 2.5",
+      "required": "Veuillez entrer le dosage"
+    },
+    "unit": "Unité",
+    "route": {
+      "label": "Voie",
+      "oral": "Orale",
+      "topical": "Topique",
+      "injection": "Injection",
+      "other": "Autre"
+    },
+    "reason": {
+      "label": "Raison (optionnel)",
+      "placeholder": "ex., Fièvre, Douleur, Allergie"
+    },
+    "logMedicine": "Enregistrer le Médicament",
+    "recentMedicines": "Médicaments Récents",
+    "success": "Médicament enregistré avec succès !",
+    "error": "Échec de l'enregistrement du médicament",
+    "deleted": "Médicament supprimé avec succès",
+    "deleteError": "Échec de la suppression du médicament",
+    "symptom": "Symptôme",
+    "severity": "Sévérité",
     "severities": {
-      "mild": "Mild",
-      "moderate": "Moderate",
-      "severe": "Severe"
+      "mild": "Léger",
+      "moderate": "Modéré",
+      "severe": "Sévère"
     },
     "notes": "Notes",
     "placeholders": {
-      "medication": "Medication name",
-      "dosage": "Dosage amount",
-      "symptom": "Describe symptom",
-      "notes": "Add any notes..."
+      "medication": "Nom du médicament",
+      "dosage": "Quantité de dosage",
+      "symptom": "Décrivez le symptôme",
+      "notes": "Ajoutez des notes..."
     },
     "units": {
+      "ml": "ml",
+      "mg": "mg",
+      "tsp": "c. à thé",
+      "tbsp": "c. à soupe",
+      "drops": "gouttes",
+      "tablet": "comprimé(s)",
       "celsius": "°C",
       "fahrenheit": "°F"
     }
   },
-  "quickLog": "Quick Log",
-  "viewHistory": "View History",
-  "editEntry": "Edit Entry",
-  "deleteEntry": "Delete Entry",
-  "confirmDelete": "Are you sure you want to delete this entry?",
-  "filterByType": "Filter by Type",
-  "filterByChild": "Filter by Child",
-  "sortByNewest": "Newest First",
-  "sortByOldest": "Oldest First",
-  "noEntries": "No entries yet",
-  "addFirstEntry": "Add your first entry to start tracking"
-}
+  "activity": {
+    "title": "Activité",
+    "addActivity": "Ajouter une Activité",
+    "logActivity": "Enregistrer l'Activité",
+    "type": "Type d'Activité",
+    "types": {
+      "play": "Jeu",
+      "tummyTime": "Temps sur le Ventre",
+      "walk": "Promenade",
+      "music": "Musique",
+      "reading": "Lecture",
+      "outdoor": "Jeu en Plein Air",
+      "other": "Autre"
+    },
+    "duration": "Durée (minutes)",
+    "description": "Description",
+    "notes": "Notes",
+    "placeholders": {
+      "duration": "Entrez la durée en minutes",
+      "description": "Décrivez l'activité...",
+      "notes": "Ajoutez des notes..."
+    },
+    "recentActivities": "Activités Récentes",
+    "success": "Activité enregistrée avec succès !",
+    "deleted": "Activité supprimée avec succès"
+  },
+  "common": {
+    "selectChild": "Sélectionner l'Enfant",
+    "cancel": "Annuler",
+    "delete": "Supprimer",
+    "loading": "Chargement...",
+    "noChildrenAdded": "Aucun Enfant Ajouté",
+    "noChildrenMessage": "Vous devez ajouter un enfant avant de pouvoir suivre les activités",
+    "addChild": "Ajouter un Enfant",
+    "recentActivities": "Activités Récentes",
+    "error": {
+      "loadChildrenFailed": "Échec du chargement des enfants"
+    }
+  },
+  "quickLog": "Enregistrement Rapide",
+  "viewHistory": "Voir l'Historique",
+  "editEntry": "Modifier l'Entrée",
+  "deleteEntry": "Supprimer l'Entrée",
+  "confirmDelete": "Êtes-vous sûr de vouloir supprimer cette entrée ?",
+  "filterByType": "Filtrer par Type",
+  "filterByChild": "Filtrer par Enfant",
+  "sortByNewest": "Plus Récent en Premier",
+  "sortByOldest": "Plus Ancien en Premier",
+  "noEntries": "Aucune entrée pour le moment",
+  "addFirstEntry": "Ajoutez votre première entrée pour commencer le suivi"
+}
\ No newline at end of file
diff --git a/maternal-web/locales/it/ai.json b/maternal-web/locales/it/ai.json
new file mode 100644
index 0000000..bba41d1
--- /dev/null
+++ b/maternal-web/locales/it/ai.json
@@ -0,0 +1,107 @@
+{
+  "title": "Assistente IA",
+  "subtitle": "Supporto Genitoriale 24/7",
+  "chat": {
+    "placeholder": "Chiedimi qualsiasi cosa sulla genitorialità...",
+    "send": "Invia",
+    "listening": "Ascolto...",
+    "processing": "Elaborazione...",
+    "thinking": "Pensando...",
+    "typing": "L'IA sta scrivendo...",
+    "voiceInput": "Input Vocale",
+    "textInput": "Input Testo",
+    "newChat": "Nuova Chat",
+    "clearChat": "Cancella Chat",
+    "confirmClear": "Sei sicuro di voler cancellare questa chat?",
+    "noMessages": "Nessun messaggio ancora",
+    "startConversation": "Inizia una conversazione con il tuo assistente IA"
+  },
+  "suggestions": {
+    "title": "Domande Suggerite",
+    "sleepPattern": "Come posso migliorare il ritmo del sonno del mio bambino?",
+    "feeding": "Quanto dovrebbe mangiare il mio bambino?",
+    "development": "Quali traguardi dovrei aspettarmi questo mese?",
+    "health": "Quando dovrei preoccuparmi per la febbre?"
+  },
+  "context": {
+    "analyzing": "Analizzando i modelli del tuo bambino...",
+    "usingRecent": "Utilizzando dati di attività recenti",
+    "basedOn": "Basato sul profilo di {{childName}}"
+  },
+  "disclaimer": {
+    "title": "Avviso Importante",
+    "message": "Questo assistente IA fornisce orientamento generale sulla genitorialità e non sostituisce il consiglio medico professionale. Consulta sempre il tuo pediatra per preoccupazioni mediche.",
+    "emergency": "In caso di emergenza, chiama immediatamente i servizi di emergenza.",
+    "understand": "Ho Capito"
+  },
+  "limits": {
+    "dailyLimit": "Limite giornaliero di domande raggiunto",
+    "dailyLimitMessage": "Hai raggiunto il tuo limite giornaliero di {{limit}} domande. Aggiorna a premium per accesso illimitato.",
+    "upgrade": "Aggiorna a Premium"
+  },
+  "history": {
+    "title": "Cronologia Chat",
+    "today": "Oggi",
+    "yesterday": "Ieri",
+    "thisWeek": "Questa Settimana",
+    "older": "Più Vecchio",
+    "noHistory": "Nessuna cronologia chat",
+    "delete": "Elimina Chat",
+    "confirmDelete": "Sei sicuro di voler eliminare questa chat?"
+  },
+  "topics": {
+    "sleep": "Sonno",
+    "feeding": "Alimentazione",
+    "development": "Sviluppo",
+    "health": "Salute",
+    "behavior": "Comportamento",
+    "safety": "Sicurezza",
+    "nutrition": "Nutrizione",
+    "general": "Generale"
+  },
+  "interface": {
+    "assistantTitle": "Assistente IA Genitoriale",
+    "assistantSubtitle": "Chiedimi qualsiasi cosa sulla genitorialità e cura dei bambini",
+    "greeting": "Ciao {{name}}! Come posso aiutarti oggi?",
+    "inputPlaceholder": "Chiedimi qualsiasi cosa...",
+    "closeDrawer": "Chiudi cassetto",
+    "moreOptions": "Più opzioni",
+    "deleteConversation": "Elimina conversazione",
+    "chatCount": "{{count}} chat",
+    "chatCount_plural": "{{count}} chat",
+    "ungrouped": "Non raggruppato",
+    "errorMessage": "Scusa, ho riscontrato un errore. Per favore riprova.",
+    "disclaimerFooter": "Questo assistente IA fornisce informazioni generali. Consulta sempre professionisti sanitari per consigli medici.",
+    "deleteDialogTitle": "Elimina Conversazione",
+    "deleteDialogMessage": "Sei sicuro di voler eliminare questa conversazione? Questa azione non può essere annullata.",
+    "cancel": "Annulla",
+    "delete": "Elimina",
+    "moveToGroup": "Sposta nel Gruppo",
+    "createNewGroup": "Crea Nuovo Gruppo",
+    "groupNameLabel": "Nome Gruppo",
+    "create": "Crea",
+    "suggestedQuestion1": "Quanto dovrebbe dormire il mio bambino a 3 mesi?",
+    "suggestedQuestion2": "Quali sono i modelli di alimentazione normali?",
+    "suggestedQuestion3": "Quando dovrei introdurre cibi solidi?",
+    "suggestedQuestion4": "Consigli per una migliore routine del sonno",
+    "thinking1": "Raccogliendo saggezza sui bambini...",
+    "thinking2": "Consultando i libri sui bambini...",
+    "thinking3": "Mescolando la risposta perfetta...",
+    "thinking4": "Riscaldando alcuni consigli...",
+    "thinking5": "Preparando il tuo biberon di conoscenza...",
+    "thinking6": "Contando piccole dita di mani e piedi...",
+    "thinking7": "Collegando i mattoncini...",
+    "thinking8": "Sbirciando nella scatola dei giocattoli...",
+    "thinking9": "Sistemando i pezzi del puzzle...",
+    "thinking10": "Mescolando il vasetto di pappa...",
+    "thinking11": "Lucidando il ciuccio della saggezza...",
+    "thinking12": "Camminando in punta di piedi durante il pisolino...",
+    "thinking13": "Organizzando la borsa dei pannolini...",
+    "thinking14": "Impacchettando la tua risposta con amore...",
+    "thinking15": "Preparando una tazza calda di orientamento...",
+    "thinking16": "Tessendo insieme alcuni pensieri...",
+    "thinking17": "Sistemando i dettagli...",
+    "thinking18": "Cospargendo un po' di polvere magica...",
+    "thinking19": "Canticchiando una ninna nanna mentre penso..."
+  }
+}
\ No newline at end of file
diff --git a/maternal-web/locales/it/auth.json b/maternal-web/locales/it/auth.json
new file mode 100644
index 0000000..71cf515
--- /dev/null
+++ b/maternal-web/locales/it/auth.json
@@ -0,0 +1,88 @@
+{
+  "login": {
+    "title": "Bentornato",
+    "subtitle": "Accedi al tuo account",
+    "email": "Email",
+    "password": "Password",
+    "rememberMe": "Ricordami",
+    "forgotPassword": "Password dimenticata?",
+    "submit": "Accedi",
+    "noAccount": "Non hai un account?",
+    "signUp": "Registrati",
+    "or": "Oppure",
+    "continueWithGoogle": "Continua con Google",
+    "continueWithApple": "Continua con Apple",
+    "biometric": {
+      "useFaceId": "Usa Face ID",
+      "useTouchId": "Usa Touch ID",
+      "useFingerprint": "Usa Impronta Digitale"
+    }
+  },
+  "signup": {
+    "title": "Crea Account",
+    "subtitle": "Unisciti a Maternal oggi",
+    "name": "Nome Completo",
+    "email": "Email",
+    "password": "Password",
+    "confirmPassword": "Conferma Password",
+    "agreeToTerms": "Accetto i {{termsLink}} e la {{privacyLink}}",
+    "termsOfService": "Termini di Servizio",
+    "privacyPolicy": "Politica sulla Privacy",
+    "submit": "Crea Account",
+    "hasAccount": "Hai già un account?",
+    "signIn": "Accedi",
+    "or": "Oppure",
+    "continueWithGoogle": "Continua con Google",
+    "continueWithApple": "Continua con Apple"
+  },
+  "forgotPassword": {
+    "title": "Reimposta Password",
+    "subtitle": "Inserisci la tua email per ricevere un link di reimpostazione",
+    "email": "Email",
+    "submit": "Invia Link di Reimpostazione",
+    "backToLogin": "Torna al login",
+    "success": "Link di reimpostazione inviato! Controlla la tua email.",
+    "checkEmail": "Abbiamo inviato un link di reimpostazione password a {{email}}"
+  },
+  "resetPassword": {
+    "title": "Crea Nuova Password",
+    "subtitle": "Inserisci la tua nuova password",
+    "password": "Nuova Password",
+    "confirmPassword": "Conferma Password",
+    "submit": "Reimposta Password",
+    "success": "Password reimpostata con successo!",
+    "backToLogin": "Torna al login"
+  },
+  "verification": {
+    "title": "Verifica la tua Email",
+    "subtitle": "Abbiamo inviato un codice di verifica a {{email}}",
+    "code": "Codice di Verifica",
+    "submit": "Verifica",
+    "resend": "Reinvia Codice",
+    "resendIn": "Reinvia tra {{seconds}}s",
+    "success": "Email verificata con successo!",
+    "didNotReceive": "Non hai ricevuto il codice?"
+  },
+  "errors": {
+    "invalidEmail": "Per favore inserisci un indirizzo email valido",
+    "invalidPassword": "La password deve avere almeno 8 caratteri",
+    "passwordMismatch": "Le password non corrispondono",
+    "emailRequired": "L'email è richiesta",
+    "passwordRequired": "La password è richiesta",
+    "nameRequired": "Il nome è richiesto",
+    "termsRequired": "Devi accettare i termini e la politica sulla privacy",
+    "invalidCredentials": "Email o password non validi",
+    "emailExists": "Un account con questa email esiste già",
+    "weakPassword": "La password è troppo debole. Per favore usa una password più forte.",
+    "networkError": "Errore di rete. Per favore riprova.",
+    "unknownError": "Si è verificato un errore. Per favore riprova."
+  },
+  "passwordRequirements": {
+    "title": "La password deve contenere:",
+    "minLength": "Almeno 8 caratteri",
+    "uppercase": "Almeno una lettera maiuscola",
+    "lowercase": "Almeno una lettera minuscola",
+    "number": "Almeno un numero",
+    "special": "Almeno un carattere speciale"
+  }
+}
\ No newline at end of file
diff --git a/maternal-web/locales/it/children.json b/maternal-web/locales/it/children.json
new file mode 100644
index 0000000..a0e9ba4
--- /dev/null
+++ b/maternal-web/locales/it/children.json
@@ -0,0 +1,50 @@
+{
+  "title": "Bambini",
+  "subtitle": "Gestisci i profili dei bambini della tua famiglia",
+  "addChild": "Aggiungi Bambino",
+  "addFirstChild": "Aggiungi Primo Bambino",
+  "editChild": "Modifica Bambino",
+  "deleteChild": "Elimina Bambino",
+  "noChildren": "Nessun bambino aggiunto ancora",
+  "noChildrenSubtitle": "Aggiungi il tuo primo bambino per iniziare a tracciare le sue attività",
+  "age": "Età",
+  "gender": {
+    "male": "Maschio",
+    "female": "Femmina",
+    "other": "Altro"
+  },
+  "dialog": {
+    "name": "Nome",
+    "birthDate": "Data di Nascita",
+    "gender": "Genere",
+    "photoUrl": "URL Foto (Opzionale)",
+    "photoPlaceholder": "https://example.com/photo.jpg",
+    "cancel": "Annulla",
+    "add": "Aggiungi",
+    "update": "Aggiorna",
+    "saving": "Salvataggio...",
+    "delete": "Elimina",
+    "deleting": "Eliminazione...",
+    "confirmDelete": "Conferma Eliminazione",
+    "confirmDeleteMessage": "Sei sicuro di voler eliminare",
+    "confirmDeleteWarning": "Questa azione non può essere annullata. Tutti i dati associati saranno rimossi permanentemente.",
+    "validation": {
+      "nameRequired": "Per favore inserisci un nome",
+      "birthDateRequired": "Per favore seleziona una data di nascita",
+      "birthDateFuture": "La data di nascita non può essere nel futuro"
+    }
+  },
+  "errors": {
+    "noFamily": "Nessuna famiglia trovata. Per favore completa prima l'onboarding.",
+    "loadFailed": "Caricamento bambini fallito",
+    "saveFailed": "Salvataggio bambino fallito",
+    "deleteFailed": "Eliminazione bambino fallita",
+    "noFamilyId": "Nessun ID famiglia trovato"
+  },
+  "ageFormat": {
+    "year": "anno",
+    "years": "anni",
+    "month": "mese",
+    "months": "mesi"
+  }
+}
\ No newline at end of file
diff --git a/maternal-web/locales/it/common.json b/maternal-web/locales/it/common.json
new file mode 100644
index 0000000..3956bb8
--- /dev/null
+++ b/maternal-web/locales/it/common.json
@@ -0,0 +1,79 @@
+{
+  "appName": "Maternal",
+  "appDescription": "Assistente per la Cura dei Bambini Alimentato da IA",
+  "welcome": "Benvenuto",
+  "loading": "Caricamento...",
+  "save": "Salva",
+  "cancel": "Annulla",
+  "delete": "Elimina",
+  "edit": "Modifica",
+  "add": "Aggiungi",
+  "close": "Chiudi",
+  "confirm": "Conferma",
+  "back": "Indietro",
+  "next": "Avanti",
+  "previous": "Precedente",
+  "finish": "Fine",
+  "search": "Cerca",
+  "filter": "Filtra",
+  "sort": "Ordina",
+  "refresh": "Aggiorna",
+  "retry": "Riprova",
+  "continue": "Continua",
+  "submit": "Invia",
+  "reset": "Reimposta",
+  "clear": "Cancella",
+  "yes": "Sì",
+  "no": "No",
+  "ok": "OK",
+  "error": "Errore",
+  "success": "Successo",
+  "warning": "Avviso",
+  "info": "Informazione",
+  "home": "Home",
+  "settings": "Impostazioni",
+  "profile": "Profilo",
+  "logout": "Esci",
+  "login": "Accedi",
+  "signup": "Registrati",
+  "email": "Email",
+  "password": "Password",
+  "name": "Nome",
+  "date": "Data",
+  "time": "Ora",
+  "duration": "Durata",
+  "notes": "Note",
+  "optional": "Opzionale",
+  "required": "Richiesto",
+  "units": {
+    "metric": "Metrico",
+    "imperial": "Imperiale"
+  },
+  "measurements": {
+    "weight": "Peso",
+    "height": "Altezza",
+    "temperature": "Temperatura",
+    "volume": "Volume"
+  },
+  "navigation": {
+    "home": "Home",
+    "dashboard": "Dashboard",
+    "tracking": "Tracciamento",
+    "trackActivity": "Traccia Attività",
+    "track": "Traccia",
+    "ai": "Assistente IA",
+    "aiChat": "Chat IA",
+    "family": "Famiglia",
+    "insights": "Approfondimenti",
+    "children": "Bambini",
+    "settings": "Impostazioni",
+    "logout": "Esci"
+  },
+  "connection": {
+    "syncActive": "Sincronizzazione in tempo reale attiva",
+    "syncDisconnected": "Sincronizzazione in tempo reale disconnessa",
+    "live": "Dal Vivo",
+    "offline": "Offline",
+    "familyMembersOnline": "{{count}} membri della famiglia online"
+  }
+}
\ No newline at end of file
diff --git a/maternal-web/locales/it/dashboard.json b/maternal-web/locales/it/dashboard.json
new file mode 100644
index 0000000..b340346
--- /dev/null
+++ b/maternal-web/locales/it/dashboard.json
@@ -0,0 +1,30 @@
+{
+  "welcomeBack": "Bentornato",
+  "welcomeBackWithName": "Bentornato, {{name}}!",
+  "subtitle": "Traccia le attività del tuo bambino e ottieni approfondimenti alimentati da IA",
+  "quickActions": {
+    "title": "Azioni Rapide",
+    "feeding": "Alimentazione",
+    "sleep": "Sonno",
+    "diaper": "Pannolino",
+    "medicine": "Medicina",
+    "activities": "Attività",
+    "aiAssistant": "Assistente IA",
+    "navigateTo": "Naviga a {{action}}"
+  },
+  "summary": {
+    "title": "Riassunto di Oggi",
+    "titleWithChild": "Riassunto di Oggi - {{childName}}",
+    "feedings": "Alimentazioni",
+    "sleep": "Sonno",
+    "diapers": "Pannolini",
+    "medications": "Farmaci",
+    "noChild": "Aggiungi un bambino per iniziare il tracciamento",
+    "noActivities": "Nessuna attività tracciata oggi"
+  },
+  "predictions": {
+    "title": "Prossima Attività Prevista",
+    "napTime": "Ora del pisolino tra {{minutes}} minuti",
+    "basedOnPatterns": "Basato sui modelli di sonno del tuo bambino"
+  }
+}
\ No newline at end of file
diff --git a/maternal-web/locales/it/errors.json b/maternal-web/locales/it/errors.json
new file mode 100644
index 0000000..0bc29bf
--- /dev/null
+++ b/maternal-web/locales/it/errors.json
@@ -0,0 +1,69 @@
+{
+  "general": {
+    "unknown": "Si è verificato un errore sconosciuto",
+    "networkError": "Errore di rete. Per favore controlla la tua connessione.",
+    "serverError": "Errore del server. Per favore riprova più tardi.",
+    "notFound": "La risorsa richiesta non è stata trovata",
+    "unauthorized": "Non sei autorizzato a eseguire questa azione",
+    "forbidden": "Accesso negato",
+    "validation": "Per favore controlla il tuo input e riprova",
+    "timeout": "Timeout della richiesta. Per favore riprova."
+  },
+  "auth": {
+    "invalidCredentials": "Email o password non validi",
+    "emailExists": "Un account con questa email esiste già",
+    "emailNotVerified": "Per favore verifica il tuo indirizzo email",
+    "accountLocked": "Il tuo account è stato bloccato. Per favore contatta il supporto.",
+    "sessionExpired": "La tua sessione è scaduta. Per favore accedi di nuovo.",
+    "weakPassword": "La password è troppo debole",
+    "tokenInvalid": "Token non valido o scaduto",
+    "deviceNotTrusted": "Dispositivo non attendibile. Per favore verifica il tuo dispositivo."
+  },
+  "family": {
+    "limitExceeded": "Limite dimensione famiglia superato",
+    "memberNotFound": "Membro della famiglia non trovato",
+    "cannotRemoveSelf": "Non puoi rimuovere te stesso dalla famiglia",
+    "insufficientPermissions": "Non hai il permesso di eseguire questa azione",
+    "invitationExpired": "Questo invito è scaduto",
+    "alreadyMember": "Questa persona è già un membro della famiglia"
+  },
+  "child": {
+    "notFound": "Profilo bambino non trovato",
+    "invalidAge": "Età non valida. Per favore controlla la data di nascita.",
+    "limitExceeded": "Hai raggiunto il numero massimo di bambini"
+  },
+  "tracking": {
+    "invalidData": "Dati di tracciamento non validi",
+    "futureDate": "Non puoi registrare attività nel futuro",
+    "duplicateEntry": "Esiste già una voce simile",
+    "invalidDuration": "Durata non valida",
+    "invalidAmount": "Quantità non valida"
+  },
+  "ai": {
+    "dailyLimitReached": "Limite giornaliero domande IA raggiunto",
+    "contextError": "Errore nel caricamento del contesto per l'IA",
+    "responseError": "Errore nella generazione della risposta IA",
+    "moderationFlag": "Il tuo messaggio è stato segnalato dal nostro sistema di moderazione dei contenuti"
+  },
+  "offline": {
+    "noConnection": "Nessuna connessione internet",
+    "syncFailed": "Sincronizzazione dati fallita",
+    "pendingChanges": "Hai modifiche in sospeso che devono essere sincronizzate"
+  },
+  "validation": {
+    "required": "Questo campo è richiesto",
+    "invalidEmail": "Per favore inserisci un indirizzo email valido",
+    "invalidPhone": "Per favore inserisci un numero di telefono valido",
+    "invalidDate": "Per favore inserisci una data valida",
+    "minLength": "Deve avere almeno {{min}} caratteri",
+    "maxLength": "Non deve avere più di {{max}} caratteri",
+    "minValue": "Deve essere almeno {{min}}",
+    "maxValue": "Non deve essere più di {{max}}",
+    "invalidFormat": "Formato non valido",
+    "passwordMismatch": "Le password non corrispondono"
+  },
+  "retry": "Riprova",
+  "goBack": "Torna Indietro",
+  "contactSupport": "Contatta il Supporto",
+  "dismiss": "Ignora"
+}
\ No newline at end of file
diff --git a/maternal-web/locales/it/family.json b/maternal-web/locales/it/family.json
new file mode 100644
index 0000000..cd49fec
--- /dev/null
+++ b/maternal-web/locales/it/family.json
@@ -0,0 +1,43 @@
+{
+  "pageTitle": "Famiglia",
+  "pageSubtitle": "Gestisci i membri della tua famiglia e condividi l'accesso",
+  "buttons": {
+    "joinFamily": "Unisciti alla Famiglia",
+    "inviteMember": "Invita Membro",
+    "copyCode": "Copia Codice",
+    "inviteFirstMember": "Invita Primo Membro"
+  },
+  "shareCode": {
+    "title": "Codice di Condivisione Famiglia",
+    "description": "Condividi questo codice con i membri della famiglia per dare loro accesso ai dati della tua famiglia"
+  },
+  "members": {
+    "title": "Membri della Famiglia ({{count}})",
+    "noMembers": "Nessun membro della famiglia ancora",
+    "noMembersDescription": "Invita membri della famiglia per collaborare nella cura dei bambini",
+    "youLabel": "Tu",
+    "removeAriaLabel": "Rimuovi {{name}} dalla famiglia"
+  },
+  "roles": {
+    "parent": "Genitore",
+    "caregiver": "Caregiver",
+    "viewer": "Visualizzatore"
+  },
+  "messages": {
+    "shareCodeCopied": "Codice di condivisione copiato negli appunti!",
+    "shareCodeCopyFailed": "Copia del codice di condivisione fallita",
+    "invitationSent": "Invito inviato con successo!",
+    "joinedFamily": "Unito alla famiglia con successo!",
+    "memberRemoved": "Membro rimosso con successo",
+    "noFamilyFound": "Nessuna famiglia trovata. Per favore completa prima l'onboarding.",
+    "failedToLoad": "Caricamento informazioni famiglia fallito",
+    "noFamilyId": "Nessun ID famiglia trovato",
+    "failedToInvite": "Invio invito fallito",
+    "failedToJoin": "Unione alla famiglia fallita",
+    "failedToRemove": "Rimozione membro fallita"
+  },
+  "placeholders": {
+    "unknownUser": "Utente Sconosciuto",
+    "noEmail": "Nessuna email"
+  }
+}
\ No newline at end of file
diff --git a/maternal-web/locales/it/insights.json b/maternal-web/locales/it/insights.json
new file mode 100644
index 0000000..536b7c8
--- /dev/null
+++ b/maternal-web/locales/it/insights.json
@@ -0,0 +1,73 @@
+{
+  "title": "Approfondimenti e Analisi",
+  "subtitle": "Traccia i modelli e ottieni approfondimenti sulle attività del tuo bambino",
+  "filters": {
+    "child": "Bambino",
+    "dateRange": {
+      "7days": "7 Giorni",
+      "30days": "30 Giorni",
+      "3months": "3 Mesi"
+    }
+  },
+  "stats": {
+    "feedings": {
+      "title": "Alimentazioni",
+      "subtitle": "Conteggio totale"
+    },
+    "sleep": {
+      "title": "Sonno",
+      "subtitle": "Media al giorno"
+    },
+    "diapers": {
+      "title": "Pannolini",
+      "subtitle": "Cambi totali"
+    },
+    "topActivity": {
+      "title": "Attività Principale",
+      "subtitle": "Più frequente"
+    }
+  },
+  "charts": {
+    "feedingFrequency": "Frequenza Alimentazione",
+    "sleepDuration": "Durata Sonno (Ore)",
+    "diaperChangesByType": "Cambi Pannolino per Tipo",
+    "activityTimeline": "Timeline Attività",
+    "activityDistribution": "Distribuzione Attività",
+    "chartLabels": {
+      "feedings": "Alimentazioni",
+      "diapers": "Pannolini",
+      "sleepHours": "Sonno (ore)"
+    }
+  },
+  "recentActivities": {
+    "title": "Attività Recenti (Ultime 20)"
+  },
+  "emptyStates": {
+    "noChildren": {
+      "title": "Nessun Bambino Aggiunto",
+      "message": "Aggiungi un bambino per vedere approfondimenti e analisi",
+      "action": "Aggiungi Bambino"
+    },
+    "noActivities": "Nessuna attività trovata per l'intervallo di date selezionato. Inizia a tracciare attività per vedere gli approfondimenti!"
+  },
+  "errors": {
+    "loadChildren": "Caricamento bambini fallito",
+    "loadActivities": "Caricamento attività fallito"
+  },
+  "activityTypes": {
+    "feeding": "Alimentazione",
+    "sleep": "Sonno",
+    "diaper": "Pannolino",
+    "medication": "Farmaco",
+    "milestone": "Traguardo",
+    "note": "Nota",
+    "none": "Nessuno"
+  },
+  "diaperTypes": {
+    "wet": "Bagnato",
+    "dirty": "Sporco",
+    "both": "Entrambi",
+    "dry": "Asciutto",
+    "unknown": "Sconosciuto"
+  }
+}
\ No newline at end of file
diff --git a/maternal-web/locales/it/onboarding.json b/maternal-web/locales/it/onboarding.json
new file mode 100644
index 0000000..8839d1d
--- /dev/null
+++ b/maternal-web/locales/it/onboarding.json
@@ -0,0 +1,99 @@
+{
+  "welcome": {
+    "title": "Benvenuto in Maternal",
+    "subtitle": "Il tuo assistente per la cura dei bambini alimentato da IA",
+    "description": "Traccia attività, ottieni approfondimenti alimentati da IA e coordinati con la tua famiglia, tutto in un posto.",
+    "getStarted": "Inizia",
+    "skip": "Salta"
+  },
+  "language": {
+    "title": "Scegli la Tua Lingua",
+    "subtitle": "Seleziona la tua lingua preferita",
+    "description": "Puoi cambiare questo più tardi nelle impostazioni"
+  },
+  "measurements": {
+    "title": "Unità di Misura",
+    "subtitle": "Scegli il tuo sistema di unità preferito",
+    "description": "Seleziona il sistema di misurazione con cui ti senti più a tuo agio. Puoi cambiare questo più tardi nelle impostazioni.",
+    "metric": {
+      "title": "Metrico",
+      "description": "Chilogrammi, centimetri, Celsius, millilitri"
+    },
+    "imperial": {
+      "title": "Imperiale",
+      "description": "Libbre, pollici, Fahrenheit, once"
+    }
+  },
+  "profile": {
+    "title": "Crea il Tuo Profilo",
+    "subtitle": "Raccontaci di te",
+    "name": "Il Tuo Nome",
+    "email": "Indirizzo Email",
+    "password": "Password",
+    "confirmPassword": "Conferma Password",
+    "relation": "Relazione con il Bambino",
+    "relations": {
+      "mother": "Madre",
+      "father": "Padre",
+      "guardian": "Tutore",
+      "caregiver": "Caregiver",
+      "other": "Altro"
+    }
+  },
+  "child": {
+    "title": "Aggiungi il Tuo Bambino",
+    "subtitle": "Iniziamo con il tuo primo bambino",
+    "name": "Nome del Bambino",
+    "dateOfBirth": "Data di Nascita",
+    "gender": "Genere",
+    "genders": {
+      "male": "Maschio",
+      "female": "Femmina",
+      "other": "Altro",
+      "preferNotToSay": "Preferisco non dire"
+    },
+    "weight": "Peso Attuale",
+    "height": "Altezza Attuale",
+    "addAnother": "Aggiungi Un Altro Bambino",
+    "skipForNow": "Salta per Ora"
+  },
+  "family": {
+    "title": "Invita Membri della Famiglia",
+    "subtitle": "Coordinati con la tua famiglia",
+    "description": "Invita membri della famiglia per visualizzare e tracciare attività insieme. Riceveranno un invito via email.",
+    "email": "Email del Membro della Famiglia",
+    "role": "Ruolo",
+    "roles": {
+      "parent": "Genitore",
+      "caregiver": "Caregiver",
+      "viewer": "Visualizzatore"
+    },
+    "addMember": "Aggiungi Membro",
+    "inviteLater": "Inviterò Più Tardi"
+  },
+  "notifications": {
+    "title": "Abilita Notifiche",
+    "subtitle": "Rimani informato",
+    "description": "Ricevi promemoria per alimentazioni, orari del sonno e traguardi importanti.",
+    "push": "Notifiche Push",
+    "email": "Notifiche Email",
+    "enable": "Abilita Notifiche",
+    "skipForNow": "Salta per Ora"
+  },
+  "complete": {
+    "title": "Tutto Pronto!",
+    "subtitle": "Sei pronto per iniziare il tracciamento",
+    "description": "Inizia a tracciare le attività del tuo bambino e ottieni approfondimenti personalizzati alimentati da IA.",
+    "startTracking": "Inizia Tracciamento",
+    "exploreDashboard": "Esplora Dashboard"
+  },
+  "navigation": {
+    "next": "Avanti",
+    "back": "Indietro",
+    "skip": "Salta",
+    "finish": "Fine"
+  },
+  "progress": {
+    "step": "Passo {{current}} di {{total}}"
+  }
+}
\ No newline at end of file
diff --git a/maternal-web/locales/it/settings.json b/maternal-web/locales/it/settings.json
new file mode 100644
index 0000000..d8bb6ed
--- /dev/null
+++ b/maternal-web/locales/it/settings.json
@@ -0,0 +1,147 @@
+{
+  "title": "Impostazioni",
+  "account": {
+    "title": "Account",
+    "profile": "Profilo",
+    "email": "Email",
+    "password": "Password",
+    "changePassword": "Cambia Password",
+    "deleteAccount": "Elimina Account",
+    "confirmDelete": "Sei sicuro di voler eliminare il tuo account? Questa azione non può essere annullata."
+  },
+  "preferences": {
+    "title": "Preferenze",
+    "language": "Lingua",
+    "measurementUnits": "Unità di Misura",
+    "metric": "Metrico (kg, cm, °C, ml)",
+    "imperial": "Imperiale (lb, in, °F, oz)",
+    "timezone": "Fuso Orario",
+    "autoDetectTimezone": "Rileva Automaticamente",
+    "timezoneUpdated": "Fuso orario aggiornato con successo",
+    "timezoneAutoDetected": "Fuso orario rilevato automaticamente",
+    "dateFormat": "Formato Data",
+    "timeFormat": "Formato Ora",
+    "12hour": "Formato 12 ore",
+    "24hour": "Formato 24 ore",
+    "timeFormatUpdated": "Formato ora aggiornato con successo",
+    "theme": "Tema",
+    "light": "Chiaro",
+    "dark": "Scuro",
+    "auto": "Automatico (Sistema)"
+  },
+  "notifications": {
+    "title": "Notifiche",
+    "push": "Notifiche Push",
+    "email": "Notifiche Email",
+    "feedingReminders": "Promemoria Alimentazione",
+    "sleepReminders": "Promemoria Sonno",
+    "milestoneAlerts": "Avvisi Traguardi",
+    "familyUpdates": "Aggiornamenti Famiglia",
+    "aiSuggestions": "Suggerimenti IA"
+  },
+  "privacy": {
+    "title": "Privacy e Sicurezza",
+    "dataSharing": "Condivisione Dati",
+    "familyAccess": "Accesso Famiglia",
+    "biometric": "Autenticazione Biometrica",
+    "enableFaceId": "Abilita Face ID",
+    "enableTouchId": "Abilita Touch ID",
+    "enableFingerprint": "Abilita Impronta Digitale",
+    "dataExport": "Esporta Dati",
+    "downloadData": "Scarica i Tuoi Dati"
+  },
+  "family": {
+    "title": "Famiglia",
+    "members": "Membri della Famiglia",
+    "inviteMember": "Invita Membro",
+    "removeMember": "Rimuovi Membro",
+    "permissions": "Permessi",
+    "role": "Ruolo",
+    "roles": {
+      "admin": "Amministratore",
+      "parent": "Genitore",
+      "caregiver": "Caregiver",
+      "viewer": "Visualizzatore"
+    }
+  },
+  "children": {
+    "title": "Bambini",
+    "addChild": "Aggiungi Bambino",
+    "editChild": "Modifica Bambino",
+    "removeChild": "Rimuovi Bambino",
+    "name": "Nome",
+    "dateOfBirth": "Data di Nascita",
+    "gender": "Genere",
+    "genders": {
+      "male": "Maschio",
+      "female": "Femmina",
+      "other": "Altro",
+      "preferNotToSay": "Preferisco non dire"
+    }
+  },
+  "subscription": {
+    "title": "Abbonamento",
+    "plan": "Piano Attuale",
+    "free": "Gratuito",
+    "premium": "Premium",
+    "upgradeToPremium": "Aggiorna a Premium",
+    "manageBilling": "Gestisci Fatturazione",
+    "cancelSubscription": "Cancella Abbonamento",
+    "renewalDate": "Data di Rinnovo",
+    "features": {
+      "unlimitedAi": "Domande IA illimitate",
+      "familySync": "Sincronizzazione famiglia",
+      "advancedAnalytics": "Analisi avanzate",
+      "exportReports": "Esporta report",
+      "prioritySupport": "Supporto prioritario"
+    }
+  },
+  "about": {
+    "title": "Informazioni",
+    "version": "Versione",
+    "termsOfService": "Termini di Servizio",
+    "privacyPolicy": "Politica sulla Privacy",
+    "helpCenter": "Centro Assistenza",
+    "contactSupport": "Contatta il Supporto",
+    "rateApp": "Valuta App",
+    "shareApp": "Condividi App"
+  },
+  "profile": {
+    "title": "Informazioni Profilo",
+    "name": "Nome",
+    "nameRequired": "Il nome non può essere vuoto",
+    "email": "Email",
+    "emailNotEditable": "L'email non può essere modificata"
+  },
+  "appearance": {
+    "title": "Aspetto",
+    "darkMode": "Modalità Scura (Prossimamente)"
+  },
+  "security": {
+    "title": "Sicurezza"
+  },
+  "sessions": {
+    "title": "Sessioni"
+  },
+  "deviceTrust": {
+    "title": "Fiducia Dispositivo"
+  },
+  "biometric": {
+    "title": "Autenticazione Biometrica"
+  },
+  "dataExport": {
+    "title": "Esportazione Dati"
+  },
+  "accountDeletion": {
+    "title": "Eliminazione Account"
+  },
+  "accountActions": {
+    "title": "Azioni Account",
+    "logout": "Esci"
+  },
+  "save": "Salva Preferenze",
+  "saving": "Salvataggio...",
+  "saved": "Impostazioni salvate con successo!",
+  "cancel": "Annulla",
+  "reset": "Ripristina Predefinito"
+}
\ No newline at end of file
diff --git a/maternal-web/locales/it/tracking.json b/maternal-web/locales/it/tracking.json
new file mode 100644
index 0000000..1f20175
--- /dev/null
+++ b/maternal-web/locales/it/tracking.json
@@ -0,0 +1,279 @@
+{
+  "title": "Tracciamento Attività",
+  "trackActivity": "Traccia Attività",
+  "selectActivity": "Seleziona un'attività da tracciare",
+  "activities": {
+    "feeding": "Alimentazione",
+    "sleep": "Sonno",
+    "diaper": "Pannolino",
+    "medicine": "Medicina",
+    "activity": "Attività"
+  },
+  "feeding": {
+    "title": "Alimentazione",
+    "addFeeding": "Aggiungi Alimentazione",
+    "type": "Tipo di Alimentazione",
+    "types": {
+      "breast": "Seno",
+      "bottle": "Biberon",
+      "solid": "Cibo Solido"
+    },
+    "side": "Lato",
+    "sides": {
+      "left": "Sinistro",
+      "right": "Destro",
+      "both": "Entrambi"
+    },
+    "amount": "Quantità",
+    "duration": "Durata",
+    "startTime": "Avvia Timer",
+    "endTime": "Ferma Timer",
+    "reset": "Reimposta",
+    "notes": "Note",
+    "bottleType": "Tipo di Biberon",
+    "bottleTypes": {
+      "formula": "Latte Artificiale",
+      "breastmilk": "Latte Materno",
+      "other": "Altro"
+    },
+    "foodDescription": "Descrizione Cibo",
+    "amountDescription": "Descrizione Quantità",
+    "placeholders": {
+      "amount": "Inserisci quantità",
+      "notes": "Aggiungi note su questa alimentazione...",
+      "duration": "O inserisci durata manualmente",
+      "foodDescription": "es., Cereali di riso, Purea di banana",
+      "amountDescription": "es., 1/4 tazza, 2 cucchiai"
+    },
+    "units": {
+      "ml": "ml",
+      "oz": "oz",
+      "minutes": "minuti"
+    },
+    "validation": {
+      "durationRequired": "Per favore inserisci la durata o usa il timer",
+      "amountRequired": "Per favore inserisci la quantità",
+      "foodRequired": "Per favore inserisci la descrizione del cibo"
+    },
+    "success": "Alimentazione registrata con successo!",
+    "deleted": "Alimentazione eliminata con successo",
+    "recentFeedings": "Alimentazioni Recenti",
+    "error": {
+      "saveFailed": "Salvataggio alimentazione fallito",
+      "deleteFailed": "Eliminazione alimentazione fallita"
+    }
+  },
+  "sleep": {
+    "title": "Sonno",
+    "addSleep": "Aggiungi Sonno",
+    "logSleep": "Registra Sonno",
+    "startTime": "Inizio Sonno",
+    "endTime": "Fine Sonno",
+    "duration": "Durata",
+    "quality": "Qualità",
+    "qualities": {
+      "poor": "Scarsa",
+      "fair": "Discreta",
+      "good": "Buona",
+      "excellent": "Eccellente"
+    },
+    "location": "Posizione",
+    "locations": {
+      "crib": "Culla",
+      "bed": "Letto",
+      "stroller": "Passeggino",
+      "carrier": "Marsupio",
+      "other": "Altro"
+    },
+    "status": {
+      "title": "Stato del Sonno",
+      "completed": "Completato (ha ora di fine)",
+      "ongoing": "In corso (sta ancora dormendo)"
+    },
+    "now": "Ora",
+    "notes": "Note",
+    "placeholders": {
+      "notes": "Aggiungi note su questa sessione di sonno..."
+    },
+    "recentSleeps": "Sonni Recenti",
+    "success": "Sonno registrato con successo!",
+    "deleted": "Sonno eliminato con successo",
+    "ongoing_duration": "In corso - {{duration}}"
+  },
+  "diaper": {
+    "title": "Pannolino",
+    "addDiaper": "Aggiungi Cambio Pannolino",
+    "logDiaper": "Registra Cambio Pannolino",
+    "type": "Tipo",
+    "types": {
+      "wet": "Bagnato",
+      "dirty": "Sporco",
+      "both": "Entrambi",
+      "dry": "Asciutto"
+    },
+    "time": "Ora",
+    "now": "Ora",
+    "conditions": {
+      "title": "Condizioni",
+      "normal": "Normale",
+      "soft": "Morbido",
+      "hard": "Duro",
+      "watery": "Acquoso",
+      "mucus": "Muco",
+      "blood": "Sangue"
+    },
+    "rash": {
+      "title": "Ha Eritema",
+      "yes": "Sì",
+      "no": "No",
+      "severity": "Gravità Eritema",
+      "alert": "Eritema da pannolino rilevato. Considera l'applicazione di crema per eritema e consulta il tuo pediatra se persiste.",
+      "severities": {
+        "mild": "Lieve",
+        "moderate": "Moderato",
+        "severe": "Grave"
+      }
+    },
+    "notes": "Note",
+    "placeholders": {
+      "notes": "Aggiungi note su questo cambio pannolino..."
+    },
+    "recentDiapers": "Cambi Pannolino Recenti",
+    "success": "Cambio pannolino registrato con successo!",
+    "deleted": "Cambio pannolino eliminato con successo"
+  },
+  "milestone": {
+    "title": "Traguardo",
+    "addMilestone": "Aggiungi Traguardo",
+    "category": "Categoria",
+    "categories": {
+      "physical": "Fisico",
+      "cognitive": "Cognitivo",
+      "social": "Sociale",
+      "language": "Linguaggio"
+    },
+    "description": "Descrizione",
+    "date": "Data",
+    "notes": "Note",
+    "placeholders": {
+      "description": "Descrivi il traguardo...",
+      "notes": "Aggiungi note aggiuntive..."
+    }
+  },
+  "health": {
+    "title": "Salute",
+    "addHealth": "Aggiungi Record Salute",
+    "type": "Tipo",
+    "types": {
+      "temperature": "Temperatura",
+      "medication": "Farmaco",
+      "symptom": "Sintomo",
+      "doctor": "Visita Medica"
+    },
+    "temperature": "Temperatura",
+    "medication": "Farmaco",
+    "medicineInfo": "Informazioni Medicina",
+    "medicineName": {
+      "label": "Nome Medicina",
+      "placeholder": "es., Paracetamolo, Ibuprofene",
+      "required": "Per favore inserisci il nome della medicina"
+    },
+    "dosage": {
+      "label": "Dosaggio",
+      "placeholder": "es., 5, 2.5",
+      "required": "Per favore inserisci il dosaggio"
+    },
+    "unit": "Unità",
+    "route": {
+      "label": "Via",
+      "oral": "Orale",
+      "topical": "Topica",
+      "injection": "Iniezione",
+      "other": "Altro"
+    },
+    "reason": {
+      "label": "Motivo (opzionale)",
+      "placeholder": "es., Febbre, Dolore, Allergia"
+    },
+    "logMedicine": "Registra Medicina",
+    "recentMedicines": "Medicine Recenti",
+    "success": "Medicina registrata con successo!",
+    "error": "Salvataggio medicina fallito",
+    "deleted": "Medicina eliminata con successo",
+    "deleteError": "Eliminazione medicina fallita",
+    "symptom": "Sintomo",
+    "severity": "Gravità",
+    "severities": {
+      "mild": "Lieve",
+      "moderate": "Moderato",
+      "severe": "Grave"
+    },
+    "notes": "Note",
+    "placeholders": {
+      "medication": "Nome farmaco",
+      "dosage": "Quantità dosaggio",
+      "symptom": "Descrivi sintomo",
+      "notes": "Aggiungi note..."
+    },
+    "units": {
+      "ml": "ml",
+      "mg": "mg",
+      "tsp": "cucchiaino",
+      "tbsp": "cucchiaio",
+      "drops": "gocce",
+      "tablet": "compressa/e",
+      "celsius": "°C",
+      "fahrenheit": "°F"
+    }
+  },
+  "activity": {
+    "title": "Attività",
+    "addActivity": "Aggiungi Attività",
+    "logActivity": "Registra Attività",
+    "type": "Tipo di Attività",
+    "types": {
+      "play": "Gioco",
+      "tummyTime": "Tempo a Pancia in Giù",
+      "walk": "Passeggiata",
+      "music": "Musica",
+      "reading": "Lettura",
+      "outdoor": "Gioco all'Aperto",
+      "other": "Altro"
+    },
+    "duration": "Durata (minuti)",
+    "description": "Descrizione",
+    "notes": "Note",
+    "placeholders": {
+      "duration": "Inserisci durata in minuti",
+      "description": "Descrivi l'attività...",
+      "notes": "Aggiungi note..."
+    },
+    "recentActivities": "Attività Recenti",
+    "success": "Attività registrata con successo!",
+    "deleted": "Attività eliminata con successo"
+  },
+  "common": {
+    "selectChild": "Seleziona Bambino",
+    "cancel": "Annulla",
+    "delete": "Elimina",
+    "loading": "Caricamento...",
+    "noChildrenAdded": "Nessun Bambino Aggiunto",
+    "noChildrenMessage": "Devi aggiungere un bambino prima di poter tracciare attività",
+    "addChild": "Aggiungi Bambino",
+    "recentActivities": "Attività Recenti",
+    "error": {
+      "loadChildrenFailed": "Caricamento bambini fallito"
+    }
+  },
+  "quickLog": "Registrazione Rapida",
+  "viewHistory": "Visualizza Cronologia",
+  "editEntry": "Modifica Voce",
+  "deleteEntry": "Elimina Voce",
+  "confirmDelete": "Sei sicuro di voler eliminare questa voce?",
+  "filterByType": "Filtra per Tipo",
+  "filterByChild": "Filtra per Bambino",
+  "sortByNewest": "Più Recente Prima",
+  "sortByOldest": "Più Vecchio Prima",
+  "noEntries": "Nessuna voce ancora",
+  "addFirstEntry": "Aggiungi la tua prima voce per iniziare il tracciamento"
+}
\ No newline at end of file
diff --git a/maternal-web/locales/pt/ai.json b/maternal-web/locales/pt/ai.json
index 37eba91..d210c51 100644
--- a/maternal-web/locales/pt/ai.json
+++ b/maternal-web/locales/pt/ai.json
@@ -1,62 +1,107 @@
 {
-  "title": "AI Assistant",
-  "subtitle": "24/7 Parenting Support",
+  "title": "Assistente IA",
+  "subtitle": "Suporte Parental 24/7",
   "chat": {
-    "placeholder": "Ask me anything about parenting...",
-    "send": "Send",
-    "listening": "Listening...",
-    "processing": "Processing...",
-    "thinking": "Thinking...",
-    "typing": "AI is typing...",
-    "voiceInput": "Voice Input",
-    "textInput": "Text Input",
-    "newChat": "New Chat",
-    "clearChat": "Clear Chat",
-    "confirmClear": "Are you sure you want to clear this chat?",
-    "noMessages": "No messages yet",
-    "startConversation": "Start a conversation with your AI assistant"
+    "placeholder": "Pergunte-me qualquer coisa sobre parentalidade...",
+    "send": "Enviar",
+    "listening": "Ouvindo...",
+    "processing": "Processando...",
+    "thinking": "Pensando...",
+    "typing": "IA está digitando...",
+    "voiceInput": "Entrada de Voz",
+    "textInput": "Entrada de Texto",
+    "newChat": "Nova Conversa",
+    "clearChat": "Limpar Conversa",
+    "confirmClear": "Tem certeza de que deseja limpar esta conversa?",
+    "noMessages": "Ainda não há mensagens",
+    "startConversation": "Inicie uma conversa com seu assistente IA"
   },
   "suggestions": {
-    "title": "Suggested Questions",
-    "sleepPattern": "How can I improve my baby's sleep pattern?",
-    "feeding": "How much should my baby be eating?",
-    "development": "What milestones should I expect this month?",
-    "health": "When should I be concerned about a fever?"
+    "title": "Perguntas Sugeridas",
+    "sleepPattern": "Como posso melhorar o padrão de sono do meu bebê?",
+    "feeding": "Quanto meu bebê deveria estar comendo?",
+    "development": "Que marcos devo esperar este mês?",
+    "health": "Quando devo me preocupar com febre?"
   },
   "context": {
-    "analyzing": "Analyzing your child's patterns...",
-    "usingRecent": "Using recent activity data",
-    "basedOn": "Based on {{childName}}'s profile"
+    "analyzing": "Analisando os padrões do seu filho...",
+    "usingRecent": "Usando dados de atividade recentes",
+    "basedOn": "Baseado no perfil de {{childName}}"
   },
   "disclaimer": {
-    "title": "Important Disclaimer",
-    "message": "This AI assistant provides general parenting guidance and is not a substitute for professional medical advice. Always consult with your pediatrician for medical concerns.",
-    "emergency": "In case of emergency, call emergency services immediately.",
-    "understand": "I Understand"
+    "title": "Aviso Importante",
+    "message": "Este assistente IA fornece orientação geral sobre parentalidade e não substitui conselhos médicos profissionais. Sempre consulte seu pediatra para preocupações médicas.",
+    "emergency": "Em caso de emergência, ligue para os serviços de emergência imediatamente.",
+    "understand": "Entendo"
   },
   "limits": {
-    "dailyLimit": "Daily question limit reached",
-    "dailyLimitMessage": "You've reached your daily limit of {{limit}} questions. Upgrade to premium for unlimited access.",
-    "upgrade": "Upgrade to Premium"
+    "dailyLimit": "Limite diário de perguntas atingido",
+    "dailyLimitMessage": "Você atingiu seu limite diário de {{limit}} perguntas. Atualize para premium para acesso ilimitado.",
+    "upgrade": "Atualizar para Premium"
   },
   "history": {
-    "title": "Chat History",
-    "today": "Today",
-    "yesterday": "Yesterday",
-    "thisWeek": "This Week",
-    "older": "Older",
-    "noHistory": "No chat history",
-    "delete": "Delete Chat",
-    "confirmDelete": "Are you sure you want to delete this chat?"
+    "title": "Histórico de Conversas",
+    "today": "Hoje",
+    "yesterday": "Ontem",
+    "thisWeek": "Esta Semana",
+    "older": "Mais Antigo",
+    "noHistory": "Sem histórico de conversas",
+    "delete": "Excluir Conversa",
+    "confirmDelete": "Tem certeza de que deseja excluir esta conversa?"
   },
   "topics": {
-    "sleep": "Sleep",
-    "feeding": "Feeding",
-    "development": "Development",
-    "health": "Health",
-    "behavior": "Behavior",
-    "safety": "Safety",
-    "nutrition": "Nutrition",
-    "general": "General"
+    "sleep": "Sono",
+    "feeding": "Alimentação",
+    "development": "Desenvolvimento",
+    "health": "Saúde",
+    "behavior": "Comportamento",
+    "safety": "Segurança",
+    "nutrition": "Nutrição",
+    "general": "Geral"
+  },
+  "interface": {
+    "assistantTitle": "Assistente IA Parental",
+    "assistantSubtitle": "Pergunte-me qualquer coisa sobre parentalidade e cuidados infantis",
+    "greeting": "Olá {{name}}! Como posso ajudá-lo hoje?",
+    "inputPlaceholder": "Pergunte-me qualquer coisa...",
+    "closeDrawer": "Fechar gaveta",
+    "moreOptions": "Mais opções",
+    "deleteConversation": "Excluir conversa",
+    "chatCount": "{{count}} conversa",
+    "chatCount_plural": "{{count}} conversas",
+    "ungrouped": "Não agrupado",
+    "errorMessage": "Desculpe, encontrei um erro. Por favor, tente novamente.",
+    "disclaimerFooter": "Este assistente IA fornece informações gerais. Sempre consulte profissionais de saúde para conselhos médicos.",
+    "deleteDialogTitle": "Excluir Conversa",
+    "deleteDialogMessage": "Tem certeza de que deseja excluir esta conversa? Esta ação não pode ser desfeita.",
+    "cancel": "Cancelar",
+    "delete": "Excluir",
+    "moveToGroup": "Mover para Grupo",
+    "createNewGroup": "Criar Novo Grupo",
+    "groupNameLabel": "Nome do Grupo",
+    "create": "Criar",
+    "suggestedQuestion1": "Quanto meu bebê deveria dormir aos 3 meses?",
+    "suggestedQuestion2": "Quais são os padrões normais de alimentação?",
+    "suggestedQuestion3": "Quando devo introduzir alimentos sólidos?",
+    "suggestedQuestion4": "Dicas para uma melhor rotina de sono",
+    "thinking1": "Coletando sabedoria de bebês...",
+    "thinking2": "Consultando os livros de bebês...",
+    "thinking3": "Preparando a resposta perfeita...",
+    "thinking4": "Aquecendo alguns conselhos...",
+    "thinking5": "Preparando sua mamadeira de conhecimento...",
+    "thinking6": "Contando dedinhos das mãos e pés...",
+    "thinking7": "Conectando os blocos de construção...",
+    "thinking8": "Espiando a caixa de brinquedos...",
+    "thinking9": "Organizando as peças do quebra-cabeça...",
+    "thinking10": "Mexendo o potinho de comida de bebê...",
+    "thinking11": "Polindo a chupeta da sabedoria...",
+    "thinking12": "Caminhando na ponta dos pés durante a soneca...",
+    "thinking13": "Organizando a bolsa de fraldas...",
+    "thinking14": "Embrulhando sua resposta com amor...",
+    "thinking15": "Preparando uma xícara quente de orientação...",
+    "thinking16": "Tricotando alguns pensamentos...",
+    "thinking17": "Arrumando os detalhes...",
+    "thinking18": "Polvilhando um pouco de pó mágico...",
+    "thinking19": "Cantarolando uma canção de ninar enquanto penso..."
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/pt/auth.json b/maternal-web/locales/pt/auth.json
index b88be82..822c91a 100644
--- a/maternal-web/locales/pt/auth.json
+++ b/maternal-web/locales/pt/auth.json
@@ -1,88 +1,88 @@
 {
   "login": {
-    "title": "Welcome Back",
-    "subtitle": "Sign in to your account",
-    "email": "Email",
-    "password": "Password",
-    "rememberMe": "Remember me",
-    "forgotPassword": "Forgot password?",
-    "submit": "Sign In",
-    "noAccount": "Don't have an account?",
-    "signUp": "Sign up",
-    "or": "Or",
-    "continueWithGoogle": "Continue with Google",
-    "continueWithApple": "Continue with Apple",
+    "title": "Bem-vindo de Volta",
+    "subtitle": "Entre na sua conta",
+    "email": "E-mail",
+    "password": "Senha",
+    "rememberMe": "Lembrar de mim",
+    "forgotPassword": "Esqueceu a senha?",
+    "submit": "Entrar",
+    "noAccount": "Não tem uma conta?",
+    "signUp": "Cadastre-se",
+    "or": "Ou",
+    "continueWithGoogle": "Continuar com Google",
+    "continueWithApple": "Continuar com Apple",
     "biometric": {
-      "useFaceId": "Use Face ID",
-      "useTouchId": "Use Touch ID",
-      "useFingerprint": "Use Fingerprint"
+      "useFaceId": "Usar Face ID",
+      "useTouchId": "Usar Touch ID",
+      "useFingerprint": "Usar Impressão Digital"
     }
   },
   "signup": {
-    "title": "Create Account",
-    "subtitle": "Join Maternal today",
-    "name": "Full Name",
-    "email": "Email",
-    "password": "Password",
-    "confirmPassword": "Confirm Password",
-    "agreeToTerms": "I agree to the {{termsLink}} and {{privacyLink}}",
-    "termsOfService": "Terms of Service",
-    "privacyPolicy": "Privacy Policy",
-    "submit": "Create Account",
-    "hasAccount": "Already have an account?",
-    "signIn": "Sign in",
-    "or": "Or",
-    "continueWithGoogle": "Continue with Google",
-    "continueWithApple": "Continue with Apple"
+    "title": "Criar Conta",
+    "subtitle": "Junte-se ao Maternal hoje",
+    "name": "Nome Completo",
+    "email": "E-mail",
+    "password": "Senha",
+    "confirmPassword": "Confirmar Senha",
+    "agreeToTerms": "Concordo com os {{termsLink}} e a {{privacyLink}}",
+    "termsOfService": "Termos de Serviço",
+    "privacyPolicy": "Política de Privacidade",
+    "submit": "Criar Conta",
+    "hasAccount": "Já tem uma conta?",
+    "signIn": "Entrar",
+    "or": "Ou",
+    "continueWithGoogle": "Continuar com Google",
+    "continueWithApple": "Continuar com Apple"
   },
   "forgotPassword": {
-    "title": "Reset Password",
-    "subtitle": "Enter your email to receive a reset link",
-    "email": "Email",
-    "submit": "Send Reset Link",
-    "backToLogin": "Back to login",
-    "success": "Reset link sent! Check your email.",
-    "checkEmail": "We've sent a password reset link to {{email}}"
+    "title": "Redefinir Senha",
+    "subtitle": "Digite seu e-mail para receber um link de redefinição",
+    "email": "E-mail",
+    "submit": "Enviar Link de Redefinição",
+    "backToLogin": "Voltar ao login",
+    "success": "Link de redefinição enviado! Verifique seu e-mail.",
+    "checkEmail": "Enviamos um link de redefinição de senha para {{email}}"
   },
   "resetPassword": {
-    "title": "Create New Password",
-    "subtitle": "Enter your new password",
-    "password": "New Password",
-    "confirmPassword": "Confirm Password",
-    "submit": "Reset Password",
-    "success": "Password reset successfully!",
-    "backToLogin": "Back to login"
+    "title": "Criar Nova Senha",
+    "subtitle": "Digite sua nova senha",
+    "password": "Nova Senha",
+    "confirmPassword": "Confirmar Senha",
+    "submit": "Redefinir Senha",
+    "success": "Senha redefinida com sucesso!",
+    "backToLogin": "Voltar ao login"
   },
   "verification": {
-    "title": "Verify Your Email",
-    "subtitle": "We've sent a verification code to {{email}}",
-    "code": "Verification Code",
-    "submit": "Verify",
-    "resend": "Resend Code",
-    "resendIn": "Resend in {{seconds}}s",
-    "success": "Email verified successfully!",
-    "didNotReceive": "Didn't receive the code?"
+    "title": "Verifique seu E-mail",
+    "subtitle": "Enviamos um código de verificação para {{email}}",
+    "code": "Código de Verificação",
+    "submit": "Verificar",
+    "resend": "Reenviar Código",
+    "resendIn": "Reenviar em {{seconds}}s",
+    "success": "E-mail verificado com sucesso!",
+    "didNotReceive": "Não recebeu o código?"
   },
   "errors": {
-    "invalidEmail": "Please enter a valid email address",
-    "invalidPassword": "Password must be at least 8 characters",
-    "passwordMismatch": "Passwords do not match",
-    "emailRequired": "Email is required",
-    "passwordRequired": "Password is required",
-    "nameRequired": "Name is required",
-    "termsRequired": "You must agree to the terms and privacy policy",
-    "invalidCredentials": "Invalid email or password",
-    "emailExists": "An account with this email already exists",
-    "weakPassword": "Password is too weak. Please use a stronger password.",
-    "networkError": "Network error. Please try again.",
-    "unknownError": "An error occurred. Please try again."
+    "invalidEmail": "Por favor, digite um endereço de e-mail válido",
+    "invalidPassword": "A senha deve ter pelo menos 8 caracteres",
+    "passwordMismatch": "As senhas não coincidem",
+    "emailRequired": "E-mail é obrigatório",
+    "passwordRequired": "Senha é obrigatória",
+    "nameRequired": "Nome é obrigatório",
+    "termsRequired": "Você deve concordar com os termos e política de privacidade",
+    "invalidCredentials": "E-mail ou senha inválidos",
+    "emailExists": "Já existe uma conta com este e-mail",
+    "weakPassword": "A senha é muito fraca. Por favor, use uma senha mais forte.",
+    "networkError": "Erro de rede. Por favor, tente novamente.",
+    "unknownError": "Ocorreu um erro. Por favor, tente novamente."
   },
   "passwordRequirements": {
-    "title": "Password must contain:",
-    "minLength": "At least 8 characters",
-    "uppercase": "At least one uppercase letter",
-    "lowercase": "At least one lowercase letter",
-    "number": "At least one number",
-    "special": "At least one special character"
+    "title": "A senha deve conter:",
+    "minLength": "Pelo menos 8 caracteres",
+    "uppercase": "Pelo menos uma letra maiúscula",
+    "lowercase": "Pelo menos uma letra minúscula",
+    "number": "Pelo menos um número",
+    "special": "Pelo menos um caractere especial"
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/pt/children.json b/maternal-web/locales/pt/children.json
index f22e2c4..08a798d 100644
--- a/maternal-web/locales/pt/children.json
+++ b/maternal-web/locales/pt/children.json
@@ -5,16 +5,37 @@
   "addFirstChild": "Adicionar Primeira Criança",
   "editChild": "Editar Criança",
   "deleteChild": "Excluir Criança",
-  "noChildren": "Nenhuma criança adicionada ainda",
-  "noChildrenSubtitle": "Adicione sua primeira criança para começar a rastrear suas atividades",
+  "noChildren": "Ainda não há crianças adicionadas",
+  "noChildrenSubtitle": "Adicione sua primeira criança para começar a acompanhar suas atividades",
   "age": "Idade",
   "gender": {
     "male": "Masculino",
     "female": "Feminino",
     "other": "Outro"
   },
+  "dialog": {
+    "name": "Nome",
+    "birthDate": "Data de Nascimento",
+    "gender": "Gênero",
+    "photoUrl": "URL da Foto (Opcional)",
+    "photoPlaceholder": "https://example.com/photo.jpg",
+    "cancel": "Cancelar",
+    "add": "Adicionar",
+    "update": "Atualizar",
+    "saving": "Salvando...",
+    "delete": "Excluir",
+    "deleting": "Excluindo...",
+    "confirmDelete": "Confirmar Exclusão",
+    "confirmDeleteMessage": "Tem certeza de que deseja excluir",
+    "confirmDeleteWarning": "Esta ação não pode ser desfeita. Todos os dados associados serão removidos permanentemente.",
+    "validation": {
+      "nameRequired": "Por favor, digite um nome",
+      "birthDateRequired": "Por favor, selecione uma data de nascimento",
+      "birthDateFuture": "A data de nascimento não pode estar no futuro"
+    }
+  },
   "errors": {
-    "noFamily": "Nenhuma família encontrada. Por favor, complete a integração primeiro.",
+    "noFamily": "Nenhuma família encontrada. Por favor, complete a configuração inicial primeiro.",
     "loadFailed": "Falha ao carregar crianças",
     "saveFailed": "Falha ao salvar criança",
     "deleteFailed": "Falha ao excluir criança",
@@ -26,4 +47,4 @@
     "month": "mês",
     "months": "meses"
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/pt/common.json b/maternal-web/locales/pt/common.json
index b1c4b28..562783c 100644
--- a/maternal-web/locales/pt/common.json
+++ b/maternal-web/locales/pt/common.json
@@ -1,6 +1,6 @@
 {
   "appName": "Maternal",
-  "appDescription": "Assistente de Cuidados Infantis com IA",
+  "appDescription": "Assistente de Cuidados Infantis Alimentado por IA",
   "welcome": "Bem-vindo",
   "loading": "Carregando...",
   "save": "Salvar",
@@ -13,12 +13,12 @@
   "back": "Voltar",
   "next": "Próximo",
   "previous": "Anterior",
-  "finish": "Concluir",
+  "finish": "Finalizar",
   "search": "Pesquisar",
   "filter": "Filtrar",
   "sort": "Ordenar",
   "refresh": "Atualizar",
-  "retry": "Tentar novamente",
+  "retry": "Tentar Novamente",
   "continue": "Continuar",
   "submit": "Enviar",
   "reset": "Redefinir",
@@ -58,13 +58,13 @@
   "navigation": {
     "home": "Início",
     "dashboard": "Painel",
-    "tracking": "Rastreamento",
-    "trackActivity": "Registrar Atividade",
-    "track": "Registrar",
+    "tracking": "Acompanhamento",
+    "trackActivity": "Acompanhar Atividade",
+    "track": "Acompanhar",
     "ai": "Assistente IA",
     "aiChat": "Chat IA",
     "family": "Família",
-    "insights": "Análises",
+    "insights": "Insights",
     "children": "Crianças",
     "settings": "Configurações",
     "logout": "Sair"
@@ -76,4 +76,4 @@
     "offline": "Offline",
     "familyMembersOnline": "{{count}} membros da família online"
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/pt/dashboard.json b/maternal-web/locales/pt/dashboard.json
index a0244e6..98af786 100644
--- a/maternal-web/locales/pt/dashboard.json
+++ b/maternal-web/locales/pt/dashboard.json
@@ -1,7 +1,7 @@
 {
-  "welcomeBack": "Bem-vindo de volta",
+  "welcomeBack": "Bem-vindo de Volta",
   "welcomeBackWithName": "Bem-vindo de volta, {{name}}!",
-  "subtitle": "Acompanhe as atividades do seu filho e obtenha insights impulsionados por IA",
+  "subtitle": "Acompanhe as atividades do seu filho e obtenha insights alimentados por IA",
   "quickActions": {
     "title": "Ações Rápidas",
     "feeding": "Alimentação",
@@ -19,12 +19,12 @@
     "sleep": "Sono",
     "diapers": "Fraldas",
     "medications": "Medicamentos",
-    "noChild": "Adicione uma criança para começar a acompanhar",
-    "noActivities": "Nenhuma atividade rastreada hoje"
+    "noChild": "Adicione uma criança para começar o acompanhamento",
+    "noActivities": "Nenhuma atividade acompanhada hoje"
   },
   "predictions": {
     "title": "Próxima Atividade Prevista",
     "napTime": "Hora da soneca em {{minutes}} minutos",
     "basedOnPatterns": "Baseado nos padrões de sono do seu filho"
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/pt/errors.json b/maternal-web/locales/pt/errors.json
index 8f431e2..90e20c7 100644
--- a/maternal-web/locales/pt/errors.json
+++ b/maternal-web/locales/pt/errors.json
@@ -1,69 +1,69 @@
 {
   "general": {
-    "unknown": "An unknown error occurred",
-    "networkError": "Network error. Please check your connection.",
-    "serverError": "Server error. Please try again later.",
-    "notFound": "The requested resource was not found",
-    "unauthorized": "You are not authorized to perform this action",
-    "forbidden": "Access denied",
-    "validation": "Please check your input and try again",
-    "timeout": "Request timed out. Please try again."
+    "unknown": "Ocorreu um erro desconhecido",
+    "networkError": "Erro de rede. Por favor, verifique sua conexão.",
+    "serverError": "Erro do servidor. Por favor, tente novamente mais tarde.",
+    "notFound": "O recurso solicitado não foi encontrado",
+    "unauthorized": "Você não está autorizado a realizar esta ação",
+    "forbidden": "Acesso negado",
+    "validation": "Por favor, verifique sua entrada e tente novamente",
+    "timeout": "Tempo limite esgotado. Por favor, tente novamente."
   },
   "auth": {
-    "invalidCredentials": "Invalid email or password",
-    "emailExists": "An account with this email already exists",
-    "emailNotVerified": "Please verify your email address",
-    "accountLocked": "Your account has been locked. Please contact support.",
-    "sessionExpired": "Your session has expired. Please sign in again.",
-    "weakPassword": "Password is too weak",
-    "tokenInvalid": "Invalid or expired token",
-    "deviceNotTrusted": "Device not trusted. Please verify your device."
+    "invalidCredentials": "E-mail ou senha inválidos",
+    "emailExists": "Já existe uma conta com este e-mail",
+    "emailNotVerified": "Por favor, verifique seu endereço de e-mail",
+    "accountLocked": "Sua conta foi bloqueada. Por favor, entre em contato com o suporte.",
+    "sessionExpired": "Sua sessão expirou. Por favor, faça login novamente.",
+    "weakPassword": "A senha é muito fraca",
+    "tokenInvalid": "Token inválido ou expirado",
+    "deviceNotTrusted": "Dispositivo não confiável. Por favor, verifique seu dispositivo."
   },
   "family": {
-    "limitExceeded": "Family size limit exceeded",
-    "memberNotFound": "Family member not found",
-    "cannotRemoveSelf": "You cannot remove yourself from the family",
-    "insufficientPermissions": "You don't have permission to perform this action",
-    "invitationExpired": "This invitation has expired",
-    "alreadyMember": "This person is already a family member"
+    "limitExceeded": "Limite de tamanho da família excedido",
+    "memberNotFound": "Membro da família não encontrado",
+    "cannotRemoveSelf": "Você não pode se remover da família",
+    "insufficientPermissions": "Você não tem permissão para realizar esta ação",
+    "invitationExpired": "Este convite expirou",
+    "alreadyMember": "Esta pessoa já é membro da família"
   },
   "child": {
-    "notFound": "Child profile not found",
-    "invalidAge": "Invalid age. Please check the date of birth.",
-    "limitExceeded": "You've reached the maximum number of children"
+    "notFound": "Perfil da criança não encontrado",
+    "invalidAge": "Idade inválida. Por favor, verifique a data de nascimento.",
+    "limitExceeded": "Você atingiu o número máximo de crianças"
   },
   "tracking": {
-    "invalidData": "Invalid tracking data",
-    "futureDate": "You cannot log activities in the future",
-    "duplicateEntry": "A similar entry already exists",
-    "invalidDuration": "Invalid duration",
-    "invalidAmount": "Invalid amount"
+    "invalidData": "Dados de acompanhamento inválidos",
+    "futureDate": "Você não pode registrar atividades no futuro",
+    "duplicateEntry": "Uma entrada similar já existe",
+    "invalidDuration": "Duração inválida",
+    "invalidAmount": "Quantidade inválida"
   },
   "ai": {
-    "dailyLimitReached": "Daily AI question limit reached",
-    "contextError": "Failed to load context for AI",
-    "responseError": "Failed to generate AI response",
-    "moderationFlag": "Your message was flagged by our content moderation system"
+    "dailyLimitReached": "Limite diário de perguntas IA atingido",
+    "contextError": "Falha ao carregar contexto para IA",
+    "responseError": "Falha ao gerar resposta IA",
+    "moderationFlag": "Sua mensagem foi sinalizada pelo nosso sistema de moderação de conteúdo"
   },
   "offline": {
-    "noConnection": "No internet connection",
-    "syncFailed": "Failed to sync data",
-    "pendingChanges": "You have pending changes that need to be synced"
+    "noConnection": "Sem conexão com a internet",
+    "syncFailed": "Falha ao sincronizar dados",
+    "pendingChanges": "Você tem alterações pendentes que precisam ser sincronizadas"
   },
   "validation": {
-    "required": "This field is required",
-    "invalidEmail": "Please enter a valid email address",
-    "invalidPhone": "Please enter a valid phone number",
-    "invalidDate": "Please enter a valid date",
-    "minLength": "Must be at least {{min}} characters",
-    "maxLength": "Must be no more than {{max}} characters",
-    "minValue": "Must be at least {{min}}",
-    "maxValue": "Must be no more than {{max}}",
-    "invalidFormat": "Invalid format",
-    "passwordMismatch": "Passwords do not match"
+    "required": "Este campo é obrigatório",
+    "invalidEmail": "Por favor, digite um endereço de e-mail válido",
+    "invalidPhone": "Por favor, digite um número de telefone válido",
+    "invalidDate": "Por favor, digite uma data válida",
+    "minLength": "Deve ter pelo menos {{min}} caracteres",
+    "maxLength": "Não deve ter mais de {{max}} caracteres",
+    "minValue": "Deve ser pelo menos {{min}}",
+    "maxValue": "Não deve ser mais de {{max}}",
+    "invalidFormat": "Formato inválido",
+    "passwordMismatch": "As senhas não coincidem"
   },
-  "retry": "Retry",
-  "goBack": "Go Back",
-  "contactSupport": "Contact Support",
-  "dismiss": "Dismiss"
-}
+  "retry": "Tentar Novamente",
+  "goBack": "Voltar",
+  "contactSupport": "Entrar em Contato com o Suporte",
+  "dismiss": "Dispensar"
+}
\ No newline at end of file
diff --git a/maternal-web/locales/pt/family.json b/maternal-web/locales/pt/family.json
new file mode 100644
index 0000000..5c7d927
--- /dev/null
+++ b/maternal-web/locales/pt/family.json
@@ -0,0 +1,43 @@
+{
+  "pageTitle": "Family",
+  "pageSubtitle": "Manage your family members and share access",
+  "buttons": {
+    "joinFamily": "Join Family",
+    "inviteMember": "Invite Member",
+    "copyCode": "Copy Code",
+    "inviteFirstMember": "Invite First Member"
+  },
+  "shareCode": {
+    "title": "Family Share Code",
+    "description": "Share this code with family members to give them access to your family's data"
+  },
+  "members": {
+    "title": "Family Members ({{count}})",
+    "noMembers": "No family members yet",
+    "noMembersDescription": "Invite family members to collaborate on child care",
+    "youLabel": "You",
+    "removeAriaLabel": "Remove {{name}} from family"
+  },
+  "roles": {
+    "parent": "Parent",
+    "caregiver": "Caregiver",
+    "viewer": "Viewer"
+  },
+  "messages": {
+    "shareCodeCopied": "Share code copied to clipboard!",
+    "shareCodeCopyFailed": "Failed to copy share code",
+    "invitationSent": "Invitation sent successfully!",
+    "joinedFamily": "Successfully joined family!",
+    "memberRemoved": "Member removed successfully",
+    "noFamilyFound": "No family found. Please complete onboarding first.",
+    "failedToLoad": "Failed to load family information",
+    "noFamilyId": "No family ID found",
+    "failedToInvite": "Failed to send invitation",
+    "failedToJoin": "Failed to join family",
+    "failedToRemove": "Failed to remove member"
+  },
+  "placeholders": {
+    "unknownUser": "Unknown User",
+    "noEmail": "No email"
+  }
+}
diff --git a/maternal-web/locales/pt/insights.json b/maternal-web/locales/pt/insights.json
new file mode 100644
index 0000000..5ab7dbd
--- /dev/null
+++ b/maternal-web/locales/pt/insights.json
@@ -0,0 +1,73 @@
+{
+  "title": "Insights & Analytics",
+  "subtitle": "Track patterns and get insights about your child's activities",
+  "filters": {
+    "child": "Child",
+    "dateRange": {
+      "7days": "7 Days",
+      "30days": "30 Days",
+      "3months": "3 Months"
+    }
+  },
+  "stats": {
+    "feedings": {
+      "title": "Feedings",
+      "subtitle": "Total count"
+    },
+    "sleep": {
+      "title": "Sleep",
+      "subtitle": "Average per day"
+    },
+    "diapers": {
+      "title": "Diapers",
+      "subtitle": "Total changes"
+    },
+    "topActivity": {
+      "title": "Top Activity",
+      "subtitle": "Most frequent"
+    }
+  },
+  "charts": {
+    "feedingFrequency": "Feeding Frequency",
+    "sleepDuration": "Sleep Duration (Hours)",
+    "diaperChangesByType": "Diaper Changes by Type",
+    "activityTimeline": "Activity Timeline",
+    "activityDistribution": "Activity Distribution",
+    "chartLabels": {
+      "feedings": "Feedings",
+      "diapers": "Diapers",
+      "sleepHours": "Sleep (hrs)"
+    }
+  },
+  "recentActivities": {
+    "title": "Recent Activities (Last 20)"
+  },
+  "emptyStates": {
+    "noChildren": {
+      "title": "No Children Added",
+      "message": "Add a child to view insights and analytics",
+      "action": "Add Child"
+    },
+    "noActivities": "No activities found for the selected date range. Start tracking activities to see insights!"
+  },
+  "errors": {
+    "loadChildren": "Failed to load children",
+    "loadActivities": "Failed to load activities"
+  },
+  "activityTypes": {
+    "feeding": "Feeding",
+    "sleep": "Sleep",
+    "diaper": "Diaper",
+    "medication": "Medication",
+    "milestone": "Milestone",
+    "note": "Note",
+    "none": "None"
+  },
+  "diaperTypes": {
+    "wet": "Wet",
+    "dirty": "Dirty",
+    "both": "Both",
+    "dry": "Dry",
+    "unknown": "Unknown"
+  }
+}
diff --git a/maternal-web/locales/pt/onboarding.json b/maternal-web/locales/pt/onboarding.json
index 18e744c..9862b89 100644
--- a/maternal-web/locales/pt/onboarding.json
+++ b/maternal-web/locales/pt/onboarding.json
@@ -1,99 +1,99 @@
 {
   "welcome": {
-    "title": "Welcome to Maternal",
-    "subtitle": "Your AI-powered child care assistant",
-    "description": "Track activities, get AI-powered insights, and coordinate with your family—all in one place.",
-    "getStarted": "Get Started",
-    "skip": "Skip"
+    "title": "Bem-vindo ao Maternal",
+    "subtitle": "Seu assistente de cuidados infantis alimentado por IA",
+    "description": "Acompanhe atividades, obtenha insights alimentados por IA e coordene com sua família, tudo em um só lugar.",
+    "getStarted": "Começar",
+    "skip": "Pular"
   },
   "language": {
-    "title": "Choose Your Language",
-    "subtitle": "Select your preferred language",
-    "description": "You can change this later in settings"
+    "title": "Escolha Seu Idioma",
+    "subtitle": "Selecione seu idioma preferido",
+    "description": "Você pode alterar isso mais tarde nas configurações"
   },
   "measurements": {
-    "title": "Measurement Units",
-    "subtitle": "Choose your preferred unit system",
-    "description": "Select the measurement system you're most comfortable with. You can change this later in settings.",
+    "title": "Unidades de Medida",
+    "subtitle": "Escolha seu sistema de unidades preferido",
+    "description": "Selecione o sistema de medidas com o qual você se sente mais confortável. Você pode alterar isso mais tarde nas configurações.",
     "metric": {
-      "title": "Metric",
-      "description": "Kilograms, centimeters, Celsius, milliliters"
+      "title": "Métrico",
+      "description": "Quilogramas, centímetros, Celsius, mililitros"
     },
     "imperial": {
       "title": "Imperial",
-      "description": "Pounds, inches, Fahrenheit, ounces"
+      "description": "Libras, polegadas, Fahrenheit, onças"
     }
   },
   "profile": {
-    "title": "Create Your Profile",
-    "subtitle": "Tell us about yourself",
-    "name": "Your Name",
-    "email": "Email Address",
-    "password": "Password",
-    "confirmPassword": "Confirm Password",
-    "relation": "Relation to Child",
+    "title": "Crie Seu Perfil",
+    "subtitle": "Conte-nos sobre você",
+    "name": "Seu Nome",
+    "email": "Endereço de E-mail",
+    "password": "Senha",
+    "confirmPassword": "Confirmar Senha",
+    "relation": "Relação com a Criança",
     "relations": {
-      "mother": "Mother",
-      "father": "Father",
-      "guardian": "Guardian",
-      "caregiver": "Caregiver",
-      "other": "Other"
+      "mother": "Mãe",
+      "father": "Pai",
+      "guardian": "Responsável",
+      "caregiver": "Cuidador",
+      "other": "Outro"
     }
   },
   "child": {
-    "title": "Add Your Child",
-    "subtitle": "Let's start with your first child",
-    "name": "Child's Name",
-    "dateOfBirth": "Date of Birth",
-    "gender": "Gender",
+    "title": "Adicione Sua Criança",
+    "subtitle": "Vamos começar com sua primeira criança",
+    "name": "Nome da Criança",
+    "dateOfBirth": "Data de Nascimento",
+    "gender": "Gênero",
     "genders": {
-      "male": "Male",
-      "female": "Female",
-      "other": "Other",
-      "preferNotToSay": "Prefer not to say"
+      "male": "Masculino",
+      "female": "Feminino",
+      "other": "Outro",
+      "preferNotToSay": "Prefiro não dizer"
     },
-    "weight": "Current Weight",
-    "height": "Current Height",
-    "addAnother": "Add Another Child",
-    "skipForNow": "Skip for Now"
+    "weight": "Peso Atual",
+    "height": "Altura Atual",
+    "addAnother": "Adicionar Outra Criança",
+    "skipForNow": "Pular por Agora"
   },
   "family": {
-    "title": "Invite Family Members",
-    "subtitle": "Coordinate with your family",
-    "description": "Invite family members to view and track activities together. They'll receive an email invitation.",
-    "email": "Family Member's Email",
-    "role": "Role",
+    "title": "Convidar Membros da Família",
+    "subtitle": "Coordene com sua família",
+    "description": "Convide membros da família para visualizar e acompanhar atividades juntos. Eles receberão um convite por e-mail.",
+    "email": "E-mail do Membro da Família",
+    "role": "Função",
     "roles": {
-      "parent": "Parent",
-      "caregiver": "Caregiver",
-      "viewer": "Viewer"
+      "parent": "Pai/Mãe",
+      "caregiver": "Cuidador",
+      "viewer": "Visualizador"
     },
-    "addMember": "Add Member",
-    "inviteLater": "I'll Invite Later"
+    "addMember": "Adicionar Membro",
+    "inviteLater": "Convidarei Mais Tarde"
   },
   "notifications": {
-    "title": "Enable Notifications",
-    "subtitle": "Stay informed",
-    "description": "Get reminders for feedings, sleep times, and important milestones.",
-    "push": "Push Notifications",
-    "email": "Email Notifications",
-    "enable": "Enable Notifications",
-    "skipForNow": "Skip for Now"
+    "title": "Ativar Notificações",
+    "subtitle": "Mantenha-se informado",
+    "description": "Receba lembretes para alimentações, horários de sono e marcos importantes.",
+    "push": "Notificações Push",
+    "email": "Notificações por E-mail",
+    "enable": "Ativar Notificações",
+    "skipForNow": "Pular por Agora"
   },
   "complete": {
-    "title": "All Set!",
-    "subtitle": "You're ready to start tracking",
-    "description": "Start tracking your child's activities and get personalized AI-powered insights.",
-    "startTracking": "Start Tracking",
-    "exploreDashboard": "Explore Dashboard"
+    "title": "Tudo Pronto!",
+    "subtitle": "Você está pronto para começar o acompanhamento",
+    "description": "Comece a acompanhar as atividades do seu filho e obtenha insights personalizados alimentados por IA.",
+    "startTracking": "Começar Acompanhamento",
+    "exploreDashboard": "Explorar Painel"
   },
   "navigation": {
-    "next": "Next",
-    "back": "Back",
-    "skip": "Skip",
-    "finish": "Finish"
+    "next": "Próximo",
+    "back": "Voltar",
+    "skip": "Pular",
+    "finish": "Finalizar"
   },
   "progress": {
-    "step": "Step {{current}} of {{total}}"
+    "step": "Passo {{current}} de {{total}}"
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/pt/settings.json b/maternal-web/locales/pt/settings.json
index 9e7198e..bf1e96b 100644
--- a/maternal-web/locales/pt/settings.json
+++ b/maternal-web/locales/pt/settings.json
@@ -1,108 +1,147 @@
 {
-  "title": "Settings",
+  "title": "Configurações",
   "account": {
-    "title": "Account",
-    "profile": "Profile",
-    "email": "Email",
-    "password": "Password",
-    "changePassword": "Change Password",
-    "deleteAccount": "Delete Account",
-    "confirmDelete": "Are you sure you want to delete your account? This action cannot be undone."
+    "title": "Conta",
+    "profile": "Perfil",
+    "email": "E-mail",
+    "password": "Senha",
+    "changePassword": "Alterar Senha",
+    "deleteAccount": "Excluir Conta",
+    "confirmDelete": "Tem certeza de que deseja excluir sua conta? Esta ação não pode ser desfeita."
   },
   "preferences": {
-    "title": "Preferences",
-    "language": "Language",
-    "measurementUnits": "Measurement Units",
-    "metric": "Metric (kg, cm, °C, ml)",
+    "title": "Preferências",
+    "language": "Idioma",
+    "measurementUnits": "Unidades de Medida",
+    "metric": "Métrico (kg, cm, °C, ml)",
     "imperial": "Imperial (lb, in, °F, oz)",
-    "dateFormat": "Date Format",
-    "timeFormat": "Time Format",
-    "12hour": "12-hour",
-    "24hour": "24-hour",
-    "theme": "Theme",
-    "light": "Light",
-    "dark": "Dark",
-    "auto": "Auto (System)"
+    "timezone": "Fuso Horário",
+    "autoDetectTimezone": "Detectar Automaticamente",
+    "timezoneUpdated": "Fuso horário atualizado com sucesso",
+    "timezoneAutoDetected": "Fuso horário detectado automaticamente",
+    "dateFormat": "Formato de Data",
+    "timeFormat": "Formato de Hora",
+    "12hour": "Formato de 12 horas",
+    "24hour": "Formato de 24 horas",
+    "timeFormatUpdated": "Formato de hora atualizado com sucesso",
+    "theme": "Tema",
+    "light": "Claro",
+    "dark": "Escuro",
+    "auto": "Automático (Sistema)"
   },
   "notifications": {
-    "title": "Notifications",
-    "push": "Push Notifications",
-    "email": "Email Notifications",
-    "feedingReminders": "Feeding Reminders",
-    "sleepReminders": "Sleep Reminders",
-    "milestoneAlerts": "Milestone Alerts",
-    "familyUpdates": "Family Updates",
-    "aiSuggestions": "AI Suggestions"
+    "title": "Notificações",
+    "push": "Notificações Push",
+    "email": "Notificações por E-mail",
+    "feedingReminders": "Lembretes de Alimentação",
+    "sleepReminders": "Lembretes de Sono",
+    "milestoneAlerts": "Alertas de Marcos",
+    "familyUpdates": "Atualizações da Família",
+    "aiSuggestions": "Sugestões de IA"
   },
   "privacy": {
-    "title": "Privacy & Security",
-    "dataSharing": "Data Sharing",
-    "familyAccess": "Family Access",
-    "biometric": "Biometric Authentication",
-    "enableFaceId": "Enable Face ID",
-    "enableTouchId": "Enable Touch ID",
-    "enableFingerprint": "Enable Fingerprint",
-    "dataExport": "Export Data",
-    "downloadData": "Download Your Data"
+    "title": "Privacidade e Segurança",
+    "dataSharing": "Compartilhamento de Dados",
+    "familyAccess": "Acesso da Família",
+    "biometric": "Autenticação Biométrica",
+    "enableFaceId": "Ativar Face ID",
+    "enableTouchId": "Ativar Touch ID",
+    "enableFingerprint": "Ativar Impressão Digital",
+    "dataExport": "Exportar Dados",
+    "downloadData": "Baixar Seus Dados"
   },
   "family": {
-    "title": "Family",
-    "members": "Family Members",
-    "inviteMember": "Invite Member",
-    "removeMember": "Remove Member",
-    "permissions": "Permissions",
-    "role": "Role",
+    "title": "Família",
+    "members": "Membros da Família",
+    "inviteMember": "Convidar Membro",
+    "removeMember": "Remover Membro",
+    "permissions": "Permissões",
+    "role": "Função",
     "roles": {
-      "admin": "Admin",
-      "parent": "Parent",
-      "caregiver": "Caregiver",
-      "viewer": "Viewer"
+      "admin": "Administrador",
+      "parent": "Pai/Mãe",
+      "caregiver": "Cuidador",
+      "viewer": "Visualizador"
     }
   },
   "children": {
-    "title": "Children",
-    "addChild": "Add Child",
-    "editChild": "Edit Child",
-    "removeChild": "Remove Child",
-    "name": "Name",
-    "dateOfBirth": "Date of Birth",
-    "gender": "Gender",
+    "title": "Crianças",
+    "addChild": "Adicionar Criança",
+    "editChild": "Editar Criança",
+    "removeChild": "Remover Criança",
+    "name": "Nome",
+    "dateOfBirth": "Data de Nascimento",
+    "gender": "Gênero",
     "genders": {
-      "male": "Male",
-      "female": "Female",
-      "other": "Other",
-      "preferNotToSay": "Prefer not to say"
+      "male": "Masculino",
+      "female": "Feminino",
+      "other": "Outro",
+      "preferNotToSay": "Prefiro não dizer"
     }
   },
   "subscription": {
-    "title": "Subscription",
-    "plan": "Current Plan",
-    "free": "Free",
+    "title": "Assinatura",
+    "plan": "Plano Atual",
+    "free": "Gratuito",
     "premium": "Premium",
-    "upgradeToPremium": "Upgrade to Premium",
-    "manageBilling": "Manage Billing",
-    "cancelSubscription": "Cancel Subscription",
-    "renewalDate": "Renewal Date",
+    "upgradeToPremium": "Atualizar para Premium",
+    "manageBilling": "Gerenciar Cobrança",
+    "cancelSubscription": "Cancelar Assinatura",
+    "renewalDate": "Data de Renovação",
     "features": {
-      "unlimitedAi": "Unlimited AI questions",
-      "familySync": "Family sync",
-      "advancedAnalytics": "Advanced analytics",
-      "exportReports": "Export reports",
-      "prioritySupport": "Priority support"
+      "unlimitedAi": "Perguntas IA ilimitadas",
+      "familySync": "Sincronização familiar",
+      "advancedAnalytics": "Análises avançadas",
+      "exportReports": "Exportar relatórios",
+      "prioritySupport": "Suporte prioritário"
     }
   },
   "about": {
-    "title": "About",
-    "version": "Version",
-    "termsOfService": "Terms of Service",
-    "privacyPolicy": "Privacy Policy",
-    "helpCenter": "Help Center",
-    "contactSupport": "Contact Support",
-    "rateApp": "Rate App",
-    "shareApp": "Share App"
+    "title": "Sobre",
+    "version": "Versão",
+    "termsOfService": "Termos de Serviço",
+    "privacyPolicy": "Política de Privacidade",
+    "helpCenter": "Central de Ajuda",
+    "contactSupport": "Entrar em Contato com o Suporte",
+    "rateApp": "Avaliar App",
+    "shareApp": "Compartilhar App"
   },
-  "save": "Save Changes",
-  "saved": "Settings saved successfully",
-  "cancel": "Cancel",
-  "reset": "Reset to Default"
-}
+  "profile": {
+    "title": "Informações do Perfil",
+    "name": "Nome",
+    "nameRequired": "O nome não pode estar vazio",
+    "email": "E-mail",
+    "emailNotEditable": "O e-mail não pode ser alterado"
+  },
+  "appearance": {
+    "title": "Aparência",
+    "darkMode": "Modo Escuro (Em Breve)"
+  },
+  "security": {
+    "title": "Segurança"
+  },
+  "sessions": {
+    "title": "Sessões"
+  },
+  "deviceTrust": {
+    "title": "Confiança do Dispositivo"
+  },
+  "biometric": {
+    "title": "Autenticação Biométrica"
+  },
+  "dataExport": {
+    "title": "Exportação de Dados"
+  },
+  "accountDeletion": {
+    "title": "Exclusão de Conta"
+  },
+  "accountActions": {
+    "title": "Ações da Conta",
+    "logout": "Sair"
+  },
+  "save": "Salvar Preferências",
+  "saving": "Salvando...",
+  "saved": "Configurações salvas com sucesso!",
+  "cancel": "Cancelar",
+  "reset": "Redefinir para Padrão"
+}
\ No newline at end of file
diff --git a/maternal-web/locales/pt/tracking.json b/maternal-web/locales/pt/tracking.json
index df206a9..50299a2 100644
--- a/maternal-web/locales/pt/tracking.json
+++ b/maternal-web/locales/pt/tracking.json
@@ -1,7 +1,7 @@
 {
-  "title": "Rastreamento de Atividades",
-  "trackActivity": "Registrar Atividade",
-  "selectActivity": "Selecione uma atividade para rastrear",
+  "title": "Acompanhamento de Atividades",
+  "trackActivity": "Acompanhar Atividade",
+  "selectActivity": "Selecione uma atividade para acompanhar",
   "activities": {
     "feeding": "Alimentação",
     "sleep": "Sono",
@@ -10,128 +10,270 @@
     "activity": "Atividade"
   },
   "feeding": {
-    "title": "Feeding",
-    "addFeeding": "Add Feeding",
-    "type": "Feeding Type",
+    "title": "Alimentação",
+    "addFeeding": "Adicionar Alimentação",
+    "type": "Tipo de Alimentação",
     "types": {
-      "breast": "Breast",
-      "bottle": "Bottle",
-      "solid": "Solid Food"
+      "breast": "Peito",
+      "bottle": "Mamadeira",
+      "solid": "Comida Sólida"
     },
-    "side": "Side",
+    "side": "Lado",
     "sides": {
-      "left": "Left",
-      "right": "Right",
-      "both": "Both"
+      "left": "Esquerdo",
+      "right": "Direito",
+      "both": "Ambos"
     },
-    "amount": "Amount",
-    "duration": "Duration",
-    "startTime": "Start Time",
-    "endTime": "End Time",
-    "notes": "Notes",
+    "amount": "Quantidade",
+    "duration": "Duração",
+    "startTime": "Iniciar Cronômetro",
+    "endTime": "Parar Cronômetro",
+    "reset": "Reiniciar",
+    "notes": "Notas",
+    "bottleType": "Tipo de Mamadeira",
+    "bottleTypes": {
+      "formula": "Fórmula",
+      "breastmilk": "Leite Materno",
+      "other": "Outro"
+    },
+    "foodDescription": "Descrição da Comida",
+    "amountDescription": "Descrição da Quantidade",
     "placeholders": {
-      "amount": "Enter amount",
-      "notes": "Add any notes about this feeding..."
+      "amount": "Digite a quantidade",
+      "notes": "Adicione notas sobre esta alimentação...",
+      "duration": "Ou digite a duração manualmente",
+      "foodDescription": "ex., Cereal de arroz, Purê de banana",
+      "amountDescription": "ex., 1/4 xícara, 2 colheres"
     },
     "units": {
       "ml": "ml",
       "oz": "oz",
-      "minutes": "minutes"
+      "minutes": "minutos"
+    },
+    "validation": {
+      "durationRequired": "Por favor, digite a duração ou use o cronômetro",
+      "amountRequired": "Por favor, digite a quantidade",
+      "foodRequired": "Por favor, digite a descrição da comida"
+    },
+    "success": "Alimentação registrada com sucesso!",
+    "deleted": "Alimentação excluída com sucesso",
+    "recentFeedings": "Alimentações Recentes",
+    "error": {
+      "saveFailed": "Falha ao salvar alimentação",
+      "deleteFailed": "Falha ao excluir alimentação"
     }
   },
   "sleep": {
-    "title": "Sleep",
-    "addSleep": "Add Sleep",
-    "startTime": "Sleep Start",
-    "endTime": "Sleep End",
-    "duration": "Duration",
-    "quality": "Quality",
+    "title": "Sono",
+    "addSleep": "Adicionar Sono",
+    "logSleep": "Registrar Sono",
+    "startTime": "Início do Sono",
+    "endTime": "Fim do Sono",
+    "duration": "Duração",
+    "quality": "Qualidade",
     "qualities": {
-      "poor": "Poor",
-      "fair": "Fair",
-      "good": "Good",
-      "excellent": "Excellent"
+      "poor": "Ruim",
+      "fair": "Regular",
+      "good": "Bom",
+      "excellent": "Excelente"
     },
-    "notes": "Notes",
+    "location": "Local",
+    "locations": {
+      "crib": "Berço",
+      "bed": "Cama",
+      "stroller": "Carrinho",
+      "carrier": "Canguru",
+      "other": "Outro"
+    },
+    "status": {
+      "title": "Status do Sono",
+      "completed": "Concluído (tem hora de fim)",
+      "ongoing": "Em andamento (ainda dormindo)"
+    },
+    "now": "Agora",
+    "notes": "Notas",
     "placeholders": {
-      "notes": "Add any notes about this sleep session..."
-    }
+      "notes": "Adicione notas sobre esta sessão de sono..."
+    },
+    "recentSleeps": "Sonos Recentes",
+    "success": "Sono registrado com sucesso!",
+    "deleted": "Sono excluído com sucesso",
+    "ongoing_duration": "Em andamento - {{duration}}"
   },
   "diaper": {
-    "title": "Diaper",
-    "addDiaper": "Add Diaper Change",
-    "type": "Type",
+    "title": "Fralda",
+    "addDiaper": "Adicionar Troca de Fralda",
+    "logDiaper": "Registrar Troca de Fralda",
+    "type": "Tipo",
     "types": {
-      "wet": "Wet",
-      "dirty": "Dirty",
-      "both": "Both",
-      "dry": "Dry"
+      "wet": "Molhada",
+      "dirty": "Suja",
+      "both": "Ambos",
+      "dry": "Seca"
     },
-    "time": "Time",
-    "notes": "Notes",
+    "time": "Hora",
+    "now": "Agora",
+    "conditions": {
+      "title": "Condições",
+      "normal": "Normal",
+      "soft": "Mole",
+      "hard": "Duro",
+      "watery": "Aguado",
+      "mucus": "Muco",
+      "blood": "Sangue"
+    },
+    "rash": {
+      "title": "Tem Assadura",
+      "yes": "Sim",
+      "no": "Não",
+      "severity": "Gravidade da Assadura",
+      "alert": "Assadura detectada. Considere aplicar pomada para assadura e consulte seu pediatra se persistir.",
+      "severities": {
+        "mild": "Leve",
+        "moderate": "Moderada",
+        "severe": "Grave"
+      }
+    },
+    "notes": "Notas",
     "placeholders": {
-      "notes": "Add any notes about this diaper change..."
-    }
+      "notes": "Adicione notas sobre esta troca de fralda..."
+    },
+    "recentDiapers": "Trocas de Fralda Recentes",
+    "success": "Troca de fralda registrada com sucesso!",
+    "deleted": "Troca de fralda excluída com sucesso"
   },
   "milestone": {
-    "title": "Milestone",
-    "addMilestone": "Add Milestone",
-    "category": "Category",
+    "title": "Marco",
+    "addMilestone": "Adicionar Marco",
+    "category": "Categoria",
     "categories": {
-      "physical": "Physical",
-      "cognitive": "Cognitive",
+      "physical": "Físico",
+      "cognitive": "Cognitivo",
       "social": "Social",
-      "language": "Language"
+      "language": "Linguagem"
     },
-    "description": "Description",
-    "date": "Date",
-    "notes": "Notes",
+    "description": "Descrição",
+    "date": "Data",
+    "notes": "Notas",
     "placeholders": {
-      "description": "Describe the milestone...",
-      "notes": "Add any additional notes..."
+      "description": "Descreva o marco...",
+      "notes": "Adicione notas adicionais..."
     }
   },
   "health": {
-    "title": "Health",
-    "addHealth": "Add Health Record",
-    "type": "Type",
+    "title": "Saúde",
+    "addHealth": "Adicionar Registro de Saúde",
+    "type": "Tipo",
     "types": {
-      "temperature": "Temperature",
-      "medication": "Medication",
-      "symptom": "Symptom",
-      "doctor": "Doctor Visit"
+      "temperature": "Temperatura",
+      "medication": "Medicamento",
+      "symptom": "Sintoma",
+      "doctor": "Consulta Médica"
     },
-    "temperature": "Temperature",
-    "medication": "Medication",
-    "dosage": "Dosage",
-    "symptom": "Symptom",
-    "severity": "Severity",
+    "temperature": "Temperatura",
+    "medication": "Medicamento",
+    "medicineInfo": "Informações do Remédio",
+    "medicineName": {
+      "label": "Nome do Remédio",
+      "placeholder": "ex., Paracetamol, Ibuprofeno",
+      "required": "Por favor, digite o nome do remédio"
+    },
+    "dosage": {
+      "label": "Dosagem",
+      "placeholder": "ex., 5, 2.5",
+      "required": "Por favor, digite a dosagem"
+    },
+    "unit": "Unidade",
+    "route": {
+      "label": "Via",
+      "oral": "Oral",
+      "topical": "Tópica",
+      "injection": "Injeção",
+      "other": "Outra"
+    },
+    "reason": {
+      "label": "Motivo (opcional)",
+      "placeholder": "ex., Febre, Dor, Alergia"
+    },
+    "logMedicine": "Registrar Remédio",
+    "recentMedicines": "Remédios Recentes",
+    "success": "Remédio registrado com sucesso!",
+    "error": "Falha ao salvar remédio",
+    "deleted": "Remédio excluído com sucesso",
+    "deleteError": "Falha ao excluir remédio",
+    "symptom": "Sintoma",
+    "severity": "Gravidade",
     "severities": {
-      "mild": "Mild",
-      "moderate": "Moderate",
-      "severe": "Severe"
+      "mild": "Leve",
+      "moderate": "Moderada",
+      "severe": "Grave"
     },
-    "notes": "Notes",
+    "notes": "Notas",
     "placeholders": {
-      "medication": "Medication name",
-      "dosage": "Dosage amount",
-      "symptom": "Describe symptom",
-      "notes": "Add any notes..."
+      "medication": "Nome do medicamento",
+      "dosage": "Quantidade da dosagem",
+      "symptom": "Descreva o sintoma",
+      "notes": "Adicione notas..."
     },
     "units": {
+      "ml": "ml",
+      "mg": "mg",
+      "tsp": "colher de chá",
+      "tbsp": "colher de sopa",
+      "drops": "gotas",
+      "tablet": "comprimido(s)",
       "celsius": "°C",
       "fahrenheit": "°F"
     }
   },
-  "quickLog": "Quick Log",
-  "viewHistory": "View History",
-  "editEntry": "Edit Entry",
-  "deleteEntry": "Delete Entry",
-  "confirmDelete": "Are you sure you want to delete this entry?",
-  "filterByType": "Filter by Type",
-  "filterByChild": "Filter by Child",
-  "sortByNewest": "Newest First",
-  "sortByOldest": "Oldest First",
-  "noEntries": "No entries yet",
-  "addFirstEntry": "Add your first entry to start tracking"
-}
+  "activity": {
+    "title": "Atividade",
+    "addActivity": "Adicionar Atividade",
+    "logActivity": "Registrar Atividade",
+    "type": "Tipo de Atividade",
+    "types": {
+      "play": "Brincadeira",
+      "tummyTime": "Tempo de Barriga",
+      "walk": "Passeio",
+      "music": "Música",
+      "reading": "Leitura",
+      "outdoor": "Brincadeira ao Ar Livre",
+      "other": "Outro"
+    },
+    "duration": "Duração (minutos)",
+    "description": "Descrição",
+    "notes": "Notas",
+    "placeholders": {
+      "duration": "Digite a duração em minutos",
+      "description": "Descreva a atividade...",
+      "notes": "Adicione notas..."
+    },
+    "recentActivities": "Atividades Recentes",
+    "success": "Atividade registrada com sucesso!",
+    "deleted": "Atividade excluída com sucesso"
+  },
+  "common": {
+    "selectChild": "Selecionar Criança",
+    "cancel": "Cancelar",
+    "delete": "Excluir",
+    "loading": "Carregando...",
+    "noChildrenAdded": "Nenhuma Criança Adicionada",
+    "noChildrenMessage": "Você precisa adicionar uma criança antes de poder acompanhar atividades",
+    "addChild": "Adicionar Criança",
+    "recentActivities": "Atividades Recentes",
+    "error": {
+      "loadChildrenFailed": "Falha ao carregar crianças"
+    }
+  },
+  "quickLog": "Registro Rápido",
+  "viewHistory": "Ver Histórico",
+  "editEntry": "Editar Entrada",
+  "deleteEntry": "Excluir Entrada",
+  "confirmDelete": "Tem certeza de que deseja excluir esta entrada?",
+  "filterByType": "Filtrar por Tipo",
+  "filterByChild": "Filtrar por Criança",
+  "sortByNewest": "Mais Recente Primeiro",
+  "sortByOldest": "Mais Antigo Primeiro",
+  "noEntries": "Ainda não há entradas",
+  "addFirstEntry": "Adicione sua primeira entrada para começar o acompanhamento"
+}
\ No newline at end of file
diff --git a/maternal-web/locales/zh/ai.json b/maternal-web/locales/zh/ai.json
index 37eba91..57d1fd2 100644
--- a/maternal-web/locales/zh/ai.json
+++ b/maternal-web/locales/zh/ai.json
@@ -1,62 +1,107 @@
 {
-  "title": "AI Assistant",
-  "subtitle": "24/7 Parenting Support",
+  "title": "AI助手",
+  "subtitle": "24/7育儿支持",
   "chat": {
-    "placeholder": "Ask me anything about parenting...",
-    "send": "Send",
-    "listening": "Listening...",
-    "processing": "Processing...",
-    "thinking": "Thinking...",
-    "typing": "AI is typing...",
-    "voiceInput": "Voice Input",
-    "textInput": "Text Input",
-    "newChat": "New Chat",
-    "clearChat": "Clear Chat",
-    "confirmClear": "Are you sure you want to clear this chat?",
-    "noMessages": "No messages yet",
-    "startConversation": "Start a conversation with your AI assistant"
+    "placeholder": "询问任何关于育儿的问题...",
+    "send": "发送",
+    "listening": "聆听中...",
+    "processing": "处理中...",
+    "thinking": "思考中...",
+    "typing": "AI正在输入...",
+    "voiceInput": "语音输入",
+    "textInput": "文本输入",
+    "newChat": "新对话",
+    "clearChat": "清除对话",
+    "confirmClear": "您确定要清除此对话吗？",
+    "noMessages": "还没有消息",
+    "startConversation": "开始与您的AI助手对话"
   },
   "suggestions": {
-    "title": "Suggested Questions",
-    "sleepPattern": "How can I improve my baby's sleep pattern?",
-    "feeding": "How much should my baby be eating?",
-    "development": "What milestones should I expect this month?",
-    "health": "When should I be concerned about a fever?"
+    "title": "建议问题",
+    "sleepPattern": "如何改善宝宝的睡眠模式？",
+    "feeding": "我的宝宝应该吃多少？",
+    "development": "这个月我应该期待什么里程碑？",
+    "health": "什么时候应该担心发烧？"
   },
   "context": {
-    "analyzing": "Analyzing your child's patterns...",
-    "usingRecent": "Using recent activity data",
-    "basedOn": "Based on {{childName}}'s profile"
+    "analyzing": "分析您孩子的模式...",
+    "usingRecent": "使用最近的活动数据",
+    "basedOn": "基于{{childName}}的档案"
   },
   "disclaimer": {
-    "title": "Important Disclaimer",
-    "message": "This AI assistant provides general parenting guidance and is not a substitute for professional medical advice. Always consult with your pediatrician for medical concerns.",
-    "emergency": "In case of emergency, call emergency services immediately.",
-    "understand": "I Understand"
+    "title": "重要免责声明",
+    "message": "此AI助手提供一般育儿指导，不能替代专业医疗建议。对于医疗问题，请始终咨询您的儿科医生。",
+    "emergency": "紧急情况下，请立即拨打急救电话。",
+    "understand": "我理解"
   },
   "limits": {
-    "dailyLimit": "Daily question limit reached",
-    "dailyLimitMessage": "You've reached your daily limit of {{limit}} questions. Upgrade to premium for unlimited access.",
-    "upgrade": "Upgrade to Premium"
+    "dailyLimit": "已达到每日问题限制",
+    "dailyLimitMessage": "您已达到每日{{limit}}个问题的限制。升级到高级版可无限访问。",
+    "upgrade": "升级到高级版"
   },
   "history": {
-    "title": "Chat History",
-    "today": "Today",
-    "yesterday": "Yesterday",
-    "thisWeek": "This Week",
-    "older": "Older",
-    "noHistory": "No chat history",
-    "delete": "Delete Chat",
-    "confirmDelete": "Are you sure you want to delete this chat?"
+    "title": "聊天历史",
+    "today": "今天",
+    "yesterday": "昨天",
+    "thisWeek": "本周",
+    "older": "更早",
+    "noHistory": "无聊天历史",
+    "delete": "删除聊天",
+    "confirmDelete": "您确定要删除此聊天吗？"
   },
   "topics": {
-    "sleep": "Sleep",
-    "feeding": "Feeding",
-    "development": "Development",
-    "health": "Health",
-    "behavior": "Behavior",
-    "safety": "Safety",
-    "nutrition": "Nutrition",
-    "general": "General"
+    "sleep": "睡眠",
+    "feeding": "喂养",
+    "development": "发育",
+    "health": "健康",
+    "behavior": "行为",
+    "safety": "安全",
+    "nutrition": "营养",
+    "general": "一般"
+  },
+  "interface": {
+    "assistantTitle": "AI育儿助手",
+    "assistantSubtitle": "询问任何关于育儿和儿童护理的问题",
+    "greeting": "您好{{name}}！今天我能为您做些什么？",
+    "inputPlaceholder": "询问任何问题...",
+    "closeDrawer": "关闭抽屉",
+    "moreOptions": "更多选项",
+    "deleteConversation": "删除对话",
+    "chatCount": "{{count}}个聊天",
+    "chatCount_plural": "{{count}}个聊天",
+    "ungrouped": "未分组",
+    "errorMessage": "抱歉，我遇到了错误。请重试。",
+    "disclaimerFooter": "此AI助手提供一般信息。医疗建议请咨询医疗专业人士。",
+    "deleteDialogTitle": "删除对话",
+    "deleteDialogMessage": "您确定要删除此对话吗？此操作无法撤销。",
+    "cancel": "取消",
+    "delete": "删除",
+    "moveToGroup": "移动到组",
+    "createNewGroup": "创建新组",
+    "groupNameLabel": "组名",
+    "create": "创建",
+    "suggestedQuestion1": "3个月大的宝宝应该睡多久？",
+    "suggestedQuestion2": "正常的喂养模式是什么？",
+    "suggestedQuestion3": "什么时候应该引入固体食物？",
+    "suggestedQuestion4": "改善睡眠习惯的技巧",
+    "thinking1": "收集宝宝智慧...",
+    "thinking2": "查阅育儿书籍...",
+    "thinking3": "调配完美答案...",
+    "thinking4": "温暖一些建议...",
+    "thinking5": "准备您的知识奶瓶...",
+    "thinking6": "数着小手指和小脚趾...",
+    "thinking7": "连接积木...",
+    "thinking8": "偷看玩具盒...",
+    "thinking9": "整理拼图碎片...",
+    "thinking10": "搅拌婴儿食品罐...",
+    "thinking11": "擦亮智慧奶嘴...",
+    "thinking12": "蹑手蹑脚穿过午睡时间...",
+    "thinking13": "整理尿布包...",
+    "thinking14": "用爱包装您的答案...",
+    "thinking15": "冲泡一杯温暖的指导...",
+    "thinking16": "编织一些想法...",
+    "thinking17": "整理细节...",
+    "thinking18": "撒一些魔法粉...",
+    "thinking19": "在思考时哼着摇篮曲..."
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/zh/auth.json b/maternal-web/locales/zh/auth.json
index b88be82..fe712f5 100644
--- a/maternal-web/locales/zh/auth.json
+++ b/maternal-web/locales/zh/auth.json
@@ -1,88 +1,88 @@
 {
   "login": {
-    "title": "Welcome Back",
-    "subtitle": "Sign in to your account",
-    "email": "Email",
-    "password": "Password",
-    "rememberMe": "Remember me",
-    "forgotPassword": "Forgot password?",
-    "submit": "Sign In",
-    "noAccount": "Don't have an account?",
-    "signUp": "Sign up",
-    "or": "Or",
-    "continueWithGoogle": "Continue with Google",
-    "continueWithApple": "Continue with Apple",
+    "title": "欢迎回来",
+    "subtitle": "登录您的账户",
+    "email": "邮箱",
+    "password": "密码",
+    "rememberMe": "记住我",
+    "forgotPassword": "忘记密码？",
+    "submit": "登录",
+    "noAccount": "还没有账户？",
+    "signUp": "注册",
+    "or": "或",
+    "continueWithGoogle": "使用Google继续",
+    "continueWithApple": "使用Apple继续",
     "biometric": {
-      "useFaceId": "Use Face ID",
-      "useTouchId": "Use Touch ID",
-      "useFingerprint": "Use Fingerprint"
+      "useFaceId": "使用面容ID",
+      "useTouchId": "使用触控ID",
+      "useFingerprint": "使用指纹"
     }
   },
   "signup": {
-    "title": "Create Account",
-    "subtitle": "Join Maternal today",
-    "name": "Full Name",
-    "email": "Email",
-    "password": "Password",
-    "confirmPassword": "Confirm Password",
-    "agreeToTerms": "I agree to the {{termsLink}} and {{privacyLink}}",
-    "termsOfService": "Terms of Service",
-    "privacyPolicy": "Privacy Policy",
-    "submit": "Create Account",
-    "hasAccount": "Already have an account?",
-    "signIn": "Sign in",
-    "or": "Or",
-    "continueWithGoogle": "Continue with Google",
-    "continueWithApple": "Continue with Apple"
+    "title": "创建账户",
+    "subtitle": "立即加入Maternal",
+    "name": "全名",
+    "email": "邮箱",
+    "password": "密码",
+    "confirmPassword": "确认密码",
+    "agreeToTerms": "我同意{{termsLink}}和{{privacyLink}}",
+    "termsOfService": "服务条款",
+    "privacyPolicy": "隐私政策",
+    "submit": "创建账户",
+    "hasAccount": "已有账户？",
+    "signIn": "登录",
+    "or": "或",
+    "continueWithGoogle": "使用Google继续",
+    "continueWithApple": "使用Apple继续"
   },
   "forgotPassword": {
-    "title": "Reset Password",
-    "subtitle": "Enter your email to receive a reset link",
-    "email": "Email",
-    "submit": "Send Reset Link",
-    "backToLogin": "Back to login",
-    "success": "Reset link sent! Check your email.",
-    "checkEmail": "We've sent a password reset link to {{email}}"
+    "title": "重置密码",
+    "subtitle": "输入您的邮箱以接收重置链接",
+    "email": "邮箱",
+    "submit": "发送重置链接",
+    "backToLogin": "返回登录",
+    "success": "重置链接已发送！请检查您的邮箱。",
+    "checkEmail": "我们已向{{email}}发送了密码重置链接"
   },
   "resetPassword": {
-    "title": "Create New Password",
-    "subtitle": "Enter your new password",
-    "password": "New Password",
-    "confirmPassword": "Confirm Password",
-    "submit": "Reset Password",
-    "success": "Password reset successfully!",
-    "backToLogin": "Back to login"
+    "title": "创建新密码",
+    "subtitle": "输入您的新密码",
+    "password": "新密码",
+    "confirmPassword": "确认密码",
+    "submit": "重置密码",
+    "success": "密码重置成功！",
+    "backToLogin": "返回登录"
   },
   "verification": {
-    "title": "Verify Your Email",
-    "subtitle": "We've sent a verification code to {{email}}",
-    "code": "Verification Code",
-    "submit": "Verify",
-    "resend": "Resend Code",
-    "resendIn": "Resend in {{seconds}}s",
-    "success": "Email verified successfully!",
-    "didNotReceive": "Didn't receive the code?"
+    "title": "验证您的邮箱",
+    "subtitle": "我们已向{{email}}发送了验证码",
+    "code": "验证码",
+    "submit": "验证",
+    "resend": "重新发送验证码",
+    "resendIn": "{{seconds}}秒后重新发送",
+    "success": "邮箱验证成功！",
+    "didNotReceive": "没有收到验证码？"
   },
   "errors": {
-    "invalidEmail": "Please enter a valid email address",
-    "invalidPassword": "Password must be at least 8 characters",
-    "passwordMismatch": "Passwords do not match",
-    "emailRequired": "Email is required",
-    "passwordRequired": "Password is required",
-    "nameRequired": "Name is required",
-    "termsRequired": "You must agree to the terms and privacy policy",
-    "invalidCredentials": "Invalid email or password",
-    "emailExists": "An account with this email already exists",
-    "weakPassword": "Password is too weak. Please use a stronger password.",
-    "networkError": "Network error. Please try again.",
-    "unknownError": "An error occurred. Please try again."
+    "invalidEmail": "请输入有效的邮箱地址",
+    "invalidPassword": "密码必须至少8个字符",
+    "passwordMismatch": "密码不匹配",
+    "emailRequired": "邮箱是必需的",
+    "passwordRequired": "密码是必需的",
+    "nameRequired": "姓名是必需的",
+    "termsRequired": "您必须同意条款和隐私政策",
+    "invalidCredentials": "邮箱或密码无效",
+    "emailExists": "此邮箱已存在账户",
+    "weakPassword": "密码太弱。请使用更强的密码。",
+    "networkError": "网络错误。请重试。",
+    "unknownError": "发生错误。请重试。"
   },
   "passwordRequirements": {
-    "title": "Password must contain:",
-    "minLength": "At least 8 characters",
-    "uppercase": "At least one uppercase letter",
-    "lowercase": "At least one lowercase letter",
-    "number": "At least one number",
-    "special": "At least one special character"
+    "title": "密码必须包含：",
+    "minLength": "至少8个字符",
+    "uppercase": "至少一个大写字母",
+    "lowercase": "至少一个小写字母",
+    "number": "至少一个数字",
+    "special": "至少一个特殊字符"
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/zh/children.json b/maternal-web/locales/zh/children.json
index 309278d..7601075 100644
--- a/maternal-web/locales/zh/children.json
+++ b/maternal-web/locales/zh/children.json
@@ -1,23 +1,44 @@
 {
-  "title": "儿童",
-  "subtitle": "管理您家庭的儿童档案",
-  "addChild": "添加儿童",
-  "addFirstChild": "添加第一个儿童",
-  "editChild": "编辑儿童",
-  "deleteChild": "删除儿童",
-  "noChildren": "还没有添加儿童",
-  "noChildrenSubtitle": "添加您的第一个儿童以开始追踪他们的活动",
+  "title": "孩子",
+  "subtitle": "管理您家庭的孩子档案",
+  "addChild": "添加孩子",
+  "addFirstChild": "添加第一个孩子",
+  "editChild": "编辑孩子",
+  "deleteChild": "删除孩子",
+  "noChildren": "还没有添加孩子",
+  "noChildrenSubtitle": "添加您的第一个孩子开始跟踪他们的活动",
   "age": "年龄",
   "gender": {
     "male": "男",
     "female": "女",
     "other": "其他"
   },
+  "dialog": {
+    "name": "姓名",
+    "birthDate": "出生日期",
+    "gender": "性别",
+    "photoUrl": "照片URL（可选）",
+    "photoPlaceholder": "https://example.com/photo.jpg",
+    "cancel": "取消",
+    "add": "添加",
+    "update": "更新",
+    "saving": "保存中...",
+    "delete": "删除",
+    "deleting": "删除中...",
+    "confirmDelete": "确认删除",
+    "confirmDeleteMessage": "您确定要删除",
+    "confirmDeleteWarning": "此操作无法撤销。所有相关数据将被永久删除。",
+    "validation": {
+      "nameRequired": "请输入姓名",
+      "birthDateRequired": "请选择出生日期",
+      "birthDateFuture": "出生日期不能是未来日期"
+    }
+  },
   "errors": {
-    "noFamily": "未找到家庭。请先完成入职流程。",
-    "loadFailed": "加载儿童失败",
-    "saveFailed": "保存儿童失败",
-    "deleteFailed": "删除儿童失败",
+    "noFamily": "未找到家庭。请先完成入门设置。",
+    "loadFailed": "加载孩子信息失败",
+    "saveFailed": "保存孩子信息失败",
+    "deleteFailed": "删除孩子失败",
     "noFamilyId": "未找到家庭ID"
   },
   "ageFormat": {
@@ -26,4 +47,4 @@
     "month": "个月",
     "months": "个月"
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/zh/common.json b/maternal-web/locales/zh/common.json
index 615ae74..e587666 100644
--- a/maternal-web/locales/zh/common.json
+++ b/maternal-web/locales/zh/common.json
@@ -33,7 +33,7 @@
   "home": "首页",
   "settings": "设置",
   "profile": "个人资料",
-  "logout": "退出",
+  "logout": "退出登录",
   "login": "登录",
   "signup": "注册",
   "email": "邮箱",
@@ -44,7 +44,7 @@
   "duration": "持续时间",
   "notes": "备注",
   "optional": "可选",
-  "required": "必填",
+  "required": "必需",
   "units": {
     "metric": "公制",
     "imperial": "英制"
@@ -52,28 +52,28 @@
   "measurements": {
     "weight": "体重",
     "height": "身高",
-    "temperature": "温度",
+    "temperature": "体温",
     "volume": "容量"
   },
   "navigation": {
     "home": "首页",
     "dashboard": "仪表板",
-    "tracking": "追踪",
-    "trackActivity": "记录活动",
-    "track": "记录",
+    "tracking": "跟踪",
+    "trackActivity": "跟踪活动",
+    "track": "跟踪",
     "ai": "AI助手",
     "aiChat": "AI聊天",
     "family": "家庭",
-    "insights": "分析",
-    "children": "儿童",
+    "insights": "洞察",
+    "children": "孩子",
     "settings": "设置",
     "logout": "退出登录"
   },
   "connection": {
-    "syncActive": "实时同步活动",
+    "syncActive": "实时同步活跃",
     "syncDisconnected": "实时同步已断开",
-    "live": "在线",
+    "live": "实时",
     "offline": "离线",
-    "familyMembersOnline": "{{count}}位家庭成员在线"
+    "familyMembersOnline": "{{count}}个家庭成员在线"
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/zh/dashboard.json b/maternal-web/locales/zh/dashboard.json
index e7e3d7a..702a0e5 100644
--- a/maternal-web/locales/zh/dashboard.json
+++ b/maternal-web/locales/zh/dashboard.json
@@ -1,7 +1,7 @@
 {
   "welcomeBack": "欢迎回来",
   "welcomeBackWithName": "欢迎回来，{{name}}！",
-  "subtitle": "追踪您孩子的活动并获得AI驱动的见解",
+  "subtitle": "跟踪您孩子的活动并获得AI驱动的洞察",
   "quickActions": {
     "title": "快速操作",
     "feeding": "喂养",
@@ -15,16 +15,16 @@
   "summary": {
     "title": "今日总结",
     "titleWithChild": "今日总结 - {{childName}}",
-    "feedings": "喂养次数",
+    "feedings": "喂养",
     "sleep": "睡眠",
     "diapers": "尿布",
     "medications": "药物",
-    "noChild": "添加孩子以开始追踪",
-    "noActivities": "今天没有追踪任何活动"
+    "noChild": "添加孩子开始跟踪",
+    "noActivities": "今天没有跟踪活动"
   },
   "predictions": {
     "title": "下一个预测活动",
-    "napTime": "{{minutes}}分钟后小睡时间",
+    "napTime": "{{minutes}}分钟后午睡时间",
     "basedOnPatterns": "基于您孩子的睡眠模式"
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/zh/errors.json b/maternal-web/locales/zh/errors.json
index 8f431e2..029cc6f 100644
--- a/maternal-web/locales/zh/errors.json
+++ b/maternal-web/locales/zh/errors.json
@@ -1,69 +1,69 @@
 {
   "general": {
-    "unknown": "An unknown error occurred",
-    "networkError": "Network error. Please check your connection.",
-    "serverError": "Server error. Please try again later.",
-    "notFound": "The requested resource was not found",
-    "unauthorized": "You are not authorized to perform this action",
-    "forbidden": "Access denied",
-    "validation": "Please check your input and try again",
-    "timeout": "Request timed out. Please try again."
+    "unknown": "发生未知错误",
+    "networkError": "网络错误。请检查您的连接。",
+    "serverError": "服务器错误。请稍后重试。",
+    "notFound": "未找到请求的资源",
+    "unauthorized": "您无权执行此操作",
+    "forbidden": "访问被拒绝",
+    "validation": "请检查您的输入并重试",
+    "timeout": "请求超时。请重试。"
   },
   "auth": {
-    "invalidCredentials": "Invalid email or password",
-    "emailExists": "An account with this email already exists",
-    "emailNotVerified": "Please verify your email address",
-    "accountLocked": "Your account has been locked. Please contact support.",
-    "sessionExpired": "Your session has expired. Please sign in again.",
-    "weakPassword": "Password is too weak",
-    "tokenInvalid": "Invalid or expired token",
-    "deviceNotTrusted": "Device not trusted. Please verify your device."
+    "invalidCredentials": "邮箱或密码无效",
+    "emailExists": "此邮箱已存在账户",
+    "emailNotVerified": "请验证您的邮箱地址",
+    "accountLocked": "您的账户已被锁定。请联系支持。",
+    "sessionExpired": "您的会话已过期。请重新登录。",
+    "weakPassword": "密码太弱",
+    "tokenInvalid": "令牌无效或已过期",
+    "deviceNotTrusted": "设备不受信任。请验证您的设备。"
   },
   "family": {
-    "limitExceeded": "Family size limit exceeded",
-    "memberNotFound": "Family member not found",
-    "cannotRemoveSelf": "You cannot remove yourself from the family",
-    "insufficientPermissions": "You don't have permission to perform this action",
-    "invitationExpired": "This invitation has expired",
-    "alreadyMember": "This person is already a family member"
+    "limitExceeded": "超出家庭规模限制",
+    "memberNotFound": "未找到家庭成员",
+    "cannotRemoveSelf": "您不能将自己从家庭中移除",
+    "insufficientPermissions": "您没有权限执行此操作",
+    "invitationExpired": "此邀请已过期",
+    "alreadyMember": "此人已是家庭成员"
   },
   "child": {
-    "notFound": "Child profile not found",
-    "invalidAge": "Invalid age. Please check the date of birth.",
-    "limitExceeded": "You've reached the maximum number of children"
+    "notFound": "未找到孩子档案",
+    "invalidAge": "年龄无效。请检查出生日期。",
+    "limitExceeded": "您已达到最大孩子数量"
   },
   "tracking": {
-    "invalidData": "Invalid tracking data",
-    "futureDate": "You cannot log activities in the future",
-    "duplicateEntry": "A similar entry already exists",
-    "invalidDuration": "Invalid duration",
-    "invalidAmount": "Invalid amount"
+    "invalidData": "跟踪数据无效",
+    "futureDate": "您不能记录未来的活动",
+    "duplicateEntry": "类似条目已存在",
+    "invalidDuration": "持续时间无效",
+    "invalidAmount": "数量无效"
   },
   "ai": {
-    "dailyLimitReached": "Daily AI question limit reached",
-    "contextError": "Failed to load context for AI",
-    "responseError": "Failed to generate AI response",
-    "moderationFlag": "Your message was flagged by our content moderation system"
+    "dailyLimitReached": "已达到每日AI问题限制",
+    "contextError": "加载AI上下文失败",
+    "responseError": "生成AI回复失败",
+    "moderationFlag": "您的消息被我们的内容审核系统标记"
   },
   "offline": {
-    "noConnection": "No internet connection",
-    "syncFailed": "Failed to sync data",
-    "pendingChanges": "You have pending changes that need to be synced"
+    "noConnection": "无网络连接",
+    "syncFailed": "同步数据失败",
+    "pendingChanges": "您有待同步的更改"
   },
   "validation": {
-    "required": "This field is required",
-    "invalidEmail": "Please enter a valid email address",
-    "invalidPhone": "Please enter a valid phone number",
-    "invalidDate": "Please enter a valid date",
-    "minLength": "Must be at least {{min}} characters",
-    "maxLength": "Must be no more than {{max}} characters",
-    "minValue": "Must be at least {{min}}",
-    "maxValue": "Must be no more than {{max}}",
-    "invalidFormat": "Invalid format",
-    "passwordMismatch": "Passwords do not match"
+    "required": "此字段是必需的",
+    "invalidEmail": "请输入有效的邮箱地址",
+    "invalidPhone": "请输入有效的电话号码",
+    "invalidDate": "请输入有效的日期",
+    "minLength": "至少需要{{min}}个字符",
+    "maxLength": "不能超过{{max}}个字符",
+    "minValue": "至少需要{{min}}",
+    "maxValue": "不能超过{{max}}",
+    "invalidFormat": "格式无效",
+    "passwordMismatch": "密码不匹配"
   },
-  "retry": "Retry",
-  "goBack": "Go Back",
-  "contactSupport": "Contact Support",
-  "dismiss": "Dismiss"
-}
+  "retry": "重试",
+  "goBack": "返回",
+  "contactSupport": "联系支持",
+  "dismiss": "关闭"
+}
\ No newline at end of file
diff --git a/maternal-web/locales/zh/family.json b/maternal-web/locales/zh/family.json
new file mode 100644
index 0000000..4c196c5
--- /dev/null
+++ b/maternal-web/locales/zh/family.json
@@ -0,0 +1,43 @@
+{
+  "pageTitle": "家庭",
+  "pageSubtitle": "管理您的家庭成员并共享访问权限",
+  "buttons": {
+    "joinFamily": "加入家庭",
+    "inviteMember": "邀请成员",
+    "copyCode": "复制代码",
+    "inviteFirstMember": "邀请第一个成员"
+  },
+  "shareCode": {
+    "title": "家庭共享代码",
+    "description": "与家庭成员分享此代码，让他们访问您的家庭数据"
+  },
+  "members": {
+    "title": "家庭成员 ({{count}})",
+    "noMembers": "还没有家庭成员",
+    "noMembersDescription": "邀请家庭成员一起照顾孩子",
+    "youLabel": "您",
+    "removeAriaLabel": "将{{name}}从家庭中移除"
+  },
+  "roles": {
+    "parent": "父母",
+    "caregiver": "照顾者",
+    "viewer": "查看者"
+  },
+  "messages": {
+    "shareCodeCopied": "共享代码已复制到剪贴板！",
+    "shareCodeCopyFailed": "复制共享代码失败",
+    "invitationSent": "邀请发送成功！",
+    "joinedFamily": "成功加入家庭！",
+    "memberRemoved": "成员移除成功",
+    "noFamilyFound": "未找到家庭。请先完成入门设置。",
+    "failedToLoad": "加载家庭信息失败",
+    "noFamilyId": "未找到家庭ID",
+    "failedToInvite": "发送邀请失败",
+    "failedToJoin": "加入家庭失败",
+    "failedToRemove": "移除成员失败"
+  },
+  "placeholders": {
+    "unknownUser": "未知用户",
+    "noEmail": "无邮箱"
+  }
+}
diff --git a/maternal-web/locales/zh/insights.json b/maternal-web/locales/zh/insights.json
new file mode 100644
index 0000000..c0305f4
--- /dev/null
+++ b/maternal-web/locales/zh/insights.json
@@ -0,0 +1,73 @@
+{
+  "title": "洞察与分析",
+  "subtitle": "跟踪模式并获取关于您孩子活动的洞察",
+  "filters": {
+    "child": "孩子",
+    "dateRange": {
+      "7days": "7天",
+      "30days": "30天",
+      "3months": "3个月"
+    }
+  },
+  "stats": {
+    "feedings": {
+      "title": "喂养",
+      "subtitle": "总次数"
+    },
+    "sleep": {
+      "title": "睡眠",
+      "subtitle": "每日平均"
+    },
+    "diapers": {
+      "title": "尿布",
+      "subtitle": "总更换次数"
+    },
+    "topActivity": {
+      "title": "主要活动",
+      "subtitle": "最频繁"
+    }
+  },
+  "charts": {
+    "feedingFrequency": "喂养频率",
+    "sleepDuration": "睡眠时长（小时）",
+    "diaperChangesByType": "按类型分类的尿布更换",
+    "activityTimeline": "活动时间线",
+    "activityDistribution": "活动分布",
+    "chartLabels": {
+      "feedings": "喂养",
+      "diapers": "尿布",
+      "sleepHours": "睡眠（小时）"
+    }
+  },
+  "recentActivities": {
+    "title": "最近活动（最近20次）"
+  },
+  "emptyStates": {
+    "noChildren": {
+      "title": "未添加孩子",
+      "message": "添加孩子以查看洞察和分析",
+      "action": "添加孩子"
+    },
+    "noActivities": "在选定的日期范围内未找到活动。开始跟踪活动以查看洞察！"
+  },
+  "errors": {
+    "loadChildren": "加载孩子信息失败",
+    "loadActivities": "加载活动失败"
+  },
+  "activityTypes": {
+    "feeding": "喂养",
+    "sleep": "睡眠",
+    "diaper": "尿布",
+    "medication": "药物",
+    "milestone": "里程碑",
+    "note": "备注",
+    "none": "无"
+  },
+  "diaperTypes": {
+    "wet": "湿",
+    "dirty": "脏",
+    "both": "两者",
+    "dry": "干",
+    "unknown": "未知"
+  }
+}
diff --git a/maternal-web/locales/zh/onboarding.json b/maternal-web/locales/zh/onboarding.json
index 18e744c..4b24a0d 100644
--- a/maternal-web/locales/zh/onboarding.json
+++ b/maternal-web/locales/zh/onboarding.json
@@ -1,99 +1,99 @@
 {
   "welcome": {
-    "title": "Welcome to Maternal",
-    "subtitle": "Your AI-powered child care assistant",
-    "description": "Track activities, get AI-powered insights, and coordinate with your family—all in one place.",
-    "getStarted": "Get Started",
-    "skip": "Skip"
+    "title": "欢迎来到Maternal",
+    "subtitle": "您的AI驱动儿童护理助手",
+    "description": "跟踪活动、获得AI驱动的洞察，并与您的家人协调——一切尽在一处。",
+    "getStarted": "开始使用",
+    "skip": "跳过"
   },
   "language": {
-    "title": "Choose Your Language",
-    "subtitle": "Select your preferred language",
-    "description": "You can change this later in settings"
+    "title": "选择您的语言",
+    "subtitle": "选择您的首选语言",
+    "description": "您可以稍后在设置中更改"
   },
   "measurements": {
-    "title": "Measurement Units",
-    "subtitle": "Choose your preferred unit system",
-    "description": "Select the measurement system you're most comfortable with. You can change this later in settings.",
+    "title": "测量单位",
+    "subtitle": "选择您的首选单位系统",
+    "description": "选择您最熟悉的测量系统。您可以稍后在设置中更改。",
     "metric": {
-      "title": "Metric",
-      "description": "Kilograms, centimeters, Celsius, milliliters"
+      "title": "公制",
+      "description": "千克、厘米、摄氏度、毫升"
     },
     "imperial": {
-      "title": "Imperial",
-      "description": "Pounds, inches, Fahrenheit, ounces"
+      "title": "英制",
+      "description": "磅、英寸、华氏度、盎司"
     }
   },
   "profile": {
-    "title": "Create Your Profile",
-    "subtitle": "Tell us about yourself",
-    "name": "Your Name",
-    "email": "Email Address",
-    "password": "Password",
-    "confirmPassword": "Confirm Password",
-    "relation": "Relation to Child",
+    "title": "创建您的档案",
+    "subtitle": "告诉我们关于您的信息",
+    "name": "您的姓名",
+    "email": "邮箱地址",
+    "password": "密码",
+    "confirmPassword": "确认密码",
+    "relation": "与孩子的关系",
     "relations": {
-      "mother": "Mother",
-      "father": "Father",
-      "guardian": "Guardian",
-      "caregiver": "Caregiver",
-      "other": "Other"
+      "mother": "母亲",
+      "father": "父亲",
+      "guardian": "监护人",
+      "caregiver": "照顾者",
+      "other": "其他"
     }
   },
   "child": {
-    "title": "Add Your Child",
-    "subtitle": "Let's start with your first child",
-    "name": "Child's Name",
-    "dateOfBirth": "Date of Birth",
-    "gender": "Gender",
+    "title": "添加您的孩子",
+    "subtitle": "让我们从您的第一个孩子开始",
+    "name": "孩子的姓名",
+    "dateOfBirth": "出生日期",
+    "gender": "性别",
     "genders": {
-      "male": "Male",
-      "female": "Female",
-      "other": "Other",
-      "preferNotToSay": "Prefer not to say"
+      "male": "男",
+      "female": "女",
+      "other": "其他",
+      "preferNotToSay": "不愿透露"
     },
-    "weight": "Current Weight",
-    "height": "Current Height",
-    "addAnother": "Add Another Child",
-    "skipForNow": "Skip for Now"
+    "weight": "当前体重",
+    "height": "当前身高",
+    "addAnother": "添加另一个孩子",
+    "skipForNow": "暂时跳过"
   },
   "family": {
-    "title": "Invite Family Members",
-    "subtitle": "Coordinate with your family",
-    "description": "Invite family members to view and track activities together. They'll receive an email invitation.",
-    "email": "Family Member's Email",
-    "role": "Role",
+    "title": "邀请家庭成员",
+    "subtitle": "与您的家人协调",
+    "description": "邀请家庭成员一起查看和跟踪活动。他们将收到邮件邀请。",
+    "email": "家庭成员的邮箱",
+    "role": "角色",
     "roles": {
-      "parent": "Parent",
-      "caregiver": "Caregiver",
-      "viewer": "Viewer"
+      "parent": "父母",
+      "caregiver": "照顾者",
+      "viewer": "查看者"
     },
-    "addMember": "Add Member",
-    "inviteLater": "I'll Invite Later"
+    "addMember": "添加成员",
+    "inviteLater": "稍后邀请"
   },
   "notifications": {
-    "title": "Enable Notifications",
-    "subtitle": "Stay informed",
-    "description": "Get reminders for feedings, sleep times, and important milestones.",
-    "push": "Push Notifications",
-    "email": "Email Notifications",
-    "enable": "Enable Notifications",
-    "skipForNow": "Skip for Now"
+    "title": "启用通知",
+    "subtitle": "保持了解",
+    "description": "获取喂养、睡眠时间和重要里程碑的提醒。",
+    "push": "推送通知",
+    "email": "邮件通知",
+    "enable": "启用通知",
+    "skipForNow": "暂时跳过"
   },
   "complete": {
-    "title": "All Set!",
-    "subtitle": "You're ready to start tracking",
-    "description": "Start tracking your child's activities and get personalized AI-powered insights.",
-    "startTracking": "Start Tracking",
-    "exploreDashboard": "Explore Dashboard"
+    "title": "全部设置完成！",
+    "subtitle": "您已准备好开始跟踪",
+    "description": "开始跟踪您孩子的活动并获得个性化的AI驱动洞察。",
+    "startTracking": "开始跟踪",
+    "exploreDashboard": "探索仪表板"
   },
   "navigation": {
-    "next": "Next",
-    "back": "Back",
-    "skip": "Skip",
-    "finish": "Finish"
+    "next": "下一步",
+    "back": "返回",
+    "skip": "跳过",
+    "finish": "完成"
   },
   "progress": {
-    "step": "Step {{current}} of {{total}}"
+    "step": "第{{current}}步，共{{total}}步"
   }
-}
+}
\ No newline at end of file
diff --git a/maternal-web/locales/zh/settings.json b/maternal-web/locales/zh/settings.json
index 9e7198e..bf1a05c 100644
--- a/maternal-web/locales/zh/settings.json
+++ b/maternal-web/locales/zh/settings.json
@@ -1,108 +1,147 @@
 {
-  "title": "Settings",
+  "title": "设置",
   "account": {
-    "title": "Account",
-    "profile": "Profile",
-    "email": "Email",
-    "password": "Password",
-    "changePassword": "Change Password",
-    "deleteAccount": "Delete Account",
-    "confirmDelete": "Are you sure you want to delete your account? This action cannot be undone."
+    "title": "账户",
+    "profile": "个人资料",
+    "email": "邮箱",
+    "password": "密码",
+    "changePassword": "更改密码",
+    "deleteAccount": "删除账户",
+    "confirmDelete": "您确定要删除您的账户吗？此操作无法撤销。"
   },
   "preferences": {
-    "title": "Preferences",
-    "language": "Language",
-    "measurementUnits": "Measurement Units",
-    "metric": "Metric (kg, cm, °C, ml)",
-    "imperial": "Imperial (lb, in, °F, oz)",
-    "dateFormat": "Date Format",
-    "timeFormat": "Time Format",
-    "12hour": "12-hour",
-    "24hour": "24-hour",
-    "theme": "Theme",
-    "light": "Light",
-    "dark": "Dark",
-    "auto": "Auto (System)"
+    "title": "偏好设置",
+    "language": "语言",
+    "measurementUnits": "测量单位",
+    "metric": "公制 (kg, cm, °C, ml)",
+    "imperial": "英制 (lb, in, °F, oz)",
+    "timezone": "时区",
+    "autoDetectTimezone": "自动检测",
+    "timezoneUpdated": "时区更新成功",
+    "timezoneAutoDetected": "自动检测时区",
+    "dateFormat": "日期格式",
+    "timeFormat": "时间格式",
+    "12hour": "12小时制",
+    "24hour": "24小时制",
+    "timeFormatUpdated": "时间格式更新成功",
+    "theme": "主题",
+    "light": "浅色",
+    "dark": "深色",
+    "auto": "自动（系统）"
   },
   "notifications": {
-    "title": "Notifications",
-    "push": "Push Notifications",
-    "email": "Email Notifications",
-    "feedingReminders": "Feeding Reminders",
-    "sleepReminders": "Sleep Reminders",
-    "milestoneAlerts": "Milestone Alerts",
-    "familyUpdates": "Family Updates",
-    "aiSuggestions": "AI Suggestions"
+    "title": "通知",
+    "push": "推送通知",
+    "email": "邮件通知",
+    "feedingReminders": "喂养提醒",
+    "sleepReminders": "睡眠提醒",
+    "milestoneAlerts": "里程碑提醒",
+    "familyUpdates": "家庭更新",
+    "aiSuggestions": "AI建议"
   },
   "privacy": {
-    "title": "Privacy & Security",
-    "dataSharing": "Data Sharing",
-    "familyAccess": "Family Access",
-    "biometric": "Biometric Authentication",
-    "enableFaceId": "Enable Face ID",
-    "enableTouchId": "Enable Touch ID",
-    "enableFingerprint": "Enable Fingerprint",
-    "dataExport": "Export Data",
-    "downloadData": "Download Your Data"
+    "title": "隐私与安全",
+    "dataSharing": "数据共享",
+    "familyAccess": "家庭访问",
+    "biometric": "生物识别认证",
+    "enableFaceId": "启用面容ID",
+    "enableTouchId": "启用触控ID",
+    "enableFingerprint": "启用指纹",
+    "dataExport": "导出数据",
+    "downloadData": "下载您的数据"
   },
   "family": {
-    "title": "Family",
-    "members": "Family Members",
-    "inviteMember": "Invite Member",
-    "removeMember": "Remove Member",
-    "permissions": "Permissions",
-    "role": "Role",
+    "title": "家庭",
+    "members": "家庭成员",
+    "inviteMember": "邀请成员",
+    "removeMember": "移除成员",
+    "permissions": "权限",
+    "role": "角色",
     "roles": {
-      "admin": "Admin",
-      "parent": "Parent",
-      "caregiver": "Caregiver",
-      "viewer": "Viewer"
+      "admin": "管理员",
+      "parent": "父母",
+      "caregiver": "照顾者",
+      "viewer": "查看者"
     }
   },
   "children": {
-    "title": "Children",
-    "addChild": "Add Child",
-    "editChild": "Edit Child",
-    "removeChild": "Remove Child",
-    "name": "Name",
-    "dateOfBirth": "Date of Birth",
-    "gender": "Gender",
+    "title": "孩子",
+    "addChild": "添加孩子",
+    "editChild": "编辑孩子",
+    "removeChild": "移除孩子",
+    "name": "姓名",
+    "dateOfBirth": "出生日期",
+    "gender": "性别",
     "genders": {
-      "male": "Male",
-      "female": "Female",
-      "other": "Other",
-      "preferNotToSay": "Prefer not to say"
+      "male": "男",
+      "female": "女",
+      "other": "其他",
+      "preferNotToSay": "不愿透露"
     }
   },
   "subscription": {
-    "title": "Subscription",
-    "plan": "Current Plan",
-    "free": "Free",
-    "premium": "Premium",
-    "upgradeToPremium": "Upgrade to Premium",
-    "manageBilling": "Manage Billing",
-    "cancelSubscription": "Cancel Subscription",
-    "renewalDate": "Renewal Date",
+    "title": "订阅",
+    "plan": "当前计划",
+    "free": "免费",
+    "premium": "高级版",
+    "upgradeToPremium": "升级到高级版",
+    "manageBilling": "管理账单",
+    "cancelSubscription": "取消订阅",
+    "renewalDate": "续费日期",
     "features": {
-      "unlimitedAi": "Unlimited AI questions",
-      "familySync": "Family sync",
-      "advancedAnalytics": "Advanced analytics",
-      "exportReports": "Export reports",
-      "prioritySupport": "Priority support"
+      "unlimitedAi": "无限AI问题",
+      "familySync": "家庭同步",
+      "advancedAnalytics": "高级分析",
+      "exportReports": "导出报告",
+      "prioritySupport": "优先支持"
     }
   },
   "about": {
-    "title": "About",
-    "version": "Version",
-    "termsOfService": "Terms of Service",
-    "privacyPolicy": "Privacy Policy",
-    "helpCenter": "Help Center",
-    "contactSupport": "Contact Support",
-    "rateApp": "Rate App",
-    "shareApp": "Share App"
+    "title": "关于",
+    "version": "版本",
+    "termsOfService": "服务条款",
+    "privacyPolicy": "隐私政策",
+    "helpCenter": "帮助中心",
+    "contactSupport": "联系支持",
+    "rateApp": "评价应用",
+    "shareApp": "分享应用"
   },
-  "save": "Save Changes",
-  "saved": "Settings saved successfully",
-  "cancel": "Cancel",
-  "reset": "Reset to Default"
-}
+  "profile": {
+    "title": "个人资料信息",
+    "name": "姓名",
+    "nameRequired": "姓名不能为空",
+    "email": "邮箱",
+    "emailNotEditable": "邮箱无法更改"
+  },
+  "appearance": {
+    "title": "外观",
+    "darkMode": "深色模式（即将推出）"
+  },
+  "security": {
+    "title": "安全"
+  },
+  "sessions": {
+    "title": "会话"
+  },
+  "deviceTrust": {
+    "title": "设备信任"
+  },
+  "biometric": {
+    "title": "生物识别认证"
+  },
+  "dataExport": {
+    "title": "数据导出"
+  },
+  "accountDeletion": {
+    "title": "账户删除"
+  },
+  "accountActions": {
+    "title": "账户操作",
+    "logout": "退出登录"
+  },
+  "save": "保存偏好设置",
+  "saving": "保存中...",
+  "saved": "设置保存成功！",
+  "cancel": "取消",
+  "reset": "重置为默认"
+}
\ No newline at end of file
diff --git a/maternal-web/locales/zh/tracking.json b/maternal-web/locales/zh/tracking.json
index bcf01f2..b1b54cd 100644
--- a/maternal-web/locales/zh/tracking.json
+++ b/maternal-web/locales/zh/tracking.json
@@ -1,7 +1,7 @@
 {
-  "title": "活动追踪",
-  "trackActivity": "记录活动",
-  "selectActivity": "选择要追踪的活动",
+  "title": "活动跟踪",
+  "trackActivity": "跟踪活动",
+  "selectActivity": "选择要跟踪的活动",
   "activities": {
     "feeding": "喂养",
     "sleep": "睡眠",
@@ -10,128 +10,270 @@
     "activity": "活动"
   },
   "feeding": {
-    "title": "Feeding",
-    "addFeeding": "Add Feeding",
-    "type": "Feeding Type",
+    "title": "喂养",
+    "addFeeding": "添加喂养",
+    "type": "喂养类型",
     "types": {
-      "breast": "Breast",
-      "bottle": "Bottle",
-      "solid": "Solid Food"
+      "breast": "母乳",
+      "bottle": "奶瓶",
+      "solid": "固体食物"
     },
-    "side": "Side",
+    "side": "侧面",
     "sides": {
-      "left": "Left",
-      "right": "Right",
-      "both": "Both"
+      "left": "左侧",
+      "right": "右侧",
+      "both": "两侧"
     },
-    "amount": "Amount",
-    "duration": "Duration",
-    "startTime": "Start Time",
-    "endTime": "End Time",
-    "notes": "Notes",
+    "amount": "数量",
+    "duration": "持续时间",
+    "startTime": "开始计时",
+    "endTime": "停止计时",
+    "reset": "重置",
+    "notes": "备注",
+    "bottleType": "奶瓶类型",
+    "bottleTypes": {
+      "formula": "配方奶",
+      "breastmilk": "母乳",
+      "other": "其他"
+    },
+    "foodDescription": "食物描述",
+    "amountDescription": "数量描述",
     "placeholders": {
-      "amount": "Enter amount",
-      "notes": "Add any notes about this feeding..."
+      "amount": "输入数量",
+      "notes": "添加关于此次喂养的备注...",
+      "duration": "或手动输入持续时间",
+      "foodDescription": "例如：米糊、香蕉泥",
+      "amountDescription": "例如：1/4杯、2勺"
     },
     "units": {
-      "ml": "ml",
-      "oz": "oz",
-      "minutes": "minutes"
+      "ml": "毫升",
+      "oz": "盎司",
+      "minutes": "分钟"
+    },
+    "validation": {
+      "durationRequired": "请输入持续时间或使用计时器",
+      "amountRequired": "请输入数量",
+      "foodRequired": "请输入食物描述"
+    },
+    "success": "喂养记录成功！",
+    "deleted": "喂养记录删除成功",
+    "recentFeedings": "最近喂养",
+    "error": {
+      "saveFailed": "保存喂养记录失败",
+      "deleteFailed": "删除喂养记录失败"
     }
   },
   "sleep": {
-    "title": "Sleep",
-    "addSleep": "Add Sleep",
-    "startTime": "Sleep Start",
-    "endTime": "Sleep End",
-    "duration": "Duration",
-    "quality": "Quality",
+    "title": "睡眠",
+    "addSleep": "添加睡眠",
+    "logSleep": "记录睡眠",
+    "startTime": "睡眠开始",
+    "endTime": "睡眠结束",
+    "duration": "持续时间",
+    "quality": "质量",
     "qualities": {
-      "poor": "Poor",
-      "fair": "Fair",
-      "good": "Good",
-      "excellent": "Excellent"
+      "poor": "差",
+      "fair": "一般",
+      "good": "好",
+      "excellent": "优秀"
     },
-    "notes": "Notes",
+    "location": "位置",
+    "locations": {
+      "crib": "婴儿床",
+      "bed": "床",
+      "stroller": "婴儿车",
+      "carrier": "背带",
+      "other": "其他"
+    },
+    "status": {
+      "title": "睡眠状态",
+      "completed": "已完成（有结束时间）",
+      "ongoing": "进行中（仍在睡觉）"
+    },
+    "now": "现在",
+    "notes": "备注",
     "placeholders": {
-      "notes": "Add any notes about this sleep session..."
-    }
+      "notes": "添加关于此次睡眠的备注..."
+    },
+    "recentSleeps": "最近睡眠",
+    "success": "睡眠记录成功！",
+    "deleted": "睡眠记录删除成功",
+    "ongoing_duration": "进行中 - {{duration}}"
   },
   "diaper": {
-    "title": "Diaper",
-    "addDiaper": "Add Diaper Change",
-    "type": "Type",
+    "title": "尿布",
+    "addDiaper": "添加换尿布",
+    "logDiaper": "记录换尿布",
+    "type": "类型",
     "types": {
-      "wet": "Wet",
-      "dirty": "Dirty",
-      "both": "Both",
-      "dry": "Dry"
+      "wet": "湿",
+      "dirty": "脏",
+      "both": "两者",
+      "dry": "干"
     },
-    "time": "Time",
-    "notes": "Notes",
+    "time": "时间",
+    "now": "现在",
+    "conditions": {
+      "title": "状况",
+      "normal": "正常",
+      "soft": "软",
+      "hard": "硬",
+      "watery": "水样",
+      "mucus": "粘液",
+      "blood": "血液"
+    },
+    "rash": {
+      "title": "有红疹",
+      "yes": "是",
+      "no": "否",
+      "severity": "红疹严重程度",
+      "alert": "检测到尿布疹。考虑涂抹尿布疹膏，如果持续请咨询您的儿科医生。",
+      "severities": {
+        "mild": "轻微",
+        "moderate": "中等",
+        "severe": "严重"
+      }
+    },
+    "notes": "备注",
     "placeholders": {
-      "notes": "Add any notes about this diaper change..."
-    }
+      "notes": "添加关于此次换尿布的备注..."
+    },
+    "recentDiapers": "最近换尿布",
+    "success": "换尿布记录成功！",
+    "deleted": "换尿布记录删除成功"
   },
   "milestone": {
-    "title": "Milestone",
-    "addMilestone": "Add Milestone",
-    "category": "Category",
+    "title": "里程碑",
+    "addMilestone": "添加里程碑",
+    "category": "类别",
     "categories": {
-      "physical": "Physical",
-      "cognitive": "Cognitive",
-      "social": "Social",
-      "language": "Language"
+      "physical": "身体",
+      "cognitive": "认知",
+      "social": "社交",
+      "language": "语言"
     },
-    "description": "Description",
-    "date": "Date",
-    "notes": "Notes",
+    "description": "描述",
+    "date": "日期",
+    "notes": "备注",
     "placeholders": {
-      "description": "Describe the milestone...",
-      "notes": "Add any additional notes..."
+      "description": "描述里程碑...",
+      "notes": "添加任何额外备注..."
     }
   },
   "health": {
-    "title": "Health",
-    "addHealth": "Add Health Record",
-    "type": "Type",
+    "title": "健康",
+    "addHealth": "添加健康记录",
+    "type": "类型",
     "types": {
-      "temperature": "Temperature",
-      "medication": "Medication",
-      "symptom": "Symptom",
-      "doctor": "Doctor Visit"
+      "temperature": "体温",
+      "medication": "药物",
+      "symptom": "症状",
+      "doctor": "医生就诊"
     },
-    "temperature": "Temperature",
-    "medication": "Medication",
-    "dosage": "Dosage",
-    "symptom": "Symptom",
-    "severity": "Severity",
+    "temperature": "体温",
+    "medication": "药物",
+    "medicineInfo": "药物信息",
+    "medicineName": {
+      "label": "药物名称",
+      "placeholder": "例如：对乙酰氨基酚、布洛芬",
+      "required": "请输入药物名称"
+    },
+    "dosage": {
+      "label": "剂量",
+      "placeholder": "例如：5、2.5",
+      "required": "请输入剂量"
+    },
+    "unit": "单位",
+    "route": {
+      "label": "给药途径",
+      "oral": "口服",
+      "topical": "外用",
+      "injection": "注射",
+      "other": "其他"
+    },
+    "reason": {
+      "label": "原因（可选）",
+      "placeholder": "例如：发烧、疼痛、过敏"
+    },
+    "logMedicine": "记录药物",
+    "recentMedicines": "最近药物",
+    "success": "药物记录成功！",
+    "error": "保存药物失败",
+    "deleted": "药物记录删除成功",
+    "deleteError": "删除药物失败",
+    "symptom": "症状",
+    "severity": "严重程度",
     "severities": {
-      "mild": "Mild",
-      "moderate": "Moderate",
-      "severe": "Severe"
+      "mild": "轻微",
+      "moderate": "中等",
+      "severe": "严重"
     },
-    "notes": "Notes",
+    "notes": "备注",
     "placeholders": {
-      "medication": "Medication name",
-      "dosage": "Dosage amount",
-      "symptom": "Describe symptom",
-      "notes": "Add any notes..."
+      "medication": "药物名称",
+      "dosage": "剂量数量",
+      "symptom": "描述症状",
+      "notes": "添加任何备注..."
     },
     "units": {
+      "ml": "毫升",
+      "mg": "毫克",
+      "tsp": "茶匙",
+      "tbsp": "汤匙",
+      "drops": "滴",
+      "tablet": "片",
       "celsius": "°C",
       "fahrenheit": "°F"
     }
   },
-  "quickLog": "Quick Log",
-  "viewHistory": "View History",
-  "editEntry": "Edit Entry",
-  "deleteEntry": "Delete Entry",
-  "confirmDelete": "Are you sure you want to delete this entry?",
-  "filterByType": "Filter by Type",
-  "filterByChild": "Filter by Child",
-  "sortByNewest": "Newest First",
-  "sortByOldest": "Oldest First",
-  "noEntries": "No entries yet",
-  "addFirstEntry": "Add your first entry to start tracking"
-}
+  "activity": {
+    "title": "活动",
+    "addActivity": "添加活动",
+    "logActivity": "记录活动",
+    "type": "活动类型",
+    "types": {
+      "play": "玩耍",
+      "tummyTime": "趴着时间",
+      "walk": "散步",
+      "music": "音乐",
+      "reading": "阅读",
+      "outdoor": "户外玩耍",
+      "other": "其他"
+    },
+    "duration": "持续时间（分钟）",
+    "description": "描述",
+    "notes": "备注",
+    "placeholders": {
+      "duration": "输入持续时间（分钟）",
+      "description": "描述活动...",
+      "notes": "添加任何备注..."
+    },
+    "recentActivities": "最近活动",
+    "success": "活动记录成功！",
+    "deleted": "活动记录删除成功"
+  },
+  "common": {
+    "selectChild": "选择孩子",
+    "cancel": "取消",
+    "delete": "删除",
+    "loading": "加载中...",
+    "noChildrenAdded": "未添加孩子",
+    "noChildrenMessage": "您需要先添加孩子才能跟踪活动",
+    "addChild": "添加孩子",
+    "recentActivities": "最近活动",
+    "error": {
+      "loadChildrenFailed": "加载孩子信息失败"
+    }
+  },
+  "quickLog": "快速记录",
+  "viewHistory": "查看历史",
+  "editEntry": "编辑条目",
+  "deleteEntry": "删除条目",
+  "confirmDelete": "您确定要删除此条目吗？",
+  "filterByType": "按类型筛选",
+  "filterByChild": "按孩子筛选",
+  "sortByNewest": "最新优先",
+  "sortByOldest": "最旧优先",
+  "noEntries": "还没有条目",
+  "addFirstEntry": "添加您的第一个条目开始跟踪"
+}
\ No newline at end of file