Skip to content

Your favorite shift management application!

feat(ui): merge export and external sync into one import & export section (#237)

panteLa9966cdfac0c
diff --git a/components/external-sync-form.tsx b/components/external-sync-form.tsx
index a42dc88..cde493f 100644
--- a/components/external-sync-form.tsx
+++ b/components/external-sync-form.tsx
@@ -12,7 +12,6 @@ import {
AUTO_SYNC_INTERVALS,
ExternalSyncFormValues,
SyncDisplayMode,
- SyncImportType,
} from "@/hooks/useExternalSyncForm";
import { cn } from "@/lib/utils";
@@ -53,33 +52,8 @@ export function ExternalSyncForm({
/>
</Field>
- {adding && (
- <Field
- label={t("externalSync.importMethod")}
- hint={
- fileImport
- ? t("externalSync.importMethodFileHint")
- : t("externalSync.importMethodUrlHint")
- }
- >
- <SegmentedControl<SyncImportType>
- label={t("externalSync.importMethod")}
- value={values.importType}
- onChange={(next) => {
- setField("importType", next);
- setField("url", "");
- setField("file", null);
- }}
- options={[
- { value: "url", label: t("syncSheet.sourceUrl") },
- { value: "file", label: t("syncSheet.sourceFile") },
- ]}
- />
- </Field>
- )}
-
{adding && fileImport ? (
- <Field label={t("externalSync.fileLabel")}>
+ <Field label={t("externalSync.fileLabel")} hint={t("externalSync.importMethodFileHint")}>
<label
className={cn(
"flex h-10 cursor-pointer items-center gap-2.5 rounded-[9px] border border-dashed px-3 text-[13px] transition-colors focus-within:ring-[3px] focus-within:ring-ring/50 hover:bg-surface-panel",
diff --git a/components/external-sync-manage-sheet.tsx b/components/external-sync-manage-sheet.tsx
index 338ccea..deac961 100644
--- a/components/external-sync-manage-sheet.tsx
+++ b/components/external-sync-manage-sheet.tsx
@@ -1,7 +1,7 @@
"use client";
import { useTranslations } from "next-intl";
-import { Loader2, Plus } from "lucide-react";
+import { FileUp, Link, Loader2 } from "lucide-react";
import { Button } from "@/components/ui/button";
import { ConfirmationDialog } from "@/components/ui/confirmation-dialog";
import { PanelBody, PanelFooter } from "@/components/panel-dialog";
@@ -11,7 +11,6 @@ import { useExternalSyncPanel } from "@/hooks/useExternalSyncPanel";
interface ExternalSyncPanelProps {
calendarId: string;
- onClose: () => void;
onSyncComplete?: () => void;
/** Lets the surrounding frame guard its close button against unsaved changes */
onDirtyChange?: (dirty: boolean) => void;
@@ -19,7 +18,6 @@ interface ExternalSyncPanelProps {
export function ExternalSyncPanel({
calendarId,
- onClose,
onSyncComplete,
onDirtyChange,
}: ExternalSyncPanelProps) {
@@ -124,17 +122,25 @@ export function ExternalSyncPanel({
? t("common.saving")
: editingSync
? t("common.save")
- : t("syncSheet.addSubscription")}
+ : values.importType === "file"
+ ? t("syncSheet.sourceFile")
+ : t("syncSheet.addSubscription")}
</Button>
</>
) : (
<>
- <Button variant="outline" className="h-10 flex-1 font-semibold" onClick={onClose}>
- {t("common.close")}
+ <Button
+ variant="outline"
+ className="h-10 flex-1 font-semibold"
+ onClick={() => startAdd("file")}
+ disabled={busy}
+ >
+ <FileUp className="size-4" />
+ {t("syncSheet.sourceFile")}
</Button>
- <Button className="h-10 flex-1 font-semibold" onClick={startAdd} disabled={busy}>
- <Plus className="size-4" />
- {t("syncSheet.addSubscription")}
+ <Button className="h-10 flex-1 font-semibold" onClick={() => startAdd("url")} disabled={busy}>
+ <Link className="size-4" />
+ {t("syncSheet.sourceUrl")}
</Button>
</>
)}
diff --git a/components/import-export-panel.tsx b/components/import-export-panel.tsx
new file mode 100644
index 0000000..243d566
--- /dev/null
+++ b/components/import-export-panel.tsx
@@ -0,0 +1,73 @@
+"use client";
+
+import { useState } from "react";
+import { useTranslations } from "next-intl";
+import { ConfirmationDialog } from "@/components/ui/confirmation-dialog";
+import { SegmentedControl } from "@/components/segmented-control";
+import { ExportPanel } from "@/components/export-dialog";
+import { ExternalSyncPanel } from "@/components/external-sync-manage-sheet";
+import { SyncNotificationsPanel } from "@/components/sync-notification-dialog";
+import { useCalendarPermission } from "@/hooks/useCalendarPermission";
+import { useExternalSync } from "@/hooks/useExternalSync";
+import { useGuardedAction, useReportDirty } from "@/hooks/useDirtyState";
+
+type Tab = "export" | "import" | "log";
+
+interface ImportExportPanelProps {
+ calendarId: string;
+ onClose: () => void;
+ onDirtyChange: (dirty: boolean) => void;
+ onSyncComplete: () => void;
+}
+
+/** Export for everyone who can see the calendar; import and sync log only with manageExternalSync. */
+export function ImportExportPanel({
+ calendarId,
+ onClose,
+ onDirtyChange,
+ onSyncComplete,
+}: ImportExportPanelProps) {
+ const t = useTranslations();
+ const canImport = useCalendarPermission(calendarId).can("manageExternalSync");
+ const { hasSyncErrors } = useExternalSync(canImport ? calendarId : null);
+ const [tab, setTab] = useState<Tab>("export");
+ const [dirty, setDirty] = useState(false);
+
+ useReportDirty(dirty, onDirtyChange);
+ const { guarded, confirmProps } = useGuardedAction(dirty, () => setDirty(false));
+
+ if (!canImport) return <ExportPanel calendarId={calendarId} onClose={onClose} />;
+
+ return (
+ <>
+ <div className="shrink-0 px-[22px] pt-[18px]">
+ <SegmentedControl<Tab>
+ value={tab}
+ onChange={(next) => guarded(() => setTab(next))}
+ label={t("settings.importExport")}
+ options={[
+ { value: "export", label: t("settings.export") },
+ { value: "import", label: t("settings.tabImport") },
+ {
+ value: "log",
+ label: t("settings.tabLog"),
+ badge: hasSyncErrors ? (
+ <span role="img" className="size-1.5 rounded-full bg-danger" aria-label={t("common.error")} />
+ ) : undefined,
+ },
+ ]}
+ />
+ </div>
+ {tab === "export" && <ExportPanel calendarId={calendarId} onClose={onClose} />}
+ {tab === "import" && (
+ <ExternalSyncPanel
+ calendarId={calendarId}
+ onSyncComplete={onSyncComplete}
+ onDirtyChange={setDirty}
+ />
+ )}
+ {tab === "log" && <SyncNotificationsPanel calendarId={calendarId} onClose={onClose} />}
+ <ConfirmationDialog {...confirmProps} />
+ </>
+ );
+}
diff --git a/components/settings-dialog.tsx b/components/settings-dialog.tsx
index 34552d9..f5466db 100644
--- a/components/settings-dialog.tsx
+++ b/components/settings-dialog.tsx
@@ -3,12 +3,10 @@
import { useState } from "react";
import { useTranslations } from "next-intl";
import {
- Bell,
- Download,
+ ArrowDownUp,
Layers,
ListChecks,
Palette,
- RefreshCw,
SlidersHorizontal,
TriangleAlert,
Users,
@@ -19,12 +17,10 @@ import { Input } from "@/components/ui/input";
import { ConfirmationDialog } from "@/components/ui/confirmation-dialog";
import { PanelBody, PanelDialog, PanelFooter } from "@/components/panel-dialog";
import { ColorSwatches, DangerZone, Field, inputClass } from "@/components/form-kit";
-import { ExportPanel } from "@/components/export-dialog";
+import { ImportExportPanel } from "@/components/import-export-panel";
import { CalendarViewPanel, ViewSettingsState } from "@/components/view-settings-sheet";
import { PresetsPanel } from "@/components/preset-manage-sheet";
import { CustomFieldsPanel } from "@/components/custom-fields-panel";
-import { ExternalSyncPanel } from "@/components/external-sync-manage-sheet";
-import { SyncNotificationsPanel } from "@/components/sync-notification-dialog";
import { PermissionsPanel } from "@/components/calendar-permissions-panel";
import { isUsableToken } from "@/components/calendar-token-list";
import { useCalendars } from "@/hooks/useCalendars";
@@ -40,11 +36,9 @@ import { useGuardedAction, useReportDirty } from "@/hooks/useDirtyState";
export type SettingsSection =
| "general"
| "presets"
- | "external"
| "permissions"
- | "export"
+ | "importExport"
| "view"
- | "notifications"
| "customFields";
export interface SettingsItem {
@@ -211,14 +205,6 @@ export function useCalendarSettings(calendarId: string | null) {
description: t("settings.presetsHint", { count: presets.length }),
meta: presets.length,
});
- if (canOpenExternal)
- items.push({
- id: "external",
- icon: RefreshCw,
- title: t("settings.external"),
- description: t("settings.externalHint", { count: externalSyncs.length }),
- meta: externalSyncs.length,
- });
if (permission.can("manageCustomFields"))
items.push({
id: "customFields",
@@ -235,12 +221,23 @@ export function useCalendarSettings(calendarId: string | null) {
title: t("settings.permissions"),
description: t("settings.permissionsHint", { count: tokens.filter(isUsableToken).length }),
});
+ // Everyone who can see the calendar may export; import and the sync log need manageExternalSync.
items.push(
{
- id: "export",
- icon: Download,
- title: t("settings.export"),
- description: t("settings.exportHint"),
+ id: "importExport",
+ icon: ArrowDownUp,
+ title: t("settings.importExport"),
+ description: !canOpenExternal
+ ? t("settings.exportHint")
+ : hasSyncErrors
+ ? t("settings.syncError")
+ : t("settings.importExportHint", { count: externalSyncs.length }),
+ meta: !canOpenExternal
+ ? undefined
+ : hasSyncErrors
+ ? t("common.error")
+ : externalSyncs.length,
+ metaTone: canOpenExternal && hasSyncErrors ? "danger" : undefined,
},
{
id: "view",
@@ -250,17 +247,6 @@ export function useCalendarSettings(calendarId: string | null) {
meta: calendar.viewSettings ? t("settings.viewOn") : t("settings.viewOff"),
}
);
- // Sync notifications manage external syncs, so they need the same permission
- // tier as that section — guests only ever get read/write, never manage.
- if (canOpenExternal)
- items.push({
- id: "notifications",
- icon: Bell,
- title: t("settings.notifications"),
- description: hasSyncErrors ? t("settings.notificationsError") : t("settings.notificationsHint"),
- meta: hasSyncErrors ? t("common.error") : undefined,
- metaTone: hasSyncErrors ? "danger" : undefined,
- });
return { calendar, items };
}
@@ -302,19 +288,17 @@ export function CalendarSettingsPanel({
);
case "presets":
return <PresetsPanel calendarId={calendarId} onClose={onClose} onDirtyChange={onDirtyChange} />;
- case "external":
+ case "permissions":
+ return <PermissionsPanel calendarId={calendarId} onClose={onCancel} onDirtyChange={onDirtyChange} />;
+ case "importExport":
return (
- <ExternalSyncPanel
+ <ImportExportPanel
calendarId={calendarId}
onClose={onClose}
- onSyncComplete={onSyncComplete}
onDirtyChange={onDirtyChange}
+ onSyncComplete={onSyncComplete}
/>
);
- case "permissions":
- return <PermissionsPanel calendarId={calendarId} onClose={onCancel} onDirtyChange={onDirtyChange} />;
- case "export":
- return <ExportPanel calendarId={calendarId} onClose={onClose} />;
case "view":
return (
<CalendarViewPanel
@@ -326,8 +310,6 @@ export function CalendarSettingsPanel({
onDirtyChange={onDirtyChange}
/>
);
- case "notifications":
- return <SyncNotificationsPanel calendarId={calendarId} onClose={onClose} />;
case "customFields":
return <CustomFieldsPanel calendarId={calendarId} onDirtyChange={onDirtyChange} />;
}
diff --git a/docs/CALENDAR_FEED.md b/docs/CALENDAR_FEED.md
index 676bec1..94f302d 100644
--- a/docs/CALENDAR_FEED.md
+++ b/docs/CALENDAR_FEED.md
@@ -24,7 +24,7 @@ The link is not a separate grant of access — it follows whatever access you cu
## Creating, Rotating, and Revoking
-Feed links live in the calendar's **Export** dialog (Settings → Export), under the "Subscription Link" option alongside the ICS and PDF export formats. From there:
+Feed links live in the calendar settings under **Import & Export**, in the **Export** tab, as the "Subscription Link" option alongside the ICS and PDF export formats. From there:
- **Create Link** generates the link for you, for this calendar, if you don't already have one.
- **Regenerate** (rotate) replaces it with a new token; the old URL stops working immediately, so any app already subscribed needs the new link re-entered.
diff --git a/hooks/useExternalSyncPanel.ts b/hooks/useExternalSyncPanel.ts
index f9992a1..703a6a1 100644
--- a/hooks/useExternalSyncPanel.ts
+++ b/hooks/useExternalSyncPanel.ts
@@ -4,7 +4,12 @@ import { useMemo, useState } from "react";
import { useTranslations } from "next-intl";
import { toast } from "sonner";
import { ExternalSync } from "@/lib/db/schema";
-import { syncToFormValues, useExternalSyncForm } from "@/hooks/useExternalSyncForm";
+import {
+ EMPTY_SYNC_FORM,
+ SyncImportType,
+ syncToFormValues,
+ useExternalSyncForm,
+} from "@/hooks/useExternalSyncForm";
import { useExternalSync } from "@/hooks/useExternalSync";
import { isRateLimitError, handleRateLimitError } from "@/lib/rate-limit-client";
import { isValidCalendarUrl, detectCalendarSyncType } from "@/lib/external-calendar-utils";
@@ -64,9 +69,9 @@ export function useExternalSyncPanel({
reset();
};
- const startAdd = () => {
+ const startAdd = (importType: SyncImportType) => {
setMode({ kind: "add" });
- reset();
+ reset({ ...EMPTY_SYNC_FORM, importType });
};
const startEdit = (sync: ExternalSync) => {
diff --git a/messages/cs.json b/messages/cs.json
index 2001054..ed45d50 100644
--- a/messages/cs.json
+++ b/messages/cs.json
@@ -295,8 +295,6 @@
"syncTypeICloud": "iCloud",
"syncTypeGoogle": "Google",
"syncTypeCustom": "Vlastní kalendář",
- "importMethod": "Způsob importu",
- "importMethodUrlHint": "URL externího kalendáře (iCloud, Google nebo jiné ICS URL)",
"importMethodFileHint": "Jednorázově importovat soubor ICS",
"fileLabel": "Soubor ICS",
"oneTimeImport": "Jednorázový import",
@@ -880,17 +878,17 @@
"generalHint": "Zobrazovaný název, barva kalendáře, smazání",
"presets": "Šablony",
"presetsHint": "{count, plural, =0 {Zatím žádné šablony} one {# šablona} few {# šablony} other {# šablon}}",
- "external": "Externí kalendáře",
- "externalHint": "{count, plural, =0 {Odběr, zobrazení, interval} one {# odběr, zobrazení, interval} few {# odběry, zobrazení, interval} other {# odběrů, zobrazení, interval}}",
"permissions": "Oprávnění",
"permissionsHint": "{count, plural, =0 {Skupiny, přiřazení, odkazy} one {Skupiny, přiřazení, # aktivní odkaz} few {Skupiny, přiřazení, # aktivní odkazy} other {Skupiny, přiřazení, # aktivních odkazů}}",
"export": "Export",
"exportHint": "Soubor ICS, PDF nebo odběrový odkaz",
+ "importExport": "Import a export",
+ "importExportHint": "{count, plural, =0 {Export, odběrový odkaz, externí kalendáře} one {Export, odběrový odkaz, # externí kalendář} few {Export, odběrový odkaz, # externí kalendáře} other {Export, odběrový odkaz, # externích kalendářů}}",
+ "tabImport": "Importovat",
+ "tabLog": "Protokol",
"view": "Zobrazení kalendáře",
"viewHint": "Vlastní zobrazení, hustota, řazení",
- "notifications": "Oznámení",
- "notificationsHint": "Synchronizace",
- "notificationsError": "Chyba synchronizace",
+ "syncError": "Chyba synchronizace",
"deleteImpact": "{count, plural, =0 {Kalendář bude trvale smazán} one {Smaže se i # směna} few {Smažou se i # směny} other {Smaže se i # směn}}",
"appliesToAll": "Změny platí okamžitě pro všechny, se kterými je kalendář sdílen.",
"groupAccount": "Účet",
diff --git a/messages/de.json b/messages/de.json
index 5535dfb..81265a8 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -295,8 +295,6 @@
"syncTypeICloud": "iCloud",
"syncTypeGoogle": "Google",
"syncTypeCustom": "Eigener Kalender",
- "importMethod": "Import-Methode",
- "importMethodUrlHint": "Externe Kalender-URL (iCloud, Google oder andere ICS-URLs)",
"importMethodFileHint": "ICS-Datei einmalig importieren",
"fileLabel": "ICS-Datei",
"oneTimeImport": "Einmaliger Import",
@@ -880,17 +878,17 @@
"generalHint": "Anzeigename, Kalenderfarbe, Löschen",
"presets": "Vorlagen",
"presetsHint": "{count, plural, =0 {Noch keine Vorlagen} one {# Vorlage} other {# Vorlagen}}",
- "external": "Externe Kalender",
- "externalHint": "{count, plural, =0 {Abo, Anzeigemodus, Intervall} one {# Abo, Anzeigemodus, Intervall} other {# Abos, Anzeigemodus, Intervall}}",
"permissions": "Berechtigungen",
"permissionsHint": "{count, plural, =0 {Gruppen, Zuweisungen, Links} one {Gruppen, Zuweisungen, # aktiver Link} other {Gruppen, Zuweisungen, # aktive Links}}",
"export": "Exportieren",
"exportHint": "ICS-Datei, PDF oder Abo-Link",
+ "importExport": "Import & Export",
+ "importExportHint": "{count, plural, =0 {Export, Abo-Link, externe Kalender} one {Export, Abo-Link, # externer Kalender} other {Export, Abo-Link, # externe Kalender}}",
+ "tabImport": "Importieren",
+ "tabLog": "Protokoll",
"view": "Kalenderansicht",
"viewHint": "Eigene Ansicht, Dichte, Sortierung",
- "notifications": "Benachrichtigungen",
- "notificationsHint": "Synchronisierung",
- "notificationsError": "Fehler bei der Synchronisierung",
+ "syncError": "Fehler bei der Synchronisierung",
"deleteImpact": "{count, plural, =0 {Der Kalender wird endgültig gelöscht} one {# Schicht wird mitgelöscht} other {# Schichten werden mitgelöscht}}",
"appliesToAll": "Änderungen werden sofort für alle Freigaben wirksam.",
"groupAccount": "Konto",
diff --git a/messages/en.json b/messages/en.json
index a78dfee..17a760c 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -295,8 +295,6 @@
"syncTypeICloud": "iCloud",
"syncTypeGoogle": "Google",
"syncTypeCustom": "Custom Calendar",
- "importMethod": "Import Method",
- "importMethodUrlHint": "External calendar URL (iCloud, Google, or other ICS URLs)",
"importMethodFileHint": "Import ICS file once",
"fileLabel": "ICS File",
"oneTimeImport": "One-time import",
@@ -880,17 +878,17 @@
"generalHint": "Display name, calendar color, delete",
"presets": "Presets",
"presetsHint": "{count, plural, =0 {No presets yet} one {# preset} other {# presets}}",
- "external": "External calendars",
- "externalHint": "{count, plural, =0 {Subscription, display mode, interval} one {# subscription, display mode, interval} other {# subscriptions, display mode, interval}}",
"permissions": "Permissions",
"permissionsHint": "{count, plural, =0 {Groups, assignments, links} one {Groups, assignments, # active link} other {Groups, assignments, # active links}}",
"export": "Export",
"exportHint": "ICS file, PDF or subscription link",
+ "importExport": "Import & export",
+ "importExportHint": "{count, plural, =0 {Export, subscription link, external calendars} one {Export, subscription link, # external calendar} other {Export, subscription link, # external calendars}}",
+ "tabImport": "Import",
+ "tabLog": "Log",
"view": "Calendar view",
"viewHint": "Own view, density, sorting",
- "notifications": "Notifications",
- "notificationsHint": "Synchronization",
- "notificationsError": "Sync error",
+ "syncError": "Sync error",
"deleteImpact": "{count, plural, =0 {The calendar is deleted permanently} one {# shift will be deleted too} other {# shifts will be deleted too}}",
"appliesToAll": "Changes apply immediately for everyone it is shared with.",
"groupAccount": "Account",
diff --git a/messages/es.json b/messages/es.json
index 9699e98..7a1d78f 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -295,8 +295,6 @@
"syncTypeICloud": "iCloud",
"syncTypeGoogle": "Google",
"syncTypeCustom": "Calendario personalizado",
- "importMethod": "Método de importación",
- "importMethodUrlHint": "URL del calendario externo (iCloud, Google u otras URLs ICS)",
"importMethodFileHint": "Importar archivo ICS una vez",
"fileLabel": "Archivo ICS",
"oneTimeImport": "Importación única",
@@ -880,17 +878,17 @@
"generalHint": "Nombre visible, color del calendario, eliminar",
"presets": "Plantillas",
"presetsHint": "{count, plural, =0 {Aún no hay plantillas} one {# plantilla} other {# plantillas}}",
- "external": "Calendarios externos",
- "externalHint": "{count, plural, =0 {Suscripción, modo de vista, intervalo} one {# suscripción, modo de vista, intervalo} other {# suscripciones, modo de vista, intervalo}}",
"permissions": "Permisos",
"permissionsHint": "{count, plural, =0 {Grupos, asignaciones, enlaces} one {Grupos, asignaciones, # enlace activo} other {Grupos, asignaciones, # enlaces activos}}",
"export": "Exportar",
"exportHint": "Archivo ICS, PDF o enlace de suscripción",
+ "importExport": "Importar y exportar",
+ "importExportHint": "{count, plural, =0 {Exportación, enlace de suscripción, calendarios externos} one {Exportación, enlace de suscripción, # calendario externo} other {Exportación, enlace de suscripción, # calendarios externos}}",
+ "tabImport": "Importar",
+ "tabLog": "Registro",
"view": "Vista del calendario",
"viewHint": "Vista propia, densidad, orden",
- "notifications": "Notificaciones",
- "notificationsHint": "Sincronización",
- "notificationsError": "Error de sincronización",
+ "syncError": "Error de sincronización",
"deleteImpact": "{count, plural, =0 {El calendario se elimina definitivamente} one {También se eliminará # turno} other {También se eliminarán # turnos}}",
"appliesToAll": "Los cambios se aplican de inmediato para todas las personas con acceso.",
"groupAccount": "Cuenta",
diff --git a/messages/fr.json b/messages/fr.json
index 8482535..9d1b73c 100755
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -295,8 +295,6 @@
"syncTypeICloud": "iCloud",
"syncTypeGoogle": "Google",
"syncTypeCustom": "Calendrier personnalisé",
- "importMethod": "Méthode d'import",
- "importMethodUrlHint": "URL du calendrier externe (iCloud, Google ou autre URL ICS)",
"importMethodFileHint": "Importer un fichier ICS une seule fois",
"fileLabel": "Fichier ICS",
"oneTimeImport": "Import unique",
@@ -880,17 +878,17 @@
"generalHint": "Nom affiché, couleur du calendrier, suppression",
"presets": "Modèles",
"presetsHint": "{count, plural, =0 {Aucun modèle} one {# modèle} other {# modèles}}",
- "external": "Calendriers externes",
- "externalHint": "{count, plural, =0 {Abonnement, affichage, intervalle} one {# abonnement, affichage, intervalle} other {# abonnements, affichage, intervalle}}",
"permissions": "Autorisations",
"permissionsHint": "{count, plural, =0 {Groupes, attributions, liens} one {Groupes, attributions, # lien actif} other {Groupes, attributions, # liens actifs}}",
"export": "Exporter",
"exportHint": "Fichier ICS, PDF ou lien d'abonnement",
+ "importExport": "Import et export",
+ "importExportHint": "{count, plural, =0 {Export, lien d'abonnement, calendriers externes} one {Export, lien d'abonnement, # calendrier externe} other {Export, lien d'abonnement, # calendriers externes}}",
+ "tabImport": "Importer",
+ "tabLog": "Journal",
"view": "Affichage du calendrier",
"viewHint": "Affichage propre, densité, tri",
- "notifications": "Notifications",
- "notificationsHint": "Synchronisation",
- "notificationsError": "Erreur de synchronisation",
+ "syncError": "Erreur de synchronisation",
"deleteImpact": "{count, plural, =0 {Le calendrier est supprimé définitivement} one {# service sera aussi supprimé} other {# services seront aussi supprimés}}",
"appliesToAll": "Les modifications s’appliquent immédiatement à toutes les personnes ayant accès.",
"groupAccount": "Compte",
diff --git a/messages/it.json b/messages/it.json
index eec1f4a..07db7b3 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -295,8 +295,6 @@
"syncTypeICloud": "iCloud",
"syncTypeGoogle": "Google",
"syncTypeCustom": "Calendario Personalizzato",
- "importMethod": "Metodo di Importazione",
- "importMethodUrlHint": "URL del calendario esterno (iCloud, Google o altri URL ICS)",
"importMethodFileHint": "Importa file ICS una sola volta",
"fileLabel": "File ICS",
"oneTimeImport": "Importazione unica",
@@ -880,17 +878,17 @@
"generalHint": "Nome visualizzato, colore del calendario, eliminazione",
"presets": "Modelli",
"presetsHint": "{count, plural, =0 {Nessun modello} one {# modello} other {# modelli}}",
- "external": "Calendari esterni",
- "externalHint": "{count, plural, =0 {Abbonamento, visualizzazione, intervallo} one {# abbonamento, visualizzazione, intervallo} other {# abbonamenti, visualizzazione, intervallo}}",
"permissions": "Permessi",
"permissionsHint": "{count, plural, =0 {Gruppi, assegnazioni, link} one {Gruppi, assegnazioni, # link attivo} other {Gruppi, assegnazioni, # link attivi}}",
"export": "Esporta",
"exportHint": "File ICS, PDF o link di abbonamento",
+ "importExport": "Importa ed esporta",
+ "importExportHint": "{count, plural, =0 {Esportazione, link di abbonamento, calendari esterni} one {Esportazione, link di abbonamento, # calendario esterno} other {Esportazione, link di abbonamento, # calendari esterni}}",
+ "tabImport": "Importa",
+ "tabLog": "Registro",
"view": "Vista del calendario",
"viewHint": "Vista propria, densità, ordinamento",
- "notifications": "Notifiche",
- "notificationsHint": "Sincronizzazione",
- "notificationsError": "Errore di sincronizzazione",
+ "syncError": "Errore di sincronizzazione",
"deleteImpact": "{count, plural, =0 {Il calendario viene eliminato definitivamente} one {Verrà eliminato anche # turno} other {Verranno eliminati anche # turni}}",
"appliesToAll": "Le modifiche valgono subito per tutte le persone con accesso.",
"groupAccount": "Account",