diff --git a/client/android/app/src/main/java/com/liketrek/trek/MainActivity.java b/client/android/app/src/main/java/com/liketrek/trek/MainActivity.java index 474d08fd4..ba98aaf9c 100644 --- a/client/android/app/src/main/java/com/liketrek/trek/MainActivity.java +++ b/client/android/app/src/main/java/com/liketrek/trek/MainActivity.java @@ -132,17 +132,20 @@ public class MainActivity extends BridgeActivity { LinearLayout bar = new LinearLayout(this); bar.setOrientation(LinearLayout.HORIZONTAL); bar.setGravity(Gravity.CENTER_VERTICAL); - bar.setPadding(Math.round(14 * dp), Math.round(10 * dp), Math.round(8 * dp), Math.round(10 * dp)); + bar.setPaddingRelative(Math.round(16 * dp), Math.round(10 * dp), Math.round(10 * dp), Math.round(10 * dp)); + // The look of the app's own first screens: a white card with a sand edge, + // warm grey text and a dark button, over whatever page the proxy shows. GradientDrawable background = new GradientDrawable(); - background.setColor(0xF2111827); - background.setCornerRadius(16 * dp); + background.setColor(0xF7FFFFFF); + background.setCornerRadius(18 * dp); + background.setStroke(Math.max(1, Math.round(dp)), 0xFFEFE4D8); bar.setBackground(background); - bar.setElevation(6 * dp); + bar.setElevation(8 * dp); TextView hint = new TextView(this); signInHint = hint; hint.setText(TrekServerStore.signInHintLabel(this)); - hint.setTextColor(0xFFE5E7EB); + hint.setTextColor(0xFF6B5F57); hint.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12.5f); bar.addView(hint, new LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1f)); @@ -150,12 +153,21 @@ public class MainActivity extends BridgeActivity { change.setText(TrekServerStore.changeServerLabel(this)); change.setAllCaps(false); change.setTextColor(0xFFFFFFFF); + GradientDrawable pill = new GradientDrawable(); + pill.setColor(0xFF111827); + pill.setCornerRadius(12 * dp); + change.setBackground(pill); + change.setMinHeight(0); + change.setMinimumHeight(0); + change.setPaddingRelative(Math.round(14 * dp), Math.round(9 * dp), Math.round(14 * dp), Math.round(9 * dp)); + LinearLayout.LayoutParams changeParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + changeParams.setMarginStart(Math.round(10 * dp)); change.setOnClickListener((v) -> { TrekServerStore.setUrl(this, null); TrekServerStore.markRestart(this); recreate(); }); - bar.addView(change, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)); + bar.addView(change, changeParams); int margin = Math.round(12 * dp); FrameLayout.LayoutParams params = new FrameLayout.LayoutParams( diff --git a/client/ios/App/App/TrekBridgeViewController.swift b/client/ios/App/App/TrekBridgeViewController.swift index 64b1c88fc..ad605d6cc 100644 --- a/client/ios/App/App/TrekBridgeViewController.swift +++ b/client/ios/App/App/TrekBridgeViewController.swift @@ -249,25 +249,38 @@ class TrekBridgeViewController: CAPBridgeViewController { private func makeSignInBar() -> UIView { let labels = TrekServerStore.labels + // The look of the app's own first screens: a white card with a sand edge, + // warm grey text and a dark button, over whatever page the proxy shows. let bar = UIView() - bar.backgroundColor = UIColor(red: 17 / 255, green: 24 / 255, blue: 39 / 255, alpha: 0.95) - bar.layer.cornerRadius = 16 + bar.backgroundColor = UIColor(white: 1, alpha: 0.97) + bar.layer.cornerRadius = 18 bar.layer.cornerCurve = .continuous + bar.layer.borderWidth = 1 + bar.layer.borderColor = UIColor(red: 0xEF / 255, green: 0xE4 / 255, blue: 0xD8 / 255, alpha: 1).cgColor + bar.layer.shadowColor = UIColor(red: 0x1F / 255, green: 0x1A / 255, blue: 0x17 / 255, alpha: 1).cgColor + bar.layer.shadowOpacity = 0.18 + bar.layer.shadowRadius = 18 + bar.layer.shadowOffset = CGSize(width: 0, height: 10) bar.translatesAutoresizingMaskIntoConstraints = false let hint = UILabel() hint.text = labels["signInHint"] ?? "Passkeys and security keys do not work on this page in the app. Sign in with a password, or let the app through your proxy." - hint.textColor = UIColor(white: 0.9, alpha: 1) + hint.textColor = UIColor(red: 0x6B / 255, green: 0x5F / 255, blue: 0x57 / 255, alpha: 1) hint.font = .preferredFont(forTextStyle: .footnote) hint.adjustsFontForContentSizeCategory = true hint.numberOfLines = 0 signInHint = hint hint.translatesAutoresizingMaskIntoConstraints = false - let change = UIButton(type: .system) + var look = UIButton.Configuration.filled() + look.baseBackgroundColor = UIColor(red: 0x11 / 255, green: 0x18 / 255, blue: 0x27 / 255, alpha: 1) + look.baseForegroundColor = .white + look.cornerStyle = .fixed + look.background.cornerRadius = 12 + look.contentInsets = NSDirectionalEdgeInsets(top: 9, leading: 14, bottom: 9, trailing: 14) + let change = UIButton(configuration: look) change.setTitle(labels["changeServer"] ?? "Change server", for: .normal) - change.setTitleColor(.white, for: .normal) change.titleLabel?.font = .systemFont(ofSize: 15, weight: .semibold) change.addTarget(self, action: #selector(changeServerFromSignIn), for: .touchUpInside) change.translatesAutoresizingMaskIntoConstraints = false diff --git a/client/native-shell/amount.ts b/client/native-shell/amount.ts new file mode 100644 index 000000000..19e5756ea --- /dev/null +++ b/client/native-shell/amount.ts @@ -0,0 +1,43 @@ +/** + * The amount inside a price as the store writes it ("4,90 €", "$4.99", + * "CHF 12.90", "1.290 ₽"), and a way to write another amount the same way: the + * same currency, the same decimal mark, the same digit grouping. The plan picker + * counts a price up to its new value with it, and turns a yearly price into what + * it makes a month, without knowing the store's locale. + */ +interface Amount { + /** The amount as a number, in the price's own unit (4.9 for "4,90 €"). */ + value: number; + /** The price written for another amount, in the same format. */ + render(value: number): string; +} + +// Digits with the marks stores put between them: . , space, no-break spaces, and +// the apostrophes Swiss formats group thousands with (1'290 and 1’290). +const NUMBER = /\d[\d.,\s  '’]*\d|\d/; + +export function amountIn(label: string): Amount | null { + const match = NUMBER.exec(label); + if (!match) return null; + const raw = match[0]; + // The decimal mark is the last . or , followed by one or two digits to the end. + const decimal = /([.,])(\d{1,2})$/.exec(raw); + const decimals = decimal ? decimal[2].length : 0; + const mark = decimal ? decimal[1] : ''; + const whole = decimal ? raw.slice(0, raw.length - decimal[0].length) : raw; + const group = /[.,\s  '’]/.exec(whole)?.[0] ?? ''; + const digits = whole.replace(/\D/g, '') + (decimal ? `.${decimal[2]}` : ''); + const value = Number(digits); + if (!Number.isFinite(value)) return null; + const before = label.slice(0, match.index); + const after = label.slice(match.index + raw.length); + return { + value, + render(next: number) { + const fixed = Math.max(0, next).toFixed(decimals); + const [int, frac] = fixed.split('.'); + const grouped = group ? int.replace(/\B(?=(\d{3})+(?!\d))/g, group) : int; + return `${before}${grouped}${frac !== undefined ? mark + frac : ''}${after}`; + }, + }; +} diff --git a/client/native-shell/fonts/comfortaa-cyrillic-700.woff2 b/client/native-shell/fonts/comfortaa-cyrillic-700.woff2 deleted file mode 100644 index 41d58aa34..000000000 Binary files a/client/native-shell/fonts/comfortaa-cyrillic-700.woff2 and /dev/null differ diff --git a/client/native-shell/fonts/museomoderno-italic-600.woff2 b/client/native-shell/fonts/museomoderno-italic-600.woff2 deleted file mode 100644 index 3e8cd7beb..000000000 Binary files a/client/native-shell/fonts/museomoderno-italic-600.woff2 and /dev/null differ diff --git a/client/native-shell/fonts/museomoderno-latin-600.woff2 b/client/native-shell/fonts/museomoderno-latin-600.woff2 deleted file mode 100644 index a892018ef..000000000 Binary files a/client/native-shell/fonts/museomoderno-latin-600.woff2 and /dev/null differ diff --git a/client/native-shell/fonts/plus-jakarta-sans-latin-400.woff2 b/client/native-shell/fonts/plus-jakarta-sans-latin-400.woff2 new file mode 100644 index 000000000..954c272b5 Binary files /dev/null and b/client/native-shell/fonts/plus-jakarta-sans-latin-400.woff2 differ diff --git a/client/native-shell/fonts/plus-jakarta-sans-latin-500.woff2 b/client/native-shell/fonts/plus-jakarta-sans-latin-500.woff2 new file mode 100644 index 000000000..3eeabddf4 Binary files /dev/null and b/client/native-shell/fonts/plus-jakarta-sans-latin-500.woff2 differ diff --git a/client/native-shell/fonts/plus-jakarta-sans-latin-600.woff2 b/client/native-shell/fonts/plus-jakarta-sans-latin-600.woff2 new file mode 100644 index 000000000..d6e4d1ec6 Binary files /dev/null and b/client/native-shell/fonts/plus-jakarta-sans-latin-600.woff2 differ diff --git a/client/native-shell/fonts/plus-jakarta-sans-latin-700.woff2 b/client/native-shell/fonts/plus-jakarta-sans-latin-700.woff2 new file mode 100644 index 000000000..ca151409e Binary files /dev/null and b/client/native-shell/fonts/plus-jakarta-sans-latin-700.woff2 differ diff --git a/client/native-shell/fonts/plus-jakarta-sans-latin-800.woff2 b/client/native-shell/fonts/plus-jakarta-sans-latin-800.woff2 new file mode 100644 index 000000000..cd71b26f4 Binary files /dev/null and b/client/native-shell/fonts/plus-jakarta-sans-latin-800.woff2 differ diff --git a/client/native-shell/fonts/plus-jakarta-sans-latin-ext-400.woff2 b/client/native-shell/fonts/plus-jakarta-sans-latin-ext-400.woff2 new file mode 100644 index 000000000..5f380e979 Binary files /dev/null and b/client/native-shell/fonts/plus-jakarta-sans-latin-ext-400.woff2 differ diff --git a/client/native-shell/fonts/plus-jakarta-sans-latin-ext-500.woff2 b/client/native-shell/fonts/plus-jakarta-sans-latin-ext-500.woff2 new file mode 100644 index 000000000..7ecc82658 Binary files /dev/null and b/client/native-shell/fonts/plus-jakarta-sans-latin-ext-500.woff2 differ diff --git a/client/native-shell/fonts/plus-jakarta-sans-latin-ext-600.woff2 b/client/native-shell/fonts/plus-jakarta-sans-latin-ext-600.woff2 new file mode 100644 index 000000000..1dc0c7d30 Binary files /dev/null and b/client/native-shell/fonts/plus-jakarta-sans-latin-ext-600.woff2 differ diff --git a/client/native-shell/fonts/plus-jakarta-sans-latin-ext-700.woff2 b/client/native-shell/fonts/plus-jakarta-sans-latin-ext-700.woff2 new file mode 100644 index 000000000..221d73081 Binary files /dev/null and b/client/native-shell/fonts/plus-jakarta-sans-latin-ext-700.woff2 differ diff --git a/client/native-shell/fonts/plus-jakarta-sans-latin-ext-800.woff2 b/client/native-shell/fonts/plus-jakarta-sans-latin-ext-800.woff2 new file mode 100644 index 000000000..acb1a742d Binary files /dev/null and b/client/native-shell/fonts/plus-jakarta-sans-latin-ext-800.woff2 differ diff --git a/client/native-shell/img/kyoto.webp b/client/native-shell/img/kyoto.webp deleted file mode 100644 index 9e076556a..000000000 Binary files a/client/native-shell/img/kyoto.webp and /dev/null differ diff --git a/client/native-shell/img/preview.webp b/client/native-shell/img/preview.webp deleted file mode 100644 index b7ba646f1..000000000 Binary files a/client/native-shell/img/preview.webp and /dev/null differ diff --git a/client/native-shell/index.html b/client/native-shell/index.html index 55c7cd063..65ec52268 100644 --- a/client/native-shell/index.html +++ b/client/native-shell/index.html @@ -3,8 +3,8 @@ - - + + TREK diff --git a/client/native-shell/main.ts b/client/native-shell/main.ts index 341295928..74862cd4d 100644 --- a/client/native-shell/main.ts +++ b/client/native-shell/main.ts @@ -3,23 +3,20 @@ import { Capacitor, CapacitorHttp } from '@capacitor/core'; import { Haptics, ImpactStyle, NotificationType } from '@capacitor/haptics'; import { SplashScreen } from '@capacitor/splash-screen'; import { StatusBar, Style } from '@capacitor/status-bar'; -import logoUrl from '../public/icons/icon-white.svg'; -import logoBlack from '../public/logo-dark.svg'; // #000 wordmark, for light backgrounds -import logoWhite from '../public/logo-light.svg'; // #fff wordmark, for dark backgrounds -import previewImage from './img/preview.webp'; // real app screens, from docs/screenshots/showcase-mobile.webp +import { PASSWORD_MIN_LENGTH, passwordProblem, passwordRuleStates } from '../../shared/src/auth/password-policy'; +import logoWhite from '../public/logo-light.svg'; // #fff wordmark, for the landscape import { AUTH_GATE_NAMES, canSignInInApp, type AuthGate } from '../src/native/authGate'; import { opensSoon, refundedBeforeOpening } from '../src/native/cloudOrders'; import { fakeIapClient, getIapClient, productIdFor, type Purchase } from '../src/native/iap'; -import { priceValue } from '../src/native/priceValue'; import { + APP_STORE_SUBSCRIPTIONS_URL, AUTH_PROXY_DOCS_URL, CLIENT_CERT_DOCS_URL, CLOUD_TERMS_URL, CLOUD_URL, + PLAY_SUBSCRIPTIONS_URL, PRIVACY_URL, STORE_TERMS_URL, - APP_STORE_SUBSCRIPTIONS_URL, - PLAY_SUBSCRIPTIONS_URL, } from '../src/native/links'; import { certificateTargetFor, @@ -29,16 +26,18 @@ import { type ProbeFailure, type ProbeGet, } from '../src/native/serverAddress'; -import { PASSWORD_MIN_LENGTH, passwordProblem, passwordRuleStates } from '../../shared/src/auth/password-policy'; import { TrekShell, type ClientCertificateFailure } from '../src/native/trekShell'; +import { amountIn } from './amount'; import { directionOf, pickLocale, translator } from './i18n'; +import { WELCOME_CAMERA, cameraForPlan, startScenery, type Camera, type Scenery } from './scenery'; import './shell.css'; /** - * The only page the app ships itself. It welcomes someone on first start, asks - * for the TREK server they open in their browser, offers TREK Cloud to someone - * without one, and stands in when a remembered server cannot be reached. - * Everything past it is the UI that server delivers. + * The only pages the app ships itself. They welcome someone on first start, ask + * for the TREK server they open in their browser, offer TREK Cloud to someone + * without one, and stand in when a remembered server cannot be reached. Every + * screen stands on the same landscape (scenery.ts); the plans move the camera + * through it. Everything past them is the UI the chosen server delivers. */ const locale = pickLocale(navigator.languages?.length ? navigator.languages : [navigator.language]); @@ -129,7 +128,7 @@ function el( return node; } -function icon(path: string, size = 22, className?: string): SVGSVGElement { +function icon(path: string, size = 18, className?: string): SVGSVGElement { const svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg'); svg.setAttribute('viewBox', '0 0 24 24'); svg.setAttribute('width', String(size)); @@ -139,6 +138,7 @@ function icon(path: string, size = 22, className?: string): SVGSVGElement { svg.setAttribute('stroke-width', '2'); svg.setAttribute('stroke-linecap', 'round'); svg.setAttribute('stroke-linejoin', 'round'); + svg.setAttribute('aria-hidden', 'true'); if (className) svg.setAttribute('class', className); const p = document.createElementNS('http://www.w3.org/2000/svg', 'path'); p.setAttribute('d', path); @@ -146,13 +146,26 @@ function icon(path: string, size = 22, className?: string): SVGSVGElement { return svg; } const I = { - chevron: 'M9 18l6-6-6-6', - cloud: 'M17.5 19a4.5 4.5 0 0 0 .5-9 6 6 0 0 0-11.6-1.6A4 4 0 0 0 6 19z', + back: 'M15 18l-6-6 6-6', globe: 'M12 2a10 10 0 1 0 0 20 10 10 0 0 0 0-20M2 12h20M12 2a15 15 0 0 1 0 20 15 15 0 0 1 0-20', - bolt: 'M13 2 4 14h7l-1 8 9-12h-7z', + image: + 'M5 3h14a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2zM8.5 10a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3zM21 15l-5-5L5 21', + spark: 'M12 3l1.8 5.2L19 10l-5.2 1.8L12 17l-1.8-5.2L5 10l5.2-1.8z', + people: + 'M16 21v-2a4 4 0 0 0-4-4H6a4 4 0 0 0-4 4v2M9 11a4 4 0 1 0 0-8 4 4 0 0 0 0 8zM22 21v-2a4 4 0 0 0-3-3.87M16 3.13a4 4 0 0 1 0 7.75', shield: 'M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10', check: 'M20 6 9 17l-5-5', - camera: 'M14.5 4h-5L7 7H4a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V9a2 2 0 0 0-2-2h-3l-2.5-3zM12 17a4 4 0 1 0 0-8 4 4 0 0 0 0 8z', + lock: 'M6 11h12a2 2 0 0 1 2 2v7a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2v-7a2 2 0 0 1 2-2zM8 11V8a4 4 0 0 1 8 0v3', + key: 'M7.5 20a4.5 4.5 0 1 0 0-9 4.5 4.5 0 0 0 0 9zM10.7 12.3 21 2M16 7l3 3M14 9l2 2', + alert: 'M12 21.5a9.5 9.5 0 1 0 0-19 9.5 9.5 0 0 0 0 19zM12 7.5v5.5M12 16.5h.01', + wifiOff: + 'M2 2l20 20M8.5 16.5a5 5 0 0 1 7 0M5 13a10 10 0 0 1 5.2-2.8M19 13a10 10 0 0 0-2.2-1.6M2 8.8a15 15 0 0 1 4.4-2.8M22 8.8A15 15 0 0 0 11 5M12 20h.01', + gate: 'M6.5 10h11a2.5 2.5 0 0 1 2.5 2.5v6a2.5 2.5 0 0 1-2.5 2.5h-11A2.5 2.5 0 0 1 4 18.5v-6A2.5 2.5 0 0 1 6.5 10zM8 10V7a4 4 0 0 1 8 0v3M12 14.5V17', + cloud: 'M7 18a4.5 4.5 0 0 1-.6-8.96A6 6 0 0 1 18 9.5a4 4 0 0 1-.5 8.5z', + clock: 'M12 21.5a9.5 9.5 0 1 0 0-19 9.5 9.5 0 0 0 0 19zM12 7v5l3 2', + update: 'M12 3v12M7 10l5 5 5-5M5 21h14', + eye: 'M2 12s3.6-7 10-7 10 7 10 7-3.6 7-10 7S2 12 2 12zM12 15a3 3 0 1 0 0-6 3 3 0 0 0 0 6z', + out: 'M7 17 17 7M9 7h8v8', }; async function tap(style: ImpactStyle = ImpactStyle.Light): Promise { @@ -170,113 +183,170 @@ async function notify(type: NotificationType): Promise { } } -// ── Screen transitions ────────────────────────────────────────────────────── +function externalLink(text: string, href: string, className?: string): HTMLAnchorElement { + return el('a', { href, target: '_blank', rel: 'noopener noreferrer', ...(className ? { className } : {}) }, text); +} + +// ── Screens ───────────────────────────────────────────────────────────────── let current: HTMLElement | null = null; -function show(screen: HTMLElement, opts: { back?: boolean } = {}): void { - screen.classList.add('screen', 'screen-enter'); - if (opts.back) screen.classList.add('screen-back'); - const previous = current; - if (previous) { - // The leaving screen is lifted out of the flow where it stands, so it fades - // from its own place rather than jumping to the top of a centred layout. - previous.style.top = `${previous.offsetTop}px`; - previous.style.left = `${previous.offsetLeft}px`; - previous.style.width = `${previous.offsetWidth}px`; - previous.classList.remove('screen-enter'); - previous.classList.add('screen-leave'); - if (opts.back) previous.classList.add('screen-back'); - previous.addEventListener('animationend', () => previous.remove(), { once: true }); - setTimeout(() => previous.remove(), 400); - } - root.append(screen); - current = screen; - // A form reads on a calm page: the photo steps back while it is on screen. - document.body.classList.toggle('quiet', screen.classList.contains('screen-quiet')); +/** The layout with the landscape beside the content: an iPad, an unfolded phone, a phone on its side. */ +const wideLayout = matchMedia('(min-width: 900px), (orientation: landscape) and (max-height: 500px)'); + +/** + * A screen: the landscape on top (beside, on a wide screen) and the content. + * The landscape starts drawing once the screen is on the page, from `camera`. + */ +interface Screen { + node: HTMLElement; + hero: HTMLElement; + body: HTMLElement; + scenery: Scenery | null; } -function externalLink(text: string, href: string): HTMLAnchorElement { - return el('a', { href, target: '_blank', rel: 'noopener noreferrer' }, text); -} -function footLinks(...extra: Node[]): HTMLElement { - return el('div', { className: 'foot-links' }, ...extra, externalLink(t('native.privacy'), PRIVACY_URL)); -} -/** - * A screen's two halves: what it is (brand, title, explanation) and what to do - * on it (the choices, the form). Stacked in one column they read as before; on - * a phone or a foldable on its side the screen is too short for one column, so - * the halves stand side by side there (shell.css, `.col`). - */ -function columns(about: Node[], act: Node[]): HTMLElement[] { - return [el('div', { className: 'col col-about' }, ...about), el('div', { className: 'col col-act' }, ...act)]; -} -function topbar(onBack: () => void): HTMLElement { - const back = el('button', { type: 'button', className: 'back' }, icon('M15 18l-6-6 6-6', 18), t('native.back')); +type HeroKind = 'welcome' | 'plain' | 'tall'; +const FRAME: Record = { welcome: 376, plain: 300, tall: 320 }; + +function backButton(onBack: () => void): HTMLButtonElement { + const back = el('button', { type: 'button', className: 'back' }, icon(I.back, 20)); + back.setAttribute('aria-label', t('native.back')); back.addEventListener('click', () => { void tap(); onBack(); }); - return el('div', { className: 'topbar' }, back); + return back; +} + +function show( + kind: HeroKind, + camera: Camera, + parts: { overlay?: Node[]; content: Node[]; back?: () => void }, + opts: { back?: boolean } = {} +): Screen { + const hero = el('div', { className: kind === 'plain' ? 'hero' : `hero ${kind}` }); + if (parts.back) hero.append(backButton(parts.back)); + hero.append(...(parts.overlay ?? [])); + const body = el('div', { className: 'body' }, ...parts.content); + const node = el('div', { className: `scr enter${opts.back ? ' reverse' : ''}` }, hero, body); + current?.remove(); + root.append(node); + current = node; + const scenery = startScenery(hero, { frame: FRAME[kind], camera, haze: kind === 'welcome' && !wideLayout.matches }); + return { node, hero, body, scenery }; +} + +/** The glass card over the landscape: what this screen is about, an address in large type. */ +interface GlassCard { + node: HTMLElement; + kicker: HTMLElement; + glyph: HTMLElement; + text: HTMLElement; + /** Shrinks the type until the whole address fits on one line. */ + fit(): void; +} +function glassCard(kicker: string, glyph: string, text: Node[]): GlassCard { + const kick = el('small', {}, kicker); + const mark = el('i', {}, icon(glyph, 16)); + const line = el('span', { className: 'url-text', dir: 'ltr' }, ...text); + const node = el('div', { className: 'card' }, kick, el('div', { className: 'url' }, mark, line)); + return { + node, + kicker: kick, + glyph: mark, + text: line, + fit() { + let size = 22; + line.style.fontSize = `${size}px`; + while (size > 13 && line.scrollWidth > line.clientWidth) { + size -= 1; + line.style.fontSize = `${size}px`; + } + }, + }; +} +function setKicker( + card: GlassCard, + text: string, + opts: { busy?: boolean; tone?: 'ok' | 'bad'; glyph?: string } = {} +): void { + card.kicker.replaceChildren(...(opts.busy ? [el('span', { className: 'spin' })] : []), text); + card.node.classList.toggle('ok', opts.tone === 'ok'); + card.node.classList.toggle('bad', opts.tone === 'bad'); + if (opts.glyph) card.glyph.replaceChildren(icon(opts.glyph, 16)); +} + +function notice(text: string): HTMLElement { + const box = el('div', { className: 'notice', role: 'alert' }); + setNotice(box, text); + return box; +} +function setNotice(box: HTMLElement, text: string): void { + box.replaceChildren(...(text ? [el('i', {}, icon(I.alert, 18)), el('span', {}, text)] : [])); +} + +function shake(field: HTMLElement): void { + void notify(NotificationType.Error); + field.classList.remove('bad'); + void field.offsetWidth; + field.classList.add('bad'); + setTimeout(() => field.classList.remove('bad'), 900); +} + +/** A field on a white card: its label above, the input, an optional badge on the card's edge. */ +function field( + label: string, + input: HTMLInputElement, + extra: { after?: Node[]; edge?: HTMLElement; below?: Node[] } = {} +): HTMLLabelElement { + return el( + 'label', + { className: 'fld' }, + el('span', { className: 'lab' }, label), + el('span', { className: 'row' }, input, ...(extra.after ?? [])), + ...(extra.edge ? [extra.edge] : []), + ...(extra.below ?? []) + ); } // ── Welcome ───────────────────────────────────────────────────────────────── function showWelcome(opts: { back?: boolean } = {}): void { - // The full TREK wordmark, in the variant that reads on the current scheme. - const hero = el( - 'span', - { className: 'hero-logo' }, - el('img', { src: logoWhite, alt: 'TREK', className: 'on-dark' }), - el('img', { src: logoBlack, alt: '', className: 'on-light' }) - ); + const perk = (glyph: string, title: string, sub: string) => + el('div', {}, el('i', {}, icon(glyph, 17)), el('span', {}, el('b', {}, title), el('small', {}, sub))); - const connect = el( - 'button', - { type: 'button', className: 'btn btn-ghost' }, - el( - 'span', - { className: 'btn-row' }, - el('b', {}, t('native.welcome.connect')), - el('small', {}, t('native.welcome.connectSub')) - ), - icon(I.chevron, 20, 'chev') - ); - connect.addEventListener('click', () => { + const discover = el('button', { type: 'button', className: 'cta' }, t('native.welcome.discover')); + discover.addEventListener('click', () => { + void tap(); + showPlans(); + }); + const have = el('button', { type: 'button', className: 'cta2' }, t('native.cloud.haveServer')); + have.addEventListener('click', () => { void tap(); showConnect(); }); - const cloud = el( - 'button', - { type: 'button', className: 'btn' }, - el( - 'span', - { className: 'btn-row' }, - el('b', {}, t('native.welcome.getCloud')), - el('small', {}, t('native.welcome.getCloudSub')) - ), - icon(I.chevron, 20, 'chev') - ); - cloud.addEventListener('click', () => { - void tap(); - showCloud(); - }); - - const demo = el('button', { type: 'button', className: 'demo-link' }, t('native.connect.tryDemo')); - demo.addEventListener('click', () => runDemo(demo)); - show( - el( - 'div', - {}, - ...columns( - [ - hero, - el('h1', { className: 'title brand-title' }, t('native.welcome.headline')), - el('p', { className: 'sub' }, t('native.welcome.sub')), - ], - [cloud, connect, demo, footLinks()] - ) - ), + 'welcome', + WELCOME_CAMERA, + { + overlay: [el('img', { src: logoWhite, alt: 'TREK', className: 'logo' })], + content: [ + el( + 'div', + { className: 'pad grow' }, + el('h1', {}, t('native.welcome.title')), + el('p', { className: 'lead' }, t('native.welcome.lead')), + el( + 'div', + { className: 'perks' }, + perk(I.globe, t('native.welcome.routeTitle'), t('native.welcome.routeSub')), + perk(I.people, t('native.welcome.togetherTitle'), t('native.welcome.togetherSub')), + perk(I.image, t('native.welcome.photosTitle'), t('native.welcome.photosSub')) + ), + el('div', { className: 'push' }), + el('div', { className: 'btns' }, discover, have) + ), + ], + }, opts ); } @@ -288,6 +358,10 @@ function showWelcome(opts: { back?: boolean } = {}): void { * right away. A server that is new enough loads again without another tap. */ function showConnect(prefill = '', opts: { back?: boolean; recheck?: boolean } = {}): void { + const host = el('b', { className: 'ph' }, 'trek.example.com'); + const caret = el('span', { className: 'caret', ariaHidden: 'true' }); + const card = glassCard(t('native.connect.yourTrek'), I.globe, [caret, host]); + const input = el('input', { type: 'url', placeholder: t('native.connect.placeholder'), @@ -301,53 +375,119 @@ function showConnect(prefill = '', opts: { back?: boolean; recheck?: boolean } = input.dir = 'ltr'; // The on-screen keyboard's return key submits the address; it reads "Go", not a newline. input.setAttribute('enterkeyhint', 'go'); - input.setAttribute('aria-label', t('native.connect.title')); - const field = el('div', { className: 'field' }, input); - - const label = el('span', {}, t('native.connect.submit')); - const submit = el('button', { type: 'submit', className: 'btn' }, label); - const error = el('p', { className: 'error', role: 'alert' }); - const gatePanel = el('div', { className: 'gate', role: 'alert', hidden: true }); - const form = el('form', { className: 'form', noValidate: true }, field, submit, error, gatePanel); - - const fail = (reason: ProbeFailure, gate?: AuthGate, server?: string, cert?: ClientCertDemand): void => { - void notify(NotificationType.Error); - field.classList.add('bad'); - setTimeout(() => field.classList.remove('bad'), 350); - if (reason === 'authGate' && gate && server) { - error.textContent = ''; - fillGatePanel(gatePanel, gate, server); - } else if (reason === 'clientCert' && cert) { - error.textContent = ''; - fillCertPanel(gatePanel, cert, () => form.requestSubmit()); - } else { - error.textContent = failureMessage(reason); - } - input.disabled = false; - submit.disabled = false; - // The certificate panel brings its own button for the same file. - addCert.hidden = !gatePanel.hidden; - addCert.disabled = false; - label.textContent = t('native.connect.submit'); - submit.replaceChildren(label); - // A panel with its own next step stays in view; the keyboard would cover it. - if (gatePanel.hidden) input.focus(); - }; + const found = el('span', { className: 'edge on', hidden: true }, icon(I.check, 12), t('native.connect.found')); + const addressField = field(t('native.connect.addressField'), input, { edge: found }); + const error = notice(''); + const panel = el('div', { className: 'panel', role: 'alert', hidden: true }); // The check offers a certificate when the proxy asks for one during the // handshake. This adds one up front: for someone who knows their proxy wants // it, and for a proxy that refuses without asking, which the check cannot tell. - const addCert = el('button', { type: 'button', className: 'linkbtn' }, t('native.cert.choose')); + const addCert = el( + 'button', + { type: 'button', className: 'side' }, + icon(I.shield, 18), + el('span', {}, t('native.connect.addCert')) + ); + const submit = el('button', { type: 'button', className: 'cta' }, t('native.connect.submit')); + const demo = el('button', { type: 'button', className: 'link' }, t('native.connect.tryDemo')); + const form = el( + 'form', + { className: 'pad form', noValidate: true }, + el('h1', { className: 'title' }, t('native.connect.title')), + el('p', { className: 'sub' }, t(opts.recheck ? 'native.connect.recheckHint' : 'native.connect.hint')), + addressField, + error, + panel, + addCert + ); + + const screen = show( + 'tall', + cameraForPlan(1), + { + back: () => showWelcome({ back: true }), + overlay: [card.node], + content: [form, el('div', { className: 'dock' }, submit, demo)], + }, + opts + ); + // The button sits in the dock at the foot of the screen, outside the form; Return in the field submits as well. + submit.addEventListener('click', () => form.requestSubmit()); + + const bare = (v: string) => + v + .trim() + .replace(/^https?:\/\//i, '') + .replace(/\/+$/, ''); + const paintHost = () => { + const h = bare(input.value); + host.textContent = h || 'trek.example.com'; + host.classList.toggle('ph', !h); + if (h) host.after(caret); + else host.before(caret); + card.fit(); + }; + const reset = () => { + setNotice(error, ''); + panel.hidden = true; + panel.replaceChildren(); + addCert.hidden = false; + found.hidden = true; + screen.node.classList.remove('compact'); + setKicker(card, t('native.connect.yourTrek'), { glyph: I.globe }); + }; + input.addEventListener('focus', () => card.node.classList.add('typing')); + input.addEventListener('blur', () => card.node.classList.remove('typing')); + input.addEventListener('input', () => { + paintHost(); + reset(); + submit.textContent = t('native.connect.submit'); + }); + paintHost(); + + // What the card says when the check fails, and its mark. + const KICKER: Partial> = { + unreachable: { labelKey: 'native.connect.kickerUnreachable', glyph: I.wifiOff }, + notTrek: { labelKey: 'native.connect.kickerNotTrek', glyph: I.alert }, + tooOld: { labelKey: 'native.connect.kickerTooOld', glyph: I.update }, + authGate: { labelKey: 'native.connect.kickerGate', glyph: I.gate }, + clientCert: { labelKey: 'native.connect.kickerCert', glyph: I.key }, + }; + const fail = (reason: ProbeFailure, gate?: AuthGate, server?: string, cert?: ClientCertDemand): void => { + void notify(NotificationType.Error); + input.disabled = false; + submit.disabled = false; + addCert.disabled = false; + submit.textContent = t('native.connect.recheck'); + const kicker = KICKER[reason]; + if (kicker) setKicker(card, t(kicker.labelKey), { tone: 'bad', glyph: kicker.glyph }); + if (reason === 'authGate' && gate && server) { + fillGatePanel(panel, gate, server); + } else if (reason === 'clientCert' && cert) { + fillCertPanel(panel, cert, () => form.requestSubmit()); + } else { + if (reason === 'invalid') shake(addressField); + setNotice(error, failureMessage(reason)); + } + // A panel with its own next step stays in view, with the room it needs; the keyboard would cover it. + const withPanel = !panel.hidden; + addCert.hidden = withPanel; + screen.node.classList.toggle('compact', withPanel); + if (!withPanel) input.focus(); + }; + addCert.addEventListener('click', async () => { if (submit.disabled) return; // a check is running const target = certificateTargetFor(input.value); if (!target) { - error.textContent = failureMessage('invalid'); + setNotice(error, failureMessage('invalid')); + shake(addressField); input.focus(); return; } void tap(); - error.textContent = ''; + setNotice(error, ''); addCert.disabled = true; const outcome = await importCertificate(target.host, target.port); addCert.disabled = false; @@ -356,45 +496,46 @@ function showConnect(prefill = '', opts: { back?: boolean; recheck?: boolean } = form.requestSubmit(); } else if (outcome !== 'cancelled') { void notify(NotificationType.Error); - error.textContent = certFailureMessage(outcome); + setNotice(error, certFailureMessage(outcome)); } }); form.addEventListener('submit', async (event) => { event.preventDefault(); + if (submit.disabled) return; void tap(ImpactStyle.Medium); - error.textContent = ''; - gatePanel.hidden = true; - gatePanel.replaceChildren(); + reset(); input.disabled = true; submit.disabled = true; addCert.disabled = true; - submit.replaceChildren(el('span', { className: 'spinner' }), t('native.connect.checking')); + input.blur(); + submit.replaceChildren(el('span', { className: 'spin' }), t('native.connect.checking')); + setKicker(card, t('native.connect.checking'), { busy: true }); const result = await probeServer(input.value, get); if (result.ok) { + setKicker(card, t('native.connect.connected'), { tone: 'ok', glyph: I.lock }); + found.hidden = false; + submit.textContent = t('native.connect.connected'); await connected(result.url); return; } fail(result.reason, result.gate, result.url, result.cert); }); - show( - el( - 'div', - {}, - ...columns( - [ - topbar(() => showWelcome({ back: true })), - el('h1', { className: 'title-sm' }, t('native.connect.title')), - el('p', { className: 'sub' }, t(opts.recheck ? 'native.connect.recheckHint' : 'native.connect.hint')), - ], - [form, addCert, footLinks()] - ) - ), - opts - ); + demo.addEventListener('click', () => runDemo(demo, error)); + if (opts.recheck && prefill) form.requestSubmit(); - else requestAnimationFrame(() => input.focus()); + else if (!prefill) requestAnimationFrame(() => input.focus()); +} + +/** A small panel with a mark, a title, what to do, and the help page. */ +function panelHead(glyph: string, title: string): HTMLElement { + return el('div', { className: 'panel-head' }, el('i', {}, icon(glyph, 18)), el('b', {}, title)); +} +function helpLink(text: string, href: string): HTMLAnchorElement { + const link = externalLink(text, href, 'panel-help'); + link.append(icon(I.out, 13, 'flip')); + return link; } /** @@ -410,11 +551,11 @@ function fillGatePanel(panel: HTMLElement, gate: AuthGate, server: string): void : name ? t('native.gate.title', { name }) : t('native.gate.titleUnknown'); - const children: Node[] = [el('p', { className: 'gate-title' }, title)]; + const children: Node[] = [panelHead(I.gate, title)]; if (canSignInInApp(gate)) { const signIn = el( 'button', - { type: 'button', className: 'btn' }, + { type: 'button', className: 'panel-btn' }, name ? t('native.gate.signIn', { name }) : t('native.gate.signInGeneric') ); signIn.addEventListener('click', () => { @@ -422,14 +563,14 @@ function fillGatePanel(panel: HTMLElement, gate: AuthGate, server: string): void void connected(server, gate.loginHost ? [gate.loginHost] : []); }); children.push( - el('p', { className: 'gate-text' }, t('native.gate.hint')), + el('p', {}, t('native.gate.hint')), signIn, - el('p', { className: 'gate-note' }, t('native.gate.googleNote')) + el('p', { className: 'panel-note' }, t('native.gate.googleNote')) ); } else { - children.push(el('p', { className: 'gate-text' }, t('native.gate.basicHint'))); + children.push(el('p', {}, t('native.gate.basicHint'))); } - children.push(externalLink(t('native.gate.help'), AUTH_PROXY_DOCS_URL)); + children.push(helpLink(t('native.gate.help'), AUTH_PROXY_DOCS_URL)); panel.replaceChildren(...children); panel.hidden = false; } @@ -441,10 +582,10 @@ function fillGatePanel(panel: HTMLElement, gate: AuthGate, server: string): void * one shown; `retry` checks the server again once it is added. */ function fillCertPanel(panel: HTMLElement, cert: ClientCertDemand, retry: () => void): void { - const status = el('p', { className: 'gate-note', role: 'status' }); + const status = el('p', { className: 'panel-status', role: 'status' }); const choose = el( 'button', - { type: 'button', className: 'btn' }, + { type: 'button', className: 'panel-btn' }, cert.sent ? t('native.cert.chooseOther') : t('native.cert.choose') ); choose.addEventListener('click', async () => { @@ -461,16 +602,13 @@ function fillCertPanel(panel: HTMLElement, cert: ClientCertDemand, retry: () => status.textContent = certFailureMessage(outcome); } }); + const hint = cert.sent ? t('native.cert.hintRefused') : t('native.cert.hint', { host: cert.host }); panel.replaceChildren( - el('p', { className: 'gate-title' }, cert.sent ? t('native.cert.titleRefused') : t('native.cert.title')), - el( - 'p', - { className: 'gate-text' }, - cert.sent ? t('native.cert.hintRefused') : t('native.cert.hint', { host: cert.host }) - ), + panelHead(I.key, cert.sent ? t('native.cert.titleRefused') : t('native.cert.title')), + el('p', {}, hint), choose, status, - externalLink(t('native.cert.help'), CLIENT_CERT_DOCS_URL) + helpLink(t('native.cert.help'), CLIENT_CERT_DOCS_URL) ); panel.hidden = false; } @@ -515,77 +653,6 @@ function certFailureMessage(failure: ClientCertificateFailure): string { } } -// ── Get TREK Cloud ────────────────────────────────────────────────────────── -function feature(path: string, text: string): HTMLElement { - return el( - 'div', - { className: 'feature' }, - el('span', { className: 'ic' }, icon(path, 18)), - el('span', { className: 'tx' }, text) - ); -} - -function showCloud(opts: { back?: boolean } = {}): void { - // The label centred, the chevron at the far edge: it points on, not at the word. - const cta = el( - 'button', - { type: 'button', className: 'btn btn-go' }, - el('span', { className: 'btn-label' }, t('native.cloud.cta')), - icon(I.chevron, 20, 'chev') - ); - cta.addEventListener('click', () => { - void tap(); - showPlans(); - }); - - // The way out for someone who already runs TREK: there, but quieter than the way in. - const have = el('button', { type: 'button', className: 'linkbtn linkbtn-quiet' }, t('native.cloud.haveServer')); - have.addEventListener('click', () => { - void tap(); - showConnect(); - }); - - show( - el( - 'div', - {}, - ...columns( - [ - topbar(() => showWelcome({ back: true })), - // The lockup is a logo: "trek" then "cloud" in every language, never mirrored. - el( - 'div', - { className: 'cloud-wordmark', role: 'img', ariaLabel: t('native.cloud.title'), dir: 'ltr' }, - el('img', { src: logoWhite, alt: '', className: 'on-dark' }), - el('img', { src: logoBlack, alt: '', className: 'on-light' }), - el('span', { className: 'cloud-tag' }, 'cloud') - ), - el('p', { className: 'sub' }, t('native.cloud.sub')), - ], - [ - // The app itself, as it runs on TREK Cloud: real screens, nothing drawn for the purpose. - el( - 'div', - { className: 'cloud-preview' }, - el('img', { src: previewImage, alt: '', loading: 'lazy', decoding: 'async' }) - ), - el( - 'div', - { className: 'features' }, - feature(I.globe, t('native.cloud.f1')), - feature(I.bolt, t('native.cloud.f2')), - feature(I.shield, t('native.cloud.f3')) - ), - cta, - have, - footLinks(), - ] - ) - ), - opts - ); -} - // ── Choose a plan (TREK Cloud) ────────────────────────────────────────────── interface CloudPlan { id: string; @@ -600,15 +667,18 @@ interface CloudPlan { function money(cents: number): string { return new Intl.NumberFormat(locale, { style: 'currency', currency: 'EUR' }).format(cents / 100); } +function count(n: number): string { + return new Intl.NumberFormat(locale).format(n); +} // A sample catalogue for the dev preview only: the cloud site is behind a gate // during development, so its /api/plans is unreachable from a local build. Never // used in a real build (see the import.meta.env.DEV guard below). const SAMPLE_PLANS: CloudPlan[] = [ - { id: 'start', name: 'Start', monthlyCents: 599, yearlyCents: 5990, aiDocuments: 0, storageGb: 10 }, - { id: 'plus', name: 'Plus', monthlyCents: 999, yearlyCents: 9990, aiDocuments: 100, storageGb: 50 }, - { id: 'pro', name: 'Pro', monthlyCents: 1599, yearlyCents: 15990, aiDocuments: 500, storageGb: 200 }, - { id: 'studio', name: 'Studio', monthlyCents: 2399, yearlyCents: 23990, aiDocuments: 2000, storageGb: 1000 }, + { id: 'start', name: 'Start', monthlyCents: 490, yearlyCents: 4900, aiDocuments: 0, storageGb: 10 }, + { id: 'basis', name: 'Basis', monthlyCents: 790, yearlyCents: 7900, aiDocuments: 25, storageGb: 10 }, + { id: 'plus', name: 'Plus', monthlyCents: 1290, yearlyCents: 12900, aiDocuments: 100, storageGb: 25 }, + { id: 'pro', name: 'Pro', monthlyCents: 1990, yearlyCents: 19900, aiDocuments: 150, storageGb: 50 }, ]; interface CloudPlans { @@ -669,106 +739,51 @@ function recommendedPlan(plans: CloudPlan[]): CloudPlan | undefined { return plans.find((p) => p.aiDocuments > 0) ?? plans[0]; } -/** - * What a year saves against twelve months, in whole percent, rounded down so - * the badge never promises more than the price gives. From the store's own price - * strings where both parse (the buyer's currency), else from the plan list. - */ -function yearlySaving(plans: CloudPlan[], offer: Offer): number | null { - const savings = plans.map((plan) => { - const month = priceValue(offer.storePrices?.get(productIdFor(plan.id, 'month'))) ?? plan.monthlyCents; - const year = priceValue(offer.storePrices?.get(productIdFor(plan.id, 'year'))) ?? plan.yearlyCents; - if (!month || !year) return null; - return Math.floor((1 - year / (month * 12)) * 100); - }); - if (savings.some((v) => v === null)) return null; - const least = Math.min(...(savings as number[])); - return least >= 5 ? least : null; +/** The kind of trip each plan is for: a weekend away, a round trip, a long journey, the whole world. */ +const TRIPS: Record = { + start: { titleKey: 'native.trip.start.title', textKey: 'native.trip.start.text' }, + basis: { titleKey: 'native.trip.basis.title', textKey: 'native.trip.basis.text' }, + plus: { titleKey: 'native.trip.plus.title', textKey: 'native.trip.plus.text' }, + pro: { titleKey: 'native.trip.pro.title', textKey: 'native.trip.pro.text' }, +}; +/** A plan's trip, its title and one line; a plan the app does not know keeps its own name. */ +function tripOf(plan: CloudPlan): { title: string; text: string } { + const trip = TRIPS[plan.id]; + return trip ? { title: t(trip.titleKey), text: t(trip.textKey) } : { title: plan.name, text: '' }; } -function planCard( - plan: CloudPlan, - interval: 'month' | 'year', - offer: Offer, - opts: { recommended: boolean; selected: boolean; onSelect?: () => void } -): HTMLElement { - const { label } = offerFor(offer, plan, interval); - const per = interval === 'year' ? t('native.plans.perYear') : t('native.plans.perMonth'); - const feat = (text: string, extra?: Node) => el('span', {}, icon(I.check, 16), text, ...(extra ? [extra] : [])); - // An absent feature (e.g. a plan with no AI documents): a muted dash, not a - // green tick, so "none" never reads as a perk. - const featOff = (text: string) => el('span', { className: 'off' }, icon('M5 12h14', 16), text); - // About 3 MB a photo, as a phone takes them: a size people can picture, as a - // camera and a number, which needs no words in any language. - const photos = el( - 'small', - { className: 'plan-photos' }, - icon(I.camera, 13), - `≈ ${new Intl.NumberFormat(locale).format(plan.storageGb * 300)}` - ); - const body = [ - el( - 'div', - { className: 'plan-top' }, - el( - 'span', - { className: 'plan-name' }, - plan.name, - ...(opts.recommended ? [el('span', { className: 'plan-badge' }, t('native.plans.recommended'))] : []) - ), - // No price yet (orders not open): the plan shows without one rather than with an empty one. - // The price is figures and a currency sign: one left-to-right run, so Arabic - // keeps "5,99 €" whole, with the period standing apart beside it. - ...(label ? [el('span', { className: 'plan-price' }, el('bdi', { dir: 'ltr' }, label), el('small', {}, per))] : []) - ), - el( - 'div', - { className: 'plan-feats' }, - feat(t('native.plans.storage', { n: String(plan.storageGb) }), photos), - plan.aiDocuments > 0 - ? feat(t('native.plans.aiDocs', { n: String(plan.aiDocuments) })) - : featOff(t('native.plans.noAi')) - ), - ]; - const className = `plan${opts.recommended ? ' featured' : ''}${opts.selected ? ' selected' : ''}`; - if (!opts.onSelect) return el('div', { className }, ...body); - // A choice among the plans, as radio buttons are: the one button below acts on it. - const card = el('button', { type: 'button', className }, el('span', { className: 'plan-radio' }), ...body); - card.setAttribute('role', 'radio'); - card.setAttribute('aria-checked', String(opts.selected)); - const select = opts.onSelect; - card.addEventListener('click', () => { - void tap(); - select(); - }); - return card; +function per(interval: 'month' | 'year'): string { + return interval === 'year' ? t('native.plans.perYear') : t('native.plans.perMonth'); } -/** - * Below the plans. With a store: how the subscription renews, the terms and the - * privacy policy, and a way to restore a subscription this Apple ID already - * holds (a reinstall, a new phone). Without one: only that buying in the app is - * not available, and no pointer elsewhere. - */ /** The restore button of the plans on screen, which redeems a payment that cleared later. */ let resumeRestore: (() => void) | null = null; let watchingTransactions = false; +/** Where the camera stood on the plan chosen last, for the screens that follow it. */ +let chosenCamera: Camera = cameraForPlan(1); +/** The plan chosen last, so coming back to the plans finds it still chosen. */ +let chosenPlanId: string | null = null; +let chosenInterval: 'month' | 'year' = 'month'; -function planFooter(offer: Offer, plans: CloudPlan[]): Node[] { - if (offer.opensSoon) return [el('p', { className: 'note' }, t('native.plans.closed'))]; - if (!offer.canBuy) return [el('p', { className: 'note' }, t('native.plans.soon'))]; - - const status = el('p', { className: 'hint', role: 'status' }); - const restore = el('button', { type: 'button', className: 'btn btn-ghost' }, t('native.plans.restore')); +/** + * Restoring a purchase this store account already made (a reinstall, a new + * phone). Found and redeemed: the instance it belongs to opens. Paid but never + * set up: the claim screen takes the purchase as it is, so nothing is bought twice. + */ +function restoreButton(offer: Offer, plans: CloudPlan[]): HTMLButtonElement { + const restore = el('button', { type: 'button', className: 'link' }, t('native.plans.restore')); + const say = (text: string) => { + restore.classList.add('msg'); + restore.textContent = text; + }; restore.addEventListener('click', async () => { void tap(); restore.disabled = true; - status.className = 'hint'; - status.textContent = t('native.plans.restoring'); + say(t('native.plans.restoring')); const purchase = await iap.restore(); if (!purchase) { restore.disabled = false; - status.textContent = t(onPlay ? 'native.plans.restoreNoneAndroid' : 'native.plans.restoreNone'); + say(t(onPlay ? 'native.plans.restoreNoneAndroid' : 'native.plans.restoreNone')); return; } // A restore finds the instance the purchase was first redeemed for; address and email are not asked again. @@ -778,25 +793,22 @@ function planFooter(offer: Offer, plans: CloudPlan[]): Node[] { showProvisioning(redeemed.instanceUrl); return; } - // Paid but never set up (Ask to Buy approved later, the app closed mid-purchase): - // the claim screen takes the purchase as it is, so nothing is bought twice. + // Paid but never set up (Ask to Buy approved later, the app closed mid-purchase). const unclaimed = redeemed.code === 'email-invalid' || (redeemed.code ?? '').startsWith('slug-'); const match = /^cloud\.([a-z0-9-]+)\.(monthly|yearly)$/.exec(purchase.productId); const plan = match ? plans.find((p) => p.id === match[1]) : undefined; if (unclaimed && match && plan) { const interval = match[2] === 'yearly' ? 'year' : 'month'; const { label } = offerFor(offer, plan, interval); - const per = interval === 'year' ? t('native.plans.perYear') : t('native.plans.perMonth'); - showClaim(plan, interval, `${label} ${per}`, { bought: purchase }); + showClaim(plan, interval, label, { bought: purchase }); return; } void notify(NotificationType.Error); restore.disabled = false; - status.className = 'hint bad'; // Bought before the opening: refused, unacknowledged, and refunded by Google Play. - status.textContent = refundedBeforeOpening(redeemed.code, onPlay) - ? t('native.claim.closedRefund') - : t('native.plans.restoreFailed'); + say( + refundedBeforeOpening(redeemed.code, onPlay) ? t('native.claim.closedRefund') : t('native.plans.restoreFailed') + ); }); // A payment that was pending (cash, some carrier billing) and has cleared since: @@ -811,153 +823,228 @@ function planFooter(offer: Offer, plans: CloudPlan[]): Node[] { void iap.unfinished().then((purchase) => { if (purchase) resumeRestore?.(); }); - - return [ - restore, - status, - el('p', { className: 'note' }, t(onPlay ? 'native.plans.legalAndroid' : 'native.plans.legal')), - el( - 'div', - { className: 'foot-links' }, - externalLink(t('native.plans.ourTerms'), CLOUD_TERMS_URL), - ...(onPlay ? [] : [externalLink(t('native.plans.terms'), STORE_TERMS_URL)]), - externalLink(t('native.privacy'), PRIVACY_URL) - ), - ]; + return restore; } function showPlans(opts: { back?: boolean } = {}): void { - let interval: 'month' | 'year' = 'month'; - let plans: CloudPlan[] | null = null; + let interval: 'month' | 'year' = chosenInterval; + let plans: CloudPlan[] = []; let offer: Offer = { canBuy: false, storePrices: null, opensSoon: false }; let selectedId: string | null = null; - const content = el('div', { className: 'loading' }, el('span', { className: 'spinner' })); - const footer = el('div', { className: 'plans-foot' }); - // What every plan has, said once above them, so the cards show only what differs. - const everyPlan = el('p', { className: 'plans-every', hidden: true }, icon(I.check, 16), t('native.plans.everyPlan')); + const tiers = el('div', { className: 'tiers', role: 'radiogroup', hidden: true }); + tiers.setAttribute('aria-label', t('native.plans.title')); + const title = el('h1', {}); + const text = el('p', {}); + const trip = el('div', { className: 'trip' }, title, text); - const monthBtn = el('button', { type: 'button' }, t('native.plans.monthly')); - const saveBadge = el('span', { className: 'save', hidden: true }); - const yearBtn = el('button', { type: 'button' }, t('native.plans.yearly'), saveBadge); - const seg = el('div', { className: 'segmented' }, monthBtn, yearBtn); + const monthBtn = el('button', { type: 'button', role: 'radio' }, t('native.plans.monthly')); + const yearBtn = el('button', { type: 'button', role: 'radio' }, t('native.plans.yearly')); + const cycle = el( + 'div', + { className: 'cycle', role: 'radiogroup' }, + el('span', { className: 'thumb' }), + monthBtn, + yearBtn + ); + cycle.setAttribute('aria-label', t('native.plans.billing')); + // The price is figures and a currency sign: one left-to-right run, so Arabic keeps "4,90 €" whole. + const priceValue = el('b', { dir: 'ltr' }); + const pricePer = el('span', {}); + const price = el('div', { className: 'price' }, priceValue, pricePer); + const equals = el('div', { className: 'equals' }); + const pricebox = el('div', { className: 'pricebox' }, cycle, price, equals); + const specs = el('div', { className: 'specs' }); + const foot = el('div', { className: 'pad', hidden: true }); - // The one way on, kept in reach at the foot of the screen while the plans scroll. - const ctaName = el('span', { className: 'btn-label' }); - const ctaPrice = el('small', {}); - const cta = el('button', { type: 'button', className: 'btn plans-go' }, el('span', { className: 'btn-row' }, el('b', {}, ctaName), ctaPrice), icon(I.chevron, 20, 'chev')); - const ctaBar = el('div', { className: 'plans-cta', hidden: true }, cta); + const loading = el('div', { className: 'loading' }, el('span', { className: 'spin' })); + const details = el('div', { className: 'stack', hidden: true }, trip, pricebox, specs); + const choose = el('button', { type: 'button', className: 'cta', hidden: true }); + const dock = el('div', { className: 'dock' }, choose); - const selected = (): CloudPlan | undefined => plans?.find((p) => p.id === selectedId); - const paintSeg = () => { - monthBtn.setAttribute('aria-pressed', String(interval === 'month')); - yearBtn.setAttribute('aria-pressed', String(interval === 'year')); + const screen = show( + 'plain', + chosenCamera, + { + back: () => showWelcome({ back: true }), + content: [el('div', { className: 'pad lift' }, tiers, loading, details), foot, dock], + }, + opts + ); + + const selected = (): CloudPlan | undefined => plans.find((p) => p.id === selectedId); + let shown: number | null = null; + let tween = 0; + /** The price counts to its new amount, as a figure does on a display, in the store's own format. */ + const paintPrice = (label: string, animate: boolean) => { + const amount = amountIn(label); + cancelAnimationFrame(tween); + if (!amount || shown === null || !animate) { + priceValue.textContent = label; + shown = amount ? amount.value : null; + return; + } + const from = shown; + const start = performance.now(); + const step = (now: number) => { + const k = Math.min(1, (now - start) / 420); + const e = 1 - Math.pow(1 - k, 3); + priceValue.textContent = amount.render(from + (amount.value - from) * e); + if (k < 1) tween = requestAnimationFrame(step); + }; + shown = amount.value; + tween = requestAnimationFrame(step); }; - const paintCta = () => { + + const paint = (animate: boolean) => { const plan = selected(); - const buyable = plan ? offerFor(offer, plan, interval).buyable : false; - ctaBar.hidden = !buyable; - if (!plan || !buyable) return; - const { label } = offerFor(offer, plan, interval); - const per = interval === 'year' ? t('native.plans.perYear') : t('native.plans.perMonth'); - ctaName.textContent = t('native.plans.continueWith', { plan: plan.name }); - ctaPrice.textContent = `${label} ${per}`; - }; - const renderList = () => { - const list = plans; - if (!list) return; - const recommended = recommendedPlan(list); - content.className = 'plans'; - content.setAttribute('role', 'radiogroup'); - content.setAttribute('aria-label', t('native.plans.title')); - content.replaceChildren( - ...list.map((p) => - planCard(p, interval, offer, { - recommended: p.id === recommended?.id, - selected: p.id === selectedId, - // Only a plan that can be bought here is a choice; a closed shop shows them as they are. - onSelect: offerFor(offer, p, interval).buyable - ? () => { - selectedId = p.id; - renderList(); - } - : undefined, - }) + if (!plan) return; + const index = plans.indexOf(plan); + tiers + .querySelectorAll('button') + .forEach((b) => b.setAttribute('aria-checked', String(b.dataset.plan === plan.id))); + monthBtn.setAttribute('aria-checked', String(interval === 'month')); + yearBtn.setAttribute('aria-checked', String(interval === 'year')); + cycle.dataset.year = String(interval === 'year'); + + const { title: tripTitle, text: tripText } = tripOf(plan); + const recommended = recommendedPlan(plans)?.id === plan.id; + title.replaceChildren( + tripTitle, + ...(recommended ? [el('span', { className: 'badge' }, t('native.plans.recommended'))] : []) + ); + text.textContent = tripText; + text.hidden = !tripText; + + const { label, buyable } = offerFor(offer, plan, interval); + // No price yet (orders not open): the plan shows without one rather than with an empty one. + price.hidden = !label; + pricePer.textContent = per(interval); + if (label) paintPrice(label, animate); + const year = offerFor(offer, plan, 'year').label; + // Without a price in either period (orders not open yet) the switch would choose between nothing. + pricebox.hidden = !label && !year; + const yearAmount = amountIn(year); + equals.textContent = + !label || !year + ? '' + : interval === 'month' + ? t('native.plans.yearlyIs', { price: year }) + : yearAmount + ? t('native.plans.monthlyIs', { price: yearAmount.render(yearAmount.value / 12) }) + : ''; + + const gb = plan.storageGb >= 1000 ? `${count(plan.storageGb / 1000)} TB` : `${count(plan.storageGb)} GB`; + const tile = (glyph: string, big: string, small: string, off = false) => + el( + 'span', + { className: off ? 'spec off' : 'spec' }, + el('i', {}, icon(glyph, 17)), + el('span', {}, el('b', {}, big), el('small', {}, small)) + ); + specs.replaceChildren( + // About 3 MB a photo, as a phone takes them: a size people can picture. + tile(I.image, gb, t('native.plans.photos', { n: count(plan.storageGb * 300) })), + plan.aiDocuments > 0 + ? tile(I.spark, t('native.plans.aiPerMonth', { n: count(plan.aiDocuments) }), t('native.plans.aiLabel')) + : tile(I.spark, t('native.plans.aiNone'), t('native.plans.aiLabel'), true), + el( + 'span', + { className: 'spec wide' }, + el('i', {}, icon(I.people, 17)), + el('span', {}, el('b', {}, t('native.plans.unlimited')), el('small', {}, t('native.plans.unlimitedSub'))), + el('em', {}, t('native.plans.inEveryPlan')) ) ); - paintCta(); - }; - const choose = (next: 'month' | 'year') => { - if (interval === next) return; - void tap(); - interval = next; - paintSeg(); - renderList(); - }; - monthBtn.addEventListener('click', () => choose('month')); - yearBtn.addEventListener('click', () => choose('year')); - paintSeg(); - cta.addEventListener('click', async () => { + choose.hidden = !buyable; + choose.textContent = t('native.plans.choose', { trip: tripTitle }); + chosenCamera = cameraForPlan(index); + chosenPlanId = plan.id; + chosenInterval = interval; + if (animate) screen.scenery?.flyTo(chosenCamera); + }; + + monthBtn.addEventListener('click', () => { + if (interval === 'month') return; + void tap(); + interval = 'month'; + paint(true); + }); + yearBtn.addEventListener('click', () => { + if (interval === 'year') return; + void tap(); + interval = 'year'; + paint(true); + }); + + choose.addEventListener('click', async () => { const plan = selected(); if (!plan) return; void tap(ImpactStyle.Medium); // A store account with a running subscription buys nothing more: say so before the form. - cta.disabled = true; + choose.disabled = true; const held = await iap.held(); - cta.disabled = false; + choose.disabled = false; if (held) { showSubscribed(); return; } - const { label } = offerFor(offer, plan, interval); - const per = interval === 'year' ? t('native.plans.perYear') : t('native.plans.perMonth'); - showClaim(plan, interval, `${label} ${per}`); + showClaim(plan, interval, offerFor(offer, plan, interval).label); }); const load = async () => { + loading.replaceChildren(el('span', { className: 'spin' })); + loading.hidden = false; const list = await fetchPlans(); - if (list) { - offer = await loadOffer(list); - plans = list.plans; - selectedId = recommendedPlan(list.plans)?.id ?? null; - const saving = yearlySaving(list.plans, offer); - if (saving !== null) { - saveBadge.textContent = `−${new Intl.NumberFormat(locale, { style: 'percent' }).format(saving / 100)}`; - saveBadge.hidden = false; - } - everyPlan.hidden = false; - renderList(); - footer.replaceChildren(...planFooter(offer, list.plans)); + if (!list) { + const retry = el('button', { type: 'button', className: 'cta2' }, t('native.plans.retry')); + retry.addEventListener('click', () => { + void tap(); + void load(); + }); + loading.replaceChildren(el('div', { className: 'stack' }, notice(t('native.plans.loadError')), retry)); return; } - content.className = ''; - const retry = el('button', { type: 'button', className: 'btn btn-ghost' }, t('native.plans.retry')); - retry.addEventListener('click', () => { - void tap(); - content.className = 'loading'; - content.replaceChildren(el('span', { className: 'spinner' })); - void load(); - }); - content.replaceChildren(el('p', { className: 'error' }, t('native.plans.loadError')), retry); + offer = await loadOffer(list); + plans = list.plans; + selectedId = plans.find((p) => p.id === chosenPlanId)?.id ?? recommendedPlan(plans)?.id ?? null; + tiers.replaceChildren( + ...plans.map((p) => { + const b = el('button', { type: 'button', role: 'radio', dataset: { plan: p.id } }, p.name); + b.addEventListener('click', () => { + if (selectedId === p.id) return; + void tap(); + selectedId = p.id; + paint(true); + }); + return b; + }) + ); + loading.hidden = true; + tiers.hidden = false; + details.hidden = false; + // The store's terms below the plans; a shop that cannot sell yet says only that. + if (offer.opensSoon || !offer.canBuy) { + foot.replaceChildren( + el('p', { className: 'legal' }, t(offer.opensSoon ? 'native.plans.closed' : 'native.plans.soon')) + ); + } else { + foot.replaceChildren( + el('p', { className: 'legal' }, t(onPlay ? 'native.plans.legalAndroid' : 'native.plans.legal')), + el( + 'div', + { className: 'legal-links' }, + externalLink(t('native.plans.ourTerms'), CLOUD_TERMS_URL), + ...(onPlay ? [] : [externalLink(t('native.plans.termsShort'), STORE_TERMS_URL)]), + externalLink(t('native.plans.privacyShort'), PRIVACY_URL) + ) + ); + dock.append(restoreButton(offer, plans)); + } + foot.hidden = false; + paint(true); }; - - show( - el( - 'div', - {}, - ...columns( - [ - topbar(() => showCloud({ back: true })), - el('h1', { className: 'title-sm' }, t('native.plans.title')), - el('p', { className: 'sub' }, t('native.plans.sub')), - seg, - ], - [everyPlan, content, ctaBar, footer] - ) - ), - opts - ); void load(); } @@ -1041,7 +1128,8 @@ async function redeemPurchase( const data = typeof res.data === 'string' ? JSON.parse(res.data) : res.data; const body = (data ?? {}) as { instanceUrl?: string; code?: string; welcome?: string }; if ((res.status === 200 || res.status === 201) && typeof body.instanceUrl === 'string') { - const welcome = typeof body.welcome === 'string' && /^[A-Za-z0-9_-]{43}$/.test(body.welcome) ? body.welcome : undefined; + const welcome = + typeof body.welcome === 'string' && /^[A-Za-z0-9_-]{43}$/.test(body.welcome) ? body.welcome : undefined; return { ok: true, instanceUrl: body.instanceUrl, ...(welcome ? { welcome } : {}) }; } return { ok: false, code: body.code ?? 'redeem-failed' }; @@ -1053,48 +1141,50 @@ async function redeemPurchase( function showClaim( plan: CloudPlan, interval: 'month' | 'year', - price: string, + priceLabel: string, opts: { back?: boolean; bought?: Purchase } = {} ): void { /** A purchase that went through but whose redeem did not: a retry redeems it again instead of buying twice. */ let bought: Purchase | null = opts.bought ?? null; + // The address on the glass card, written as it is typed. + const slugShown = el('b', { className: 'ph' }, t('native.claim.slugPlaceholder')); + const caret = el('span', { className: 'caret', ariaHidden: 'true' }); + const card = glassCard(t('native.claim.addressLabel'), I.lock, [caret, slugShown, el('span', {}, cloudSuffix())]); + const slugInput = el('input', { type: 'text', - className: 'slug-input', autocapitalize: 'off', spellcheck: false, value: '', - placeholder: t('native.claim.addressLabel'), + placeholder: t('native.claim.slugPlaceholder'), }); slugInput.setAttribute('inputmode', 'url'); slugInput.setAttribute('autocomplete', 'off'); slugInput.setAttribute('maxlength', '40'); - slugInput.setAttribute('aria-label', t('native.claim.addressLabel')); slugInput.setAttribute('enterkeyhint', 'next'); + slugInput.dir = 'ltr'; + const free = el('span', { className: 'edge on', hidden: true }, icon(I.check, 12), t('native.claim.freeBadge')); + const slugNote = el('p', { className: 'note', role: 'status' }); // "name.liketrek.com" is one address, left to right in every language. - const slugField = el( - 'div', - { className: 'field slug-field', dir: 'ltr' }, - slugInput, - el('span', { className: 'slug-suffix' }, cloudSuffix()) - ); - const slugNote = el('p', { className: 'hint' }); + const slugField = field(t('native.claim.addressField'), slugInput, { + after: [el('em', { dir: 'ltr' }, cloudSuffix())], + edge: free, + below: [slugNote], + }); const emailInput = el('input', { type: 'email', value: '', autocapitalize: 'off', spellcheck: false, - placeholder: t('native.claim.emailLabel'), + placeholder: t('native.claim.emailPlaceholder'), }); emailInput.setAttribute('inputmode', 'email'); emailInput.setAttribute('autocomplete', 'email'); emailInput.setAttribute('enterkeyhint', 'next'); - emailInput.setAttribute('aria-label', t('native.claim.emailLabel')); emailInput.dir = 'ltr'; - emailInput.classList.add('ltr-value'); - const emailField = el('div', { className: 'field' }, emailInput); + const emailField = field(t('native.claim.emailLabel'), emailInput); // The password for the new TREK, chosen here so the buyer lands signed in (no password by mail). const passwordInput = el('input', { @@ -1102,40 +1192,38 @@ function showClaim( value: '', autocapitalize: 'off', spellcheck: false, - placeholder: t('native.claim.passwordLabel'), + placeholder: t('native.claim.passwordPlaceholder'), }); passwordInput.setAttribute('autocomplete', 'new-password'); passwordInput.setAttribute('enterkeyhint', 'go'); passwordInput.setAttribute('maxlength', '128'); - passwordInput.setAttribute('aria-label', t('native.claim.passwordLabel')); passwordInput.dir = 'ltr'; - passwordInput.classList.add('ltr-value'); - const passwordField = el('div', { className: 'field' }, passwordInput); - // Shown when the server's list knows the password, or on a send with a rule unmet. - const passwordHint = el('p', { className: 'hint', hidden: true }, t('native.claim.passwordHint')); - // The rules, each ticked off as it is met, rather than a paragraph to read. - const ruleLabels = { - // The number outside the words: it is always the same, and the word reads after it in every language. - length: `${PASSWORD_MIN_LENGTH}+ ${t('native.claim.ruleLength')}`, - upper: t('native.claim.ruleUpper'), - lower: t('native.claim.ruleLower'), - digit: t('native.claim.ruleDigit'), - special: t('native.claim.ruleSpecial'), - } as const; - const ruleItems = (Object.keys(ruleLabels) as (keyof typeof ruleLabels)[]).map((rule) => ({ - rule, - node: el('span', {}, icon(I.check, 13), ruleLabels[rule]), - })); - const passwordRules = el('div', { className: 'pw-rules' }, ...ruleItems.map((r) => r.node)); + const eye = el('button', { type: 'button', className: 'eye' }, icon(I.eye, 18)); + eye.setAttribute('aria-label', t('native.claim.showPassword')); + eye.addEventListener('click', (e) => { + e.preventDefault(); + passwordInput.type = passwordInput.type === 'password' ? 'text' : 'password'; + }); + // The length on the card's edge, the other rules beneath, each ticked off as it is met. + // The number outside the words: it is always the same, and the word reads after it in every language. + const lengthRule = el('span', { className: 'edge' }, `${PASSWORD_MIN_LENGTH}+ ${t('native.claim.ruleLength')}`); + const RULES = [ + { rule: 'upper', labelKey: 'native.claim.ruleUpper' }, + { rule: 'lower', labelKey: 'native.claim.ruleLower' }, + { rule: 'digit', labelKey: 'native.claim.ruleDigit' }, + { rule: 'special', labelKey: 'native.claim.ruleSpecial' }, + ] as const; + const ruleItems = RULES.map(({ rule, labelKey }) => ({ rule, node: el('span', {}, t(labelKey)) })); + const passwordField = field(t('native.claim.passwordLabel'), passwordInput, { + after: [eye], + edge: lengthRule, + below: [el('div', { className: 'rules' }, ...ruleItems.map((r) => r.node))], + }); const paintRules = () => { const states = passwordRuleStates(passwordInput.value); + lengthRule.classList.toggle('on', states.length); for (const { rule, node } of ruleItems) node.classList.toggle('met', states[rule]); }; - passwordInput.addEventListener('input', () => { - paintRules(); - passwordHint.hidden = true; - passwordHint.className = 'hint'; - }); // The § 327h agreement, asked on its own before anything is bought. let consent: DeviationsConsent | null = null; @@ -1145,7 +1233,7 @@ function showClaim( 'label', { className: 'consent' }, consentBox, - el('span', {}, el('strong', {}, t('native.claim.consentTitle')), ' ', consentText) + el('span', {}, el('strong', {}, t('native.claim.consentTitle')), consentText) ); const loadConsent = async (): Promise => { consentBox.checked = false; @@ -1158,53 +1246,57 @@ function showClaim( }; void loadConsent(); - const submit = el('button', { type: 'submit', className: 'btn' }, t('native.claim.subscribe', { price })); + const subscribeLabel = () => t('native.claim.subscribe', { price: priceLabel }); + const submit = el('button', { type: 'button', className: 'cta' }, subscribeLabel()); // What is about to be bought, so nobody pays for a plan they did not mean. - const change = el('button', { type: 'button', className: 'linkbtn' }, t('native.claim.change')); + const change = el('button', { type: 'button' }, t('native.claim.change')); change.addEventListener('click', () => { void tap(); showPlans({ back: true }); }); - const planSummary = el( + const planRow = el( 'div', - { className: 'claim-plan' }, - el('span', {}, el('b', {}, `TREK Cloud ${plan.name}`), el('bdi', { dir: 'ltr' }, price)), + { className: 'plan-row' }, + el('span', {}, el('b', {}, plan.name), el('small', { dir: 'ltr' }, `${priceLabel} ${per(interval)}`)), // A purchase already made is not a choice any more. ...(bought ? [] : [change]) ); - const error = el('p', { className: 'error', role: 'alert' }); + const error = notice(''); const form = el( 'form', - { className: 'form', noValidate: true }, + { className: 'pad form', noValidate: true }, + el('h1', { className: 'title' }, t('native.claim.almost')), + planRow, slugField, - slugNote, emailField, - el('p', { className: 'hint' }, t('native.claim.emailHint')), passwordField, - passwordRules, - passwordHint, // Our terms govern the instance (terms § 5a): named before the purchase, not only in the confirmation mail. el( 'p', - { className: 'note' }, + { className: 'agree' }, t('native.claim.agree'), ' ', externalLink(t('native.plans.ourTerms'), CLOUD_TERMS_URL) ), consentField, - el( - 'div', - { className: 'trust' }, - el('span', {}, icon(I.globe, 15), t('native.claim.trustServers')), - el('span', {}, icon(I.check, 15), t('native.claim.trustCancel')), - el('span', {}, icon(I.shield, 15), t('native.claim.trustNoAds')) - ), - submit, error ); - // "Next" moves on to the next field instead of sending the form half filled; - // "Go" on the password sends it. + show( + 'tall', + chosenCamera, + { + back: () => showPlans({ back: true }), + overlay: [card.node], + content: [ + form, + el('div', { className: 'dock' }, submit, el('p', { className: 'fine' }, t('native.claim.renews'))), + ], + }, + opts + ); + + // "Next" moves on to the next field instead of sending the form half filled; "Go" on the password sends it. const nextOnEnter = (from: HTMLInputElement, to: HTMLInputElement) => from.addEventListener('keydown', (e) => { if (e.key !== 'Enter' || e.isComposing) return; @@ -1213,11 +1305,18 @@ function showClaim( }); nextOnEnter(slugInput, emailInput); nextOnEnter(emailInput, passwordInput); + passwordInput.addEventListener('keydown', (e) => { + if (e.key !== 'Enter' || e.isComposing) return; + e.preventDefault(); + submit.click(); + }); + + slugInput.addEventListener('focus', () => card.node.classList.add('typing')); + slugInput.addEventListener('blur', () => card.node.classList.remove('typing')); let status: SlugStatus | null = null; let timer: ReturnType | undefined; const noteFor: Partial> = { - available: t('native.claim.free'), taken: t('native.claim.taken'), invalid: t('native.claim.invalid'), reserved: t('native.claim.reserved'), @@ -1225,39 +1324,31 @@ function showClaim( slugInput.addEventListener('input', () => { clearTimeout(timer); status = null; + free.hidden = true; slugNote.textContent = ''; - slugNote.className = 'hint'; - slugField.classList.remove('bad'); const value = slugInput.value.trim().toLowerCase(); + slugShown.textContent = value || t('native.claim.slugPlaceholder'); + slugShown.classList.toggle('ph', !value); + if (value) slugShown.after(caret); + else slugShown.before(caret); + card.fit(); if (value.length < 3) return; timer = setTimeout(async () => { const result = await slugStatus(value); if (slugInput.value.trim().toLowerCase() !== value) return; status = result; - slugNote.className = `hint ${result === 'available' ? 'ok' : result === 'error' ? '' : 'bad'}`; - if (result === 'available') { - // The address as it will be, the moment it is theirs to take. - slugNote.className = 'hint ok slug-free'; - slugNote.replaceChildren( - icon(I.check, 16), - el('bdi', { dir: 'ltr' }, `${value}${cloudSuffix()}`), - el('small', {}, noteFor.available ?? '') - ); - return; - } + free.hidden = result !== 'available'; slugNote.textContent = noteFor[result] ?? ''; }, 350); }); + passwordInput.addEventListener('input', () => { + paintRules(); + setNotice(error, ''); + }); + card.fit(); - const shake = (field: HTMLElement): void => { - void notify(NotificationType.Error); - field.classList.add('bad'); - setTimeout(() => field.classList.remove('bad'), 350); - }; - - form.addEventListener('submit', async (event) => { - event.preventDefault(); - error.textContent = ''; + submit.addEventListener('click', async () => { + setNotice(error, ''); const slug = slugInput.value.trim().toLowerCase(); const email = emailInput.value.trim(); if (slug.length < 3 || status === 'taken' || status === 'invalid' || status === 'reserved') { @@ -1274,22 +1365,19 @@ function showClaim( const password = passwordInput.value; if (passwordProblem(password) || password.length > 128) { shake(passwordField); - passwordHint.hidden = false; - passwordHint.className = 'hint bad'; + setNotice(error, t('native.claim.passwordHint')); passwordInput.focus(); return; } - passwordHint.hidden = true; - passwordHint.className = 'hint'; // Nothing is bought without the agreement on the text the server holds today. if (!consent && !(await loadConsent())) { shake(consentField); - error.textContent = t('native.claim.consentUnavailable'); + setNotice(error, t('native.claim.consentUnavailable')); return; } if (!consentBox.checked) { shake(consentField); - error.textContent = t('native.claim.consentRequired'); + setNotice(error, t('native.claim.consentRequired')); consentBox.focus(); return; } @@ -1306,28 +1394,28 @@ function showClaim( submit.disabled = on; }; lock(true); - submit.replaceChildren(el('span', { className: 'spinner' }), t('native.connect.checking')); + submit.replaceChildren(el('span', { className: 'spin' }), t('native.connect.checking')); const restore = () => { lock(false); - submit.replaceChildren(t('native.claim.subscribe', { price })); + submit.replaceChildren(subscribeLabel()); }; if (!bought) { const outcome = await iap.purchase(productIdFor(plan.id, interval)); if (outcome.kind === 'cancelled') { restore(); - error.textContent = t('native.claim.cancelled'); + setNotice(error, t('native.claim.cancelled')); return; } if (outcome.kind === 'pending') { restore(); - error.textContent = t('native.claim.pending'); + setNotice(error, t('native.claim.pending')); return; } if (outcome.kind === 'failed') { void notify(NotificationType.Error); restore(); - error.textContent = t('native.claim.failed'); + setNotice(error, t('native.claim.failed')); return; } if (outcome.kind === 'subscribed') { @@ -1347,42 +1435,53 @@ function showClaim( restore(); if (redeemed.code === 'slug-taken') { shake(slugField); + free.hidden = true; slugNote.textContent = t('native.claim.taken'); - slugNote.className = 'hint bad'; } else if (redeemed.code === 'consent-outdated' || redeemed.code === 'consent-deviations') { // The text changed since it was shown: the purchase waits, unredeemed, for the agreement on today's. await loadConsent(); shake(consentField); - error.textContent = t('native.claim.consentChanged'); + setNotice(error, t('native.claim.consentChanged')); } else if (redeemed.code === 'password-weak') { // A common password the list on the server knows: the purchase waits, unredeemed, for a better one. shake(passwordField); - passwordHint.hidden = false; - passwordHint.className = 'hint bad'; + setNotice(error, t('native.claim.passwordHint')); } else { - error.textContent = refundedBeforeOpening(redeemed.code, onPlay) - ? t('native.claim.closedRefund') - : t('native.claim.redeemFailed'); + setNotice( + error, + refundedBeforeOpening(redeemed.code, onPlay) ? t('native.claim.closedRefund') : t('native.claim.redeemFailed') + ); } }); +} - show( - el( - 'div', - { className: 'screen-quiet' }, - ...columns( - [ - topbar(() => showPlans({ back: true })), - el('h1', { className: 'title-sm' }, t('native.claim.title')), - el('p', { className: 'sub' }, t('native.claim.sub')), - planSummary, - ], - [form] - ) - ), - opts - ); - requestAnimationFrame(() => slugInput.focus()); +// ── States of their own ───────────────────────────────────────────────────── +/** A screen that says where things stand: the landscape, the card, a title, what to do. */ +function stateScreen(o: { + camera: Camera; + kicker: string; + glyph: string; + host: string; + tone?: 'ok' | 'bad'; + busy?: boolean; + title: string; + text: string; + extra?: Node[]; + dock: Node[]; + back?: () => void; +}): { screen: Screen; card: GlassCard; title: HTMLElement; text: HTMLElement; dock: HTMLElement } { + const card = glassCard(o.kicker, o.glyph, [el('b', {}, o.host)]); + setKicker(card, o.kicker, { tone: o.tone, busy: o.busy }); + const title = el('h1', { className: 'title' }, o.title); + const text = el('p', { className: 'sub' }, o.text); + const dock = el('div', { className: 'dock' }, ...o.dock); + const screen = show('tall', o.camera, { + back: o.back, + overlay: [card.node], + content: [el('div', { className: 'pad form' }, title, text, ...(o.extra ?? [])), dock], + }); + card.fit(); + return { screen, card, title, text, dock }; } /** @@ -1394,12 +1493,12 @@ function showClaim( */ function showSubscribed(): void { void notify(NotificationType.Warning); - const status = el('p', { className: 'hint', role: 'status' }); - const open = el('button', { type: 'button', className: 'btn' }, t('native.subscribed.open')); + const status = el('p', { className: 'status-line', role: 'status' }); + const open = el('button', { type: 'button', className: 'cta' }, t('native.subscribed.open')); open.addEventListener('click', async () => { void tap(ImpactStyle.Medium); open.disabled = true; - status.className = 'hint'; + status.className = 'status-line'; status.textContent = t('native.plans.restoring'); const purchase = await iap.restore(); const redeemed = purchase ? await redeemPurchase('', '', purchase) : null; @@ -1410,52 +1509,93 @@ function showSubscribed(): void { } void notify(NotificationType.Error); open.disabled = false; - status.className = 'hint bad'; + status.className = 'status-line bad'; status.textContent = t('native.plans.restoreFailed'); }); - const manage = externalLink(t('native.subscribed.manage'), onPlay ? PLAY_SUBSCRIPTIONS_URL : APP_STORE_SUBSCRIPTIONS_URL); - show( - el( - 'div', - {}, - ...columns( - [ - topbar(() => showPlans({ back: true })), - el('h1', { className: 'title-sm' }, t('native.subscribed.title')), - el('p', { className: 'sub' }, t(onPlay ? 'native.subscribed.textAndroid' : 'native.subscribed.text')), - ], - [open, status, el('div', { className: 'foot-links' }, manage)] - ) - ) + const manage = externalLink( + t('native.subscribed.manage'), + onPlay ? PLAY_SUBSCRIPTIONS_URL : APP_STORE_SUBSCRIPTIONS_URL, + 'cta2' ); + stateScreen({ + camera: cameraForPlan(0), + kicker: t('native.subscribed.kicker'), + glyph: I.cloud, + host: 'TREK Cloud', + tone: 'ok', + title: t('native.subscribed.title'), + text: t(onPlay ? 'native.subscribed.textAndroid' : 'native.subscribed.text'), + extra: [status], + dock: [open, manage], + back: () => showPlans({ back: true }), + }); } -/** The build runs on the server; the app waits on the new address and loads it the moment it answers. */ -function showProvisioning(instanceUrl: string, welcome?: string): void { - const host = (() => { - try { - return new URL(instanceUrl).host; - } catch { - return instanceUrl; - } - })(); +function hostOf(url: string): string { + try { + return new URL(url).host; + } catch { + return url; + } +} - const spinner = el('div', { className: 'provision-mark' }, el('span', { className: 'spinner' })); - show( - el( - 'div', - { className: 'screen-center' }, - spinner, - el('h1', { className: 'title-sm' }, t('native.provisioning.title')), - el('p', { className: 'sub' }, t('native.provisioning.sub', { host })) - ) +/** + * The build runs on the server; the app waits on the new address, ticks off + * the steps, and opens it once it answers: "Arrived", then on to the trip. + */ +function showProvisioning(instanceUrl: string, welcome?: string): void { + const host = hostOf(instanceUrl); + const stepServer = el('span', {}, t('native.provisioning.stepServer')); + const stepReady = el('span', {}, t('native.provisioning.stepReady')); + const steps = el( + 'div', + { className: 'steps' }, + el('span', { className: 'on' }, t('native.provisioning.stepAddress')), + stepServer, + stepReady ); + const sub = el('span', {}); + sub.append( + ...t('native.provisioning.sub', { host: '\u0000' }) + .split('\u0000') + .flatMap((part, i) => (i ? [el('b', { dir: 'ltr' }, host), part] : [part])) + ); + const view = stateScreen({ + camera: chosenCamera, + kicker: t('native.provisioning.kicker'), + glyph: I.lock, + host, + busy: true, + title: t('native.provisioning.title'), + text: '', + extra: [steps], + dock: [], + }); + view.text.replaceChildren(sub); + setTimeout(() => stepServer.classList.add('on'), 1300); + + const ready = async (url: string) => { + stepServer.classList.add('on'); + stepReady.classList.add('on'); + void notify(NotificationType.Success); + setKicker(view.card, t('native.provisioning.stepReady'), { tone: 'ok' }); + view.title.textContent = t('native.provisioning.readyTitle'); + view.text.textContent = t('native.provisioning.readySub'); + const go = el('button', { type: 'button', className: 'cta' }, t('native.provisioning.open')); + go.addEventListener('click', () => { + void tap(ImpactStyle.Medium); + go.disabled = true; + void connected(url, [], welcome); + }); + view.dock.replaceChildren(go); + }; const deadline = Date.now() + 180_000; const poll = async (): Promise => { + if (!view.screen.node.isConnected) return; const result = await probeServer(instanceUrl, get); if (result.ok) { - await connected(result.url, [], welcome); + await ready(result.url); return; } if (Date.now() > deadline) { @@ -1469,26 +1609,25 @@ function showProvisioning(instanceUrl: string, welcome?: string): void { function showProvisioningSlow(instanceUrl: string, welcome?: string): void { void notify(NotificationType.Warning); - const retry = el('button', { type: 'button', className: 'btn' }, t('native.provisioning.retry')); + const retry = el('button', { type: 'button', className: 'cta' }, t('native.provisioning.retry')); retry.addEventListener('click', () => { void tap(); showProvisioning(instanceUrl, welcome); }); - show( - el( - 'div', - { className: 'screen-center' }, - el('h1', { className: 'title-sm' }, t('native.provisioning.failedTitle')), - el('p', { className: 'sub' }, t('native.provisioning.failedSub')), - retry - ) - ); + stateScreen({ + camera: cameraForPlan(3), + kicker: t('native.provisioning.failedTitle'), + glyph: I.clock, + host: hostOf(instanceUrl), + title: t('native.provisioning.failedTitle'), + text: t('native.provisioning.failedSub'), + dock: [retry], + }); } -// ── Shared actions ────────────────────────────────────────────────────────── async function runDemo(button: HTMLButtonElement, error?: HTMLElement): Promise { void tap(); - if (error) error.textContent = ''; + if (error) setNotice(error, ''); button.disabled = true; const result = await probeDemo(get); if (result.ok) { @@ -1497,42 +1636,20 @@ async function runDemo(button: HTMLButtonElement, error?: HTMLElement): Promise< } button.disabled = false; if (error) { - error.textContent = failureMessage(result.reason); + setNotice(error, failureMessage(result.reason)); } else { void notify(NotificationType.Error); } } /** - * The tick, then the server takes over. A beat so the success registers. With a - * welcome code (a purchase with a chosen password) the app opens the instance's - * welcome page once, which signs the buyer in; an app build without that option - * opens the sign-in page instead, where the chosen password works. + * The server takes over: a beat so the success registers, then the web view goes + * there. With a welcome code (a purchase with a chosen password) the app opens + * the instance's welcome page once, which signs the buyer in; an app build + * without that option opens the sign-in page instead, where the chosen password works. */ async function connected(url: string, signInHosts: string[] = [], welcome?: string): Promise { void notify(NotificationType.Success); - const host = (() => { - try { - return new URL(url).host; - } catch { - return url; - } - })(); - const tick = el('div', { className: 'tick' }); - const svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg'); - svg.setAttribute('viewBox', '0 0 24 24'); - svg.setAttribute('fill', 'none'); - svg.setAttribute('stroke', 'currentColor'); - svg.setAttribute('stroke-width', '2.5'); - svg.setAttribute('stroke-linecap', 'round'); - svg.setAttribute('stroke-linejoin', 'round'); - const p = document.createElementNS('http://www.w3.org/2000/svg', 'path'); - p.setAttribute('d', I.check); - svg.appendChild(p); - tick.appendChild(svg); - show( - el('div', { className: 'success' }, tick, el('h1', { className: 'title-sm' }, t('native.connecting', { host }))) - ); await new Promise((r) => setTimeout(r, 700)); await TrekShell.setServer({ url, @@ -1547,58 +1664,52 @@ async function connected(url: string, signInHosts: string[] = [], welcome?: stri } function showUnreachable(server: string, cert?: ClientCertDemand, failure?: string): void { - const certPanel = el('div', { className: 'gate', role: 'alert', hidden: true }); - if (cert) fillCertPanel(certPanel, cert, () => void TrekShell.reload()); - const retry = el('button', { type: 'button', className: cert ? 'linkbtn' : 'btn' }, t('native.offline.retry')); + const host = hostOf(server); + const panel = el('div', { className: 'panel', role: 'alert', hidden: true }); + if (cert) fillCertPanel(panel, cert, () => void TrekShell.reload()); + const retry = el('button', { type: 'button', className: cert ? 'cta2' : 'cta' }, t('native.offline.retry')); retry.addEventListener('click', () => { void tap(); retry.disabled = true; + retry.replaceChildren(el('span', { className: 'spin' }), t('native.connect.checking')); void TrekShell.reload(); }); - const change = el('button', { type: 'button', className: 'linkbtn' }, t('native.changeServer')); + const change = el('button', { type: 'button', className: 'link' }, t('native.changeServer')); change.addEventListener('click', () => { void tap(); void TrekShell.resetServer(); }); - show( - el( - 'div', - {}, - ...columns( - [ - el('img', { src: logoUrl, alt: '', className: 'shell-logo' }), - el('h1', { className: 'title-sm' }, cert ? t('native.cert.unreachableTitle') : t('native.offline.title')), - el( - 'p', - { className: 'sub' }, - cert - ? t('native.cert.unreachableHint', { server: new URL(server).host }) - : t('native.offline.hint', { server: new URL(server).host }) - ), - ], - [ - certPanel, - retry, - change, - // The cause in the web view's own terms, small: what a report needs, not a second message. - ...(failure ? [el('p', { className: 'diag', dir: 'ltr' }, failure.slice(0, 120))] : []), - footLinks(), - ] - ) - ) - ); + stateScreen({ + camera: cameraForPlan(2), + kicker: cert ? t('native.cert.unreachableTitle') : t('native.connect.kickerUnreachable'), + glyph: cert ? I.key : I.wifiOff, + host, + tone: 'bad', + title: cert ? t('native.cert.unreachableTitle') : t('native.offline.title'), + text: cert ? t('native.cert.unreachableHint', { server: host }) : t('native.offline.hint', { server: host }), + extra: cert ? [panel] : [], + dock: [ + retry, + change, + // The cause in the web view's own terms, small: what a report needs, not a second message. + ...(failure ? [el('p', { className: 'diag', dir: 'ltr' }, failure.slice(0, 120))] : []), + ], + }); } // ── Start ─────────────────────────────────────────────────────────────────── /** - * The address screen is always on the near-black surface, so the status bar must - * draw its clock and icons in light. The server's UI sets its own style once it - * loads (native/nativeApp.ts); this is only for the screen the app ships. Fails - * quietly where there is no status bar (web, the simulator without the plugin). + * On a phone the status bar sits on the landscape's sea, which a soft shade at + * the top keeps dark: light clock and icons. On a wide screen it also crosses + * the light column beside the landscape, where light icons would vanish, so the + * first screens hide it there. The server's UI sets its own style once it loads + * (native/nativeApp.ts). Fails quietly where there is no status bar. */ async function paintStatusBar(): Promise { try { await StatusBar.setStyle({ style: Style.Dark }); + if (wideLayout.matches) await StatusBar.hide(); + else await StatusBar.show(); } catch { /* web / unavailable: no native status bar to style */ } @@ -1611,7 +1722,7 @@ async function paintStatusBar(): Promise { function followBackGesture(): void { try { void App.addListener('backButton', () => { - const back = current?.querySelector('.topbar .back'); + const back = current?.querySelector('.back'); if (back) back.click(); else void App.minimizeApp(); }); @@ -1623,29 +1734,41 @@ function followBackGesture(): void { /** * The keyboard closes the ways it does in an iOS app: a tap beside the fields, * or a drag of the screen. A web view keeps it open for both, and on the claim - * screen the keyboard covered the hints and the terms with no way to put it away. + * screen the keyboard covered the terms with no way to put it away. */ function letKeyboardClose(): void { const isField = (target: EventTarget | null) => - target instanceof Element && !!target.closest('input, textarea, select, [contenteditable="true"], .field'); + target instanceof Element && !!target.closest('input, textarea, select, [contenteditable="true"], .fld'); const close = () => { const active = document.activeElement; if (active instanceof HTMLElement && isField(active)) active.blur(); }; - document.addEventListener('pointerdown', (e) => { - if (!isField(e.target)) close(); - }, true); + document.addEventListener( + 'pointerdown', + (e) => { + if (!isField(e.target)) close(); + }, + true + ); let startY: number | null = null; - document.addEventListener('touchstart', (e) => { - startY = isField(e.target) ? null : (e.touches[0]?.clientY ?? null); - }, { passive: true }); - document.addEventListener('touchmove', (e) => { - const y = e.touches[0]?.clientY; - if (startY !== null && y !== undefined && Math.abs(y - startY) > 10) { - startY = null; - close(); - } - }, { passive: true }); + document.addEventListener( + 'touchstart', + (e) => { + startY = isField(e.target) ? null : (e.touches[0]?.clientY ?? null); + }, + { passive: true } + ); + document.addEventListener( + 'touchmove', + (e) => { + const y = e.touches[0]?.clientY; + if (startY !== null && y !== undefined && Math.abs(y - startY) > 10) { + startY = null; + close(); + } + }, + { passive: true } + ); } /** @@ -1667,6 +1790,7 @@ async function certificateDemand(server: string): Promise { void paintStatusBar(); + wideLayout.addEventListener('change', () => void paintStatusBar()); followBackGesture(); letKeyboardClose(); let url: string | null; diff --git a/client/native-shell/scenery.ts b/client/native-shell/scenery.ts new file mode 100644 index 000000000..89a4dea47 --- /dev/null +++ b/client/native-shell/scenery.ts @@ -0,0 +1,585 @@ +/** + * The landscape behind the first screens of the app: one world seen from above, + * an island out at sea, the coast with its town, the farmland behind it and the + * mountains at the back. A fragment shader draws it every frame (water, surf, + * boats, a car on the road), so it is never a photo and never the same twice. + * + * The plan picker moves the camera through that world, one place per plan, so + * choosing reads as travelling further inland. The scenes are framed for a phone + * 390 px wide: a wider or taller box (iPad, an unfolded phone) shows more of the + * world around the same centre. + * + * Kept light for the phone it runs on: the device pixel ratio is capped at 2, + * the picture drops to a lower resolution when frames come slow, the loop stops + * while the app is in the background or the canvas has left the page, and with + * reduced motion it is one still frame. Without WebGL the box keeps its plain + * sea colour from the stylesheet. + */ + +/** Where the camera stands for a place, in world pixels, for a 390 px frame. */ +export type Camera = readonly [number, number]; +export const WELCOME_CAMERA: Camera = [0, 0]; +/** One place per plan, in the order the plans come: island, coast, farmland, mountains. */ +const PLAN_CAMERAS: readonly Camera[] = [ + [62, -392], + [0, 24], + [60, 290], + [70, 660], +]; +export function cameraForPlan(index: number): Camera { + return PLAN_CAMERAS[Math.max(0, Math.min(PLAN_CAMERAS.length - 1, index))]; +} + +const FRAME_WIDTH = 390; + +const FRAGMENT = ` + precision highp float; + uniform vec2 uRes; uniform float uDpr; uniform float uT; uniform vec2 uCam; uniform float uHaze; + float coast(float x) { return 128.0 + 12.0 * sin(x * 0.018 + 0.6) + 7.0 * sin(x * 0.051 + 2.1) + 4.0 * sin(x * 0.11); } + float riverX(float y) { return 168.0 - (y - 120.0) * 0.30 + 9.0 * sin(y * 0.035 + 0.8) + 4.0 * sin(y * 0.09); } + float hash(vec2 p) { return fract(sin(dot(p, vec2(127.1, 311.7))) * 43758.5453); } + vec2 hash2(vec2 p) { return fract(sin(vec2(dot(p, vec2(127.1, 311.7)), dot(p, vec2(269.5, 183.3)))) * 43758.5453); } + float noise(vec2 p) { vec2 i = floor(p), f = fract(p); vec2 u = f * f * (3.0 - 2.0 * f); + return mix(mix(hash(i), hash(i + vec2(1, 0)), u.x), mix(hash(i + vec2(0, 1)), hash(i + vec2(1, 1)), u.x), u.y); } + float fbm(vec2 p) { float v = 0.0, a = 0.5; for (int i = 0; i < 5; i++) { v += a * noise(p); p = p * 2.03 + vec2(1.7, 9.2); a *= 0.5; } return v; } + float fbm3(vec2 p) { float v = 0.0, a = 0.5; for (int i = 0; i < 3; i++) { v += a * noise(p); p = p * 2.03 + vec2(1.7, 9.2); a *= 0.5; } return v; } + float wave(vec2 p, float t) { + return 0.55 * sin(dot(p, vec2(0.040, 0.085)) - t * 1.10) + 0.35 * sin(dot(p, vec2(-0.070, 0.050)) - t * 1.45) + + 0.22 * sin(dot(p, vec2(0.110, 0.130)) - t * 2.10) + 0.12 * sin(dot(p, vec2(-0.170, 0.190)) - t * 2.90) + + 0.90 * fbm(p * 0.055 + vec2(t * 0.18, t * 0.32)); + } + float ridged(vec2 p) { float v = 0.0, a = 0.5; for (int i = 0; i < 5; i++) { float n = 1.0 - abs(noise(p) * 2.0 - 1.0); v += a * n * n; p = p * 2.07 + vec2(3.1, 1.7); a *= 0.5; } return v; } + /* Height: gentle near the shore, sharp ridges further inland. */ + float peaks(vec2 p) { float v = 0.0, a = 0.55; for (int i = 0; i < 7; i++) { v += a * (1.0 - abs(noise(p) * 2.0 - 1.0)); p = p * 2.13 + vec2(1.3, 4.7); a *= 0.5; } return v; } + float ground(vec2 p) { + float inland = smoothstep(10.0, 170.0, p.y - coast(p.x)); + return fbm(p * 0.011) * 0.4 + ridged(p * 0.014 + 5.0) * 1.15 * inland + fbm3(p * 0.06) * 0.08; + } + /* The island out at sea: signed distance to its shore in px (> 0 on land), + a round main body with an uneven coast and a headland to the east. */ + float islD(vec2 p) { + vec2 q = (p - vec2(230.0, -250.0)) / vec2(1.5, 1.0); + float r = length(q); + float rad = 66.0 + 46.0 * (fbm(q * 0.016 + 4.0) - 0.5) + 30.0 * (fbm(q * 0.045 + 8.0) - 0.5) + 10.0 * (fbm(p * 0.09) - 0.5); + vec2 q2 = (p - vec2(372.0, -222.0)) / vec2(1.6, 1.0); + float head = 15.0 + 10.0 * (fbm(p * 0.04 + 9.0) - 0.5) - length(q2); + return max(rad - r, head); + } + float islH(vec2 p) { + float s = islD(p); + return smoothstep(0.0, 60.0, s) * (0.5 + 0.7 * fbm(p * 0.018 + 2.0)) + ridged(p * 0.03) * 0.22 * smoothstep(8.0, 50.0, s); + } + /* Trees: one per cell at most, a round crown of varying size. Returns the + crown's cover (0..1) and how far from its centre, for the shading. */ + vec3 tree(vec2 p, float cell) { + vec2 c = floor(p / cell); + float best = 9.0; vec2 off = vec2(0.0); float sz = 0.0; + for (int j = -1; j <= 1; j++) for (int i = -1; i <= 1; i++) { + vec2 g = c + vec2(float(i), float(j)); + vec2 h = hash2(g); + vec2 o = (g + 0.15 + 0.7 * h) * cell; + float r = cell * (0.38 + 0.22 * hash(g + 3.1)); + float d = length(p - o) / r; + if (d < best) { best = d; off = (p - o) / r; sz = r; } + } + return vec3(1.0 - smoothstep(0.86, 1.0, best), off); + } + /* A Mediterranean town: one house per cell, a rectangle turned the way + the lane runs there (the direction drifts across town, so lanes curve), + sized at random and packed close. Whitewashed cubes with a parapet and + now and then a water tank, pastel walls, terracotta roofs pitched along + the long side, and the odd blue dome. */ + float town(vec2 p, out vec3 roof, out vec2 hid) { + float cell = 9.0; + vec2 c = floor(p / cell); + roof = vec3(0.0); + hid = c; + float got = 0.0; + for (int j = -1; j <= 1; j++) for (int i = -1; i <= 1; i++) { + vec2 g = c + vec2(float(i), float(j)); + if (hash(g + 2.7) < 0.07) continue; + vec2 o = (g + 0.5 + 0.35 * (hash2(g) - 0.5)) * cell; + float ang = (noise(o * 0.018) - 0.5) * 2.4 + (hash(g + 7.7) - 0.5) * 0.25; + vec2 cs = vec2(cos(ang), sin(ang)); + vec2 rel = p - o; + vec2 l = vec2(dot(rel, cs), dot(rel, vec2(-cs.y, cs.x))); + vec2 hs = cell * vec2(0.36 + 0.16 * hash(g + 1.3), 0.27 + 0.14 * hash(g + 4.1)); + if (abs(l.x) < hs.x && abs(l.y) < hs.y) { + float k = hash(g + 5.3); + vec3 col = k < 0.44 ? vec3(0.96, 0.95, 0.91) : k < 0.68 ? vec3(0.80, 0.46, 0.32) : k < 0.80 ? vec3(0.93, 0.79, 0.56) : k < 0.90 ? vec3(0.94, 0.75, 0.67) : vec3(0.88, 0.86, 0.80); + float rim = min(hs.x - abs(l.x), hs.y - abs(l.y)); + if (k >= 0.44 && k < 0.68) { + // pitched roof: the ridge runs along the long side, one slope lit, one shaded + float lit = dot(vec2(-cs.y, cs.x), vec2(-0.67, -0.73)) * sign(l.y); + col *= lit > 0.0 ? 1.08 : 0.80; + col *= 0.95 + 0.05 * sin(l.x * 3.6); + col *= 1.0 - 0.25 * (1.0 - smoothstep(0.0, 0.5, abs(l.y))); + } else { + // flat roof: a parapet round the edge, a water tank on some + col *= 1.0 - 0.13 * (1.0 - smoothstep(0.4, 1.1, rim)); + vec2 tk = vec2(hs.x * 0.45, -hs.y * 0.35); + if (hash(g + 6.2) < 0.35 && length(l - tk) < 0.95) col = vec3(0.45, 0.47, 0.50) + 0.25 * step(0.0, -(l - tk).x - (l - tk).y); + if (k < 0.44 && hash(g + 4.4) < 0.08 && length(l) < min(hs.x, hs.y) * 0.85) { + col = mix(vec3(0.12, 0.30, 0.64), vec3(0.58, 0.76, 0.98), clamp(0.55 - dot(rel / (min(hs.x, hs.y) * 0.85), vec2(-0.67, -0.73)) * 0.6, 0.0, 1.0)); + } + } + col *= 0.93 + 0.1 * hash(g + 9.9); + roof = col; + hid = g; + got = 1.0; + } + } + return got; + } + void main() { + vec2 sp = vec2(gl_FragCoord.x, uRes.y - gl_FragCoord.y) / uDpr; + vec2 p = sp + uCam; + float t = uT; + vec3 L = normalize(vec3(-0.55, -0.6, 0.62)); + float d = coast(p.x) - p.y; // > 0 at sea, < 0 inland, in px + float wash = 6.0 + 4.0 * sin(t * 1.2 + p.x * 0.045) + 3.0 * fbm3(vec2(p.x * 0.08, t * 0.6)); + vec3 col; + if (d > -2.0) { + /* ── sea ── */ + float e = 0.9, h = wave(p, t); + vec3 n = normalize(vec3(-(wave(p + vec2(e, 0.0), t) - h) * 1.6, -(wave(p + vec2(0.0, e), t) - h) * 1.6, 1.0)); + float depth = smoothstep(0.0, 120.0, d); + col = mix(vec3(0.47, 0.83, 0.82), vec3(0.17, 0.58, 0.72), smoothstep(0.0, 0.45, depth)); + col = mix(col, vec3(0.07, 0.33, 0.55), smoothstep(0.45, 1.0, depth)); + col *= 0.78 + 0.32 * clamp(dot(n, -vec3(L.x, L.y, -L.z)), 0.0, 1.0); + vec3 Ls = normalize(vec3(0.45, -0.55, 0.70)); + vec3 R = reflect(-Ls, n); + col += vec3(1.0, 0.97, 0.9) * (pow(clamp(R.z, 0.0, 1.0), 90.0) * 0.45 + pow(clamp(R.z, 0.0, 1.0), 900.0) * step(0.55, noise(p * 0.6 + t * 2.0)) * 1.4); + float ca = pow(1.0 - abs(sin(fbm(p * 0.09 + vec2(t * 0.35, -t * 0.25)) * 9.0)), 6.0); + col += vec3(0.85, 1.0, 0.95) * ca * 0.22 * (1.0 - smoothstep(0.0, 40.0, d)); + float runs = smoothstep(0.82, 1.0, sin(d * 0.32 + t * 2.2 + fbm3(p * 0.05) * 3.0)) * (1.0 - smoothstep(6.0, 46.0, d)); + float lace = smoothstep(0.45, 0.75, fbm3(p * 0.22 + vec2(t * 0.5, 0.0))); + float foam = max(1.0 - smoothstep(wash - 4.0, wash + 3.0, d), runs * lace * 0.8); + col = mix(col, vec3(0.97, 0.99, 1.0), clamp(foam, 0.0, 1.0) * 0.92); + // boats crossing, each in a lane of its own (46 px apart, wider than any + // wake), at a speed that swells and eases but never turns back + for (int k = 0; k < 2; k++) { + float fk = float(k); + float dir = fk < 0.5 ? 1.0 : -1.0; + float speed = 10.0 + fk * 4.0; + float run = speed * t + 14.0 * sin(t * 0.23 + fk * 2.0) + 6.0 * sin(t * 0.61 + fk * 4.0); + float lane = 36.0 + fk * 46.0; + float drift = 2.6 * sin(t * 0.31 + fk * 1.7); + vec2 bp = vec2(mod(fk * 190.0 + run * dir, 480.0) - 45.0, lane + drift); + float yaw = 2.6 * 0.31 * cos(t * 0.31 + fk * 1.7) / speed; + vec2 q = p - bp; + q = vec2(q.x * dir, q.y); + q = vec2(q.x + yaw * q.y, q.y - yaw * q.x); + float back = -q.x; + float open = 0.29 + 0.05 * sin(t * 1.3 + fk * 3.0 + back * 0.05); + float spread = back * open; + float churn = smoothstep(0.25, 0.65, noise(vec2(back * 0.35 - t * 1.6, q.y * 0.45 + fk * 7.0))); + float edgeW = 0.7 + 0.8 * noise(vec2(back * 0.2 + fk * 3.0, t * 0.8)); + float fade = step(0.0, back) * (1.0 - smoothstep(8.0, 64.0, back)); + float wake = (1.0 - smoothstep(edgeW * 0.6, edgeW * 1.8, abs(abs(q.y) - spread))) * fade * (0.55 + 0.45 * churn); + wake += (1.0 - smoothstep(0.0, 2.4, abs(q.y))) * step(0.0, back) * (1.0 - smoothstep(4.0, 30.0, back)) * 0.7 * churn; + col = mix(col, vec3(0.96, 0.98, 1.0), clamp(wake, 0.0, 1.0) * 0.78); + float hull = length(q / vec2(6.5, 2.4)); + col = mix(col, vec3(0.20, 0.30, 0.40), (1.0 - smoothstep(1.0, 1.5, length((q - vec2(-1.0, 1.4)) / vec2(6.5, 2.4)))) * 0.25); + col = mix(col, mix(vec3(0.98), vec3(0.80, 0.82, 0.85), step(0.0, q.y)), 1.0 - smoothstep(0.92, 1.0, hull)); + col = mix(col, vec3(0.55, 0.36, 0.24), 1.0 - smoothstep(0.9, 1.0, length((q - vec2(-1.0, 0.0)) / vec2(2.4, 1.2)))); + } + // the island: a shelf of shallow water, a reef, surf, a beach, a wooded hill + if (abs(p.y + 250.0) < 175.0 && abs(p.x - 265.0) < 310.0) { + float sI = islD(p); + if (sI < 0.0) { + float sd = -sI; + float shelf = 1.0 - smoothstep(4.0, 78.0, sd); + float ripple = 0.5 + 0.5 * sin(dot(p, vec2(0.42, 0.25)) + fbm(p * 0.05) * 6.0); + vec3 sh = mix(vec3(0.13, 0.52, 0.66), vec3(0.40, 0.83, 0.81), smoothstep(62.0, 10.0, sd)); + sh = mix(sh, vec3(0.80, 0.86, 0.74), smoothstep(26.0, 0.0, sd) * 0.4); + sh *= 0.95 + 0.08 * ripple * smoothstep(50.0, 4.0, sd); + float swell = sin(sd * 0.3 + t * 1.8 + fbm3(p * 0.03) * 4.0); + sh *= 1.0 + 0.09 * swell * smoothstep(70.0, 20.0, sd) * smoothstep(0.0, 8.0, sd); + float reef = smoothstep(0.57, 0.68, fbm(p * 0.045 + 13.0)) * smoothstep(12.0, 22.0, sd) * (1.0 - smoothstep(46.0, 60.0, sd)); + sh = mix(sh, vec3(0.18, 0.40, 0.42) * (0.82 + 0.3 * noise(p * 0.5)), reef * 0.75); + float lw = 0.85 + 0.3 * clamp(dot(n, -vec3(L.x, L.y, -L.z)), 0.0, 1.0); + col = mix(col, sh * lw, shelf); + float cs = pow(1.0 - abs(sin(fbm(p * 0.12 + vec2(t * 0.4, -t * 0.3)) * 10.0)), 7.0); + col += vec3(0.9, 1.0, 0.95) * cs * 0.24 * smoothstep(45.0, 4.0, sd); + // surf breaking along the reef edge, in pieces + float reefLine = 44.0 + 12.0 * (fbm(p * 0.02 + 5.0) - 0.5); + float brk = (1.0 - smoothstep(0.0, 2.0 + 2.5 * fbm3(p * 0.04 + vec2(t * 0.25, 0.0)), abs(sd - reefLine - 2.5 * sin(t * 0.8 + p.x * 0.03)))); + brk *= smoothstep(0.35, 0.62, noise(p * 0.08 + vec2(t * 0.6, 0.0))) * smoothstep(0.42, 0.56, fbm(p * 0.03 + 13.0)); + col = mix(col, vec3(0.96, 0.99, 1.0), brk * 0.6); + // waves rolling in, foam lines thinning out as they come, the swash on the sand + float lace2 = smoothstep(0.42, 0.72, fbm3(p * 0.25 + vec2(t * 0.4, 0.0))); + float roll = smoothstep(0.9, 1.0, swell) * (1.0 - smoothstep(5.0, 26.0, sd)); + float iw = 4.5 + 3.5 * sin(t * 1.1 + fbm(p * 0.03) * 6.0); + float swash = 1.0 - smoothstep(iw - 3.0, iw + 2.5, sd); + col = mix(col, vec3(0.97, 0.99, 1.0), clamp(max(swash * (0.55 + 0.45 * lace2), roll * lace2 * 0.8), 0.0, 1.0) * 0.9); + } else { + float hI = islH(p); + vec3 nI = normalize(vec3(-(islH(p + vec2(1.0, 0.0)) - hI) * 110.0, -(islH(p + vec2(0.0, 1.0)) - hI) * 110.0, 1.0)); + float shI = clamp(dot(nI, normalize(vec3(-L.x, -L.y, L.z))), 0.0, 1.0); + float bwI = 5.0 + 15.0 * fbm(p * 0.03 + 2.0); + vec3 sandI = vec3(0.95, 0.89, 0.74) + (hash(floor(p * 3.0)) - 0.5) * 0.05; + sandI = mix(sandI, vec3(0.76, 0.69, 0.56), (1.0 - smoothstep(0.0, 4.5, sI)) * 0.75); + float big = step(0.55, fbm(p * 0.025 + 6.0)); + vec3 tr = big > 0.5 ? tree(p, 8.0) : tree(p, 4.6); + vec3 trS = big > 0.5 ? tree(p - vec2(2.6, 3.0), 8.0) : tree(p - vec2(1.7, 2.0), 4.6); + float lit = clamp(0.62 - dot(tr.yz, vec2(L.x, L.y)) * 0.55, 0.0, 1.0); + float jung = smoothstep(bwI, bwI + 8.0, sI); + vec3 under = mix(vec3(0.46, 0.55, 0.28), vec3(0.28, 0.42, 0.19), noise(p * 0.1)) * (1.0 - 0.35 * trS.x); + vec3 canopy = mix(vec3(0.09, 0.27, 0.12), vec3(0.42, 0.62, 0.28), lit) * (0.9 + 0.2 * noise(p * 2.0)); + vec3 landI = mix(sandI, under, jung); + landI *= 1.0 - 0.3 * trS.x * smoothstep(bwI - 4.0, bwI, sI) * (1.0 - jung); + landI = mix(landI, canopy, tr.x * smoothstep(bwI - 3.0, bwI + 5.0, sI) * (0.35 + 0.65 * smoothstep(0.22, 0.36, fbm(p * 0.035 + 1.0)))); + // bare rock on the steep top and boulders where the headland meets the sea + float slI = 1.0 - nI.z; + landI = mix(landI, vec3(0.62, 0.58, 0.50) * (0.9 + 0.15 * noise(p * 0.8)), smoothstep(0.7, 0.88, slI) * 0.6); + vec3 bo = tree(p, 4.0); + float blit = clamp(0.6 - dot(bo.yz, vec2(L.x, L.y)) * 0.6, 0.0, 1.0); + vec3 rocks = mix(vec3(0.30, 0.29, 0.27), mix(vec3(0.52, 0.50, 0.46), vec3(0.80, 0.77, 0.71), blit), bo.x); + float rk = smoothstep(0.6, 0.7, fbm(p * 0.05 + 4.0)) * (1.0 - smoothstep(bwI - 2.0, bwI + 4.0, sI)); + landI = mix(landI, rocks, rk); + landI *= 0.5 + 0.7 * shI; + col = mix(vec3(0.90, 0.95, 0.93), landI, smoothstep(0.0, 1.4, sI)); + } + // a sailboat going round, well outside the reef + float sa = t * 0.06; + vec2 sb = vec2(230.0, -250.0) + vec2(cos(sa) * 1.5, sin(sa)) * 140.0; + vec2 tang = normalize(vec2(-sin(sa) * 1.5, cos(sa))); + vec2 q = p - sb; + q = vec2(dot(q, tang), dot(q, vec2(-tang.y, tang.x))); + float back = -q.x; + float wk = (1.0 - smoothstep(0.5, 1.6, abs(abs(q.y) - back * 0.22))) * step(0.0, back) * (1.0 - smoothstep(6.0, 44.0, back)); + col = mix(col, vec3(0.96, 0.98, 1.0), wk * 0.7); + col = mix(col, vec3(0.10, 0.22, 0.32), (1.0 - smoothstep(1.0, 1.4, length((q - vec2(-1.5, 2.6)) / vec2(5.0, 3.0)))) * 0.25); + col = mix(col, vec3(0.98), 1.0 - smoothstep(0.9, 1.0, length(q / vec2(4.8, 1.7)))); + float sail = max(abs(q.x + 0.4) - 2.6, abs(q.y + 1.2 - (q.x + 0.4) * 0.15) - 0.7); + col = mix(col, vec3(0.88, 0.86, 0.82), 1.0 - smoothstep(-0.2, 0.3, sail)); + } + } else { + /* ── land: hillside, macchia, and the town down at the water ── */ + float e = 1.2, h = ground(p); + vec3 n = normalize(vec3(-(ground(p + vec2(e, 0.0)) - h) * 17.0, -(ground(p + vec2(0.0, e)) - h) * 17.0, 1.0)); + float shade = clamp(dot(n, normalize(vec3(-L.x, -L.y, L.z))), 0.0, 1.0); + float slope = 1.0 - n.z; + float veg = fbm(p * 0.03 + 2.0); + vec3 base = mix(vec3(0.78, 0.72, 0.53), vec3(0.50, 0.56, 0.33), smoothstep(0.42, 0.58, veg)); + base = mix(base, vec3(0.36, 0.45, 0.25), smoothstep(0.6, 0.7, veg) * 0.8); + base *= 0.9 + 0.16 * noise(p * 1.4) + 0.06 * (hash(floor(p * 2.0)) - 0.5); + float shrub = smoothstep(0.42, 0.6, fbm(p * 0.022 + 11.0)); + vec3 shT = tree(p - vec2(2.0, 2.4), 6.0); + base *= 1.0 - 0.34 * shT.x * shrub; + vec3 tr = tree(p, 6.0); + float lit = clamp(0.62 - dot(tr.yz, vec2(L.x, L.y)) * 0.55, 0.0, 1.0); + vec3 leaf = mix(vec3(0.16, 0.27, 0.14), vec3(0.45, 0.55, 0.30), lit) * (0.9 + 0.2 * noise(p * 2.3)); + base = mix(base, leaf, tr.x * shrub * (1.0 - smoothstep(0.35, 0.6, slope))); + vec3 limestone = mix(vec3(0.70, 0.66, 0.58), vec3(0.88, 0.85, 0.78), noise(p * 0.7)) * (0.92 + 0.12 * noise(p * 3.1)); + base = mix(base, limestone, smoothstep(0.3, 0.6, slope) * 0.75); + // the town: dense by the water, thinning out up the hill, house by house + vec3 roof, tmpRoof; vec2 hid, tmpId; + float occ = town(p, roof, hid); + float occS = town(p - vec2(2.4, 3.0), tmpRoof, tmpId); + float near = exp(d / 150.0); + float want = fbm(p * 0.011 + 3.0) * 0.75 * exp(d / 420.0) + near * 0.6; + float here = step(0.55 + 0.12 * hash(hid + 6.6), want); + float hereS = step(0.55 + 0.12 * hash(tmpId + 6.6), want); + // lanes are paved only in the dense heart; where no house stands the hillside shows + float dense = smoothstep(0.62, 0.7, want); + vec3 stone = vec3(0.87, 0.84, 0.77) * (0.95 + 0.07 * noise(p * 1.6)); + vec3 open = roof.x < -0.5 ? mix(stone, vec3(0.48, 0.57, 0.34), step(0.5, hash(hid + 3.0))) : stone; + col = mix(base, open, dense); + if (occ * here > 0.5) col = roof; + else if (occS * hereS > 0.5) col *= 0.64; + // the hinterland: parcels with their own crop and row direction, hedges between + float farm = smoothstep(150.0, 200.0, -d) * (1.0 - smoothstep(450.0, 510.0, -d)); + if (farm > 0.0) { + vec2 fp = (p + vec2(fbm(p * 0.015), fbm(p * 0.015 + 7.0)) * 10.0) * vec2(0.62, 1.0); + vec2 fc = floor(fp / 58.0); + float b1 = 99.0, b2 = 99.0; vec2 fid = vec2(0.0); + for (int fj = -1; fj <= 1; fj++) for (int fi = -1; fi <= 1; fi++) { + vec2 g = fc + vec2(float(fi), float(fj)); + float dd = length(fp - (g + 0.25 + 0.5 * hash2(g)) * 58.0); + if (dd < b1) { b2 = b1; b1 = dd; fid = g; } else if (dd < b2) { b2 = dd; } + } + float kind = hash(fid + 1.7); + float ang = hash(fid + 4.2) * 3.1416; + vec2 dir = vec2(cos(ang), sin(ang)); + float u = dot(p, dir), v = dot(p, vec2(-dir.y, dir.x)); + vec3 parcel; + if (kind < 0.36) { + float r = smoothstep(-0.2, 0.6, sin(u * 6.2831 / 4.0)); + vec3 vine = mix(vec3(0.24, 0.36, 0.16), vec3(0.44, 0.54, 0.25), noise(p * 1.4)) * (0.85 + 0.2 * noise(vec2(u * 0.3, v * 1.6))); + parcel = mix(vec3(0.67, 0.57, 0.42), vine, r); + } else if (kind < 0.56) { + parcel = mix(vec3(0.88, 0.78, 0.52), vec3(0.80, 0.68, 0.43), 0.5 + 0.5 * sin(u * 6.2831 / 2.4)) * (0.94 + 0.1 * noise(p * 0.5)); + } else if (kind < 0.74) { + vec2 q = vec2(u, v) / 9.0; + vec2 qc = fract(q) - 0.5 + (hash2(floor(q)) - 0.5) * 0.18; + float olive = 1.0 - smoothstep(0.2, 0.33, length(qc)); + float oshadow = 1.0 - smoothstep(0.2, 0.36, length(qc - vec2(0.12, 0.16))); + vec3 soil = vec3(0.76, 0.68, 0.52) * (1.0 - 0.28 * oshadow); + parcel = mix(soil, mix(vec3(0.36, 0.42, 0.28), vec3(0.56, 0.60, 0.42), clamp(0.6 - dot(qc, vec2(L.x, L.y)) * 1.4, 0.0, 1.0)), olive); + } else if (kind < 0.88) { + parcel = mix(vec3(0.50, 0.39, 0.28), vec3(0.63, 0.51, 0.37), 0.5 + 0.5 * sin(u * 6.2831 / 1.9)) * (0.95 + 0.08 * noise(p * 0.6)); + } else { + parcel = mix(vec3(0.47, 0.57, 0.29), vec3(0.58, 0.63, 0.33), noise(p * 0.08)); + } + // hedgerows and the odd cypress along the field edges + float edgeD = (b2 - b1) * 0.5; + parcel *= 0.92 + 0.16 * hash(fid + 5.5); + float hedge = 1.0 - smoothstep(0.5, 1.5, edgeD); + vec3 cy = tree(p, 5.0); + parcel = mix(parcel, vec3(0.30, 0.35, 0.20), hedge * 0.75); + parcel = mix(parcel, vec3(0.12, 0.20, 0.10), cy.x * (1.0 - smoothstep(1.5, 3.5, edgeD)) * step(0.7, hash(fid + 9.0))); + float level = 1.0 - smoothstep(0.38, 0.6, slope); + col = mix(col, parcel, farm * level * (1.0 - step(0.5, occ * here))); + // a country road winding through, a car on it + float ry = 425.0 + 26.0 * sin(p.x * 0.011 + 1.0) + 9.0 * sin(p.x * 0.029); + float rd = abs(p.y - ry); + col = mix(col, vec3(0.86, 0.82, 0.72), (1.0 - smoothstep(4.6, 5.6, rd)) * farm); + col = mix(col, vec3(0.36, 0.36, 0.37) * (0.95 + 0.08 * noise(p * 2.0)), (1.0 - smoothstep(3.4, 4.2, rd)) * farm); + col = mix(col, vec3(0.95), (1.0 - smoothstep(0.25, 0.6, rd)) * step(0.5, fract(p.x / 9.0)) * farm); + float cx = mod(t * 22.0 + 6.0 * sin(t * 0.4), 760.0) - 120.0; + float cyy = 425.0 + 26.0 * sin(cx * 0.011 + 1.0) + 9.0 * sin(cx * 0.029) - 1.6; + float slopeR = 26.0 * 0.011 * cos(cx * 0.011 + 1.0) + 9.0 * 0.029 * cos(cx * 0.029); + vec2 cq = p - vec2(cx, cyy); + float ca = atan(slopeR); + cq = vec2(cq.x * cos(ca) + cq.y * sin(ca), -cq.x * sin(ca) + cq.y * cos(ca)); + float body = max(abs(cq.x) - 3.4, abs(cq.y) - 1.4); + col = mix(col, vec3(0.14, 0.14, 0.15), (1.0 - smoothstep(0.0, 1.4, max(abs(cq.x - 0.8) - 3.6, abs(cq.y - 0.9) - 1.6))) * 0.35); + col = mix(col, vec3(0.78, 0.16, 0.13), 1.0 - smoothstep(-0.2, 0.4, body)); + col = mix(col, vec3(0.20, 0.24, 0.30), (1.0 - smoothstep(-0.2, 0.3, max(abs(cq.x - 0.9) - 1.0, abs(cq.y) - 1.0)))); + } + col *= 0.64 + 0.5 * shade; + col *= 1.0 - 0.1 * smoothstep(0.55, 0.0, h); + // the high country: broad massifs, conifers in the valley, snow on the tops + float alpine = smoothstep(470.0, 590.0, -d); + if (alpine > 0.0) { + float lakeD = length((p - vec2(250.0, 790.0)) / vec2(2.3, 1.0)); + float valley = mix(0.35, 1.0, smoothstep(26.0, 80.0, lakeD)); + float hA = (peaks(p * 0.006 + 5.0) * 1.3 - 0.2 + fbm(p * 0.035) * 0.05) * valley; + float hX = (peaks((p + vec2(1.5, 0.0)) * 0.006 + 5.0) * 1.3 - 0.2 + fbm((p + vec2(1.5, 0.0)) * 0.035) * 0.05) * valley; + float hY = (peaks((p + vec2(0.0, 1.5)) * 0.006 + 5.0) * 1.3 - 0.2 + fbm((p + vec2(0.0, 1.5)) * 0.035) * 0.05) * valley; + vec3 nA = normalize(vec3(-(hX - hA) * 95.0, -(hY - hA) * 95.0, 1.0)); + float shA = clamp(dot(nA, normalize(vec3(-L.x, -L.y, L.z))), 0.0, 1.0); + float slA = 1.0 - nA.z; + vec3 rockA = mix(vec3(0.46, 0.43, 0.39), vec3(0.62, 0.58, 0.52), noise(p * 0.05)) * (0.94 + 0.08 * noise(p * 0.9)); + vec3 trA = tree(p, 4.4); + vec3 trS = tree(p - vec2(1.6, 2.0), 4.4); + float conifer = (1.0 - smoothstep(0.40, 0.50, hA + (noise(p * 0.06) - 0.5) * 0.08)) * (1.0 - smoothstep(0.5, 0.75, slA)); + vec3 meadow = mix(vec3(0.42, 0.50, 0.28), vec3(0.52, 0.56, 0.32), noise(p * 0.1)); + vec3 forestA = meadow * (1.0 - 0.4 * trS.x); + forestA = mix(forestA, mix(vec3(0.07, 0.15, 0.09), vec3(0.20, 0.33, 0.18), clamp(0.6 - dot(trA.yz, vec2(L.x, L.y)) * 0.6, 0.0, 1.0)), trA.x * smoothstep(0.2, 0.5, fbm(p * 0.02 + 3.0) + 0.25)); + vec3 alp = mix(rockA, forestA, conifer); + float snowA = smoothstep(0.75, 0.81, hA + (noise(p * 0.09) - 0.5) * 0.1) * (1.0 - smoothstep(0.55, 0.8, slA)); + snowA = max(snowA, smoothstep(0.86, 0.94, hA)); + alp *= 0.36 + 0.86 * shA; + alp = mix(alp * vec3(0.8, 0.87, 1.05), alp * vec3(1.04, 1.0, 0.95), smoothstep(0.35, 0.8, shA)); + vec3 snowC = mix(vec3(0.70, 0.77, 0.88), vec3(0.98, 0.98, 0.97), smoothstep(0.2, 0.75, shA)) * (0.96 + 0.05 * noise(p * 0.6)); + alp = mix(alp, snowC, snowA); + col = mix(col, alp, alpine); + } + // a mountain lake in a valley + vec2 lc = vec2(250.0, 790.0); + float ld = length((p - lc) / vec2(2.3, 1.0)) + (fbm(p * 0.05) - 0.5) * 14.0; + if (ld < 34.0) { + float lw = wave(p * 1.3, t * 0.6); + vec3 lake = mix(vec3(0.12, 0.36, 0.48), vec3(0.24, 0.55, 0.62), smoothstep(34.0, 12.0, ld)); + lake *= 0.86 + 0.12 * lw; + lake += vec3(1.0, 0.98, 0.92) * pow(noise(p * 0.6 + t * 1.2), 14.0) * 0.7; + col = mix(col, lake, smoothstep(34.0, 31.0, ld)); + col = mix(col, vec3(0.82, 0.80, 0.74), (1.0 - smoothstep(0.0, 1.8, abs(ld - 32.0))) * 0.8); + } + // the shore: small coves of sand between rocks, wet where the wash runs + float bw = 17.0 + 10.0 * fbm3(vec2(p.x * 0.03, 1.0)); + float shore = 1.0 - smoothstep(bw - 3.0, bw + 2.0, -d); + float rock = smoothstep(0.56, 0.66, fbm(p * 0.05 + 4.0)); + vec3 sand = vec3(0.93, 0.86, 0.71) + (hash(floor(p * 3.0)) - 0.5) * 0.06; + float wet = 1.0 - smoothstep(0.0, 6.0 + wash * 0.4, -d); + sand = mix(sand, vec3(0.74, 0.67, 0.55), wet * 0.8); + // boulders: round stones lit from the top left, darker in the cracks between + vec3 bo = tree(p, 4.5); + float blit = clamp(0.6 - dot(bo.yz, vec2(L.x, L.y)) * 0.6, 0.0, 1.0); + vec3 rocks = mix(vec3(0.30, 0.29, 0.27), mix(vec3(0.52, 0.50, 0.46), vec3(0.80, 0.77, 0.71), blit), bo.x); + vec3 edgeCol = mix(sand, rocks, rock); + col = mix(col, edgeCol, shore); + } + // haze into the page below: a long, uneven edge that drifts slowly + float H = uRes.y / uDpr; + float edge = H - 118.0 + 42.0 * (fbm3(vec2(sp.x * 0.011, t * 0.04)) - 0.5) * 2.0 + 22.0 * (fbm(sp * 0.028 + vec2(t * 0.05, 0.0)) - 0.5) * 2.0; + float mist = smoothstep(edge - 34.0, edge + 84.0, sp.y); + mist = clamp(mist + smoothstep(H - 24.0, H, sp.y), 0.0, 1.0); + col = mix(col, vec3(1.0, 0.98, 0.961), mist * uHaze); + gl_FragColor = vec4(col, 1.0); + }`; + +const VERTEX = 'attribute vec2 a; void main(){ gl_Position = vec4(a, 0.0, 1.0); }'; + +export interface Scenery { + /** Glides the camera to another place; a still picture jumps there. */ + flyTo(camera: Camera): void; +} + +interface SceneryOptions { + /** The height the scene is framed for; the box may be taller or shorter. */ + frame: number; + camera?: Camera; + /** The soft fade into the page at the foot of the picture; off beside a column. */ + haze?: boolean; +} + +const reducedMotion = (): boolean => + typeof matchMedia === 'function' && matchMedia('(prefers-reduced-motion: reduce)').matches; + +export function startScenery(box: HTMLElement, opts: SceneryOptions): Scenery | null { + const canvas = document.createElement('canvas'); + canvas.className = 'scenery'; + canvas.setAttribute('aria-hidden', 'true'); + box.prepend(canvas); + const gl = canvas.getContext('webgl', { antialias: false, premultipliedAlpha: false, powerPreference: 'low-power' }); + if (!gl) { + canvas.remove(); + return null; + } + const compile = (type: number, src: string): WebGLShader | null => { + const shader = gl.createShader(type); + if (!shader) return null; + gl.shaderSource(shader, src); + gl.compileShader(shader); + return shader; + }; + const program = gl.createProgram(); + const vs = compile(gl.VERTEX_SHADER, VERTEX); + const fs = compile(gl.FRAGMENT_SHADER, FRAGMENT); + if (!program || !vs || !fs) { + canvas.remove(); + return null; + } + gl.attachShader(program, vs); + gl.attachShader(program, fs); + gl.linkProgram(program); + if (!gl.getProgramParameter(program, gl.LINK_STATUS)) { + canvas.remove(); + return null; + } + gl.useProgram(program); + gl.bindBuffer(gl.ARRAY_BUFFER, gl.createBuffer()); + gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([-1, -1, 1, -1, -1, 1, 1, 1]), gl.STATIC_DRAW); + const position = gl.getAttribLocation(program, 'a'); + gl.enableVertexAttribArray(position); + gl.vertexAttribPointer(position, 2, gl.FLOAT, false, 0, 0); + const uRes = gl.getUniformLocation(program, 'uRes'); + const uDpr = gl.getUniformLocation(program, 'uDpr'); + const uT = gl.getUniformLocation(program, 'uT'); + const uCam = gl.getUniformLocation(program, 'uCam'); + gl.uniform1f(gl.getUniformLocation(program, 'uHaze'), opts.haze === false ? 0 : 1); + + // The picture's resolution: the screen's, capped at 2, scaled down when frames come slow. + let quality = 1; + let offset: [number, number] = [0, 0]; + const resize = () => { + const cssWidth = box.clientWidth || FRAME_WIDTH; + const cssHeight = box.clientHeight || opts.frame; + const ratio = Math.min(2, Math.max(1, window.devicePixelRatio || 1)) * quality; + canvas.width = Math.max(1, Math.round(cssWidth * ratio)); + canvas.height = Math.max(1, Math.round(cssHeight * ratio)); + canvas.style.height = `${cssHeight}px`; + gl.viewport(0, 0, canvas.width, canvas.height); + gl.uniform2f(uRes, canvas.width, canvas.height); + gl.uniform1f(uDpr, canvas.width / cssWidth); + // The scene is framed for a phone: a bigger box shows more around the same + // centre, a smaller one (a small iPhone) the middle of it. + offset = [(cssWidth - FRAME_WIDTH) / 2, (cssHeight - opts.frame) / 2]; + }; + resize(); + + const still = reducedMotion(); + const born = performance.now(); + let camera: [number, number] = [opts.camera?.[0] ?? 0, opts.camera?.[1] ?? 0]; + let flight: { from: [number, number]; to: Camera; start: number; duration: number } | null = null; + let running = false; + let lastFrame = 0; + let measured = 0; + let slowFrames = 0; + + const draw = (now: number) => { + if (flight) { + const k = Math.min(1, (now - flight.start) / flight.duration); + const e = k < 0.5 ? 4 * k * k * k : 1 - Math.pow(-2 * k + 2, 3) / 2; + camera = [ + flight.from[0] + (flight.to[0] - flight.from[0]) * e, + flight.from[1] + (flight.to[1] - flight.from[1]) * e, + ]; + if (k >= 1) flight = null; + } + gl.uniform2f(uCam, camera[0] - offset[0], camera[1] - offset[1]); + gl.uniform1f(uT, still ? 4 : (now - born) / 1000 + 4); + gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4); + }; + + const frame = (now: number) => { + if (!canvas.isConnected || document.hidden) { + running = false; + return; + } + // A device that cannot keep up gets a smaller picture once, rather than a stutter. + if (lastFrame && quality === 1 && measured < 90) { + measured += 1; + if (now - lastFrame > 24) slowFrames += 1; + if (measured === 90 && slowFrames > 45) { + quality = 0.7; + resize(); + } + } + lastFrame = now; + draw(now); + if (!still || flight) requestAnimationFrame(frame); + else running = false; + }; + const run = () => { + if (running) return; + running = true; + lastFrame = 0; + requestAnimationFrame(frame); + }; + run(); + + // The loop stops in the background (document.hidden) and starts again on return. + const wake = () => { + if (!document.hidden && canvas.isConnected) run(); + }; + document.addEventListener('visibilitychange', wake); + if (typeof ResizeObserver === 'function') { + const observer = new ResizeObserver(() => { + if (!canvas.isConnected) { + observer.disconnect(); + document.removeEventListener('visibilitychange', wake); + return; + } + resize(); + if (still) run(); + }); + observer.observe(box); + } + canvas.addEventListener('webglcontextlost', (event) => { + event.preventDefault(); + canvas.remove(); + }); + + return { + flyTo(to: Camera) { + if (still) { + camera = [to[0], to[1]]; + run(); + return; + } + const distance = Math.hypot(to[0] - camera[0], to[1] - camera[1]); + flight = { + from: [camera[0], camera[1]], + to, + start: performance.now(), + duration: Math.min(1700, 700 + distance * 1.1), + }; + run(); + }, + }; +} diff --git a/client/native-shell/shell.css b/client/native-shell/shell.css index a71532639..2e64792af 100644 --- a/client/native-shell/shell.css +++ b/client/native-shell/shell.css @@ -1,14 +1,17 @@ /* - * The address screen the app ships. Dark first, mirroring the app's neutral - * default scheme (client/src/index.css), so it shares the launch screen's - * background and never flashes. Everything past this screen is the UI the - * chosen server delivers. + * The first screens the app ships itself: welcome, plans, address, an own + * server, and the states between. Light, on a landscape seen from above + * (scenery.ts). Everything past them is the UI the chosen server delivers. + * + * Every side is a logical one (inline start and end), so Arabic and Hebrew + * mirror the layout without rules of their own. */ /* - * TREK's own type, self-hosted (latin subset, bundled — the shell loads offline - * and hotlinks nothing). Poppins is the display face across the app and - * liketrek.com; MuseoModerno draws the "cloud" of the TREK Cloud wordmark. + * TREK's own type, self-hosted (latin subset, bundled: the shell loads offline + * and hotlinks nothing). Poppins sets the headlines and prices. Poppins has no + * Cyrillic, so Russian and Ukrainian get Montserrat under the same family name, + * loaded only when a Cyrillic letter is on screen. */ @font-face { font-family: 'Poppins'; @@ -31,20 +34,6 @@ font-display: swap; src: url('./fonts/poppins-latin-700.woff2') format('woff2'); } -@font-face { - font-family: 'MuseoModerno'; - font-style: normal; - font-weight: 600 700; - font-display: swap; - src: url('./fonts/museomoderno-latin-600.woff2') format('woff2'); -} -/* - * Poppins and MuseoModerno have no Cyrillic, so Russian and Ukrainian fell back - * to the system's plain sans. Each family gets a Cyrillic-only stand-in under its - * own name, picked for the same build: Montserrat for the geometric text face, - * Comfortaa for the rounded headline. The unicode-range keeps Latin on TREK's - * own faces and loads these only when a Cyrillic letter is on screen. - */ @font-face { font-family: 'Poppins'; font-style: normal; @@ -69,742 +58,417 @@ src: url('./fonts/montserrat-cyrillic-700.woff2') format('woff2'); unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } +/* + * Plus Jakarta Sans, the text face of the first screens: Latin and Latin + * Extended (Czech, Polish, Turkish, Vietnamese letters), each loaded only when + * a letter of its range is on screen. Cyrillic borrows Montserrat under the same + * family name, as Poppins does. + */ @font-face { - font-family: 'MuseoModerno'; + font-family: 'Plus Jakarta Sans'; font-style: normal; - font-weight: 600 700; + font-weight: 400; font-display: swap; - src: url('./fonts/comfortaa-cyrillic-700.woff2') format('woff2'); - unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; + src: url('./fonts/plus-jakarta-sans-latin-400.woff2') format('woff2'); + unicode-range: + U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, + U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } -/* Italic, subset to the letters of "cloud" — the wordmark's badge, nothing else. */ @font-face { - font-family: 'MuseoModerno'; - font-style: italic; + font-family: 'Plus Jakarta Sans'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: url('./fonts/plus-jakarta-sans-latin-500.woff2') format('woff2'); + unicode-range: + U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, + U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +@font-face { + font-family: 'Plus Jakarta Sans'; + font-style: normal; font-weight: 600; font-display: swap; - src: url('./fonts/museomoderno-italic-600.woff2') format('woff2'); + src: url('./fonts/plus-jakarta-sans-latin-600.woff2') format('woff2'); + unicode-range: + U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, + U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +@font-face { + font-family: 'Plus Jakarta Sans'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url('./fonts/plus-jakarta-sans-latin-700.woff2') format('woff2'); + unicode-range: + U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, + U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +@font-face { + font-family: 'Plus Jakarta Sans'; + font-style: normal; + font-weight: 800; + font-display: swap; + src: url('./fonts/plus-jakarta-sans-latin-800.woff2') format('woff2'); + unicode-range: + U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, + U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +@font-face { + font-family: 'Plus Jakarta Sans'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url('./fonts/plus-jakarta-sans-latin-ext-400.woff2') format('woff2'); + unicode-range: + U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, + U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +@font-face { + font-family: 'Plus Jakarta Sans'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: url('./fonts/plus-jakarta-sans-latin-ext-500.woff2') format('woff2'); + unicode-range: + U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, + U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +@font-face { + font-family: 'Plus Jakarta Sans'; + font-style: normal; + font-weight: 600; + font-display: swap; + src: url('./fonts/plus-jakarta-sans-latin-ext-600.woff2') format('woff2'); + unicode-range: + U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, + U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +@font-face { + font-family: 'Plus Jakarta Sans'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url('./fonts/plus-jakarta-sans-latin-ext-700.woff2') format('woff2'); + unicode-range: + U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, + U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +@font-face { + font-family: 'Plus Jakarta Sans'; + font-style: normal; + font-weight: 800; + font-display: swap; + src: url('./fonts/plus-jakarta-sans-latin-ext-800.woff2') format('woff2'); + unicode-range: + U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, + U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +@font-face { + font-family: 'Plus Jakarta Sans'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: url('./fonts/montserrat-cyrillic-500.woff2') format('woff2'); + unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +@font-face { + font-family: 'Plus Jakarta Sans'; + font-style: normal; + font-weight: 600; + font-display: swap; + src: url('./fonts/montserrat-cyrillic-600.woff2') format('woff2'); + unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +@font-face { + font-family: 'Plus Jakarta Sans'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url('./fonts/montserrat-cyrillic-700.woff2') format('woff2'); + unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } :root { - --bg: #09090b; - --bg-2: #101013; - --surface: #18181b; - --surface-2: #1f1f23; - --edge: #27272a; - --edge-strong: #3f3f46; - --ink: #fafafa; - --muted: #a1a1aa; - --faint: #71717a; - --accent: #fafafa; - --accent-ink: #09090b; - --danger: #f87171; - --ok: #4ade80; - /* The hairline the ambient grid is drawn in, and a travel-dusk wash for depth. */ - --grid: rgba(255, 255, 255, 0.055); - --wash-1: rgba(129, 140, 248, 0.12); - /* Mixes with transparent, spelled out per scheme: older Android web views (Chrome 113) - resolved color-mix() towards transparent as opaque and drew solid halos and rings. */ - --accent-ink-a16: rgba(9, 9, 11, 0.16); - --accent-ink-a35: rgba(9, 9, 11, 0.35); - --danger-a16: rgba(248, 113, 113, 0.16); - --ink-a22: rgba(250, 250, 250, 0.22); - --ink-a3: rgba(250, 250, 250, 0.03); - --ink-a4: rgba(250, 250, 250, 0.04); - --ink-a9: rgba(250, 250, 250, 0.09); - --ok-a16: rgba(74, 222, 128, 0.16); - --ok-a22: rgba(74, 222, 128, 0.22); - --wash-1-a85: rgba(129, 140, 248, 0.102); - --wash-1-a90: rgba(129, 140, 248, 0.108); - --wash-2: rgba(244, 114, 182, 0.08); - --veil-top: rgba(9, 9, 11, 0.4); - --veil-mid: rgba(9, 9, 11, 0.72); - --font: 'Poppins', -apple-system, BlinkMacSystemFont, 'SF Pro Text', 'Segoe UI', Roboto, system-ui, sans-serif; - --radius: 16px; - --ease: cubic-bezier(0.22, 1, 0.36, 1); - --ease-in: cubic-bezier(0.4, 0, 1, 1); - /* 1 left to right, -1 in Arabic: a screen that comes next slides in from the trailing side. */ - --flow: 1; - color-scheme: dark; -} -:root[dir='rtl'] { - --flow: -1; -} - -@media (prefers-color-scheme: light) { - :root { - --bg: #ffffff; - --bg-2: #fafafa; - --surface: #f4f4f5; - --surface-2: #ececef; - --edge: #e4e4e7; - --edge-strong: #d4d4d8; - --ink: #111827; - --muted: #52525b; - --faint: #9ca3af; - --accent: #111827; - --accent-ink: #ffffff; - --danger: #dc2626; - --ok: #16a34a; - --grid: rgba(17, 24, 39, 0.075); - --wash-1: rgba(79, 70, 229, 0.1); - --accent-ink-a16: rgba(255, 255, 255, 0.16); - --accent-ink-a35: rgba(255, 255, 255, 0.35); - --danger-a16: rgba(220, 38, 38, 0.16); - --ink-a22: rgba(17, 24, 39, 0.22); - --ink-a3: rgba(17, 24, 39, 0.03); - --ink-a4: rgba(17, 24, 39, 0.04); - --ink-a9: rgba(17, 24, 39, 0.09); - --ok-a16: rgba(22, 163, 74, 0.16); - --ok-a22: rgba(22, 163, 74, 0.22); - --wash-1-a85: rgba(79, 70, 229, 0.085); - --wash-1-a90: rgba(79, 70, 229, 0.09); - --wash-2: rgba(219, 39, 119, 0.07); - --veil-top: rgba(255, 255, 255, 0.12); - --veil-mid: rgba(255, 255, 255, 0.74); - color-scheme: light; - } - .mark { - filter: none; - } - /* The app icon is drawn white; on the light surface it turns black. */ - .shell-logo { - filter: brightness(0); - } + --page: #fffaf5; + --ink: #1f1a17; + --text: #6b5f57; + --muted: #8a7b6f; + --faint: #b9ab9e; + --line: #efe4d8; + --line-soft: #f3ebe1; + --sand: #f6efe6; + --dark: #111827; + --good: #1d7a46; + --bad: #b42318; + --sea: #cfe3ef; + --text-face: 'Plus Jakarta Sans', system-ui, -apple-system, 'Segoe UI', Roboto, sans-serif; + --display-face: 'Poppins', system-ui, -apple-system, 'Segoe UI', Roboto, sans-serif; + /* The insets of the device, from the web view or, on iOS, from the native side. */ + --safe-top: max(env(safe-area-inset-top, 0px), var(--trek-native-safe-top, 0px)); + --safe-bottom: max(env(safe-area-inset-bottom, 0px), var(--trek-native-safe-bottom, 0px)); + --safe-start: max(env(safe-area-inset-left, 0px), var(--trek-native-safe-left, 0px)); + --safe-end: max(env(safe-area-inset-right, 0px), var(--trek-native-safe-right, 0px)); + color-scheme: light; + -webkit-text-size-adjust: 100%; } * { box-sizing: border-box; -webkit-tap-highlight-color: transparent; } - html, body { margin: 0; - min-height: 100%; - background: - radial-gradient(90% 55% at 50% -12%, var(--wash-1), transparent 62%), - radial-gradient(80% 50% at 50% 112%, var(--wash-2), transparent 64%), var(--bg); + height: 100%; + background: var(--page); color: var(--ink); - font-family: var(--font); - -webkit-text-size-adjust: 100%; - -webkit-font-smoothing: antialiased; - text-rendering: optimizeLegibility; - user-select: none; - -webkit-user-select: none; - /* A double tap on a button zoomed the screen on iOS. An app does not zoom: - taps stay taps, panning still scrolls. */ - touch-action: manipulation; -} - -/* - * The backdrop, in two fixed layers behind the content. First a soft dusk wash - * at top and bottom — a trace of the colour the app's photos carry, never loud - * enough to read as decoration. Then a quiet grid that fades out through a - * radial mask: depth, the way liketrek.com's hero carries it. - */ -/* The grid, strongest at the top-right and fading left and down — the half the - photo leaves open, so the two meet in a soft seam down the middle. */ -body::before { - content: ''; - position: fixed; - inset: 0 0 auto; - height: 440px; - background-image: - linear-gradient(var(--grid) 1px, transparent 1px), linear-gradient(90deg, var(--grid) 1px, transparent 1px); - background-size: 54px 54px; - -webkit-mask-image: radial-gradient(135% 95% at 100% 0%, #000 34%, transparent 80%); - mask-image: radial-gradient(135% 95% at 100% 0%, #000 34%, transparent 80%); - pointer-events: none; - z-index: 0; -} -/* - * A travel photo as a top band (Kyoto at dusk, the same image liketrek.com uses - * in its pricing section), under a dark gradient and faded out at the bottom so - * the headline stays legible. Dark-first; in light mode it steps back to the - * quiet grid instead, which reads better on a white page. - */ -/* The travel photo (Kyoto at dusk, as on liketrek.com), anchored left and faded - out toward the right so it hands over to the grid, and down into the page. - The veil over it takes the scheme's page colour: a dark dusk in dark mode, a - bright morning haze in light mode, so the black wordmark still reads on it. */ -body::after { - content: ''; - position: fixed; - inset: 0 0 auto; - height: 440px; - background: - linear-gradient(180deg, var(--veil-top) 0%, var(--veil-mid) 62%, var(--bg) 100%), - url('./img/kyoto.webp') left 28% / cover no-repeat; - /* A long, soft hand-over to the grid: a short one read as an edge. */ - -webkit-mask-image: linear-gradient(90deg, #000 0%, #000 22%, transparent 96%); - mask-image: linear-gradient(90deg, #000 0%, #000 22%, transparent 96%); - pointer-events: none; - z-index: 0; -} -/* In Arabic the photo holds the leading (right) side and the grid the other. */ -:root[dir='rtl'] body::after { - background-position: - 0 0, - right 28%; - -webkit-mask-image: linear-gradient(270deg, #000 0%, #000 22%, transparent 96%); - mask-image: linear-gradient(270deg, #000 0%, #000 22%, transparent 96%); -} -:root[dir='rtl'] body::before { - -webkit-mask-image: radial-gradient(135% 95% at 0% 0%, #000 34%, transparent 80%); - mask-image: radial-gradient(135% 95% at 0% 0%, #000 34%, transparent 80%); + font-family: var(--text-face); + overscroll-behavior: none; +} +button, +input { + font: inherit; +} +:focus-visible { + outline: 2px solid var(--dark); + outline-offset: 2px; } +/* The page: one screen at a time, each its own scroller. */ .shell { - position: relative; - z-index: 1; - min-height: 100vh; - min-height: 100dvh; - display: flex; - flex-direction: column; - max-width: 440px; - margin: 0 auto; - padding: calc(env(safe-area-inset-top) + 28px) 24px calc(env(safe-area-inset-bottom) + 24px); - /* Clip only the sideways slide: a screen taller than the window scrolls the - page instead (and a sticky column needs an ancestor that does not scroll). */ + position: fixed; + inset: 0; overflow-x: clip; } - -/* ── Screen transitions ──────────────────────────────────────────────────── */ -.screen { +.scr { + position: absolute; + inset: 0; + overflow-x: hidden; + overflow-y: auto; + scrollbar-width: none; display: flex; flex-direction: column; - gap: 14px; - /* Centred while it fits; taller than the window it starts at the top and the - page scrolls, rather than overflowing both edges as justify-content would. */ - margin-block: auto; + padding-bottom: 30px; + background: var(--page); } -/* A screen's two halves (main.ts, columns()): one column unless the layout asks. */ -.col { +.scr::-webkit-scrollbar { + display: none; +} +.scr.enter { + animation: scrIn 0.42s cubic-bezier(0.2, 0.8, 0.2, 1) both; +} +.scr.enter.reverse { + animation-name: scrInBack; +} +:root[dir='rtl'] .scr.enter { + animation-name: scrInBack; +} +:root[dir='rtl'] .scr.enter.reverse { + animation-name: scrIn; +} +@keyframes scrIn { + from { + opacity: 0; + transform: translateX(22px); + } + to { + opacity: 1; + transform: none; + } +} +@keyframes scrInBack { + from { + opacity: 0; + transform: translateX(-22px); + } + to { + opacity: 1; + transform: none; + } +} +/* On a phone the content flows in the screen's own column. */ +.body { display: contents; } -.screen-enter { - animation: screenIn 0.5s var(--ease) both; + +/* ── The landscape at the top ── */ +.hero { + position: relative; + flex: none; + overflow: hidden; + background: var(--sea); + margin-bottom: -1px; + height: min(300px, 36svh); } -/* Lifted out where it stood: main.ts sets its top, left and width. */ -.screen-leave { - animation: screenOut 0.28s var(--ease-in) both; +.hero.tall { + height: min(320px, 38svh); +} +.hero.welcome { + height: min(376px, 44.5svh); + min-height: 250px; +} +.hero .scenery { position: absolute; - margin: 0; + inset: 0; + width: 100%; + height: 100%; } -.screen-back.screen-enter { - animation-name: screenInBack; +/* The status bar's clock and icons stay readable on the sea. */ +.hero::before { + content: ''; + position: absolute; + z-index: 1; + inset-inline: 0; + top: 0; + height: calc(var(--safe-top) + 36px); + background: linear-gradient(180deg, rgba(8, 24, 40, 0.28), rgba(8, 24, 40, 0)); + pointer-events: none; } -.screen-back.screen-leave { - animation-name: screenOutBack; +.hero::after { + content: ''; + position: absolute; + inset-inline: 0; + bottom: -2px; + height: 110px; + background: linear-gradient( + 180deg, + rgba(255, 250, 245, 0) 0%, + rgba(255, 250, 245, 0.8) 55%, + #fffaf5 82%, + #fffaf5 100% + ); + pointer-events: none; } -@keyframes screenIn { - from { - opacity: 0; - transform: translateX(calc(26px * var(--flow))); - } - to { - opacity: 1; - transform: none; - } +.hero.welcome::after { + height: 18px; + background: linear-gradient(180deg, rgba(255, 250, 245, 0), #fffaf5 88%); } -@keyframes screenOut { - to { - opacity: 0; - transform: translateX(calc(-22px * var(--flow))); - } +.logo { + position: absolute; + z-index: 2; + top: calc(var(--safe-top) + 10px); + inset-inline-start: calc(24px + var(--safe-start)); + height: 40px; + filter: drop-shadow(0 1px 6px rgba(7, 40, 70, 0.45)); } -@keyframes screenInBack { - from { - opacity: 0; - transform: translateX(calc(-26px * var(--flow))); - } - to { - opacity: 1; - transform: none; - } -} -@keyframes screenOutBack { - to { - opacity: 0; - transform: translateX(calc(22px * var(--flow))); - } -} - -/* Children stagger in, so a screen assembles rather than snaps. Inside the two - halves the explanation comes first and the choices follow. */ -.screen-enter > :not(.col), -.screen-enter > .col > * { - animation: riseIn 0.55s var(--ease) both; -} -.screen-enter > .col > :nth-child(1) { - animation-delay: 0.02s; -} -.screen-enter > .col > :nth-child(2) { - animation-delay: 0.07s; -} -.screen-enter > .col > :nth-child(3) { - animation-delay: 0.12s; -} -.screen-enter > .col > :nth-child(4) { - animation-delay: 0.17s; -} -.screen-enter > .col-act > :nth-child(1) { - animation-delay: 0.15s; -} -.screen-enter > .col-act > :nth-child(2) { - animation-delay: 0.2s; -} -.screen-enter > .col-act > :nth-child(3) { - animation-delay: 0.25s; -} -.screen-enter > .col-act > :nth-child(4) { - animation-delay: 0.3s; -} -.screen-enter > *:nth-child(1) { - animation-delay: 0.02s; -} -.screen-enter > *:nth-child(2) { - animation-delay: 0.07s; -} -.screen-enter > *:nth-child(3) { - animation-delay: 0.12s; -} -.screen-enter > *:nth-child(4) { - animation-delay: 0.17s; -} -.screen-enter > *:nth-child(5) { - animation-delay: 0.22s; -} -.screen-enter > *:nth-child(6) { - animation-delay: 0.27s; -} -@keyframes riseIn { - from { - opacity: 0; - transform: translateY(12px); - } - to { - opacity: 1; - transform: none; - } -} - -/* ── Brand ───────────────────────────────────────────────────────────────── */ -.brand { - display: inline-flex; - align-items: center; - gap: 11px; - margin-bottom: 6px; -} -.brand .mark { +.back { + position: absolute; + z-index: 3; + top: calc(var(--safe-top) + 8px); + inset-inline-start: calc(20px + var(--safe-start)); width: 40px; height: 40px; -} -.brand .wordmark { - font-weight: 700; - font-size: 1.5rem; - letter-spacing: -0.01em; -} -.brand .tag { - font-style: italic; - font-weight: 600; - font-size: 0.9rem; - color: var(--accent-ink); - background: var(--accent); + display: grid; + place-items: center; + border: 0; border-radius: 999px; - padding: 2px 10px; - line-height: 1.3; -} - -.shell-logo { - width: 52px; - height: 52px; - margin-bottom: 4px; -} - -/* The big hero mark on the welcome screen, with a gentle breathing float. */ -.hero-mark { - width: 80px; - height: 80px; - margin-bottom: 20px; - animation: floaty 6s ease-in-out infinite; - filter: drop-shadow(0 14px 36px var(--wash-1-a90)) - drop-shadow(0 6px 16px var(--ink-a22)); -} - -/* The full TREK wordmark on the welcome screen, in the variant that reads on the scheme. */ -.hero-logo { - display: block; - margin-bottom: 22px; - filter: drop-shadow(0 14px 36px var(--wash-1-a90)) - drop-shadow(0 6px 16px var(--ink-a22)); - animation: logoRise 0.7s var(--ease) both; -} -.hero-logo img { - display: block; - height: 62px; - width: auto; -} -.hero-logo .on-light { - display: none; -} -@media (prefers-color-scheme: light) { - .hero-logo .on-dark { - display: none; - } - .hero-logo .on-light { - display: block; - } -} -@keyframes logoRise { - from { - opacity: 0; - transform: translateY(8px); - } - to { - opacity: 1; - transform: none; - } -} -@keyframes floaty { - 0%, - 100% { - transform: translateY(0); - } - 50% { - transform: translateY(-6px); - } -} - -/* ── Type ────────────────────────────────────────────────────────────────── */ -.title { - font-size: 2.05rem; - line-height: 1.1; - font-weight: 700; - letter-spacing: -0.03em; - margin: 0; - /* Honour the newline in the headline string (e.g. "Deine Reisen.\nDein Plan."). */ - white-space: pre-line; - text-wrap: balance; -} -/* The welcome headline as the brand says it: MuseoModerno, lower case. */ -.brand-title { - font-family: 'MuseoModerno', 'Poppins', sans-serif; - font-weight: 700; - text-transform: lowercase; - letter-spacing: -0.01em; - line-height: 1.08; -} - -/* The TREK Cloud lockup (cloud intro screen): the wordmark plus the "cloud" - badge in italic MuseoModerno, an inverted pill, exactly as on liketrek.com. */ -.cloud-wordmark { - display: inline-flex; - align-items: center; - gap: 9px; - /* Left to right inside (dir="ltr"), yet on the screen's start edge in Arabic. */ - align-self: flex-start; -} -.cloud-wordmark img { - display: block; - height: 38px; - width: auto; -} -.cloud-wordmark .on-light { - display: none; -} -@media (prefers-color-scheme: light) { - .cloud-wordmark .on-dark { - display: none; - } - .cloud-wordmark .on-light { - display: block; - } -} -.cloud-tag { - font-family: 'MuseoModerno', system-ui, sans-serif; - font-style: italic; - font-weight: 600; - font-size: 0.95rem; - line-height: 1.35; - padding: 2px 11px; - border-radius: 999px; - color: var(--bg); - background: var(--ink); -} -.title-sm { - font-size: 1.5rem; - line-height: 1.18; - font-weight: 700; - letter-spacing: -0.025em; - margin: 0; - text-wrap: balance; -} -.sub { - color: var(--muted); - margin: 0; - line-height: 1.55; - font-size: 0.9rem; - overflow-wrap: anywhere; - /* No lone last word ("AI.") on a line of its own. */ - text-wrap: balance; -} - -/* ── Buttons ─────────────────────────────────────────────────────────────── */ -.btn { - font: inherit; - font-weight: 600; - font-size: 1.02rem; - padding: 16px 22px; - border: 1px solid transparent; - /* A pill, as the app's buttons are. */ - border-radius: 999px; - background: var(--accent); - color: var(--accent-ink); - cursor: pointer; - box-shadow: - 0 8px 22px -14px rgba(0, 0, 0, 0.55), - 0 1px 2px rgba(0, 0, 0, 0.25); - transition: - transform 0.14s var(--ease), - opacity 0.2s, - background 0.2s, - box-shadow 0.2s, - border-color 0.2s; - display: inline-flex; - align-items: center; - justify-content: center; - gap: 10px; - min-height: 54px; -} -.btn:active { - transform: scale(0.975); -} -.btn:disabled { - opacity: 0.55; -} -/* A two-line choice (welcome) is a card rather than a button: the app's card radius. */ -.btn:has(.btn-row) { - border-radius: 22px; - padding-inline: 18px; -} -.btn-ghost { - background: var(--surface); + background: #fff; color: var(--ink); - border-color: var(--edge); - box-shadow: - 0 1px 2px rgba(0, 0, 0, 0.22), - inset 0 0 0 1px var(--ink-a4); + cursor: pointer; + box-shadow: 0 6px 16px -8px rgba(0, 0, 0, 0.5); } -.btn-ghost:active { - background: var(--surface-2); -} -.btn-row { - display: flex; - flex-direction: column; - align-items: flex-start; - gap: 2px; - /* A subtitle that wraps keeps to the start edge under its title. */ - text-align: start; -} -.btn-row b { - font-weight: 650; -} -.btn-row small { - font-weight: 500; - font-size: 0.86rem; - opacity: 0.7; -} -.btn .chev { - flex: none; - margin-inline-start: auto; - opacity: 0.5; -} -/* A centred label with the chevron at the far edge, the label optically centred. */ -.btn-go .btn-label { - flex: 1; - padding-inline-start: 20px; -} -/* Chevrons point along the reading direction. */ -:root[dir='rtl'] .chev, -:root[dir='rtl'] .back svg { +:root[dir='rtl'] .back svg, +:root[dir='rtl'] .flip { transform: scaleX(-1); } -.linkbtn { - font: inherit; - font-size: 0.95rem; - padding: 12px; - border: 0; - background: none; - color: var(--muted); - cursor: pointer; - align-self: center; - transition: color 0.2s; +/* ── The glass card over the landscape ── */ +.card { + position: absolute; + z-index: 2; + inset-inline: calc(20px + var(--safe-start)) calc(20px + var(--safe-end)); + /* Lower in a short landscape (the keyboard is up), so it never meets the back button. */ + bottom: clamp(18px, calc(100% - 242px), 78px); + padding: 12px 16px 14px; + border-radius: 18px; + background: rgba(255, 255, 255, 0.8); + -webkit-backdrop-filter: blur(16px) saturate(1.5); + backdrop-filter: blur(16px) saturate(1.5); + box-shadow: + 0 18px 36px -18px rgba(17, 24, 39, 0.55), + inset 0 0 0 1px rgba(255, 255, 255, 0.6); } - -/* "Try the demo": a tertiary action, but a tidy pill so it reads as a choice, not stray text. */ -.demo-link { - font: inherit; - font-weight: 600; - font-size: 0.95rem; - align-self: stretch; - width: 100%; - margin-top: 2px; - padding: 9px 18px; - min-height: 40px; - border-radius: 999px; - border: 1px solid var(--edge); - background: transparent; - color: var(--muted); - cursor: pointer; - white-space: nowrap; - transition: - color 0.2s, - background 0.2s, - border-color 0.2s, - transform 0.14s var(--ease); -} -.demo-link:active { - transform: scale(0.97); - background: var(--surface-2); - color: var(--ink); -} -.linkbtn:active { - color: var(--ink); -} -a.linkbtn { - text-decoration: none; -} - -.foot-links { +.card small { display: flex; - flex-wrap: wrap; - justify-content: center; - gap: 4px 22px; - margin-top: 6px; - padding-top: 16px; - border-top: 1px solid var(--edge); - font-size: 0.86rem; + align-items: center; + gap: 6px; + font-size: 11px; + font-weight: 700; + letter-spacing: 0.1em; + text-transform: uppercase; + color: var(--text); } -.foot-links a { +.card.ok small { + color: var(--good); +} +.card.bad small, +.card.bad .url i { + color: var(--bad); +} +.url { + display: flex; + align-items: center; + gap: 8px; + margin-top: 6px; + min-width: 0; +} +.url i { + display: flex; + flex: none; + color: var(--dark); +} +.url-text { + font-family: var(--display-face); + font-size: 22px; + font-weight: 600; + letter-spacing: -0.02em; + white-space: nowrap; + overflow: hidden; + min-width: 0; +} +.url-text b { + font-weight: 600; + color: var(--dark); +} +.url-text b.ph { + color: #a99a8c; +} +.url-text span { color: var(--muted); font-weight: 500; - text-decoration: none; - padding: 6px 2px; - transition: color 0.2s; } -.foot-links a:active { - color: var(--ink); +.caret { + display: inline-block; + width: 2px; + height: 1.05em; + margin: 0 1px; + vertical-align: -0.17em; + background: var(--dark); + border-radius: 2px; + animation: blink 1.1s steps(1) infinite; } - -/* ── Address form ────────────────────────────────────────────────────────── */ -.form { - display: flex; - flex-direction: column; - gap: 12px; -} -.field { - position: relative; -} -.field input { - width: 100%; - font: inherit; - font-size: 1rem; - padding: 13px 18px; - border-radius: 999px; - border: 1px solid var(--edge); - background: var(--surface); - color: var(--ink); - outline: none; - box-shadow: - 0 1px 2px rgba(0, 0, 0, 0.18), - inset 0 1px 0 var(--ink-a4); - transition: - border-color 0.2s, - box-shadow 0.25s; - user-select: text; - -webkit-user-select: text; -} -.field input::placeholder { - color: var(--faint); -} -.field input:focus { - border-color: var(--edge-strong); - box-shadow: 0 0 0 4px var(--ink-a9); -} -.field.bad input { - border-color: var(--danger); - box-shadow: 0 0 0 4px var(--danger-a16); - animation: shake 0.3s; -} -@keyframes shake { - 25% { - transform: translateX(-5px); - } - 50% { - transform: translateX(5px); - } - 75% { - transform: translateX(-3px); - } -} - -.error { - color: var(--danger); - margin: 0; - min-height: 1.4em; - line-height: 1.45; - font-size: 0.95rem; - transition: opacity 0.2s; -} - -/* A sign-in proxy in front of the server: which one, sign in to it here, or let the app through. */ -.gate { - display: flex; - flex-direction: column; - gap: 10px; - padding: 16px 18px; - border-radius: 22px; - background: var(--surface); - border: 1px solid var(--edge); - text-align: start; -} -.gate[hidden] { +.card:not(.typing) .caret { display: none; } -.gate-title { - margin: 0; - font-weight: 600; - color: var(--ink); - line-height: 1.4; +@keyframes blink { + 50% { + opacity: 0; + } } -.gate-text { - margin: 0; - color: var(--muted); - font-size: 0.9rem; - line-height: 1.5; -} -.gate-note { - margin: 0; - color: var(--faint); - font-size: 0.82rem; - line-height: 1.45; -} -.gate a { - color: var(--ink); - font-size: 0.9rem; -} - -/* Spinner inside the connect button while probing. */ -.spinner { - width: 18px; - height: 18px; - border: 2px solid var(--accent-ink-a35); - border-top-color: var(--accent-ink); +.spin { + width: 10px; + height: 10px; border-radius: 50%; - animation: spin 0.7s linear infinite; + border: 2px solid var(--text); + border-top-color: transparent; + animation: spin 0.8s linear infinite; +} +.cta .spin { + width: 16px; + height: 16px; + border-color: #fff; + border-top-color: transparent; } @keyframes spin { to { @@ -812,758 +476,939 @@ a.linkbtn { } } -/* ── Feature list (cloud screen) ─────────────────────────────────────────── */ -.features { +/* ── Content ── */ +.pad { + position: relative; + z-index: 2; display: flex; flex-direction: column; - gap: 2px; - margin: 4px 0 2px; + gap: 14px; + padding-inline: calc(24px + var(--safe-start)) calc(24px + var(--safe-end)); } -.feature { +.pad.grow { + flex: 1; + margin-top: -30px; +} +.pad.lift { + margin-top: -34px; + gap: 16px; +} +.pad.lift + .pad { + margin-top: 16px; +} +.stack { display: flex; - align-items: flex-start; + flex-direction: column; + gap: 16px; + width: 100%; +} +.pad.form { + margin-top: 2px; + gap: 12px; +} +.push { + flex: 1; + min-height: 0; +} +h1 { + margin: 0; + font-family: var(--display-face); + font-weight: 600; + font-size: 36px; + letter-spacing: -0.025em; + line-height: 1.08; + text-wrap: balance; +} +.lead { + margin: 0; + font-size: 16px; + line-height: 1.55; + color: var(--text); +} +.title { + font-size: 26px; + letter-spacing: -0.02em; +} +.sub { + margin: -4px 0 0; + font-size: 14.5px; + line-height: 1.5; + color: var(--text); +} +.sub b { + color: var(--ink); +} +.perks { + display: flex; + flex-direction: column; + margin-top: 4px; + padding: 2px 16px; + border-radius: 18px; + background: #fff; + box-shadow: + 0 0 0 1px var(--line), + 0 14px 28px -24px rgba(31, 26, 23, 0.6); +} +.perks div { + display: flex; + align-items: center; gap: 13px; - padding: 11px 0; - border-top: 1px solid var(--edge); + padding: 8px 0; } -.feature:first-child { - border-top: 0; +.perks div + div { + border-top: 1px solid var(--line-soft); } -.feature .ic { - flex: none; +.perks i { width: 34px; height: 34px; + flex: none; border-radius: 10px; - background: var(--surface); - border: 1px solid var(--edge); + background: var(--dark); + color: #fff; display: grid; place-items: center; - color: var(--ink); } -.feature .tx { - line-height: 1.4; - padding-top: 5px; - font-size: 0.98rem; +.perks b { + display: block; + font-size: 14.5px; + font-weight: 800; +} +.perks small { + display: block; + font-size: 12.5px; + color: var(--muted); + margin-top: 1px; +} +.btns { + display: flex; + flex-direction: column; + gap: 8px; } -/* ── Success tick before the server loads ────────────────────────────────── */ -.success { - align-items: center; - text-align: center; - justify-content: center; -} -.tick { - width: 72px; - height: 72px; - border-radius: 50%; - background: var(--ok-a16); - display: grid; - place-items: center; - margin-bottom: 8px; - animation: pop 0.45s var(--ease) both; -} -.tick svg { - width: 38px; - height: 38px; - color: var(--ok); -} -.tick path { - stroke-dasharray: 48; - stroke-dashoffset: 48; - animation: draw 0.45s 0.15s var(--ease) forwards; -} -@keyframes pop { - from { - transform: scale(0.4); - opacity: 0; - } - to { - transform: scale(1); - opacity: 1; - } -} -@keyframes draw { - to { - stroke-dashoffset: 0; - } -} - -.topbar { +/* ── Buttons ── */ +.cta, +.cta2 { + width: 100%; + border: 0; + border-radius: 16px; + cursor: pointer; display: flex; align-items: center; - margin-block: 0 2px; - margin-inline-start: -8px; + justify-content: center; + gap: 10px; + text-align: center; + text-decoration: none; + transition: transform 0.15s; } -.back { - font: inherit; +.cta { + min-height: 58px; + background: var(--dark); + color: #fff; + font: 700 17px var(--text-face); + box-shadow: 0 14px 28px -14px rgba(17, 24, 39, 0.55); +} +.cta2 { + min-height: 52px; + background: #fff; + color: var(--dark); + font: 700 16px var(--text-face); + box-shadow: 0 0 0 1.5px var(--ink); +} +.cta:active, +.cta2:active { + transform: scale(0.985); +} +.cta:disabled { + opacity: 0.7; + cursor: default; +} +.link { + display: block; + margin: 6px auto 0; + padding: 8px; border: 0; background: none; - color: var(--muted); - font-size: 0.98rem; - padding: 8px; - display: inline-flex; - align-items: center; - gap: 4px; + color: var(--text); + font: 600 15px var(--text-face); cursor: pointer; } -.back:active { - color: var(--ink); +.link.msg { + font-size: 12.5px; + color: var(--muted); +} +.dock { + position: sticky; + bottom: -30px; + z-index: 3; + margin-top: auto; + padding-block: 22px calc(30px + var(--safe-bottom)); + padding-inline: calc(24px + var(--safe-start)) calc(24px + var(--safe-end)); + background: linear-gradient(180deg, rgba(255, 250, 245, 0), #fffaf5 34%); +} +.dock .cta2 { + margin-top: 8px; +} +.fine { + margin: 10px 0 0; + text-align: center; + font-size: 12px; + font-weight: 500; + color: var(--muted); +} +.diag { + margin: 10px 0 0; + text-align: center; + font: + 500 11px ui-monospace, + 'SF Mono', + Menlo, + monospace; + color: #a99a8c; + overflow-wrap: anywhere; } -@media (prefers-reduced-motion: reduce) { - *, - *::before { - animation-duration: 0.001ms !important; - animation-iteration-count: 1 !important; - transition-duration: 0.001ms !important; - } -} - -/* ── Plan picker (cloud subscription) ────────────────────────────────────── */ -.segmented { - display: flex; +/* ── Plans ── */ +.tiers { + display: grid; + grid-auto-flow: column; + grid-auto-columns: minmax(0, 1fr); gap: 4px; padding: 4px; - background: var(--surface); - border: 1px solid var(--edge); - border-radius: 999px; - align-self: stretch; + border-radius: 16px; + background: var(--line-soft); } -.segmented button { - flex: 1; - font: inherit; - font-weight: 600; - font-size: 0.95rem; - padding: 9px; +.tiers button { border: 0; - border-radius: 999px; - background: none; - color: var(--muted); + border-radius: 12px; + padding: 10px 0; + background: transparent; + font: 700 14px var(--text-face); + color: var(--text); cursor: pointer; transition: background 0.2s, color 0.2s; - display: inline-flex; - align-items: center; - justify-content: center; - gap: 7px; } -.segmented button[aria-pressed='true'] { - background: var(--accent); - color: var(--accent-ink); +.tiers button[aria-checked='true'] { + background: #fff; + color: var(--ink); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12); } -.segmented .save { - font-size: 0.72rem; - font-weight: 600; - padding: 1px 6px; - border-radius: 999px; - background: var(--ok-a22); - color: var(--ok); -} -.segmented button[aria-pressed='true'] .save { - background: var(--accent-ink-a16); - color: var(--accent-ink); -} - -.plans { - display: flex; - flex-direction: column; - gap: 14px; - /* Room for the badge that sits on the first card's top edge. */ - padding-top: 4px; -} -.plan { - border: 1px solid var(--edge); - border-radius: var(--radius); - padding: 16px; - background: var(--surface); - box-shadow: - 0 2px 10px -4px rgba(0, 0, 0, 0.3), - inset 0 0 0 1px var(--ink-a3); - transition: - border-color 0.2s, - box-shadow 0.2s, - transform 0.14s var(--ease); -} -.plan.featured { - box-shadow: - 0 10px 30px -10px var(--wash-1-a85), - 0 2px 8px -3px rgba(0, 0, 0, 0.35); -} -.plan:active { - transform: scale(0.99); -} -.plan.featured { - border-color: var(--edge-strong); - background: var(--surface-2); -} -.plan-top { - display: flex; - align-items: baseline; - justify-content: space-between; - gap: 10px; -} -.plan-name { - font-weight: 700; - font-size: 1.12rem; -} -.plan-price { - font-weight: 700; - font-size: 1.3rem; - letter-spacing: -0.01em; -} -.plan-price small { - font-weight: 500; - font-size: 0.8rem; - color: var(--muted); - margin-inline-start: 7px; -} -.plan-feats { - margin: 10px 0 14px; - display: flex; - flex-direction: column; - gap: 6px; - color: var(--muted); - font-size: 0.92rem; -} -.plan-feats span { - display: flex; - align-items: center; - gap: 8px; -} -.plan-feats svg { - flex: none; - color: var(--ok); -} -.plan-feats .off, -.plan-feats .off svg { - color: var(--faint); -} -/* A plan is a choice, as a radio button is: the whole card takes the tap. */ -button.plan { - font: inherit; - color: inherit; - text-align: start; - width: 100%; - cursor: pointer; - position: relative; - padding-inline-start: 48px; -} -.plan-radio { - position: absolute; - inset-inline-start: 16px; - top: 19px; - width: 20px; - height: 20px; - border-radius: 50%; - border: 1.5px solid var(--edge-strong); - transition: - border-color 0.2s, - border-width 0.2s var(--ease); -} -.plan.selected { - border-color: var(--ink); - box-shadow: - 0 0 0 1px var(--ink), - 0 14px 34px -14px var(--wash-1-a85), - 0 2px 8px -3px rgba(0, 0, 0, 0.35); -} -.plan.selected .plan-radio { - border: 6px solid var(--ink); -} -/* Pinned to the card's top edge, so the name and the price keep their line. */ -.plan { - position: relative; -} -.plan-badge { - position: absolute; - top: -9px; - inset-inline-end: 16px; - padding: 2px 9px; - border-radius: 999px; - background: var(--accent); - color: var(--accent-ink); - font-size: 0.68rem; - font-weight: 600; - letter-spacing: 0.02em; -} -.plan-feats small { - color: var(--faint); - font-size: 0.8rem; - margin-inline-start: 2px; -} -.plan-feats { - margin-bottom: 0; -} - -/* What every plan has, once above the cards. */ -.plans-every { - display: flex; - align-items: center; - gap: 8px; - margin: 0 2px; - color: var(--muted); - font-size: 0.88rem; -} -.plans-every svg { - flex: none; - color: var(--ok); -} - -/* The one button on, held at the foot of the screen over a fade while the plans scroll. */ -.plans-cta { - position: sticky; - bottom: 0; - z-index: 2; - margin: 0 -2px; - padding: 18px 2px calc(env(safe-area-inset-bottom, 0px) + 10px); - background: linear-gradient(to bottom, transparent, var(--bg) 38%); -} -.plans-cta .btn { - width: 100%; - justify-content: space-between; - border-radius: 22px; - padding-inline: 22px 18px; -} -.plans-cta .btn-row small { - opacity: 0.72; -} - -.loading { - display: flex; - justify-content: center; - padding: 40px 0; -} -.loading .spinner { - width: 26px; - height: 26px; - border-color: var(--edge-strong); - border-top-color: var(--ink); -} -/* Small print (the terms a purchase is under, how it renews): in the system's - own text face at its regular weight. Poppins ships from 500 up only, which - made a paragraph of legal text read as heavy as a heading. */ -.note { - text-align: center; - color: var(--faint); - font-family: -apple-system, BlinkMacSystemFont, 'SF Pro Text', Roboto, system-ui, sans-serif; - font-weight: 400; - font-size: 0.76rem; - margin: 2px 0 0; - line-height: 1.5; -} -.note a { - color: var(--muted); -} -/* Under the plans: restore, the renewal terms, the legal links. */ -.plans-foot { - display: flex; - flex-direction: column; - gap: 10px; - margin-top: 4px; -} -.plans-foot .hint { - text-align: center; - margin: 0; -} -.plans-foot .hint:empty { - display: none; -} - -/* ── Claim: address + email, and the provisioning wait ───────────────────── */ -/* One rounded field holding the address input and its fixed ".liketrek.com" - suffix — the input itself is seamless, the box and its states live here. */ -.slug-field { - display: flex; - align-items: center; - padding-inline-end: 18px; - border-radius: 999px; - border: 1px solid var(--edge); - background: var(--surface); - box-shadow: - 0 1px 2px rgba(0, 0, 0, 0.18), - inset 0 1px 0 var(--ink-a4); - transition: - border-color 0.2s, - box-shadow 0.25s; -} -.slug-field .slug-input, -.slug-field .slug-input:focus { - flex: 1; +.trip { min-width: 0; - text-align: start; + margin-top: 10px; +} +.trip h1 { + font-size: 28px; + display: flex; + align-items: center; + gap: 10px; + white-space: nowrap; +} +.trip p { + margin: 6px 0 0; + color: var(--text); + font-size: 14px; + line-height: 1.4; +} +.badge { + font-family: var(--text-face); + font-size: 11px; + font-weight: 700; + letter-spacing: 0.04em; + padding: 4px 10px; + border-radius: 999px; + background: var(--dark); + color: #fff; +} +.pricebox { + display: flex; + flex-direction: column; + padding: 6px 6px 16px; + border-radius: 20px; + background: #fff; + box-shadow: + 0 0 0 1px var(--line), + 0 16px 30px -24px rgba(31, 26, 23, 0.55); +} +.cycle { + position: relative; + display: grid; + grid-template-columns: 1fr 1fr; + padding: 4px; + border-radius: 15px; + background: var(--sand); +} +.cycle .thumb { + position: absolute; + top: 4px; + bottom: 4px; + inset-inline-start: 4px; + width: calc(50% - 4px); + border-radius: 11px; + background: var(--dark); + box-shadow: 0 4px 10px -4px rgba(17, 24, 39, 0.5); + transition: transform 0.32s cubic-bezier(0.2, 0.8, 0.2, 1); +} +.cycle[data-year='true'] .thumb { + transform: translateX(100%); +} +:root[dir='rtl'] .cycle[data-year='true'] .thumb { + transform: translateX(-100%); +} +.cycle button { + position: relative; + z-index: 1; border: 0; background: transparent; - /* The ring is the whole field's (focus-within below), not a second one inside it. */ - box-shadow: none; -} -/* An email is typed left to right, but its Arabic placeholder reads from the right. */ -:root[dir='rtl'] .field input.ltr-value:placeholder-shown { - direction: rtl; -} -.slug-field:focus-within { - border-color: var(--edge-strong); - box-shadow: 0 0 0 4px var(--ink-a9); -} -.slug-field.bad { - border-color: var(--danger); - box-shadow: 0 0 0 4px var(--danger-a16); - animation: shake 0.3s; -} -.slug-suffix { - flex: none; - color: var(--muted); - font-size: 0.95rem; - padding-inline-start: 4px; - user-select: none; -} -.hint { - margin: -6px 2px 2px; - font-size: 0.84rem; - color: var(--faint); - min-height: 1.1em; - transition: color 0.2s; -} -.hint.ok { - color: var(--ok); -} -.hint.bad { - color: var(--danger); -} - -.screen-center { - justify-content: center; - text-align: center; - align-items: center; - gap: 18px; -} -.screen-center .title-sm, -.screen-center .sub { - text-align: center; -} -.provision-mark { - width: 56px; - height: 56px; - display: flex; - align-items: center; - justify-content: center; - margin-bottom: 4px; -} -.provision-mark .spinner { - width: 40px; - height: 40px; - border-width: 3px; - border-color: var(--edge-strong); - border-top-color: var(--accent); -} - -/* ── A large screen ────────────────────────────────────────────────────────── - On its side (an iPad, a foldable unfolded) the photo becomes a panel of its - own on the leading half, full height, and the column of choices stands - centred in the other half, the way a split sign-in page uses the width. - Upright, the photo band grows with the screen instead of stopping at a - phone's 440px. Logical sides, so Arabic mirrors it. */ -@media (min-width: 840px) and (min-height: 600px) and (orientation: landscape) { - body::after, - :root[dir='rtl'] body::after { - inset: 16px auto 16px 16px; - inset-block: 16px; - inset-inline: 16px auto; - width: calc(50% - 24px); - height: auto; - border-radius: 28px; - background: - linear-gradient(180deg, transparent 50%, rgba(0, 0, 0, 0.32) 100%), - url('./img/kyoto.webp') 30% 45% / cover no-repeat; - -webkit-mask-image: none; - mask-image: none; - box-shadow: 0 30px 70px -30px rgba(0, 0, 0, 0.55); - } - body::before { - inset: 0; - inset-inline-start: 50%; - height: auto; - } - .shell { - max-width: none; - width: 50%; - margin-inline: 50% 0; - padding-inline: max(32px, calc(25vw - 220px)); - } -} -/* With the whole half of a 13" iPad on its side, the plans stand two by two - rather than in a column to scroll through. */ -@media (min-width: 1200px) and (min-height: 600px) and (orientation: landscape) { - .shell:has(.plans) { - padding-inline: max(32px, calc(25vw - 320px)); - } - .plans { - display: grid; - grid-template-columns: repeat(2, minmax(0, 1fr)); - } -} -/* An iPad upright, a foldable unfolded, half of an iPad in Split View: the photo - spans the whole width as a band across the top and fades out only downwards, - and the choices stand under it in a wider column than a phone's, centred in - the room the band leaves, so the page reads as one composition rather than a - phone screen at the top of the glass. The plans take two columns. */ -@media (min-width: 600px) and (min-height: 800px) and (orientation: portrait) { - body::before, - body::after { - height: 56vh; - } - body::after, - :root[dir='rtl'] body::after { - background-position: - 0 0, - center 30%; - -webkit-mask-image: none; - mask-image: none; - } - .shell { - max-width: 560px; - padding-top: calc(env(safe-area-inset-top) + 28vh); - padding-bottom: calc(env(safe-area-inset-bottom) + 6vh); - } - .shell:has(.plans) { - max-width: 760px; - padding-top: calc(env(safe-area-inset-top) + 16vh); - } - .plans { - display: grid; - grid-template-columns: repeat(2, minmax(0, 1fr)); - } -} - -/* ── A short screen on its side ────────────────────────────────────────────── - A phone, or a foldable folded, turned landscape: one column of choices is - taller than the glass, and the second choice or the main button ended up - below the edge. The two halves of a screen stand side by side instead, what - it is on the leading side and what to do on the other, top-aligned under the - status bar. The leading half stays put while a long list beside it (the - plans) scrolls, so Back is always in reach. */ -@media (orientation: landscape) and (max-height: 500px) { - .shell { - max-width: 880px; - padding-top: calc(env(safe-area-inset-top) + 16px); - padding-bottom: calc(env(safe-area-inset-bottom) + 16px); - padding-inline: max(28px, env(safe-area-inset-left)) max(28px, env(safe-area-inset-right)); - } - .screen:has(> .col) { - display: grid; - grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); - column-gap: 40px; - align-items: center; - } - /* The plans run longer than the window: both halves start at the top. */ - .screen:has(.plans) { - align-items: start; - } - .col { - display: flex; - flex-direction: column; - gap: 12px; - } - .col-about { - position: sticky; - top: calc(env(safe-area-inset-top) + 16px); - } - .hero-logo { - margin-bottom: 4px; - } - .hero-logo img { - height: 46px; - } - .title { - font-size: 1.75rem; - } - .btn { - min-height: 50px; - padding-block: 12px; - } - .features { - margin: 0; - } - .feature { - padding: 7px 0; - } - .foot-links { - margin-top: 0; - padding-top: 10px; - } -} - -/* The separate § 327h agreement on the claim screen: its own box, ticked by hand. */ -.consent { - display: flex; - gap: 10px; - align-items: flex-start; - padding: 12px 14px; - border: 1px solid var(--edge); - border-radius: 14px; - background: var(--surface); - color: var(--muted); - font-size: 0.8rem; - line-height: 1.45; - max-height: 34vh; - overflow-y: auto; + padding: 9px 0; + font: 600 14px var(--text-face); + color: var(--text); cursor: pointer; + transition: color 0.25s; } -.consent input { - flex: none; - width: 20px; - height: 20px; - margin: 1px 0 0; - accent-color: var(--ink); +.cycle button[aria-checked='true'] { + color: #fff; } -.consent strong { - color: var(--ink); +.price { + display: flex; + align-items: baseline; + justify-content: center; + gap: 8px; + margin-top: 18px; +} +.price b { + font-family: var(--display-face); + font-size: 40px; + font-weight: 600; + letter-spacing: -0.02em; + line-height: 1; + font-variant-numeric: tabular-nums; + white-space: nowrap; +} +.price span { + color: var(--text); + font-size: 14px; font-weight: 600; } -.consent.bad { - border-color: var(--danger); - animation: shake 0.35s; +.equals { + margin-top: 6px; + text-align: center; + font-size: 13px; + font-weight: 600; + color: var(--muted); +} +.equals:empty { + display: none; +} +.specs { + display: grid; + grid-template-columns: repeat(2, minmax(0, 1fr)); + gap: 8px; +} +.spec { + display: flex; + align-items: center; + gap: 10px; + min-width: 0; + padding: 10px 12px; + border-radius: 14px; + background: #fff; + box-shadow: 0 0 0 1px var(--line); +} +.spec i { + width: 32px; + height: 32px; + flex: none; + border-radius: 10px; + display: grid; + place-items: center; + background: var(--sand); + color: var(--dark); +} +.spec b { + display: block; + font-size: 14px; + font-weight: 800; + line-height: 1.2; + white-space: nowrap; +} +.spec small { + display: block; + font-size: 11.5px; + color: var(--muted); + font-weight: 600; + line-height: 1.25; + white-space: nowrap; +} +.spec.off i { + color: var(--faint); +} +.spec.off b { + color: var(--muted); +} +.spec.wide { + grid-column: 1 / -1; +} +.spec.wide em { + margin-inline-start: auto; + font-style: normal; + font-size: 11.5px; + font-weight: 700; + color: var(--text); + background: var(--sand); + padding: 4px 9px; + border-radius: 999px; + white-space: nowrap; +} +.legal { + margin: 2px 0 0; + font-size: 11.5px; + line-height: 1.5; + color: var(--muted); + text-align: center; + text-wrap: pretty; +} +.legal-links { + display: flex; + flex-wrap: wrap; + justify-content: center; + gap: 4px 12px; + margin-top: -4px; +} +.legal-links a, +.agree a { + font-size: 11.5px; + font-weight: 600; + color: var(--text); + text-decoration: underline; + text-underline-offset: 2px; + text-decoration-color: #d9cbbb; +} +.loading { + display: grid; + place-items: center; + min-height: 160px; +} +.loading .spin { + width: 22px; + height: 22px; } -/* ── Claim: what is bought, the address as it will be, the password rules ── */ -/* A form reads on a calm page: the photo steps back while one is on screen. */ -body::after { - transition: opacity 0.4s var(--ease); -} -body.quiet::after { - opacity: 0; -} -.claim-plan { +/* ── Address and sign-up ── */ +.plan-row { display: flex; align-items: center; justify-content: space-between; - gap: 12px; - margin-top: 4px; - padding: 12px 14px 12px 16px; - border: 1px solid var(--edge); - border-radius: var(--radius); - background: var(--surface); + padding-block: 10px; + padding-inline: 16px 10px; + border-radius: 14px; + background: var(--sand); } -.claim-plan > span { +.plan-row > span { display: flex; - flex-direction: column; - gap: 1px; + align-items: center; + gap: 10px; min-width: 0; } -.claim-plan b { - font-weight: 650; -} -.claim-plan bdi { - color: var(--muted); - font-size: 0.88rem; -} -.claim-plan .linkbtn { - flex: none; -} -.slug-free { - display: flex; - align-items: center; - gap: 7px; - flex-wrap: wrap; -} -.slug-free bdi { - color: var(--ink); - font-weight: 600; -} -.slug-free small { - font-size: inherit; -} -.pw-rules { - display: flex; - flex-wrap: wrap; - gap: 6px; - margin: -4px 0 0; -} -.pw-rules span { - display: inline-flex; - align-items: center; - gap: 5px; - padding: 4px 10px 4px 8px; +.plan-row b { + font-size: 12.5px; + font-weight: 700; + letter-spacing: 0.02em; + color: #fff; + background: var(--dark); + padding: 4px 11px; border-radius: 999px; - background: var(--surface); - border: 1px solid var(--edge); - color: var(--faint); - font-size: 0.78rem; - transition: - color 0.2s, - background 0.2s, - border-color 0.2s; } -.pw-rules svg { - opacity: 0.35; - transition: opacity 0.2s; +.plan-row small { + font-size: 13.5px; + font-weight: 600; + color: var(--text); } -.pw-rules .met { - color: var(--ok); - background: var(--ok-a16); - border-color: transparent; +.plan-row button { + border: 0; + background: #fff; + border-radius: 10px; + padding: 7px 12px; + font: 700 13px var(--text-face); + color: var(--dark); + cursor: pointer; + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); } -.pw-rules .met svg { - opacity: 1; -} -/* Three short facts right above the purchase. */ -.trust { +.fld { + position: relative; + margin-top: 8px; display: flex; - flex-wrap: wrap; - justify-content: center; - gap: 6px 16px; + flex-direction: column; + gap: 2px; + padding: 10px 16px 11px; + border-radius: 16px; + background: #fff; + box-shadow: 0 0 0 1px var(--line); + cursor: text; + transition: box-shadow 0.2s; +} +.fld:focus-within { + box-shadow: 0 0 0 2px var(--dark); +} +.fld.bad { + box-shadow: 0 0 0 2px var(--bad); + animation: shake 0.35s; +} +@keyframes shake { + 25% { + transform: translateX(-4px); + } + 75% { + transform: translateX(4px); + } +} +.fld .lab { + font-size: 12px; + font-weight: 700; color: var(--muted); - font-size: 0.8rem; } -.trust span { - display: inline-flex; +.fld .row { + display: flex; align-items: center; - gap: 6px; + gap: 4px; + min-width: 0; } -.trust svg { - flex: none; - color: var(--ok); +.fld input { + flex: 1; + min-width: 0; + border: 0; + outline: none; + background: transparent; + padding: 0; + font: 600 16px var(--text-face); + color: var(--ink); } - -/* ── Cloud: the app itself, and a quieter way out ── */ -.cloud-preview { - margin: 2px -8px 4px; - border-radius: 22px; - overflow: hidden; - aspect-ratio: 720 / 562; - background: var(--surface); - box-shadow: - 0 24px 50px -24px var(--wash-1-a85), - 0 2px 10px -4px rgba(0, 0, 0, 0.35), - inset 0 0 0 1px var(--ink-a4); -} -.cloud-preview img { - display: block; - width: 100%; - height: 100%; - object-fit: cover; -} -.linkbtn-quiet { - font-size: 0.86rem; +.fld input::placeholder { color: var(--faint); - padding-top: 4px; } -.plan-photos { +.fld input:disabled { + opacity: 0.6; +} +.fld em { + font-style: normal; + font-weight: 600; + font-size: 15px; + color: var(--muted); +} +/* A badge on the card's edge: free, a rule met. */ +.fld .edge { + position: absolute; + top: -10px; + inset-inline-end: 14px; display: inline-flex; align-items: center; gap: 4px; + padding: 3px 9px; + border-radius: 999px; + font-size: 11px; + font-weight: 700; + color: var(--muted); + background: #f1e7db; + box-shadow: 0 0 0 3px var(--page); + transition: + background 0.2s, + color 0.2s; } -.plan-feats .plan-photos svg { - color: var(--faint); +.fld .edge.on { + color: #fff; + background: var(--good); + animation: pop 0.3s cubic-bezier(0.2, 0.8, 0.2, 1); +} +@keyframes pop { + from { + opacity: 0; + transform: translateY(4px); + } + to { + opacity: 1; + transform: none; + } +} +.fld .note { + margin: 4px 0 0; + font-size: 12.5px; + font-weight: 600; + color: var(--bad); +} +.fld .note:empty { + display: none; +} +.rules { + display: flex; + flex-wrap: wrap; + gap: 6px; + margin-top: 8px; +} +.rules span { + font-size: 11px; + font-weight: 700; + color: var(--muted); + background: var(--sand); + padding: 3px 9px; + border-radius: 999px; + transition: + background 0.2s, + color 0.2s; +} +.rules span.met { + color: #fff; + background: var(--good); +} +.eye { + display: flex; + padding: 2px; + border: 0; + background: transparent; + color: var(--muted); + cursor: pointer; +} +.agree { + margin: 2px 0 0; + font-size: 11.5px; + line-height: 1.5; + color: var(--muted); + text-align: center; + text-wrap: pretty; +} +.consent { + display: flex; + gap: 12px; + align-items: flex-start; + padding: 14px 16px; + border-radius: 16px; + background: #fff; + box-shadow: 0 0 0 1px var(--line); + font-size: 12.5px; + line-height: 1.5; + color: var(--text); + cursor: pointer; +} +.consent.bad { + box-shadow: 0 0 0 2px var(--bad); + animation: shake 0.35s; +} +.consent input { + appearance: none; + -webkit-appearance: none; + flex: none; + width: 22px; + height: 22px; + margin: 1px 0 0; + border-radius: 7px; + box-shadow: inset 0 0 0 2px #e6dccf; + background: #fff center / 14px no-repeat; + cursor: pointer; + transition: + background-color 0.2s, + box-shadow 0.2s; +} +.consent input:checked { + background-color: var(--dark); + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='white' stroke-width='3.2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M5 12.5l4.5 4.5L19 7.5'/%3E%3C/svg%3E"); + box-shadow: none; +} +.consent strong { + display: block; + color: var(--ink); + font-weight: 800; + margin-bottom: 2px; +} +.consent-text { + display: block; + max-height: 140px; + overflow-y: auto; + white-space: pre-line; } -/* The cause of a failed load, for a report: small, quiet, and selectable. */ -.diag { +/* ── Own server ── */ +.notice { + display: flex; + gap: 10px; + align-items: flex-start; margin: 0; - text-align: center; - color: var(--faint); - font-family: ui-monospace, 'SF Mono', Menlo, Consolas, monospace; - font-size: 0.72rem; - user-select: text; - -webkit-user-select: text; + padding: 12px 14px; + border-radius: 14px; + background: #fbeeec; + color: #8f2a1d; + font-size: 13.5px; + font-weight: 600; + line-height: 1.45; +} +.notice:empty { + display: none; +} +.notice i { + display: flex; + flex: none; + margin-top: 1px; +} +.side { + display: flex; + align-items: center; + gap: 10px; + width: 100%; + padding: 13px 16px; + border: 0; + border-radius: 16px; + background: #fff; + box-shadow: 0 0 0 1px var(--line); + font: 600 14.5px var(--text-face); + color: var(--ink); + text-align: start; + cursor: pointer; +} +.side svg { + flex: none; + color: var(--dark); +} +.panel { + display: flex; + flex-direction: column; + gap: 10px; + padding: 16px; + border-radius: 18px; + background: #fff; + box-shadow: + 0 0 0 1px var(--line), + 0 16px 30px -26px rgba(31, 26, 23, 0.6); +} +.panel[hidden], +[hidden] { + display: none !important; +} +.panel-head { + display: flex; + gap: 12px; + align-items: center; +} +.panel-head i { + width: 36px; + height: 36px; + flex: none; + border-radius: 11px; + background: var(--dark); + color: #fff; + display: grid; + place-items: center; +} +.panel-head b { + font-size: 15px; + font-weight: 800; + line-height: 1.3; +} +.panel p { + margin: 0; + font-size: 13.5px; + line-height: 1.5; + color: var(--text); +} +.panel p b { + color: var(--ink); +} +.panel .panel-note { + font-size: 12px; + color: var(--muted); +} +.panel .panel-status { + color: var(--bad); + font-weight: 600; +} +.panel .panel-status:empty { + display: none; +} +.panel-btn { + min-height: 46px; + border: 0; + border-radius: 13px; + background: var(--dark); + color: #fff; + font: 700 15px var(--text-face); + cursor: pointer; +} +.panel-btn:disabled { + opacity: 0.7; +} +.panel-help { + display: inline-flex; + align-items: center; + gap: 4px; + align-self: flex-start; + font-size: 13px; + font-weight: 700; + color: var(--ink); + text-decoration: none; +} +.status-line { + margin: 0; + font-size: 13.5px; + font-weight: 600; + color: var(--text); +} +.status-line:empty { + display: none; +} +.status-line.bad { + color: var(--bad); +} +/* A panel needs the room: the landscape steps back while it is open. */ +.hero.tall { + transition: height 0.45s cubic-bezier(0.2, 0.8, 0.2, 1); +} +.scr.compact .hero.tall { + height: min(214px, 26svh); +} +.scr.compact .card { + bottom: 30px; +} +.scr.compact .sub { + display: none; +} + +/* ── Setting up ── */ +.steps { + display: flex; + flex-direction: column; + padding: 4px 16px; + border-radius: 18px; + background: #fff; + box-shadow: 0 0 0 1px var(--line); +} +.steps span { + display: flex; + align-items: center; + gap: 12px; + padding: 11px 0; + font-size: 14.5px; + font-weight: 700; + color: var(--faint); + transition: color 0.3s; +} +.steps span + span { + border-top: 1px solid var(--line-soft); +} +.steps span::before { + content: ''; + flex: none; + width: 18px; + height: 18px; + border-radius: 50%; + box-shadow: inset 0 0 0 2px #e6dccf; + transition: all 0.3s; +} +.steps span.on { + color: var(--ink); +} +.steps span.on::before { + background: var(--good) + url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='white' stroke-width='3.2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M5 12.5l4.5 4.5L19 7.5'/%3E%3C/svg%3E") + center / 12px no-repeat; + box-shadow: none; +} + +/* + * Wide screens (an iPad, an unfolded phone) and a phone on its side: two + * columns, the landscape at full height on one side, the content beside it in + * a column of its own that scrolls on its own. + */ +@media (min-width: 900px), (orientation: landscape) and (max-height: 500px) { + .scr { + flex-direction: row; + padding: 0; + overflow: hidden; + } + .hero, + .hero.tall, + .hero.welcome, + .scr.compact .hero.tall { + flex: 1 1 auto; + height: 100%; + min-height: 0; + margin: 0; + } + .hero::after { + display: none; + } + .body { + flex: none; + width: 460px; + height: 100%; + display: flex; + flex-direction: column; + overflow-x: hidden; + overflow-y: auto; + scrollbar-width: none; + padding-top: calc(var(--safe-top) + 48px); + background: var(--page); + box-shadow: -1px 0 0 rgba(31, 26, 23, 0.06); + } + .body::-webkit-scrollbar { + display: none; + } + .pad.grow, + .pad.lift, + .pad.form { + margin-top: 0; + } + .pad.grow { + justify-content: center; + } + .pad.grow .push { + flex: 0 0 18px; + } + .scr.compact .sub { + display: block; + } + .card { + inset-inline: calc(32px + var(--safe-start)) auto; + width: min(420px, calc(100% - 64px)); + bottom: 40px; + } + .logo { + top: calc(var(--safe-top) + 24px); + inset-inline-start: calc(32px + var(--safe-start)); + height: 46px; + } + .back { + top: calc(var(--safe-top) + 20px); + inset-inline-start: calc(28px + var(--safe-start)); + } + .pad, + .dock { + padding-inline: 24px calc(24px + var(--safe-end)); + } +} +/* A phone on its side has little height: the column is narrower and starts higher. */ +@media (orientation: landscape) and (max-height: 500px) { + .body { + width: min(420px, 52vw); + padding-top: calc(var(--safe-top) + 20px); + } +} +/* Two screens with a hinge between them: the landscape on one, the content on the other. */ +@media (horizontal-viewport-segments: 2) { + .hero, + .hero.tall, + .hero.welcome, + .scr.compact .hero.tall { + flex: none; + width: env(viewport-segment-width 0 0); + } + .body { + width: env(viewport-segment-width 1 0); + margin-inline-start: calc(env(viewport-segment-left 1 0) - env(viewport-segment-right 0 0)); + } +} + +@media (prefers-reduced-motion: reduce) { + .scr.enter, + .scr * { + animation: none !important; + transition: none !important; + } } diff --git a/client/tests/unit/native/nativeAmount.test.ts b/client/tests/unit/native/nativeAmount.test.ts new file mode 100644 index 000000000..32d0ac19d --- /dev/null +++ b/client/tests/unit/native/nativeAmount.test.ts @@ -0,0 +1,41 @@ +import { describe, expect, it } from 'vitest'; + +import { amountIn } from '../../../native-shell/amount'; + +// FE-NATIVE-AMOUNT-001 to FE-NATIVE-AMOUNT-005 +// +// The amount inside a store price string (client/native-shell/amount.ts): read +// as a number, and written again in the same format, so the plan picker can +// count a price up and turn a yearly price into a monthly one in any currency. + +describe('native shell price amounts', () => { + it('FE-NATIVE-AMOUNT-001: a euro price with a decimal comma reads and writes back the same way', () => { + const amount = amountIn('4,90 €'); + expect(amount?.value).toBe(4.9); + expect(amount?.render(4.9)).toBe('4,90 €'); + expect(amount?.render(79 / 12)).toBe('6,58 €'); + }); + + it('FE-NATIVE-AMOUNT-002: a dollar price keeps its sign in front and its decimal point', () => { + const amount = amountIn('$199.00'); + expect(amount?.value).toBe(199); + expect(amount?.render(199 / 12)).toBe('$16.58'); + }); + + it('FE-NATIVE-AMOUNT-003: thousands keep their grouping mark', () => { + expect(amountIn('1.290 ₽')?.value).toBe(1290); + expect(amountIn('1.290 ₽')?.render(12345)).toBe('12.345 ₽'); + expect(amountIn('CHF 1’290.50')?.value).toBe(1290.5); + expect(amountIn('CHF 1’290.50')?.render(2000)).toBe('CHF 2’000.00'); + expect(amountIn("CHF 1'290.50")?.render(2000)).toBe("CHF 2'000.00"); + }); + + it('FE-NATIVE-AMOUNT-004: a price without figures has no amount', () => { + expect(amountIn('')).toBeNull(); + expect(amountIn('Free')).toBeNull(); + }); + + it('FE-NATIVE-AMOUNT-005: a count never runs below zero', () => { + expect(amountIn('4,90 €')?.render(-3)).toBe('0,00 €'); + }); +}); diff --git a/client/tests/unit/native/nativeShell.test.ts b/client/tests/unit/native/nativeShell.test.ts index 80cddc2cf..fcb824655 100644 --- a/client/tests/unit/native/nativeShell.test.ts +++ b/client/tests/unit/native/nativeShell.test.ts @@ -51,46 +51,50 @@ describe('native shell', () => { it('FE-NATIVE-SHELL-002: the first screens speak without dashes as punctuation', () => { for (const code of ['en', 'de']) { const t = translator(code); - for (const key of ['native.welcome.sub', 'native.cloud.sub', 'native.cloud.f3']) { + for (const key of ['native.welcome.lead', 'native.plans.yearlyIs', 'native.provisioning.readySub']) { expect(t(key)).not.toMatch(/[\u2013\u2014]| - /); } } }); - it("FE-NATIVE-SHELL-003: Russian keeps TREK's faces through Cyrillic stand-ins under the same family names", () => { + it("FE-NATIVE-SHELL-003: Russian keeps the shell's faces through Cyrillic stand-ins under the same family names", () => { const faces = css.match(/@font-face\s*\{[^}]*\}/g) ?? []; const cyrillic = faces.filter((f) => /unicode-range:\s*U\+0301, U\+0400-045F/.test(f)); expect(cyrillic.filter((f) => /font-family:\s*'Poppins'/.test(f))).toHaveLength(3); - expect(cyrillic.filter((f) => /font-family:\s*'MuseoModerno'/.test(f))).toHaveLength(1); - for (const face of cyrillic) { + expect(cyrillic.filter((f) => /font-family:\s*'Plus Jakarta Sans'/.test(f))).toHaveLength(3); + for (const face of faces) { const file = /url\('\.\/fonts\/([^']+)'\)/.exec(face)?.[1]; expect(file).toBeTruthy(); expect(() => readFileSync(resolve(process.cwd(), 'native-shell/fonts', file as string))).not.toThrow(); } }); - it('FE-NATIVE-SHELL-004: a short screen on its side puts the two halves of a screen side by side', () => { - const compact = /orientation: landscape\) and \(max-height: 500px\)/; - expect(find('.screen:has(> .col)', compact)[0]?.body).toMatch( - /grid-template-columns:\s*minmax\(0, 1fr\) minmax\(0, 1fr\)/ - ); - expect(find('.col-about', compact)[0]?.body).toMatch(/position:\s*sticky/); - // Everywhere else the halves are no boxes of their own: one column, as before. - expect(find('.col')[0]?.body).toMatch(/display:\s*contents/); + it('FE-NATIVE-SHELL-004: a wide screen or a phone on its side puts the landscape beside a column of its own', () => { + const wide = /min-width: 900px\), \(orientation: landscape\) and \(max-height: 500px\)/; + expect(find('.scr', wide)[0]?.body).toMatch(/flex-direction:\s*row/); + expect(find('.body', wide)[0]?.body).toMatch(/overflow-y:\s*auto/); + // On a phone the content is no box of its own: it flows in the screen's column. + expect(find('.body')[0]?.body).toMatch(/display:\s*contents/); + // Two screens with a hinge: the landscape on one, the content on the other. + expect(find('.body', /horizontal-viewport-segments: 2/)[0]?.body).toMatch(/env\(viewport-segment-width 1 0\)/); }); it('FE-NATIVE-SHELL-005: a screen taller than the window scrolls instead of overflowing both edges', () => { - expect(find('.screen')[0]?.body).toMatch(/margin-block:\s*auto/); + expect(find('.scr')[0]?.body).toMatch(/overflow-y:\s*auto/); const shell = find('.shell')[0]?.body ?? ''; expect(shell).toMatch(/overflow-x:\s*clip/); expect(shell).not.toMatch(/justify-content:\s*center/); + // The button at the foot stays in reach while the screen scrolls under it. + expect(find('.dock')[0]?.body).toMatch(/position:\s*sticky/); }); - it('FE-NATIVE-SHELL-006: in Arabic the chevrons sit at the far edge and point along the reading direction, the price stands apart', () => { - expect(find('.btn .chev')[0]?.body).toMatch(/margin-inline-start:\s*auto/); - expect(find(":root[dir='rtl'] .chev")[0]?.body).toMatch(/transform:\s*scaleX\(-1\)/); - expect(find('.plan-price small')[0]?.body).toMatch(/margin-inline-start:\s*7px/); - expect(find('.btn-row')[0]?.body).toMatch(/text-align:\s*start/); - expect(css).not.toMatch(/margin-left|margin-right|padding-left|padding-right|text-align:\s*left/); + it('FE-NATIVE-SHELL-006: in Arabic and Hebrew the layout mirrors through logical sides only', () => { + expect(find(":root[dir='rtl'] .back svg")[0]?.body).toMatch(/transform:\s*scaleX\(-1\)/); + expect(find(":root[dir='rtl'] .cycle[data-year='true'] .thumb")[0]?.body).toMatch(/translateX\(-100%\)/); + expect(find('.fld .edge')[0]?.body).toMatch(/inset-inline-end:\s*14px/); + expect(find('.card')[0]?.body).toMatch(/inset-inline:/); + expect(css).not.toMatch( + /margin-left|margin-right|padding-left|padding-right|text-align:\s*left|[^-]left:\s|[^-]right:\s/ + ); }); }); diff --git a/shared/src/i18n/ar/native.ts b/shared/src/i18n/ar/native.ts index 8854b2777..12d65fbd0 100644 --- a/shared/src/i18n/ar/native.ts +++ b/shared/src/i18n/ar/native.ts @@ -30,43 +30,22 @@ const native: TranslationStrings = { 'native.privacy': 'سياسة الخصوصية', 'native.settings.server': 'الخادم', 'native.settings.serverHint': 'هذا التطبيق متصل بـ {server}.', - 'native.welcome.headline': 'رحلاتك.\nخطتك.', - 'native.welcome.sub': 'خطّطوا معًا في الوقت الفعلي: جولات وميزانيات ويوميات وألبوم صور، بمساعدة الذكاء الاصطناعي.', - 'native.welcome.connect': 'اربط TREK الخاص بك', - 'native.welcome.connectSub': 'افتح العنوان الذي تستخدمه بالفعل', - 'native.welcome.getCloud': 'احصل على TREK Cloud', - 'native.welcome.getCloudSub': 'مُستضاف من أجلك، دون إعداد', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': 'نستضيف TREK من أجلك، على عنوانك الخاص. لا شيء لتثبيته أو صيانته: جاهز في دقائق.', - 'native.cloud.f1': 'عنوانك الخاص، على خوادم في ألمانيا', - 'native.cloud.f2': 'جاهز في دقائق، والتحديثات على عاتقنا', - 'native.cloud.f3': 'بياناتك تبقى لك: بلا إعلانات، بلا تتبّع', - 'native.cloud.cta': 'ابدأ', 'native.cloud.haveServer': 'لديّ خادم TREK بالفعل', - 'native.connecting': 'جارٍ الاتصال بـ {host}', 'native.back': 'رجوع', 'native.plans.title': 'اختر خطتك', - 'native.plans.sub': 'TREK مُستضاف على عنوانك الخاص. غيّر أو ألغِ في أي وقت.', 'native.plans.monthly': 'شهريًا', 'native.plans.yearly': 'سنويًا', 'native.plans.perMonth': 'شهريًا', 'native.plans.perYear': 'سنويًا', - 'native.plans.aiDocs': '{n} مستند بالذكاء الاصطناعي شهريًا', - 'native.plans.noAi': 'بلا مستندات ذكاء اصطناعي', - 'native.plans.storage': '{n} غيغابايت تخزين', 'native.plans.loadError': 'تعذّر تحميل الخطط. تحقق من اتصالك وحاول مرة أخرى.', 'native.plans.retry': 'حاول مرة أخرى', 'native.plans.soon': 'الاشتراك داخل التطبيق غير متاح بعد.', 'native.plans.closed': 'يفتح TREK Cloud قريبًا. يمكنك الاشتراك هنا اعتبارًا من يوم الافتتاح.', - 'native.claim.title': 'اقتربنا من الانتهاء', - 'native.claim.sub': 'اختر عنوانك. سنُعدّه على الفور.', 'native.claim.addressLabel': 'عنوانك', 'native.claim.taken': 'هذا العنوان مُستخدَم.', 'native.claim.invalid': 'ثلاثة أحرف أو أرقام أو شرطات أو أكثر.', 'native.claim.reserved': 'هذا العنوان محجوز.', - 'native.claim.free': 'متاح', 'native.claim.emailLabel': 'البريد الإلكتروني', - 'native.claim.emailHint': 'لحسابك والرسائل المتعلقة بعقدك.', 'native.claim.passwordLabel': 'كلمة المرور', 'native.claim.passwordHint': '8 أحرف على الأقل. يجب أن تحتوي كلمة المرور على حرف كبير وحرف صغير ورقم ورمز خاص.', 'native.claim.subscribe': 'اشترك مقابل {price}', @@ -80,23 +59,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'تعذّرت استعادة TREK الخاص بك. حاول مرة أخرى.', 'native.plans.legal': 'يُخصم المبلغ من معرّف Apple عند التأكيد. يتجدد الاشتراك تلقائيًا ما لم تلغه قبل 24 ساعة على الأقل من نهاية الفترة. يمكنك إدارته أو إلغاؤه من إعدادات حسابك في App Store.', - 'native.plans.terms': 'شروط استخدام Apple (EULA)', 'native.plans.ourTerms': 'شروط TREK Cloud', 'native.plans.legalAndroid': 'يُخصم المبلغ من حساب Google الخاص بك عند التأكيد. يتجدد الاشتراك تلقائيًا ما لم تلغِه قبل نهاية الفترة. يمكنك إدارته أو إلغاؤه في Google Play من الملف الشخصي، الدفعات والاشتراكات، الاشتراكات.', 'native.plans.restoreNoneAndroid': 'لم يُعثر على اشتراك نشط في حساب Google هذا.', 'native.plans.recommended': 'موصى به', - 'native.plans.everyPlan': 'في كل خطة: أماكن ورحلات وأشخاص بلا حدود', - 'native.plans.continueWith': 'المتابعة مع {plan}', 'native.claim.change': 'تغيير', 'native.claim.ruleLength': 'أحرف', 'native.claim.ruleUpper': 'حرف كبير', 'native.claim.ruleLower': 'حرف صغير', 'native.claim.ruleDigit': 'رقم', 'native.claim.ruleSpecial': 'رمز', - 'native.claim.trustServers': 'خوادم في ألمانيا', - 'native.claim.trustCancel': 'إلغاء في أي وقت', - 'native.claim.trustNoAds': 'بلا إعلانات', 'native.subscribed.title': 'لديك TREK Cloud بالفعل', 'native.subscribed.text': 'يوجد بالفعل اشتراك نشط في TREK Cloud على معرّف Apple هذا. يمكنك الاشتراك من جديد، وبعنوان جديد أيضًا، بعد انتهائه.', @@ -202,6 +175,63 @@ const native: TranslationStrings = { 'native.cert.settingRemove': 'إزالة', 'native.cert.removeTitle': 'إزالة الشهادة؟', 'native.cert.removeMessage': 'من دونها لن يسمح الوكيل أمام {host} بدخول التطبيق حتى تضيف شهادة جديدة.', + 'native.welcome.title': 'إلى أين الرحلة القادمة؟', + 'native.welcome.lead': 'خطّطوا معًا لوجهتكم. يجمع TREK المسار والحجوزات والصور في مكان واحد.', + 'native.welcome.routeTitle': 'المسار والخريطة', + 'native.welcome.routeSub': 'يومًا بيوم، مع الطرق والأوقات', + 'native.welcome.togetherTitle': 'التخطيط معًا', + 'native.welcome.togetherSub': 'يرى الجميع كل تغيير فورًا', + 'native.welcome.photosTitle': 'الصور وكتاب الصور', + 'native.welcome.photosSub': 'تبقى الذكريات مع الرحلة', + 'native.welcome.discover': 'استكشف خطط السحابة', + 'native.trip.start.title': 'رحلة نهاية الأسبوع', + 'native.trip.start.text': 'رحلات قصيرة، والتخطيط أولًا.', + 'native.trip.basis.title': 'جولة', + 'native.trip.basis.text': 'عدة محطات، والحجوزات تلقائيًا.', + 'native.trip.plus.title': 'رحلة كبيرة', + 'native.trip.plus.text': 'أسابيع في الطريق، مع المجموعة كلها.', + 'native.trip.pro.title': 'رحّالة', + 'native.trip.pro.text': 'لمن يسافر كثيرًا ولكتب الصور الكبيرة.', + 'native.plans.unlimited': 'بلا حدود', + 'native.plans.unlimitedSub': 'الرحلات ورفاق السفر', + 'native.plans.inEveryPlan': 'في كل خطة', + 'native.plans.yearlyIs': '{price} سنويًا، ألغِ في أي وقت', + 'native.plans.monthlyIs': 'أي {price} شهريًا', + 'native.plans.photos': '≈ {n} صورة', + 'native.plans.aiPerMonth': '{n} / شهر', + 'native.plans.aiNone': 'لا شيء', + 'native.plans.aiLabel': 'مستندات الذكاء الاصطناعي', + 'native.plans.choose': 'اختر {trip}', + 'native.plans.termsShort': 'شروط الاستخدام (EULA)', + 'native.plans.privacyShort': 'الخصوصية', + 'native.plans.billing': 'الدفع', + 'native.claim.almost': 'اقتربنا', + 'native.claim.addressField': 'العنوان', + 'native.claim.slugPlaceholder': 'yourname', // same-as-en + 'native.claim.emailPlaceholder': 'you@example.com', // same-as-en + 'native.claim.passwordPlaceholder': 'اختر كلمة مرور', + 'native.claim.freeBadge': 'متاح', + 'native.claim.renews': 'يتجدّد تلقائيًا، ألغِ في أي وقت.', + 'native.claim.showPassword': 'إظهار كلمة المرور', + 'native.connect.yourTrek': 'TREK الخاص بك', + 'native.connect.addressField': 'عنوان الخادم', + 'native.connect.found': 'تم العثور على TREK', + 'native.connect.connected': 'متصل', + 'native.connect.addCert': 'إضافة شهادة عميل', + 'native.connect.recheck': 'تحقّق مجددًا', + 'native.connect.kickerUnreachable': 'غير متاح', + 'native.connect.kickerNotTrek': 'ليس TREK', + 'native.connect.kickerTooOld': 'يلزم تحديث', + 'native.connect.kickerCert': 'تلزم شهادة', + 'native.connect.kickerGate': 'يلزم تسجيل الدخول', + 'native.subscribed.kicker': 'اشتراك نشط', + 'native.provisioning.kicker': 'جارٍ الإعداد', + 'native.provisioning.stepAddress': 'تم حجز العنوان', + 'native.provisioning.stepServer': 'الخادم يبدأ', + 'native.provisioning.stepReady': 'جاهز', + 'native.provisioning.readyTitle': 'وصلنا.', + 'native.provisioning.readySub': 'TREK الخاص بك جاهز. ادعُ من يسافرون معك.', + 'native.provisioning.open': 'خطّط لرحلة', }; export default native; diff --git a/shared/src/i18n/az/native.ts b/shared/src/i18n/az/native.ts index 9462f9c1b..b9f0ca7f2 100644 --- a/shared/src/i18n/az/native.ts +++ b/shared/src/i18n/az/native.ts @@ -30,45 +30,22 @@ const native: TranslationStrings = { 'native.privacy': 'Məxfilik siyasəti', 'native.settings.server': 'Server', // same-as-en 'native.settings.serverHint': 'Bu tətbiq {server} serverinə qoşulub.', - 'native.welcome.headline': 'Səyahətlərin.\nPlanın.', - 'native.welcome.sub': - 'Real vaxtda birlikdə planlayın: turlar, büdcələr, jurnallar və foto kitab, süni intellektin köməyi ilə.', - 'native.welcome.connect': 'TREK-inizi qoşun', - 'native.welcome.connectSub': 'Artıq istifadə etdiyiniz ünvanı açın', - 'native.welcome.getCloud': 'TREK Cloud əldə edin', - 'native.welcome.getCloudSub': 'Sizin üçün hostlanır, quraşdırma yoxdur', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': - 'TREK-i sizin üçün, öz ünvanınızda hostlayırıq. Quraşdırmaq lazım deyil, saxlamaq lazım deyil: bir neçə dəqiqəyə hazırdır.', - 'native.cloud.f1': 'Öz ünvanınız, Almaniyadakı serverlərdə', - 'native.cloud.f2': 'Bir neçə dəqiqəyə hazır, yeniləmələr bizdən', - 'native.cloud.f3': 'Məlumatlarınız sizin qalır: reklam yoxdur, izləmə yoxdur', - 'native.cloud.cta': 'Başla', 'native.cloud.haveServer': 'Artıq TREK serverim var', - 'native.connecting': '{host} ünvanına qoşulur', 'native.back': 'Geri', 'native.plans.title': 'Planınızı seçin', - 'native.plans.sub': 'Öz ünvanınızda hostlanan TREK. İstənilən vaxt dəyişin və ya ləğv edin.', 'native.plans.monthly': 'Aylıq', 'native.plans.yearly': 'İllik', 'native.plans.perMonth': 'ayda', 'native.plans.perYear': 'ildə', - 'native.plans.aiDocs': 'ayda {n} süni intellekt sənədi', - 'native.plans.noAi': 'Süni intellekt sənədi yoxdur', - 'native.plans.storage': '{n} GB yaddaş', 'native.plans.loadError': 'Planları yükləmək mümkün olmadı. Bağlantınızı yoxlayın və yenidən cəhd edin.', 'native.plans.retry': 'Yenidən cəhd edin', 'native.plans.soon': 'Tətbiqdaxili abunə hələ mövcud deyil.', 'native.plans.closed': 'TREK Cloud tezliklə açılır. Açılış günündən etibarən burada abunə ola bilərsiniz.', - 'native.claim.title': 'Az qaldı', - 'native.claim.sub': 'Ünvanınızı seçin. Dərhal hazırlayırıq.', 'native.claim.addressLabel': 'Ünvanınız', 'native.claim.taken': 'Bu ünvan tutulub.', 'native.claim.invalid': 'Üç və ya daha çox hərf, rəqəm və defis.', 'native.claim.reserved': 'Bu ünvan ehtiyat saxlanılıb.', - 'native.claim.free': 'Əlçatandır', 'native.claim.emailLabel': 'E-poçt', - 'native.claim.emailHint': 'Hesabınız və müqavilənizlə bağlı bildirişlər üçün.', 'native.claim.passwordLabel': 'Parol', 'native.claim.passwordHint': 'Ən azı 8 simvol. Parolda böyük hərf, kiçik hərf, rəqəm və xüsusi simvol olmalıdır.', 'native.claim.subscribe': '{price} qarşılığında abunə ol', @@ -83,23 +60,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'TREK-inizi bərpa edə bilmədik. Zəhmət olmasa yenidən cəhd edin.', 'native.plans.legal': 'Ödəniş təsdiq zamanı Apple ID-nizdən tutulur. Dövrün bitməsinə ən azı 24 saat qalmış ləğv etməsəniz, abunə avtomatik yenilənir. Onu App Store hesab ayarlarınızda idarə edə və ya ləğv edə bilərsiniz.', - 'native.plans.terms': 'Apple istifadə şərtləri (EULA)', 'native.plans.ourTerms': 'TREK Cloud şərtləri', 'native.plans.legalAndroid': 'Ödəniş təsdiq etdikdə Google hesabınızdan tutulur. Abunəlik dövr bitməzdən əvvəl ləğv etməsəniz avtomatik yenilənir. Onu Google Play-də Profil, Ödənişlər və abunəliklər, Abunəliklər bölməsində idarə edə və ya ləğv edə bilərsiniz.', 'native.plans.restoreNoneAndroid': 'Bu Google hesabında aktiv abunəlik tapılmadı.', 'native.plans.recommended': 'Tövsiyə olunur', - 'native.plans.everyPlan': 'Hər planda: limitsiz yerlər, səfərlər və insanlar', - 'native.plans.continueWith': '{plan} ilə davam et', 'native.claim.change': 'Dəyiş', 'native.claim.ruleLength': 'simvol', 'native.claim.ruleUpper': 'Böyük hərf', 'native.claim.ruleLower': 'Kiçik hərf', 'native.claim.ruleDigit': 'Rəqəm', 'native.claim.ruleSpecial': 'Xüsusi simvol', - 'native.claim.trustServers': 'Serverlər Almaniyada', - 'native.claim.trustCancel': 'İstənilən vaxt ləğv et', - 'native.claim.trustNoAds': 'Reklamsız', 'native.subscribed.title': 'Artıq TREK Cloud-unuz var', 'native.subscribed.text': 'Bu Apple ID-də artıq aktiv TREK Cloud abunəliyi var. O bitdikdən sonra yenisini, həm də yeni ünvanla, ala bilərsiniz.', @@ -208,6 +179,64 @@ const native: TranslationStrings = { 'native.cert.settingRemove': 'Sil', 'native.cert.removeTitle': 'Sertifikat silinsin?', 'native.cert.removeMessage': 'Onsuz {host} qarşısındakı proksi yenisini əlavə edənə qədər tətbiqi buraxmayacaq.', + 'native.welcome.title': 'Növbəti səyahət haraya?', + 'native.welcome.lead': + 'Haraya gedəcəyinizi birlikdə planlayın. TREK marşrutu, rezervasiyaları və fotoları bir yerdə saxlayır.', + 'native.welcome.routeTitle': 'Marşrut və xəritə', + 'native.welcome.routeSub': 'Gün-gün, yollar və vaxtlarla', + 'native.welcome.togetherTitle': 'Birlikdə planlaşdırın', + 'native.welcome.togetherSub': 'Hər kəs hər dəyişikliyi dərhal görür', + 'native.welcome.photosTitle': 'Fotolar və foto kitab', + 'native.welcome.photosSub': 'Xatirələr səyahətlə qalır', + 'native.welcome.discover': 'Bulud planlarına baxın', + 'native.trip.start.title': 'Həftəsonu səfəri', + 'native.trip.start.text': 'Qısa səfərlər, əsasən planlaşdırma.', + 'native.trip.basis.title': 'Tur', + 'native.trip.basis.text': 'Bir neçə dayanacaq, rezervasiyalar avtomatik.', + 'native.trip.plus.title': 'Böyük səyahət', + 'native.trip.plus.text': 'Həftələrlə yolda, bütün qrupla.', + 'native.trip.pro.title': 'Dünya səyyahı', + 'native.trip.pro.text': 'Tez-tez səyahət edənlər və böyük foto kitablar üçün.', + 'native.plans.unlimited': 'Limitsiz', + 'native.plans.unlimitedSub': 'Səfərlər və yol yoldaşları', + 'native.plans.inEveryPlan': 'hər planda', + 'native.plans.yearlyIs': 'İllik {price}, istənilən vaxt ləğv edin', + 'native.plans.monthlyIs': 'Bu, ayda {price} edir', + 'native.plans.photos': '≈ {n} foto', + 'native.plans.aiPerMonth': '{n} / ay', + 'native.plans.aiNone': 'Yoxdur', + 'native.plans.aiLabel': 'Sİ sənədləri', + 'native.plans.choose': '{trip} seçin', + 'native.plans.termsShort': 'İstifadə şərtləri (EULA)', + 'native.plans.privacyShort': 'Məxfilik', + 'native.plans.billing': 'Ödəniş', + 'native.claim.almost': 'Az qaldı', + 'native.claim.addressField': 'Ünvan', + 'native.claim.slugPlaceholder': 'adiniz', + 'native.claim.emailPlaceholder': 'siz@numune.az', + 'native.claim.passwordPlaceholder': 'Parol seçin', + 'native.claim.freeBadge': 'boşdur', + 'native.claim.renews': 'Avtomatik yenilənir, istənilən vaxt ləğv edin.', + 'native.claim.showPassword': 'Parolu göstər', + 'native.connect.yourTrek': 'Sizin TREK', + 'native.connect.addressField': 'Server ünvanı', + 'native.connect.found': 'TREK tapıldı', + 'native.connect.connected': 'Qoşuldu', + 'native.connect.addCert': 'Müştəri sertifikatı əlavə edin', + 'native.connect.recheck': 'Yenidən yoxlayın', + 'native.connect.kickerUnreachable': 'Əlçatan deyil', + 'native.connect.kickerNotTrek': 'TREK deyil', + 'native.connect.kickerTooOld': 'Yeniləmə lazımdır', + 'native.connect.kickerCert': 'Sertifikat lazımdır', + 'native.connect.kickerGate': 'Giriş lazımdır', + 'native.subscribed.kicker': 'Aktiv abunə', + 'native.provisioning.kicker': 'Qurulur', + 'native.provisioning.stepAddress': 'Ünvan rezerv edildi', + 'native.provisioning.stepServer': 'Server başlayır', + 'native.provisioning.stepReady': 'Hazırdır', + 'native.provisioning.readyTitle': 'Çatdıq.', + 'native.provisioning.readySub': 'TREK-iniz hazırdır. Sizinlə səyahət edənləri dəvət edin.', + 'native.provisioning.open': 'Səyahət planlaşdırın', }; export default native; diff --git a/shared/src/i18n/br/native.ts b/shared/src/i18n/br/native.ts index 6c3e0b336..2243cec68 100644 --- a/shared/src/i18n/br/native.ts +++ b/shared/src/i18n/br/native.ts @@ -30,44 +30,22 @@ const native: TranslationStrings = { 'native.privacy': 'Política de privacidade', 'native.settings.server': 'Servidor', 'native.settings.serverHint': 'Este app está conectado a {server}.', - 'native.welcome.headline': 'Suas viagens.\nSeu plano.', - 'native.welcome.sub': 'Planejem juntos em tempo real: roteiros, orçamentos, diário e fotolivro, com a ajuda da IA.', - 'native.welcome.connect': 'Conecte seu TREK', - 'native.welcome.connectSub': 'Abra o endereço que você já usa', - 'native.welcome.getCloud': 'Obter o TREK Cloud', - 'native.welcome.getCloudSub': 'Hospedado para você, sem instalação', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': - 'Nós hospedamos o TREK para você, no seu próprio endereço. Nada para instalar, nada para manter: pronto em minutos.', - 'native.cloud.f1': 'Seu próprio endereço, em servidores na Alemanha', - 'native.cloud.f2': 'Pronto em minutos, com as atualizações por nossa conta', - 'native.cloud.f3': 'Seus dados continuam seus: sem anúncios, sem rastreamento', - 'native.cloud.cta': 'Começar', 'native.cloud.haveServer': 'Já tenho um servidor TREK', - 'native.connecting': 'Conectando a {host}', 'native.back': 'Voltar', 'native.plans.title': 'Escolha seu plano', - 'native.plans.sub': 'TREK hospedado no seu próprio endereço. Altere ou cancele quando quiser.', 'native.plans.monthly': 'Mensal', 'native.plans.yearly': 'Anual', 'native.plans.perMonth': 'por mês', 'native.plans.perYear': 'por ano', - 'native.plans.aiDocs': '{n} documentos com IA por mês', - 'native.plans.noAi': 'Sem documentos com IA', - 'native.plans.storage': '{n} GB de armazenamento', 'native.plans.loadError': 'Não foi possível carregar os planos. Verifique sua conexão e tente novamente.', 'native.plans.retry': 'Tentar de novo', 'native.plans.soon': 'A assinatura no app ainda não está disponível.', 'native.plans.closed': 'O TREK Cloud abre em breve. Você poderá assinar aqui a partir do dia da abertura.', - 'native.claim.title': 'Quase lá', - 'native.claim.sub': 'Escolha seu endereço. Preparamos tudo na hora.', 'native.claim.addressLabel': 'Seu endereço', 'native.claim.taken': 'Esse endereço já está em uso.', 'native.claim.invalid': 'Três ou mais letras, números e hifens.', 'native.claim.reserved': 'Esse endereço está reservado.', - 'native.claim.free': 'Disponível', 'native.claim.emailLabel': 'E-mail', - 'native.claim.emailHint': 'Para sua conta e avisos sobre seu contrato.', 'native.claim.passwordLabel': 'Senha', 'native.claim.passwordHint': 'Pelo menos 8 caracteres. A senha deve ter maiúscula, minúscula, número e um caractere especial.', @@ -83,23 +61,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'Não conseguimos restaurar seu TREK. Tente novamente.', 'native.plans.legal': 'O pagamento é cobrado no seu ID Apple ao confirmar. A assinatura é renovada automaticamente, a menos que seja cancelada pelo menos 24 horas antes do fim do período. Gerencie ou cancele nos ajustes da sua conta da App Store.', - 'native.plans.terms': 'Termos de uso da Apple (EULA)', 'native.plans.ourTerms': 'Termos do TREK Cloud', 'native.plans.legalAndroid': 'O pagamento é cobrado na sua conta Google ao confirmar. A assinatura é renovada automaticamente, a menos que você a cancele antes do fim do período. Gerencie ou cancele no Google Play em Perfil, Pagamentos e assinaturas, Assinaturas.', 'native.plans.restoreNoneAndroid': 'Nenhuma assinatura ativa encontrada nesta conta Google.', 'native.plans.recommended': 'Recomendado', - 'native.plans.everyPlan': 'Em todo plano: lugares, viagens e pessoas ilimitados', - 'native.plans.continueWith': 'Continuar com {plan}', 'native.claim.change': 'Alterar', 'native.claim.ruleLength': 'caracteres', 'native.claim.ruleUpper': 'Maiúscula', 'native.claim.ruleLower': 'Minúscula', 'native.claim.ruleDigit': 'Número', 'native.claim.ruleSpecial': 'Símbolo', - 'native.claim.trustServers': 'Servidores na Alemanha', - 'native.claim.trustCancel': 'Cancele quando quiser', - 'native.claim.trustNoAds': 'Sem anúncios', 'native.subscribed.title': 'Você já tem o TREK Cloud', 'native.subscribed.text': 'Este ID Apple já tem uma assinatura ativa do TREK Cloud. Você pode fazer uma nova, inclusive com um novo endereço, quando ela terminar.', @@ -210,6 +182,63 @@ const native: TranslationStrings = { 'native.cert.removeTitle': 'Remover o certificado?', 'native.cert.removeMessage': 'Sem ele, o proxy na frente de {host} não deixa mais o app entrar até você adicionar outro.', + 'native.welcome.title': 'Para onde vamos agora?', + 'native.welcome.lead': 'Planejem juntos para onde vão. O TREK guarda roteiro, reservas e fotos em um só lugar.', + 'native.welcome.routeTitle': 'Roteiro e mapa', + 'native.welcome.routeSub': 'Dia a dia, com trajetos e horários', + 'native.welcome.togetherTitle': 'Planejar juntos', + 'native.welcome.togetherSub': 'Todos veem cada mudança na hora', + 'native.welcome.photosTitle': 'Fotos e fotolivro', + 'native.welcome.photosSub': 'As memórias ficam com a viagem', + 'native.welcome.discover': 'Conhecer os planos na nuvem', + 'native.trip.start.title': 'Fim de semana', + 'native.trip.start.text': 'Viagens curtas, mais planejamento.', + 'native.trip.basis.title': 'Roteiro', + 'native.trip.basis.text': 'Vários destinos, reservas automáticas.', + 'native.trip.plus.title': 'Grande viagem', + 'native.trip.plus.text': 'Semanas na estrada, com o grupo todo.', + 'native.trip.pro.title': 'Viajante do mundo', + 'native.trip.pro.text': 'Para quem viaja muito e faz fotolivros grandes.', + 'native.plans.unlimited': 'Ilimitado', + 'native.plans.unlimitedSub': 'Viagens e companheiros de viagem', + 'native.plans.inEveryPlan': 'em todos os planos', + 'native.plans.yearlyIs': '{price} por ano, cancele quando quiser', + 'native.plans.monthlyIs': 'São {price} por mês', + 'native.plans.photos': '≈ {n} fotos', + 'native.plans.aiPerMonth': '{n} / mês', + 'native.plans.aiNone': 'Nenhum', + 'native.plans.aiLabel': 'Documentos de IA', + 'native.plans.choose': 'Escolher {trip}', + 'native.plans.termsShort': 'Termos de uso (EULA)', + 'native.plans.privacyShort': 'Privacidade', + 'native.plans.billing': 'Cobrança', + 'native.claim.almost': 'Quase lá', + 'native.claim.addressField': 'Endereço', + 'native.claim.slugPlaceholder': 'seunome', + 'native.claim.emailPlaceholder': 'voce@exemplo.com.br', + 'native.claim.passwordPlaceholder': 'Escolha uma senha', + 'native.claim.freeBadge': 'livre', + 'native.claim.renews': 'Renova automaticamente, cancele quando quiser.', + 'native.claim.showPassword': 'Mostrar senha', + 'native.connect.yourTrek': 'Seu TREK', + 'native.connect.addressField': 'Endereço do servidor', + 'native.connect.found': 'TREK encontrado', + 'native.connect.connected': 'Conectado', + 'native.connect.addCert': 'Adicionar certificado de cliente', + 'native.connect.recheck': 'Verificar de novo', + 'native.connect.kickerUnreachable': 'Inacessível', + 'native.connect.kickerNotTrek': 'Não é TREK', + 'native.connect.kickerTooOld': 'Atualização necessária', + 'native.connect.kickerCert': 'Certificado necessário', + 'native.connect.kickerGate': 'Login necessário', + 'native.subscribed.kicker': 'Assinatura ativa', + 'native.provisioning.kicker': 'Configurando', + 'native.provisioning.stepAddress': 'Endereço reservado', + 'native.provisioning.stepServer': 'Servidor iniciando', + 'native.provisioning.stepReady': 'Pronto', + 'native.provisioning.readyTitle': 'Chegamos.', + 'native.provisioning.readySub': 'Seu TREK está pronto. Convide quem viaja com você.', + 'native.provisioning.open': 'Planejar uma viagem', }; export default native; diff --git a/shared/src/i18n/ca/native.ts b/shared/src/i18n/ca/native.ts index de9c5cd7f..822a68b35 100644 --- a/shared/src/i18n/ca/native.ts +++ b/shared/src/i18n/ca/native.ts @@ -30,45 +30,22 @@ const native: TranslationStrings = { 'native.privacy': 'Política de privadesa', 'native.settings.server': 'Servidor', 'native.settings.serverHint': 'Aquesta app està connectada a {server}.', - 'native.welcome.headline': 'Els teus viatges.\nEl teu pla.', - 'native.welcome.sub': - 'Planifiqueu junts en temps real: rutes, pressupostos, diari i fotollibre, amb l’ajuda de la IA.', - 'native.welcome.connect': 'Connecta el teu TREK', - 'native.welcome.connectSub': 'Obre l’adreça que ja fas servir', - 'native.welcome.getCloud': 'Obtén el TREK Cloud', - 'native.welcome.getCloudSub': 'Allotjat per tu, sense instal·lació', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': - 'Allotgem el TREK per tu, a la teva pròpia adreça. Res a instal·lar, res a mantenir: a punt en minuts.', - 'native.cloud.f1': 'La teva pròpia adreça, en servidors a Alemanya', - 'native.cloud.f2': 'A punt en minuts, amb les actualitzacions a càrrec nostre', - 'native.cloud.f3': 'Les teves dades segueixen sent teves: sense anuncis, sense seguiment', - 'native.cloud.cta': 'Comença', 'native.cloud.haveServer': 'Ja tinc un servidor TREK', - 'native.connecting': 'Connectant a {host}', 'native.back': 'Enrere', 'native.plans.title': 'Tria el teu pla', - 'native.plans.sub': 'TREK allotjat a la teva pròpia adreça. Canvia o cancel·la quan vulguis.', 'native.plans.monthly': 'Mensual', 'native.plans.yearly': 'Anual', 'native.plans.perMonth': 'al mes', 'native.plans.perYear': 'a l’any', - 'native.plans.aiDocs': '{n} documents amb IA al mes', - 'native.plans.noAi': 'Sense documents amb IA', - 'native.plans.storage': '{n} GB d’emmagatzematge', 'native.plans.loadError': 'No s’han pogut carregar els plans. Comprova la connexió i torna-ho a provar.', 'native.plans.retry': 'Torna-ho a provar', 'native.plans.soon': 'La subscripció a l’app encara no està disponible.', 'native.plans.closed': 'TREK Cloud obre aviat. Podràs subscriure’t aquí des del dia de l’obertura.', - 'native.claim.title': 'Gairebé a punt', - 'native.claim.sub': 'Tria la teva adreça. Ho preparem de seguida.', 'native.claim.addressLabel': 'La teva adreça', 'native.claim.taken': 'Aquesta adreça ja està ocupada.', 'native.claim.invalid': 'Tres o més lletres, xifres i guions.', 'native.claim.reserved': 'Aquesta adreça està reservada.', - 'native.claim.free': 'Disponible', 'native.claim.emailLabel': 'Correu', - 'native.claim.emailHint': 'Per al teu compte i els avisos sobre el teu contracte.', 'native.claim.passwordLabel': 'Contrasenya', 'native.claim.passwordHint': 'Almenys 8 caràcters. La contrasenya ha de contenir majúscules, minúscules, números i un caràcter especial.', @@ -84,23 +61,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'No hem pogut restaurar el teu TREK. Torna-ho a provar.', 'native.plans.legal': 'El pagament es carrega al teu ID d’Apple en confirmar. La subscripció es renova automàticament si no la cancel·les com a mínim 24 hores abans que acabi el període. Gestiona-la o cancel·la-la a la configuració del teu compte de l’App Store.', - 'native.plans.terms': 'Condicions d’ús d’Apple (EULA)', 'native.plans.ourTerms': 'Condicions de TREK Cloud', 'native.plans.legalAndroid': 'El pagament es carrega al teu compte de Google en confirmar. La subscripció es renova automàticament si no la cancel·les abans que acabi el període. Gestiona-la o cancel·la-la a Google Play, a Perfil, Pagaments i subscripcions, Subscripcions.', 'native.plans.restoreNoneAndroid': 'No s’ha trobat cap subscripció activa en aquest compte de Google.', 'native.plans.recommended': 'Recomanat', - 'native.plans.everyPlan': 'En cada pla: llocs, viatges i persones il·limitats', - 'native.plans.continueWith': 'Continua amb {plan}', 'native.claim.change': 'Canvia', 'native.claim.ruleLength': 'caràcters', 'native.claim.ruleUpper': 'Majúscula', 'native.claim.ruleLower': 'Minúscula', 'native.claim.ruleDigit': 'Número', 'native.claim.ruleSpecial': 'Símbol', - 'native.claim.trustServers': 'Servidors a Alemanya', - 'native.claim.trustCancel': 'Cancel·la quan vulguis', - 'native.claim.trustNoAds': 'Sense anuncis', 'native.subscribed.title': 'Ja tens TREK Cloud', 'native.subscribed.text': 'Aquest ID d’Apple ja té una subscripció activa a TREK Cloud. En pots contractar una de nova, també amb una adreça nova, quan s’hagi acabat.', @@ -212,6 +183,63 @@ const native: TranslationStrings = { 'native.cert.removeTitle': 'Vols eliminar el certificat?', 'native.cert.removeMessage': "Sense ell, el proxy davant de {host} ja no deixa entrar l'app fins que n'afegeixis un altre.", + 'native.welcome.title': 'On anirem ara?', + 'native.welcome.lead': 'Planifiqueu junts on aneu. TREK reuneix la ruta, les reserves i les fotos en un sol lloc.', + 'native.welcome.routeTitle': 'Ruta i mapa', + 'native.welcome.routeSub': 'Dia a dia, amb trajectes i horaris', + 'native.welcome.togetherTitle': 'Planificar junts', + 'native.welcome.togetherSub': 'Tothom veu cada canvi a l’instant', + 'native.welcome.photosTitle': 'Fotos i fotollibre', + 'native.welcome.photosSub': 'Els records es queden amb el viatge', + 'native.welcome.discover': 'Descobreix els plans cloud', + 'native.trip.start.title': 'Escapada', + 'native.trip.start.text': 'Viatges curts, sobretot planificar.', + 'native.trip.basis.title': 'Ruta per etapes', + 'native.trip.basis.text': 'Diverses parades, reserves automàtiques.', + 'native.trip.plus.title': 'Gran viatge', + 'native.trip.plus.text': 'Setmanes de viatge, amb tot el grup.', + 'native.trip.pro.title': 'Rodamón', + 'native.trip.pro.text': 'Per a qui viatja sovint i fa fotollibres grans.', + 'native.plans.unlimited': 'Il·limitat', + 'native.plans.unlimitedSub': 'Viatges i companys de viatge', + 'native.plans.inEveryPlan': 'en tots els plans', + 'native.plans.yearlyIs': '{price} l’any, cancel·la quan vulguis', + 'native.plans.monthlyIs': 'Són {price} al mes', + 'native.plans.photos': '≈ {n} fotos', + 'native.plans.aiPerMonth': '{n} / mes', + 'native.plans.aiNone': 'Cap', + 'native.plans.aiLabel': 'Documents IA', + 'native.plans.choose': 'Tria {trip}', + 'native.plans.termsShort': 'Condicions d’ús (EULA)', + 'native.plans.privacyShort': 'Privadesa', + 'native.plans.billing': 'Facturació', + 'native.claim.almost': 'Gairebé hi som', + 'native.claim.addressField': 'Adreça', + 'native.claim.slugPlaceholder': 'elteunom', + 'native.claim.emailPlaceholder': 'tu@exemple.cat', + 'native.claim.passwordPlaceholder': 'Tria una contrasenya', + 'native.claim.freeBadge': 'lliure', + 'native.claim.renews': 'Es renova automàticament, cancel·la quan vulguis.', + 'native.claim.showPassword': 'Mostra la contrasenya', + 'native.connect.yourTrek': 'El teu TREK', + 'native.connect.addressField': 'Adreça del servidor', + 'native.connect.found': 'TREK trobat', + 'native.connect.connected': 'Connectat', + 'native.connect.addCert': 'Afegeix un certificat de client', + 'native.connect.recheck': 'Comprova de nou', + 'native.connect.kickerUnreachable': 'No accessible', + 'native.connect.kickerNotTrek': 'No és TREK', + 'native.connect.kickerTooOld': 'Cal actualitzar', + 'native.connect.kickerCert': 'Cal un certificat', + 'native.connect.kickerGate': 'Cal iniciar sessió', + 'native.subscribed.kicker': 'Subscripció activa', + 'native.provisioning.kicker': 'S’està preparant', + 'native.provisioning.stepAddress': 'Adreça reservada', + 'native.provisioning.stepServer': 'El servidor s’inicia', + 'native.provisioning.stepReady': 'Llest', + 'native.provisioning.readyTitle': 'Hem arribat.', + 'native.provisioning.readySub': 'El teu TREK està llest. Convida qui viatja amb tu.', + 'native.provisioning.open': 'Planifica un viatge', }; export default native; diff --git a/shared/src/i18n/cs/native.ts b/shared/src/i18n/cs/native.ts index 8c680e685..f49af67d5 100644 --- a/shared/src/i18n/cs/native.ts +++ b/shared/src/i18n/cs/native.ts @@ -30,44 +30,22 @@ const native: TranslationStrings = { 'native.privacy': 'Zásady ochrany osobních údajů', 'native.settings.server': 'Server', // same-as-en 'native.settings.serverHint': 'Tato aplikace je připojena k {server}.', - 'native.welcome.headline': 'Vaše cesty.\nVáš plán.', - 'native.welcome.sub': 'Plánujte společně v reálném čase: trasy, rozpočty, deník a fotokniha, s pomocí AI.', - 'native.welcome.connect': 'Připojte svůj TREK', - 'native.welcome.connectSub': 'Otevřete adresu, kterou už používáte', - 'native.welcome.getCloud': 'Získat TREK Cloud', - 'native.welcome.getCloudSub': 'Hostováno za vás, bez instalace', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': - 'TREK hostujeme za vás, na vaší vlastní adrese. Nic neinstalujete, nic neudržujete: hotovo za pár minut.', - 'native.cloud.f1': 'Vlastní adresa, na serverech v Německu', - 'native.cloud.f2': 'Hotovo za pár minut, aktualizace řešíme my', - 'native.cloud.f3': 'Vaše data zůstávají vaše: žádné reklamy, žádné sledování', - 'native.cloud.cta': 'Začít', 'native.cloud.haveServer': 'Už mám server TREK', - 'native.connecting': 'Připojování k {host}', 'native.back': 'Zpět', 'native.plans.title': 'Vyberte si tarif', - 'native.plans.sub': 'TREK hostovaný na vaší vlastní adrese. Kdykoli změňte nebo zrušte.', 'native.plans.monthly': 'Měsíčně', 'native.plans.yearly': 'Ročně', 'native.plans.perMonth': 'měsíčně', 'native.plans.perYear': 'ročně', - 'native.plans.aiDocs': '{n} dokumentů s AI měsíčně', - 'native.plans.noAi': 'Žádné dokumenty s AI', - 'native.plans.storage': '{n} GB úložiště', 'native.plans.loadError': 'Tarify se nepodařilo načíst. Zkontrolujte připojení a zkuste to znovu.', 'native.plans.retry': 'Zkusit znovu', 'native.plans.soon': 'Předplatné v aplikaci zatím není k dispozici.', 'native.plans.closed': 'TREK Cloud brzy otevírá. Ode dne otevření si zde můžete předplatné sjednat.', - 'native.claim.title': 'Skoro hotovo', - 'native.claim.sub': 'Vyberte si adresu. Hned ji připravíme.', 'native.claim.addressLabel': 'Vaše adresa', 'native.claim.taken': 'Tato adresa je obsazená.', 'native.claim.invalid': 'Tři a více písmen, číslic a pomlček.', 'native.claim.reserved': 'Tato adresa je rezervovaná.', - 'native.claim.free': 'Dostupné', 'native.claim.emailLabel': 'E-mail', - 'native.claim.emailHint': 'Pro váš účet a zprávy ke smlouvě.', 'native.claim.passwordLabel': 'Heslo', 'native.claim.passwordHint': 'Alespoň 8 znaků. Heslo musí obsahovat velké a malé písmeno, číslici a speciální znak.', 'native.claim.subscribe': 'Předplatit za {price}', @@ -81,23 +59,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'Váš TREK se nepodařilo obnovit. Zkuste to znovu.', 'native.plans.legal': 'Platba se strhne z vašeho Apple ID při potvrzení. Předplatné se automaticky obnovuje, pokud jej nezrušíte alespoň 24 hodin před koncem období. Spravovat nebo zrušit jej můžete v nastavení účtu App Store.', - 'native.plans.terms': 'Podmínky použití Apple (EULA)', 'native.plans.ourTerms': 'Podmínky TREK Cloud', 'native.plans.legalAndroid': 'Platba se při potvrzení strhne z vašeho účtu Google. Předplatné se automaticky obnovuje, pokud je nezrušíte před koncem období. Spravovat nebo zrušit ho můžete v Google Play v části Profil, Platby a odběry, Odběry.', 'native.plans.restoreNoneAndroid': 'Pro tento účet Google nebylo nalezeno žádné aktivní předplatné.', 'native.plans.recommended': 'Doporučeno', - 'native.plans.everyPlan': 'V každém tarifu: neomezeně míst, cest a lidí', - 'native.plans.continueWith': 'Pokračovat s {plan}', 'native.claim.change': 'Změnit', 'native.claim.ruleLength': 'znaků', 'native.claim.ruleUpper': 'Velké písmeno', 'native.claim.ruleLower': 'Malé písmeno', 'native.claim.ruleDigit': 'Číslice', 'native.claim.ruleSpecial': 'Speciální znak', - 'native.claim.trustServers': 'Servery v Německu', - 'native.claim.trustCancel': 'Kdykoli zrušitelné', - 'native.claim.trustNoAds': 'Bez reklam', 'native.subscribed.title': 'TREK Cloud už máte', 'native.subscribed.text': 'Toto Apple ID už má aktivní předplatné TREK Cloud. Nové, i s novou adresou, si můžete sjednat, až skončí.', @@ -204,6 +176,63 @@ const native: TranslationStrings = { 'native.cert.settingRemove': 'Odebrat', 'native.cert.removeTitle': 'Odebrat certifikát?', 'native.cert.removeMessage': 'Bez něj proxy před {host} aplikaci nepustí, dokud nepřidáš nový.', + 'native.welcome.title': 'Kam pojedete příště?', + 'native.welcome.lead': 'Plánujte společně, kam se vydáte. TREK drží trasu, rezervace a fotky na jednom místě.', + 'native.welcome.routeTitle': 'Trasa a mapa', + 'native.welcome.routeSub': 'Den po dni, s cestami a časy', + 'native.welcome.togetherTitle': 'Plánovat společně', + 'native.welcome.togetherSub': 'Všichni hned vidí každou změnu', + 'native.welcome.photosTitle': 'Fotky a fotokniha', + 'native.welcome.photosSub': 'Vzpomínky zůstávají u cesty', + 'native.welcome.discover': 'Prohlédnout cloudové tarify', + 'native.trip.start.title': 'Víkendovka', + 'native.trip.start.text': 'Krátké cesty, hlavně plánování.', + 'native.trip.basis.title': 'Okružní cesta', + 'native.trip.basis.text': 'Více míst, rezervace automaticky.', + 'native.trip.plus.title': 'Velká cesta', + 'native.trip.plus.text': 'Týdny na cestách, s celou skupinou.', + 'native.trip.pro.title': 'Světoběžník', + 'native.trip.pro.text': 'Pro časté cestovatele a velké fotoknihy.', + 'native.plans.unlimited': 'Neomezeně', + 'native.plans.unlimitedSub': 'Cesty a spolucestující', + 'native.plans.inEveryPlan': 'v každém tarifu', + 'native.plans.yearlyIs': '{price} ročně, zrušení kdykoli', + 'native.plans.monthlyIs': 'To je {price} měsíčně', + 'native.plans.photos': '≈ {n} fotek', + 'native.plans.aiPerMonth': '{n} / měsíc', + 'native.plans.aiNone': 'Žádné', + 'native.plans.aiLabel': 'Dokumenty AI', + 'native.plans.choose': 'Vybrat: {trip}', + 'native.plans.termsShort': 'Podmínky použití (EULA)', + 'native.plans.privacyShort': 'Soukromí', + 'native.plans.billing': 'Platba', + 'native.claim.almost': 'Skoro na místě', + 'native.claim.addressField': 'Adresa', + 'native.claim.slugPlaceholder': 'vasejmeno', + 'native.claim.emailPlaceholder': 'vy@priklad.cz', + 'native.claim.passwordPlaceholder': 'Zvolte heslo', + 'native.claim.freeBadge': 'volná', + 'native.claim.renews': 'Obnovuje se automaticky, zrušení kdykoli.', + 'native.claim.showPassword': 'Zobrazit heslo', + 'native.connect.yourTrek': 'Váš TREK', + 'native.connect.addressField': 'Adresa serveru', + 'native.connect.found': 'TREK nalezen', + 'native.connect.connected': 'Připojeno', + 'native.connect.addCert': 'Přidat klientský certifikát', + 'native.connect.recheck': 'Zkontrolovat znovu', + 'native.connect.kickerUnreachable': 'Nedostupný', + 'native.connect.kickerNotTrek': 'Není TREK', + 'native.connect.kickerTooOld': 'Nutná aktualizace', + 'native.connect.kickerCert': 'Nutný certifikát', + 'native.connect.kickerGate': 'Nutné přihlášení', + 'native.subscribed.kicker': 'Aktivní předplatné', + 'native.provisioning.kicker': 'Nastavuje se', + 'native.provisioning.stepAddress': 'Adresa rezervována', + 'native.provisioning.stepServer': 'Server se spouští', + 'native.provisioning.stepReady': 'Připraveno', + 'native.provisioning.readyTitle': 'Na místě.', + 'native.provisioning.readySub': 'Váš TREK je připraven. Pozvěte ty, kdo cestují s vámi.', + 'native.provisioning.open': 'Naplánovat cestu', }; export default native; diff --git a/shared/src/i18n/de/native.ts b/shared/src/i18n/de/native.ts index d6c61ea35..5748128f3 100644 --- a/shared/src/i18n/de/native.ts +++ b/shared/src/i18n/de/native.ts @@ -31,44 +31,22 @@ const native: TranslationStrings = { 'native.privacy': 'Datenschutzerklärung', 'native.settings.server': 'Server', // same-as-en 'native.settings.serverHint': 'Diese App ist mit {server} verbunden.', - 'native.welcome.headline': 'Deine Reisen.\nDein Plan.', - 'native.welcome.sub': 'Gemeinsam in Echtzeit planen: Touren, Budgets, Journal und Fotobuch, mit Hilfe von KI.', - 'native.welcome.connect': 'Mit deinem TREK verbinden', - 'native.welcome.connectSub': 'Die Adresse öffnen, die du schon nutzt', - 'native.welcome.getCloud': 'TREK Cloud holen', - 'native.welcome.getCloudSub': 'Für dich gehostet, ohne Einrichtung', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': - 'Wir hosten TREK für dich, auf deiner eigenen Adresse. Nichts zu installieren, nichts zu warten, in wenigen Minuten bereit.', - 'native.cloud.f1': 'Eigene Adresse, auf Servern in Deutschland', - 'native.cloud.f2': 'In Minuten eingerichtet, Updates übernehmen wir', - 'native.cloud.f3': 'Deine Daten bleiben deine: keine Werbung, kein Tracking', - 'native.cloud.cta': 'Loslegen', 'native.cloud.haveServer': 'Ich habe schon einen TREK-Server', - 'native.connecting': 'Verbinde mit {host}', 'native.back': 'Zurück', 'native.plans.title': 'Tarif wählen', - 'native.plans.sub': 'Gehostetes TREK auf deiner eigenen Adresse. Jederzeit änder- oder kündbar.', 'native.plans.monthly': 'Monatlich', 'native.plans.yearly': 'Jährlich', - 'native.plans.perMonth': 'pro Monat', - 'native.plans.perYear': 'pro Jahr', - 'native.plans.aiDocs': '{n} KI-Dokumente im Monat', - 'native.plans.noAi': 'Keine KI-Dokumente', - 'native.plans.storage': '{n} GB Speicher', + 'native.plans.perMonth': 'im Monat', + 'native.plans.perYear': 'im Jahr', 'native.plans.loadError': 'Die Tarife konnten nicht geladen werden. Prüfe deine Verbindung und versuch es erneut.', 'native.plans.retry': 'Erneut versuchen', 'native.plans.soon': 'Abschließen in der App ist noch nicht verfügbar.', 'native.plans.closed': 'TREK Cloud öffnet bald. Ab dem Eröffnungstag kannst du hier abonnieren.', - 'native.claim.title': 'Fast geschafft', - 'native.claim.sub': 'Wähle deine Adresse. Wir richten sie sofort ein.', 'native.claim.addressLabel': 'Deine Adresse', 'native.claim.taken': 'Diese Adresse ist vergeben.', 'native.claim.invalid': 'Mindestens drei Buchstaben, Ziffern und Bindestriche.', 'native.claim.reserved': 'Diese Adresse ist reserviert.', - 'native.claim.free': 'Verfügbar', 'native.claim.emailLabel': 'E-Mail', - 'native.claim.emailHint': 'Für dein Konto und Mitteilungen zu deinem Vertrag.', 'native.claim.passwordLabel': 'Passwort', 'native.claim.passwordHint': 'Mindestens 8 Zeichen. Passwort muss Groß-, Kleinbuchstaben, eine Zahl und ein Sonderzeichen enthalten.', @@ -84,23 +62,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'Wir konnten dein TREK nicht wiederherstellen. Bitte versuch es erneut.', 'native.plans.legal': 'Die Zahlung wird bei Bestätigung über deine Apple-ID abgerechnet. Das Abo verlängert sich automatisch, wenn du es nicht mindestens 24 Stunden vor Ablauf des Zeitraums kündigst. Verwalten und kündigen kannst du es in den Einstellungen deines App-Store-Accounts.', - 'native.plans.terms': 'Nutzungsbedingungen von Apple (EULA)', 'native.plans.ourTerms': 'AGB von TREK Cloud', 'native.plans.legalAndroid': 'Die Zahlung wird bei Bestätigung über dein Google-Konto abgerechnet. Das Abo verlängert sich automatisch, wenn du es nicht vor Ablauf des Zeitraums kündigst. Verwalten und kündigen kannst du es in Google Play unter Profil, Zahlungen und Abos, Abos.', 'native.plans.restoreNoneAndroid': 'Für dieses Google-Konto wurde kein aktives Abo gefunden.', 'native.plans.recommended': 'Empfohlen', - 'native.plans.everyPlan': 'In jedem Tarif: unbegrenzt Orte, Reisen und Personen', - 'native.plans.continueWith': 'Weiter mit {plan}', 'native.claim.change': 'Ändern', 'native.claim.ruleLength': 'Zeichen', 'native.claim.ruleUpper': 'Großbuchstabe', 'native.claim.ruleLower': 'Kleinbuchstabe', 'native.claim.ruleDigit': 'Zahl', 'native.claim.ruleSpecial': 'Sonderzeichen', - 'native.claim.trustServers': 'Server in Deutschland', - 'native.claim.trustCancel': 'Jederzeit kündbar', - 'native.claim.trustNoAds': 'Keine Werbung', 'native.subscribed.title': 'Du hast schon TREK Cloud', 'native.subscribed.text': 'Über diese Apple-ID läuft bereits ein TREK-Cloud-Abo. Ein neues kannst du abschließen, auch mit neuer Adresse, sobald es beendet ist.', @@ -214,6 +186,63 @@ const native: TranslationStrings = { 'native.cert.removeTitle': 'Zertifikat entfernen?', 'native.cert.removeMessage': 'Ohne Zertifikat lässt der Proxy vor {host} die App nicht mehr durch, bis du wieder eins hinzufügst.', + 'native.welcome.title': 'Wohin geht die nächste Reise?', + 'native.welcome.lead': 'Plant zusammen, wohin es geht. TREK hält Route, Buchungen und Fotos an einem Ort.', + 'native.welcome.routeTitle': 'Route und Karte', + 'native.welcome.routeSub': 'Tag für Tag, mit Wegen und Zeiten', + 'native.welcome.togetherTitle': 'Gemeinsam planen', + 'native.welcome.togetherSub': 'Alle sehen jede Änderung sofort', + 'native.welcome.photosTitle': 'Fotos und Fotobuch', + 'native.welcome.photosSub': 'Die Erinnerungen bleiben bei der Reise', + 'native.welcome.discover': 'Cloud-Tarife entdecken', + 'native.trip.start.title': 'Wochenendtrip', + 'native.trip.start.text': 'Kurze Reisen, vor allem planen.', + 'native.trip.basis.title': 'Rundreise', + 'native.trip.basis.text': 'Mehrere Orte, Buchungen automatisch.', + 'native.trip.plus.title': 'Große Reise', + 'native.trip.plus.text': 'Wochenlang unterwegs, mit der ganzen Gruppe.', + 'native.trip.pro.title': 'Weltenbummler', + 'native.trip.pro.text': 'Für Vielreisende und große Fotobücher.', + 'native.plans.unlimited': 'Unbegrenzt', + 'native.plans.unlimitedSub': 'Reisen und Mitreisende', + 'native.plans.inEveryPlan': 'in jedem Tarif', + 'native.plans.yearlyIs': 'Jährlich {price}, jederzeit kündbar', + 'native.plans.monthlyIs': 'Das sind {price} im Monat', + 'native.plans.photos': '≈ {n} Fotos', + 'native.plans.aiPerMonth': '{n} / Monat', + 'native.plans.aiNone': 'Keine', + 'native.plans.aiLabel': 'KI-Dokumente', + 'native.plans.choose': '{trip} wählen', + 'native.plans.termsShort': 'Nutzungsbedingungen (EULA)', + 'native.plans.privacyShort': 'Datenschutz', + 'native.plans.billing': 'Zahlweise', + 'native.claim.almost': 'Fast angekommen', + 'native.claim.addressField': 'Adresse', + 'native.claim.slugPlaceholder': 'deinname', + 'native.claim.emailPlaceholder': 'du@beispiel.de', + 'native.claim.passwordPlaceholder': 'Passwort wählen', + 'native.claim.freeBadge': 'frei', + 'native.claim.renews': 'Verlängert sich automatisch, jederzeit kündbar.', + 'native.claim.showPassword': 'Passwort zeigen', + 'native.connect.yourTrek': 'Dein TREK', + 'native.connect.addressField': 'Server-Adresse', + 'native.connect.found': 'TREK gefunden', + 'native.connect.connected': 'Verbunden', + 'native.connect.addCert': 'Client-Zertifikat hinzufügen', + 'native.connect.recheck': 'Erneut prüfen', + 'native.connect.kickerUnreachable': 'Nicht erreichbar', + 'native.connect.kickerNotTrek': 'Kein TREK', + 'native.connect.kickerTooOld': 'Update nötig', + 'native.connect.kickerCert': 'Zertifikat nötig', + 'native.connect.kickerGate': 'Anmeldung nötig', + 'native.subscribed.kicker': 'Aktives Abo', + 'native.provisioning.kicker': 'Wird eingerichtet', + 'native.provisioning.stepAddress': 'Adresse reserviert', + 'native.provisioning.stepServer': 'Server startet', + 'native.provisioning.stepReady': 'Bereit', + 'native.provisioning.readyTitle': 'Angekommen.', + 'native.provisioning.readySub': 'Dein TREK ist bereit. Lade die ein, die mitreisen.', + 'native.provisioning.open': 'Reise planen', }; export default native; diff --git a/shared/src/i18n/en/native.ts b/shared/src/i18n/en/native.ts index e0c356f8b..cc87ffe76 100644 --- a/shared/src/i18n/en/native.ts +++ b/shared/src/i18n/en/native.ts @@ -30,44 +30,22 @@ const native: TranslationStrings = { 'native.privacy': 'Privacy policy', 'native.settings.server': 'Server', 'native.settings.serverHint': 'This app is connected to {server}.', - 'native.welcome.headline': 'Your Trips.\nYour Plan.', - 'native.welcome.sub': 'Plan together in real time: tours, budgets, journals and a photo book, with help from AI.', - 'native.welcome.connect': 'Connect your TREK', - 'native.welcome.connectSub': 'Open the address you already use', - 'native.welcome.getCloud': 'Get TREK Cloud', - 'native.welcome.getCloudSub': 'Hosted for you, no setup', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': - 'We host TREK for you, on your own address. Nothing to install, nothing to maintain, and it is ready in minutes.', - 'native.cloud.f1': 'Your own address, on servers in Germany', - 'native.cloud.f2': 'Set up in minutes, updates handled for you', - 'native.cloud.f3': 'Your data stays yours: no ads, no tracking', - 'native.cloud.cta': 'Get started', 'native.cloud.haveServer': 'I already have a TREK', - 'native.connecting': 'Connecting to {host}', 'native.back': 'Back', 'native.plans.title': 'Choose your plan', - 'native.plans.sub': 'Hosted TREK on your own address. Change or cancel anytime.', 'native.plans.monthly': 'Monthly', 'native.plans.yearly': 'Yearly', 'native.plans.perMonth': 'per month', 'native.plans.perYear': 'per year', - 'native.plans.aiDocs': '{n} AI documents a month', - 'native.plans.noAi': 'No AI documents', - 'native.plans.storage': '{n} GB storage', 'native.plans.loadError': 'Could not load the plans. Check your connection and try again.', 'native.plans.retry': 'Try again', 'native.plans.soon': 'Subscribing in the app is not available yet.', 'native.plans.closed': 'TREK Cloud opens soon. You can subscribe here from opening day.', - 'native.claim.title': 'Almost there', - 'native.claim.sub': 'Choose your address. We set it up right away.', 'native.claim.addressLabel': 'Your address', 'native.claim.taken': 'That address is taken.', 'native.claim.invalid': 'Three or more letters, numbers and hyphens.', 'native.claim.reserved': 'That address is reserved.', - 'native.claim.free': 'Available', 'native.claim.emailLabel': 'Email', - 'native.claim.emailHint': 'For your account and messages about your contract.', 'native.claim.passwordLabel': 'Password', 'native.claim.passwordHint': 'At least 8 characters. Password must contain uppercase, lowercase, a number, and a special character.', @@ -83,23 +61,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'We could not restore your TREK. Please try again.', 'native.plans.legal': 'Payment is charged to your Apple ID when you confirm. The subscription renews automatically unless you cancel it at least 24 hours before the period ends. Manage or cancel it in your App Store account settings.', - 'native.plans.terms': 'Apple terms of use (EULA)', 'native.plans.ourTerms': 'TREK Cloud terms', 'native.plans.legalAndroid': 'Payment is charged to your Google account when you confirm. The subscription renews automatically unless you cancel it before the period ends. Manage or cancel it in Google Play under Profile, Payments and subscriptions, Subscriptions.', 'native.plans.restoreNoneAndroid': 'No active subscription found on this Google account.', 'native.plans.recommended': 'Recommended', - 'native.plans.everyPlan': 'In every plan: unlimited places, trips and people', - 'native.plans.continueWith': 'Continue with {plan}', 'native.claim.change': 'Change', 'native.claim.ruleLength': 'characters', 'native.claim.ruleUpper': 'Uppercase', 'native.claim.ruleLower': 'Lowercase', 'native.claim.ruleDigit': 'Number', 'native.claim.ruleSpecial': 'Symbol', - 'native.claim.trustServers': 'Servers in Germany', - 'native.claim.trustCancel': 'Cancel anytime', - 'native.claim.trustNoAds': 'No ads', 'native.subscribed.title': 'You already have TREK Cloud', 'native.subscribed.text': 'This Apple ID already has an active TREK Cloud subscription. You can take out a new one, at a new address too, once it has ended.', @@ -209,6 +181,63 @@ const native: TranslationStrings = { 'native.cert.removeTitle': 'Remove the certificate?', 'native.cert.removeMessage': 'Without it, the proxy in front of {host} no longer lets the app in until you add one again.', + 'native.welcome.title': 'Where are you going next?', + 'native.welcome.lead': 'Plan together where you are headed. TREK keeps your route, bookings and photos in one place.', + 'native.welcome.routeTitle': 'Route and map', + 'native.welcome.routeSub': 'Day by day, with routes and times', + 'native.welcome.togetherTitle': 'Plan together', + 'native.welcome.togetherSub': 'Everyone sees every change at once', + 'native.welcome.photosTitle': 'Photos and photo book', + 'native.welcome.photosSub': 'The memories stay with the trip', + 'native.welcome.discover': 'Explore cloud plans', + 'native.trip.start.title': 'Weekend trip', + 'native.trip.start.text': 'Short trips, mostly planning.', + 'native.trip.basis.title': 'Round trip', + 'native.trip.basis.text': 'Several stops, bookings sorted automatically.', + 'native.trip.plus.title': 'Big journey', + 'native.trip.plus.text': 'Weeks on the road, with the whole group.', + 'native.trip.pro.title': 'Globetrotter', + 'native.trip.pro.text': 'For frequent travellers and big photo books.', + 'native.plans.unlimited': 'Unlimited', + 'native.plans.unlimitedSub': 'Trips and travel companions', + 'native.plans.inEveryPlan': 'in every plan', + 'native.plans.yearlyIs': 'Yearly {price}, cancel anytime', + 'native.plans.monthlyIs': 'That is {price} a month', + 'native.plans.photos': '≈ {n} photos', + 'native.plans.aiPerMonth': '{n} / month', + 'native.plans.aiNone': 'None', + 'native.plans.aiLabel': 'AI documents', + 'native.plans.choose': 'Choose {trip}', + 'native.plans.termsShort': 'Terms of Use (EULA)', + 'native.plans.privacyShort': 'Privacy', + 'native.plans.billing': 'Billing', + 'native.claim.almost': 'Almost there', + 'native.claim.addressField': 'Address', + 'native.claim.slugPlaceholder': 'yourname', + 'native.claim.emailPlaceholder': 'you@example.com', + 'native.claim.passwordPlaceholder': 'Choose a password', + 'native.claim.freeBadge': 'available', + 'native.claim.renews': 'Renews automatically, cancel anytime.', + 'native.claim.showPassword': 'Show password', + 'native.connect.yourTrek': 'Your TREK', + 'native.connect.addressField': 'Server address', + 'native.connect.found': 'TREK found', + 'native.connect.connected': 'Connected', + 'native.connect.addCert': 'Add a client certificate', + 'native.connect.recheck': 'Check again', + 'native.connect.kickerUnreachable': 'Not reachable', + 'native.connect.kickerNotTrek': 'Not TREK', + 'native.connect.kickerTooOld': 'Update needed', + 'native.connect.kickerCert': 'Certificate needed', + 'native.connect.kickerGate': 'Sign-in needed', + 'native.subscribed.kicker': 'Active subscription', + 'native.provisioning.kicker': 'Setting up', + 'native.provisioning.stepAddress': 'Address reserved', + 'native.provisioning.stepServer': 'Server starting', + 'native.provisioning.stepReady': 'Ready', + 'native.provisioning.readyTitle': 'Arrived.', + 'native.provisioning.readySub': 'Your TREK is ready. Invite the people travelling with you.', + 'native.provisioning.open': 'Plan a trip', }; export default native; diff --git a/shared/src/i18n/es/native.ts b/shared/src/i18n/es/native.ts index a7af561e0..6d4aabbd1 100644 --- a/shared/src/i18n/es/native.ts +++ b/shared/src/i18n/es/native.ts @@ -30,45 +30,22 @@ const native: TranslationStrings = { 'native.privacy': 'Política de privacidad', 'native.settings.server': 'Servidor', 'native.settings.serverHint': 'Esta app está conectada a {server}.', - 'native.welcome.headline': 'Tus viajes.\nTu plan.', - 'native.welcome.sub': - 'Planifica en equipo y en tiempo real: rutas, presupuestos, diario y fotolibro, con ayuda de la IA.', - 'native.welcome.connect': 'Conecta tu TREK', - 'native.welcome.connectSub': 'Abre la dirección que ya usas', - 'native.welcome.getCloud': 'Obtén TREK Cloud', - 'native.welcome.getCloudSub': 'Alojado para ti, sin instalación', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': - 'Alojamos TREK por ti, en tu propia dirección. Nada que instalar, nada que mantener: listo en minutos.', - 'native.cloud.f1': 'Tu propia dirección, en servidores en Alemania', - 'native.cloud.f2': 'Listo en minutos, con las actualizaciones a nuestro cargo', - 'native.cloud.f3': 'Tus datos siguen siendo tuyos: sin anuncios, sin rastreo', - 'native.cloud.cta': 'Empezar', 'native.cloud.haveServer': 'Ya tengo un servidor TREK', - 'native.connecting': 'Conectando con {host}', 'native.back': 'Atrás', 'native.plans.title': 'Elige tu plan', - 'native.plans.sub': 'TREK alojado en tu propia dirección. Cambia o cancela cuando quieras.', 'native.plans.monthly': 'Mensual', 'native.plans.yearly': 'Anual', 'native.plans.perMonth': 'al mes', 'native.plans.perYear': 'al año', - 'native.plans.aiDocs': '{n} documentos con IA al mes', - 'native.plans.noAi': 'Sin documentos con IA', - 'native.plans.storage': '{n} GB de almacenamiento', 'native.plans.loadError': 'No se han podido cargar los planes. Revisa tu conexión e inténtalo de nuevo.', 'native.plans.retry': 'Reintentar', 'native.plans.soon': 'La suscripción dentro de la app aún no está disponible.', 'native.plans.closed': 'TREK Cloud abre pronto. Podrás suscribirte aquí desde el día de la apertura.', - 'native.claim.title': 'Casi listo', - 'native.claim.sub': 'Elige tu dirección. La preparamos al instante.', 'native.claim.addressLabel': 'Tu dirección', 'native.claim.taken': 'Esa dirección ya está ocupada.', 'native.claim.invalid': 'Tres o más letras, números y guiones.', 'native.claim.reserved': 'Esa dirección está reservada.', - 'native.claim.free': 'Disponible', 'native.claim.emailLabel': 'Correo', - 'native.claim.emailHint': 'Para tu cuenta y los avisos sobre tu contrato.', 'native.claim.passwordLabel': 'Contraseña', 'native.claim.passwordHint': 'Al menos 8 caracteres. La contraseña debe contener mayúsculas, minúsculas, números y un carácter especial.', @@ -84,23 +61,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'No pudimos restaurar tu TREK. Inténtalo de nuevo.', 'native.plans.legal': 'El pago se cobra a tu ID de Apple al confirmar. La suscripción se renueva automáticamente salvo que la canceles al menos 24 horas antes de que termine el periodo. Gestiónala o cancélala en los ajustes de tu cuenta del App Store.', - 'native.plans.terms': 'Términos de uso de Apple (EULA)', 'native.plans.ourTerms': 'Condiciones de TREK Cloud', 'native.plans.legalAndroid': 'El pago se carga a tu cuenta de Google al confirmar. La suscripción se renueva automáticamente salvo que la canceles antes de que termine el periodo. Gestiónala o cancélala en Google Play, en Perfil, Pagos y suscripciones, Suscripciones.', 'native.plans.restoreNoneAndroid': 'No se encontró ninguna suscripción activa en esta cuenta de Google.', 'native.plans.recommended': 'Recomendado', - 'native.plans.everyPlan': 'En todos los planes: lugares, viajes y personas ilimitados', - 'native.plans.continueWith': 'Continuar con {plan}', 'native.claim.change': 'Cambiar', 'native.claim.ruleLength': 'caracteres', 'native.claim.ruleUpper': 'Mayúscula', 'native.claim.ruleLower': 'Minúscula', 'native.claim.ruleDigit': 'Número', 'native.claim.ruleSpecial': 'Símbolo', - 'native.claim.trustServers': 'Servidores en Alemania', - 'native.claim.trustCancel': 'Cancela cuando quieras', - 'native.claim.trustNoAds': 'Sin anuncios', 'native.subscribed.title': 'Ya tienes TREK Cloud', 'native.subscribed.text': 'Este ID de Apple ya tiene una suscripción activa a TREK Cloud. Podrás contratar una nueva, también con una dirección nueva, cuando haya terminado.', @@ -211,6 +182,63 @@ const native: TranslationStrings = { 'native.cert.settingRemove': 'Eliminar', 'native.cert.removeTitle': '¿Eliminar el certificado?', 'native.cert.removeMessage': 'Sin él, el proxy delante de {host} ya no deja entrar a la app hasta que añadas otro.', + 'native.welcome.title': '¿A dónde vas ahora?', + 'native.welcome.lead': 'Planead juntos a dónde vais. TREK reúne la ruta, las reservas y las fotos en un solo lugar.', + 'native.welcome.routeTitle': 'Ruta y mapa', + 'native.welcome.routeSub': 'Día a día, con trayectos y horarios', + 'native.welcome.togetherTitle': 'Planificar juntos', + 'native.welcome.togetherSub': 'Todos ven cada cambio al instante', + 'native.welcome.photosTitle': 'Fotos y fotolibro', + 'native.welcome.photosSub': 'Los recuerdos se quedan con el viaje', + 'native.welcome.discover': 'Descubrir los planes cloud', + 'native.trip.start.title': 'Escapada', + 'native.trip.start.text': 'Viajes cortos, sobre todo planificar.', + 'native.trip.basis.title': 'Ruta por etapas', + 'native.trip.basis.text': 'Varias paradas, reservas automáticas.', + 'native.trip.plus.title': 'Gran viaje', + 'native.trip.plus.text': 'Semanas de viaje, con todo el grupo.', + 'native.trip.pro.title': 'Trotamundos', + 'native.trip.pro.text': 'Para viajeros frecuentes y grandes fotolibros.', + 'native.plans.unlimited': 'Ilimitado', + 'native.plans.unlimitedSub': 'Viajes y compañeros de viaje', + 'native.plans.inEveryPlan': 'en todos los planes', + 'native.plans.yearlyIs': '{price} al año, cancela cuando quieras', + 'native.plans.monthlyIs': 'Son {price} al mes', + 'native.plans.photos': '≈ {n} fotos', + 'native.plans.aiPerMonth': '{n} / mes', + 'native.plans.aiNone': 'Ninguno', + 'native.plans.aiLabel': 'Documentos IA', + 'native.plans.choose': 'Elegir {trip}', + 'native.plans.termsShort': 'Condiciones de uso (EULA)', + 'native.plans.privacyShort': 'Privacidad', + 'native.plans.billing': 'Facturación', + 'native.claim.almost': 'Ya casi', + 'native.claim.addressField': 'Dirección', + 'native.claim.slugPlaceholder': 'tunombre', + 'native.claim.emailPlaceholder': 'tu@ejemplo.es', + 'native.claim.passwordPlaceholder': 'Elige una contraseña', + 'native.claim.freeBadge': 'libre', + 'native.claim.renews': 'Se renueva automáticamente, cancela cuando quieras.', + 'native.claim.showPassword': 'Mostrar contraseña', + 'native.connect.yourTrek': 'Tu TREK', + 'native.connect.addressField': 'Dirección del servidor', + 'native.connect.found': 'TREK encontrado', + 'native.connect.connected': 'Conectado', + 'native.connect.addCert': 'Añadir un certificado de cliente', + 'native.connect.recheck': 'Comprobar de nuevo', + 'native.connect.kickerUnreachable': 'No accesible', + 'native.connect.kickerNotTrek': 'No es TREK', + 'native.connect.kickerTooOld': 'Actualización necesaria', + 'native.connect.kickerCert': 'Certificado necesario', + 'native.connect.kickerGate': 'Inicio de sesión necesario', + 'native.subscribed.kicker': 'Suscripción activa', + 'native.provisioning.kicker': 'Preparando', + 'native.provisioning.stepAddress': 'Dirección reservada', + 'native.provisioning.stepServer': 'Iniciando el servidor', + 'native.provisioning.stepReady': 'Listo', + 'native.provisioning.readyTitle': 'Has llegado.', + 'native.provisioning.readySub': 'Tu TREK está listo. Invita a quienes viajan contigo.', + 'native.provisioning.open': 'Planificar un viaje', }; export default native; diff --git a/shared/src/i18n/et/native.ts b/shared/src/i18n/et/native.ts index f169c2823..b5f3094c0 100644 --- a/shared/src/i18n/et/native.ts +++ b/shared/src/i18n/et/native.ts @@ -30,44 +30,22 @@ const native: TranslationStrings = { 'native.privacy': 'Privaatsuspoliitika', 'native.settings.server': 'Server', // same-as-en 'native.settings.serverHint': 'See rakendus on ühendatud serveriga {server}.', - 'native.welcome.headline': 'Sinu reisid.\nSinu plaan.', - 'native.welcome.sub': 'Planeeri koos reaalajas: teekonnad, eelarved, päevik ja fotoraamat, tehisintellekti abiga.', - 'native.welcome.connect': 'Ühenda oma TREK', - 'native.welcome.connectSub': 'Ava aadress, mida juba kasutad', - 'native.welcome.getCloud': 'Hangi TREK Cloud', - 'native.welcome.getCloudSub': 'Majutatud sinu eest, seadistamiseta', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': - 'Majutame TREK-i sinu eest, sinu enda aadressil. Midagi pole vaja paigaldada ega hallata: valmis mõne minutiga.', - 'native.cloud.f1': 'Sinu enda aadress, Saksamaa serverites', - 'native.cloud.f2': 'Valmis mõne minutiga, uuendused teeme meie', - 'native.cloud.f3': 'Sinu andmed jäävad sinu omaks: reklaamideta, jälgimiseta', - 'native.cloud.cta': 'Alusta', 'native.cloud.haveServer': 'Mul on juba TREK-i server', - 'native.connecting': 'Ühendumine aadressiga {host}', 'native.back': 'Tagasi', 'native.plans.title': 'Vali oma pakett', - 'native.plans.sub': 'TREK majutatud sinu enda aadressil. Muuda või tühista igal ajal.', 'native.plans.monthly': 'Kuus', 'native.plans.yearly': 'Aastas', 'native.plans.perMonth': 'kuus', 'native.plans.perYear': 'aastas', - 'native.plans.aiDocs': '{n} AI-dokumenti kuus', - 'native.plans.noAi': 'AI-dokumente pole', - 'native.plans.storage': '{n} GB mahtu', 'native.plans.loadError': 'Pakette ei õnnestunud laadida. Kontrolli ühendust ja proovi uuesti.', 'native.plans.retry': 'Proovi uuesti', 'native.plans.soon': 'Rakendusesisene tellimine pole veel saadaval.', 'native.plans.closed': 'TREK Cloud avatakse peagi. Avamispäevast saad siin tellida.', - 'native.claim.title': 'Peaaegu valmis', - 'native.claim.sub': 'Vali oma aadress. Seadistame selle kohe.', 'native.claim.addressLabel': 'Sinu aadress', 'native.claim.taken': 'See aadress on juba võetud.', 'native.claim.invalid': 'Vähemalt kolm tähte, numbrit või sidekriipsu.', 'native.claim.reserved': 'See aadress on reserveeritud.', - 'native.claim.free': 'Saadaval', 'native.claim.emailLabel': 'E-post', - 'native.claim.emailHint': 'Sinu konto ja lepinguga seotud teadete jaoks.', 'native.claim.passwordLabel': 'Parool', 'native.claim.passwordHint': 'Vähemalt 8 märki. Parool peab sisaldama suur- ja väiketähte, numbrit ning erimärki.', 'native.claim.subscribe': 'Telli hinnaga {price}', @@ -82,23 +60,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'Me ei saanud sinu TREK-i taastada. Proovi uuesti.', 'native.plans.legal': 'Makse võetakse kinnitamisel sinu Apple ID-lt. Tellimus pikeneb automaatselt, kui sa ei tühista seda vähemalt 24 tundi enne perioodi lõppu. Halda või tühista seda oma App Store’i konto seadetes.', - 'native.plans.terms': "Apple'i kasutustingimused (EULA)", 'native.plans.ourTerms': 'TREK Cloudi tingimused', 'native.plans.legalAndroid': "Makse võetakse kinnitamisel sinu Google'i kontolt. Tellimus uueneb automaatselt, kui sa ei tühista seda enne perioodi lõppu. Halda või tühista seda Google Plays: Profiil, Maksed ja tellimused, Tellimused.", 'native.plans.restoreNoneAndroid': "Selle Google'i kontoga ei leitud aktiivset tellimust.", 'native.plans.recommended': 'Soovitatud', - 'native.plans.everyPlan': 'Igas paketis: piiramatult kohti, reise ja inimesi', - 'native.plans.continueWith': 'Jätka paketiga {plan}', 'native.claim.change': 'Muuda', 'native.claim.ruleLength': 'märki', 'native.claim.ruleUpper': 'Suurtäht', 'native.claim.ruleLower': 'Väiketäht', 'native.claim.ruleDigit': 'Arv', 'native.claim.ruleSpecial': 'Erimärk', - 'native.claim.trustServers': 'Serverid Saksamaal', - 'native.claim.trustCancel': 'Tühista igal ajal', - 'native.claim.trustNoAds': 'Reklaamivaba', 'native.subscribed.title': 'Sul on juba TREK Cloud', 'native.subscribed.text': 'Sellel Apple ID-l on juba aktiivne TREK Cloudi tellimus. Uue, ka uue aadressiga, saad võtta pärast selle lõppemist.', @@ -206,6 +178,63 @@ const native: TranslationStrings = { 'native.cert.settingRemove': 'Eemalda', 'native.cert.removeTitle': 'Eemaldada sertifikaat?', 'native.cert.removeMessage': 'Ilma selleta ei lase {host} ees olev proksi rakendust enam läbi, kuni lisad uue.', + 'native.welcome.title': 'Kuhu järgmiseks?', + 'native.welcome.lead': 'Planeerige koos, kuhu minna. TREK hoiab marsruudi, broneeringud ja fotod ühes kohas.', + 'native.welcome.routeTitle': 'Marsruut ja kaart', + 'native.welcome.routeSub': 'Päev päeva haaval, teede ja aegadega', + 'native.welcome.togetherTitle': 'Koos planeerida', + 'native.welcome.togetherSub': 'Kõik näevad iga muudatust kohe', + 'native.welcome.photosTitle': 'Fotod ja fotoraamat', + 'native.welcome.photosSub': 'Mälestused jäävad reisi juurde', + 'native.welcome.discover': 'Vaata pilvepakette', + 'native.trip.start.title': 'Nädalavahetus', + 'native.trip.start.text': 'Lühikesed reisid, peamiselt planeerimine.', + 'native.trip.basis.title': 'Ringreis', + 'native.trip.basis.text': 'Mitu peatust, broneeringud automaatselt.', + 'native.trip.plus.title': 'Suur reis', + 'native.trip.plus.text': 'Nädalaid teel, kogu seltskonnaga.', + 'native.trip.pro.title': 'Maailmarändur', + 'native.trip.pro.text': 'Sagedastele reisijatele ja suurtele fotoraamatutele.', + 'native.plans.unlimited': 'Piiramatult', + 'native.plans.unlimitedSub': 'Reisid ja kaasreisijad', + 'native.plans.inEveryPlan': 'igas paketis', + 'native.plans.yearlyIs': '{price} aastas, tühista igal ajal', + 'native.plans.monthlyIs': 'See on {price} kuus', + 'native.plans.photos': '≈ {n} fotot', + 'native.plans.aiPerMonth': '{n} / kuus', + 'native.plans.aiNone': 'Puudub', + 'native.plans.aiLabel': 'TI-dokumendid', + 'native.plans.choose': 'Vali {trip}', + 'native.plans.termsShort': 'Kasutustingimused (EULA)', + 'native.plans.privacyShort': 'Privaatsus', + 'native.plans.billing': 'Maksmine', + 'native.claim.almost': 'Peaaegu kohal', + 'native.claim.addressField': 'Aadress', + 'native.claim.slugPlaceholder': 'sinunimi', + 'native.claim.emailPlaceholder': 'sina@naide.ee', + 'native.claim.passwordPlaceholder': 'Vali parool', + 'native.claim.freeBadge': 'vaba', + 'native.claim.renews': 'Uueneb automaatselt, tühista igal ajal.', + 'native.claim.showPassword': 'Näita parooli', + 'native.connect.yourTrek': 'Sinu TREK', + 'native.connect.addressField': 'Serveri aadress', + 'native.connect.found': 'TREK leitud', + 'native.connect.connected': 'Ühendatud', + 'native.connect.addCert': 'Lisa kliendisertifikaat', + 'native.connect.recheck': 'Kontrolli uuesti', + 'native.connect.kickerUnreachable': 'Pole kättesaadav', + 'native.connect.kickerNotTrek': 'Pole TREK', + 'native.connect.kickerTooOld': 'Vaja uuendada', + 'native.connect.kickerCert': 'Vaja sertifikaati', + 'native.connect.kickerGate': 'Vaja sisse logida', + 'native.subscribed.kicker': 'Aktiivne tellimus', + 'native.provisioning.kicker': 'Seadistamine', + 'native.provisioning.stepAddress': 'Aadress broneeritud', + 'native.provisioning.stepServer': 'Server käivitub', + 'native.provisioning.stepReady': 'Valmis', + 'native.provisioning.readyTitle': 'Kohal.', + 'native.provisioning.readySub': 'Sinu TREK on valmis. Kutsu kaasa need, kes reisivad sinuga.', + 'native.provisioning.open': 'Planeeri reis', }; export default native; diff --git a/shared/src/i18n/fr/native.ts b/shared/src/i18n/fr/native.ts index c562380ad..80c4c2e48 100644 --- a/shared/src/i18n/fr/native.ts +++ b/shared/src/i18n/fr/native.ts @@ -31,45 +31,22 @@ const native: TranslationStrings = { 'native.privacy': 'Politique de confidentialité', 'native.settings.server': 'Serveur', 'native.settings.serverHint': 'Cette application est connectée à {server}.', - 'native.welcome.headline': 'Vos voyages.\nVotre plan.', - 'native.welcome.sub': - 'Planifiez ensemble en temps réel : circuits, budgets, journal et livre photo, avec l’aide de l’IA.', - 'native.welcome.connect': 'Connecter votre TREK', - 'native.welcome.connectSub': 'Ouvrez l’adresse que vous utilisez déjà', - 'native.welcome.getCloud': 'Obtenir TREK Cloud', - 'native.welcome.getCloudSub': 'Hébergé pour vous, sans installation', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': - 'Nous hébergeons TREK pour vous, sur votre propre adresse. Rien à installer, rien à maintenir : prêt en quelques minutes.', - 'native.cloud.f1': 'Votre propre adresse, sur des serveurs en Allemagne', - 'native.cloud.f2': 'Prêt en quelques minutes, mises à jour prises en charge', - 'native.cloud.f3': 'Vos données restent les vôtres : sans publicité, sans pistage', - 'native.cloud.cta': 'Commencer', 'native.cloud.haveServer': 'J’ai déjà un serveur TREK', - 'native.connecting': 'Connexion à {host}', 'native.back': 'Retour', 'native.plans.title': 'Choisissez votre forfait', - 'native.plans.sub': 'TREK hébergé sur votre propre adresse. Modifiable ou résiliable à tout moment.', 'native.plans.monthly': 'Mensuel', 'native.plans.yearly': 'Annuel', 'native.plans.perMonth': 'par mois', 'native.plans.perYear': 'par an', - 'native.plans.aiDocs': '{n} documents IA par mois', - 'native.plans.noAi': 'Pas de documents IA', - 'native.plans.storage': '{n} Go de stockage', 'native.plans.loadError': 'Impossible de charger les forfaits. Vérifiez votre connexion et réessayez.', 'native.plans.retry': 'Réessayer', 'native.plans.soon': 'L’abonnement dans l’app n’est pas encore disponible.', 'native.plans.closed': 'TREK Cloud ouvre bientôt. Vous pourrez vous abonner ici dès l’ouverture.', - 'native.claim.title': 'Presque terminé', - 'native.claim.sub': 'Choisissez votre adresse. Nous la préparons aussitôt.', 'native.claim.addressLabel': 'Votre adresse', 'native.claim.taken': 'Cette adresse est déjà prise.', 'native.claim.invalid': 'Au moins trois lettres, chiffres ou traits d’union.', 'native.claim.reserved': 'Cette adresse est réservée.', - 'native.claim.free': 'Disponible', 'native.claim.emailLabel': 'E-mail', - 'native.claim.emailHint': 'Pour votre compte et les messages concernant votre contrat.', 'native.claim.passwordLabel': 'Mot de passe', 'native.claim.passwordHint': 'Au moins 8 caractères. Le mot de passe doit contenir des majuscules, des minuscules, un chiffre et un caractère spécial.', @@ -85,23 +62,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'Nous n’avons pas pu restaurer votre TREK. Réessayez.', 'native.plans.legal': 'Le paiement est débité de votre identifiant Apple lors de la confirmation. L’abonnement se renouvelle automatiquement, sauf résiliation au moins 24 heures avant la fin de la période. Gérez-le ou résiliez-le dans les réglages de votre compte App Store.', - 'native.plans.terms': 'Conditions d’utilisation d’Apple (CLUF)', 'native.plans.ourTerms': 'Conditions de TREK Cloud', 'native.plans.legalAndroid': 'Le paiement est débité de votre compte Google lors de la confirmation. L’abonnement se renouvelle automatiquement, sauf si vous le résiliez avant la fin de la période. Gérez-le ou résiliez-le dans Google Play sous Profil, Paiements et abonnements, Abonnements.', 'native.plans.restoreNoneAndroid': 'Aucun abonnement actif trouvé pour ce compte Google.', 'native.plans.recommended': 'Recommandé', - 'native.plans.everyPlan': 'Dans chaque formule : lieux, voyages et personnes illimités', - 'native.plans.continueWith': 'Continuer avec {plan}', 'native.claim.change': 'Modifier', 'native.claim.ruleLength': 'caractères', 'native.claim.ruleUpper': 'Majuscule', 'native.claim.ruleLower': 'Minuscule', 'native.claim.ruleDigit': 'Chiffre', 'native.claim.ruleSpecial': 'Symbole', - 'native.claim.trustServers': 'Serveurs en Allemagne', - 'native.claim.trustCancel': 'Résiliable à tout moment', - 'native.claim.trustNoAds': 'Sans publicité', 'native.subscribed.title': 'Vous avez déjà TREK Cloud', 'native.subscribed.text': 'Cet identifiant Apple a déjà un abonnement TREK Cloud actif. Vous pourrez en souscrire un nouveau, avec une nouvelle adresse aussi, une fois celui-ci terminé.', @@ -213,6 +184,64 @@ const native: TranslationStrings = { 'native.cert.removeTitle': 'Supprimer le certificat ?', 'native.cert.removeMessage': "Sans lui, le proxy devant {host} ne laisse plus entrer l'app tant que tu n'en ajoutes pas un nouveau.", + 'native.welcome.title': 'Où partez-vous ensuite ?', + 'native.welcome.lead': + 'Planifiez ensemble votre destination. TREK réunit l’itinéraire, les réservations et les photos au même endroit.', + 'native.welcome.routeTitle': 'Itinéraire et carte', + 'native.welcome.routeSub': 'Jour après jour, avec trajets et horaires', + 'native.welcome.togetherTitle': 'Planifier ensemble', + 'native.welcome.togetherSub': 'Chacun voit chaque changement aussitôt', + 'native.welcome.photosTitle': 'Photos et livre photo', + 'native.welcome.photosSub': 'Les souvenirs restent avec le voyage', + 'native.welcome.discover': 'Découvrir les offres cloud', + 'native.trip.start.title': 'Week-end', + 'native.trip.start.text': 'Courts séjours, surtout de la planification.', + 'native.trip.basis.title': 'Circuit', + 'native.trip.basis.text': 'Plusieurs étapes, réservations automatiques.', + 'native.trip.plus.title': 'Grand voyage', + 'native.trip.plus.text': 'Des semaines sur la route, avec tout le groupe.', + 'native.trip.pro.title': 'Globe-trotteur', + 'native.trip.pro.text': 'Pour les grands voyageurs et les grands livres photo.', + 'native.plans.unlimited': 'Illimité', + 'native.plans.unlimitedSub': 'Voyages et compagnons de voyage', + 'native.plans.inEveryPlan': 'dans chaque offre', + 'native.plans.yearlyIs': '{price} par an, résiliable à tout moment', + 'native.plans.monthlyIs': 'Soit {price} par mois', + 'native.plans.photos': '≈ {n} photos', // same-as-en + 'native.plans.aiPerMonth': '{n} / mois', + 'native.plans.aiNone': 'Aucun', + 'native.plans.aiLabel': 'Documents IA', + 'native.plans.choose': 'Choisir {trip}', + 'native.plans.termsShort': 'Conditions d’utilisation (EULA)', + 'native.plans.privacyShort': 'Confidentialité', + 'native.plans.billing': 'Facturation', + 'native.claim.almost': 'Presque arrivé', + 'native.claim.addressField': 'Adresse', + 'native.claim.slugPlaceholder': 'votrenom', + 'native.claim.emailPlaceholder': 'vous@exemple.fr', + 'native.claim.passwordPlaceholder': 'Choisissez un mot de passe', + 'native.claim.freeBadge': 'libre', + 'native.claim.renews': 'Renouvellement automatique, résiliable à tout moment.', + 'native.claim.showPassword': 'Afficher le mot de passe', + 'native.connect.yourTrek': 'Votre TREK', + 'native.connect.addressField': 'Adresse du serveur', + 'native.connect.found': 'TREK trouvé', + 'native.connect.connected': 'Connecté', + 'native.connect.addCert': 'Ajouter un certificat client', + 'native.connect.recheck': 'Vérifier à nouveau', + 'native.connect.kickerUnreachable': 'Injoignable', + 'native.connect.kickerNotTrek': 'Pas un TREK', + 'native.connect.kickerTooOld': 'Mise à jour requise', + 'native.connect.kickerCert': 'Certificat requis', + 'native.connect.kickerGate': 'Connexion requise', + 'native.subscribed.kicker': 'Abonnement actif', + 'native.provisioning.kicker': 'Mise en place', + 'native.provisioning.stepAddress': 'Adresse réservée', + 'native.provisioning.stepServer': 'Démarrage du serveur', + 'native.provisioning.stepReady': 'Prêt', + 'native.provisioning.readyTitle': 'Arrivé.', + 'native.provisioning.readySub': 'Votre TREK est prêt. Invitez celles et ceux qui voyagent avec vous.', + 'native.provisioning.open': 'Planifier un voyage', }; export default native; diff --git a/shared/src/i18n/gr/native.ts b/shared/src/i18n/gr/native.ts index 0c6dae33f..87aa2d34f 100644 --- a/shared/src/i18n/gr/native.ts +++ b/shared/src/i18n/gr/native.ts @@ -31,45 +31,22 @@ const native: TranslationStrings = { 'native.privacy': 'Πολιτική απορρήτου', 'native.settings.server': 'Διακομιστής', 'native.settings.serverHint': 'Αυτή η εφαρμογή είναι συνδεδεμένη στο {server}.', - 'native.welcome.headline': 'Τα ταξίδια σας.\nΤο πλάνο σας.', - 'native.welcome.sub': - 'Σχεδιάστε μαζί σε πραγματικό χρόνο: διαδρομές, προϋπολογισμούς, ημερολόγιο και φωτογραφικό άλμπουμ, με τη βοήθεια του AI.', - 'native.welcome.connect': 'Συνδέστε το TREK σας', - 'native.welcome.connectSub': 'Ανοίξτε τη διεύθυνση που ήδη χρησιμοποιείτε', - 'native.welcome.getCloud': 'Αποκτήστε το TREK Cloud', - 'native.welcome.getCloudSub': 'Φιλοξενείται για εσάς, χωρίς εγκατάσταση', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': - 'Φιλοξενούμε το TREK για εσάς, στη δική σας διεύθυνση. Τίποτα για εγκατάσταση, τίποτα για συντήρηση: έτοιμο σε λίγα λεπτά.', - 'native.cloud.f1': 'Η δική σας διεύθυνση, σε διακομιστές στη Γερμανία', - 'native.cloud.f2': 'Έτοιμο σε λίγα λεπτά, τις ενημερώσεις τις αναλαμβάνουμε εμείς', - 'native.cloud.f3': 'Τα δεδομένα σας παραμένουν δικά σας: χωρίς διαφημίσεις, χωρίς παρακολούθηση', - 'native.cloud.cta': 'Ξεκινήστε', 'native.cloud.haveServer': 'Έχω ήδη διακομιστή TREK', - 'native.connecting': 'Σύνδεση με {host}', 'native.back': 'Πίσω', 'native.plans.title': 'Επιλέξτε το πλάνο σας', - 'native.plans.sub': 'TREK στη δική σας διεύθυνση. Αλλάξτε ή ακυρώστε όποτε θέλετε.', 'native.plans.monthly': 'Μηνιαία', 'native.plans.yearly': 'Ετήσια', 'native.plans.perMonth': 'τον μήνα', 'native.plans.perYear': 'τον χρόνο', - 'native.plans.aiDocs': '{n} έγγραφα AI τον μήνα', - 'native.plans.noAi': 'Χωρίς έγγραφα AI', - 'native.plans.storage': '{n} GB αποθηκευτικού χώρου', 'native.plans.loadError': 'Δεν ήταν δυνατή η φόρτωση των πλάνων. Ελέγξτε τη σύνδεσή σας και δοκιμάστε ξανά.', 'native.plans.retry': 'Δοκιμάστε ξανά', 'native.plans.soon': 'Η συνδρομή μέσα από την εφαρμογή δεν είναι ακόμη διαθέσιμη.', 'native.plans.closed': 'Το TREK Cloud ανοίγει σύντομα. Από την ημέρα έναρξης θα μπορείτε να εγγραφείτε εδώ.', - 'native.claim.title': 'Σχεδόν έτοιμο', - 'native.claim.sub': 'Επιλέξτε τη διεύθυνσή σας. Το ετοιμάζουμε αμέσως.', 'native.claim.addressLabel': 'Η διεύθυνσή σας', 'native.claim.taken': 'Αυτή η διεύθυνση είναι πιασμένη.', 'native.claim.invalid': 'Τρία ή περισσότερα γράμματα, αριθμοί και παύλες.', 'native.claim.reserved': 'Αυτή η διεύθυνση είναι δεσμευμένη.', - 'native.claim.free': 'Διαθέσιμη', 'native.claim.emailLabel': 'Ηλ. ταχυδρομείο', - 'native.claim.emailHint': 'Για τον λογαριασμό σας και ενημερώσεις για τη σύμβασή σας.', 'native.claim.passwordLabel': 'Κωδικός', 'native.claim.passwordHint': 'Τουλάχιστον 8 χαρακτήρες. Ο κωδικός πρέπει να περιέχει κεφαλαία, πεζά, έναν αριθμό και έναν ειδικό χαρακτήρα.', @@ -85,23 +62,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'Δεν μπορέσαμε να επαναφέρουμε το TREK σας. Δοκιμάστε ξανά.', 'native.plans.legal': 'Η πληρωμή χρεώνεται στο Apple ID σας κατά την επιβεβαίωση. Η συνδρομή ανανεώνεται αυτόματα, εκτός αν την ακυρώσετε τουλάχιστον 24 ώρες πριν από το τέλος της περιόδου. Διαχειριστείτε ή ακυρώστε τη στις ρυθμίσεις του λογαριασμού σας στο App Store.', - 'native.plans.terms': 'Όροι χρήσης της Apple (EULA)', 'native.plans.ourTerms': 'Όροι του TREK Cloud', 'native.plans.legalAndroid': 'Η πληρωμή χρεώνεται στον λογαριασμό σας Google κατά την επιβεβαίωση. Η συνδρομή ανανεώνεται αυτόματα, εκτός αν την ακυρώσετε πριν λήξει η περίοδος. Διαχειριστείτε ή ακυρώστε τη στο Google Play, στο Προφίλ, Πληρωμές και συνδρομές, Συνδρομές.', 'native.plans.restoreNoneAndroid': 'Δεν βρέθηκε ενεργή συνδρομή σε αυτόν τον λογαριασμό Google.', 'native.plans.recommended': 'Προτείνεται', - 'native.plans.everyPlan': 'Σε κάθε πακέτο: απεριόριστα μέρη, ταξίδια και άτομα', - 'native.plans.continueWith': 'Συνέχεια με {plan}', 'native.claim.change': 'Αλλαγή', 'native.claim.ruleLength': 'χαρακτήρες', 'native.claim.ruleUpper': 'Κεφαλαίο', 'native.claim.ruleLower': 'Πεζό', 'native.claim.ruleDigit': 'Αριθμός', 'native.claim.ruleSpecial': 'Σύμβολο', - 'native.claim.trustServers': 'Διακομιστές στη Γερμανία', - 'native.claim.trustCancel': 'Ακύρωση οποτεδήποτε', - 'native.claim.trustNoAds': 'Χωρίς διαφημίσεις', 'native.subscribed.title': 'Έχετε ήδη TREK Cloud', 'native.subscribed.text': 'Αυτό το Apple ID έχει ήδη ενεργή συνδρομή στο TREK Cloud. Μπορείτε να κάνετε νέα, και με νέα διεύθυνση, όταν λήξει.', @@ -217,6 +188,63 @@ const native: TranslationStrings = { 'native.cert.removeTitle': 'Αφαίρεση του πιστοποιητικού;', 'native.cert.removeMessage': 'Χωρίς αυτό, ο διακομιστής μεσολάβησης μπροστά στο {host} δεν αφήνει πια την εφαρμογή να μπει, μέχρι να προσθέσεις νέο.', + 'native.welcome.title': 'Πού πάμε μετά;', + 'native.welcome.lead': 'Σχεδιάστε μαζί πού θα πάτε. Το TREK κρατά διαδρομή, κρατήσεις και φωτογραφίες σε ένα σημείο.', + 'native.welcome.routeTitle': 'Διαδρομή και χάρτης', + 'native.welcome.routeSub': 'Μέρα με τη μέρα, με δρόμους και ώρες', + 'native.welcome.togetherTitle': 'Σχεδιασμός μαζί', + 'native.welcome.togetherSub': 'Όλοι βλέπουν κάθε αλλαγή αμέσως', + 'native.welcome.photosTitle': 'Φωτογραφίες και φωτοβιβλίο', + 'native.welcome.photosSub': 'Οι αναμνήσεις μένουν με το ταξίδι', + 'native.welcome.discover': 'Δείτε τα πακέτα cloud', + 'native.trip.start.title': 'Σαββατοκύριακο', + 'native.trip.start.text': 'Σύντομα ταξίδια, κυρίως σχεδιασμός.', + 'native.trip.basis.title': 'Περιήγηση', + 'native.trip.basis.text': 'Πολλοί σταθμοί, κρατήσεις αυτόματα.', + 'native.trip.plus.title': 'Μεγάλο ταξίδι', + 'native.trip.plus.text': 'Εβδομάδες στον δρόμο, με όλη την ομάδα.', + 'native.trip.pro.title': 'Κοσμογυρισμένος', + 'native.trip.pro.text': 'Για όσους ταξιδεύουν συχνά και μεγάλα φωτοβιβλία.', + 'native.plans.unlimited': 'Απεριόριστα', + 'native.plans.unlimitedSub': 'Ταξίδια και συνταξιδιώτες', + 'native.plans.inEveryPlan': 'σε κάθε πακέτο', + 'native.plans.yearlyIs': '{price} τον χρόνο, ακύρωση οποτεδήποτε', + 'native.plans.monthlyIs': 'Δηλαδή {price} τον μήνα', + 'native.plans.photos': '≈ {n} φωτογραφίες', + 'native.plans.aiPerMonth': '{n} / μήνα', + 'native.plans.aiNone': 'Κανένα', + 'native.plans.aiLabel': 'Έγγραφα AI', + 'native.plans.choose': 'Επιλογή: {trip}', + 'native.plans.termsShort': 'Όροι χρήσης (EULA)', + 'native.plans.privacyShort': 'Απόρρητο', + 'native.plans.billing': 'Χρέωση', + 'native.claim.almost': 'Σχεδόν φτάσαμε', + 'native.claim.addressField': 'Διεύθυνση', + 'native.claim.slugPlaceholder': 'toonomasou', + 'native.claim.emailPlaceholder': 'eseis@paradeigma.gr', + 'native.claim.passwordPlaceholder': 'Επιλέξτε κωδικό', + 'native.claim.freeBadge': 'ελεύθερη', + 'native.claim.renews': 'Ανανεώνεται αυτόματα, ακύρωση οποτεδήποτε.', + 'native.claim.showPassword': 'Εμφάνιση κωδικού', + 'native.connect.yourTrek': 'Το TREK σας', + 'native.connect.addressField': 'Διεύθυνση διακομιστή', + 'native.connect.found': 'Βρέθηκε TREK', + 'native.connect.connected': 'Συνδέθηκε', + 'native.connect.addCert': 'Προσθήκη πιστοποιητικού πελάτη', + 'native.connect.recheck': 'Νέος έλεγχος', + 'native.connect.kickerUnreachable': 'Μη προσβάσιμο', + 'native.connect.kickerNotTrek': 'Δεν είναι TREK', + 'native.connect.kickerTooOld': 'Χρειάζεται ενημέρωση', + 'native.connect.kickerCert': 'Χρειάζεται πιστοποιητικό', + 'native.connect.kickerGate': 'Χρειάζεται σύνδεση', + 'native.subscribed.kicker': 'Ενεργή συνδρομή', + 'native.provisioning.kicker': 'Ρύθμιση', + 'native.provisioning.stepAddress': 'Η διεύθυνση δεσμεύτηκε', + 'native.provisioning.stepServer': 'Ο διακομιστής ξεκινά', + 'native.provisioning.stepReady': 'Έτοιμο', + 'native.provisioning.readyTitle': 'Φτάσαμε.', + 'native.provisioning.readySub': 'Το TREK σας είναι έτοιμο. Προσκαλέστε όσους ταξιδεύουν μαζί σας.', + 'native.provisioning.open': 'Σχεδιασμός ταξιδιού', }; export default native; diff --git a/shared/src/i18n/he/native.ts b/shared/src/i18n/he/native.ts index 69718dd8c..d6b008010 100644 --- a/shared/src/i18n/he/native.ts +++ b/shared/src/i18n/he/native.ts @@ -30,43 +30,22 @@ const native: TranslationStrings = { 'native.privacy': 'מדיניות הפרטיות', 'native.settings.server': 'שרת', 'native.settings.serverHint': 'האפליקציה הזו מחוברת אל {server}.', - 'native.welcome.headline': 'הטיולים שלכם.\nהתוכנית שלכם.', - 'native.welcome.sub': 'מתכננים ביחד בזמן אמת: מסלולים, תקציבים, יומן ואלבום תמונות, בעזרת AI.', - 'native.welcome.connect': 'חיבור ה-TREK שלכם', - 'native.welcome.connectSub': 'פתחו את הכתובת שאתם כבר משתמשים בה', - 'native.welcome.getCloud': 'קבלת TREK Cloud', - 'native.welcome.getCloudSub': 'מתארח עבורכם, בלי התקנה', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': 'אנחנו מארחים את TREK עבורכם, על כתובת משלכם. אין מה להתקין, אין מה לתחזק: מוכן תוך דקות.', - 'native.cloud.f1': 'כתובת משלכם, על שרתים בגרמניה', - 'native.cloud.f2': 'מוכן תוך דקות, העדכונים עלינו', - 'native.cloud.f3': 'הנתונים שלכם נשארים שלכם: בלי פרסומות, בלי מעקב', - 'native.cloud.cta': 'התחלה', 'native.cloud.haveServer': 'כבר יש לי שרת TREK', - 'native.connecting': 'מתחבר אל {host}', 'native.back': 'חזרה', 'native.plans.title': 'בחרו את התוכנית שלכם', - 'native.plans.sub': 'TREK מתארח על כתובת משלכם. שנו או בטלו בכל עת.', 'native.plans.monthly': 'חודשי', 'native.plans.yearly': 'שנתי', 'native.plans.perMonth': 'לחודש', 'native.plans.perYear': 'לשנה', - 'native.plans.aiDocs': '{n} מסמכי AI בחודש', - 'native.plans.noAi': 'בלי מסמכי AI', - 'native.plans.storage': '{n} GB אחסון', 'native.plans.loadError': 'לא ניתן לטעון את התוכניות. בדקו את החיבור ונסו שוב.', 'native.plans.retry': 'נסו שוב', 'native.plans.soon': 'הרשמה בתוך האפליקציה עדיין לא זמינה.', 'native.plans.closed': 'TREK Cloud ייפתח בקרוב. מיום הפתיחה תוכלו להירשם כאן.', - 'native.claim.title': 'כמעט סיימנו', - 'native.claim.sub': 'בחרו את הכתובת שלכם. אנחנו מכינים אותה מיד.', 'native.claim.addressLabel': 'הכתובת שלכם', 'native.claim.taken': 'הכתובת הזו תפוסה.', 'native.claim.invalid': 'שלוש אותיות, ספרות ומקפים או יותר.', 'native.claim.reserved': 'הכתובת הזו שמורה.', - 'native.claim.free': 'זמין', 'native.claim.emailLabel': 'אימייל', - 'native.claim.emailHint': 'לחשבון שלכם ולהודעות על החוזה.', 'native.claim.passwordLabel': 'סיסמה', 'native.claim.passwordHint': 'לפחות 8 תווים. הסיסמה חייבת להכיל אות גדולה, אות קטנה, ספרה ותו מיוחד.', 'native.claim.subscribe': 'הרשמה תמורת {price}', @@ -80,23 +59,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'לא הצלחנו לשחזר את ה-TREK שלך. אנא נסו שוב.', 'native.plans.legal': 'התשלום מחויב ב-Apple ID שלך בעת האישור. המינוי מתחדש אוטומטית אלא אם מבטלים אותו לפחות 24 שעות לפני סוף התקופה. אפשר לנהל או לבטל אותו בהגדרות חשבון ה-App Store.', - 'native.plans.terms': 'תנאי השימוש של Apple (EULA)', 'native.plans.ourTerms': 'התנאים של TREK Cloud', 'native.plans.legalAndroid': 'התשלום יחויב בחשבון Google שלכם עם האישור. המינוי מתחדש אוטומטית אלא אם תבטלו אותו לפני סוף התקופה. אפשר לנהל או לבטל אותו ב-Google Play תחת פרופיל, תשלומים ומינויים, מינויים.', 'native.plans.restoreNoneAndroid': 'לא נמצא מינוי פעיל בחשבון Google הזה.', 'native.plans.recommended': 'מומלץ', - 'native.plans.everyPlan': 'בכל מסלול: מקומות, טיולים ואנשים ללא הגבלה', - 'native.plans.continueWith': 'המשך עם {plan}', 'native.claim.change': 'שינוי', 'native.claim.ruleLength': 'תווים', 'native.claim.ruleUpper': 'אות גדולה', 'native.claim.ruleLower': 'אות קטנה', 'native.claim.ruleDigit': 'ספרה', 'native.claim.ruleSpecial': 'סימן מיוחד', - 'native.claim.trustServers': 'שרתים בגרמניה', - 'native.claim.trustCancel': 'ביטול בכל עת', - 'native.claim.trustNoAds': 'ללא פרסומות', 'native.subscribed.title': 'כבר יש לך TREK Cloud', 'native.subscribed.text': 'ל-Apple ID הזה כבר יש מינוי פעיל ל-TREK Cloud. אפשר להירשם למינוי חדש, גם בכתובת חדשה, אחרי שהוא יסתיים.', @@ -201,6 +174,63 @@ const native: TranslationStrings = { 'native.cert.settingRemove': 'הסרה', 'native.cert.removeTitle': 'להסיר את התעודה?', 'native.cert.removeMessage': 'בלעדיה הפרוקסי שלפני {host} לא יכניס את האפליקציה עד שתתווסף תעודה חדשה.', + 'native.welcome.title': 'לאן נוסעים הפעם?', + 'native.welcome.lead': 'תכננו יחד לאן נוסעים. TREK שומר את המסלול, ההזמנות והתמונות במקום אחד.', + 'native.welcome.routeTitle': 'מסלול ומפה', + 'native.welcome.routeSub': 'יום אחר יום, עם דרכים ושעות', + 'native.welcome.togetherTitle': 'מתכננים יחד', + 'native.welcome.togetherSub': 'כולם רואים כל שינוי מיד', + 'native.welcome.photosTitle': 'תמונות ואלבום', + 'native.welcome.photosSub': 'הזיכרונות נשארים עם הטיול', + 'native.welcome.discover': 'גלו את חבילות הענן', + 'native.trip.start.title': 'סוף שבוע', + 'native.trip.start.text': 'טיולים קצרים, בעיקר תכנון.', + 'native.trip.basis.title': 'טיול מעגלי', + 'native.trip.basis.text': 'כמה תחנות, הזמנות אוטומטיות.', + 'native.trip.plus.title': 'מסע גדול', + 'native.trip.plus.text': 'שבועות בדרכים, עם כל הקבוצה.', + 'native.trip.pro.title': 'נווד עולמי', + 'native.trip.pro.text': 'למי שנוסע הרבה ולאלבומים גדולים.', + 'native.plans.unlimited': 'ללא הגבלה', + 'native.plans.unlimitedSub': 'טיולים ושותפים לדרך', + 'native.plans.inEveryPlan': 'בכל חבילה', + 'native.plans.yearlyIs': '{price} לשנה, ביטול בכל עת', + 'native.plans.monthlyIs': 'כלומר {price} לחודש', + 'native.plans.photos': '≈ {n} תמונות', + 'native.plans.aiPerMonth': '{n} / חודש', + 'native.plans.aiNone': 'אין', + 'native.plans.aiLabel': 'מסמכי AI', + 'native.plans.choose': 'בחירת {trip}', + 'native.plans.termsShort': 'תנאי שימוש (EULA)', + 'native.plans.privacyShort': 'פרטיות', + 'native.plans.billing': 'חיוב', + 'native.claim.almost': 'כמעט שם', + 'native.claim.addressField': 'כתובת', + 'native.claim.slugPlaceholder': 'yourname', // same-as-en + 'native.claim.emailPlaceholder': 'you@example.com', // same-as-en + 'native.claim.passwordPlaceholder': 'בחרו סיסמה', + 'native.claim.freeBadge': 'פנויה', + 'native.claim.renews': 'מתחדש אוטומטית, ביטול בכל עת.', + 'native.claim.showPassword': 'הצגת סיסמה', + 'native.connect.yourTrek': 'ה-TREK שלכם', + 'native.connect.addressField': 'כתובת השרת', + 'native.connect.found': 'נמצא TREK', + 'native.connect.connected': 'מחובר', + 'native.connect.addCert': 'הוספת תעודת לקוח', + 'native.connect.recheck': 'בדיקה חוזרת', + 'native.connect.kickerUnreachable': 'לא זמין', + 'native.connect.kickerNotTrek': 'זה לא TREK', + 'native.connect.kickerTooOld': 'נדרש עדכון', + 'native.connect.kickerCert': 'נדרשת תעודה', + 'native.connect.kickerGate': 'נדרשת התחברות', + 'native.subscribed.kicker': 'מינוי פעיל', + 'native.provisioning.kicker': 'בהקמה', + 'native.provisioning.stepAddress': 'הכתובת שמורה', + 'native.provisioning.stepServer': 'השרת עולה', + 'native.provisioning.stepReady': 'מוכן', + 'native.provisioning.readyTitle': 'הגענו.', + 'native.provisioning.readySub': 'ה-TREK שלכם מוכן. הזמינו את מי שנוסעים איתכם.', + 'native.provisioning.open': 'תכנון טיול', }; export default native; diff --git a/shared/src/i18n/hu/native.ts b/shared/src/i18n/hu/native.ts index 9687e732e..a97006477 100644 --- a/shared/src/i18n/hu/native.ts +++ b/shared/src/i18n/hu/native.ts @@ -31,44 +31,22 @@ const native: TranslationStrings = { 'native.privacy': 'Adatvédelmi irányelvek', 'native.settings.server': 'Szerver', 'native.settings.serverHint': 'Ez az alkalmazás ehhez csatlakozik: {server}.', - 'native.welcome.headline': 'Az utazásaid.\nA terved.', - 'native.welcome.sub': 'Tervezzetek együtt valós időben: túrák, költségvetések, napló és fotókönyv, MI segítségével.', - 'native.welcome.connect': 'Csatlakoztasd a TREK-edet', - 'native.welcome.connectSub': 'Nyisd meg a címet, amit már használsz', - 'native.welcome.getCloud': 'TREK Cloud beszerzése', - 'native.welcome.getCloudSub': 'Neked tárolva, telepítés nélkül', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': - 'A TREK-et neked üzemeltetjük, a saját címeden. Semmit nem kell telepíteni, semmit karbantartani: percek alatt kész.', - 'native.cloud.f1': 'Saját cím, németországi szervereken', - 'native.cloud.f2': 'Percek alatt kész, a frissítéseket mi intézzük', - 'native.cloud.f3': 'Az adataid a tieid maradnak: nincs hirdetés, nincs követés', - 'native.cloud.cta': 'Kezdés', 'native.cloud.haveServer': 'Már van TREK-szerverem', - 'native.connecting': 'Csatlakozás ehhez: {host}', 'native.back': 'Vissza', 'native.plans.title': 'Válaszd ki a csomagod', - 'native.plans.sub': 'TREK a saját címeden üzemeltetve. Bármikor módosíthatod vagy lemondhatod.', 'native.plans.monthly': 'Havi', 'native.plans.yearly': 'Éves', 'native.plans.perMonth': 'havonta', 'native.plans.perYear': 'évente', - 'native.plans.aiDocs': 'havi {n} MI-dokumentum', - 'native.plans.noAi': 'Nincs MI-dokumentum', - 'native.plans.storage': '{n} GB tárhely', 'native.plans.loadError': 'A csomagokat nem sikerült betölteni. Ellenőrizd a kapcsolatot, és próbáld újra.', 'native.plans.retry': 'Újra', 'native.plans.soon': 'Az appon belüli előfizetés még nem érhető el.', 'native.plans.closed': 'A TREK Cloud hamarosan nyit. A nyitás napjától itt tudsz előfizetni.', - 'native.claim.title': 'Mindjárt kész', - 'native.claim.sub': 'Válaszd ki a címed. Azonnal beállítjuk.', 'native.claim.addressLabel': 'A címed', 'native.claim.taken': 'Ez a cím foglalt.', 'native.claim.invalid': 'Legalább három betű, szám vagy kötőjel.', 'native.claim.reserved': 'Ez a cím fenntartott.', - 'native.claim.free': 'Szabad', 'native.claim.emailLabel': 'E-mail', - 'native.claim.emailHint': 'A fiókodhoz és a szerződéssel kapcsolatos üzenetekhez.', 'native.claim.passwordLabel': 'Jelszó', 'native.claim.passwordHint': 'Legalább 8 karakter. A jelszónak tartalmaznia kell nagybetűt, kisbetűt, számot és speciális karaktert.', @@ -84,23 +62,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'Nem sikerült visszaállítani a TREK-edet. Próbáld újra.', 'native.plans.legal': 'A fizetést megerősítéskor az Apple ID-d terheli. Az előfizetés automatikusan megújul, hacsak nem mondod le legalább 24 órával az időszak vége előtt. Kezelni vagy lemondani az App Store-fiókod beállításaiban tudod.', - 'native.plans.terms': 'Az Apple felhasználási feltételei (EULA)', 'native.plans.ourTerms': 'A TREK Cloud feltételei', 'native.plans.legalAndroid': 'A díjat a megerősítéskor a Google-fiókodra terheljük. Az előfizetés automatikusan megújul, ha nem mondod le az időszak vége előtt. Kezelni vagy lemondani a Google Playben tudod: Profil, Fizetések és előfizetések, Előfizetések.', 'native.plans.restoreNoneAndroid': 'Ehhez a Google-fiókhoz nem található aktív előfizetés.', 'native.plans.recommended': 'Ajánlott', - 'native.plans.everyPlan': 'Minden csomagban: korlátlan hely, utazás és résztvevő', - 'native.plans.continueWith': 'Tovább ezzel: {plan}', 'native.claim.change': 'Módosítás', 'native.claim.ruleLength': 'karakter', 'native.claim.ruleUpper': 'Nagybetű', 'native.claim.ruleLower': 'Kisbetű', 'native.claim.ruleDigit': 'Szám', 'native.claim.ruleSpecial': 'Speciális karakter', - 'native.claim.trustServers': 'Szerverek Németországban', - 'native.claim.trustCancel': 'Bármikor lemondható', - 'native.claim.trustNoAds': 'Reklámmentes', 'native.subscribed.title': 'Már van TREK Cloud-előfizetésed', 'native.subscribed.text': 'Ehhez az Apple ID-hoz már tartozik aktív TREK Cloud-előfizetés. Újat, akár új címmel is, akkor köthetsz, ha ez lejárt.', @@ -211,6 +183,64 @@ const native: TranslationStrings = { 'native.cert.settingRemove': 'Eltávolítás', 'native.cert.removeTitle': 'Eltávolítod a tanúsítványt?', 'native.cert.removeMessage': 'Nélküle a(z) {host} előtti proxy nem engedi be az appot, amíg újat nem adsz hozzá.', + 'native.welcome.title': 'Hová utazol legközelebb?', + 'native.welcome.lead': + 'Tervezzétek meg együtt, hová mentek. A TREK egy helyen tartja az útvonalat, a foglalásokat és a fotókat.', + 'native.welcome.routeTitle': 'Útvonal és térkép', + 'native.welcome.routeSub': 'Napról napra, utakkal és időpontokkal', + 'native.welcome.togetherTitle': 'Közös tervezés', + 'native.welcome.togetherSub': 'Mindenki azonnal látja a változásokat', + 'native.welcome.photosTitle': 'Fotók és fotókönyv', + 'native.welcome.photosSub': 'Az emlékek az utazásnál maradnak', + 'native.welcome.discover': 'Felhőcsomagok felfedezése', + 'native.trip.start.title': 'Hétvégi kiruccanás', + 'native.trip.start.text': 'Rövid utak, főleg tervezés.', + 'native.trip.basis.title': 'Körutazás', + 'native.trip.basis.text': 'Több állomás, foglalások automatikusan.', + 'native.trip.plus.title': 'Nagy utazás', + 'native.trip.plus.text': 'Hetekig úton, az egész csapattal.', + 'native.trip.pro.title': 'Világjáró', + 'native.trip.pro.text': 'Gyakori utazóknak és nagy fotókönyvekhez.', + 'native.plans.unlimited': 'Korlátlan', + 'native.plans.unlimitedSub': 'Utazások és útitársak', + 'native.plans.inEveryPlan': 'minden csomagban', + 'native.plans.yearlyIs': 'Évente {price}, bármikor lemondható', + 'native.plans.monthlyIs': 'Ez havonta {price}', + 'native.plans.photos': '≈ {n} fotó', + 'native.plans.aiPerMonth': '{n} / hó', + 'native.plans.aiNone': 'Nincs', + 'native.plans.aiLabel': 'MI-dokumentumok', + 'native.plans.choose': '{trip} választása', + 'native.plans.termsShort': 'Felhasználási feltételek (EULA)', + 'native.plans.privacyShort': 'Adatvédelem', + 'native.plans.billing': 'Fizetés', + 'native.claim.almost': 'Majdnem ott', + 'native.claim.addressField': 'Cím', + 'native.claim.slugPlaceholder': 'neved', + 'native.claim.emailPlaceholder': 'te@pelda.hu', + 'native.claim.passwordPlaceholder': 'Válassz jelszót', + 'native.claim.freeBadge': 'szabad', + 'native.claim.renews': 'Automatikusan megújul, bármikor lemondható.', + 'native.claim.showPassword': 'Jelszó megjelenítése', + 'native.connect.yourTrek': 'A TREK-ed', + 'native.connect.addressField': 'Szervercím', + 'native.connect.found': 'TREK megtalálva', + 'native.connect.connected': 'Csatlakozva', + 'native.connect.addCert': 'Klienstanúsítvány hozzáadása', + 'native.connect.recheck': 'Újraellenőrzés', + 'native.connect.kickerUnreachable': 'Nem elérhető', + 'native.connect.kickerNotTrek': 'Nem TREK', + 'native.connect.kickerTooOld': 'Frissítés szükséges', + 'native.connect.kickerCert': 'Tanúsítvány szükséges', + 'native.connect.kickerGate': 'Bejelentkezés szükséges', + 'native.subscribed.kicker': 'Aktív előfizetés', + 'native.provisioning.kicker': 'Beállítás', + 'native.provisioning.stepAddress': 'Cím lefoglalva', + 'native.provisioning.stepServer': 'Szerver indul', + 'native.provisioning.stepReady': 'Kész', + 'native.provisioning.readyTitle': 'Megérkeztél.', + 'native.provisioning.readySub': 'A TREK-ed kész. Hívd meg azokat, akik veled utaznak.', + 'native.provisioning.open': 'Utazás tervezése', }; export default native; diff --git a/shared/src/i18n/id/native.ts b/shared/src/i18n/id/native.ts index de869cef3..c0a1ba135 100644 --- a/shared/src/i18n/id/native.ts +++ b/shared/src/i18n/id/native.ts @@ -30,44 +30,22 @@ const native: TranslationStrings = { 'native.privacy': 'Kebijakan privasi', 'native.settings.server': 'Server', // same-as-en 'native.settings.serverHint': 'Aplikasi ini terhubung ke {server}.', - 'native.welcome.headline': 'Perjalanan Anda.\nRencana Anda.', - 'native.welcome.sub': 'Rencanakan bersama secara real time: tur, anggaran, jurnal, dan buku foto, dibantu AI.', - 'native.welcome.connect': 'Hubungkan TREK Anda', - 'native.welcome.connectSub': 'Buka alamat yang sudah Anda pakai', - 'native.welcome.getCloud': 'Dapatkan TREK Cloud', - 'native.welcome.getCloudSub': 'Dihosting untuk Anda, tanpa penyiapan', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': - 'Kami menghosting TREK untuk Anda, di alamat Anda sendiri. Tidak ada yang perlu dipasang atau dirawat: siap dalam hitungan menit.', - 'native.cloud.f1': 'Alamat Anda sendiri, di server di Jerman', - 'native.cloud.f2': 'Siap dalam hitungan menit, pembaruan kami yang urus', - 'native.cloud.f3': 'Data Anda tetap milik Anda: tanpa iklan, tanpa pelacakan', - 'native.cloud.cta': 'Mulai', 'native.cloud.haveServer': 'Saya sudah punya server TREK', - 'native.connecting': 'Menghubungkan ke {host}', 'native.back': 'Kembali', 'native.plans.title': 'Pilih paket Anda', - 'native.plans.sub': 'TREK dihosting di alamat Anda sendiri. Ubah atau batalkan kapan saja.', 'native.plans.monthly': 'Bulanan', 'native.plans.yearly': 'Tahunan', 'native.plans.perMonth': 'per bulan', 'native.plans.perYear': 'per tahun', - 'native.plans.aiDocs': '{n} dokumen AI per bulan', - 'native.plans.noAi': 'Tanpa dokumen AI', - 'native.plans.storage': 'Penyimpanan {n} GB', 'native.plans.loadError': 'Tidak dapat memuat paket. Periksa koneksi Anda dan coba lagi.', 'native.plans.retry': 'Coba lagi', 'native.plans.soon': 'Berlangganan di aplikasi belum tersedia.', 'native.plans.closed': 'TREK Cloud segera dibuka. Mulai hari pembukaan, Anda bisa berlangganan di sini.', - 'native.claim.title': 'Hampir selesai', - 'native.claim.sub': 'Pilih alamat Anda. Kami langsung menyiapkannya.', 'native.claim.addressLabel': 'Alamat Anda', 'native.claim.taken': 'Alamat itu sudah dipakai.', 'native.claim.invalid': 'Tiga huruf, angka, atau tanda hubung atau lebih.', 'native.claim.reserved': 'Alamat itu dicadangkan.', - 'native.claim.free': 'Tersedia', 'native.claim.emailLabel': 'Email', // same-as-en - 'native.claim.emailHint': 'Untuk akun Anda dan pemberitahuan tentang kontrak Anda.', 'native.claim.passwordLabel': 'Kata sandi', 'native.claim.passwordHint': 'Minimal 8 karakter. Kata sandi harus mengandung huruf besar, huruf kecil, angka, dan karakter khusus.', @@ -83,23 +61,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'Kami tidak dapat memulihkan TREK Anda. Silakan coba lagi.', 'native.plans.legal': 'Pembayaran ditagihkan ke Apple ID Anda saat konfirmasi. Langganan diperpanjang otomatis kecuali dibatalkan setidaknya 24 jam sebelum periode berakhir. Kelola atau batalkan di pengaturan akun App Store Anda.', - 'native.plans.terms': 'Ketentuan penggunaan Apple (EULA)', 'native.plans.ourTerms': 'Ketentuan TREK Cloud', 'native.plans.legalAndroid': 'Pembayaran ditagihkan ke akun Google Anda saat konfirmasi. Langganan diperpanjang otomatis kecuali Anda membatalkannya sebelum periode berakhir. Kelola atau batalkan di Google Play pada Profil, Pembayaran & langganan, Langganan.', 'native.plans.restoreNoneAndroid': 'Tidak ditemukan langganan aktif di akun Google ini.', 'native.plans.recommended': 'Disarankan', - 'native.plans.everyPlan': 'Di setiap paket: tempat, perjalanan, dan orang tanpa batas', - 'native.plans.continueWith': 'Lanjut dengan {plan}', 'native.claim.change': 'Ubah', 'native.claim.ruleLength': 'karakter', 'native.claim.ruleUpper': 'Huruf besar', 'native.claim.ruleLower': 'Huruf kecil', 'native.claim.ruleDigit': 'Angka', 'native.claim.ruleSpecial': 'Simbol', - 'native.claim.trustServers': 'Server di Jerman', - 'native.claim.trustCancel': 'Batalkan kapan saja', - 'native.claim.trustNoAds': 'Tanpa iklan', 'native.subscribed.title': 'Kamu sudah punya TREK Cloud', 'native.subscribed.text': 'Apple ID ini sudah memiliki langganan TREK Cloud yang aktif. Kamu bisa berlangganan lagi, juga dengan alamat baru, setelah langganan ini berakhir.', @@ -210,6 +182,64 @@ const native: TranslationStrings = { 'native.cert.removeTitle': 'Hapus sertifikat?', 'native.cert.removeMessage': 'Tanpa sertifikat, proxy di depan {host} tidak lagi meloloskan aplikasi sampai kamu menambahkan yang baru.', + 'native.welcome.title': 'Mau ke mana berikutnya?', + 'native.welcome.lead': + 'Rencanakan bersama ke mana kalian pergi. TREK menyimpan rute, pemesanan, dan foto di satu tempat.', + 'native.welcome.routeTitle': 'Rute dan peta', + 'native.welcome.routeSub': 'Hari demi hari, dengan jalur dan waktu', + 'native.welcome.togetherTitle': 'Rencanakan bersama', + 'native.welcome.togetherSub': 'Semua orang langsung melihat setiap perubahan', + 'native.welcome.photosTitle': 'Foto dan buku foto', + 'native.welcome.photosSub': 'Kenangan tetap bersama perjalanan', + 'native.welcome.discover': 'Lihat paket cloud', + 'native.trip.start.title': 'Liburan akhir pekan', + 'native.trip.start.text': 'Perjalanan singkat, terutama merencanakan.', + 'native.trip.basis.title': 'Perjalanan keliling', + 'native.trip.basis.text': 'Beberapa tempat, pemesanan otomatis.', + 'native.trip.plus.title': 'Perjalanan besar', + 'native.trip.plus.text': 'Berminggu-minggu di jalan, bersama seluruh rombongan.', + 'native.trip.pro.title': 'Penjelajah dunia', + 'native.trip.pro.text': 'Untuk yang sering bepergian dan buku foto besar.', + 'native.plans.unlimited': 'Tanpa batas', + 'native.plans.unlimitedSub': 'Perjalanan dan teman perjalanan', + 'native.plans.inEveryPlan': 'di setiap paket', + 'native.plans.yearlyIs': '{price} per tahun, batalkan kapan saja', + 'native.plans.monthlyIs': 'Itu {price} per bulan', + 'native.plans.photos': '≈ {n} foto', + 'native.plans.aiPerMonth': '{n} / bulan', + 'native.plans.aiNone': 'Tidak ada', + 'native.plans.aiLabel': 'Dokumen AI', + 'native.plans.choose': 'Pilih {trip}', + 'native.plans.termsShort': 'Ketentuan Penggunaan (EULA)', + 'native.plans.privacyShort': 'Privasi', + 'native.plans.billing': 'Pembayaran', + 'native.claim.almost': 'Hampir sampai', + 'native.claim.addressField': 'Alamat', + 'native.claim.slugPlaceholder': 'namamu', + 'native.claim.emailPlaceholder': 'kamu@contoh.id', + 'native.claim.passwordPlaceholder': 'Pilih kata sandi', + 'native.claim.freeBadge': 'tersedia', + 'native.claim.renews': 'Diperpanjang otomatis, batalkan kapan saja.', + 'native.claim.showPassword': 'Tampilkan kata sandi', + 'native.connect.yourTrek': 'TREK kamu', + 'native.connect.addressField': 'Alamat server', + 'native.connect.found': 'TREK ditemukan', + 'native.connect.connected': 'Terhubung', + 'native.connect.addCert': 'Tambahkan sertifikat klien', + 'native.connect.recheck': 'Periksa lagi', + 'native.connect.kickerUnreachable': 'Tidak terjangkau', + 'native.connect.kickerNotTrek': 'Bukan TREK', + 'native.connect.kickerTooOld': 'Perlu pembaruan', + 'native.connect.kickerCert': 'Perlu sertifikat', + 'native.connect.kickerGate': 'Perlu masuk', + 'native.subscribed.kicker': 'Langganan aktif', + 'native.provisioning.kicker': 'Sedang disiapkan', + 'native.provisioning.stepAddress': 'Alamat dipesan', + 'native.provisioning.stepServer': 'Server dimulai', + 'native.provisioning.stepReady': 'Siap', + 'native.provisioning.readyTitle': 'Sudah sampai.', + 'native.provisioning.readySub': 'TREK kamu sudah siap. Undang yang ikut bepergian denganmu.', + 'native.provisioning.open': 'Rencanakan perjalanan', }; export default native; diff --git a/shared/src/i18n/it/native.ts b/shared/src/i18n/it/native.ts index 375e07d62..a0ab49bb6 100644 --- a/shared/src/i18n/it/native.ts +++ b/shared/src/i18n/it/native.ts @@ -31,44 +31,22 @@ const native: TranslationStrings = { 'native.privacy': 'Informativa sulla privacy', 'native.settings.server': 'Server', // same-as-en 'native.settings.serverHint': 'Questa app è collegata a {server}.', - 'native.welcome.headline': 'I tuoi viaggi.\nIl tuo piano.', - 'native.welcome.sub': 'Pianifica insieme in tempo reale: tour, budget, diario e fotolibro, con l’aiuto dell’IA.', - 'native.welcome.connect': 'Collega il tuo TREK', - 'native.welcome.connectSub': 'Apri l’indirizzo che già usi', - 'native.welcome.getCloud': 'Attiva TREK Cloud', - 'native.welcome.getCloudSub': 'Ospitato per te, senza installazione', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': - 'Ospitiamo TREK per te, sul tuo indirizzo. Niente da installare, niente da mantenere: pronto in pochi minuti.', - 'native.cloud.f1': 'Il tuo indirizzo, su server in Germania', - 'native.cloud.f2': 'Pronto in pochi minuti, aggiornamenti inclusi', - 'native.cloud.f3': 'I tuoi dati restano tuoi: niente pubblicità, niente tracciamento', - 'native.cloud.cta': 'Inizia', 'native.cloud.haveServer': 'Ho già un server TREK', - 'native.connecting': 'Connessione a {host}', 'native.back': 'Indietro', 'native.plans.title': 'Scegli il tuo piano', - 'native.plans.sub': 'TREK ospitato sul tuo indirizzo. Modifica o disdici quando vuoi.', 'native.plans.monthly': 'Mensile', 'native.plans.yearly': 'Annuale', 'native.plans.perMonth': 'al mese', 'native.plans.perYear': 'all’anno', - 'native.plans.aiDocs': '{n} documenti con IA al mese', - 'native.plans.noAi': 'Nessun documento con IA', - 'native.plans.storage': '{n} GB di spazio', 'native.plans.loadError': 'Impossibile caricare i piani. Controlla la connessione e riprova.', 'native.plans.retry': 'Riprova', 'native.plans.soon': 'L’abbonamento nell’app non è ancora disponibile.', 'native.plans.closed': 'TREK Cloud apre presto. Potrai abbonarti qui dal giorno dell’apertura.', - 'native.claim.title': 'Quasi fatto', - 'native.claim.sub': 'Scegli il tuo indirizzo. Lo prepariamo subito.', 'native.claim.addressLabel': 'Il tuo indirizzo', 'native.claim.taken': 'Questo indirizzo è già occupato.', 'native.claim.invalid': 'Almeno tre lettere, numeri o trattini.', 'native.claim.reserved': 'Questo indirizzo è riservato.', - 'native.claim.free': 'Disponibile', 'native.claim.emailLabel': 'Email', // same-as-en - 'native.claim.emailHint': 'Per il tuo account e le comunicazioni sul contratto.', 'native.claim.passwordLabel': 'La tua password', 'native.claim.passwordHint': 'Almeno 8 caratteri. La password deve contenere lettere maiuscole, minuscole, un numero e un carattere speciale.', @@ -84,23 +62,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'Non siamo riusciti a ripristinare il tuo TREK. Riprova.', 'native.plans.legal': 'Il pagamento viene addebitato sul tuo ID Apple alla conferma. L’abbonamento si rinnova automaticamente se non lo annulli almeno 24 ore prima della fine del periodo. Gestiscilo o annullalo nelle impostazioni del tuo account App Store.', - 'native.plans.terms': 'Termini d’uso di Apple (EULA)', 'native.plans.ourTerms': 'Condizioni di TREK Cloud', 'native.plans.legalAndroid': 'Il pagamento viene addebitato sul tuo account Google alla conferma. L’abbonamento si rinnova automaticamente se non lo annulli prima della fine del periodo. Gestiscilo o annullalo in Google Play da Profilo, Pagamenti e abbonamenti, Abbonamenti.', 'native.plans.restoreNoneAndroid': 'Nessun abbonamento attivo trovato per questo account Google.', 'native.plans.recommended': 'Consigliato', - 'native.plans.everyPlan': 'In ogni piano: luoghi, viaggi e persone illimitati', - 'native.plans.continueWith': 'Continua con {plan}', 'native.claim.change': 'Cambia', 'native.claim.ruleLength': 'caratteri', 'native.claim.ruleUpper': 'Maiuscola', 'native.claim.ruleLower': 'Minuscola', 'native.claim.ruleDigit': 'Numero', 'native.claim.ruleSpecial': 'Simbolo', - 'native.claim.trustServers': 'Server in Germania', - 'native.claim.trustCancel': 'Disdici quando vuoi', - 'native.claim.trustNoAds': 'Senza pubblicità', 'native.subscribed.title': 'Hai già TREK Cloud', 'native.subscribed.text': 'Questo ID Apple ha già un abbonamento TREK Cloud attivo. Potrai sottoscriverne uno nuovo, anche con un nuovo indirizzo, quando sarà terminato.', @@ -213,6 +185,63 @@ const native: TranslationStrings = { 'native.cert.removeTitle': 'Rimuovere il certificato?', 'native.cert.removeMessage': "Senza, il proxy davanti a {host} non fa più entrare l'app finché non ne aggiungi uno nuovo.", + 'native.welcome.title': 'Dove si va la prossima volta?', + 'native.welcome.lead': 'Pianificate insieme la meta. TREK tiene percorso, prenotazioni e foto in un unico posto.', + 'native.welcome.routeTitle': 'Percorso e mappa', + 'native.welcome.routeSub': 'Giorno per giorno, con tragitti e orari', + 'native.welcome.togetherTitle': 'Pianificare insieme', + 'native.welcome.togetherSub': 'Tutti vedono subito ogni modifica', + 'native.welcome.photosTitle': 'Foto e fotolibro', + 'native.welcome.photosSub': 'I ricordi restano con il viaggio', + 'native.welcome.discover': 'Scopri i piani cloud', + 'native.trip.start.title': 'Weekend', + 'native.trip.start.text': 'Viaggi brevi, soprattutto da pianificare.', + 'native.trip.basis.title': 'Tour', + 'native.trip.basis.text': 'Più tappe, prenotazioni automatiche.', + 'native.trip.plus.title': 'Grande viaggio', + 'native.trip.plus.text': 'Settimane in viaggio, con tutto il gruppo.', + 'native.trip.pro.title': 'Giramondo', + 'native.trip.pro.text': 'Per chi viaggia spesso e per grandi fotolibri.', + 'native.plans.unlimited': 'Illimitati', + 'native.plans.unlimitedSub': 'Viaggi e compagni di viaggio', + 'native.plans.inEveryPlan': 'in ogni piano', + 'native.plans.yearlyIs': '{price} all’anno, disdici quando vuoi', + 'native.plans.monthlyIs': 'Sono {price} al mese', + 'native.plans.photos': '≈ {n} foto', + 'native.plans.aiPerMonth': '{n} / mese', + 'native.plans.aiNone': 'Nessuno', + 'native.plans.aiLabel': 'Documenti IA', + 'native.plans.choose': 'Scegli {trip}', + 'native.plans.termsShort': 'Condizioni d’uso (EULA)', + 'native.plans.privacyShort': 'Privacy', // same-as-en + 'native.plans.billing': 'Fatturazione', + 'native.claim.almost': 'Quasi arrivati', + 'native.claim.addressField': 'Indirizzo', + 'native.claim.slugPlaceholder': 'tuonome', + 'native.claim.emailPlaceholder': 'tu@esempio.it', + 'native.claim.passwordPlaceholder': 'Scegli una password', + 'native.claim.freeBadge': 'libero', + 'native.claim.renews': 'Si rinnova automaticamente, disdici quando vuoi.', + 'native.claim.showPassword': 'Mostra password', + 'native.connect.yourTrek': 'Il tuo TREK', + 'native.connect.addressField': 'Indirizzo del server', + 'native.connect.found': 'TREK trovato', + 'native.connect.connected': 'Connesso', + 'native.connect.addCert': 'Aggiungi un certificato client', + 'native.connect.recheck': 'Verifica di nuovo', + 'native.connect.kickerUnreachable': 'Non raggiungibile', + 'native.connect.kickerNotTrek': 'Non è TREK', + 'native.connect.kickerTooOld': 'Aggiornamento necessario', + 'native.connect.kickerCert': 'Certificato necessario', + 'native.connect.kickerGate': 'Accesso necessario', + 'native.subscribed.kicker': 'Abbonamento attivo', + 'native.provisioning.kicker': 'Configurazione', + 'native.provisioning.stepAddress': 'Indirizzo riservato', + 'native.provisioning.stepServer': 'Avvio del server', + 'native.provisioning.stepReady': 'Pronto', + 'native.provisioning.readyTitle': 'Arrivati.', + 'native.provisioning.readySub': 'Il tuo TREK è pronto. Invita chi viaggia con te.', + 'native.provisioning.open': 'Pianifica un viaggio', }; export default native; diff --git a/shared/src/i18n/ja/native.ts b/shared/src/i18n/ja/native.ts index 792bc0d5e..6df5e48e9 100644 --- a/shared/src/i18n/ja/native.ts +++ b/shared/src/i18n/ja/native.ts @@ -30,44 +30,22 @@ const native: TranslationStrings = { 'native.privacy': 'プライバシーポリシー', 'native.settings.server': 'サーバー', 'native.settings.serverHint': 'このアプリは {server} に接続されています。', - 'native.welcome.headline': 'あなたの旅。\nあなたの計画。', - 'native.welcome.sub': 'みんなでリアルタイムに計画:ツアー、予算、ジャーナル、フォトブック。AIも活用できます。', - 'native.welcome.connect': 'あなたのTREKに接続', - 'native.welcome.connectSub': 'すでに使っているアドレスを開く', - 'native.welcome.getCloud': 'TREK Cloudを始める', - 'native.welcome.getCloudSub': 'あなたのために用意、設定不要', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': - 'TREKをあなたのために、あなた専用のアドレスでホストします。インストールも管理も不要で、数分で使えます。', - 'native.cloud.f1': '専用アドレス、ドイツのサーバー上', - 'native.cloud.f2': '数分で準備完了、アップデートはお任せ', - 'native.cloud.f3': 'データはあなたのもの。広告なし、追跡なし', - 'native.cloud.cta': '始める', 'native.cloud.haveServer': 'すでにTREKサーバーを持っています', - 'native.connecting': '{host} に接続中', 'native.back': '戻る', 'native.plans.title': 'プランを選ぶ', - 'native.plans.sub': 'あなた専用のアドレスでホストされるTREK。いつでも変更・解約できます。', 'native.plans.monthly': '月額', 'native.plans.yearly': '年額', 'native.plans.perMonth': '月あたり', 'native.plans.perYear': '年あたり', - 'native.plans.aiDocs': '月に{n}件のAIドキュメント', - 'native.plans.noAi': 'AIドキュメントなし', - 'native.plans.storage': '{n} GB のストレージ', 'native.plans.loadError': 'プランを読み込めませんでした。接続を確認してもう一度お試しください。', 'native.plans.retry': 'もう一度試す', 'native.plans.soon': 'アプリ内での登録はまだご利用いただけません。', 'native.plans.closed': 'TREK Cloudはまもなく開始します。開始日からここで登録できます。', - 'native.claim.title': 'もう少しです', - 'native.claim.sub': 'アドレスを選んでください。すぐに用意します。', 'native.claim.addressLabel': 'あなたのアドレス', 'native.claim.taken': 'このアドレスは使用中です。', 'native.claim.invalid': '3文字以上の英字・数字・ハイフン。', 'native.claim.reserved': 'このアドレスは予約済みです。', - 'native.claim.free': '利用可能', 'native.claim.emailLabel': 'メール', - 'native.claim.emailHint': 'アカウントと契約に関するお知らせ用です。', 'native.claim.passwordLabel': 'パスワード', 'native.claim.passwordHint': '8文字以上。大文字・小文字・数字・記号を含めてください。', 'native.claim.subscribe': '{price} で登録', @@ -82,23 +60,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'TREKを復元できませんでした。もう一度お試しください。', 'native.plans.legal': 'お支払いは確認時にApple IDに請求されます。期間終了の24時間前までに解約しない限り、サブスクリプションは自動更新されます。管理や解約はApp Storeのアカウント設定から行えます。', - 'native.plans.terms': 'Apple の利用規約(EULA)', 'native.plans.ourTerms': 'TREK Cloud 利用規約', 'native.plans.legalAndroid': '確認時に Google アカウントに請求されます。期間終了前に解約しない限り、サブスクリプションは自動更新されます。Google Play の[プロフィール][お支払いと定期購入][定期購入]で管理または解約できます。', 'native.plans.restoreNoneAndroid': 'この Google アカウントには有効なサブスクリプションがありません。', 'native.plans.recommended': 'おすすめ', - 'native.plans.everyPlan': 'すべてのプランで:場所・旅行・メンバーが無制限', - 'native.plans.continueWith': '{plan} で続ける', 'native.claim.change': '変更', 'native.claim.ruleLength': '文字', 'native.claim.ruleUpper': '大文字', 'native.claim.ruleLower': '小文字', 'native.claim.ruleDigit': '数字', 'native.claim.ruleSpecial': '記号', - 'native.claim.trustServers': 'ドイツのサーバー', - 'native.claim.trustCancel': 'いつでも解約可能', - 'native.claim.trustNoAds': '広告なし', 'native.subscribed.title': 'TREK Cloud はすでにご利用中です', 'native.subscribed.text': 'この Apple ID にはすでに有効な TREK Cloud のサブスクリプションがあります。終了後に、新しいアドレスでも新たに申し込めます。', @@ -208,6 +180,63 @@ const native: TranslationStrings = { 'native.cert.settingRemove': '削除', 'native.cert.removeTitle': '証明書を削除しますか?', 'native.cert.removeMessage': '削除すると、新しい証明書を追加するまで {host} の前段のプロキシはアプリを通しません。', + 'native.welcome.title': '次はどこへ行きますか?', + 'native.welcome.lead': '行き先をみんなで計画しましょう。TREK はルート、予約、写真をひとつにまとめます。', + 'native.welcome.routeTitle': 'ルートと地図', + 'native.welcome.routeSub': '一日ずつ、道のりと時間つき', + 'native.welcome.togetherTitle': 'みんなで計画', + 'native.welcome.togetherSub': 'すべての変更がすぐ全員に届きます', + 'native.welcome.photosTitle': '写真とフォトブック', + 'native.welcome.photosSub': '思い出は旅と一緒に残ります', + 'native.welcome.discover': 'クラウドプランを見る', + 'native.trip.start.title': '週末旅行', + 'native.trip.start.text': '短い旅、計画が中心。', + 'native.trip.basis.title': '周遊旅行', + 'native.trip.basis.text': '複数の目的地、予約は自動で。', + 'native.trip.plus.title': '大旅行', + 'native.trip.plus.text': '何週間もの旅を、グループ全員で。', + 'native.trip.pro.title': '世界旅行者', + 'native.trip.pro.text': 'よく旅する人と大きなフォトブックに。', + 'native.plans.unlimited': '無制限', + 'native.plans.unlimitedSub': '旅行と同行者', + 'native.plans.inEveryPlan': 'すべてのプランで', + 'native.plans.yearlyIs': '年額 {price}、いつでも解約可能', + 'native.plans.monthlyIs': '月あたり {price}', + 'native.plans.photos': '約 {n} 枚の写真', + 'native.plans.aiPerMonth': '{n} / 月', + 'native.plans.aiNone': 'なし', + 'native.plans.aiLabel': 'AI ドキュメント', + 'native.plans.choose': '{trip}を選ぶ', + 'native.plans.termsShort': '利用規約 (EULA)', + 'native.plans.privacyShort': 'プライバシー', + 'native.plans.billing': 'お支払い', + 'native.claim.almost': 'もうすぐ到着', + 'native.claim.addressField': 'アドレス', + 'native.claim.slugPlaceholder': 'yourname', // same-as-en + 'native.claim.emailPlaceholder': 'you@example.com', // same-as-en + 'native.claim.passwordPlaceholder': 'パスワードを決める', + 'native.claim.freeBadge': '空き', + 'native.claim.renews': '自動更新、いつでも解約できます。', + 'native.claim.showPassword': 'パスワードを表示', + 'native.connect.yourTrek': 'あなたの TREK', + 'native.connect.addressField': 'サーバーのアドレス', + 'native.connect.found': 'TREK が見つかりました', + 'native.connect.connected': '接続済み', + 'native.connect.addCert': 'クライアント証明書を追加', + 'native.connect.recheck': 'もう一度確認', + 'native.connect.kickerUnreachable': '接続できません', + 'native.connect.kickerNotTrek': 'TREK ではありません', + 'native.connect.kickerTooOld': '更新が必要', + 'native.connect.kickerCert': '証明書が必要', + 'native.connect.kickerGate': 'サインインが必要', + 'native.subscribed.kicker': '有効なサブスクリプション', + 'native.provisioning.kicker': '準備中', + 'native.provisioning.stepAddress': 'アドレスを確保', + 'native.provisioning.stepServer': 'サーバーを起動中', + 'native.provisioning.stepReady': '準備完了', + 'native.provisioning.readyTitle': '到着しました。', + 'native.provisioning.readySub': 'TREK の準備ができました。一緒に旅する人を招待しましょう。', + 'native.provisioning.open': '旅を計画する', }; export default native; diff --git a/shared/src/i18n/ko/native.ts b/shared/src/i18n/ko/native.ts index 51e0b2cad..4ad990a4d 100644 --- a/shared/src/i18n/ko/native.ts +++ b/shared/src/i18n/ko/native.ts @@ -29,43 +29,22 @@ const native: TranslationStrings = { 'native.privacy': '개인정보 처리방침', 'native.settings.server': '서버', 'native.settings.serverHint': '이 앱은 {server}에 연결되어 있습니다.', - 'native.welcome.headline': '당신의 여행.\n당신의 계획.', - 'native.welcome.sub': '실시간으로 함께 계획하세요: 투어, 예산, 저널, 포토북까지 AI와 함께.', - 'native.welcome.connect': '내 TREK 연결', - 'native.welcome.connectSub': '이미 사용하는 주소 열기', - 'native.welcome.getCloud': 'TREK Cloud 시작하기', - 'native.welcome.getCloudSub': '설정 없이 대신 호스팅', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': 'TREK을 여러분만의 주소로 대신 호스팅합니다. 설치도 관리도 필요 없이 몇 분이면 준비됩니다.', - 'native.cloud.f1': '나만의 주소, 독일 서버에서', - 'native.cloud.f2': '몇 분이면 준비 완료, 업데이트는 저희가', - 'native.cloud.f3': '데이터는 그대로 내 것: 광고 없음, 추적 없음', - 'native.cloud.cta': '시작하기', 'native.cloud.haveServer': '이미 TREK 서버가 있어요', - 'native.connecting': '{host}에 연결 중', 'native.back': '뒤로', 'native.plans.title': '플랜 선택', - 'native.plans.sub': '나만의 주소로 호스팅되는 TREK. 언제든 변경하거나 해지하세요.', 'native.plans.monthly': '월간', 'native.plans.yearly': '연간', 'native.plans.perMonth': '월', 'native.plans.perYear': '년', - 'native.plans.aiDocs': '월 {n}개의 AI 문서', - 'native.plans.noAi': 'AI 문서 없음', - 'native.plans.storage': '{n} GB 저장공간', 'native.plans.loadError': '플랜을 불러오지 못했습니다. 연결을 확인하고 다시 시도하세요.', 'native.plans.retry': '다시 시도', 'native.plans.soon': '앱 내 구독은 아직 이용할 수 없습니다.', 'native.plans.closed': 'TREK Cloud가 곧 문을 엽니다. 오픈일부터 여기에서 구독할 수 있습니다.', - 'native.claim.title': '거의 다 됐어요', - 'native.claim.sub': '주소를 선택하세요. 바로 준비해 드립니다.', 'native.claim.addressLabel': '내 주소', 'native.claim.taken': '이미 사용 중인 주소예요.', 'native.claim.invalid': '세 글자 이상의 문자, 숫자, 하이픈.', 'native.claim.reserved': '예약된 주소예요.', - 'native.claim.free': '사용 가능', 'native.claim.emailLabel': '이메일', - 'native.claim.emailHint': '계정과 계약 관련 안내에 사용됩니다.', 'native.claim.passwordLabel': '비밀번호', 'native.claim.passwordHint': '8자 이상. 비밀번호는 대문자, 소문자, 숫자, 특수문자를 포함해야 합니다.', 'native.claim.subscribe': '{price}에 구독', @@ -79,23 +58,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'TREK을 복원하지 못했습니다. 다시 시도하세요.', 'native.plans.legal': '결제는 확인 시 Apple ID로 청구됩니다. 기간 종료 최소 24시간 전에 해지하지 않으면 구독이 자동으로 갱신됩니다. App Store 계정 설정에서 관리하거나 해지할 수 있습니다.', - 'native.plans.terms': 'Apple 이용 약관(EULA)', 'native.plans.ourTerms': 'TREK Cloud 약관', 'native.plans.legalAndroid': '확인 시 Google 계정으로 결제됩니다. 기간이 끝나기 전에 취소하지 않으면 구독이 자동으로 갱신됩니다. Google Play의 프로필, 결제 및 정기 결제, 정기 결제에서 관리하거나 취소할 수 있습니다.', 'native.plans.restoreNoneAndroid': '이 Google 계정에서 활성 구독을 찾을 수 없습니다.', 'native.plans.recommended': '추천', - 'native.plans.everyPlan': '모든 요금제: 장소, 여행, 인원 무제한', - 'native.plans.continueWith': '{plan}(으)로 계속', 'native.claim.change': '변경', 'native.claim.ruleLength': '자', 'native.claim.ruleUpper': '대문자', 'native.claim.ruleLower': '소문자', 'native.claim.ruleDigit': '숫자', 'native.claim.ruleSpecial': '특수문자', - 'native.claim.trustServers': '독일 내 서버', - 'native.claim.trustCancel': '언제든 해지 가능', - 'native.claim.trustNoAds': '광고 없음', 'native.subscribed.title': '이미 TREK Cloud를 이용 중입니다', 'native.subscribed.text': '이 Apple ID에는 이미 활성 TREK Cloud 구독이 있습니다. 구독이 끝나면 새 주소로도 새로 구독할 수 있습니다.', @@ -204,6 +177,63 @@ const native: TranslationStrings = { 'native.cert.removeTitle': '인증서를 삭제할까요?', 'native.cert.removeMessage': '인증서가 없으면 새 인증서를 추가할 때까지 {host} 앞의 프록시가 앱을 통과시키지 않습니다.', + 'native.welcome.title': '다음 여행은 어디로 갈까요?', + 'native.welcome.lead': '어디로 갈지 함께 계획하세요. TREK이 경로, 예약, 사진을 한곳에 모아 둡니다.', + 'native.welcome.routeTitle': '경로와 지도', + 'native.welcome.routeSub': '하루하루, 길과 시간까지', + 'native.welcome.togetherTitle': '함께 계획하기', + 'native.welcome.togetherSub': '모든 변경 사항을 모두가 바로 봅니다', + 'native.welcome.photosTitle': '사진과 포토북', + 'native.welcome.photosSub': '추억은 여행과 함께 남습니다', + 'native.welcome.discover': '클라우드 요금제 보기', + 'native.trip.start.title': '주말여행', + 'native.trip.start.text': '짧은 여행, 주로 계획.', + 'native.trip.basis.title': '순회 여행', + 'native.trip.basis.text': '여러 장소, 예약은 자동으로.', + 'native.trip.plus.title': '긴 여행', + 'native.trip.plus.text': '몇 주간의 여정, 모든 일행과 함께.', + 'native.trip.pro.title': '세계 여행자', + 'native.trip.pro.text': '자주 여행하는 분과 큰 포토북을 위해.', + 'native.plans.unlimited': '무제한', + 'native.plans.unlimitedSub': '여행과 동행자', + 'native.plans.inEveryPlan': '모든 요금제에 포함', + 'native.plans.yearlyIs': '연 {price}, 언제든 해지', + 'native.plans.monthlyIs': '월 {price}에 해당', + 'native.plans.photos': '약 {n}장의 사진', + 'native.plans.aiPerMonth': '{n} / 월', + 'native.plans.aiNone': '없음', + 'native.plans.aiLabel': 'AI 문서', + 'native.plans.choose': '{trip} 선택', + 'native.plans.termsShort': '이용 약관 (EULA)', + 'native.plans.privacyShort': '개인정보', + 'native.plans.billing': '결제', + 'native.claim.almost': '거의 다 왔어요', + 'native.claim.addressField': '주소', + 'native.claim.slugPlaceholder': 'yourname', // same-as-en + 'native.claim.emailPlaceholder': 'you@example.com', // same-as-en + 'native.claim.passwordPlaceholder': '비밀번호 정하기', + 'native.claim.freeBadge': '사용 가능', + 'native.claim.renews': '자동 갱신되며 언제든 해지할 수 있습니다.', + 'native.claim.showPassword': '비밀번호 표시', + 'native.connect.yourTrek': '나의 TREK', + 'native.connect.addressField': '서버 주소', + 'native.connect.found': 'TREK을 찾았습니다', + 'native.connect.connected': '연결됨', + 'native.connect.addCert': '클라이언트 인증서 추가', + 'native.connect.recheck': '다시 확인', + 'native.connect.kickerUnreachable': '연결할 수 없음', + 'native.connect.kickerNotTrek': 'TREK이 아님', + 'native.connect.kickerTooOld': '업데이트 필요', + 'native.connect.kickerCert': '인증서 필요', + 'native.connect.kickerGate': '로그인 필요', + 'native.subscribed.kicker': '활성 구독', + 'native.provisioning.kicker': '설정 중', + 'native.provisioning.stepAddress': '주소 예약됨', + 'native.provisioning.stepServer': '서버 시작 중', + 'native.provisioning.stepReady': '준비 완료', + 'native.provisioning.readyTitle': '도착했어요.', + 'native.provisioning.readySub': 'TREK이 준비되었습니다. 함께 여행하는 사람들을 초대하세요.', + 'native.provisioning.open': '여행 계획하기', }; export default native; diff --git a/shared/src/i18n/nl/native.ts b/shared/src/i18n/nl/native.ts index a1b6f8d3f..3df3e8f1a 100644 --- a/shared/src/i18n/nl/native.ts +++ b/shared/src/i18n/nl/native.ts @@ -30,44 +30,22 @@ const native: TranslationStrings = { 'native.privacy': 'Privacybeleid', 'native.settings.server': 'Server', // same-as-en 'native.settings.serverHint': 'Deze app is verbonden met {server}.', - 'native.welcome.headline': 'Jouw reizen.\nJouw plan.', - 'native.welcome.sub': 'Plan samen in realtime: tours, budgetten, dagboek en fotoboek, met hulp van AI.', - 'native.welcome.connect': 'Verbind je TREK', - 'native.welcome.connectSub': 'Open het adres dat je al gebruikt', - 'native.welcome.getCloud': 'Neem TREK Cloud', - 'native.welcome.getCloudSub': 'Voor je gehost, zonder installatie', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': - 'Wij hosten TREK voor je, op je eigen adres. Niets te installeren, niets te onderhouden: binnen enkele minuten klaar.', - 'native.cloud.f1': 'Je eigen adres, op servers in Duitsland', - 'native.cloud.f2': 'In enkele minuten klaar, updates doen wij', - 'native.cloud.f3': 'Je gegevens blijven van jou: geen advertenties, geen tracking', - 'native.cloud.cta': 'Aan de slag', 'native.cloud.haveServer': 'Ik heb al een TREK-server', - 'native.connecting': 'Verbinden met {host}', 'native.back': 'Terug', 'native.plans.title': 'Kies je abonnement', - 'native.plans.sub': 'TREK gehost op je eigen adres. Altijd te wijzigen of op te zeggen.', 'native.plans.monthly': 'Maandelijks', 'native.plans.yearly': 'Jaarlijks', 'native.plans.perMonth': 'per maand', 'native.plans.perYear': 'per jaar', - 'native.plans.aiDocs': '{n} AI-documenten per maand', - 'native.plans.noAi': 'Geen AI-documenten', - 'native.plans.storage': '{n} GB opslag', 'native.plans.loadError': 'Kan de abonnementen niet laden. Controleer je verbinding en probeer het opnieuw.', 'native.plans.retry': 'Opnieuw proberen', 'native.plans.soon': 'Abonneren in de app is nog niet beschikbaar.', 'native.plans.closed': 'TREK Cloud opent binnenkort. Vanaf de openingsdag kun je hier abonneren.', - 'native.claim.title': 'Bijna klaar', - 'native.claim.sub': 'Kies je adres. We zetten het meteen klaar.', 'native.claim.addressLabel': 'Je adres', 'native.claim.taken': 'Dit adres is al bezet.', 'native.claim.invalid': 'Minstens drie letters, cijfers of streepjes.', 'native.claim.reserved': 'Dit adres is gereserveerd.', - 'native.claim.free': 'Beschikbaar', 'native.claim.emailLabel': 'E-mail', - 'native.claim.emailHint': 'Voor je account en berichten over je contract.', 'native.claim.passwordLabel': 'Wachtwoord', 'native.claim.passwordHint': 'Minstens 8 tekens. Wachtwoord moet hoofdletters, kleine letters, een cijfer en een speciaal teken bevatten.', @@ -83,23 +61,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'We konden je TREK niet herstellen. Probeer het opnieuw.', 'native.plans.legal': 'De betaling wordt bij bevestiging via je Apple ID afgeschreven. Het abonnement wordt automatisch verlengd, tenzij je het minstens 24 uur voor het einde van de periode opzegt. Beheer of annuleer het in de instellingen van je App Store-account.', - 'native.plans.terms': 'Gebruiksvoorwaarden van Apple (EULA)', 'native.plans.ourTerms': 'Voorwaarden van TREK Cloud', 'native.plans.legalAndroid': 'De betaling wordt bij bevestiging via je Google-account in rekening gebracht. Het abonnement wordt automatisch verlengd, tenzij je het vóór het einde van de periode opzegt. Beheer of zeg het op in Google Play onder Profiel, Betalingen en abonnementen, Abonnementen.', 'native.plans.restoreNoneAndroid': 'Geen actief abonnement gevonden voor dit Google-account.', 'native.plans.recommended': 'Aanbevolen', - 'native.plans.everyPlan': 'In elk abonnement: onbeperkt plekken, reizen en personen', - 'native.plans.continueWith': 'Doorgaan met {plan}', 'native.claim.change': 'Wijzigen', 'native.claim.ruleLength': 'tekens', 'native.claim.ruleUpper': 'Hoofdletter', 'native.claim.ruleLower': 'Kleine letter', 'native.claim.ruleDigit': 'Cijfer', 'native.claim.ruleSpecial': 'Symbool', - 'native.claim.trustServers': 'Servers in Duitsland', - 'native.claim.trustCancel': 'Altijd opzegbaar', - 'native.claim.trustNoAds': 'Geen advertenties', 'native.subscribed.title': 'Je hebt al TREK Cloud', 'native.subscribed.text': 'Deze Apple ID heeft al een actief TREK Cloud-abonnement. Je kunt een nieuw afsluiten, ook met een nieuw adres, zodra het is afgelopen.', @@ -211,6 +183,63 @@ const native: TranslationStrings = { 'native.cert.removeTitle': 'Certificaat verwijderen?', 'native.cert.removeMessage': 'Zonder certificaat laat de proxy voor {host} de app niet meer door, tot je er weer een toevoegt.', + 'native.welcome.title': 'Waar gaat de volgende reis heen?', + 'native.welcome.lead': 'Plan samen waar het heen gaat. TREK houdt route, boekingen en foto’s op één plek.', + 'native.welcome.routeTitle': 'Route en kaart', + 'native.welcome.routeSub': 'Dag voor dag, met wegen en tijden', + 'native.welcome.togetherTitle': 'Samen plannen', + 'native.welcome.togetherSub': 'Iedereen ziet elke wijziging meteen', + 'native.welcome.photosTitle': 'Foto’s en fotoboek', + 'native.welcome.photosSub': 'De herinneringen blijven bij de reis', + 'native.welcome.discover': 'Cloudabonnementen bekijken', + 'native.trip.start.title': 'Weekendje weg', + 'native.trip.start.text': 'Korte reizen, vooral plannen.', + 'native.trip.basis.title': 'Rondreis', + 'native.trip.basis.text': 'Meerdere plekken, boekingen automatisch.', + 'native.trip.plus.title': 'Grote reis', + 'native.trip.plus.text': 'Weken onderweg, met de hele groep.', + 'native.trip.pro.title': 'Wereldreiziger', + 'native.trip.pro.text': 'Voor veelreizigers en grote fotoboeken.', + 'native.plans.unlimited': 'Onbeperkt', + 'native.plans.unlimitedSub': 'Reizen en medereizigers', + 'native.plans.inEveryPlan': 'in elk abonnement', + 'native.plans.yearlyIs': '{price} per jaar, altijd opzegbaar', + 'native.plans.monthlyIs': 'Dat is {price} per maand', + 'native.plans.photos': '≈ {n} foto’s', + 'native.plans.aiPerMonth': '{n} / maand', + 'native.plans.aiNone': 'Geen', + 'native.plans.aiLabel': 'AI-documenten', + 'native.plans.choose': '{trip} kiezen', + 'native.plans.termsShort': 'Gebruiksvoorwaarden (EULA)', + 'native.plans.privacyShort': 'Privacy', // same-as-en + 'native.plans.billing': 'Betaling', + 'native.claim.almost': 'Bijna aangekomen', + 'native.claim.addressField': 'Adres', + 'native.claim.slugPlaceholder': 'jouwnaam', + 'native.claim.emailPlaceholder': 'jij@voorbeeld.nl', + 'native.claim.passwordPlaceholder': 'Kies een wachtwoord', + 'native.claim.freeBadge': 'vrij', + 'native.claim.renews': 'Verlengt automatisch, altijd opzegbaar.', + 'native.claim.showPassword': 'Wachtwoord tonen', + 'native.connect.yourTrek': 'Jouw TREK', + 'native.connect.addressField': 'Serveradres', + 'native.connect.found': 'TREK gevonden', + 'native.connect.connected': 'Verbonden', + 'native.connect.addCert': 'Clientcertificaat toevoegen', + 'native.connect.recheck': 'Opnieuw controleren', + 'native.connect.kickerUnreachable': 'Niet bereikbaar', + 'native.connect.kickerNotTrek': 'Geen TREK', + 'native.connect.kickerTooOld': 'Update nodig', + 'native.connect.kickerCert': 'Certificaat nodig', + 'native.connect.kickerGate': 'Aanmelden nodig', + 'native.subscribed.kicker': 'Actief abonnement', + 'native.provisioning.kicker': 'Wordt ingericht', + 'native.provisioning.stepAddress': 'Adres gereserveerd', + 'native.provisioning.stepServer': 'Server start', + 'native.provisioning.stepReady': 'Klaar', + 'native.provisioning.readyTitle': 'Aangekomen.', + 'native.provisioning.readySub': 'Je TREK is klaar. Nodig je medereizigers uit.', + 'native.provisioning.open': 'Reis plannen', }; export default native; diff --git a/shared/src/i18n/pl/native.ts b/shared/src/i18n/pl/native.ts index ea6f932d6..7a2a21e4b 100644 --- a/shared/src/i18n/pl/native.ts +++ b/shared/src/i18n/pl/native.ts @@ -30,44 +30,22 @@ const native: TranslationStrings = { 'native.privacy': 'Polityka prywatności', 'native.settings.server': 'Serwer', 'native.settings.serverHint': 'Ta aplikacja jest połączona z {server}.', - 'native.welcome.headline': 'Twoje podróże.\nTwój plan.', - 'native.welcome.sub': 'Planujcie razem w czasie rzeczywistym: trasy, budżety, dziennik i fotoksiążka, z pomocą AI.', - 'native.welcome.connect': 'Połącz swój TREK', - 'native.welcome.connectSub': 'Otwórz adres, którego już używasz', - 'native.welcome.getCloud': 'Weź TREK Cloud', - 'native.welcome.getCloudSub': 'Hostowany dla Ciebie, bez instalacji', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': - 'Hostujemy TREK za Ciebie, pod Twoim własnym adresem. Nic do instalowania, nic do utrzymywania: gotowe w kilka minut.', - 'native.cloud.f1': 'Twój własny adres, na serwerach w Niemczech', - 'native.cloud.f2': 'Gotowe w kilka minut, aktualizacje po naszej stronie', - 'native.cloud.f3': 'Twoje dane zostają Twoje: bez reklam, bez śledzenia', - 'native.cloud.cta': 'Zacznij', 'native.cloud.haveServer': 'Mam już serwer TREK', - 'native.connecting': 'Łączenie z {host}', 'native.back': 'Wstecz', 'native.plans.title': 'Wybierz plan', - 'native.plans.sub': 'TREK hostowany pod Twoim własnym adresem. Zmieniaj lub anuluj w każdej chwili.', 'native.plans.monthly': 'Miesięcznie', 'native.plans.yearly': 'Rocznie', 'native.plans.perMonth': 'miesięcznie', 'native.plans.perYear': 'rocznie', - 'native.plans.aiDocs': '{n} dokumentów AI miesięcznie', - 'native.plans.noAi': 'Bez dokumentów AI', - 'native.plans.storage': '{n} GB miejsca', 'native.plans.loadError': 'Nie udało się wczytać planów. Sprawdź połączenie i spróbuj ponownie.', 'native.plans.retry': 'Spróbuj ponownie', 'native.plans.soon': 'Subskrypcja w aplikacji nie jest jeszcze dostępna.', 'native.plans.closed': 'TREK Cloud wkrótce startuje. Od dnia otwarcia możesz tu wykupić subskrypcję.', - 'native.claim.title': 'Prawie gotowe', - 'native.claim.sub': 'Wybierz swój adres. Przygotujemy go od razu.', 'native.claim.addressLabel': 'Twój adres', 'native.claim.taken': 'Ten adres jest już zajęty.', 'native.claim.invalid': 'Co najmniej trzy litery, cyfry lub myślniki.', 'native.claim.reserved': 'Ten adres jest zarezerwowany.', - 'native.claim.free': 'Dostępny', 'native.claim.emailLabel': 'E-mail', - 'native.claim.emailHint': 'Do konta i wiadomości dotyczących umowy.', 'native.claim.passwordLabel': 'Hasło', 'native.claim.passwordHint': 'Co najmniej 8 znaków. Hasło musi zawierać wielką literę, małą literę, cyfrę i znak specjalny.', @@ -83,23 +61,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'Nie udało się przywrócić Twojego TREK. Spróbuj ponownie.', 'native.plans.legal': 'Płatność zostanie pobrana z Twojego Apple ID po potwierdzeniu. Subskrypcja odnawia się automatycznie, chyba że anulujesz ją co najmniej 24 godziny przed końcem okresu. Zarządzaj nią lub anuluj w ustawieniach konta App Store.', - 'native.plans.terms': 'Warunki korzystania Apple (EULA)', 'native.plans.ourTerms': 'Warunki TREK Cloud', 'native.plans.legalAndroid': 'Płatność zostanie pobrana z Twojego konta Google po potwierdzeniu. Subskrypcja odnawia się automatycznie, jeśli nie anulujesz jej przed końcem okresu. Zarządzaj nią lub ją anuluj w Google Play w sekcji Profil, Płatności i subskrypcje, Subskrypcje.', 'native.plans.restoreNoneAndroid': 'Nie znaleziono aktywnej subskrypcji na tym koncie Google.', 'native.plans.recommended': 'Polecany', - 'native.plans.everyPlan': 'W każdym planie: bez limitu miejsc, podróży i osób', - 'native.plans.continueWith': 'Dalej z planem {plan}', 'native.claim.change': 'Zmień', 'native.claim.ruleLength': 'znaków', 'native.claim.ruleUpper': 'Wielka litera', 'native.claim.ruleLower': 'Mała litera', 'native.claim.ruleDigit': 'Cyfra', 'native.claim.ruleSpecial': 'Znak specjalny', - 'native.claim.trustServers': 'Serwery w Niemczech', - 'native.claim.trustCancel': 'Anulujesz w każdej chwili', - 'native.claim.trustNoAds': 'Bez reklam', 'native.subscribed.title': 'Masz już TREK Cloud', 'native.subscribed.text': 'To Apple ID ma już aktywną subskrypcję TREK Cloud. Nową, także z nowym adresem, możesz wykupić, gdy ta się zakończy.', @@ -208,6 +180,63 @@ const native: TranslationStrings = { 'native.cert.settingRemove': 'Usuń', 'native.cert.removeTitle': 'Usunąć certyfikat?', 'native.cert.removeMessage': 'Bez niego proxy przed {host} nie wpuści aplikacji, dopóki nie dodasz nowego.', + 'native.welcome.title': 'Dokąd teraz?', + 'native.welcome.lead': 'Planujcie razem, dokąd jedziecie. TREK trzyma trasę, rezerwacje i zdjęcia w jednym miejscu.', + 'native.welcome.routeTitle': 'Trasa i mapa', + 'native.welcome.routeSub': 'Dzień po dniu, z drogami i godzinami', + 'native.welcome.togetherTitle': 'Planowanie razem', + 'native.welcome.togetherSub': 'Każdy od razu widzi każdą zmianę', + 'native.welcome.photosTitle': 'Zdjęcia i fotoksiążka', + 'native.welcome.photosSub': 'Wspomnienia zostają przy podróży', + 'native.welcome.discover': 'Poznaj plany w chmurze', + 'native.trip.start.title': 'Weekendowy wypad', + 'native.trip.start.text': 'Krótkie wyjazdy, głównie planowanie.', + 'native.trip.basis.title': 'Objazdówka', + 'native.trip.basis.text': 'Kilka miejsc, rezerwacje automatycznie.', + 'native.trip.plus.title': 'Wielka podróż', + 'native.trip.plus.text': 'Tygodnie w drodze, z całą grupą.', + 'native.trip.pro.title': 'Obieżyświat', + 'native.trip.pro.text': 'Dla częstych podróżników i dużych fotoksiążek.', + 'native.plans.unlimited': 'Bez limitu', + 'native.plans.unlimitedSub': 'Podróże i współtowarzysze', + 'native.plans.inEveryPlan': 'w każdym planie', + 'native.plans.yearlyIs': '{price} rocznie, rezygnacja w każdej chwili', + 'native.plans.monthlyIs': 'To {price} miesięcznie', + 'native.plans.photos': '≈ {n} zdjęć', + 'native.plans.aiPerMonth': '{n} / miesiąc', + 'native.plans.aiNone': 'Brak', + 'native.plans.aiLabel': 'Dokumenty AI', + 'native.plans.choose': 'Wybierz: {trip}', + 'native.plans.termsShort': 'Warunki korzystania (EULA)', + 'native.plans.privacyShort': 'Prywatność', + 'native.plans.billing': 'Rozliczenie', + 'native.claim.almost': 'Prawie na miejscu', + 'native.claim.addressField': 'Adres', + 'native.claim.slugPlaceholder': 'twojanazwa', + 'native.claim.emailPlaceholder': 'ty@przyklad.pl', + 'native.claim.passwordPlaceholder': 'Wybierz hasło', + 'native.claim.freeBadge': 'wolny', + 'native.claim.renews': 'Odnawia się automatycznie, rezygnacja w każdej chwili.', + 'native.claim.showPassword': 'Pokaż hasło', + 'native.connect.yourTrek': 'Twój TREK', + 'native.connect.addressField': 'Adres serwera', + 'native.connect.found': 'Znaleziono TREK', + 'native.connect.connected': 'Połączono', + 'native.connect.addCert': 'Dodaj certyfikat klienta', + 'native.connect.recheck': 'Sprawdź ponownie', + 'native.connect.kickerUnreachable': 'Nieosiągalny', + 'native.connect.kickerNotTrek': 'To nie TREK', + 'native.connect.kickerTooOld': 'Wymagana aktualizacja', + 'native.connect.kickerCert': 'Wymagany certyfikat', + 'native.connect.kickerGate': 'Wymagane logowanie', + 'native.subscribed.kicker': 'Aktywna subskrypcja', + 'native.provisioning.kicker': 'Konfiguracja', + 'native.provisioning.stepAddress': 'Adres zarezerwowany', + 'native.provisioning.stepServer': 'Serwer się uruchamia', + 'native.provisioning.stepReady': 'Gotowe', + 'native.provisioning.readyTitle': 'Na miejscu.', + 'native.provisioning.readySub': 'Twój TREK jest gotowy. Zaproś osoby, które jadą z tobą.', + 'native.provisioning.open': 'Zaplanuj podróż', }; export default native; diff --git a/shared/src/i18n/ru/native.ts b/shared/src/i18n/ru/native.ts index 52c6f911b..ef8c1bdf7 100644 --- a/shared/src/i18n/ru/native.ts +++ b/shared/src/i18n/ru/native.ts @@ -30,44 +30,22 @@ const native: TranslationStrings = { 'native.privacy': 'Политика конфиденциальности', 'native.settings.server': 'Сервер', 'native.settings.serverHint': 'Приложение подключено к {server}.', - 'native.welcome.headline': 'Ваши поездки.\nВаш план.', - 'native.welcome.sub': 'Планируйте вместе в реальном времени: туры, бюджеты, дневник и фотокнига, с помощью ИИ.', - 'native.welcome.connect': 'Подключите свой TREK', - 'native.welcome.connectSub': 'Откройте адрес, которым уже пользуетесь', - 'native.welcome.getCloud': 'Получить TREK Cloud', - 'native.welcome.getCloudSub': 'Размещён для вас, без настройки', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': - 'Мы разместим TREK для вас, на вашем собственном адресе. Ничего не нужно устанавливать и обслуживать: готово за минуты.', - 'native.cloud.f1': 'Собственный адрес, на серверах в Германии', - 'native.cloud.f2': 'Готово за минуты, обновления берём на себя', - 'native.cloud.f3': 'Ваши данные остаются вашими: без рекламы, без слежки', - 'native.cloud.cta': 'Начать', 'native.cloud.haveServer': 'У меня уже есть сервер TREK', - 'native.connecting': 'Подключение к {host}', 'native.back': 'Назад', 'native.plans.title': 'Выберите тариф', - 'native.plans.sub': 'TREK на вашем собственном адресе. Меняйте или отменяйте в любое время.', 'native.plans.monthly': 'Ежемесячно', 'native.plans.yearly': 'Ежегодно', 'native.plans.perMonth': 'в месяц', 'native.plans.perYear': 'в год', - 'native.plans.aiDocs': '{n} ИИ-документов в месяц', - 'native.plans.noAi': 'Без ИИ-документов', - 'native.plans.storage': '{n} ГБ хранилища', 'native.plans.loadError': 'Не удалось загрузить тарифы. Проверьте подключение и повторите попытку.', 'native.plans.retry': 'Повторить', 'native.plans.soon': 'Оформление подписки в приложении пока недоступно.', 'native.plans.closed': 'TREK Cloud скоро откроется. Оформить подписку здесь можно будет со дня открытия.', - 'native.claim.title': 'Почти готово', - 'native.claim.sub': 'Выберите адрес. Мы сразу всё настроим.', 'native.claim.addressLabel': 'Ваш адрес', 'native.claim.taken': 'Этот адрес занят.', 'native.claim.invalid': 'Три и более букв, цифр и дефисов.', 'native.claim.reserved': 'Этот адрес зарезервирован.', - 'native.claim.free': 'Доступно', 'native.claim.emailLabel': 'Эл. почта', - 'native.claim.emailHint': 'Для вашей учётной записи и сообщений о договоре.', 'native.claim.passwordLabel': 'Пароль', 'native.claim.passwordHint': 'Не менее 8 символов. Пароль должен содержать заглавные, строчные буквы, цифру и специальный символ.', @@ -83,23 +61,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'Не удалось восстановить ваш TREK. Повторите попытку.', 'native.plans.legal': 'Оплата списывается с вашего Apple ID при подтверждении. Подписка продлевается автоматически, если не отменить её минимум за 24 часа до конца периода. Управлять подпиской или отменить её можно в настройках учётной записи App Store.', - 'native.plans.terms': 'Условия использования Apple (EULA)', 'native.plans.ourTerms': 'Условия TREK Cloud', 'native.plans.legalAndroid': 'Оплата списывается с вашего аккаунта Google при подтверждении. Подписка продлевается автоматически, если вы не отмените её до конца периода. Управлять ею или отменить можно в Google Play: Профиль, Платежи и подписки, Подписки.', 'native.plans.restoreNoneAndroid': 'Для этого аккаунта Google активная подписка не найдена.', 'native.plans.recommended': 'Рекомендуем', - 'native.plans.everyPlan': 'В каждом тарифе: без ограничений по местам, поездкам и людям', - 'native.plans.continueWith': 'Продолжить с {plan}', 'native.claim.change': 'Изменить', 'native.claim.ruleLength': 'символов', 'native.claim.ruleUpper': 'Заглавная буква', 'native.claim.ruleLower': 'Строчная буква', 'native.claim.ruleDigit': 'Цифра', 'native.claim.ruleSpecial': 'Спецсимвол', - 'native.claim.trustServers': 'Серверы в Германии', - 'native.claim.trustCancel': 'Отмена в любой момент', - 'native.claim.trustNoAds': 'Без рекламы', 'native.subscribed.title': 'У вас уже есть TREK Cloud', 'native.subscribed.text': 'На этом Apple ID уже есть активная подписка TREK Cloud. Оформить новую, в том числе с новым адресом, можно после её окончания.', @@ -211,6 +183,63 @@ const native: TranslationStrings = { 'native.cert.settingRemove': 'Удалить', 'native.cert.removeTitle': 'Удалить сертификат?', 'native.cert.removeMessage': 'Без него прокси перед {host} не пропустит приложение, пока вы не добавите новый.', + 'native.welcome.title': 'Куда отправимся дальше?', + 'native.welcome.lead': 'Планируйте поездку вместе. TREK хранит маршрут, бронирования и фото в одном месте.', + 'native.welcome.routeTitle': 'Маршрут и карта', + 'native.welcome.routeSub': 'День за днём, с путями и временем', + 'native.welcome.togetherTitle': 'Планировать вместе', + 'native.welcome.togetherSub': 'Все сразу видят каждое изменение', + 'native.welcome.photosTitle': 'Фото и фотокнига', + 'native.welcome.photosSub': 'Воспоминания остаются с поездкой', + 'native.welcome.discover': 'Посмотреть облачные тарифы', + 'native.trip.start.title': 'Выходные', + 'native.trip.start.text': 'Короткие поездки, в основном планирование.', + 'native.trip.basis.title': 'Тур', + 'native.trip.basis.text': 'Несколько мест, бронирования автоматически.', + 'native.trip.plus.title': 'Большое путешествие', + 'native.trip.plus.text': 'Недели в пути, всей группой.', + 'native.trip.pro.title': 'Путешественник', + 'native.trip.pro.text': 'Для тех, кто часто в пути, и больших фотокниг.', + 'native.plans.unlimited': 'Без ограничений', + 'native.plans.unlimitedSub': 'Поездки и попутчики', + 'native.plans.inEveryPlan': 'в каждом тарифе', + 'native.plans.yearlyIs': '{price} в год, отмена в любое время', + 'native.plans.monthlyIs': 'Это {price} в месяц', + 'native.plans.photos': '≈ {n} фото', + 'native.plans.aiPerMonth': '{n} / мес.', + 'native.plans.aiNone': 'Нет', + 'native.plans.aiLabel': 'Документы ИИ', + 'native.plans.choose': 'Выбрать: {trip}', + 'native.plans.termsShort': 'Условия использования (EULA)', + 'native.plans.privacyShort': 'Конфиденциальность', + 'native.plans.billing': 'Оплата', + 'native.claim.almost': 'Почти на месте', + 'native.claim.addressField': 'Адрес', + 'native.claim.slugPlaceholder': 'vashe-imya', + 'native.claim.emailPlaceholder': 'vy@primer.ru', + 'native.claim.passwordPlaceholder': 'Придумайте пароль', + 'native.claim.freeBadge': 'свободен', + 'native.claim.renews': 'Продлевается автоматически, отмена в любое время.', + 'native.claim.showPassword': 'Показать пароль', + 'native.connect.yourTrek': 'Ваш TREK', + 'native.connect.addressField': 'Адрес сервера', + 'native.connect.found': 'TREK найден', + 'native.connect.connected': 'Подключено', + 'native.connect.addCert': 'Добавить клиентский сертификат', + 'native.connect.recheck': 'Проверить снова', + 'native.connect.kickerUnreachable': 'Недоступен', + 'native.connect.kickerNotTrek': 'Это не TREK', + 'native.connect.kickerTooOld': 'Нужно обновление', + 'native.connect.kickerCert': 'Нужен сертификат', + 'native.connect.kickerGate': 'Нужен вход', + 'native.subscribed.kicker': 'Активная подписка', + 'native.provisioning.kicker': 'Настраивается', + 'native.provisioning.stepAddress': 'Адрес зарезервирован', + 'native.provisioning.stepServer': 'Сервер запускается', + 'native.provisioning.stepReady': 'Готово', + 'native.provisioning.readyTitle': 'Прибыли.', + 'native.provisioning.readySub': 'Ваш TREK готов. Пригласите тех, кто едет с вами.', + 'native.provisioning.open': 'Спланировать поездку', }; export default native; diff --git a/shared/src/i18n/sk/native.ts b/shared/src/i18n/sk/native.ts index 266a96785..ce271e5d4 100644 --- a/shared/src/i18n/sk/native.ts +++ b/shared/src/i18n/sk/native.ts @@ -30,44 +30,22 @@ const native: TranslationStrings = { 'native.privacy': 'Zásady ochrany osobných údajov', 'native.settings.server': 'Server', // same-as-en 'native.settings.serverHint': 'Táto aplikácia je pripojená k serveru {server}.', - 'native.welcome.headline': 'Vaše cesty.\nVáš plán.', - 'native.welcome.sub': 'Plánujte spoločne v reálnom čase: trasy, rozpočty, denníky a fotokniha, s pomocou AI.', - 'native.welcome.connect': 'Pripojte svoj TREK', - 'native.welcome.connectSub': 'Otvorte adresu, ktorú už používate', - 'native.welcome.getCloud': 'Získať TREK Cloud', - 'native.welcome.getCloudSub': 'Hostované za vás, bez inštalácie', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': - 'TREK hostujeme za vás, na vašej vlastnej adrese. Nič neinštalujete, nič neudržiavate: hotovo za pár minút.', - 'native.cloud.f1': 'Vlastná adresa, na serveroch v Nemecku', - 'native.cloud.f2': 'Hotovo za pár minút, aktualizácie riešime my', - 'native.cloud.f3': 'Vaše údaje zostávajú vaše: žiadne reklamy, žiadne sledovanie', - 'native.cloud.cta': 'Začať', 'native.cloud.haveServer': 'Už mám server TREK', - 'native.connecting': 'Pripájanie k {host}', 'native.back': 'Späť', 'native.plans.title': 'Vyberte si tarif', - 'native.plans.sub': 'TREK hostovaný na vašej vlastnej adrese. Kedykoľvek zmeňte alebo zrušte.', 'native.plans.monthly': 'Mesačne', 'native.plans.yearly': 'Ročne', 'native.plans.perMonth': 'mesačne', 'native.plans.perYear': 'ročne', - 'native.plans.aiDocs': '{n} dokumentov s AI mesačne', - 'native.plans.noAi': 'Žiadne dokumenty s AI', - 'native.plans.storage': '{n} GB úložiska', 'native.plans.loadError': 'Tarify sa nepodarilo načítať. Skontrolujte pripojenie a skúste to znova.', 'native.plans.retry': 'Skúsiť znova', 'native.plans.soon': 'Predplatné v aplikácii zatiaľ nie je dostupné.', 'native.plans.closed': 'TREK Cloud čoskoro otvára. Odo dňa otvorenia si tu môžete predplatné objednať.', - 'native.claim.title': 'Takmer hotovo', - 'native.claim.sub': 'Vyberte si adresu. Hneď ju pripravíme.', 'native.claim.addressLabel': 'Vaša adresa', 'native.claim.taken': 'Táto adresa je obsadená.', 'native.claim.invalid': 'Tri a viac písmen, číslic a pomlčiek.', 'native.claim.reserved': 'Táto adresa je rezervovaná.', - 'native.claim.free': 'Dostupné', 'native.claim.emailLabel': 'E-mail', - 'native.claim.emailHint': 'Pre váš účet a správy k zmluve.', 'native.claim.passwordLabel': 'Heslo', 'native.claim.passwordHint': 'Aspoň 8 znakov. Heslo musí obsahovať veľké písmeno, malé písmeno, číslicu a špeciálny znak.', @@ -82,23 +60,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'Váš TREK sa nepodarilo obnoviť. Skúste to znova.', 'native.plans.legal': 'Platba sa strhne z vášho Apple ID pri potvrdení. Predplatné sa automaticky obnovuje, ak ho nezrušíte aspoň 24 hodín pred koncom obdobia. Spravovať alebo zrušiť ho môžete v nastaveniach účtu App Store.', - 'native.plans.terms': 'Podmienky používania Apple (EULA)', 'native.plans.ourTerms': 'Podmienky TREK Cloud', 'native.plans.legalAndroid': 'Platba sa pri potvrdení strhne z vášho účtu Google. Predplatné sa automaticky obnovuje, ak ho nezrušíte pred koncom obdobia. Spravovať alebo zrušiť ho môžete v Google Play v časti Profil, Platby a odbery, Odbery.', 'native.plans.restoreNoneAndroid': 'Pre tento účet Google sa nenašlo žiadne aktívne predplatné.', 'native.plans.recommended': 'Odporúčané', - 'native.plans.everyPlan': 'V každom balíku: neobmedzene miest, ciest a ľudí', - 'native.plans.continueWith': 'Pokračovať s {plan}', 'native.claim.change': 'Zmeniť', 'native.claim.ruleLength': 'znakov', 'native.claim.ruleUpper': 'Veľké písmeno', 'native.claim.ruleLower': 'Malé písmeno', 'native.claim.ruleDigit': 'Číslica', 'native.claim.ruleSpecial': 'Špeciálny znak', - 'native.claim.trustServers': 'Servery v Nemecku', - 'native.claim.trustCancel': 'Kedykoľvek zrušiteľné', - 'native.claim.trustNoAds': 'Bez reklám', 'native.subscribed.title': 'TREK Cloud už máte', 'native.subscribed.text': 'Toto Apple ID už má aktívne predplatné TREK Cloud. Nové, aj s novou adresou, si môžete objednať, keď skončí.', @@ -206,6 +178,63 @@ const native: TranslationStrings = { 'native.cert.settingRemove': 'Odstrániť', 'native.cert.removeTitle': 'Odstrániť certifikát?', 'native.cert.removeMessage': 'Bez neho proxy pred {host} aplikáciu nepustí, kým nepridáš nový.', + 'native.welcome.title': 'Kam pôjdete nabudúce?', + 'native.welcome.lead': 'Plánujte spoločne, kam sa vyberiete. TREK drží trasu, rezervácie a fotky na jednom mieste.', + 'native.welcome.routeTitle': 'Trasa a mapa', + 'native.welcome.routeSub': 'Deň po dni, s cestami a časmi', + 'native.welcome.togetherTitle': 'Plánovať spoločne', + 'native.welcome.togetherSub': 'Všetci hneď vidia každú zmenu', + 'native.welcome.photosTitle': 'Fotky a fotokniha', + 'native.welcome.photosSub': 'Spomienky zostávajú pri ceste', + 'native.welcome.discover': 'Pozrieť cloudové tarify', + 'native.trip.start.title': 'Víkendovka', + 'native.trip.start.text': 'Krátke cesty, hlavne plánovanie.', + 'native.trip.basis.title': 'Okružná cesta', + 'native.trip.basis.text': 'Viac miest, rezervácie automaticky.', + 'native.trip.plus.title': 'Veľká cesta', + 'native.trip.plus.text': 'Týždne na cestách, s celou skupinou.', + 'native.trip.pro.title': 'Svetobežník', + 'native.trip.pro.text': 'Pre častých cestovateľov a veľké fotoknihy.', + 'native.plans.unlimited': 'Neobmedzene', + 'native.plans.unlimitedSub': 'Cesty a spolucestujúci', + 'native.plans.inEveryPlan': 'v každom tarife', + 'native.plans.yearlyIs': '{price} ročne, zrušenie kedykoľvek', + 'native.plans.monthlyIs': 'To je {price} mesačne', + 'native.plans.photos': '≈ {n} fotiek', + 'native.plans.aiPerMonth': '{n} / mesiac', + 'native.plans.aiNone': 'Žiadne', + 'native.plans.aiLabel': 'Dokumenty AI', + 'native.plans.choose': 'Vybrať: {trip}', + 'native.plans.termsShort': 'Podmienky používania (EULA)', + 'native.plans.privacyShort': 'Súkromie', + 'native.plans.billing': 'Platba', + 'native.claim.almost': 'Skoro na mieste', + 'native.claim.addressField': 'Adresa', + 'native.claim.slugPlaceholder': 'vasemeno', + 'native.claim.emailPlaceholder': 'vy@priklad.sk', + 'native.claim.passwordPlaceholder': 'Zvoľte heslo', + 'native.claim.freeBadge': 'voľná', + 'native.claim.renews': 'Obnovuje sa automaticky, zrušenie kedykoľvek.', + 'native.claim.showPassword': 'Zobraziť heslo', + 'native.connect.yourTrek': 'Váš TREK', + 'native.connect.addressField': 'Adresa servera', + 'native.connect.found': 'TREK nájdený', + 'native.connect.connected': 'Pripojené', + 'native.connect.addCert': 'Pridať klientsky certifikát', + 'native.connect.recheck': 'Skontrolovať znova', + 'native.connect.kickerUnreachable': 'Nedostupný', + 'native.connect.kickerNotTrek': 'Nie je TREK', + 'native.connect.kickerTooOld': 'Potrebná aktualizácia', + 'native.connect.kickerCert': 'Potrebný certifikát', + 'native.connect.kickerGate': 'Potrebné prihlásenie', + 'native.subscribed.kicker': 'Aktívne predplatné', + 'native.provisioning.kicker': 'Nastavuje sa', + 'native.provisioning.stepAddress': 'Adresa rezervovaná', + 'native.provisioning.stepServer': 'Server sa spúšťa', + 'native.provisioning.stepReady': 'Pripravené', + 'native.provisioning.readyTitle': 'Na mieste.', + 'native.provisioning.readySub': 'Váš TREK je pripravený. Pozvite tých, ktorí cestujú s vami.', + 'native.provisioning.open': 'Naplánovať cestu', }; export default native; diff --git a/shared/src/i18n/sv/native.ts b/shared/src/i18n/sv/native.ts index 86eea38e2..1aa397694 100644 --- a/shared/src/i18n/sv/native.ts +++ b/shared/src/i18n/sv/native.ts @@ -31,44 +31,22 @@ const native: TranslationStrings = { 'native.privacy': 'Integritetspolicy', 'native.settings.server': 'Server', // same-as-en 'native.settings.serverHint': 'Den här appen är ansluten till {server}.', - 'native.welcome.headline': 'Dina resor.\nDin plan.', - 'native.welcome.sub': 'Planera tillsammans i realtid: turer, budgetar, resejournaler och fotobok, med hjälp av AI.', - 'native.welcome.connect': 'Anslut din TREK', - 'native.welcome.connectSub': 'Öppna adressen du redan använder', - 'native.welcome.getCloud': 'Skaffa TREK Cloud', - 'native.welcome.getCloudSub': 'Hostat åt dig, utan installation', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': - 'Vi hostar TREK åt dig, på din egen adress. Inget att installera, inget att underhålla: klart på några minuter.', - 'native.cloud.f1': 'Din egen adress, på servrar i Tyskland', - 'native.cloud.f2': 'Klart på några minuter, uppdateringar sköter vi', - 'native.cloud.f3': 'Dina data förblir dina: inga annonser, ingen spårning', - 'native.cloud.cta': 'Kom igång', 'native.cloud.haveServer': 'Jag har redan en TREK-server', - 'native.connecting': 'Ansluter till {host}', 'native.back': 'Tillbaka', 'native.plans.title': 'Välj ditt abonnemang', - 'native.plans.sub': 'TREK hostat på din egen adress. Ändra eller avsluta när som helst.', 'native.plans.monthly': 'Månadsvis', 'native.plans.yearly': 'Årsvis', 'native.plans.perMonth': 'per månad', 'native.plans.perYear': 'per år', - 'native.plans.aiDocs': '{n} AI-dokument i månaden', - 'native.plans.noAi': 'Inga AI-dokument', - 'native.plans.storage': '{n} GB lagring', 'native.plans.loadError': 'Det gick inte att läsa in abonnemangen. Kontrollera anslutningen och försök igen.', 'native.plans.retry': 'Försök igen', 'native.plans.soon': 'Prenumeration i appen är inte tillgänglig ännu.', 'native.plans.closed': 'TREK Cloud öppnar snart. Från öppningsdagen kan du prenumerera här.', - 'native.claim.title': 'Nästan klart', - 'native.claim.sub': 'Välj din adress. Vi gör i ordning den direkt.', 'native.claim.addressLabel': 'Din adress', 'native.claim.taken': 'Den adressen är upptagen.', 'native.claim.invalid': 'Tre eller fler bokstäver, siffror och bindestreck.', 'native.claim.reserved': 'Den adressen är reserverad.', - 'native.claim.free': 'Ledig', 'native.claim.emailLabel': 'E-post', - 'native.claim.emailHint': 'För ditt konto och meddelanden om ditt avtal.', 'native.claim.passwordLabel': 'Lösenord', 'native.claim.passwordHint': 'Minst 8 tecken. Lösenordet måste innehålla versaler, gemener, en siffra och ett specialtecken.', @@ -83,23 +61,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'Vi kunde inte återställa din TREK. Försök igen.', 'native.plans.legal': 'Betalningen debiteras ditt Apple-ID när du bekräftar. Prenumerationen förnyas automatiskt om du inte avslutar den minst 24 timmar före periodens slut. Hantera eller avsluta den i inställningarna för ditt App Store-konto.', - 'native.plans.terms': 'Apples användarvillkor (EULA)', 'native.plans.ourTerms': 'Villkor för TREK Cloud', 'native.plans.legalAndroid': 'Betalningen debiteras ditt Google-konto när du bekräftar. Prenumerationen förnyas automatiskt om du inte säger upp den innan perioden tar slut. Hantera eller säg upp den i Google Play under Profil, Betalningar och prenumerationer, Prenumerationer.', 'native.plans.restoreNoneAndroid': 'Ingen aktiv prenumeration hittades för det här Google-kontot.', 'native.plans.recommended': 'Rekommenderas', - 'native.plans.everyPlan': 'I varje plan: obegränsat med platser, resor och personer', - 'native.plans.continueWith': 'Fortsätt med {plan}', 'native.claim.change': 'Ändra', 'native.claim.ruleLength': 'tecken', 'native.claim.ruleUpper': 'Versal', 'native.claim.ruleLower': 'Gemen', 'native.claim.ruleDigit': 'Siffra', 'native.claim.ruleSpecial': 'Specialtecken', - 'native.claim.trustServers': 'Servrar i Tyskland', - 'native.claim.trustCancel': 'Avsluta när du vill', - 'native.claim.trustNoAds': 'Ingen reklam', 'native.subscribed.title': 'Du har redan TREK Cloud', 'native.subscribed.text': 'Det här Apple-ID:t har redan en aktiv TREK Cloud-prenumeration. Du kan teckna en ny, även med en ny adress, när den har upphört.', @@ -207,6 +179,63 @@ const native: TranslationStrings = { 'native.cert.removeTitle': 'Ta bort certifikatet?', 'native.cert.removeMessage': 'Utan det släpper proxyn framför {host} inte längre in appen förrän du lägger till ett nytt.', + 'native.welcome.title': 'Vart bär nästa resa?', + 'native.welcome.lead': 'Planera tillsammans vart ni ska. TREK håller rutt, bokningar och bilder på ett ställe.', + 'native.welcome.routeTitle': 'Rutt och karta', + 'native.welcome.routeSub': 'Dag för dag, med vägar och tider', + 'native.welcome.togetherTitle': 'Planera tillsammans', + 'native.welcome.togetherSub': 'Alla ser varje ändring direkt', + 'native.welcome.photosTitle': 'Bilder och fotobok', + 'native.welcome.photosSub': 'Minnena stannar hos resan', + 'native.welcome.discover': 'Utforska molnplaner', + 'native.trip.start.title': 'Weekendresa', + 'native.trip.start.text': 'Korta resor, mest planering.', + 'native.trip.basis.title': 'Rundresa', + 'native.trip.basis.text': 'Flera stopp, bokningar automatiskt.', + 'native.trip.plus.title': 'Stor resa', + 'native.trip.plus.text': 'Veckor på vägen, med hela gruppen.', + 'native.trip.pro.title': 'Världsresenär', + 'native.trip.pro.text': 'För dig som reser ofta och gör stora fotoböcker.', + 'native.plans.unlimited': 'Obegränsat', + 'native.plans.unlimitedSub': 'Resor och medresenärer', + 'native.plans.inEveryPlan': 'i varje plan', + 'native.plans.yearlyIs': '{price} per år, avsluta när du vill', + 'native.plans.monthlyIs': 'Det blir {price} i månaden', + 'native.plans.photos': '≈ {n} bilder', + 'native.plans.aiPerMonth': '{n} / månad', + 'native.plans.aiNone': 'Inga', + 'native.plans.aiLabel': 'AI-dokument', + 'native.plans.choose': 'Välj {trip}', + 'native.plans.termsShort': 'Användarvillkor (EULA)', + 'native.plans.privacyShort': 'Integritet', + 'native.plans.billing': 'Betalning', + 'native.claim.almost': 'Nästan framme', + 'native.claim.addressField': 'Adress', + 'native.claim.slugPlaceholder': 'dittnamn', + 'native.claim.emailPlaceholder': 'du@exempel.se', + 'native.claim.passwordPlaceholder': 'Välj ett lösenord', + 'native.claim.freeBadge': 'ledig', + 'native.claim.renews': 'Förnyas automatiskt, avsluta när du vill.', + 'native.claim.showPassword': 'Visa lösenord', + 'native.connect.yourTrek': 'Ditt TREK', + 'native.connect.addressField': 'Serveradress', + 'native.connect.found': 'TREK hittat', + 'native.connect.connected': 'Ansluten', + 'native.connect.addCert': 'Lägg till klientcertifikat', + 'native.connect.recheck': 'Kontrollera igen', + 'native.connect.kickerUnreachable': 'Inte nåbar', + 'native.connect.kickerNotTrek': 'Inte TREK', + 'native.connect.kickerTooOld': 'Uppdatering krävs', + 'native.connect.kickerCert': 'Certifikat krävs', + 'native.connect.kickerGate': 'Inloggning krävs', + 'native.subscribed.kicker': 'Aktivt abonnemang', + 'native.provisioning.kicker': 'Ställs in', + 'native.provisioning.stepAddress': 'Adress reserverad', + 'native.provisioning.stepServer': 'Servern startar', + 'native.provisioning.stepReady': 'Klart', + 'native.provisioning.readyTitle': 'Framme.', + 'native.provisioning.readySub': 'Ditt TREK är klart. Bjud in dem som reser med dig.', + 'native.provisioning.open': 'Planera en resa', }; export default native; diff --git a/shared/src/i18n/th/native.ts b/shared/src/i18n/th/native.ts index 1d27aca34..69f26ab6b 100644 --- a/shared/src/i18n/th/native.ts +++ b/shared/src/i18n/th/native.ts @@ -30,43 +30,22 @@ const native: TranslationStrings = { 'native.privacy': 'นโยบายความเป็นส่วนตัว', 'native.settings.server': 'เซิร์ฟเวอร์', 'native.settings.serverHint': 'แอปนี้เชื่อมต่อกับ {server} อยู่', - 'native.welcome.headline': 'การเดินทางของคุณ\nแผนของคุณ', - 'native.welcome.sub': 'วางแผนร่วมกันแบบเรียลไทม์: ทัวร์ งบประมาณ บันทึกการเดินทาง และโฟโต้บุ๊ก โดยมี AI ช่วย', - 'native.welcome.connect': 'เชื่อมต่อ TREK ของคุณ', - 'native.welcome.connectSub': 'เปิดที่อยู่ที่คุณใช้อยู่แล้ว', - 'native.welcome.getCloud': 'รับ TREK Cloud', - 'native.welcome.getCloudSub': 'โฮสต์ให้คุณ ไม่ต้องตั้งค่า', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': 'เราโฮสต์ TREK ให้คุณ บนที่อยู่ของคุณเอง ไม่ต้องติดตั้ง ไม่ต้องดูแล พร้อมใช้ในไม่กี่นาที', - 'native.cloud.f1': 'ที่อยู่ของคุณเอง บนเซิร์ฟเวอร์ในเยอรมนี', - 'native.cloud.f2': 'พร้อมใช้ในไม่กี่นาที การอัปเดตเราจัดการให้', - 'native.cloud.f3': 'ข้อมูลของคุณยังเป็นของคุณ ไม่มีโฆษณา ไม่มีการติดตาม', - 'native.cloud.cta': 'เริ่มต้น', 'native.cloud.haveServer': 'ฉันมีเซิร์ฟเวอร์ TREK อยู่แล้ว', - 'native.connecting': 'กำลังเชื่อมต่อกับ {host}', 'native.back': 'กลับ', 'native.plans.title': 'เลือกแพ็กเกจของคุณ', - 'native.plans.sub': 'TREK ที่โฮสต์บนที่อยู่ของคุณเอง เปลี่ยนหรือยกเลิกได้ทุกเมื่อ', 'native.plans.monthly': 'รายเดือน', 'native.plans.yearly': 'รายปี', 'native.plans.perMonth': 'ต่อเดือน', 'native.plans.perYear': 'ต่อปี', - 'native.plans.aiDocs': 'เอกสาร AI {n} ฉบับต่อเดือน', - 'native.plans.noAi': 'ไม่มีเอกสาร AI', - 'native.plans.storage': 'พื้นที่เก็บข้อมูล {n} GB', 'native.plans.loadError': 'โหลดแพ็กเกจไม่สำเร็จ ตรวจสอบการเชื่อมต่อแล้วลองอีกครั้ง', 'native.plans.retry': 'ลองอีกครั้ง', 'native.plans.soon': 'ยังไม่สามารถสมัครสมาชิกในแอปได้', 'native.plans.closed': 'TREK Cloud จะเปิดเร็วๆ นี้ ตั้งแต่วันเปิดตัวคุณสามารถสมัครสมาชิกได้ที่นี่', - 'native.claim.title': 'เกือบเสร็จแล้ว', - 'native.claim.sub': 'เลือกที่อยู่ของคุณ เราจะตั้งค่าให้ทันที', 'native.claim.addressLabel': 'ที่อยู่ของคุณ', 'native.claim.taken': 'ที่อยู่นี้ถูกใช้แล้ว', 'native.claim.invalid': 'ตัวอักษร ตัวเลข และขีดกลาง ตั้งแต่สามตัวขึ้นไป', 'native.claim.reserved': 'ที่อยู่นี้ถูกสงวนไว้', - 'native.claim.free': 'ว่าง', 'native.claim.emailLabel': 'อีเมล', - 'native.claim.emailHint': 'สำหรับบัญชีของคุณและการแจ้งเกี่ยวกับสัญญา', 'native.claim.passwordLabel': 'รหัสผ่าน', 'native.claim.passwordHint': 'อย่างน้อย 8 ตัวอักษร รหัสผ่านจะต้องมีตัวพิมพ์ใหญ่ ตัวพิมพ์เล็ก ตัวเลข และอักขระพิเศษ', 'native.claim.subscribe': 'สมัครสมาชิกในราคา {price}', @@ -80,23 +59,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'เรากู้คืน TREK ของคุณไม่สำเร็จ โปรดลองอีกครั้ง', 'native.plans.legal': 'ระบบจะเรียกเก็บเงินจาก Apple ID ของคุณเมื่อยืนยัน การสมัครสมาชิกจะต่ออายุอัตโนมัติ เว้นแต่คุณจะยกเลิกอย่างน้อย 24 ชั่วโมงก่อนสิ้นสุดรอบ จัดการหรือยกเลิกได้ในการตั้งค่าบัญชี App Store', - 'native.plans.terms': 'ข้อกำหนดการใช้งานของ Apple (EULA)', 'native.plans.ourTerms': 'ข้อกำหนดของ TREK Cloud', 'native.plans.legalAndroid': 'ระบบจะเรียกเก็บเงินจากบัญชี Google ของคุณเมื่อยืนยัน การสมัครสมาชิกจะต่ออายุอัตโนมัติ เว้นแต่คุณจะยกเลิกก่อนสิ้นสุดรอบ จัดการหรือยกเลิกได้ใน Google Play ที่ โปรไฟล์ การชำระเงินและการสมัครใช้บริการ การสมัครใช้บริการ', 'native.plans.restoreNoneAndroid': 'ไม่พบการสมัครสมาชิกที่ใช้งานอยู่ในบัญชี Google นี้', 'native.plans.recommended': 'แนะนำ', - 'native.plans.everyPlan': 'ทุกแพ็กเกจ: สถานที่ ทริป และผู้ร่วมเดินทางไม่จำกัด', - 'native.plans.continueWith': 'ไปต่อกับ {plan}', 'native.claim.change': 'เปลี่ยน', 'native.claim.ruleLength': 'ตัวอักษร', 'native.claim.ruleUpper': 'ตัวพิมพ์ใหญ่', 'native.claim.ruleLower': 'ตัวพิมพ์เล็ก', 'native.claim.ruleDigit': 'ตัวเลข', 'native.claim.ruleSpecial': 'สัญลักษณ์', - 'native.claim.trustServers': 'เซิร์ฟเวอร์ในเยอรมนี', - 'native.claim.trustCancel': 'ยกเลิกได้ทุกเมื่อ', - 'native.claim.trustNoAds': 'ไม่มีโฆษณา', 'native.subscribed.title': 'คุณมี TREK Cloud อยู่แล้ว', 'native.subscribed.text': 'Apple ID นี้มีการสมัครสมาชิก TREK Cloud ที่ใช้งานอยู่แล้ว คุณสมัครใหม่ได้ รวมถึงใช้ที่อยู่ใหม่ หลังจากการสมัครนี้สิ้นสุดลง', @@ -200,6 +173,63 @@ const native: TranslationStrings = { 'native.cert.settingRemove': 'ลบ', 'native.cert.removeTitle': 'ลบใบรับรองหรือไม่', 'native.cert.removeMessage': 'หากไม่มีใบรับรอง พร็อกซีหน้า {host} จะไม่ให้แอปผ่านจนกว่าคุณจะเพิ่มใบใหม่', + 'native.welcome.title': 'ทริปหน้าจะไปที่ไหนดี?', + 'native.welcome.lead': 'วางแผนด้วยกันว่าจะไปที่ไหน TREK เก็บเส้นทาง การจอง และรูปภาพไว้ในที่เดียว', + 'native.welcome.routeTitle': 'เส้นทางและแผนที่', + 'native.welcome.routeSub': 'ทีละวัน พร้อมเส้นทางและเวลา', + 'native.welcome.togetherTitle': 'วางแผนด้วยกัน', + 'native.welcome.togetherSub': 'ทุกคนเห็นทุกการเปลี่ยนแปลงทันที', + 'native.welcome.photosTitle': 'รูปภาพและโฟโต้บุ๊ก', + 'native.welcome.photosSub': 'ความทรงจำอยู่คู่กับทริป', + 'native.welcome.discover': 'ดูแพ็กเกจคลาวด์', + 'native.trip.start.title': 'ทริปสุดสัปดาห์', + 'native.trip.start.text': 'ทริปสั้น เน้นวางแผน', + 'native.trip.basis.title': 'ทริปหลายเมือง', + 'native.trip.basis.text': 'หลายจุดหมาย จองอัตโนมัติ', + 'native.trip.plus.title': 'ทริปใหญ่', + 'native.trip.plus.text': 'อยู่บนถนนหลายสัปดาห์ กับทั้งกลุ่ม', + 'native.trip.pro.title': 'นักเดินทางรอบโลก', + 'native.trip.pro.text': 'สำหรับคนเดินทางบ่อยและโฟโต้บุ๊กเล่มใหญ่', + 'native.plans.unlimited': 'ไม่จำกัด', + 'native.plans.unlimitedSub': 'ทริปและเพื่อนร่วมทาง', + 'native.plans.inEveryPlan': 'ในทุกแพ็กเกจ', + 'native.plans.yearlyIs': 'ปีละ {price} ยกเลิกได้ทุกเมื่อ', + 'native.plans.monthlyIs': 'เท่ากับเดือนละ {price}', + 'native.plans.photos': '≈ {n} รูป', + 'native.plans.aiPerMonth': '{n} / เดือน', + 'native.plans.aiNone': 'ไม่มี', + 'native.plans.aiLabel': 'เอกสาร AI', + 'native.plans.choose': 'เลือก{trip}', + 'native.plans.termsShort': 'ข้อกำหนดการใช้งาน (EULA)', + 'native.plans.privacyShort': 'ความเป็นส่วนตัว', + 'native.plans.billing': 'การชำระเงิน', + 'native.claim.almost': 'ใกล้ถึงแล้ว', + 'native.claim.addressField': 'ที่อยู่', + 'native.claim.slugPlaceholder': 'yourname', // same-as-en + 'native.claim.emailPlaceholder': 'you@example.com', // same-as-en + 'native.claim.passwordPlaceholder': 'ตั้งรหัสผ่าน', + 'native.claim.freeBadge': 'ว่าง', + 'native.claim.renews': 'ต่ออายุอัตโนมัติ ยกเลิกได้ทุกเมื่อ', + 'native.claim.showPassword': 'แสดงรหัสผ่าน', + 'native.connect.yourTrek': 'TREK ของคุณ', + 'native.connect.addressField': 'ที่อยู่เซิร์ฟเวอร์', + 'native.connect.found': 'พบ TREK แล้ว', + 'native.connect.connected': 'เชื่อมต่อแล้ว', + 'native.connect.addCert': 'เพิ่มใบรับรองไคลเอนต์', + 'native.connect.recheck': 'ตรวจสอบอีกครั้ง', + 'native.connect.kickerUnreachable': 'เข้าถึงไม่ได้', + 'native.connect.kickerNotTrek': 'ไม่ใช่ TREK', + 'native.connect.kickerTooOld': 'ต้องอัปเดต', + 'native.connect.kickerCert': 'ต้องใช้ใบรับรอง', + 'native.connect.kickerGate': 'ต้องลงชื่อเข้าใช้', + 'native.subscribed.kicker': 'การสมัครสมาชิกที่ใช้งานอยู่', + 'native.provisioning.kicker': 'กำลังตั้งค่า', + 'native.provisioning.stepAddress': 'จองที่อยู่แล้ว', + 'native.provisioning.stepServer': 'เซิร์ฟเวอร์กำลังเริ่ม', + 'native.provisioning.stepReady': 'พร้อม', + 'native.provisioning.readyTitle': 'ถึงแล้ว', + 'native.provisioning.readySub': 'TREK ของคุณพร้อมแล้ว เชิญคนที่เดินทางไปกับคุณได้เลย', + 'native.provisioning.open': 'วางแผนทริป', }; export default native; diff --git a/shared/src/i18n/tr/native.ts b/shared/src/i18n/tr/native.ts index d1948b2e1..2e96bf71d 100644 --- a/shared/src/i18n/tr/native.ts +++ b/shared/src/i18n/tr/native.ts @@ -30,45 +30,22 @@ const native: TranslationStrings = { 'native.privacy': 'Gizlilik politikası', 'native.settings.server': 'Sunucu', 'native.settings.serverHint': 'Bu uygulama {server} adresine bağlı.', - 'native.welcome.headline': 'Gezileriniz.\nPlanınız.', - 'native.welcome.sub': - 'Gerçek zamanlı birlikte planlayın: turlar, bütçeler, günlükler ve fotoğraf kitabı, yapay zekâ desteğiyle.', - 'native.welcome.connect': 'TREK’inizi bağlayın', - 'native.welcome.connectSub': 'Zaten kullandığınız adresi açın', - 'native.welcome.getCloud': 'TREK Cloud’u edinin', - 'native.welcome.getCloudSub': 'Sizin için barındırılır, kurulum yok', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': - 'TREK’i sizin için, kendi adresinizde barındırırız. Kuracak bir şey yok, bakımı yok: dakikalar içinde hazır.', - 'native.cloud.f1': 'Kendi adresiniz, Almanya’daki sunucularda', - 'native.cloud.f2': 'Dakikalar içinde hazır, güncellemeler bizden', - 'native.cloud.f3': 'Verileriniz sizin kalır: reklam yok, takip yok', - 'native.cloud.cta': 'Başla', 'native.cloud.haveServer': 'Zaten bir TREK sunucum var', - 'native.connecting': '{host} adresine bağlanılıyor', 'native.back': 'Geri', 'native.plans.title': 'Planınızı seçin', - 'native.plans.sub': 'Kendi adresinizde barındırılan TREK. İstediğiniz zaman değiştirin veya iptal edin.', 'native.plans.monthly': 'Aylık', 'native.plans.yearly': 'Yıllık', 'native.plans.perMonth': 'ayda', 'native.plans.perYear': 'yılda', - 'native.plans.aiDocs': 'ayda {n} yapay zeka belgesi', - 'native.plans.noAi': 'Yapay zeka belgesi yok', - 'native.plans.storage': '{n} GB depolama', 'native.plans.loadError': 'Planlar yüklenemedi. Bağlantınızı kontrol edip tekrar deneyin.', 'native.plans.retry': 'Tekrar dene', 'native.plans.soon': 'Uygulama içi abonelik henüz kullanılamıyor.', 'native.plans.closed': 'TREK Cloud yakında açılıyor. Açılış gününden itibaren buradan abone olabilirsiniz.', - 'native.claim.title': 'Neredeyse hazır', - 'native.claim.sub': 'Adresinizi seçin. Hemen hazırlıyoruz.', 'native.claim.addressLabel': 'Adresiniz', 'native.claim.taken': 'Bu adres alınmış.', 'native.claim.invalid': 'Üç ya da daha fazla harf, rakam ve tire.', 'native.claim.reserved': 'Bu adres ayrılmış.', - 'native.claim.free': 'Uygun', 'native.claim.emailLabel': 'E-posta', - 'native.claim.emailHint': 'Hesabınız ve sözleşmenizle ilgili bildirimler için.', 'native.claim.passwordLabel': 'Şifre', 'native.claim.passwordHint': 'En az 8 karakter. Şifre büyük harf, küçük harf, sayı ve özel karakter içermelidir.', 'native.claim.subscribe': '{price} karşılığında abone ol', @@ -83,23 +60,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'TREK’inizi geri yükleyemedik. Lütfen tekrar deneyin.', 'native.plans.legal': 'Ödeme, onayladığınızda Apple Kimliğinizden alınır. Abonelik, dönem bitmeden en az 24 saat önce iptal edilmezse otomatik olarak yenilenir. Aboneliği App Store hesap ayarlarınızdan yönetebilir veya iptal edebilirsiniz.', - 'native.plans.terms': 'Apple kullanım koşulları (EULA)', 'native.plans.ourTerms': 'TREK Cloud koşulları', 'native.plans.legalAndroid': "Ödeme, onayladığınızda Google hesabınızdan tahsil edilir. Abonelik, dönem bitmeden iptal etmezseniz otomatik olarak yenilenir. Google Play'de Profil, Ödemeler ve abonelikler, Abonelikler bölümünden yönetebilir veya iptal edebilirsiniz.", 'native.plans.restoreNoneAndroid': 'Bu Google hesabında etkin abonelik bulunamadı.', 'native.plans.recommended': 'Önerilen', - 'native.plans.everyPlan': 'Her planda: sınırsız yer, gezi ve kişi', - 'native.plans.continueWith': '{plan} ile devam et', 'native.claim.change': 'Değiştir', 'native.claim.ruleLength': 'karakter', 'native.claim.ruleUpper': 'Büyük harf', 'native.claim.ruleLower': 'Küçük harf', 'native.claim.ruleDigit': 'Rakam', 'native.claim.ruleSpecial': 'Sembol', - 'native.claim.trustServers': 'Sunucular Almanya’da', - 'native.claim.trustCancel': 'İstediğin zaman iptal et', - 'native.claim.trustNoAds': 'Reklamsız', 'native.subscribed.title': "Zaten TREK Cloud'unuz var", 'native.subscribed.text': 'Bu Apple Kimliğinde zaten etkin bir TREK Cloud aboneliği var. Sona erdikten sonra yeni bir abonelik, yeni bir adresle de, başlatabilirsiniz.', @@ -207,6 +178,64 @@ const native: TranslationStrings = { 'native.cert.removeTitle': 'Sertifika kaldırılsın mı?', 'native.cert.removeMessage': 'Sertifika olmadan {host} önündeki proxy, yenisini ekleyene kadar uygulamayı içeri almaz.', + 'native.welcome.title': 'Sıradaki yolculuk nereye?', + 'native.welcome.lead': + 'Nereye gideceğinizi birlikte planlayın. TREK rotayı, rezervasyonları ve fotoğrafları tek yerde tutar.', + 'native.welcome.routeTitle': 'Rota ve harita', + 'native.welcome.routeSub': 'Gün gün, yollar ve saatlerle', + 'native.welcome.togetherTitle': 'Birlikte planla', + 'native.welcome.togetherSub': 'Herkes her değişikliği anında görür', + 'native.welcome.photosTitle': 'Fotoğraflar ve fotoğraf kitabı', + 'native.welcome.photosSub': 'Anılar yolculukla birlikte kalır', + 'native.welcome.discover': 'Bulut paketlerini keşfet', + 'native.trip.start.title': 'Hafta sonu kaçamağı', + 'native.trip.start.text': 'Kısa yolculuklar, çoğunlukla planlama.', + 'native.trip.basis.title': 'Tur', + 'native.trip.basis.text': 'Birkaç durak, rezervasyonlar otomatik.', + 'native.trip.plus.title': 'Büyük yolculuk', + 'native.trip.plus.text': 'Haftalarca yolda, tüm grupla.', + 'native.trip.pro.title': 'Dünya gezgini', + 'native.trip.pro.text': 'Sık seyahat edenler ve büyük fotoğraf kitapları için.', + 'native.plans.unlimited': 'Sınırsız', + 'native.plans.unlimitedSub': 'Yolculuklar ve yol arkadaşları', + 'native.plans.inEveryPlan': 'her pakette', + 'native.plans.yearlyIs': 'Yıllık {price}, istediğin zaman iptal', + 'native.plans.monthlyIs': 'Ayda {price} eder', + 'native.plans.photos': '≈ {n} fotoğraf', + 'native.plans.aiPerMonth': '{n} / ay', + 'native.plans.aiNone': 'Yok', + 'native.plans.aiLabel': 'Yapay zekâ belgeleri', + 'native.plans.choose': '{trip} seç', + 'native.plans.termsShort': 'Kullanım Koşulları (EULA)', + 'native.plans.privacyShort': 'Gizlilik', + 'native.plans.billing': 'Ödeme', + 'native.claim.almost': 'Neredeyse vardık', + 'native.claim.addressField': 'Adres', + 'native.claim.slugPlaceholder': 'adin', + 'native.claim.emailPlaceholder': 'sen@ornek.com', + 'native.claim.passwordPlaceholder': 'Bir parola seç', + 'native.claim.freeBadge': 'boş', + 'native.claim.renews': 'Otomatik yenilenir, istediğin zaman iptal edebilirsin.', + 'native.claim.showPassword': 'Parolayı göster', + 'native.connect.yourTrek': 'TREK’in', + 'native.connect.addressField': 'Sunucu adresi', + 'native.connect.found': 'TREK bulundu', + 'native.connect.connected': 'Bağlandı', + 'native.connect.addCert': 'İstemci sertifikası ekle', + 'native.connect.recheck': 'Tekrar kontrol et', + 'native.connect.kickerUnreachable': 'Ulaşılamıyor', + 'native.connect.kickerNotTrek': 'TREK değil', + 'native.connect.kickerTooOld': 'Güncelleme gerekli', + 'native.connect.kickerCert': 'Sertifika gerekli', + 'native.connect.kickerGate': 'Giriş gerekli', + 'native.subscribed.kicker': 'Etkin abonelik', + 'native.provisioning.kicker': 'Kuruluyor', + 'native.provisioning.stepAddress': 'Adres ayrıldı', + 'native.provisioning.stepServer': 'Sunucu başlıyor', + 'native.provisioning.stepReady': 'Hazır', + 'native.provisioning.readyTitle': 'Vardık.', + 'native.provisioning.readySub': 'TREK’in hazır. Seninle yolculuk edenleri davet et.', + 'native.provisioning.open': 'Yolculuk planla', }; export default native; diff --git a/shared/src/i18n/uk/native.ts b/shared/src/i18n/uk/native.ts index 2460a3265..97f2b7573 100644 --- a/shared/src/i18n/uk/native.ts +++ b/shared/src/i18n/uk/native.ts @@ -30,44 +30,22 @@ const native: TranslationStrings = { 'native.privacy': 'Політика конфіденційності', 'native.settings.server': 'Сервер', 'native.settings.serverHint': 'Застосунок підключено до {server}.', - 'native.welcome.headline': 'Ваші подорожі.\nВаш план.', - 'native.welcome.sub': 'Плануйте разом у реальному часі: тури, бюджети, щоденники та фотокнига, за допомогою ШІ.', - 'native.welcome.connect': 'Підключіть свій TREK', - 'native.welcome.connectSub': 'Відкрийте адресу, якою вже користуєтеся', - 'native.welcome.getCloud': 'Отримати TREK Cloud', - 'native.welcome.getCloudSub': 'Розміщено для вас, без налаштування', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': - 'Ми розміщуємо TREK для вас, на вашій власній адресі. Нічого не потрібно встановлювати чи обслуговувати: готово за кілька хвилин.', - 'native.cloud.f1': 'Власна адреса, на серверах у Німеччині', - 'native.cloud.f2': 'Готово за кілька хвилин, оновлення беремо на себе', - 'native.cloud.f3': 'Ваші дані залишаються вашими: без реклами, без стеження', - 'native.cloud.cta': 'Почати', 'native.cloud.haveServer': 'У мене вже є сервер TREK', - 'native.connecting': 'Підключення до {host}', 'native.back': 'Назад', 'native.plans.title': 'Виберіть тариф', - 'native.plans.sub': 'TREK на вашій власній адресі. Змінюйте або скасовуйте будь-коли.', 'native.plans.monthly': 'Щомісяця', 'native.plans.yearly': 'Щороку', 'native.plans.perMonth': 'на місяць', 'native.plans.perYear': 'на рік', - 'native.plans.aiDocs': '{n} ШІ-документів на місяць', - 'native.plans.noAi': 'Без ШІ-документів', - 'native.plans.storage': '{n} ГБ сховища', 'native.plans.loadError': 'Не вдалося завантажити тарифи. Перевірте з’єднання та повторіть спробу.', 'native.plans.retry': 'Повторити', 'native.plans.soon': 'Оформлення підписки в застосунку поки недоступне.', 'native.plans.closed': 'TREK Cloud скоро відкриється. Оформити підписку тут можна буде з дня відкриття.', - 'native.claim.title': 'Майже готово', - 'native.claim.sub': 'Виберіть адресу. Ми одразу все налаштуємо.', 'native.claim.addressLabel': 'Ваша адреса', 'native.claim.taken': 'Ця адреса зайнята.', 'native.claim.invalid': 'Три або більше літер, цифр і дефісів.', 'native.claim.reserved': 'Ця адреса зарезервована.', - 'native.claim.free': 'Доступно', 'native.claim.emailLabel': 'Ел. пошта', - 'native.claim.emailHint': 'Для вашого облікового запису та повідомлень щодо договору.', 'native.claim.passwordLabel': 'Пароль', 'native.claim.passwordHint': 'Щонайменше 8 символів. Пароль повинен містити великі й малі літери, цифру та спеціальний символ.', @@ -83,23 +61,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'Не вдалося відновити ваш TREK. Повторіть спробу.', 'native.plans.legal': 'Оплата списується з вашого Apple ID під час підтвердження. Підписка поновлюється автоматично, якщо не скасувати її щонайменше за 24 години до кінця періоду. Керувати нею чи скасувати її можна в налаштуваннях облікового запису App Store.', - 'native.plans.terms': 'Умови використання Apple (EULA)', 'native.plans.ourTerms': 'Умови TREK Cloud', 'native.plans.legalAndroid': 'Оплата списується з вашого облікового запису Google під час підтвердження. Підписка подовжується автоматично, якщо ви не скасуєте її до кінця періоду. Керувати нею або скасувати можна в Google Play: Профіль, Платежі й підписки, Підписки.', 'native.plans.restoreNoneAndroid': 'Для цього облікового запису Google активної підписки не знайдено.', 'native.plans.recommended': 'Рекомендуємо', - 'native.plans.everyPlan': 'У кожному тарифі: без обмежень місць, подорожей і людей', - 'native.plans.continueWith': 'Продовжити з {plan}', 'native.claim.change': 'Змінити', 'native.claim.ruleLength': 'символів', 'native.claim.ruleUpper': 'Велика літера', 'native.claim.ruleLower': 'Мала літера', 'native.claim.ruleDigit': 'Цифра', 'native.claim.ruleSpecial': 'Спецсимвол', - 'native.claim.trustServers': 'Сервери в Німеччині', - 'native.claim.trustCancel': 'Скасування будь-коли', - 'native.claim.trustNoAds': 'Без реклами', 'native.subscribed.title': 'У вас уже є TREK Cloud', 'native.subscribed.text': 'На цьому Apple ID уже є активна підписка TREK Cloud. Оформити нову, зокрема з новою адресою, можна після її завершення.', @@ -208,6 +180,63 @@ const native: TranslationStrings = { 'native.cert.settingRemove': 'Видалити', 'native.cert.removeTitle': 'Видалити сертифікат?', 'native.cert.removeMessage': 'Без нього проксі перед {host} не пропустить застосунок, доки ви не додасте новий.', + 'native.welcome.title': 'Куди вирушимо далі?', + 'native.welcome.lead': 'Плануйте поїздку разом. TREK зберігає маршрут, бронювання й фото в одному місці.', + 'native.welcome.routeTitle': 'Маршрут і карта', + 'native.welcome.routeSub': 'День за днем, зі шляхами й часом', + 'native.welcome.togetherTitle': 'Планувати разом', + 'native.welcome.togetherSub': 'Усі одразу бачать кожну зміну', + 'native.welcome.photosTitle': 'Фото й фотокнига', + 'native.welcome.photosSub': 'Спогади залишаються з поїздкою', + 'native.welcome.discover': 'Переглянути хмарні тарифи', + 'native.trip.start.title': 'Вихідні', + 'native.trip.start.text': 'Короткі поїздки, здебільшого планування.', + 'native.trip.basis.title': 'Тур', + 'native.trip.basis.text': 'Кілька місць, бронювання автоматично.', + 'native.trip.plus.title': 'Велика подорож', + 'native.trip.plus.text': 'Тижні в дорозі, усією групою.', + 'native.trip.pro.title': 'Мандрівник', + 'native.trip.pro.text': 'Для тих, хто часто в дорозі, і великих фотокниг.', + 'native.plans.unlimited': 'Без обмежень', + 'native.plans.unlimitedSub': 'Поїздки й попутники', + 'native.plans.inEveryPlan': 'у кожному тарифі', + 'native.plans.yearlyIs': '{price} на рік, скасування будь-коли', + 'native.plans.monthlyIs': 'Це {price} на місяць', + 'native.plans.photos': '≈ {n} фото', + 'native.plans.aiPerMonth': '{n} / міс.', + 'native.plans.aiNone': 'Немає', + 'native.plans.aiLabel': 'Документи ШІ', + 'native.plans.choose': 'Обрати: {trip}', + 'native.plans.termsShort': 'Умови використання (EULA)', + 'native.plans.privacyShort': 'Конфіденційність', + 'native.plans.billing': 'Оплата', + 'native.claim.almost': 'Майже на місці', + 'native.claim.addressField': 'Адреса', + 'native.claim.slugPlaceholder': 'vashe-imia', + 'native.claim.emailPlaceholder': 'vy@pryklad.ua', + 'native.claim.passwordPlaceholder': 'Придумайте пароль', + 'native.claim.freeBadge': 'вільна', + 'native.claim.renews': 'Продовжується автоматично, скасування будь-коли.', + 'native.claim.showPassword': 'Показати пароль', + 'native.connect.yourTrek': 'Ваш TREK', + 'native.connect.addressField': 'Адреса сервера', + 'native.connect.found': 'TREK знайдено', + 'native.connect.connected': 'Підключено', + 'native.connect.addCert': 'Додати клієнтський сертифікат', + 'native.connect.recheck': 'Перевірити знову', + 'native.connect.kickerUnreachable': 'Недоступний', + 'native.connect.kickerNotTrek': 'Це не TREK', + 'native.connect.kickerTooOld': 'Потрібне оновлення', + 'native.connect.kickerCert': 'Потрібен сертифікат', + 'native.connect.kickerGate': 'Потрібен вхід', + 'native.subscribed.kicker': 'Активна підписка', + 'native.provisioning.kicker': 'Налаштовується', + 'native.provisioning.stepAddress': 'Адресу зарезервовано', + 'native.provisioning.stepServer': 'Сервер запускається', + 'native.provisioning.stepReady': 'Готово', + 'native.provisioning.readyTitle': 'Прибули.', + 'native.provisioning.readySub': 'Ваш TREK готовий. Запросіть тих, хто їде з вами.', + 'native.provisioning.open': 'Спланувати поїздку', }; export default native; diff --git a/shared/src/i18n/vi/native.ts b/shared/src/i18n/vi/native.ts index b82c8debb..68f104fe3 100644 --- a/shared/src/i18n/vi/native.ts +++ b/shared/src/i18n/vi/native.ts @@ -31,45 +31,22 @@ const native: TranslationStrings = { 'native.privacy': 'Chính sách quyền riêng tư', 'native.settings.server': 'Máy chủ', 'native.settings.serverHint': 'Ứng dụng này đang kết nối với {server}.', - 'native.welcome.headline': 'Chuyến đi của bạn.\nKế hoạch của bạn.', - 'native.welcome.sub': - 'Lập kế hoạch cùng nhau theo thời gian thực: tour, ngân sách, nhật ký và photobook, với sự hỗ trợ của AI.', - 'native.welcome.connect': 'Kết nối TREK của bạn', - 'native.welcome.connectSub': 'Mở địa chỉ bạn vẫn dùng', - 'native.welcome.getCloud': 'Nhận TREK Cloud', - 'native.welcome.getCloudSub': 'Được lưu trữ sẵn cho bạn, không cần cài đặt', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': - 'Chúng tôi lưu trữ TREK cho bạn, trên địa chỉ của riêng bạn. Không cần cài đặt, không cần bảo trì: sẵn sàng trong vài phút.', - 'native.cloud.f1': 'Địa chỉ riêng của bạn, trên máy chủ ở Đức', - 'native.cloud.f2': 'Sẵn sàng trong vài phút, bản cập nhật do chúng tôi lo', - 'native.cloud.f3': 'Dữ liệu của bạn vẫn là của bạn: không quảng cáo, không theo dõi', - 'native.cloud.cta': 'Bắt đầu', 'native.cloud.haveServer': 'Tôi đã có máy chủ TREK', - 'native.connecting': 'Đang kết nối tới {host}', 'native.back': 'Quay lại', 'native.plans.title': 'Chọn gói của bạn', - 'native.plans.sub': 'TREK lưu trữ trên địa chỉ riêng của bạn. Thay đổi hoặc hủy bất cứ lúc nào.', 'native.plans.monthly': 'Hằng tháng', 'native.plans.yearly': 'Hằng năm', 'native.plans.perMonth': 'mỗi tháng', 'native.plans.perYear': 'mỗi năm', - 'native.plans.aiDocs': '{n} tài liệu AI mỗi tháng', - 'native.plans.noAi': 'Không có tài liệu AI', - 'native.plans.storage': '{n} GB lưu trữ', 'native.plans.loadError': 'Không thể tải các gói. Hãy kiểm tra kết nối và thử lại.', 'native.plans.retry': 'Thử lại', 'native.plans.soon': 'Chưa thể đăng ký trong ứng dụng.', 'native.plans.closed': 'TREK Cloud sắp ra mắt. Từ ngày ra mắt, bạn có thể đăng ký tại đây.', - 'native.claim.title': 'Sắp xong rồi', - 'native.claim.sub': 'Chọn địa chỉ của bạn. Chúng tôi thiết lập ngay.', 'native.claim.addressLabel': 'Địa chỉ của bạn', 'native.claim.taken': 'Địa chỉ đó đã có người dùng.', 'native.claim.invalid': 'Từ ba chữ cái, chữ số và dấu gạch nối trở lên.', 'native.claim.reserved': 'Địa chỉ đó đã được giữ chỗ.', - 'native.claim.free': 'Có sẵn', 'native.claim.emailLabel': 'Email', // same-as-en - 'native.claim.emailHint': 'Dùng cho tài khoản và thông báo về hợp đồng của bạn.', 'native.claim.passwordLabel': 'Mật khẩu', 'native.claim.passwordHint': 'Ít nhất 8 ký tự. Mật khẩu phải có chữ hoa, chữ thường, số và ký tự đặc biệt.', 'native.claim.subscribe': 'Đăng ký với giá {price}', @@ -84,23 +61,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': 'Chúng tôi không thể khôi phục TREK của bạn. Vui lòng thử lại.', 'native.plans.legal': 'Khoản thanh toán được tính vào Apple ID của bạn khi xác nhận. Gói đăng ký tự động gia hạn trừ khi bạn hủy ít nhất 24 giờ trước khi kỳ hạn kết thúc. Quản lý hoặc hủy trong cài đặt tài khoản App Store của bạn.', - 'native.plans.terms': 'Điều khoản sử dụng của Apple (EULA)', 'native.plans.ourTerms': 'Điều khoản TREK Cloud', 'native.plans.legalAndroid': 'Khoản thanh toán được tính vào tài khoản Google của bạn khi xác nhận. Gói đăng ký tự động gia hạn trừ khi bạn hủy trước khi hết kỳ. Quản lý hoặc hủy trong Google Play tại Hồ sơ, Thanh toán và gói thuê bao, Gói thuê bao.', 'native.plans.restoreNoneAndroid': 'Không tìm thấy gói đăng ký đang hoạt động trên tài khoản Google này.', 'native.plans.recommended': 'Đề xuất', - 'native.plans.everyPlan': 'Mọi gói: địa điểm, chuyến đi và người tham gia không giới hạn', - 'native.plans.continueWith': 'Tiếp tục với {plan}', 'native.claim.change': 'Đổi', 'native.claim.ruleLength': 'ký tự', 'native.claim.ruleUpper': 'Chữ hoa', 'native.claim.ruleLower': 'Chữ thường', 'native.claim.ruleDigit': 'Chữ số', 'native.claim.ruleSpecial': 'Ký hiệu', - 'native.claim.trustServers': 'Máy chủ tại Đức', - 'native.claim.trustCancel': 'Hủy bất cứ lúc nào', - 'native.claim.trustNoAds': 'Không quảng cáo', 'native.subscribed.title': 'Bạn đã có TREK Cloud', 'native.subscribed.text': 'Apple ID này đã có gói đăng ký TREK Cloud đang hoạt động. Bạn có thể đăng ký gói mới, kể cả với địa chỉ mới, sau khi gói này kết thúc.', @@ -209,6 +180,63 @@ const native: TranslationStrings = { 'native.cert.removeTitle': 'Gỡ bỏ chứng chỉ?', 'native.cert.removeMessage': 'Không có chứng chỉ, proxy trước {host} sẽ không cho ứng dụng vào cho đến khi bạn thêm chứng chỉ mới.', + 'native.welcome.title': 'Chuyến đi tới sẽ đến đâu?', + 'native.welcome.lead': 'Cùng nhau lên kế hoạch đi đâu. TREK giữ lộ trình, đặt chỗ và ảnh ở một nơi.', + 'native.welcome.routeTitle': 'Lộ trình và bản đồ', + 'native.welcome.routeSub': 'Từng ngày, có đường đi và giờ giấc', + 'native.welcome.togetherTitle': 'Lên kế hoạch cùng nhau', + 'native.welcome.togetherSub': 'Mọi người thấy ngay mọi thay đổi', + 'native.welcome.photosTitle': 'Ảnh và sách ảnh', + 'native.welcome.photosSub': 'Kỷ niệm ở lại cùng chuyến đi', + 'native.welcome.discover': 'Khám phá các gói cloud', + 'native.trip.start.title': 'Chuyến cuối tuần', + 'native.trip.start.text': 'Chuyến đi ngắn, chủ yếu lên kế hoạch.', + 'native.trip.basis.title': 'Chuyến đi vòng', + 'native.trip.basis.text': 'Nhiều điểm dừng, đặt chỗ tự động.', + 'native.trip.plus.title': 'Chuyến đi lớn', + 'native.trip.plus.text': 'Hàng tuần trên đường, cùng cả nhóm.', + 'native.trip.pro.title': 'Người du lịch vòng quanh thế giới', + 'native.trip.pro.text': 'Cho người hay đi và sách ảnh lớn.', + 'native.plans.unlimited': 'Không giới hạn', + 'native.plans.unlimitedSub': 'Chuyến đi và bạn đồng hành', + 'native.plans.inEveryPlan': 'trong mọi gói', + 'native.plans.yearlyIs': '{price} mỗi năm, hủy bất cứ lúc nào', + 'native.plans.monthlyIs': 'Tức là {price} mỗi tháng', + 'native.plans.photos': '≈ {n} ảnh', + 'native.plans.aiPerMonth': '{n} / tháng', + 'native.plans.aiNone': 'Không có', + 'native.plans.aiLabel': 'Tài liệu AI', + 'native.plans.choose': 'Chọn {trip}', + 'native.plans.termsShort': 'Điều khoản sử dụng (EULA)', + 'native.plans.privacyShort': 'Quyền riêng tư', + 'native.plans.billing': 'Thanh toán', + 'native.claim.almost': 'Sắp đến rồi', + 'native.claim.addressField': 'Địa chỉ', + 'native.claim.slugPlaceholder': 'tenban', + 'native.claim.emailPlaceholder': 'ban@vidu.vn', + 'native.claim.passwordPlaceholder': 'Chọn mật khẩu', + 'native.claim.freeBadge': 'còn trống', + 'native.claim.renews': 'Tự động gia hạn, hủy bất cứ lúc nào.', + 'native.claim.showPassword': 'Hiện mật khẩu', + 'native.connect.yourTrek': 'TREK của bạn', + 'native.connect.addressField': 'Địa chỉ máy chủ', + 'native.connect.found': 'Đã tìm thấy TREK', + 'native.connect.connected': 'Đã kết nối', + 'native.connect.addCert': 'Thêm chứng chỉ máy khách', + 'native.connect.recheck': 'Kiểm tra lại', + 'native.connect.kickerUnreachable': 'Không truy cập được', + 'native.connect.kickerNotTrek': 'Không phải TREK', + 'native.connect.kickerTooOld': 'Cần cập nhật', + 'native.connect.kickerCert': 'Cần chứng chỉ', + 'native.connect.kickerGate': 'Cần đăng nhập', + 'native.subscribed.kicker': 'Gói đăng ký đang hoạt động', + 'native.provisioning.kicker': 'Đang thiết lập', + 'native.provisioning.stepAddress': 'Đã giữ địa chỉ', + 'native.provisioning.stepServer': 'Máy chủ đang khởi động', + 'native.provisioning.stepReady': 'Sẵn sàng', + 'native.provisioning.readyTitle': 'Đã đến.', + 'native.provisioning.readySub': 'TREK của bạn đã sẵn sàng. Hãy mời những người cùng đi.', + 'native.provisioning.open': 'Lên kế hoạch chuyến đi', }; export default native; diff --git a/shared/src/i18n/zh-TW/native.ts b/shared/src/i18n/zh-TW/native.ts index 4ba0be05c..ad311ae1f 100644 --- a/shared/src/i18n/zh-TW/native.ts +++ b/shared/src/i18n/zh-TW/native.ts @@ -27,43 +27,22 @@ const native: TranslationStrings = { 'native.privacy': '隱私權政策', 'native.settings.server': '伺服器', 'native.settings.serverHint': '此 App 已連線到 {server}。', - 'native.welcome.headline': '你的旅行。\n你的計畫。', - 'native.welcome.sub': '即時協同規劃:路線、預算、遊記、相簿書,還有 AI 協助。', - 'native.welcome.connect': '連線你的 TREK', - 'native.welcome.connectSub': '開啟你已在使用的網址', - 'native.welcome.getCloud': '取得 TREK Cloud', - 'native.welcome.getCloudSub': '為你託管,無需架設', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': '我們為你託管 TREK,使用你自己的網址。無需安裝、無需維護,幾分鐘即可就緒。', - 'native.cloud.f1': '你專屬的網址,伺服器位於德國', - 'native.cloud.f2': '幾分鐘即可就緒,更新由我們負責', - 'native.cloud.f3': '你的資料仍屬於你:沒有廣告,沒有追蹤', - 'native.cloud.cta': '開始', 'native.cloud.haveServer': '我已經有 TREK 伺服器了', - 'native.connecting': '正在連線 {host}', 'native.back': '返回', 'native.plans.title': '選擇方案', - 'native.plans.sub': '使用你自己的網址託管的 TREK。隨時變更或取消。', 'native.plans.monthly': '每月', 'native.plans.yearly': '每年', 'native.plans.perMonth': '每月', 'native.plans.perYear': '每年', - 'native.plans.aiDocs': '每月 {n} 份 AI 文件', - 'native.plans.noAi': '無 AI 文件', - 'native.plans.storage': '{n} GB 儲存空間', 'native.plans.loadError': '無法載入方案。請檢查網路連線後重試。', 'native.plans.retry': '重試', 'native.plans.soon': '目前尚不支援在 App 內訂閱。', 'native.plans.closed': 'TREK Cloud 即將開放。開放當天起即可在此訂閱。', - 'native.claim.title': '快完成了', - 'native.claim.sub': '選擇你的網址。我們會立即為你準備好。', 'native.claim.addressLabel': '你的網址', 'native.claim.taken': '此網址已被使用。', 'native.claim.invalid': '三個以上的字母、數字和連字號。', 'native.claim.reserved': '此網址已被保留。', - 'native.claim.free': '可用', 'native.claim.emailLabel': '電子郵件', - 'native.claim.emailHint': '用於你的帳號與合約相關通知。', 'native.claim.passwordLabel': '密碼', 'native.claim.passwordHint': '至少 8 個字元。密碼必須包含大寫字母、小寫字母、數字和特殊字元。', 'native.claim.subscribe': '以 {price} 訂閱', @@ -77,23 +56,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': '無法恢復你的 TREK。請重試。', 'native.plans.legal': '確認後將透過你的 Apple ID 付款。除非在目前週期結束前至少 24 小時取消,否則訂閱會自動續訂。可在 App Store 帳號設定中管理或取消。', - 'native.plans.terms': 'Apple 使用條款(EULA)', 'native.plans.ourTerms': 'TREK Cloud 條款', 'native.plans.legalAndroid': '確認後將從你的 Google 帳號扣款。除非你在期滿前取消,訂閱會自動續訂。可在 Google Play 的「個人資料」「付款和訂閱」「訂閱」中管理或取消。', 'native.plans.restoreNoneAndroid': '此 Google 帳號沒有有效的訂閱。', 'native.plans.recommended': '推薦', - 'native.plans.everyPlan': '每個方案都包含:不限地點、行程和人數', - 'native.plans.continueWith': '繼續選擇 {plan}', 'native.claim.change': '更改', 'native.claim.ruleLength': '個字元', 'native.claim.ruleUpper': '大寫字母', 'native.claim.ruleLower': '小寫字母', 'native.claim.ruleDigit': '數字', 'native.claim.ruleSpecial': '符號', - 'native.claim.trustServers': '伺服器位於德國', - 'native.claim.trustCancel': '隨時取消', - 'native.claim.trustNoAds': '無廣告', 'native.subscribed.title': '你已經訂閱 TREK Cloud', 'native.subscribed.text': '此 Apple ID 已有一個有效的 TREK Cloud 訂閱。訂閱結束後,你可以重新訂閱,也可以使用新網址。', @@ -195,6 +168,63 @@ const native: TranslationStrings = { 'native.cert.settingRemove': '移除', 'native.cert.removeTitle': '要移除憑證嗎?', 'native.cert.removeMessage': '移除後,在你新增憑證之前,{host} 前方的代理將不再放行 App。', + 'native.welcome.title': '下一站去哪裡?', + 'native.welcome.lead': '一起規劃要去的地方。TREK 把路線、預訂和照片放在同一個地方。', + 'native.welcome.routeTitle': '路線和地圖', + 'native.welcome.routeSub': '一天一天,含路線和時間', + 'native.welcome.togetherTitle': '一起規劃', + 'native.welcome.togetherSub': '每個變更所有人立即可見', + 'native.welcome.photosTitle': '照片和相簿', + 'native.welcome.photosSub': '回憶和旅程留在一起', + 'native.welcome.discover': '了解雲端方案', + 'native.trip.start.title': '週末旅行', + 'native.trip.start.text': '短途旅行,以規劃為主。', + 'native.trip.basis.title': '環狀旅行', + 'native.trip.basis.text': '多個地點,預訂自動整理。', + 'native.trip.plus.title': '長途旅行', + 'native.trip.plus.text': '數週在路上,和整個團隊一起。', + 'native.trip.pro.title': '環球旅人', + 'native.trip.pro.text': '適合常出遊的人和大型相簿。', + 'native.plans.unlimited': '無限制', + 'native.plans.unlimitedSub': '旅行和同行者', + 'native.plans.inEveryPlan': '每個方案都有', + 'native.plans.yearlyIs': '每年 {price},隨時可取消', + 'native.plans.monthlyIs': '相當於每月 {price}', + 'native.plans.photos': '約 {n} 張照片', + 'native.plans.aiPerMonth': '{n} / 月', + 'native.plans.aiNone': '無', + 'native.plans.aiLabel': 'AI 文件', + 'native.plans.choose': '選擇{trip}', + 'native.plans.termsShort': '使用條款 (EULA)', + 'native.plans.privacyShort': '隱私', + 'native.plans.billing': '付款', + 'native.claim.almost': '快到了', + 'native.claim.addressField': '網址', + 'native.claim.slugPlaceholder': 'yourname', // same-as-en + 'native.claim.emailPlaceholder': 'you@example.com', // same-as-en + 'native.claim.passwordPlaceholder': '設定密碼', + 'native.claim.freeBadge': '可用', + 'native.claim.renews': '自動續訂,隨時可取消。', + 'native.claim.showPassword': '顯示密碼', + 'native.connect.yourTrek': '你的 TREK', + 'native.connect.addressField': '伺服器網址', + 'native.connect.found': '找到 TREK', + 'native.connect.connected': '已連線', + 'native.connect.addCert': '新增用戶端憑證', + 'native.connect.recheck': '再次檢查', + 'native.connect.kickerUnreachable': '無法連線', + 'native.connect.kickerNotTrek': '不是 TREK', + 'native.connect.kickerTooOld': '需要更新', + 'native.connect.kickerCert': '需要憑證', + 'native.connect.kickerGate': '需要登入', + 'native.subscribed.kicker': '訂閱有效', + 'native.provisioning.kicker': '正在設定', + 'native.provisioning.stepAddress': '網址已保留', + 'native.provisioning.stepServer': '伺服器啟動中', + 'native.provisioning.stepReady': '就緒', + 'native.provisioning.readyTitle': '到了。', + 'native.provisioning.readySub': '你的 TREK 已就緒。邀請和你同行的人吧。', + 'native.provisioning.open': '規劃旅行', }; export default native; diff --git a/shared/src/i18n/zh/native.ts b/shared/src/i18n/zh/native.ts index adba91e23..e51551e45 100644 --- a/shared/src/i18n/zh/native.ts +++ b/shared/src/i18n/zh/native.ts @@ -26,43 +26,22 @@ const native: TranslationStrings = { 'native.privacy': '隐私政策', 'native.settings.server': '服务器', 'native.settings.serverHint': '此应用已连接到 {server}。', - 'native.welcome.headline': '你的旅行。\n你的计划。', - 'native.welcome.sub': '实时协同规划:路线、预算、游记、相册书,还有 AI 协助。', - 'native.welcome.connect': '连接你的 TREK', - 'native.welcome.connectSub': '打开你已在使用的地址', - 'native.welcome.getCloud': '获取 TREK Cloud', - 'native.welcome.getCloudSub': '为你托管,无需搭建', - 'native.cloud.title': 'TREK Cloud', - 'native.cloud.sub': '我们为你托管 TREK,用你自己的地址。无需安装、无需维护,几分钟即可就绪。', - 'native.cloud.f1': '你专属的地址,服务器位于德国', - 'native.cloud.f2': '几分钟即可就绪,更新由我们负责', - 'native.cloud.f3': '你的数据仍归你所有:没有广告,没有追踪', - 'native.cloud.cta': '开始', 'native.cloud.haveServer': '我已经有 TREK 服务器了', - 'native.connecting': '正在连接 {host}', 'native.back': '返回', 'native.plans.title': '选择方案', - 'native.plans.sub': '用你自己的地址托管的 TREK。随时更改或取消。', 'native.plans.monthly': '按月', 'native.plans.yearly': '按年', 'native.plans.perMonth': '每月', 'native.plans.perYear': '每年', - 'native.plans.aiDocs': '每月 {n} 份 AI 文档', - 'native.plans.noAi': '无 AI 文档', - 'native.plans.storage': '{n} GB 存储空间', 'native.plans.loadError': '无法加载方案。请检查网络连接后重试。', 'native.plans.retry': '重试', 'native.plans.soon': '暂不支持在应用内订阅。', 'native.plans.closed': 'TREK Cloud 即将开放。开放当天起即可在此订阅。', - 'native.claim.title': '就快好了', - 'native.claim.sub': '选择你的地址。我们会立即为你准备好。', 'native.claim.addressLabel': '你的地址', 'native.claim.taken': '该地址已被占用。', 'native.claim.invalid': '三个及以上的字母、数字和连字符。', 'native.claim.reserved': '该地址已被保留。', - 'native.claim.free': '可用', 'native.claim.emailLabel': '邮箱', - 'native.claim.emailHint': '用于你的账户和合同相关通知。', 'native.claim.passwordLabel': '密码', 'native.claim.passwordHint': '至少 8 个字符。密码必须包含大写字母、小写字母、数字和特殊字符。', 'native.claim.subscribe': '以 {price} 订阅', @@ -76,23 +55,17 @@ const native: TranslationStrings = { 'native.plans.restoreFailed': '无法恢复你的 TREK。请重试。', 'native.plans.legal': '确认后将通过你的 Apple ID 付款。除非在当前周期结束前至少 24 小时取消,否则订阅会自动续订。可在 App Store 账户设置中管理或取消。', - 'native.plans.terms': 'Apple 使用条款(EULA)', 'native.plans.ourTerms': 'TREK Cloud 条款', 'native.plans.legalAndroid': '确认后将从你的 Google 账号扣款。除非你在期满前取消,订阅会自动续订。可在 Google Play 的“个人资料”“付款和订阅”“订阅”中管理或取消。', 'native.plans.restoreNoneAndroid': '此 Google 账号没有有效订阅。', 'native.plans.recommended': '推荐', - 'native.plans.everyPlan': '每个方案都包含:不限地点、行程和人数', - 'native.plans.continueWith': '继续选择 {plan}', 'native.claim.change': '更改', 'native.claim.ruleLength': '个字符', 'native.claim.ruleUpper': '大写字母', 'native.claim.ruleLower': '小写字母', 'native.claim.ruleDigit': '数字', 'native.claim.ruleSpecial': '符号', - 'native.claim.trustServers': '服务器位于德国', - 'native.claim.trustCancel': '随时取消', - 'native.claim.trustNoAds': '无广告', 'native.subscribed.title': '你已经订阅了 TREK Cloud', 'native.subscribed.text': '此 Apple ID 已有一个有效的 TREK Cloud 订阅。订阅结束后,你可以重新订阅,也可以使用新地址。', @@ -194,6 +167,63 @@ const native: TranslationStrings = { 'native.cert.settingRemove': '移除', 'native.cert.removeTitle': '移除证书?', 'native.cert.removeMessage': '移除后,在你添加新证书之前,{host} 前面的代理将不再放行应用。', + 'native.welcome.title': '下一站去哪儿?', + 'native.welcome.lead': '一起规划要去的地方。TREK 把路线、预订和照片放在同一个地方。', + 'native.welcome.routeTitle': '路线和地图', + 'native.welcome.routeSub': '一天一天,含路线和时间', + 'native.welcome.togetherTitle': '一起规划', + 'native.welcome.togetherSub': '每个改动所有人立即可见', + 'native.welcome.photosTitle': '照片和相册', + 'native.welcome.photosSub': '回忆和旅程留在一起', + 'native.welcome.discover': '了解云端方案', + 'native.trip.start.title': '周末游', + 'native.trip.start.text': '短途旅行,以规划为主。', + 'native.trip.basis.title': '环线旅行', + 'native.trip.basis.text': '多个地点,预订自动整理。', + 'native.trip.plus.title': '长途旅行', + 'native.trip.plus.text': '数周在路上,和整个团队一起。', + 'native.trip.pro.title': '环球旅行者', + 'native.trip.pro.text': '适合常出行的人和大型相册。', + 'native.plans.unlimited': '不限', + 'native.plans.unlimitedSub': '旅行和同行者', + 'native.plans.inEveryPlan': '每个方案都有', + 'native.plans.yearlyIs': '每年 {price},随时可取消', + 'native.plans.monthlyIs': '相当于每月 {price}', + 'native.plans.photos': '约 {n} 张照片', + 'native.plans.aiPerMonth': '{n} / 月', + 'native.plans.aiNone': '无', + 'native.plans.aiLabel': 'AI 文档', + 'native.plans.choose': '选择{trip}', + 'native.plans.termsShort': '使用条款 (EULA)', + 'native.plans.privacyShort': '隐私', + 'native.plans.billing': '付款', + 'native.claim.almost': '马上就到', + 'native.claim.addressField': '地址', + 'native.claim.slugPlaceholder': 'yourname', // same-as-en + 'native.claim.emailPlaceholder': 'you@example.com', // same-as-en + 'native.claim.passwordPlaceholder': '设置密码', + 'native.claim.freeBadge': '可用', + 'native.claim.renews': '自动续订,随时可取消。', + 'native.claim.showPassword': '显示密码', + 'native.connect.yourTrek': '你的 TREK', + 'native.connect.addressField': '服务器地址', + 'native.connect.found': '找到 TREK', + 'native.connect.connected': '已连接', + 'native.connect.addCert': '添加客户端证书', + 'native.connect.recheck': '再次检查', + 'native.connect.kickerUnreachable': '无法访问', + 'native.connect.kickerNotTrek': '不是 TREK', + 'native.connect.kickerTooOld': '需要更新', + 'native.connect.kickerCert': '需要证书', + 'native.connect.kickerGate': '需要登录', + 'native.subscribed.kicker': '订阅有效', + 'native.provisioning.kicker': '正在设置', + 'native.provisioning.stepAddress': '地址已预留', + 'native.provisioning.stepServer': '服务器启动中', + 'native.provisioning.stepReady': '就绪', + 'native.provisioning.readyTitle': '到了。', + 'native.provisioning.readySub': '你的 TREK 已就绪。邀请和你同行的人吧。', + 'native.provisioning.open': '规划旅行', }; export default native;