diff --git a/client/src/mobile/screens/settings/MSettingsAbout.tsx b/client/src/mobile/screens/settings/MSettingsAbout.tsx
index a6f2a983e..8960bb3c0 100644
--- a/client/src/mobile/screens/settings/MSettingsAbout.tsx
+++ b/client/src/mobile/screens/settings/MSettingsAbout.tsx
@@ -2,6 +2,7 @@ import { Bug, BookOpen, Coffee, ExternalLink, Heart, Info, Lightbulb } from 'luc
import type { LucideIcon } from 'lucide-react'
import { useTranslation } from '../../../i18n'
import { MSetCard } from './MSettingsUi'
+import { withoutDonationsInApp } from '../../../utils/donations'
interface AboutLink {
href: string
@@ -14,14 +15,14 @@ interface AboutLink {
export default function MSettingsAbout({ appVersion }: { appVersion: string }) {
const { t } = useTranslation()
- const links: AboutLink[] = [
+ const links: AboutLink[] = withoutDonationsInApp([
{ href: 'https://ko-fi.com/mauriceboe', icon: Coffee, title: 'Ko-fi', sub: t('admin.github.support') },
{ href: 'https://buymeacoffee.com/mauriceboe', icon: Heart, title: 'Buy Me a Coffee', sub: t('admin.github.support') },
{ href: 'https://discord.gg/NhZBDSd4qW', icon: Heart, title: 'Discord', sub: 'Join the community' },
{ href: 'https://github.com/liketrek/TREK/issues/new?template=bug_report.yml', icon: Bug, title: t('settings.about.reportBug'), sub: t('settings.about.reportBugHint') },
{ href: 'https://github.com/liketrek/TREK/discussions/new?category=feature-requests', icon: Lightbulb, title: t('settings.about.featureRequest'), sub: t('settings.about.featureRequestHint') },
{ href: 'https://github.com/liketrek/TREK/wiki', icon: BookOpen, title: 'Wiki', sub: t('settings.about.wikiHint') },
- ]
+ ])
return (
diff --git a/client/src/mobile/screens/settings/MSettingsServer.tsx b/client/src/mobile/screens/settings/MSettingsServer.tsx
index 598c28ccb..d7fd34851 100644
--- a/client/src/mobile/screens/settings/MSettingsServer.tsx
+++ b/client/src/mobile/screens/settings/MSettingsServer.tsx
@@ -7,7 +7,7 @@ import { MSetButton, MSetCard, MSetHint } from './MSettingsUi';
/** Only inside the iOS/Android app: which server it talks to, and the way to another one. */
export default function MSettingsServer() {
const { t } = useTranslation();
- const { host, changeServer } = useNativeServer();
+ const { host, changeServer, privacyUrl } = useNativeServer();
if (!host) return null;
return (
@@ -15,6 +15,14 @@ export default function MSettingsServer() {
{t('native.changeServer')}
+
+ {t('native.privacy')}
+
);
}
diff --git a/client/src/native/links.ts b/client/src/native/links.ts
new file mode 100644
index 000000000..e70e0b8aa
--- /dev/null
+++ b/client/src/native/links.ts
@@ -0,0 +1,13 @@
+/**
+ * Pages the apps link to outside the user's server. They open in the system
+ * browser: the WebView hands every navigation off the server's own origin to it.
+ */
+
+/** The privacy policy the store listings name too. */
+export const PRIVACY_URL = 'https://liketrek.com/privacy';
+
+/** What a TREK server is and how to run one, for someone who has none yet. */
+export const SERVER_DOCS_URL = 'https://github.com/liketrek/TREK#readme';
+
+/** The public demo the address screen offers to someone without a server. */
+export const DEMO_SERVER_URL = 'https://demo.liketrek.com';
diff --git a/client/src/native/nativeApp.test.ts b/client/src/native/nativeApp.test.ts
index c4a3d3be1..7710c502e 100644
--- a/client/src/native/nativeApp.test.ts
+++ b/client/src/native/nativeApp.test.ts
@@ -106,4 +106,22 @@ describe('startNativeApp', () => {
await vi.waitFor(() => expect(report).toHaveBeenCalledWith(expect.any(Error)));
vi.unstubAllGlobals();
});
+
+ it('stays quiet when the installed app is older than the offline copy', async () => {
+ vi.mocked(isNativeIos).mockReturnValue(true);
+ vi.mocked(keepOfflineShellFresh).mockRejectedValue(
+ Object.assign(new Error('not implemented'), { code: 'UNIMPLEMENTED' })
+ );
+ const report = vi.fn();
+ vi.stubGlobal('reportError', report);
+ startNativeApp();
+ vi.advanceTimersByTime(15_000);
+ await vi.waitFor(() => expect(keepOfflineShellFresh).toHaveBeenCalled());
+ // Let the rejection reach its handler.
+ await Promise.resolve();
+ await Promise.resolve();
+ await Promise.resolve();
+ expect(report).not.toHaveBeenCalled();
+ vi.unstubAllGlobals();
+ });
});
diff --git a/client/src/native/nativeApp.ts b/client/src/native/nativeApp.ts
index 88ee8ff9b..ba57310d6 100644
--- a/client/src/native/nativeApp.ts
+++ b/client/src/native/nativeApp.ts
@@ -6,6 +6,7 @@ import { isEffectivelyOffline } from '../sync/networkMode';
import { keepOfflineShellFresh } from './offlineShell';
import { isNativeApp, isNativeIos } from './platform';
import { reportNativeFailure } from './reportFailure';
+import { isUnimplemented } from './trekShell';
/** Long enough that the warm-up never competes with the first screen's requests. */
const OFFLINE_SHELL_DELAY_MS = 15_000;
@@ -35,8 +36,11 @@ export function startNativeApp(): void {
void Keyboard.setAccessoryBarVisible({ isVisible: false });
window.setTimeout(() => {
if (isEffectivelyOffline()) return;
- // Not refreshed this time is no harm: the next launch tries again.
- keepOfflineShellFresh().catch(reportNativeFailure);
+ // Not refreshed this time is no harm: the next launch tries again. An app
+ // older than the offline copy has no such method, which is no failure.
+ keepOfflineShellFresh().catch((err: unknown) => {
+ if (!isUnimplemented(err)) reportNativeFailure(err);
+ });
}, OFFLINE_SHELL_DELAY_MS);
}
}
diff --git a/client/src/native/serverAddress.test.ts b/client/src/native/serverAddress.test.ts
index 6ed2692fb..a66508093 100644
--- a/client/src/native/serverAddress.test.ts
+++ b/client/src/native/serverAddress.test.ts
@@ -1,5 +1,5 @@
import { describe, expect, it, vi } from 'vitest';
-import { candidateUrls, probeServer, type ProbeResponse } from './serverAddress';
+import { candidateUrls, probeDemo, probeServer, type ProbeResponse } from './serverAddress';
const features = (
url: string,
@@ -25,6 +25,18 @@ describe('candidateUrls', () => {
});
describe('probeServer', () => {
+ it('accepts a server at the minimum native API version or above', async () => {
+ const data = { bookingImport: false, nativeApp: true, nativeApi: 1 };
+ const get = vi.fn().mockResolvedValue(features('https://trek.example.com/api/health/features', data));
+ expect(await probeServer('https://trek.example.com', get)).toEqual({ ok: true, url: 'https://trek.example.com' });
+ });
+
+ it('calls a server below the minimum native API version too old', async () => {
+ const data = { bookingImport: false, nativeApp: true, nativeApi: 0 };
+ const get = vi.fn().mockResolvedValue(features('https://trek.example.com/api/health/features', data));
+ expect(await probeServer('https://trek.example.com', get)).toEqual({ ok: false, reason: 'tooOld' });
+ });
+
it('accepts a server that reports nativeApp and follows its redirect', async () => {
const get = vi.fn().mockResolvedValue(features('https://trek.example.com/api/health/features'));
expect(await probeServer('http://trek.example.com', get)).toEqual({ ok: true, url: 'https://trek.example.com' });
@@ -83,3 +95,11 @@ describe('probeServer', () => {
expect(get).not.toHaveBeenCalled();
});
});
+
+describe('probeDemo', () => {
+ it('probes the public demo server the address screen offers', async () => {
+ const get = vi.fn().mockResolvedValue(features('https://demo.liketrek.com/api/health/features'));
+ expect(await probeDemo(get)).toEqual({ ok: true, url: 'https://demo.liketrek.com' });
+ expect(get).toHaveBeenCalledWith('https://demo.liketrek.com/api/health/features');
+ });
+});
diff --git a/client/src/native/serverAddress.ts b/client/src/native/serverAddress.ts
index d7e493e49..d2a51305f 100644
--- a/client/src/native/serverAddress.ts
+++ b/client/src/native/serverAddress.ts
@@ -1,3 +1,5 @@
+import { DEMO_SERVER_URL } from './links';
+
/**
* Turns what someone typed into the app's address field into a TREK server it
* can load, or a reason it cannot.
@@ -16,6 +18,13 @@ export type ProbeGet = (url: string) => Promise;
const FEATURES_PATH = '/api/health/features';
+/**
+ * The oldest server API this app can work with (`nativeApi` in the features
+ * response). A server from before the field existed answers without it and is
+ * accepted while the minimum is 1.
+ */
+const MIN_NATIVE_API = 1;
+
function normalize(raw: string): string | null {
let parsed: URL;
try {
@@ -47,6 +56,8 @@ function isRecord(value: unknown): value is Record {
function judge(response: ProbeResponse): ProbeResult {
if (response.status !== 200 || !isRecord(response.data)) return { ok: false, reason: 'notTrek' };
if (response.data.nativeApp === true) {
+ const api = response.data.nativeApi;
+ if (typeof api === 'number' && api < MIN_NATIVE_API) return { ok: false, reason: 'tooOld' };
// Follow a redirect (http to https, a canonical host) so the app loads the
// address the server actually answers on.
const base = response.url.endsWith(FEATURES_PATH) ? response.url.slice(0, -FEATURES_PATH.length) : null;
@@ -74,3 +85,8 @@ export async function probeServer(input: string, get: ProbeGet): Promise {
+ return probeServer(DEMO_SERVER_URL, get);
+}
diff --git a/client/src/native/trekShell.ts b/client/src/native/trekShell.ts
index 596f991e4..548f12183 100644
--- a/client/src/native/trekShell.ts
+++ b/client/src/native/trekShell.ts
@@ -34,3 +34,12 @@ export interface TrekShellPlugin {
export const TrekShell = registerPlugin('TrekShell');
export const APP_URL_SCHEME = 'com.liketrek.trek';
+
+/**
+ * True for the rejection Capacitor gives when the installed app has no such
+ * native method: the UI comes from the server, so a newer server can call into
+ * an app binary that predates the method.
+ */
+export function isUnimplemented(err: unknown): boolean {
+ return typeof err === 'object' && err !== null && (err as { code?: unknown }).code === 'UNIMPLEMENTED';
+}
diff --git a/client/src/utils/donations.test.ts b/client/src/utils/donations.test.ts
new file mode 100644
index 000000000..bf7f25823
--- /dev/null
+++ b/client/src/utils/donations.test.ts
@@ -0,0 +1,50 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { isNativeApp } from '../native/platform';
+import { donationsShown, isDonationLink, noticeAsksForDonation, withoutDonationsInApp } from './donations';
+
+vi.mock('../native/platform', () => ({ isNativeApp: vi.fn() }));
+
+const links = [{ href: 'https://ko-fi.com/mauriceboe' }, { href: 'https://discord.gg/x' }];
+
+beforeEach(() => {
+ vi.mocked(isNativeApp).mockReturnValue(false);
+});
+
+describe('isDonationLink', () => {
+ it('knows the donation pages, their subdomains too', () => {
+ expect(isDonationLink('https://ko-fi.com/mauriceboe')).toBe(true);
+ expect(isDonationLink('https://www.BuyMeACoffee.com/mauriceboe')).toBe(true);
+ });
+
+ it('is false for anything else, a missing href or one that is no URL', () => {
+ expect(isDonationLink('https://github.com/liketrek/TREK')).toBe(false);
+ expect(isDonationLink('https://notko-fi.com/x')).toBe(false);
+ expect(isDonationLink(undefined)).toBe(false);
+ expect(isDonationLink('not a url')).toBe(false);
+ });
+});
+
+describe('in a browser', () => {
+ it('keeps every link and every notice', () => {
+ expect(donationsShown()).toBe(true);
+ expect(withoutDonationsInApp(links)).toEqual(links);
+ });
+});
+
+describe('in the native app', () => {
+ it('drops the donation links', () => {
+ vi.mocked(isNativeApp).mockReturnValue(true);
+ expect(donationsShown()).toBe(false);
+ expect(withoutDonationsInApp(links)).toEqual([{ href: 'https://discord.gg/x' }]);
+ });
+});
+
+describe('noticeAsksForDonation', () => {
+ it('looks at both buttons', () => {
+ expect(noticeAsksForDonation({ cta: { href: 'https://ko-fi.com/x' } })).toBe(true);
+ expect(noticeAsksForDonation({ secondaryCta: { href: 'https://buymeacoffee.com/x' } })).toBe(true);
+ expect(noticeAsksForDonation({ cta: { href: '/settings' }, secondaryCta: null })).toBe(false);
+ expect(noticeAsksForDonation({})).toBe(false);
+ });
+});
diff --git a/client/src/utils/donations.ts b/client/src/utils/donations.ts
new file mode 100644
index 000000000..547dff238
--- /dev/null
+++ b/client/src/utils/donations.ts
@@ -0,0 +1,38 @@
+import { isNativeApp } from '../native/platform';
+
+/** Where the project takes donations. */
+const DONATION_HOSTS = ['ko-fi.com', 'buymeacoffee.com'];
+
+/** Whether `href` points at one of the project's donation pages. */
+export function isDonationLink(href: string | undefined): boolean {
+ if (!href) return false;
+ let host: string;
+ try {
+ host = new URL(href).hostname.toLowerCase();
+ } catch {
+ return false;
+ }
+ return DONATION_HOSTS.some((d) => host === d || host.endsWith(`.${d}`));
+}
+
+/**
+ * Whether the donation links may show. Not inside the iOS and Android apps:
+ * the store rules on payments (Apple 3.1.1, Google Play's Payments policy)
+ * allow no link to an outside payment page there. A browser keeps them.
+ */
+export function donationsShown(): boolean {
+ return !isNativeApp();
+}
+
+/** `links` without the donation pages inside the native apps, unchanged anywhere else. */
+export function withoutDonationsInApp(links: T[]): T[] {
+ return donationsShown() ? links : links.filter((link) => !isDonationLink(link.href));
+}
+
+/** Whether a system notice asks for a donation through one of its buttons. */
+export function noticeAsksForDonation(notice: {
+ cta?: { href?: string } | null;
+ secondaryCta?: { href?: string } | null;
+}): boolean {
+ return isDonationLink(notice.cta?.href) || isDonationLink(notice.secondaryCta?.href);
+}
diff --git a/client/tests/unit/native/donations.native.test.tsx b/client/tests/unit/native/donations.native.test.tsx
new file mode 100644
index 000000000..d816950e9
--- /dev/null
+++ b/client/tests/unit/native/donations.native.test.tsx
@@ -0,0 +1,94 @@
+// FE-NATIVE-DONATIONS-001 to FE-NATIVE-DONATIONS-005
+// Inside the iOS and Android apps no screen links to a donation page: the store
+// rules on payments (Apple 3.1.1, Google Play Payments) allow no outside payment
+// link there. Every place that shows one is rendered here with the app mocked in.
+import { http, HttpResponse } from 'msw';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import GitHubPanel from '../../../src/components/Admin/GitHubPanel';
+import AboutTab from '../../../src/components/Settings/AboutTab';
+import { SystemNoticeHost } from '../../../src/components/SystemNotices/SystemNoticeHost';
+import MAdminGitHubPanel from '../../../src/mobile/screens/admin/MAdminGitHubPanel';
+import MSettingsAbout from '../../../src/mobile/screens/settings/MSettingsAbout';
+import { useSystemNoticeStore, type SystemNoticeDTO } from '../../../src/store/systemNoticeStore';
+import { server } from '../../helpers/msw/server';
+import { render, screen, waitFor } from '../../helpers/render';
+import { resetAllStores } from '../../helpers/store';
+
+vi.mock('../../../src/native/platform', () => ({
+ isNativeApp: () => true,
+ isNativeIos: () => false,
+ nativeServerHost: () => 'trek.example.com',
+}));
+vi.mock('../../../src/components/SystemNotices/SystemNoticeModal.js', () => ({
+ ModalRenderer: ({ notices }: { notices: SystemNoticeDTO[] }) => (
+ {notices.map((n) => n.id).join(',')}
+ ),
+}));
+vi.mock('../../../src/components/SystemNotices/SystemNoticeBanner.js', () => ({
+ BannerRenderer: ({ notices }: { notices: SystemNoticeDTO[] }) => (
+ {notices.map((n) => n.id).join(',')}
+ ),
+ ToastRenderer: () => null,
+}));
+
+function donationLinks(): Element[] {
+ return Array.from(document.querySelectorAll('a[href]')).filter((a) =>
+ /ko-fi\.com|buymeacoffee\.com/.test(a.getAttribute('href') ?? '')
+ );
+}
+
+beforeEach(() => {
+ resetAllStores();
+ server.use(http.get('/api/admin/github-releases', () => HttpResponse.json([])));
+});
+
+afterEach(() => {
+ server.resetHandlers();
+});
+
+describe('donation links inside the native app', () => {
+ it('FE-NATIVE-DONATIONS-001: the desktop About tab shows none, but keeps the community links', () => {
+ render();
+ expect(donationLinks()).toEqual([]);
+ expect(screen.getByText('Discord')).toBeInTheDocument();
+ });
+
+ it('FE-NATIVE-DONATIONS-002: the phone About section shows none', () => {
+ render();
+ expect(donationLinks()).toEqual([]);
+ expect(screen.getByText('Wiki')).toBeInTheDocument();
+ });
+
+ it('FE-NATIVE-DONATIONS-003: the desktop admin GitHub panel shows none', async () => {
+ render();
+ await waitFor(() => expect(screen.getByText('Discord')).toBeInTheDocument());
+ expect(donationLinks()).toEqual([]);
+ });
+
+ it('FE-NATIVE-DONATIONS-004: the phone admin GitHub panel shows none', async () => {
+ render();
+ await waitFor(() => expect(screen.getByText('Discord')).toBeInTheDocument());
+ expect(donationLinks()).toEqual([]);
+ });
+
+ it('FE-NATIVE-DONATIONS-005: a system notice asking for a donation stays hidden, any other one shows', () => {
+ const base = { display: 'banner', severity: 'info', titleKey: 'Title', bodyKey: 'Body', dismissible: true };
+ useSystemNoticeStore.setState({
+ loaded: true,
+ fetching: false,
+ notices: [
+ {
+ ...base,
+ id: 'support',
+ cta: { kind: 'link', labelKey: 'Coffee', href: 'https://buymeacoffee.com/mauriceboe' },
+ secondaryCta: { kind: 'link', labelKey: 'Ko-fi', href: 'https://ko-fi.com/mauriceboe' },
+ },
+ { ...base, id: 'maintenance' },
+ ] as unknown as SystemNoticeDTO[],
+ });
+ render();
+ expect(screen.getByTestId('banners')).toHaveTextContent('maintenance');
+ expect(screen.getByTestId('banners')).not.toHaveTextContent('support');
+ });
+});
diff --git a/server/src/nest/health/features.controller.ts b/server/src/nest/health/features.controller.ts
index e2ff73249..93dfb022e 100644
--- a/server/src/nest/health/features.controller.ts
+++ b/server/src/nest/health/features.controller.ts
@@ -66,6 +66,10 @@ export class FeaturesController {
// one serves a UI that knows neither the sign-in hand-off nor the way
// back to the server picker, and the user would be stuck in it.
nativeApp: true,
+ // The version of what the apps rely on from the server (the hand-off
+ // routes, the shell bridge in the served UI). Raised only for a change an
+ // older app cannot follow; the app refuses a server below its minimum.
+ nativeApi: 1,
};
}
}
diff --git a/server/tests/unit/nest/features.controller.test.ts b/server/tests/unit/nest/features.controller.test.ts
index 97db7500b..26038ea8f 100644
--- a/server/tests/unit/nest/features.controller.test.ts
+++ b/server/tests/unit/nest/features.controller.test.ts
@@ -37,6 +37,7 @@ describe('FeaturesController (GET /api/health/features)', () => {
aiParsing: true,
aiAssistant: true,
nativeApp: true,
+ nativeApi: 1,
});
});
@@ -47,6 +48,7 @@ describe('FeaturesController (GET /api/health/features)', () => {
aiParsing: false,
aiAssistant: false,
nativeApp: true,
+ nativeApi: 1,
});
});
@@ -56,12 +58,14 @@ describe('FeaturesController (GET /api/health/features)', () => {
aiParsing: false,
aiAssistant: false,
nativeApp: true,
+ nativeApi: 1,
});
expect(await make(false, true).controller.features()).toEqual({
bookingImport: false,
aiParsing: true,
aiAssistant: true,
nativeApp: true,
+ nativeApi: 1,
});
});
@@ -83,8 +87,10 @@ describe('FeaturesController (GET /api/health/features)', () => {
}
});
- it('FEAT-014: always tells the native apps this server speaks their sign-in hand-off', async () => {
- expect((await make(false, false).controller.features()).nativeApp).toBe(true);
+ it('FEAT-014: tells the native apps it speaks their sign-in hand-off, and at which version', async () => {
+ const features = await make(false, false).controller.features();
+ expect(features.nativeApp).toBe(true);
+ expect(features.nativeApi).toBe(1);
});
it('FEAT-005: bookingImport is read live, not cached at construction', async () => {
diff --git a/shared/src/i18n/ar/native.ts b/shared/src/i18n/ar/native.ts
index ea1dbb8df..9b7611189 100644
--- a/shared/src/i18n/ar/native.ts
+++ b/shared/src/i18n/ar/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'اتصال',
'native.connect.checking': 'جارٍ التحقق…',
+ 'native.connect.tryDemo': 'لا يوجد خادم بعد؟ جرّب النسخة التجريبية',
+ 'native.connect.whatIsServer': 'ما هو خادم TREK؟',
'native.connect.errorInvalid': 'لا يبدو هذا عنوان ويب.',
'native.connect.errorUnreachable': 'لا يستجيب أي خادم على هذا العنوان. تحقق من العنوان ومن اتصالك.',
'native.connect.errorNotTrek': 'الخادم على هذا العنوان ليس TREK.',
@@ -19,6 +21,7 @@ const native: TranslationStrings = {
'native.handoff.hint': 'لقد سجّلت الدخول باسم {name}. افتح تطبيق TREK لإكمال تسجيل الدخول هناك.',
'native.handoff.open': 'فتح تطبيق TREK',
'native.handoff.switchAccount': 'استخدام حساب آخر',
+ 'native.privacy': 'سياسة الخصوصية',
'native.settings.server': 'الخادم',
'native.settings.serverHint': 'هذا التطبيق متصل بـ {server}.',
};
diff --git a/shared/src/i18n/az/native.ts b/shared/src/i18n/az/native.ts
index 0f006edde..032d218bd 100644
--- a/shared/src/i18n/az/native.ts
+++ b/shared/src/i18n/az/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'Qoşul',
'native.connect.checking': 'Yoxlanılır…',
+ 'native.connect.tryDemo': 'Hələ serveriniz yoxdur? Demonu sınayın',
+ 'native.connect.whatIsServer': 'TREK serveri nədir?',
'native.connect.errorInvalid': 'Bu, veb ünvana bənzəmir.',
'native.connect.errorUnreachable': 'Bu ünvanda heç bir server cavab vermədi. Ünvanı və bağlantınızı yoxlayın.',
'native.connect.errorNotTrek': 'Bu ünvandakı server TREK deyil.',
@@ -19,6 +21,7 @@ const native: TranslationStrings = {
'native.handoff.hint': 'Siz {name} kimi daxil olmusunuz. Girişi orada tamamlamaq üçün TREK tətbiqini açın.',
'native.handoff.open': 'TREK tətbiqini aç',
'native.handoff.switchAccount': 'Başqa hesabdan istifadə et',
+ 'native.privacy': 'Məxfilik siyasəti',
'native.settings.server': 'Server', // same-as-en
'native.settings.serverHint': 'Bu tətbiq {server} serverinə qoşulub.',
};
diff --git a/shared/src/i18n/br/native.ts b/shared/src/i18n/br/native.ts
index db571e832..6d555e279 100644
--- a/shared/src/i18n/br/native.ts
+++ b/shared/src/i18n/br/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'Conectar',
'native.connect.checking': 'Verificando…',
+ 'native.connect.tryDemo': 'Ainda não tem servidor? Experimente a demonstração',
+ 'native.connect.whatIsServer': 'O que é um servidor TREK?',
'native.connect.errorInvalid': 'Isso não parece um endereço da web.',
'native.connect.errorUnreachable': 'Nenhum servidor respondeu neste endereço. Verifique o endereço e sua conexão.',
'native.connect.errorNotTrek': 'O servidor neste endereço não é o TREK.',
@@ -19,6 +21,7 @@ const native: TranslationStrings = {
'native.handoff.hint': 'Você entrou como {name}. Abra o app TREK para concluir o login por lá.',
'native.handoff.open': 'Abrir o app TREK',
'native.handoff.switchAccount': 'Usar outra conta',
+ 'native.privacy': 'Política de privacidade',
'native.settings.server': 'Servidor',
'native.settings.serverHint': 'Este app está conectado a {server}.',
};
diff --git a/shared/src/i18n/ca/native.ts b/shared/src/i18n/ca/native.ts
index 311d27113..0a883ac80 100644
--- a/shared/src/i18n/ca/native.ts
+++ b/shared/src/i18n/ca/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'Connecta',
'native.connect.checking': 'S’està comprovant…',
+ 'native.connect.tryDemo': 'Encara no tens servidor? Prova la demostració',
+ 'native.connect.whatIsServer': 'Què és un servidor TREK?',
'native.connect.errorInvalid': 'Això no sembla una adreça web.',
'native.connect.errorUnreachable': 'Cap servidor respon en aquesta adreça. Comprova l’adreça i la connexió.',
'native.connect.errorNotTrek': 'El servidor d’aquesta adreça no és TREK.',
@@ -19,6 +21,7 @@ const native: TranslationStrings = {
'native.handoff.hint': 'Has iniciat la sessió com a {name}. Obre l’app de TREK per acabar d’iniciar-hi la sessió.',
'native.handoff.open': 'Obre l’app de TREK',
'native.handoff.switchAccount': 'Fes servir un altre compte',
+ 'native.privacy': 'Política de privadesa',
'native.settings.server': 'Servidor',
'native.settings.serverHint': 'Aquesta app està connectada a {server}.',
};
diff --git a/shared/src/i18n/cs/native.ts b/shared/src/i18n/cs/native.ts
index fae2d3566..aaab4fda7 100644
--- a/shared/src/i18n/cs/native.ts
+++ b/shared/src/i18n/cs/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'Připojit',
'native.connect.checking': 'Ověřování…',
+ 'native.connect.tryDemo': 'Ještě nemáte server? Vyzkoušejte demo',
+ 'native.connect.whatIsServer': 'Co je server TREK?',
'native.connect.errorInvalid': 'To nevypadá jako webová adresa.',
'native.connect.errorUnreachable': 'Na této adrese neodpovídá žádný server. Zkontrolujte adresu a připojení.',
'native.connect.errorNotTrek': 'Server na této adrese není TREK.',
@@ -19,6 +21,7 @@ const native: TranslationStrings = {
'native.handoff.hint': 'Jste přihlášeni jako {name}. Otevřete aplikaci TREK a dokončete přihlášení v ní.',
'native.handoff.open': 'Otevřít aplikaci TREK',
'native.handoff.switchAccount': 'Použít jiný účet',
+ '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}.',
};
diff --git a/shared/src/i18n/de/native.ts b/shared/src/i18n/de/native.ts
index f1b4500c0..8a7474f80 100644
--- a/shared/src/i18n/de/native.ts
+++ b/shared/src/i18n/de/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'Verbinden',
'native.connect.checking': 'Wird geprüft…',
+ 'native.connect.tryDemo': 'Noch keinen Server? Probier die Demo aus',
+ 'native.connect.whatIsServer': 'Was ist ein TREK-Server?',
'native.connect.errorInvalid': 'Das sieht nicht nach einer Webadresse aus.',
'native.connect.errorUnreachable':
'Unter dieser Adresse antwortet kein Server. Prüfe die Adresse und deine Verbindung.',
@@ -20,6 +22,7 @@ const native: TranslationStrings = {
'native.handoff.hint': 'Du bist als {name} angemeldet. Öffne die TREK-App, um die Anmeldung dort abzuschließen.',
'native.handoff.open': 'TREK-App öffnen',
'native.handoff.switchAccount': 'Anderes Konto verwenden',
+ 'native.privacy': 'Datenschutzerklärung',
'native.settings.server': 'Server', // same-as-en
'native.settings.serverHint': 'Diese App ist mit {server} verbunden.',
};
diff --git a/shared/src/i18n/en/native.ts b/shared/src/i18n/en/native.ts
index 3d7a4bae5..8561f2d61 100644
--- a/shared/src/i18n/en/native.ts
+++ b/shared/src/i18n/en/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'Connect',
'native.connect.checking': 'Checking…',
+ 'native.connect.tryDemo': 'No server yet? Try the demo',
+ 'native.connect.whatIsServer': 'What is a TREK server?',
'native.connect.errorInvalid': 'That does not look like a web address.',
'native.connect.errorUnreachable': 'No server answered at this address. Check the address and your connection.',
'native.connect.errorNotTrek': 'The server at this address is not TREK.',
@@ -19,6 +21,7 @@ const native: TranslationStrings = {
'native.handoff.hint': 'You are signed in as {name}. Open the TREK app to finish signing in there.',
'native.handoff.open': 'Open the TREK app',
'native.handoff.switchAccount': 'Use a different account',
+ 'native.privacy': 'Privacy policy',
'native.settings.server': 'Server',
'native.settings.serverHint': 'This app is connected to {server}.',
};
diff --git a/shared/src/i18n/es/native.ts b/shared/src/i18n/es/native.ts
index d6b17fcf9..25044b2ad 100644
--- a/shared/src/i18n/es/native.ts
+++ b/shared/src/i18n/es/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'Conectar',
'native.connect.checking': 'Comprobando…',
+ 'native.connect.tryDemo': '¿Aún no tienes servidor? Prueba la demo',
+ 'native.connect.whatIsServer': '¿Qué es un servidor TREK?',
'native.connect.errorInvalid': 'Eso no parece una dirección web.',
'native.connect.errorUnreachable': 'Ningún servidor responde en esta dirección. Revisa la dirección y tu conexión.',
'native.connect.errorNotTrek': 'El servidor de esta dirección no es TREK.',
@@ -20,6 +22,7 @@ const native: TranslationStrings = {
'native.handoff.hint': 'Has iniciado sesión como {name}. Abre la app de TREK para terminar de iniciar sesión allí.',
'native.handoff.open': 'Abrir la app de TREK',
'native.handoff.switchAccount': 'Usar otra cuenta',
+ 'native.privacy': 'Política de privacidad',
'native.settings.server': 'Servidor',
'native.settings.serverHint': 'Esta app está conectada a {server}.',
};
diff --git a/shared/src/i18n/et/native.ts b/shared/src/i18n/et/native.ts
index a68213fa9..2ee2fb754 100644
--- a/shared/src/i18n/et/native.ts
+++ b/shared/src/i18n/et/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'Ühenda',
'native.connect.checking': 'Kontrollin…',
+ 'native.connect.tryDemo': 'Serverit veel pole? Proovi demot',
+ 'native.connect.whatIsServer': 'Mis on TREKi server?',
'native.connect.errorInvalid': 'See ei näe välja nagu veebiaadress.',
'native.connect.errorUnreachable': 'Sellel aadressil ei vastanud ükski server. Kontrolli aadressi ja oma ühendust.',
'native.connect.errorNotTrek': 'Sellel aadressil olev server ei ole TREK.',
@@ -19,6 +21,7 @@ const native: TranslationStrings = {
'native.handoff.hint': 'Oled sisse logitud kui {name}. Ava TREKi rakendus, et sisselogimine seal lõpetada.',
'native.handoff.open': 'Ava TREKi rakendus',
'native.handoff.switchAccount': 'Kasuta teist kontot',
+ 'native.privacy': 'Privaatsuspoliitika',
'native.settings.server': 'Server', // same-as-en
'native.settings.serverHint': 'See rakendus on ühendatud serveriga {server}.',
};
diff --git a/shared/src/i18n/fr/native.ts b/shared/src/i18n/fr/native.ts
index ba7345b6f..ea97a8421 100644
--- a/shared/src/i18n/fr/native.ts
+++ b/shared/src/i18n/fr/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'Se connecter',
'native.connect.checking': 'Vérification…',
+ 'native.connect.tryDemo': 'Pas encore de serveur ? Essayez la démo',
+ 'native.connect.whatIsServer': 'Qu’est-ce qu’un serveur TREK ?',
'native.connect.errorInvalid': 'Cela ne ressemble pas à une adresse web.',
'native.connect.errorUnreachable': 'Aucun serveur ne répond à cette adresse. Vérifiez l’adresse et votre connexion.',
'native.connect.errorNotTrek': 'Le serveur à cette adresse n’est pas TREK.',
@@ -20,6 +22,7 @@ const native: TranslationStrings = {
'Vous êtes connecté en tant que {name}. Ouvrez l’application TREK pour y terminer la connexion.',
'native.handoff.open': 'Ouvrir l’application TREK',
'native.handoff.switchAccount': 'Utiliser un autre compte',
+ 'native.privacy': 'Politique de confidentialité',
'native.settings.server': 'Serveur',
'native.settings.serverHint': 'Cette application est connectée à {server}.',
};
diff --git a/shared/src/i18n/gr/native.ts b/shared/src/i18n/gr/native.ts
index f1f760d3c..b9e9da2a7 100644
--- a/shared/src/i18n/gr/native.ts
+++ b/shared/src/i18n/gr/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'Σύνδεση',
'native.connect.checking': 'Έλεγχος…',
+ 'native.connect.tryDemo': 'Δεν έχετε ακόμη διακομιστή; Δοκιμάστε την επίδειξη',
+ 'native.connect.whatIsServer': 'Τι είναι ένας διακομιστής TREK;',
'native.connect.errorInvalid': 'Αυτό δεν μοιάζει με διεύθυνση ιστού.',
'native.connect.errorUnreachable':
'Κανένας διακομιστής δεν απαντά σε αυτή τη διεύθυνση. Ελέγξτε τη διεύθυνση και τη σύνδεσή σας.',
@@ -21,6 +23,7 @@ const native: TranslationStrings = {
'native.handoff.hint': 'Έχετε συνδεθεί ως {name}. Ανοίξτε την εφαρμογή TREK για να ολοκληρώσετε εκεί τη σύνδεση.',
'native.handoff.open': 'Άνοιγμα της εφαρμογής TREK',
'native.handoff.switchAccount': 'Χρήση άλλου λογαριασμού',
+ 'native.privacy': 'Πολιτική απορρήτου',
'native.settings.server': 'Διακομιστής',
'native.settings.serverHint': 'Αυτή η εφαρμογή είναι συνδεδεμένη στο {server}.',
};
diff --git a/shared/src/i18n/hu/native.ts b/shared/src/i18n/hu/native.ts
index 7a56126d3..a27472897 100644
--- a/shared/src/i18n/hu/native.ts
+++ b/shared/src/i18n/hu/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'Csatlakozás',
'native.connect.checking': 'Ellenőrzés…',
+ 'native.connect.tryDemo': 'Még nincs szervered? Próbáld ki a demót',
+ 'native.connect.whatIsServer': 'Mi az a TREK-szerver?',
'native.connect.errorInvalid': 'Ez nem úgy néz ki, mint egy webcím.',
'native.connect.errorUnreachable': 'Ezen a címen nem válaszol szerver. Ellenőrizd a címet és a kapcsolatot.',
'native.connect.errorNotTrek': 'Az ezen a címen futó szerver nem TREK.',
@@ -20,6 +22,7 @@ const native: TranslationStrings = {
'{name} néven vagy bejelentkezve. Nyisd meg a TREK alkalmazást, hogy ott befejezd a bejelentkezést.',
'native.handoff.open': 'TREK alkalmazás megnyitása',
'native.handoff.switchAccount': 'Másik fiók használata',
+ 'native.privacy': 'Adatvédelmi irányelvek',
'native.settings.server': 'Szerver',
'native.settings.serverHint': 'Ez az alkalmazás ehhez csatlakozik: {server}.',
};
diff --git a/shared/src/i18n/id/native.ts b/shared/src/i18n/id/native.ts
index 8cff16ebc..6b9b497c5 100644
--- a/shared/src/i18n/id/native.ts
+++ b/shared/src/i18n/id/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'Hubungkan',
'native.connect.checking': 'Memeriksa…',
+ 'native.connect.tryDemo': 'Belum punya server? Coba demonya',
+ 'native.connect.whatIsServer': 'Apa itu server TREK?',
'native.connect.errorInvalid': 'Itu tidak terlihat seperti alamat web.',
'native.connect.errorUnreachable': 'Tidak ada server yang merespons di alamat ini. Periksa alamat dan koneksimu.',
'native.connect.errorNotTrek': 'Server di alamat ini bukan TREK.',
@@ -19,6 +21,7 @@ const native: TranslationStrings = {
'native.handoff.hint': 'Kamu masuk sebagai {name}. Buka aplikasi TREK untuk menyelesaikan proses masuk di sana.',
'native.handoff.open': 'Buka aplikasi TREK',
'native.handoff.switchAccount': 'Gunakan akun lain',
+ 'native.privacy': 'Kebijakan privasi',
'native.settings.server': 'Server', // same-as-en
'native.settings.serverHint': 'Aplikasi ini terhubung ke {server}.',
};
diff --git a/shared/src/i18n/it/native.ts b/shared/src/i18n/it/native.ts
index 11c398fea..8e812103b 100644
--- a/shared/src/i18n/it/native.ts
+++ b/shared/src/i18n/it/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'Connetti',
'native.connect.checking': 'Verifica in corso…',
+ 'native.connect.tryDemo': 'Non hai ancora un server? Prova la demo',
+ 'native.connect.whatIsServer': 'Che cos’è un server TREK?',
'native.connect.errorInvalid': 'Non sembra un indirizzo web.',
'native.connect.errorUnreachable':
'Nessun server risponde a questo indirizzo. Controlla l’indirizzo e la connessione.',
@@ -20,6 +22,7 @@ const native: TranslationStrings = {
'native.handoff.hint': 'Hai effettuato l’accesso come {name}. Apri l’app TREK per completare lì l’accesso.',
'native.handoff.open': 'Apri l’app TREK',
'native.handoff.switchAccount': 'Usa un altro account',
+ 'native.privacy': 'Informativa sulla privacy',
'native.settings.server': 'Server', // same-as-en
'native.settings.serverHint': 'Questa app è collegata a {server}.',
};
diff --git a/shared/src/i18n/ja/native.ts b/shared/src/i18n/ja/native.ts
index cb662f652..3cc41f5a6 100644
--- a/shared/src/i18n/ja/native.ts
+++ b/shared/src/i18n/ja/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': '接続',
'native.connect.checking': '確認中…',
+ 'native.connect.tryDemo': 'まだサーバーがありませんか？デモをお試しください',
+ 'native.connect.whatIsServer': 'TREK サーバーとは？',
'native.connect.errorInvalid': 'Web アドレスではないようです。',
'native.connect.errorUnreachable': 'このアドレスで応答するサーバーがありません。アドレスと接続を確認してください。',
'native.connect.errorNotTrek': 'このアドレスのサーバーは TREK ではありません。',
@@ -19,6 +21,7 @@ const native: TranslationStrings = {
'native.handoff.hint': '{name} としてログインしています。TREK アプリを開いて、そちらでログインを完了してください。',
'native.handoff.open': 'TREK アプリを開く',
'native.handoff.switchAccount': '別のアカウントを使う',
+ 'native.privacy': 'プライバシーポリシー',
'native.settings.server': 'サーバー',
'native.settings.serverHint': 'このアプリは {server} に接続されています。',
};
diff --git a/shared/src/i18n/ko/native.ts b/shared/src/i18n/ko/native.ts
index 1f05fb7b0..50667dffd 100644
--- a/shared/src/i18n/ko/native.ts
+++ b/shared/src/i18n/ko/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': '연결',
'native.connect.checking': '확인 중…',
+ 'native.connect.tryDemo': '아직 서버가 없나요? 데모를 사용해 보세요',
+ 'native.connect.whatIsServer': 'TREK 서버란?',
'native.connect.errorInvalid': '웹 주소가 아닌 것 같습니다.',
'native.connect.errorUnreachable': '이 주소에서 응답하는 서버가 없습니다. 주소와 연결 상태를 확인하세요.',
'native.connect.errorNotTrek': '이 주소의 서버는 TREK이 아닙니다.',
@@ -19,6 +21,7 @@ const native: TranslationStrings = {
'native.handoff.hint': '{name}(으)로 로그인되어 있습니다. TREK 앱을 열어 로그인을 완료하세요.',
'native.handoff.open': 'TREK 앱 열기',
'native.handoff.switchAccount': '다른 계정 사용',
+ 'native.privacy': '개인정보 처리방침',
'native.settings.server': '서버',
'native.settings.serverHint': '이 앱은 {server}에 연결되어 있습니다.',
};
diff --git a/shared/src/i18n/nl/native.ts b/shared/src/i18n/nl/native.ts
index 617505830..477e15fb7 100644
--- a/shared/src/i18n/nl/native.ts
+++ b/shared/src/i18n/nl/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'Verbinden',
'native.connect.checking': 'Controleren…',
+ 'native.connect.tryDemo': 'Nog geen server? Probeer de demo',
+ 'native.connect.whatIsServer': 'Wat is een TREK-server?',
'native.connect.errorInvalid': 'Dat lijkt geen webadres.',
'native.connect.errorUnreachable': 'Er reageert geen server op dit adres. Controleer het adres en je verbinding.',
'native.connect.errorNotTrek': 'De server op dit adres is geen TREK.',
@@ -19,6 +21,7 @@ const native: TranslationStrings = {
'native.handoff.hint': 'Je bent ingelogd als {name}. Open de TREK-app om daar het inloggen af te ronden.',
'native.handoff.open': 'TREK-app openen',
'native.handoff.switchAccount': 'Ander account gebruiken',
+ 'native.privacy': 'Privacybeleid',
'native.settings.server': 'Server', // same-as-en
'native.settings.serverHint': 'Deze app is verbonden met {server}.',
};
diff --git a/shared/src/i18n/pl/native.ts b/shared/src/i18n/pl/native.ts
index 744df5182..da15ab95d 100644
--- a/shared/src/i18n/pl/native.ts
+++ b/shared/src/i18n/pl/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'Połącz',
'native.connect.checking': 'Sprawdzanie…',
+ 'native.connect.tryDemo': 'Nie masz jeszcze serwera? Wypróbuj demo',
+ 'native.connect.whatIsServer': 'Czym jest serwer TREK?',
'native.connect.errorInvalid': 'To nie wygląda na adres internetowy.',
'native.connect.errorUnreachable': 'Pod tym adresem nie odpowiada żaden serwer. Sprawdź adres i połączenie.',
'native.connect.errorNotTrek': 'Serwer pod tym adresem to nie TREK.',
@@ -19,6 +21,7 @@ const native: TranslationStrings = {
'native.handoff.hint': 'Zalogowano jako {name}. Otwórz aplikację TREK, aby tam dokończyć logowanie.',
'native.handoff.open': 'Otwórz aplikację TREK',
'native.handoff.switchAccount': 'Użyj innego konta',
+ 'native.privacy': 'Polityka prywatności',
'native.settings.server': 'Serwer',
'native.settings.serverHint': 'Ta aplikacja jest połączona z {server}.',
};
diff --git a/shared/src/i18n/ru/native.ts b/shared/src/i18n/ru/native.ts
index 9c4b429fa..cc5a38724 100644
--- a/shared/src/i18n/ru/native.ts
+++ b/shared/src/i18n/ru/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'Подключиться',
'native.connect.checking': 'Проверка…',
+ 'native.connect.tryDemo': 'Ещё нет сервера? Попробуйте демо',
+ 'native.connect.whatIsServer': 'Что такое сервер TREK?',
'native.connect.errorInvalid': 'Это не похоже на веб-адрес.',
'native.connect.errorUnreachable': 'По этому адресу не отвечает ни один сервер. Проверьте адрес и подключение.',
'native.connect.errorNotTrek': 'Сервер по этому адресу не является TREK.',
@@ -19,6 +21,7 @@ const native: TranslationStrings = {
'native.handoff.hint': 'Вы вошли как {name}. Откройте приложение TREK, чтобы завершить вход в нём.',
'native.handoff.open': 'Открыть приложение TREK',
'native.handoff.switchAccount': 'Использовать другой аккаунт',
+ 'native.privacy': 'Политика конфиденциальности',
'native.settings.server': 'Сервер',
'native.settings.serverHint': 'Приложение подключено к {server}.',
};
diff --git a/shared/src/i18n/sk/native.ts b/shared/src/i18n/sk/native.ts
index 898c47736..2faba5d44 100644
--- a/shared/src/i18n/sk/native.ts
+++ b/shared/src/i18n/sk/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'Pripojiť',
'native.connect.checking': 'Overuje sa…',
+ 'native.connect.tryDemo': 'Ešte nemáte server? Vyskúšajte demo',
+ 'native.connect.whatIsServer': 'Čo je server TREK?',
'native.connect.errorInvalid': 'Toto nevyzerá ako webová adresa.',
'native.connect.errorUnreachable': 'Na tejto adrese neodpovedal žiadny server. Skontrolujte adresu a pripojenie.',
'native.connect.errorNotTrek': 'Server na tejto adrese nie je TREK.',
@@ -19,6 +21,7 @@ const native: TranslationStrings = {
'native.handoff.hint': 'Ste prihlásení ako {name}. Otvorte aplikáciu TREK a dokončite prihlásenie v nej.',
'native.handoff.open': 'Otvoriť aplikáciu TREK',
'native.handoff.switchAccount': 'Použiť iný účet',
+ '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}.',
};
diff --git a/shared/src/i18n/sv/native.ts b/shared/src/i18n/sv/native.ts
index 79a5fca03..48fdac8c4 100644
--- a/shared/src/i18n/sv/native.ts
+++ b/shared/src/i18n/sv/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'Anslut',
'native.connect.checking': 'Kontrollerar…',
+ 'native.connect.tryDemo': 'Ingen server än? Testa demon',
+ 'native.connect.whatIsServer': 'Vad är en TREK-server?',
'native.connect.errorInvalid': 'Det ser inte ut som en webbadress.',
'native.connect.errorUnreachable':
'Ingen server svarar på den här adressen. Kontrollera adressen och din anslutning.',
@@ -20,6 +22,7 @@ const native: TranslationStrings = {
'native.handoff.hint': 'Du är inloggad som {name}. Öppna TREK-appen för att slutföra inloggningen där.',
'native.handoff.open': 'Öppna TREK-appen',
'native.handoff.switchAccount': 'Använd ett annat konto',
+ 'native.privacy': 'Integritetspolicy',
'native.settings.server': 'Server', // same-as-en
'native.settings.serverHint': 'Den här appen är ansluten till {server}.',
};
diff --git a/shared/src/i18n/th/native.ts b/shared/src/i18n/th/native.ts
index edd5f1f42..9f7a3c1ff 100644
--- a/shared/src/i18n/th/native.ts
+++ b/shared/src/i18n/th/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'เชื่อมต่อ',
'native.connect.checking': 'กำลังตรวจสอบ…',
+ 'native.connect.tryDemo': 'ยังไม่มีเซิร์ฟเวอร์ใช่ไหม ลองใช้เดโม',
+ 'native.connect.whatIsServer': 'เซิร์ฟเวอร์ TREK คืออะไร',
'native.connect.errorInvalid': 'ดูเหมือนว่านี่ไม่ใช่ที่อยู่เว็บ',
'native.connect.errorUnreachable': 'ไม่มีเซิร์ฟเวอร์ตอบกลับที่ที่อยู่นี้ โปรดตรวจสอบที่อยู่และการเชื่อมต่อของคุณ',
'native.connect.errorNotTrek': 'เซิร์ฟเวอร์ที่ที่อยู่นี้ไม่ใช่ TREK',
@@ -19,6 +21,7 @@ const native: TranslationStrings = {
'native.handoff.hint': 'คุณเข้าสู่ระบบในชื่อ {name} เปิดแอป TREK เพื่อเข้าสู่ระบบให้เสร็จสิ้นที่นั่น',
'native.handoff.open': 'เปิดแอป TREK',
'native.handoff.switchAccount': 'ใช้บัญชีอื่น',
+ 'native.privacy': 'นโยบายความเป็นส่วนตัว',
'native.settings.server': 'เซิร์ฟเวอร์',
'native.settings.serverHint': 'แอปนี้เชื่อมต่อกับ {server} อยู่',
};
diff --git a/shared/src/i18n/tr/native.ts b/shared/src/i18n/tr/native.ts
index 9bdcc998d..8998140ef 100644
--- a/shared/src/i18n/tr/native.ts
+++ b/shared/src/i18n/tr/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'Bağlan',
'native.connect.checking': 'Kontrol ediliyor…',
+ 'native.connect.tryDemo': 'Henüz sunucun yok mu? Demoyu dene',
+ 'native.connect.whatIsServer': 'TREK sunucusu nedir?',
'native.connect.errorInvalid': 'Bu bir web adresine benzemiyor.',
'native.connect.errorUnreachable': 'Bu adreste yanıt veren bir sunucu yok. Adresi ve bağlantını kontrol et.',
'native.connect.errorNotTrek': 'Bu adresteki sunucu TREK değil.',
@@ -19,6 +21,7 @@ const native: TranslationStrings = {
'native.handoff.hint': '{name} olarak giriş yaptın. Girişi tamamlamak için TREK uygulamasını aç.',
'native.handoff.open': 'TREK uygulamasını aç',
'native.handoff.switchAccount': 'Başka bir hesap kullan',
+ 'native.privacy': 'Gizlilik politikası',
'native.settings.server': 'Sunucu',
'native.settings.serverHint': 'Bu uygulama {server} adresine bağlı.',
};
diff --git a/shared/src/i18n/uk/native.ts b/shared/src/i18n/uk/native.ts
index de94bb0ae..2da8ec2c0 100644
--- a/shared/src/i18n/uk/native.ts
+++ b/shared/src/i18n/uk/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'Підключитися',
'native.connect.checking': 'Перевірка…',
+ 'native.connect.tryDemo': 'Ще немає сервера? Спробуйте демо',
+ 'native.connect.whatIsServer': 'Що таке сервер TREK?',
'native.connect.errorInvalid': 'Це не схоже на вебадресу.',
'native.connect.errorUnreachable': 'За цією адресою не відповідає жоден сервер. Перевірте адресу та з’єднання.',
'native.connect.errorNotTrek': 'Сервер за цією адресою не є TREK.',
@@ -19,6 +21,7 @@ const native: TranslationStrings = {
'native.handoff.hint': 'Ви увійшли як {name}. Відкрийте застосунок TREK, щоб завершити вхід у ньому.',
'native.handoff.open': 'Відкрити застосунок TREK',
'native.handoff.switchAccount': 'Використати інший обліковий запис',
+ 'native.privacy': 'Політика конфіденційності',
'native.settings.server': 'Сервер',
'native.settings.serverHint': 'Застосунок підключено до {server}.',
};
diff --git a/shared/src/i18n/vi/native.ts b/shared/src/i18n/vi/native.ts
index f7dc8bde7..3402c7a56 100644
--- a/shared/src/i18n/vi/native.ts
+++ b/shared/src/i18n/vi/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': 'Kết nối',
'native.connect.checking': 'Đang kiểm tra…',
+ 'native.connect.tryDemo': 'Chưa có máy chủ? Dùng thử bản demo',
+ 'native.connect.whatIsServer': 'Máy chủ TREK là gì?',
'native.connect.errorInvalid': 'Đây có vẻ không phải là địa chỉ web.',
'native.connect.errorUnreachable':
'Không có máy chủ nào phản hồi tại địa chỉ này. Hãy kiểm tra địa chỉ và kết nối của bạn.',
@@ -20,6 +22,7 @@ const native: TranslationStrings = {
'native.handoff.hint': 'Bạn đã đăng nhập với tên {name}. Mở ứng dụng TREK để hoàn tất đăng nhập ở đó.',
'native.handoff.open': 'Mở ứng dụng TREK',
'native.handoff.switchAccount': 'Dùng tài khoản khác',
+ '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}.',
};
diff --git a/shared/src/i18n/zh-TW/native.ts b/shared/src/i18n/zh-TW/native.ts
index 9486311d5..1dd7607bb 100644
--- a/shared/src/i18n/zh-TW/native.ts
+++ b/shared/src/i18n/zh-TW/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': '連線',
'native.connect.checking': '正在檢查…',
+ 'native.connect.tryDemo': '還沒有伺服器？試試示範版',
+ 'native.connect.whatIsServer': '什麼是 TREK 伺服器？',
'native.connect.errorInvalid': '這看起來不像網址。',
'native.connect.errorUnreachable': '此網址沒有伺服器回應。請檢查網址與網路連線。',
'native.connect.errorNotTrek': '此網址上的伺服器不是 TREK。',
@@ -19,6 +21,7 @@ const native: TranslationStrings = {
'native.handoff.hint': '你已以 {name} 身分登入。請開啟 TREK App，在那裡完成登入。',
'native.handoff.open': '開啟 TREK App',
'native.handoff.switchAccount': '使用其他帳號',
+ 'native.privacy': '隱私權政策',
'native.settings.server': '伺服器',
'native.settings.serverHint': '此 App 已連線到 {server}。',
};
diff --git a/shared/src/i18n/zh/native.ts b/shared/src/i18n/zh/native.ts
index 701b06acc..68c6367d3 100644
--- a/shared/src/i18n/zh/native.ts
+++ b/shared/src/i18n/zh/native.ts
@@ -6,6 +6,8 @@ const native: TranslationStrings = {
'native.connect.placeholder': 'https://trek.example.com',
'native.connect.submit': '连接',
'native.connect.checking': '正在检查…',
+ 'native.connect.tryDemo': '还没有服务器？试试演示版',
+ 'native.connect.whatIsServer': '什么是 TREK 服务器？',
'native.connect.errorInvalid': '这看起来不像网址。',
'native.connect.errorUnreachable': '此地址没有服务器响应。请检查地址和网络连接。',
'native.connect.errorNotTrek': '此地址上的服务器不是 TREK。',
@@ -19,6 +21,7 @@ const native: TranslationStrings = {
'native.handoff.hint': '你已以 {name} 身份登录。请打开 TREK 应用，在那里完成登录。',
'native.handoff.open': '打开 TREK 应用',
'native.handoff.switchAccount': '使用其他账号',
+ 'native.privacy': '隐私政策',
'native.settings.server': '服务器',
'native.settings.serverHint': '此应用已连接到 {server}。',
};
diff --git a/wiki/Native-Apps.md b/wiki/Native-Apps.md
new file mode 100644
index 000000000..59ca199f3
--- /dev/null
+++ b/wiki/Native-Apps.md
@@ -0,0 +1,76 @@
+# Native Apps
+
+**TREK Travel Planner** is the TREK app for iPhone, iPad and Android, from the App Store and Google Play. It is a client for your TREK server: it asks for the server's address once and then shows the TREK interface that server delivers, in the version the server runs, with the same data, the same accounts and the same settings as in the browser. On the home screen it is called **TREK**.
+
+The browser keeps working as before, and installing TREK from the browser as a web app is still possible; see [Offline-Mode-and-PWA](Offline-Mode-and-PWA). The app adds what a browser cannot do well on a phone: signing in with single sign-on and passkeys, the system share sheet for exports, haptics, and on iOS a start without network.
+
+## Connecting to a server
+
+On first start the app shows its address screen. Enter the address you open TREK at in the browser, for example `trek.example.com` or `192.168.1.10:3001`. Without a scheme the app tries https first and then plain http.
+
+The app checks that the address answers as a TREK server that knows the apps, and then loads it. If it does not, it says why:
+
+- **No server answered**: the address is wrong, the server is down, or the phone cannot reach it (see the network section below).
+- **Not TREK**: something answered, but not a TREK server.
+- **Too old**: a TREK server from before the apps. Update it to a current release.
+
+No server yet? **Try the demo** connects to the public demo at demo.liketrek.com, which everybody shares and which is reset every hour. **What is a TREK server?** leads to the project page, which explains how to run your own.
+
+To switch servers later, open **Settings → Account** in the app: the **Server** card names the server and has **Change server**, which returns to the address screen. The sign-in screen has the same link at the bottom.
+
+## Signing in
+
+A password works inside the app as in the browser, and **Remember me** is on by default, so the app does not ask again after the phone closed it.
+
+Single sign-on and passkeys cannot run inside the app's web view: identity providers refuse embedded browsers, and a passkey belongs to your server's domain, which the app cannot be tied to for every server. So the app opens your server's sign-in in the system browser instead. Sign in there as usual, tap **Open the TREK app**, and the app continues signed in. The browser hands over a one-time code that only the app that asked for it can redeem, valid for a minute. The server records the sign-in as a login from the native app.
+
+Passkeys are managed in the browser for the same reason: the **Passkeys** card is hidden in the app.
+
+## Offline
+
+The app keeps the trips you choose offline the same way the browser does, including their maps; see [Offline-Mode-and-PWA](Offline-Mode-and-PWA). On iOS, where the web view runs no service worker, the app stores a copy of the server's start page and of every script of its current version, so it also starts with no network. When the server cannot be reached on start, the app opens that copy, or offers **Try again** and **Change server**.
+
+## Plain http, the home network and VPNs
+
+The app accepts plain http on purpose, because a server at home is often reached as `http://192.168.x.x:3001` or over a VPN such as Tailscale. Use https for anything reachable from the internet. iOS asks once for access to the local network; allow it, or the app cannot reach a server on your network.
+
+## Files and downloads
+
+Exports, attachments and backup codes open in the system share sheet, from where you save them to Files, open them in another app or send them on.
+
+## Privacy
+
+The app sends what you enter to your TREK server and nowhere else; the makers of TREK receive nothing. Map tiles come from the map provider your server is set up with. The privacy policy is at https://liketrek.com/privacy and is linked from the address screen and from **Settings → Account**. How to delete an account: https://liketrek.com/delete-account.
+
+The app hides the donation links (Ko-fi, Buy Me a Coffee) that the browser shows, because the store rules allow no outside payment links in an app.
+
+## For maintainers: releasing the apps
+
+The apps are built from `client/`: Capacitor wraps the address screen in `client/native-shell/`, and the iOS and Android projects are `client/ios/` and `client/android/`.
+
+- **Every pull request** that touches the native code runs `.github/workflows/native.yml`: an unsigned Android debug and release build (the release build runs R8 with `client/android/app/proguard-rules.pro`), an iOS simulator build with Xcode 26, and a check of the store texts and images.
+- **A release** runs `.github/workflows/native-release.yml`, by hand (choose the Play track) or on a `v*` tag. A tag pushed by another workflow with the default token does not start it, so after a release run it by hand on the tag. It builds the signed Android App Bundle and sends it to the chosen Google Play testing track as a draft, and archives the iOS app and uploads it to App Store Connect, where it appears in TestFlight. Promoting a build to production happens in the two consoles.
+- **Version numbers**: both stores get the version from `client/package.json` without a prerelease suffix, and the workflow run number plus 1000 as the build number. A prerelease reuses its version with a higher build number and stays on the internal track and in TestFlight.
+- **The `store` environment** holds every secret and needs the approval of a required reviewer before a job starts. It only runs in liketrek/TREK, never for a pull request.
+
+### Secrets in the `store` environment
+
+| Secret | What |
+| --- | --- |
+| ANDROID_UPLOAD_KEYSTORE_B64 | The upload keystore, base64 encoded |
+| ANDROID_KEYSTORE_PASSWORD, ANDROID_KEY_ALIAS, ANDROID_KEY_PASSWORD | Its password, key alias and key password |
+| PLAY_SERVICE_ACCOUNT_JSON | The Google Cloud service account with "Release to testing tracks" in Play Console |
+| APPLE_TEAM_ID | The Apple Developer team of [APPLE ORGANISATION ACCOUNT] |
+| ASC_KEY_ID, ASC_ISSUER_ID, ASC_KEY_P8_B64 | The App Store Connect team API key (App Manager role), the .p8 file base64 encoded |
+
+The Play account is [GOOGLE PLAY ORGANISATION ACCOUNT], the Apple account [APPLE ORGANISATION ACCOUNT]. Google Play App Signing holds the app signing key; the upload key above only proves a build comes from us and can be reset through Play support if lost. Its offline backup lives at [KEYSTORE BACKUP LOCATION]. Never commit a keystore, a .p8 key or a service account file: `client/android/.gitignore` ignores them.
+
+The first Android bundle has to be uploaded by hand once (Play only accepts API uploads after that): run the release workflow, download the bundle from the run's artifacts and upload it to Internal testing in Play Console.
+
+### Store listings
+
+The listing texts, the review notes, the policy page drafts and the screenshots live in `client/fastlane/`; its `client/fastlane/README.md` explains how to make the screenshots and upload the listings. App Review gets a separate review server, [REVIEW SERVER URL], with its own accounts, because the public demo blocks account deletion and uploads; the review notes in App Store Connect name it.
+
+### The server side
+
+The app relies on two things of the server: `/api/health/features` answers `nativeApp: true` and `nativeApi` (the version of what the apps use), and `/api/auth/native` carries the sign-in hand-off. `nativeApi` is raised only for a change an older app cannot follow; the app refuses a server below the minimum it knows. Keep demo.liketrek.com on a current release for as long as the apps are in the stores, since **Try the demo** connects to it.
diff --git a/wiki/_Sidebar.md b/wiki/_Sidebar.md
index f6cd68af2..3707c489f 100644
--- a/wiki/_Sidebar.md
+++ b/wiki/_Sidebar.md
@@ -23,6 +23,7 @@
- [[Dashboard Widgets|Dashboard-Widgets]]
- [[Notifications Inbox|Notifications-Inbox]]
- [[TREK on a Phone|Mobile-App]]
+- [[Native Apps|Native-Apps]]
- [[Offline Mode and PWA|Offline-Mode-and-PWA]]
- [[Languages]]