diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index 4b413c6f..46f89c38 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -767,6 +767,64 @@
         "app_updates": "App Updates",
         "about_nuvio": "About Nuvio"
     },
+    "cloud_sync": {
+        "title": "Nuvio Sync",
+        "description": "Sync data across your Nuvio devices",
+        "hero_title": "Cloud Sync",
+        "hero_subtitle": "Keep your addons, progress, and library aligned across all devices.",
+        "auth": {
+            "account": "Account",
+            "not_configured": "Supabase not configured",
+            "not_authenticated": "Not authenticated",
+            "email_session": "Email session",
+            "signed_in_as": "Signed in as {{email}}",
+            "not_signed_in": "Not signed in",
+            "effective_owner": "Effective owner: {{id}}"
+        },
+        "stats": {
+            "title": "Database Statistics",
+            "plugins": "Plugins",
+            "addons": "Addons",
+            "watch_progress": "Watch Progress",
+            "library_items": "Library Items",
+            "watched_items": "Watched Items",
+            "signin_required": "Sign in to load remote data counts."
+        },
+        "actions": {
+            "title": "Actions",
+            "description": "Pull to update this device from the cloud, or push from this device as the latest source.",
+            "pull_btn": "Pull from Cloud",
+            "push_btn": "Push from Device",
+            "manage_account": "Manage Account",
+            "sign_out": "Sign Out",
+            "sign_in_up": "Sign In / Up"
+        },
+        "alerts": {
+            "pull_success_title": "Cloud Data Pulled",
+            "pull_success_msg": "The latest cloud data has been downloaded to this device.",
+            "pull_failed_title": "Pull Failed",
+            "pull_failed_msg": "Failed to download data from the cloud",
+            "push_success_title": "Push Completed",
+            "push_success_msg": "Device data has been uploaded to the cloud.",
+            "push_failed_title": "Push Failed",
+            "push_failed_msg": "Failed to upload local data",
+            "sign_out_failed": "Sign Out Failed",
+            "sign_out_failed_title": "Logout Error"
+        },
+        "external_sync": {
+            "title": "External Sync Priority",
+            "active_msg": "{{services}} is active. Watch progress and library updates are managed by these services instead of Nuvio cloud database.",
+            "inactive_msg": "If Trakt or Simkl sync is enabled, watch progress and library updates will use those services instead of Nuvio cloud database."
+        },
+        "pre_auth": {
+            "title": "Before Syncing",
+            "description": "Sign in to start cloud sync and keep your data consistent across devices.",
+            "point_1": "• Addons and plugins settings",
+            "point_2": "• Watch progress and library",
+            "env_warning": "Set EXPO_PUBLIC_SUPABASE_URL and EXPO_PUBLIC_SUPABASE_ANON_KEY to enable sync."
+        },
+        "connection": "Connection"
+    },
     "privacy": {
         "title": "Privacy & Data",
         "settings_desc": "Control telemetry and data collection",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 8ac6a0bb..736840c6 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -775,6 +775,64 @@
         "app_updates": "Atualizações do App",
         "about_nuvio": "Sobre o Nuvio"
     },
+    "cloud_sync": {
+        "title": "Nuvio Sync",
+        "description": "Sincronize dados entre seus dispositivos Nuvio",
+        "hero_title": "Sincronização na Nuvem",
+        "hero_subtitle": "Mantenha seus addons, progresso e biblioteca alinhados em todos os dispositivos.",
+        "auth": {
+            "account": "Conta",
+            "not_configured": "Supabase não configurado",
+            "not_authenticated": "Não autenticado",
+            "email_session": "Sessão de email",
+            "signed_in_as": "Logado como {{email}}",
+            "not_signed_in": "Não logado",
+            "effective_owner": "Proprietário efetivo: {{id}}"
+        },
+        "stats": {
+            "title": "Estatísticas do Banco de Dados",
+            "plugins": "Plugins",
+            "addons": "Addons",
+            "watch_progress": "Progresso",
+            "library_items": "Itens na Biblioteca",
+            "watched_items": "Itens Assistidos",
+            "signin_required": "Faça login para carregar contagens de dados remotos."
+        },
+        "actions": {
+            "title": "Ações",
+            "description": "Baixe para atualizar este dispositivo a partir da nuvem, ou envie deste dispositivo como a fonte mais recente.",
+            "pull_btn": "Baixar da Nuvem",
+            "push_btn": "Enviar deste Dispositivo",
+            "manage_account": "Gerenciar Conta",
+            "sign_out": "Sair",
+            "sign_in_up": "Entrar / Cadastrar"
+        },
+        "alerts": {
+            "pull_success_title": "Dados da Nuvem Baixados",
+            "pull_success_msg": "Os dados mais recentes da nuvem foram baixados para este dispositivo.",
+            "pull_failed_title": "Falha ao Baixar",
+            "pull_failed_msg": "Falha ao baixar dados da nuvem",
+            "push_success_title": "Envio Concluído",
+            "push_success_msg": "Os dados deste dispositivo foram enviados para a nuvem.",
+            "push_failed_title": "Falha ao Enviar",
+            "push_failed_msg": "Falha ao enviar dados locais",
+            "sign_out_failed": "Falha ao Sair",
+            "sign_out_failed_title": "Erro de Saida"
+        },
+        "external_sync": {
+            "title": "Prioridade de Sincronização Externa",
+            "active_msg": "{{services}} está ativo. O progresso e atualizações da biblioteca são gerenciados por esses serviços em vez do banco de dados Nuvio.",
+            "inactive_msg": "Se a sincronização do Trakt ou Simkl estiver ativada, o progresso e a biblioteca usarão esses serviços em vez do banco de dados Nuvio."
+        },
+        "pre_auth": {
+            "title": "Antes de Sincronizar",
+            "description": "Faça login para iniciar a sincronização na nuvem e manter seus dados consistentes entre dispositivos.",
+            "point_1": "• Configurações de addons e plugins",
+            "point_2": "• Progresso de exibição e biblioteca",
+            "env_warning": "Defina EXPO_PUBLIC_SUPABASE_URL e EXPO_PUBLIC_SUPABASE_ANON_KEY para habilitar a sincronização."
+        },
+        "connection": "Conexão"
+    },
     "privacy": {
         "title": "Privacidade e Dados",
         "settings_desc": "Controle a telemetria e coleta de dados",
diff --git a/src/screens/SettingsScreen.tsx b/src/screens/SettingsScreen.tsx
index cd545c8f..b2bb71a2 100644
--- a/src/screens/SettingsScreen.tsx
+++ b/src/screens/SettingsScreen.tsx
@@ -381,8 +381,8 @@ const SettingsScreen: React.FC = () => {
           <SettingsCard title={t('settings.sections.account')} isTablet={isTablet}>
             {showCloudSyncItem && (
               <SettingItem
-                title="Nuvio Sync"
-                description="Sync data across your Nuvio devices"
+                title={t('settings.cloud_sync.title')}
+                description={t('settings.cloud_sync.description')}
                 customIcon={
                   <FastImage
                     source={require('../../assets/nuvio-sync-icon-og.png')}
diff --git a/src/screens/SyncSettingsScreen.tsx b/src/screens/SyncSettingsScreen.tsx
index 6be0070f..ab0ec7ae 100644
--- a/src/screens/SyncSettingsScreen.tsx
+++ b/src/screens/SyncSettingsScreen.tsx
@@ -48,7 +48,7 @@ const SyncSettingsScreen: React.FC = () => {
     (title: string, message: string, actions?: Array<{ label: string; onPress: () => void; style?: object }>) => {
       setAlertTitle(title);
       setAlertMessage(message);
-      setAlertActions(actions && actions.length > 0 ? actions : [{ label: 'OK', onPress: () => {} }]);
+      setAlertActions(actions && actions.length > 0 ? actions : [{ label: 'OK', onPress: () => { } }]);
       setAlertVisible(true);
     },
     []
@@ -64,7 +64,7 @@ const SyncSettingsScreen: React.FC = () => {
       const stats = await supabaseSyncService.getRemoteStats();
       setRemoteStats(stats);
     } catch (error: any) {
-      openAlert('Sync Error', error?.message || 'Failed to load sync state');
+      openAlert(t('common.error'), error?.message || t('settings.cloud_sync.auth.not_authenticated'));
     } finally {
       setLoading(false);
     }
@@ -77,19 +77,19 @@ const SyncSettingsScreen: React.FC = () => {
   );
 
   const authLabel = useMemo(() => {
-    if (!supabaseSyncService.isConfigured()) return 'Supabase not configured';
-    if (!sessionUser) return 'Not authenticated';
-    return `Email session${sessionUser.email ? ` (${sessionUser.email})` : ''}`;
+    if (!supabaseSyncService.isConfigured()) return t('settings.cloud_sync.auth.not_configured');
+    if (!sessionUser) return t('settings.cloud_sync.auth.not_authenticated');
+    return `${t('settings.cloud_sync.auth.email_session')} ${sessionUser.email ? `(${sessionUser.email})` : ''}`;
   }, [sessionUser]);
 
   const statItems = useMemo(() => {
     if (!remoteStats) return [];
     return [
-      { label: 'Plugins', value: remoteStats.plugins },
-      { label: 'Addons', value: remoteStats.addons },
-      { label: 'Watch Progress', value: remoteStats.watchProgress },
-      { label: 'Library Items', value: remoteStats.libraryItems },
-      { label: 'Watched Items', value: remoteStats.watchedItems },
+      { label: t('settings.cloud_sync.stats.plugins'), value: remoteStats.plugins },
+      { label: t('settings.cloud_sync.stats.addons'), value: remoteStats.addons },
+      { label: t('settings.cloud_sync.stats.watch_progress'), value: remoteStats.watchProgress },
+      { label: t('settings.cloud_sync.stats.library_items'), value: remoteStats.libraryItems },
+      { label: t('settings.cloud_sync.stats.watched_items'), value: remoteStats.watchedItems },
     ];
   }, [remoteStats]);
   const isSignedIn = Boolean(user);
@@ -106,10 +106,10 @@ const SyncSettingsScreen: React.FC = () => {
     setSyncCodeLoading(true);
     try {
       await supabaseSyncService.pullAllToLocal();
-      openAlert('Cloud Data Pulled', 'Latest cloud data was pulled to this device.');
+      openAlert(t('settings.cloud_sync.alerts.pull_success_title'), t('settings.cloud_sync.alerts.pull_success_msg'));
       await loadSyncState();
     } catch (error: any) {
-      openAlert('Pull Failed', error?.message || 'Failed to pull cloud data');
+      openAlert(t('settings.cloud_sync.alerts.pull_failed_title'), error?.message || t('settings.cloud_sync.alerts.pull_failed_msg'));
     } finally {
       setSyncCodeLoading(false);
     }
@@ -119,10 +119,10 @@ const SyncSettingsScreen: React.FC = () => {
     setSyncCodeLoading(true);
     try {
       await supabaseSyncService.pushAllLocalData();
-      openAlert('Upload Complete', 'This device data has been uploaded to cloud.');
+      openAlert(t('settings.cloud_sync.alerts.push_success_title'), t('settings.cloud_sync.alerts.push_success_msg'));
       await loadSyncState();
     } catch (error: any) {
-      openAlert('Upload Failed', error?.message || 'Failed to upload local data');
+      openAlert(t('settings.cloud_sync.alerts.push_failed_title'), error?.message || t('settings.cloud_sync.alerts.push_failed_msg'));
     } finally {
       setSyncCodeLoading(false);
     }
@@ -134,14 +134,14 @@ const SyncSettingsScreen: React.FC = () => {
       await signOut();
       await loadSyncState();
     } catch (error: any) {
-      openAlert('Sign Out Failed', error?.message || 'Failed to sign out');
+      openAlert(t('settings.cloud_sync.alerts.sign_out_failed_title'), error?.message || t('settings.cloud_sync.alerts.sign_out_failed_msg'));
     } finally {
       setSyncCodeLoading(false);
     }
   };
 
   return (
-      <SafeAreaView style={[styles.container, { backgroundColor: currentTheme.colors.darkBackground }]}>
+    <SafeAreaView style={[styles.container, { backgroundColor: currentTheme.colors.darkBackground }]}>
       <StatusBar barStyle="light-content" />
       <View style={styles.header}>
         <TouchableOpacity onPress={() => navigation.goBack()} style={styles.backButton}>
@@ -150,176 +150,181 @@ const SyncSettingsScreen: React.FC = () => {
         </TouchableOpacity>
         <View style={styles.headerActions} />
       </View>
-      <Text style={[styles.screenTitle, { color: currentTheme.colors.highEmphasis }]}>Nuvio Sync</Text>
+      <Text style={[styles.screenTitle, { color: currentTheme.colors.highEmphasis }]}>{t('settings.cloud_sync.title')}</Text>
 
       {loading ? (
         <View style={styles.loadingContainer}>
           <ActivityIndicator color={currentTheme.colors.primary} size="large" />
         </View>
       ) : (
-      <>
+        <>
 
-      <ScrollView contentContainerStyle={[styles.content, isTablet ? styles.contentTablet : null, { paddingBottom: insets.bottom + 24 }]}>
-        <View style={[styles.heroCard, { backgroundColor: currentTheme.colors.elevation1, borderColor: currentTheme.colors.elevation2 }]}>
-          <View style={styles.heroTopRow}>
-            <View style={styles.heroTitleWrap}>
-              <Text style={[styles.heroTitle, { color: currentTheme.colors.highEmphasis }]}>Cloud Sync</Text>
-              <Text style={[styles.heroSubtitle, { color: currentTheme.colors.mediumEmphasis }]}>
-                Keep your addons, progress and library aligned across devices.
-              </Text>
-            </View>
-          </View>
-        </View>
-
-        <View style={[styles.noteCard, { backgroundColor: currentTheme.colors.elevation1, borderColor: currentTheme.colors.elevation2 }]}>
-          <View style={styles.sectionHeader}>
-            <MaterialIcons name="info-outline" size={18} color={currentTheme.colors.highEmphasis} />
-            <Text style={[styles.cardTitle, { color: currentTheme.colors.highEmphasis }]}>External Sync Priority</Text>
-          </View>
-          <Text style={[styles.cardText, { color: currentTheme.colors.mediumEmphasis }]}>
-            {externalSyncActive
-              ? `${externalSyncServices.join(' + ')} is active. Watch progress and library updates are managed by these services instead of Nuvio cloud database.`
-              : 'If Trakt or Simkl sync is enabled, watch progress and library updates will use those services instead of Nuvio cloud database.'}
-          </Text>
-        </View>
-
-        <View style={[styles.card, { backgroundColor: currentTheme.colors.elevation1, borderColor: currentTheme.colors.elevation2 }]}>
-          <View style={styles.sectionHeader}>
-            <MaterialIcons name="person-outline" size={18} color={currentTheme.colors.highEmphasis} />
-            <Text style={[styles.cardTitle, { color: currentTheme.colors.highEmphasis }]}>Account</Text>
-          </View>
-          <Text style={[styles.cardText, { color: currentTheme.colors.mediumEmphasis }]}>
-            {user?.email ? `Signed in as ${user.email}` : 'Not signed in'}
-          </Text>
-          <View style={styles.buttonRow}>
-            {!isSignedIn ? (
-              <TouchableOpacity
-                style={[styles.button, { backgroundColor: currentTheme.colors.primary }]}
-                onPress={() => navigation.navigate('Account')}
-              >
-                <Text style={styles.buttonText}>Sign In / Sign Up</Text>
-              </TouchableOpacity>
-            ) : (
-              <>
-                <TouchableOpacity
-                  style={[styles.button, { backgroundColor: currentTheme.colors.primary }]}
-                  onPress={() => navigation.navigate('AccountManage')}
-                >
-                  <Text style={styles.buttonText}>Manage Account</Text>
-                </TouchableOpacity>
-                <TouchableOpacity
-                  disabled={syncCodeLoading}
-                  style={[styles.button, { backgroundColor: currentTheme.colors.elevation2 }]}
-                  onPress={handleSignOut}
-                >
-                  <Text style={styles.buttonText}>Sign Out</Text>
-                </TouchableOpacity>
-              </>
-            )}
-          </View>
-        </View>
-
-        {!isSignedIn ? (
-          <View style={[styles.card, styles.preAuthCard, { backgroundColor: currentTheme.colors.elevation1, borderColor: currentTheme.colors.elevation2 }]}>
-            <View style={styles.sectionHeader}>
-              <MaterialIcons name="sync-lock" size={18} color={currentTheme.colors.highEmphasis} />
-              <Text style={[styles.cardTitle, { color: currentTheme.colors.highEmphasis }]}>Before You Sync</Text>
-            </View>
-            <Text style={[styles.cardText, { color: currentTheme.colors.mediumEmphasis }]}>
-              Sign in to start cloud sync and keep your data consistent across devices.
-            </Text>
-            <View style={styles.preAuthList}>
-              <Text style={[styles.preAuthItem, { color: currentTheme.colors.mediumEmphasis }]}>• Addons and plugin settings</Text>
-              <Text style={[styles.preAuthItem, { color: currentTheme.colors.mediumEmphasis }]}>• Watch progress and library</Text>
-            </View>
-            {!supabaseSyncService.isConfigured() && (
-              <Text style={[styles.warning, { color: '#ffb454' }]}>
-                Set EXPO_PUBLIC_SUPABASE_URL and EXPO_PUBLIC_SUPABASE_ANON_KEY to enable sync.
-              </Text>
-            )}
-          </View>
-        ) : (
-          <>
-            <View style={[styles.card, { backgroundColor: currentTheme.colors.elevation1, borderColor: currentTheme.colors.elevation2 }]}>
-              <View style={styles.sectionHeader}>
-                <MaterialIcons name="link" size={18} color={currentTheme.colors.highEmphasis} />
-                <Text style={[styles.cardTitle, { color: currentTheme.colors.highEmphasis }]}>Connection</Text>
-              </View>
-              <Text style={[styles.cardText, { color: currentTheme.colors.mediumEmphasis }]}>{authLabel}</Text>
-              <Text style={[styles.cardText, { color: currentTheme.colors.mediumEmphasis }]}>
-                Effective owner: {ownerId || 'Unavailable'}
-              </Text>
-              {!supabaseSyncService.isConfigured() && (
-                <Text style={[styles.warning, { color: '#ffb454' }]}>
-                  Set EXPO_PUBLIC_SUPABASE_URL and EXPO_PUBLIC_SUPABASE_ANON_KEY to enable sync.
-                </Text>
-              )}
-            </View>
-
-            <View style={[styles.card, { backgroundColor: currentTheme.colors.elevation1, borderColor: currentTheme.colors.elevation2 }]}>
-              <View style={styles.sectionHeader}>
-                <MaterialIcons name="storage" size={18} color={currentTheme.colors.highEmphasis} />
-                <Text style={[styles.cardTitle, { color: currentTheme.colors.highEmphasis }]}>Database Stats</Text>
-              </View>
-              {!remoteStats ? (
-                <Text style={[styles.cardText, { color: currentTheme.colors.mediumEmphasis }]}>
-                  Sign in to load remote data counts.
-                </Text>
-              ) : (
-                <View style={styles.statsGrid}>
-                  {statItems.map((item) => (
-                    <View key={item.label} style={[styles.statTile, { backgroundColor: currentTheme.colors.darkBackground, borderColor: currentTheme.colors.elevation2 }]}>
-                      <Text style={[styles.statValue, { color: currentTheme.colors.highEmphasis }]}>{item.value}</Text>
-                      <Text style={[styles.statLabel, { color: currentTheme.colors.mediumEmphasis }]}>{item.label}</Text>
-                    </View>
-                  ))}
+          <ScrollView contentContainerStyle={[styles.content, isTablet ? styles.contentTablet : null, { paddingBottom: insets.bottom + 24 }]}>
+            <View style={[styles.heroCard, { backgroundColor: currentTheme.colors.elevation1, borderColor: currentTheme.colors.elevation2 }]}>
+              <View style={styles.heroTopRow}>
+                <View style={styles.heroTitleWrap}>
+                  <Text style={[styles.heroTitle, { color: currentTheme.colors.highEmphasis }]}>{t('settings.cloud_sync.hero_title')}</Text>
+                  <Text style={[styles.heroSubtitle, { color: currentTheme.colors.mediumEmphasis }]}>
+                    {t('settings.cloud_sync.hero_subtitle')}
+                  </Text>
                 </View>
-              )}
+              </View>
+            </View>
+
+            <View style={[styles.noteCard, { backgroundColor: currentTheme.colors.elevation1, borderColor: currentTheme.colors.elevation2 }]}>
+              <View style={styles.sectionHeader}>
+                <MaterialIcons name="info-outline" size={18} color={currentTheme.colors.highEmphasis} />
+                <Text style={[styles.cardTitle, { color: currentTheme.colors.highEmphasis }]}>{t('settings.cloud_sync.external_sync.title')}</Text>
+              </View>
+              <Text style={[styles.cardText, { color: currentTheme.colors.mediumEmphasis }]}>
+                {externalSyncActive
+                  ? t('settings.cloud_sync.external_sync.active_msg', {
+                    services: externalSyncServices.join(' + ')
+                  })
+                  : t('settings.cloud_sync.external_sync.inactive_msg')}
+              </Text>
             </View>
 
             <View style={[styles.card, { backgroundColor: currentTheme.colors.elevation1, borderColor: currentTheme.colors.elevation2 }]}>
               <View style={styles.sectionHeader}>
-                <MaterialIcons name="sync" size={18} color={currentTheme.colors.highEmphasis} />
-                <Text style={[styles.cardTitle, { color: currentTheme.colors.highEmphasis }]}>Actions</Text>
+                <MaterialIcons name="person-outline" size={18} color={currentTheme.colors.highEmphasis} />
+                <Text style={[styles.cardTitle, { color: currentTheme.colors.highEmphasis }]}>{t('settings.cloud_sync.auth.account')}</Text>
               </View>
               <Text style={[styles.cardText, { color: currentTheme.colors.mediumEmphasis }]}>
-                Pull to refresh this device from cloud, or upload this device as the latest source.
+                {user?.email
+                  ? t('settings.cloud_sync.auth.signed_in_as', { email: user.email })
+                  : t('settings.cloud_sync.auth.not_signed_in')
+                }
               </Text>
               <View style={styles.buttonRow}>
-                <TouchableOpacity
-                  disabled={syncCodeLoading || !supabaseSyncService.isConfigured()}
-                  style={[
-                    styles.button,
-                    styles.primaryButton,
-                    { backgroundColor: currentTheme.colors.primary },
-                    (syncCodeLoading || !supabaseSyncService.isConfigured()) && styles.buttonDisabled,
-                  ]}
-                  onPress={handleManualSync}
-                >
-                  {syncCodeLoading ? (
-                    <ActivityIndicator color="#fff" />
-                  ) : (
-                    <Text style={styles.buttonText}>Pull From Cloud</Text>
-                  )}
-                </TouchableOpacity>
-                <TouchableOpacity
-                  disabled={syncCodeLoading || !supabaseSyncService.isConfigured()}
-                  style={[
-                    styles.button,
-                    styles.secondaryButton,
-                    { backgroundColor: currentTheme.colors.elevation2, borderColor: currentTheme.colors.elevation2 },
-                    (syncCodeLoading || !supabaseSyncService.isConfigured()) && styles.buttonDisabled,
-                  ]}
-                  onPress={handleUploadLocalData}
-                >
-                  <Text style={styles.buttonText}>Upload This Device</Text>
-                </TouchableOpacity>
+                {!isSignedIn ? (
+                  <TouchableOpacity
+                    style={[styles.button, { backgroundColor: currentTheme.colors.primary }]}
+                    onPress={() => navigation.navigate('Account')}
+                  >
+                    <Text style={styles.buttonText}>{t('settings.cloud_sync.actions.sign_in_up')}</Text>
+                  </TouchableOpacity>
+                ) : (
+                  <>
+                    <TouchableOpacity
+                      style={[styles.button, { backgroundColor: currentTheme.colors.primary }]}
+                      onPress={() => navigation.navigate('AccountManage')}
+                    >
+                      <Text style={styles.buttonText}>{t('settings.cloud_sync.actions.manage_account')}</Text>
+                    </TouchableOpacity>
+                    <TouchableOpacity
+                      disabled={syncCodeLoading}
+                      style={[styles.button, { backgroundColor: currentTheme.colors.elevation2 }]}
+                      onPress={handleSignOut}
+                    >
+                      <Text style={styles.buttonText}>{t('settings.cloud_sync.actions.sign_out')}</Text>
+                    </TouchableOpacity>
+                  </>
+                )}
               </View>
             </View>
-          </>
-        )}
-      </ScrollView>
-      </>
+
+            {!isSignedIn ? (
+              <View style={[styles.card, styles.preAuthCard, { backgroundColor: currentTheme.colors.elevation1, borderColor: currentTheme.colors.elevation2 }]}>
+                <View style={styles.sectionHeader}>
+                  <MaterialIcons name="sync-lock" size={18} color={currentTheme.colors.highEmphasis} />
+                  <Text style={[styles.cardTitle, { color: currentTheme.colors.highEmphasis }]}>{t('settings.cloud_sync.pre_auth.title')}</Text>
+                </View>
+                <Text style={[styles.cardText, { color: currentTheme.colors.mediumEmphasis }]}>
+                  {t('settings.cloud_sync.pre_auth.description')}
+                </Text>
+                <View style={styles.preAuthList}>
+                  <Text style={[styles.preAuthItem, { color: currentTheme.colors.mediumEmphasis }]}>{t('settings.cloud_sync.pre_auth.point_1')}</Text>
+                  <Text style={[styles.preAuthItem, { color: currentTheme.colors.mediumEmphasis }]}>{t('settings.cloud_sync.pre_auth.point_2')}</Text>
+                </View>
+                {!supabaseSyncService.isConfigured() && (
+                  <Text style={[styles.warning, { color: '#ffb454' }]}>
+                    {t('settings.cloud_sync.pre_auth.env_warning')}
+                  </Text>
+                )}
+              </View>
+            ) : (
+              <>
+                <View style={[styles.card, { backgroundColor: currentTheme.colors.elevation1, borderColor: currentTheme.colors.elevation2 }]}>
+                  <View style={styles.sectionHeader}>
+                    <MaterialIcons name="link" size={18} color={currentTheme.colors.highEmphasis} />
+                    <Text style={[styles.cardTitle, { color: currentTheme.colors.highEmphasis }]}>{t('settings.cloud_sync.connection')}</Text>
+                  </View>
+                  <Text style={[styles.cardText, { color: currentTheme.colors.mediumEmphasis }]}>{authLabel}</Text>
+                  <Text style={[styles.cardText, { color: currentTheme.colors.mediumEmphasis }]}>
+                    {t('settings.cloud_sync.auth.effective_owner', { id: ownerId || 'Unavailable' })}
+                  </Text>
+                  {!supabaseSyncService.isConfigured() && (
+                    <Text style={[styles.warning, { color: '#ffb454' }]}>
+                      {t('settings.cloud_sync.pre_auth.env_warning')}
+                    </Text>
+                  )}
+                </View>
+
+                <View style={[styles.card, { backgroundColor: currentTheme.colors.elevation1, borderColor: currentTheme.colors.elevation2 }]}>
+                  <View style={styles.sectionHeader}>
+                    <MaterialIcons name="storage" size={18} color={currentTheme.colors.highEmphasis} />
+                    <Text style={[styles.cardTitle, { color: currentTheme.colors.highEmphasis }]}>{t('settings.cloud_sync.stats.title')}</Text>
+                  </View>
+                  {!remoteStats ? (
+                    <Text style={[styles.cardText, { color: currentTheme.colors.mediumEmphasis }]}>
+                      {t('settings.cloud_sync.stats.signin_required')}
+                    </Text>
+                  ) : (
+                    <View style={styles.statsGrid}>
+                      {statItems.map((item) => (
+                        <View key={item.label} style={[styles.statTile, { backgroundColor: currentTheme.colors.darkBackground, borderColor: currentTheme.colors.elevation2 }]}>
+                          <Text style={[styles.statValue, { color: currentTheme.colors.highEmphasis }]}>{item.value}</Text>
+                          <Text style={[styles.statLabel, { color: currentTheme.colors.mediumEmphasis }]}>{item.label}</Text>
+                        </View>
+                      ))}
+                    </View>
+                  )}
+                </View>
+
+                <View style={[styles.card, { backgroundColor: currentTheme.colors.elevation1, borderColor: currentTheme.colors.elevation2 }]}>
+                  <View style={styles.sectionHeader}>
+                    <MaterialIcons name="sync" size={18} color={currentTheme.colors.highEmphasis} />
+                    <Text style={[styles.cardTitle, { color: currentTheme.colors.highEmphasis }]}>{t('settings.cloud_sync.actions.title')}</Text>
+                  </View>
+                  <Text style={[styles.cardText, { color: currentTheme.colors.mediumEmphasis }]}>
+                    {t('settings.cloud_sync.actions.description')}
+                  </Text>
+                  <View style={styles.buttonRow}>
+                    <TouchableOpacity
+                      disabled={syncCodeLoading || !supabaseSyncService.isConfigured()}
+                      style={[
+                        styles.button,
+                        styles.primaryButton,
+                        { backgroundColor: currentTheme.colors.primary },
+                        (syncCodeLoading || !supabaseSyncService.isConfigured()) && styles.buttonDisabled,
+                      ]}
+                      onPress={handleManualSync}
+                    >
+                      {syncCodeLoading ? (
+                        <ActivityIndicator color="#fff" />
+                      ) : (
+                        <Text style={styles.buttonText}>{t('settings.cloud_sync.actions.pull_btn')}</Text>
+                      )}
+                    </TouchableOpacity>
+                    <TouchableOpacity
+                      disabled={syncCodeLoading || !supabaseSyncService.isConfigured()}
+                      style={[
+                        styles.button,
+                        styles.secondaryButton,
+                        { backgroundColor: currentTheme.colors.elevation2, borderColor: currentTheme.colors.elevation2 },
+                        (syncCodeLoading || !supabaseSyncService.isConfigured()) && styles.buttonDisabled,
+                      ]}
+                      onPress={handleUploadLocalData}
+                    >
+                      <Text style={styles.buttonText}>{t('settings.cloud_sync.actions.push_btn')}</Text>
+                    </TouchableOpacity>
+                  </View>
+                </View>
+              </>
+            )}
+          </ScrollView>
+        </>
       )}
 
       <CustomAlert