Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

PRD-7744 PRD-8031: sync cadence config and pull/push panel actions (#3717)

shagun-singh-inkeep803a5ab5c455
diff --git a/.changeset/sync-panel-verb-semantics.md b/.changeset/sync-panel-verb-semantics.md
new file mode 100644
index 000000000..650973b8b
--- /dev/null
+++ b/.changeset/sync-panel-verb-semantics.md
@@ -0,0 +1,13 @@
+---
+"@inkeep/open-knowledge": minor
+---
+
+Git sync gets a rebuilt control panel and mode-independent manual actions.
+
+The sync popover now carries a three-way mode selector — **Manual**, **Auto (Pull only)**, **Auto (Pull and Push)** — plus manual **Pull**, **Push**, and **Pull and Push** buttons that behave identically in every mode: the mode only chooses what runs on a schedule. Pull never commits your in-progress work in any mode; Pull and Push runs the classic sync (commit, push, merge). The panel's status section lists which files a pull would bring in, which files a push would include, and which changed files sit outside OpenKnowledge's commit scope and would be skipped — refreshed by a read-only fetch when the panel opens. Settings and the enable dialogs use the same mode names.
+
+How often the automatic modes run is now configurable per machine: **Settings → Sync → Advanced** adds **Check for updates every** and **Push my edits every** (30 seconds to 1 hour), stored as `autoSync.pullIntervalSeconds` and `autoSync.pushIntervalSeconds` in the project-local config. When a pull is blocked because your uncommitted local changes overlap an incoming update, the popover now lists the blocked files under **Changed here and on the remote** with a **Commit and sync** button that commits exactly those files and resumes, plus a **Resolve in terminal** handoff (desktop app) for stashing or discarding by hand — OpenKnowledge never discards uncommitted work for you.
+
+Two fixes to what a pull does with files it cannot merge cleanly. When an incoming change collides with a local edit to a non-document artifact, Pull now keeps your version rather than failing the whole pull — the Pull verb's disposition is keep-mine, and previously a single dirty artifact overlapping an incoming change would abort everything else the pull had to deliver. Separately, sync's own shareable files under `.ok/` (the ones it legitimately writes) are no longer refused by the symlink guard's state-directory check, which had been rejecting them by resolved path.
+
+Three smaller changes ride along. The panel's freshness line now reports each direction separately (`↓ 2m ago · ↑ 5m ago`) instead of one "Updated" timestamp that only ever reflected whichever direction ran last. An **Advanced settings** link in the popover opens Settings → Sync with the Advanced section already expanded. And when a new worktree inherits its sync setting from the root project, the notice names the mode exactly as the Settings control labels it, rather than using retired wording.
diff --git a/docs/content/features/github-sync.mdx b/docs/content/features/github-sync.mdx
index 4945c3bae..4a23a8eda 100644
--- a/docs/content/features/github-sync.mdx
+++ b/docs/content/features/github-sync.mdx
@@ -8,13 +8,16 @@ import { Cloud } from 'lucide-react';
OpenKnowledge can connect a project to a GitHub remote repository and keep it synced over time. When GitHub sync is enabled, OpenKnowledge keeps your copy current with the remote.
-There are two modes for GitHub sync:
+The sync mode controls what runs automatically:
-- **Full** pulls commits from the remote and pushes your commits back.
-- **Follow** fetches updates from the remote and never pushes or commits on your behalf.
+- **Manual** — nothing moves until you ask. Pull, push, or both from the sync menu whenever you choose.
+- **Auto (Pull only)** — updates flow in from the remote on a schedule; your edits stay on this computer and are never pushed.
+- **Auto (Pull and Push)** — your edits are committed and pushed automatically, and remote changes pull in.
+
+The mode only chooses the schedule. The manual **Pull**, **Push**, and **Pull and Push** buttons in the sync menu do the same thing in every mode: **Pull** brings in remote changes without ever committing your work, **Push** commits and sends your work, and **Pull and Push** does both in one pass. If your GitHub account can't push to the repository, **Push** and **Pull and Push** are hidden rather than offered and rejected — see [GitHub-side blockers](#github-side-blockers).
<Callout type="warn">
- Only enable full GitHub sync for repositories where you are comfortable with OpenKnowledge writing commits to the remote history. If you are worried about automated commits cluttering your Git history, do not enable full sync for that repository.
+ Only enable Auto (Pull and Push) for repositories where you are comfortable with OpenKnowledge writing commits to the remote history. If you are worried about automated commits cluttering your Git history, use Manual or Auto (Pull only) for that repository.
</Callout>
## What GitHub sync is for
@@ -65,13 +68,25 @@ This will open a dialog where you can choose an owner and repository name. You c
## Enable GitHub sync
-When you open a freshly cloned project, you will be prompted to enable sync. If you have full access to the repository, you will be prompted to enable **Full** sync. If you have read-only access, you will be prompted to enable **Follow** sync. You can change the sync mode from the sync popover (the <Cloud role="img" aria-label="Sync" className="inline size-4 align-text-bottom" /> icon) or from **Settings → Sync** at any time.
+### How often sync runs
+
+Both automatic modes run on a timer, and the two directions have their own cadence: OpenKnowledge checks for updates every **30 seconds** and pushes your edits every **60 seconds** by default. They differ on purpose. A pull is a read, so checking more often only means you see other people's work sooner. A push is a commit, so pushing more often leaves more of them in the history everyone reads.
+
+Change either one in **Settings → Sync → Advanced** (the disclosure is collapsed by default), under **Check for updates every** and **Push my edits every**. The controls appear only while an automatic mode is active — in Manual nothing runs on a schedule, so there is no cadence to set. Both accept 30 seconds, 1 minute, 5 minutes, 15 minutes, or 1 hour, and both are per-machine — your choice stays on this computer and is not committed to the repository. **Push my edits every** appears only in Auto (Pull and Push), since no other mode pushes on a schedule.
+
+While you are signed out, **Auto (Pull only)** checks for updates at most every 3 minutes no matter what you choose here — a signed-out client is anonymous to GitHub, and the limit protects the repository from the combined polling of everyone following it. Auto (Pull and Push) is unaffected: pushing requires being signed in to begin with.
-If you want to set a default sync setting for future collaborators, go to the project settings page and navigate to the **Sync** → **Shared default** section. This writes [`autoSync.default`](/docs/reference/configuration) — one of `off`, `follow`, or `full` — to the project's committed `.ok/config.yml`, pre-answering the enable-sync prompt for everyone who clones the repo; each machine's own auto-sync choice overrides it.
+When you open a freshly cloned project, you will be prompted to enable sync. If you have push access to the repository, you will be prompted to enable **Auto (Pull and Push)**. If you have read-only access, you will be prompted to enable **Auto (Pull only)**. You can change the sync mode from the sync popover (the <Cloud role="img" aria-label="Sync" className="inline size-4 align-text-bottom" /> icon) or from **Settings → Sync** at any time.
-### Full
+If you want to set a default sync setting for future collaborators, go to the project settings page and navigate to the **Sync** → **Shared default** section. This writes [`autoSync.default`](/docs/reference/configuration) — one of `off` (Manual), `follow` (Auto, pull only), or `full` (Auto, pull and push) — to the project's committed `.ok/config.yml`, pre-answering the enable-sync prompt for everyone who clones the repo; each machine's own auto-sync choice overrides it.
-With full sync active, OpenKnowledge:
+### Manual
+
+Nothing runs on a schedule. The sync menu's **Pull**, **Push**, and **Pull and Push** buttons cover everything on demand, and the menu's status section shows what each would do before you click: which files a pull would bring in, which files a push would include, and which changed files sit outside OpenKnowledge's commit scope and would be skipped. When sync is paused because your local edits overlap an incoming update, the same menu grows a **Changed here and on the remote** section listing the blocked files with a **Commit and sync** button — see [Conflicts and pending changes](#conflicts-and-pending-changes).
+
+### Auto (Pull and Push)
+
+With push-and-pull sync active, OpenKnowledge:
- Fetches commits from the remote
- Commits your edits locally using the configured Git identity
@@ -79,16 +94,14 @@ With full sync active, OpenKnowledge:
If your Git identity isn't set, OpenKnowledge commits under a default "OpenKnowledge" author; the sync status indicator reminds you to set one so teammates see your name.
-Pulls can overwrite uncommitted local file changes, so commit or discard work-in-progress before you enable sync.
-
-### Follow
+### Auto (Pull only)
-With follow sync active, OpenKnowledge:
+With pull-only sync active, OpenKnowledge:
- Fetches commits from the remote
-- Never commits or pushes your edits to the remote
+- Never commits or pushes your edits on its own — if you have push access, the manual **Push** button is still there when you want to send something. Collaborators who can't push to the repository don't see it; see [GitHub-side blockers](#github-side-blockers).
-Your own edits stay on this computer. You can keep editing a followed project: when an update arrives, non-overlapping changes combine automatically, and an edit to the same lines the remote changed surfaces in the [conflict view](#resolving-a-conflict) where you choose which side to keep. Your branch always tracks the remote tip and never forks.
+Your own edits stay on this computer. You can keep editing: when an update arrives, non-overlapping changes combine automatically, and an edit to the same lines the remote changed surfaces in the [conflict view](#resolving-a-conflict) where you choose which side to keep. Your branch always tracks the remote tip and never forks. The same applies to the manual **Pull** button in every mode — a pull never commits your in-progress work.
## Authentication
@@ -114,7 +127,7 @@ The username entries above apply to HTTPS remotes only. SSH projects follow the
## Sync status and conflicts
-The sync status indicator in the editor shows the current state of the connection: how many commits you are ahead or behind the remote, when the last sync ran, whether sync is paused, and how many files have unresolved conflicts. You can also trigger an immediate sync from the same control instead of waiting for the next scheduled run. From a terminal, `ok sync` commits, pulls, and pushes in one pass; `ok pull` and `ok push` cover one direction each. All three work whether or not the editor is open (see the [CLI reference](/docs/reference/cli)).
+The sync status indicator in the editor opens the sync menu: the mode selector, the manual **Pull** / **Push** / **Pull and Push** buttons, and a live status section showing how far ahead or behind the remote you are, which files a pull would bring in, which files a push would include (and which it would skip), unresolved conflicts, and when a sync last ran. Opening the menu refreshes the remote counts with a read-only fetch — nothing in your copy moves until you press a button. From a terminal, `ok sync` commits, pulls, and pushes in one pass; `ok pull` and `ok push` cover one direction each. All three work whether or not the editor is open (see the [CLI reference](/docs/reference/cli)).
## Resolving a conflict
@@ -135,7 +148,7 @@ A few situations stop sync from completing successfully. In each case the sync s
### Conflicts and pending changes
- **Unresolved conflicts.** If even one file has a conflict between your edits and your team's, sync waits. You can keep working on every other doc; only the conflicted files are frozen until you choose a side from the diff view. See [Resolving a conflict](#resolving-a-conflict) above.
-- **Local changes would be overwritten by an incoming update.** A teammate's update is ready to pull, but a file it touches has uncommitted local changes. Doc edits are committed automatically before merging, so this usually means other tracked files, like configs. Sync pauses rather than clobbering your work; commit, stash, or discard those changes from a terminal and sync resumes.
+- **Local changes would be overwritten by an incoming update.** A teammate's update is ready to pull, but a file it touches has uncommitted local changes. Doc edits are committed automatically before merging, so this usually means other tracked files, like configs. Sync pauses rather than clobbering your work. The sync menu lists every blocked file under **Changed here and on the remote**, and **Commit and sync** commits exactly those files and resumes — nothing else in your working tree is touched. If you would rather stash the changes or throw them away, **Resolve in terminal** (desktop app only) opens a terminal on the project so you can run that yourself. OpenKnowledge never discards uncommitted work for you.
- **Edits made outside the app aren't ready yet.** If you (or another tool) edited a file directly on disk while sync wanted to merge, OpenKnowledge waits until those external edits settle before merging. Usually this clears in a second or two on its own.
### Project isn't on a normal branch
@@ -146,7 +159,7 @@ A few situations stop sync from completing successfully. In each case the sync s
### GitHub-side blockers
- **Authentication errors.** Your stored credentials expired, were revoked, or don't have access to this repository anymore. Reconnect from the sync indicator (or from **Settings → Account**) to clear the error.
-- **You don't have permission to push to this repo.** Someone shared a project backed by a GitHub repo where your account isn't a collaborator (or has read-only access on a private repo). OpenKnowledge checks this up front and offers **Follow** instead of full sync.
+- **You don't have permission to push to this repo.** Someone shared a project backed by a GitHub repo where your account isn't a collaborator (or has read-only access on a private repo). OpenKnowledge checks this up front and offers **Auto (Pull only)** instead. In that mode the manual **Push** and **Pull and Push** buttons are hidden, since GitHub would reject them.
- **Protected branches and rejected pushes.** If the target branch requires reviews, signed commits, or status checks, GitHub rejects the push. OpenKnowledge turns sync off automatically so it stops retrying, and it stays off until you turn it back on from the sync indicator or **Settings → Sync**. Switch to a branch you can push to, or use a pull request for the protected branch instead.
### Temporary problems
diff --git a/docs/content/features/share.mdx b/docs/content/features/share.mdx
index cbd05213b..e095fa964 100644
--- a/docs/content/features/share.mdx
+++ b/docs/content/features/share.mdx
@@ -25,10 +25,10 @@ If the push fails after the repo was created (auth lost mid-flow, network blip),
### Freshness warnings
-A share link points at GitHub, but your local edits only reach GitHub through auto-sync (off by default) or a manual push. When you click Share, OpenKnowledge checks the shared doc or folder against its last-known state on GitHub and, if the link won't yet show what you're looking at, adds a non-blocking warning row to the popover:
+A share link points at GitHub, but your local edits only reach GitHub through **Auto (Pull and Push)** or a manual push — in Manual and Auto (Pull only), nothing is pushed on a schedule. When you click Share, OpenKnowledge checks the shared doc or folder against its last-known state on GitHub and, if the link won't yet show what you're looking at, adds a non-blocking warning row to the popover:
-- **Not on GitHub yet.** The target has never been pushed, so the link won't resolve until it is. With auto-sync off, the row offers **Enable auto-sync** and **How to push manually**; with auto-sync on, it offers **Sync now** and clears itself once the push lands.
-- **Unpushed changes.** The target is on GitHub but has local edits that aren't, so recipients see the last pushed version. With auto-sync on this stays silent — the next sync closes the gap.
+- **Not on GitHub yet.** The target has never been pushed, so the link won't resolve until it is. When the project isn't on Auto (Pull and Push), the row offers **Enable Auto (Pull and Push)** and **How to push manually**; when it is, it offers **Sync now** and clears itself once the push lands.
+- **Unpushed changes.** The target is on GitHub but has local edits that aren't, so recipients see the last pushed version. On Auto (Pull and Push) this stays silent — the next scheduled push closes the gap.
- **Empty folder.** The folder holds nothing Git can track — it has no documents, or everything inside it is ignored — so the link won't resolve, and unlike the never-pushed case no push will fix it. The row names the only remedy, adding a document, and offers no sync actions at all. Only folders reach this state: a doc is trackable at any size, including zero bytes.
If you don't have write access to the repo, the row explains that instead of offering a push action. The check is local, adds no network round-trip, and never blocks sharing: if it can't run, the link still copies with no warning. Folder shares get the same treatment as docs, and can additionally hit the empty-folder case above, which a doc never can. Links minted by an agent get the same check: the [`share_link` MCP tool](/docs/reference/mcp) prepends the warning to its response so the agent can relay it with the link.
@@ -66,11 +66,11 @@ If OpenKnowledge can't reach GitHub to make this call, the dialog falls back to
### When the shared target is not on your local copy
Even on the right branch, a shared target (file or folder) can be renamed or deleted after a link is minted. In this case, OpenKnowledge offers to open the renamed target at its new path, a plain "removed from this branch" message with a link back to the parent folder, or "not pushed yet" when the path never existed.
-If the target was moved, renamed, or deleted in your own local copy, OpenKnowledge tells you to commit your changes manually or enable auto-sync.
+If the target was moved, renamed, or deleted in your own local copy, OpenKnowledge tells you to commit your changes manually or enable Auto (Pull and Push).
If the target is on GitHub but hasn't reached your local copy yet, OpenKnowledge alerts you that your local copy is behind. The **Pull latest changes** button on this message fetches from GitHub and fast-forwards your copy in place. It only ever pulls: nothing is committed or pushed on your behalf, and your uncommitted edits ride on top of what comes in. If the pull can't run — another sync operation is already in flight, or GitHub is unreachable — the reason appears under the message and the button stays available to retry.
### Receiving without push permission
-If the shared repo is one your GitHub account can't push to (you're not a collaborator on a public repo, or you have read-only access on a private one), OpenKnowledge offers **[Follow](/docs/features/github-sync#follow)** at first open instead of the full "Enable auto-sync?" prompt: your copy keeps up to date by pulling the latest from GitHub automatically, while your own edits stay on your computer. You can keep editing — an incoming update combines with your non-overlapping changes automatically, and an edit to the same lines surfaces as a conflict to resolve.
+If the shared repo is one your GitHub account can't push to (you're not a collaborator on a public repo, or you have read-only access on a private one), OpenKnowledge offers **[Auto (Pull only)](/docs/features/github-sync#auto-pull-only)** at first open instead of the full "Enable Auto (Pull and Push)?" prompt: your copy keeps up to date by pulling the latest from GitHub automatically, while your own edits stay on your computer. You can keep editing — an incoming update combines with your non-overlapping changes automatically, and an edit to the same lines surfaces as a conflict to resolve.
See [GitHub sync](/docs/features/github-sync) for how to automatically sync changes to GitHub, and [Timeline and recovery](/docs/features/timeline-and-recovery) for per-doc history once the doc is open.
diff --git a/docs/content/reference/configuration.mdx b/docs/content/reference/configuration.mdx
index e9c587ed9..8f97c7701 100644
--- a/docs/content/reference/configuration.mdx
+++ b/docs/content/reference/configuration.mdx
@@ -50,7 +50,9 @@ A key set in a file more specific than its scope (a user-scope key in `.ok/confi
| `appearance.sidebar.showSkillGroups` | boolean | `true` | project-local | Group skills in the dock by where they came from: the publisher they were imported from, or the plugin that ships them. Skills you authored stay ungrouped at the top of their scope. Toggled with **Group skills by source** in the tree view options. |
| `appearance.sidebar.pinnedProjectSkills` | string[] | `[]` | project-local | Project-scope skills pinned to the top of the dock, by name. A pinned skill keeps its normal row too, so a source group still lists everything from that source. |
| `appearance.sidebar.pinnedGlobalSkills` | string[] | `[]` | user | Global-scope skills pinned to the top of the dock, by name. Stored per user rather than per project, so a pinned global skill follows you into every project. |
-| `autoSync.mode` | `"off" \| "follow" \| "full" \| null` | `null` | project-local | Per-machine sync mode for this project: `off` (no sync), `follow` (one-directional — pull remote changes, never push your own; the earlier value `pull` is accepted as an alias), `full` (bidirectional pull and push). `null` means "unanswered"; the editor's onboarding modal triggers on first remote-detected open. Supersedes `autoSync.enabled`. |
+| `autoSync.mode` | `"off" \| "follow" \| "full" \| null` | `null` | project-local | Per-machine sync mode for this project: `off` (shown as **Manual** — nothing scheduled; the manual pull/push actions still work), `follow` (shown as **Auto (Pull only)** — pull remote changes on a schedule, never push; the earlier value `pull` is accepted as an alias), `full` (shown as **Auto (Pull and Push)** — bidirectional). `null` means "unanswered"; the editor's onboarding modal triggers on first remote-detected open. Supersedes `autoSync.enabled`. |
+| `autoSync.pullIntervalSeconds` | `number` | `30` | project-local | Seconds between scheduled pulls while `autoSync.mode` is `follow` or `full` (30–3600). Shown in **Settings → Sync** as **Check for updates every**. An unauthenticated follower is additionally floored to a 3-minute anonymous poll minimum, so a shorter value has no effect while signed out. |
+| `autoSync.pushIntervalSeconds` | `number` | `60` | project-local | Seconds between scheduled pushes while `autoSync.mode` is `full` (30–3600). Shown in **Settings → Sync** as **Push my edits every**. Ignored in every other mode, which never pushes on a schedule. Each cycle with pending edits authors a commit, so a shorter interval means more, smaller commits in shared history. |
| `autoSync.enabled` | `boolean \| null` | `null` | project-local | Legacy per-machine auto-sync toggle, superseded by `autoSync.mode`. Read only when `mode` is absent (`true` = full, `false` = off). `null` means "unanswered". |
| `autoSync.default` | `"off" \| "follow" \| "full" \| boolean \| null` | `null` | project | Committed seed for each machine's first-open sync mode: `off` / `follow` / `full`, or the legacy boolean (`true` = full, `false` = off). `null` = ask. Lets a maintainer pre-answer the onboarding prompt for everyone who clones; a per-machine `autoSync.mode` overrides it. Compatibility note: a committed string value (`off` / `follow` / `full`) is rejected by app versions released before `autoSync.mode` existed, resetting that machine to config defaults until it updates (it never silently syncs). The legacy boolean seed (`true` / `false`) stays readable by older apps — commit `follow` only once collaborators are on a current version. |
| `server.bind` | list of addresses | `["127.0.0.1"]` | project-local | Addresses the server binds, e.g. `[127.0.0.1]` or `[0.0.0.0]`. The loopback default keeps everything off-machine out. A non-loopback bind additionally requires the `server.allowExternal` consent interlock. Per-machine — a value committed to `.ok/config.yml` is ignored (the exposing host would otherwise refuse to boot for every teammate who clones and runs locally, since the interlock needs per-machine consent that is never committed). Set it where the server is exposed: `OK_BIND` (space-separated), `ok start --bind <address>`, or `.ok/local/config.yml`. Lists replace, never merge. Read at server start. |
diff --git a/packages/app/src/components/AutoSyncEnableWarning.tsx b/packages/app/src/components/AutoSyncEnableWarning.tsx
index 7983952c5..691b43eb1 100644
--- a/packages/app/src/components/AutoSyncEnableWarning.tsx
+++ b/packages/app/src/components/AutoSyncEnableWarning.tsx
@@ -21,12 +21,12 @@ export function AutoSyncEnableDialogIntro({ variant = 'full' }: SyncVariantProps
return (
<>
<DialogTitle>
- <Trans>Enable Follow?</Trans>
+ <Trans>Enable Auto (Pull only)?</Trans>
</DialogTitle>
<DialogDescription>
<Trans>
- Follow fetches updates from your remote git repository and fast-forwards your copy
- automatically. Your local edits stay on this computer and are never pushed.
+ Auto (Pull only) fetches updates from your remote git repository and fast-forwards your
+ copy automatically. Your local edits stay on this computer and are never pushed.
</Trans>
</DialogDescription>
</>
@@ -35,7 +35,7 @@ export function AutoSyncEnableDialogIntro({ variant = 'full' }: SyncVariantProps
return (
<>
<DialogTitle>
- <Trans>Enable git auto-sync?</Trans>
+ <Trans>Enable Auto (Pull and Push)?</Trans>
</DialogTitle>
<DialogDescription>
<Trans>
@@ -112,7 +112,8 @@ function PullOnlyBullets() {
title={<Trans>Your edits stay on this computer</Trans>}
body={
<Trans>
- Follow never pushes or commits your local changes. They stay only on this machine.
+ Auto (Pull only) never pushes or commits your local changes. They stay only on this
+ machine.
</Trans>
}
/>
diff --git a/packages/app/src/components/AutoSyncOnboardingDialog.dom.test.tsx b/packages/app/src/components/AutoSyncOnboardingDialog.dom.test.tsx
index 0238051c5..699ba7da7 100644
--- a/packages/app/src/components/AutoSyncOnboardingDialog.dom.test.tsx
+++ b/packages/app/src/components/AutoSyncOnboardingDialog.dom.test.tsx
@@ -57,7 +57,7 @@ describe('AutoSyncOnboardingDialog runtime behavior', () => {
writer = () => ({ ok: true });
await renderDialog('full');
- expect(screen.getByRole('button', { name: 'Enable auto-sync' })).not.toBeNull();
+ expect(screen.getByRole('button', { name: 'Enable Auto (Pull and Push)' })).not.toBeNull();
expect(screen.getByRole('button', { name: 'Keep disabled' })).not.toBeNull();
expect(screen.queryByRole('button', { name: /close/i })).toBeNull();
expect(screen.getByRole('note').textContent).toContain('Heads up');
@@ -67,7 +67,7 @@ describe('AutoSyncOnboardingDialog runtime behavior', () => {
writer = () => ({ ok: true });
await renderDialog('follow');
- expect(screen.getByRole('button', { name: 'Enable Follow' })).not.toBeNull();
+ expect(screen.getByRole('button', { name: 'Enable Auto (Pull only)' })).not.toBeNull();
const note = screen.getByRole('note').textContent ?? '';
expect(note).toContain('Updates flow in');
expect(note).toContain('stay only on this machine');
@@ -81,13 +81,13 @@ describe('AutoSyncOnboardingDialog runtime behavior', () => {
};
await renderDialog('full');
- await userEvent.click(screen.getByRole('button', { name: 'Enable auto-sync' }));
+ await userEvent.click(screen.getByRole('button', { name: 'Enable Auto (Pull and Push)' }));
expect(modeWrites).toEqual(['full']);
cleanup();
modeWrites.length = 0;
await renderDialog('follow');
- await userEvent.click(screen.getByRole('button', { name: 'Enable Follow' }));
+ await userEvent.click(screen.getByRole('button', { name: 'Enable Auto (Pull only)' }));
expect(modeWrites).toEqual(['follow']);
});
@@ -107,7 +107,8 @@ describe('AutoSyncOnboardingDialog runtime behavior', () => {
await renderDialog('follow');
expect(
- (screen.getByRole('button', { name: 'Enable Follow' }) as HTMLButtonElement).disabled,
+ (screen.getByRole('button', { name: 'Enable Auto (Pull only)' }) as HTMLButtonElement)
+ .disabled,
).toBe(true);
expect(
(screen.getByRole('button', { name: 'Keep disabled' }) as HTMLButtonElement).disabled,
@@ -119,7 +120,7 @@ describe('AutoSyncOnboardingDialog runtime behavior', () => {
writer = () => ({ ok: false, error: 'binding unavailable' });
await renderDialog('full', () => resolvedCalls.push('resolved'));
- await userEvent.click(screen.getByRole('button', { name: 'Enable auto-sync' }));
+ await userEvent.click(screen.getByRole('button', { name: 'Enable Auto (Pull and Push)' }));
expect(resolvedCalls).toEqual([]);
expect(toastErrors).toEqual(['Could not enable sync: binding unavailable']);
@@ -132,7 +133,7 @@ describe('AutoSyncOnboardingDialog runtime behavior', () => {
await userEvent.keyboard('{Escape}');
await waitFor(() => {
- expect(screen.getByRole('button', { name: 'Enable auto-sync' })).not.toBeNull();
+ expect(screen.getByRole('button', { name: 'Enable Auto (Pull and Push)' })).not.toBeNull();
});
expect(resolvedCalls).toEqual([]);
});
diff --git a/packages/app/src/components/AutoSyncOnboardingDialog.tsx b/packages/app/src/components/AutoSyncOnboardingDialog.tsx
index 0318cdbbb..5725259b0 100644
--- a/packages/app/src/components/AutoSyncOnboardingDialog.tsx
+++ b/packages/app/src/components/AutoSyncOnboardingDialog.tsx
@@ -90,7 +90,11 @@ export function AutoSyncOnboardingDialog({
<Trans>Keep disabled</Trans>
</Button>
<Button onClick={() => persistChoice(true)} disabled={writer === null}>
- {variant === 'follow' ? <Trans>Enable Follow</Trans> : <Trans>Enable auto-sync</Trans>}
+ {variant === 'follow' ? (
+ <Trans>Enable Auto (Pull only)</Trans>
+ ) : (
+ <Trans>Enable Auto (Pull and Push)</Trans>
+ )}
</Button>
</DialogFooter>
</DialogContent>
diff --git a/packages/app/src/components/EnableSyncConfirmDialog.dom.test.tsx b/packages/app/src/components/EnableSyncConfirmDialog.dom.test.tsx
index 124942ccd..b1668ef73 100644
--- a/packages/app/src/components/EnableSyncConfirmDialog.dom.test.tsx
+++ b/packages/app/src/components/EnableSyncConfirmDialog.dom.test.tsx
@@ -35,7 +35,7 @@ describe('EnableSyncConfirmDialog', () => {
test('full variant (default) shows the bidirectional warning and no stranded disclosure', async () => {
await renderDialog({ strandedCommitCount: 3 });
- expect(screen.getByRole('button', { name: 'Enable auto-sync' })).not.toBeNull();
+ expect(screen.getByRole('button', { name: 'Enable Auto (Pull and Push)' })).not.toBeNull();
const note = screen.getByRole('note').textContent ?? '';
expect(note).toContain('Commits happen automatically');
// Stranded disclosure is pull-only; a full enable pushes the commits, so it
@@ -45,7 +45,7 @@ describe('EnableSyncConfirmDialog', () => {
test('pull variant shows the one-directional warning', async () => {
await renderDialog({ variant: 'follow' });
- expect(screen.getByRole('button', { name: 'Enable Follow' })).not.toBeNull();
+ expect(screen.getByRole('button', { name: 'Enable Auto (Pull only)' })).not.toBeNull();
expect(screen.getByRole('note').textContent ?? '').toContain('Updates flow in');
expect(screen.queryByText(/haven't shared/i)).toBeNull();
});
@@ -67,7 +67,7 @@ describe('EnableSyncConfirmDialog', () => {
test('confirm fires the callback', async () => {
const confirms: string[] = [];
await renderDialog({ variant: 'follow', onConfirm: () => confirms.push('ok') });
- await userEvent.click(screen.getByRole('button', { name: 'Enable Follow' }));
+ await userEvent.click(screen.getByRole('button', { name: 'Enable Auto (Pull only)' }));
expect(confirms).toEqual(['ok']);
});
});
diff --git a/packages/app/src/components/EnableSyncConfirmDialog.tsx b/packages/app/src/components/EnableSyncConfirmDialog.tsx
index 64cab2ec5..f6ce96d3b 100644
--- a/packages/app/src/components/EnableSyncConfirmDialog.tsx
+++ b/packages/app/src/components/EnableSyncConfirmDialog.tsx
@@ -68,7 +68,11 @@ export function EnableSyncConfirmDialog({
</Button>
</DialogClose>
<Button onClick={onConfirm}>
- {variant === 'follow' ? <Trans>Enable Follow</Trans> : <Trans>Enable auto-sync</Trans>}
+ {variant === 'follow' ? (
+ <Trans>Enable Auto (Pull only)</Trans>
+ ) : (
+ <Trans>Enable Auto (Pull and Push)</Trans>
+ )}
</Button>
</DialogFooter>
</DialogContent>
diff --git a/packages/app/src/components/ShareFreshnessWarning.dom.test.tsx b/packages/app/src/components/ShareFreshnessWarning.dom.test.tsx
index 85799dbbc..b1189a982 100644
--- a/packages/app/src/components/ShareFreshnessWarning.dom.test.tsx
+++ b/packages/app/src/components/ShareFreshnessWarning.dom.test.tsx
@@ -171,7 +171,7 @@ describe('ShareFreshnessWarning — recovery CTAs (FR4/FR5)', () => {
kind="doc"
/>,
);
- expect(screen.getByRole('button', { name: 'Enable auto-sync' })).not.toBeNull();
+ expect(screen.getByRole('button', { name: 'Enable Auto (Pull and Push)' })).not.toBeNull();
const link = screen.getByRole('link', { name: /How to push manually/ }) as HTMLAnchorElement;
expect(link.getAttribute('href')).toBe('https://git-scm.com/docs/git-push');
});
@@ -187,14 +187,14 @@ describe('ShareFreshnessWarning — recovery CTAs (FR4/FR5)', () => {
);
// The row CTA opens the off → on confirmation gate rather than navigating
// the sender away to the settings surface.
- fireEvent.click(screen.getByRole('button', { name: 'Enable auto-sync' }));
+ fireEvent.click(screen.getByRole('button', { name: 'Enable Auto (Pull and Push)' }));
const dialog = screen.getByRole('dialog');
expect(window.location.hash).toBe('');
expect(autoSyncWrites).toEqual([]); // nothing written until the user confirms
// Confirming the gate enables auto-sync in place via the project-local
// config binding.
- fireEvent.click(within(dialog).getByRole('button', { name: 'Enable auto-sync' }));
+ fireEvent.click(within(dialog).getByRole('button', { name: 'Enable Auto (Pull and Push)' }));
expect(autoSyncWrites).toEqual([true]);
});
@@ -207,7 +207,7 @@ describe('ShareFreshnessWarning — recovery CTAs (FR4/FR5)', () => {
/>,
);
expect(screen.getByRole('button', { name: 'Sync now' })).not.toBeNull();
- expect(screen.queryByRole('button', { name: 'Enable auto-sync' })).toBeNull();
+ expect(screen.queryByRole('button', { name: 'Enable Auto (Pull and Push)' })).toBeNull();
expect(screen.queryByRole('link', { name: /How to push manually/ })).toBeNull();
});
@@ -307,7 +307,7 @@ describe('ShareFreshnessWarning — recovery CTAs (FR4/FR5)', () => {
kind="doc"
/>,
);
- expect(screen.queryByRole('button', { name: 'Enable auto-sync' })).toBeNull();
+ expect(screen.queryByRole('button', { name: 'Enable Auto (Pull and Push)' })).toBeNull();
expect(screen.queryByRole('button', { name: 'Sync now' })).toBeNull();
expect(screen.queryByRole('link', { name: /How to push manually/ })).toBeNull();
});
@@ -332,7 +332,7 @@ describe('ShareFreshnessWarning — empty folder', () => {
expect(text).not.toContain("isn't on GitHub yet");
expect(text).not.toContain("hasn't synced to GitHub yet");
// Every CTA is a dead end for a folder git cannot represent.
- expect(screen.queryByRole('button', { name: 'Enable auto-sync' })).toBeNull();
+ expect(screen.queryByRole('button', { name: 'Enable Auto (Pull and Push)' })).toBeNull();
expect(screen.queryByRole('link', { name: /How to push manually/ })).toBeNull();
expect(screen.queryByRole('button', { name: 'Sync now' })).toBeNull();
});
diff --git a/packages/app/src/components/ShareFreshnessWarning.tsx b/packages/app/src/components/ShareFreshnessWarning.tsx
index 7c8c6b15f..113d0660c 100644
--- a/packages/app/src/components/ShareFreshnessWarning.tsx
+++ b/packages/app/src/components/ShareFreshnessWarning.tsx
@@ -205,7 +205,7 @@ export function ShareFreshnessWarning({ freshness, status, kind }: ShareFreshnes
) : (
<div className="flex flex-wrap items-center gap-x-3 gap-y-1.5">
<Button variant="outline" size="xs" onClick={() => onToggleRequest(true)}>
- <Trans>Enable auto-sync</Trans>
+ <Trans>Enable Auto (Pull and Push)</Trans>
</Button>
<a
href={PUSH_DOCS_URL}
diff --git a/packages/app/src/components/ShareReceiveMissDialog.dom.test.tsx b/packages/app/src/components/ShareReceiveMissDialog.dom.test.tsx
index 4329f2c5b..608b37626 100644
--- a/packages/app/src/components/ShareReceiveMissDialog.dom.test.tsx
+++ b/packages/app/src/components/ShareReceiveMissDialog.dom.test.tsx
@@ -213,7 +213,9 @@ describe('ShareReceiveMissDialog', () => {
// place AND dismisses the miss dialog (regression guard: the dialog must
// dismiss on confirm).
fireEvent.click(screen.getByTestId('share-receive-miss-enable-sync'));
- fireEvent.click(within(openConsentDialog()).getByRole('button', { name: 'Enable auto-sync' }));
+ fireEvent.click(
+ within(openConsentDialog()).getByRole('button', { name: 'Enable Auto (Pull and Push)' }),
+ );
expect(autoSyncWrites).toEqual([{ mode: 'full', enabled: true }]);
await waitFor(() => {
@@ -631,7 +633,7 @@ describe('ShareReceiveMissDialog follow-mode offer', () => {
expect(window.location.hash).toBe('');
expect(autoSyncWrites).toEqual([]);
- fireEvent.click(within(consent).getByRole('button', { name: 'Enable Follow' }));
+ fireEvent.click(within(consent).getByRole('button', { name: 'Enable Auto (Pull only)' }));
// Follow mode lands, and the legacy boolean is cleared so an older app can't
// read the project as full-sync and start pushing this receiver's copy.
@@ -707,7 +709,7 @@ describe('ShareReceiveMissDialog follow-mode offer', () => {
setSyncStatus(pullableSyncStatus({ lastPullUtc: 'p1', lastPullOutcome: 'succeeded' }));
const consent = await waitFor(() => openConsentDialog());
- fireEvent.click(within(consent).getByRole('button', { name: 'Enable Follow' }));
+ fireEvent.click(within(consent).getByRole('button', { name: 'Enable Auto (Pull only)' }));
// The failed write raises its own toast; it must not cost the receiver the
// document the pull already fetched for them.
diff --git a/packages/app/src/components/ShareReceiveMissPanel.dom.test.tsx b/packages/app/src/components/ShareReceiveMissPanel.dom.test.tsx
index 2e6487edf..d5e153293 100644
--- a/packages/app/src/components/ShareReceiveMissPanel.dom.test.tsx
+++ b/packages/app/src/components/ShareReceiveMissPanel.dom.test.tsx
@@ -222,7 +222,7 @@ describe('ShareReceiveMissPanel verdict surfaces', () => {
fireEvent.click(screen.getByTestId('share-receive-miss-enable-sync'));
const dialog = screen.getByRole('dialog');
expect(autoSyncWrites).toEqual([]);
- fireEvent.click(within(dialog).getByRole('button', { name: 'Enable auto-sync' }));
+ fireEvent.click(within(dialog).getByRole('button', { name: 'Enable Auto (Pull and Push)' }));
expect(autoSyncWrites).toEqual([true]);
// The in-tab surface has no modal to close, so a successful enable clears it
// by navigating to the parent folder (DOC_NAV path 'notes/plan' → 'notes').
diff --git a/packages/app/src/components/SyncBlockingChanges.dom.test.tsx b/packages/app/src/components/SyncBlockingChanges.dom.test.tsx
new file mode 100644
index 000000000..3ed14d947
--- /dev/null
+++ b/packages/app/src/components/SyncBlockingChanges.dom.test.tsx
@@ -0,0 +1,114 @@
+import * as actualLinguiMacro from '@lingui/react/macro';
+import { cleanup, render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import type { ReactNode } from 'react';
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
+import { renderLinguiTemplate } from '@/test-utils/lingui-mock';
+
+vi.doMock('@lingui/core/macro', () => ({
+ ...actualLinguiMacro,
+ t: renderLinguiTemplate,
+ msg: renderLinguiTemplate,
+}));
+
+vi.doMock('@lingui/react/macro', () => ({
+ ...actualLinguiMacro,
+ Trans: ({ children }: { children: ReactNode }) => <>{children}</>,
+ useLingui: () => ({ t: renderLinguiTemplate }),
+}));
+
+const calls: string[] = [];
+let failNext = false;
+vi.doMock('@/lib/resolve-blocking', () => ({
+ resolveBlockingChanges: (action: string) => {
+ calls.push(action);
+ return failNext ? Promise.reject(new Error('409')) : Promise.resolve();
+ },
+}));
+
+const terminalCommands: string[] = [];
+vi.doMock('@/components/handoff/terminal-command-events', () => ({
+ requestTerminalCommand: (id: string) => {
+ terminalCommands.push(id);
+ },
+}));
+
+const PATHS = ['.claude/launch.json', '.codex/config.toml'];
+
+async function renderPanel(paths: readonly string[] = PATHS) {
+ const { SyncBlockingChanges } = await import('./SyncBlockingChanges');
+ render(<SyncBlockingChanges paths={paths} />);
+}
+
+describe('SyncBlockingChanges', () => {
+ beforeEach(() => {
+ calls.length = 0;
+ terminalCommands.length = 0;
+ failNext = false;
+ });
+
+ afterEach(() => {
+ cleanup();
+ // Back to the browser default: the next test asserts the button's absence.
+ delete (window as { okDesktop?: unknown }).okDesktop;
+ });
+
+ test('lists every blocking path rather than naming a few in a sentence', async () => {
+ await renderPanel();
+
+ for (const path of PATHS) {
+ expect(screen.getByText(path)).toBeTruthy();
+ }
+ });
+
+ test('renders nothing when nothing is blocking', async () => {
+ await renderPanel([]);
+
+ expect(screen.queryByTestId('sync-blocking-commit')).toBeNull();
+ });
+
+ test('commit goes straight through — it only adds a commit', async () => {
+ await renderPanel();
+
+ await userEvent.click(screen.getByTestId('sync-blocking-commit'));
+
+ expect(calls).toEqual(['commit']);
+ });
+
+ test('there is no Discard button — the destructive verb is withheld', async () => {
+ // Uncommitted content has no reflog behind it, so a confirmation dialog is
+ // not recoverability. The verb ships once a snapshot does; until then the
+ // panel offers Commit and a terminal.
+ await renderPanel();
+
+ expect(screen.queryByTestId('sync-blocking-discard')).toBeNull();
+ expect(screen.queryByRole('button', { name: /discard/i })).toBeNull();
+ });
+
+ test('a refused action says so instead of looking like it worked', async () => {
+ // The server 409s when nothing is blocking any more — a stale panel, or a
+ // second click. Swallowing that would leave the buttons reading as dead.
+ failNext = true;
+ await renderPanel();
+
+ await userEvent.click(screen.getByTestId('sync-blocking-commit'));
+
+ await waitFor(() => {
+ expect(screen.getByTestId('sync-blocking-error')).toBeTruthy();
+ });
+ });
+
+ test('the terminal action appears only where a terminal exists', async () => {
+ // The docked PTY is behind the Electron bridge; in a browser the button
+ // would open nothing at all.
+ await renderPanel();
+ expect(screen.queryByTestId('sync-blocking-terminal')).toBeNull();
+ cleanup();
+
+ (window as { okDesktop?: unknown }).okDesktop = {};
+ await renderPanel();
+
+ await userEvent.click(screen.getByTestId('sync-blocking-terminal'));
+ expect(terminalCommands).toEqual(['git-status']);
+ });
+});
diff --git a/packages/app/src/components/SyncBlockingChanges.tsx b/packages/app/src/components/SyncBlockingChanges.tsx
new file mode 100644
index 000000000..d431f0d93
--- /dev/null
+++ b/packages/app/src/components/SyncBlockingChanges.tsx
@@ -0,0 +1,135 @@
+/**
+ * The resolution panel for a pre-merge overlap — the one sync pause the user
+ * can clear from inside the app.
+ *
+ * The engine pauses when tracked files are dirty locally AND changed on the
+ * remote, because `git merge` would refuse. Before this panel that state
+ * rendered as a sentence naming three of the files, which told the user what
+ * happened and left them to go find a terminal. Here the same state carries the
+ * full list, the non-destructive action that ends it, and a way into the app's
+ * own terminal for anyone who wants to drive it by hand.
+ *
+ * Deliberately NO Discard button. Reverting uncommitted work is unrecoverable —
+ * git keeps no reflog for it — and the spec's ordering constraint is that the
+ * destructive verb ships only once a recoverable snapshot exists behind it.
+ * Until then a terminal is the honest escape: it makes the user type the
+ * destructive command themselves, in a place where they can inspect first.
+ *
+ * Commit acts on the server's blocking set, never on a path this component
+ * sends — see `resolveBlockingChanges`.
+ */
+
+import { Trans } from '@lingui/react/macro';
+import { Terminal } from 'lucide-react';
+import { useState } from 'react';
+import { requestTerminalCommand } from '@/components/handoff/terminal-command-events';
+import { Button } from '@/components/ui/button';
+import { Spinner } from '@/components/ui/spinner';
+import { resolveBlockingChanges } from '@/lib/resolve-blocking';
+
+/**
+ * Whether the docked terminal exists to be opened. Desktop-only: the PTY lives
+ * behind the Electron bridge, so in a browser the button would open nothing.
+ */
+function terminalAvailable(): boolean {
+ return typeof window !== 'undefined' && window.okDesktop != null;
+}
+
+export function SyncBlockingChanges({ paths }: { paths: readonly string[] }) {
+ const [pending, setPending] = useState<'commit' | null>(null);
+ const [failed, setFailed] = useState(false);
+
+ if (paths.length === 0) return null;
+
+ // Clears `pending` on both paths rather than in a `finally`: React Compiler
+ // cannot lower a try-statement with a finalizer, and fails the production
+ // build on it (it type-checks and passes tests either way).
+ async function run(action: 'commit') {
+ setPending(action);
+ setFailed(false);
+ try {
+ await resolveBlockingChanges(action);
+ setPending(null);
+ } catch {
+ // Includes the 409 for "nothing is blocking any more". Both cases end the
+ // same way for the user: the panel stays until the next status update
+ // says otherwise, with a line saying the action did not take.
+ setFailed(true);
+ setPending(null);
+ }
+ }
+
+ const busy = pending !== null;
+
+ return (
+ <div className="flex flex-col gap-2 border-t pt-3">
+ <div className="flex flex-col gap-0.5">
+ <span id="sync-blocking-heading" className="text-xs font-medium text-foreground">
+ <Trans>Changed here and on the remote</Trans>
+ </span>
+ <span className="text-2xs text-muted-foreground">
+ <Trans>
+ Sync is paused. Commit these local edits to continue, or sort them out in a terminal.
+ </Trans>
+ </span>
+ </div>
+
+ {/* Capped height rather than a truncated list: the server already caps the
+ set, and a scroll keeps a long one from pushing the actions out of
+ reach in a popover the user cannot resize. */}
+ {/* tabIndex: Chromium (so Electron) does not make scroll containers
+ keyboard-focusable on its own, and every child here is plain text — so
+ without it a keyboard user cannot read past roughly the seventh path
+ in the very list they are being asked to act on. `overscroll-contain`
+ keeps reaching the end from scroll-chaining to the surface behind. */}
+ <ul
+ aria-labelledby="sync-blocking-heading"
+ className="flex max-h-28 flex-col gap-1 overflow-y-auto overscroll-contain"
+ data-testid="sync-blocking-list"
+ >
+ {paths.map((path) => (
+ <li
+ key={path}
+ title={path}
+ className="min-w-0 truncate font-mono text-2xs text-foreground"
+ >
+ {path}
+ </li>
+ ))}
+ </ul>
+
+ {/* role="alert": this appears after an explicit click inside a popover with
+ no other announcement, so without a live region a screen-reader user
+ gets silence on a failed action. */}
+ {failed && (
+ <p role="alert" className="text-xs text-destructive" data-testid="sync-blocking-error">
+ <Trans>That did not go through. Check the server logs and try again.</Trans>
+ </p>
+ )}
+
+ <Button
+ size="xs"
+ disabled={busy}
+ onClick={() => void run('commit')}
+ data-testid="sync-blocking-commit"
+ >
+ {pending === 'commit' && <Spinner aria-hidden="true" data-icon="inline-start" />}
+ <Trans>Commit and sync</Trans>
+ </Button>
+
+ {terminalAvailable() && (
+ <Button
+ variant="link-muted"
+ size="xs"
+ className="self-start p-0"
+ disabled={busy}
+ onClick={() => requestTerminalCommand('git-status')}
+ data-testid="sync-blocking-terminal"
+ >
+ <Terminal data-icon="inline-start" />
+ <Trans>Resolve in terminal</Trans>
+ </Button>
+ )}
+ </div>
+ );
+}
diff --git a/packages/app/src/components/SyncStatusBadge.dom.test.tsx b/packages/app/src/components/SyncStatusBadge.dom.test.tsx
index d4a8cd0d4..4f394d7b4 100644
--- a/packages/app/src/components/SyncStatusBadge.dom.test.tsx
+++ b/packages/app/src/components/SyncStatusBadge.dom.test.tsx
@@ -1,8 +1,8 @@
import * as actualLinguiMacro from '@lingui/react/macro';
-import { cleanup, render, screen, waitFor, within } from '@testing-library/react';
+import { act, cleanup, render, screen, waitFor, within } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
-import type { ReactNode } from 'react';
-import { afterEach, describe, expect, test, vi } from 'vitest';
+import { type ReactNode, useEffect, useReducer } from 'react';
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
import { TooltipProvider } from '@/components/ui/tooltip';
import type { GitSyncStatus } from '@/hooks/use-git-sync-status';
import { renderLinguiTemplate } from '@/test-utils/lingui-mock';
@@ -38,14 +38,80 @@ let projectLocalConfig: {
let projectLocalSynced = true;
const patches: unknown[] = [];
+// The real hook polls, so the badge re-renders when the engine's state moves.
+// The mock keeps a force-render handle so a test can advance `status`
+// mid-interaction (see `advanceStatus`) instead of only seeding it before mount.
+let forceStatusRender: (() => void) | null = null;
vi.doMock('@/hooks/use-git-sync-status', () => ({
- useGitSyncStatusDetailed: () => ({ status, fetchError }),
+ useGitSyncStatusDetailed: () => {
+ const [, force] = useReducer((n: number) => n + 1, 0);
+ useEffect(() => {
+ forceStatusRender = force;
+ return () => {
+ forceStatusRender = null;
+ };
+ }, []);
+ return { status, fetchError };
+ },
}));
vi.doMock('@/hooks/use-conflicts', () => ({
useConflicts: () => ({ conflicts: [{ file: 'docs/conflicted.md' }] }),
}));
+type WorktreeTestEntry = {
+ path: string;
+ code: string;
+ syncScoped: boolean;
+ /** Present only for paths the server resolved a navigation target for. */
+ open?: { kind: 'doc'; docName: string } | { kind: 'asset'; path: string };
+};
+
+let worktree: {
+ branch: string | null;
+ detached: boolean;
+ upstream: string | null;
+ staged: WorktreeTestEntry[];
+ notStaged: WorktreeTestEntry[];
+ untracked: WorktreeTestEntry[];
+ incoming: WorktreeTestEntry[];
+ truncated: boolean;
+ readable?: boolean;
+} | null = null;
+
+vi.doMock('@/hooks/use-git-worktree-status', () => ({
+ useGitWorktreeStatus: () => ({ status: worktree, loading: worktree === null }),
+}));
+
+const triggered: string[] = [];
+/** When set, `triggerSync` rejects — the offline / server-down shape. */
+let triggerRejection: Error | null = null;
+vi.doMock('@/lib/trigger-sync', () => ({
+ triggerSync: (op: string) => {
+ triggered.push(op);
+ return triggerRejection ? Promise.reject(triggerRejection) : Promise.resolve();
+ },
+}));
+
+/** Deep-link navigations the popover requested, in order. */
+let settingsNavigations: string[] = [];
+vi.doMock('@/lib/use-settings-route', () => ({
+ openSyncSettings: () => {
+ settingsNavigations.push('sync');
+ },
+}));
+
+const emptyWorktree = {
+ branch: 'main',
+ detached: false,
+ upstream: 'origin/main',
+ staged: [],
+ notStaged: [],
+ untracked: [],
+ incoming: [],
+ truncated: false,
+};
+
vi.doMock('@/lib/config-provider', () => ({
useConfigContext: () => ({
projectLocalConfig,
@@ -83,21 +149,33 @@ async function renderBadge(props: { onSignIn?: () => void } = {}) {
async function openPopover() {
await userEvent.click(screen.getByRole('button', { name: /Sync status:/ }));
await waitFor(() => {
- expect(screen.getByText('Repository')).toBeTruthy();
+ expect(screen.getByTestId('sync-mode-select')).toBeTruthy();
});
}
-describe('SyncStatusBadge helper behavior', () => {
- test('shouldDisableSyncSwitch only blocks before project-local sync or after push denial', async () => {
- const { shouldDisableSyncSwitch } = await import('./SyncStatusBadge');
-
- expect(shouldDisableSyncSwitch(false, 'allowed')).toBe(true);
- expect(shouldDisableSyncSwitch(true, 'denied')).toBe(true);
- expect(shouldDisableSyncSwitch(true, 'allowed')).toBe(false);
- expect(shouldDisableSyncSwitch(true, 'unknown')).toBe(false);
- expect(shouldDisableSyncSwitch(true, undefined)).toBe(false);
+/** Move the engine's reported state the way a poll tick would, mid-test. */
+async function advanceStatus(next: GitSyncStatus): Promise<void> {
+ status = next;
+ await act(async () => {
+ forceStatusRender?.();
});
+}
+
+/**
+ * The spinner inside a manual-action button, or null. Queried by role rather
+ * than class so the assertion survives a styling change; `hidden: true` because
+ * the spinner carries `aria-hidden` (the button already names the state).
+ */
+function spinnerIn(testId: string): HTMLElement | null {
+ return within(screen.getByTestId(testId)).queryByRole('status', { hidden: true });
+}
+/** The mode the Select is currently showing, read off the trigger's text. */
+function selectedMode(): string {
+ return screen.getByTestId('sync-mode-select').textContent ?? '';
+}
+
+describe('SyncStatusBadge helper behavior', () => {
test('formats push-permission denial reasons into actionable copy', async () => {
const { formatPushPermissionDenied } = await import('./SyncStatusBadge');
@@ -337,30 +415,19 @@ describe('SyncStatusBadge helper behavior', () => {
expect(shouldOfferSignInAgain(undefined)).toBe(false);
});
- test('a pull-only toggle stays enabled even when push is denied', async () => {
- const { shouldDisableSyncSwitch } = await import('./SyncStatusBadge');
-
- // Pull-only never pushes, so a denied probe is irrelevant to its toggle.
- expect(shouldDisableSyncSwitch(true, 'denied', 'follow')).toBe(false);
- // Off/full still gate on denial — enabling there reaches push-requiring full sync.
- expect(shouldDisableSyncSwitch(true, 'denied', 'off')).toBe(true);
- expect(shouldDisableSyncSwitch(true, 'denied', 'full')).toBe(true);
- // Cold start (project-local config not yet synced) disables regardless of mode.
- expect(shouldDisableSyncSwitch(false, 'allowed', 'follow')).toBe(true);
- });
-
test('displayState promotes a pull-only idle-with-conflicts project to conflict', async () => {
const { displayState } = await import('./SyncStatusBadge');
expect(
displayState({ ...baseStatus, syncMode: 'follow', state: 'idle', conflictCount: 1 }),
).toBe('conflict');
- // No conflicts, or full sync, leaves the state untouched (full sets 'conflict' itself).
expect(
displayState({ ...baseStatus, syncMode: 'follow', state: 'idle', conflictCount: 0 }),
).toBe('idle');
+ // The unified B1 pull holds every mode idle while ledger conflicts wait,
+ // so the promotion is mode-independent now — full included.
expect(displayState({ ...baseStatus, syncMode: 'full', state: 'idle', conflictCount: 1 })).toBe(
- 'idle',
+ 'conflict',
);
expect(
displayState({ ...baseStatus, syncMode: 'follow', state: 'pulling', conflictCount: 1 }),
@@ -375,11 +442,15 @@ describe('SyncStatusBadge helper behavior', () => {
expect(tooltipLabel({ ...following, state: 'idle', behind: 3 })).toBe('3 behind');
expect(tooltipLabel({ ...following, state: 'pulling' })).toBe('Updating');
expect(tooltipLabel({ ...following, state: 'idle', conflictCount: 2 })).toBe('2 conflicts');
- // Even a following payload that arrives with syncEnabled false is never "Sync off".
expect(tooltipLabel({ ...following, state: 'idle', syncEnabled: false })).toBe('Up to date');
// Full sync is unchanged.
expect(tooltipLabel({ ...baseStatus, state: 'idle' })).toBe('Synced');
- expect(tooltipLabel({ ...baseStatus, state: 'idle', syncEnabled: false })).toBe('Sync off');
+ // `syncEnabled: false` is Manual, a resting mode — it still reports real
+ // state rather than the old "Sync off" dead end.
+ expect(tooltipLabel({ ...baseStatus, state: 'idle', syncEnabled: false })).toBe('Synced');
+ expect(tooltipLabel({ ...baseStatus, state: 'idle', syncEnabled: false, behind: 2 })).toBe(
+ '2 behind',
+ );
});
test('formatPausedReason explains a pull-only divergence in plain language', async () => {
@@ -398,6 +469,9 @@ describe('SyncStatusBadge runtime behavior', () => {
projectLocalConfig = { autoSync: { enabled: false } };
projectLocalSynced = true;
patches.length = 0;
+ worktree = emptyWorktree;
+ triggered.length = 0;
+ triggerRejection = null;
});
test('exports the SyncStatusBadge component', async () => {
@@ -413,16 +487,62 @@ describe('SyncStatusBadge runtime behavior', () => {
expect(screen.queryByRole('button')).toBeNull();
});
- test.each([
- ['disabled without paused reason', { state: 'disabled', pausedReason: undefined }],
- ['dormant without a remote', { state: 'dormant', hasRemote: false }],
- ] as const)('hides %s', async (_label, override) => {
- status = { ...baseStatus, ...override } as GitSyncStatus;
+ test('hides only when there is no git remote', async () => {
+ status = { ...baseStatus, state: 'dormant', hasRemote: false } as GitSyncStatus;
await renderBadge();
expect(screen.queryByRole('button')).toBeNull();
});
+ test('Manual never renders as a fault — no warning glyph, no "disabled" copy', async () => {
+ // The engine reports `disabled` whenever no automation is scheduled, which
+ // is exactly Manual's resting state. Rendering that as a warning sends the
+ // user hunting for a problem that does not exist.
+ status = {
+ ...baseStatus,
+ state: 'disabled',
+ syncEnabled: false,
+ syncMode: 'off',
+ pausedReason: undefined,
+ } as GitSyncStatus;
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ await renderBadge();
+
+ expect(screen.getByRole('button', { name: 'Sync status: Manual' })).toBeTruthy();
+ expect(screen.queryByRole('button', { name: /disabled/i })).toBeNull();
+ });
+
+ test('an auto-disable still reads as a fault — pausedReason is the discriminator', async () => {
+ status = {
+ ...baseStatus,
+ state: 'disabled',
+ syncEnabled: false,
+ syncMode: 'full',
+ pausedReason: 'protected-branch',
+ } as GitSyncStatus;
+ projectLocalConfig = { autoSync: { mode: 'full' } };
+ await renderBadge();
+
+ expect(screen.getByRole('button', { name: 'Sync status: Sync paused' })).toBeTruthy();
+ });
+
+ test('a manual (mode off) project stays visible — Manual is a resting mode, not an opt-out', async () => {
+ // Pre-rewrite this payload hid the badge, which stranded the user in
+ // Settings to reach a Pull button. Manual owns the manual actions, so the
+ // badge has to be reachable.
+ status = {
+ ...baseStatus,
+ state: 'disabled',
+ syncEnabled: false,
+ syncMode: 'off',
+ pausedReason: undefined,
+ } as GitSyncStatus;
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ await renderBadge();
+
+ expect(screen.getByRole('button', { name: /Sync status:/ })).toBeTruthy();
+ });
+
test.each([
['auth-error', { state: 'auth-error', syncEnabled: true }],
['conflict', { state: 'conflict', conflictCount: 2, syncEnabled: true }],
@@ -470,42 +590,188 @@ describe('SyncStatusBadge runtime behavior', () => {
expect(screen.getByText('Protected branch — cannot push')).toBeTruthy();
});
- test('popover switch is on (Pause sync) when a mode is active', async () => {
+ test('the mode selector reflects the resolved local mode', async () => {
status = { ...baseStatus, state: 'idle', syncEnabled: false };
projectLocalConfig = { autoSync: { enabled: true } };
await renderBadge();
await openPopover();
- const toggle = screen.getByRole('switch', { name: 'Pause sync' });
- expect(toggle.getAttribute('aria-checked')).toBe('true');
+ // Legacy `enabled: true` resolves to full.
+ expect(selectedMode()).toContain('Auto (Pull and Push)');
+ });
+
+ test('a never-answered project rests in Manual', async () => {
+ status = { ...baseStatus, state: 'idle', syncEnabled: false };
+ projectLocalConfig = { autoSync: {} };
+ await renderBadge();
+ await openPopover();
+
+ expect(selectedMode()).toContain('Manual');
+ expect(screen.getByTestId('sync-popover-mode-line').textContent).toContain(
+ 'Nothing moves until you ask',
+ );
});
- test('popover switch is disabled until the project-local config has synced', async () => {
+ test('mode selector is disabled until the project-local config has synced', async () => {
status = { ...baseStatus, state: 'idle', syncEnabled: false };
projectLocalConfig = { autoSync: { enabled: false } };
projectLocalSynced = false;
await renderBadge();
await openPopover();
- const toggle = screen.getByRole('switch', { name: 'Resume sync' }) as HTMLButtonElement;
- expect(toggle.disabled).toBe(true);
+ expect((screen.getByTestId('sync-mode-select') as HTMLButtonElement).disabled).toBe(true);
});
- test('resuming from off opens confirmation before patching (defaults to full)', async () => {
+ test('choosing an auto mode confirms before patching; Manual applies immediately', async () => {
status = { ...baseStatus, state: 'idle', syncEnabled: false };
- projectLocalConfig = { autoSync: { enabled: false } };
+ projectLocalConfig = { autoSync: { mode: 'off' } };
await renderBadge();
await openPopover();
- await userEvent.click(screen.getByRole('switch', { name: 'Resume sync' }));
+ // Entering a pushing mode crosses a consent boundary — nothing is written
+ // until the dialog is confirmed.
+ await userEvent.click(screen.getByTestId('sync-mode-select'));
+ await userEvent.click(screen.getByRole('option', { name: 'Auto (Pull and Push)' }));
expect(patches).toEqual([]);
- // Resuming a never-enabled project defaults to full sync (which pushes), so
- // it confirms; the write clears the resume memory.
- await userEvent.click(screen.getByRole('button', { name: 'Enable auto-sync' }));
+ await userEvent.click(screen.getByRole('button', { name: 'Enable Auto (Pull and Push)' }));
expect(patches).toEqual([{ autoSync: { mode: 'full', enabled: null, resumeMode: null } }]);
});
+ test('returning to Manual writes straight through — standing sync down never pushes', async () => {
+ status = { ...baseStatus, state: 'idle' };
+ projectLocalConfig = { autoSync: { mode: 'full' } };
+ await renderBadge();
+ await openPopover();
+
+ await userEvent.click(screen.getByTestId('sync-mode-select'));
+ await userEvent.click(screen.getByRole('option', { name: 'Manual' }));
+
+ expect(patches).toEqual([{ autoSync: { mode: 'off', enabled: null, resumeMode: null } }]);
+ });
+
+ test('conflicts gate Push but never Pull', async () => {
+ // The overlay pull runs WITH ledger conflicts (it re-pins them against the
+ // new tip); only pushing waits for the resolver. Disabling Pull would
+ // leave a Manual project with one conflicted doc unable to receive
+ // anything.
+ status = { ...baseStatus, state: 'idle', conflictCount: 1 };
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ await renderBadge();
+ await openPopover();
+
+ expect((screen.getByTestId('sync-popover-pull') as HTMLButtonElement).disabled).toBe(false);
+ expect((screen.getByTestId('sync-popover-push') as HTMLButtonElement).disabled).toBe(true);
+ expect((screen.getByTestId('sync-popover-sync') as HTMLButtonElement).disabled).toBe(true);
+ });
+
+ test('a real merge conflict blocks Pull, unlike a ledger conflict', async () => {
+ // The companion above covers the LEDGER case (engine idle, conflictCount>0)
+ // where Pull must stay live. This is the other one: `state: 'conflict'` is a
+ // real MERGE_HEAD, and `runOneShotPull` refuses it because git cannot merge
+ // into an unresolved merge — so a live button would be a silent no-op.
+ //
+ // The two are easy to conflate because `displayState` promotes the ledger
+ // case to 'conflict' for rendering; the gate has to read `status.state` to
+ // keep them apart, and this pair is what proves it does.
+ status = { ...baseStatus, state: 'conflict', conflictCount: 1 };
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ await renderBadge();
+ await openPopover();
+
+ expect((screen.getByTestId('sync-popover-pull') as HTMLButtonElement).disabled).toBe(true);
+ expect((screen.getByTestId('sync-popover-push') as HTMLButtonElement).disabled).toBe(true);
+ });
+
+ test('manual actions dispatch the matching one-shot op', async () => {
+ status = { ...baseStatus, state: 'idle' };
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ await renderBadge();
+ await openPopover();
+
+ await userEvent.click(screen.getByTestId('sync-popover-pull'));
+ await userEvent.click(screen.getByTestId('sync-popover-push'));
+ await userEvent.click(screen.getByTestId('sync-popover-sync'));
+
+ expect(triggered).toEqual(['pull', 'push', 'sync']);
+ });
+
+ test('the in-flight spinner lands on the action the user clicked', async () => {
+ // The shared `busy` flag is direction-blind: parking the only spinner on
+ // Pull and Push made a plain Pull light up the one button that was not
+ // running.
+ status = { ...baseStatus, state: 'idle' };
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ await renderBadge();
+ await openPopover();
+
+ await userEvent.click(screen.getByTestId('sync-popover-pull'));
+ await advanceStatus({ ...baseStatus, state: 'pulling' });
+
+ expect(spinnerIn('sync-popover-pull')).not.toBeNull();
+ expect(spinnerIn('sync-popover-sync')).toBeNull();
+ expect(spinnerIn('sync-popover-push')).toBeNull();
+
+ // Attribution is released with the cycle, so the next automation tick is
+ // free to spin whichever direction it actually runs.
+ await advanceStatus({ ...baseStatus, state: 'idle' });
+ expect(spinnerIn('sync-popover-pull')).toBeNull();
+
+ // Same contract in the other direction: a manual Push owns the spinner
+ // even though the engine reports the same direction-blind `busy`.
+ await userEvent.click(screen.getByTestId('sync-popover-push'));
+ await advanceStatus({ ...baseStatus, state: 'pushing' });
+
+ expect(spinnerIn('sync-popover-push')).not.toBeNull();
+ expect(spinnerIn('sync-popover-sync')).toBeNull();
+ expect(spinnerIn('sync-popover-pull')).toBeNull();
+ });
+
+ test('a trigger that never reaches the engine does not misattribute the next cycle', async () => {
+ // The clear-on-idle effect keys off `busy`, and a failed trigger starts no
+ // cycle — so `busy` never flips and the effect never fires. Left alone, the
+ // dead attribution outlives the click and lights the button the user
+ // pressed while an entirely different (probably automatic) cycle runs.
+ const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+ try {
+ status = { ...baseStatus, state: 'idle' };
+ projectLocalConfig = { autoSync: { mode: 'full' } };
+ await renderBadge();
+ await openPopover();
+
+ triggerRejection = new Error('offline');
+ await userEvent.click(screen.getByTestId('sync-popover-pull'));
+ await waitFor(() => expect(warn).toHaveBeenCalled());
+ triggerRejection = null;
+
+ // Nothing ran, so nothing spins.
+ expect(spinnerIn('sync-popover-pull')).toBeNull();
+
+ // Now an automatic push cycle starts. It must own the spinner.
+ await advanceStatus({ ...baseStatus, state: 'pushing' });
+ expect(spinnerIn('sync-popover-push')).not.toBeNull();
+ expect(spinnerIn('sync-popover-pull')).toBeNull();
+ } finally {
+ warn.mockRestore();
+ }
+ });
+
+ test.each([
+ ['pulling', 'pulling', 'sync-popover-pull'],
+ ['fetching', 'fetching', 'sync-popover-pull'],
+ ['pushing', 'pushing', 'sync-popover-push'],
+ ] as const)('an automation-driven %s cycle spins the matching direction, never Pull and Push', async (_label, state, expectedTestId) => {
+ // No click to attribute, so the engine's own direction decides — claiming
+ // a manual action the user never took would be the same lie in reverse.
+ status = { ...baseStatus, state } as GitSyncStatus;
+ projectLocalConfig = { autoSync: { mode: 'full' } };
+ await renderBadge();
+ await openPopover();
+
+ expect(spinnerIn(expectedTestId)).not.toBeNull();
+ expect(spinnerIn('sync-popover-sync')).toBeNull();
+ });
+
test.each([
['idle', { state: 'idle' }, 'Sync status: Up to date'],
['pulling', { state: 'pulling' }, 'Sync status: Updating'],
@@ -548,19 +814,37 @@ describe('SyncStatusBadge runtime behavior', () => {
expect(screen.getByRole('button', { name: /Sync status:/ })).toBeTruthy();
});
- test('following popover shows the follow state, not "sync off", with a Sync action', async () => {
+ test('Follow still offers all three manual actions — the mode governs automation, not the user', async () => {
status = { ...baseStatus, syncMode: 'follow', state: 'idle' } as GitSyncStatus;
projectLocalConfig = { autoSync: { mode: 'follow' } };
await renderBadge();
await openPopover();
- const toggle = screen.getByRole('switch', { name: 'Pause sync' });
- expect(toggle.getAttribute('aria-checked')).toBe('true');
- expect(screen.queryByText(/Sync is off/)).toBeNull();
- expect(screen.getByRole('button', { name: 'Sync' })).toBeTruthy();
+ expect(selectedMode()).toContain('Auto (Pull only)');
+ // Auto pull-only describes what runs on a timer. An explicit press is the
+ // user acting for themselves, so every action stays reachable.
+ expect(screen.getByTestId('sync-popover-pull')).toBeTruthy();
+ expect(screen.getByTestId('sync-popover-push')).toBeTruthy();
+ expect(screen.getByTestId('sync-popover-sync')).toBeTruthy();
});
- test('following popover keeps the Switch reachable when push is denied', async () => {
+ test('a read-only collaborator is the one case that loses the push actions', async () => {
+ // Not a consent rule — the remote would 403, so the button would be a lie.
+ status = {
+ ...baseStatus,
+ state: 'idle',
+ pushPermission: { checkStatus: 'denied', deniedReason: 'no-collaborator' },
+ } as GitSyncStatus;
+ projectLocalConfig = { autoSync: { mode: 'follow' } };
+ await renderBadge();
+ await openPopover();
+
+ expect(screen.getByTestId('sync-popover-pull')).toBeTruthy();
+ expect(screen.queryByTestId('sync-popover-push')).toBeNull();
+ expect(screen.queryByTestId('sync-popover-sync')).toBeNull();
+ });
+
+ test('following popover keeps the mode selector usable when push is denied', async () => {
status = {
...baseStatus,
syncMode: 'follow',
@@ -571,8 +855,7 @@ describe('SyncStatusBadge runtime behavior', () => {
await renderBadge();
await openPopover();
- const toggle = screen.getByRole('switch', { name: 'Pause sync' }) as HTMLButtonElement;
- expect(toggle.disabled).toBe(false);
+ expect((screen.getByTestId('sync-mode-select') as HTMLButtonElement).disabled).toBe(false);
});
test('following popover states the mode instead of the push-permission verdict', async () => {
@@ -586,10 +869,50 @@ describe('SyncStatusBadge runtime behavior', () => {
await renderBadge();
await openPopover();
- expect(screen.getByTestId('sync-popover-mode-line').textContent).toContain('Follow');
+ expect(screen.getByTestId('sync-popover-mode-line').textContent).toContain(
+ 'Updates flow in from your remote',
+ );
expect(screen.queryByText(/don't have permission to push/)).toBeNull();
- // A genuine read-only user cannot choose Full, so the mode toggle is hidden.
- expect(screen.queryByTestId('sync-popover-mode-toggle')).toBeNull();
+ });
+
+ test('a read-only collaborator on full can still see which mode the project is in', async () => {
+ // Radix fills the trigger by portaling the SELECTED item's text into it, so
+ // omitting the `full` item for a project already on `full` left the trigger
+ // blank — and `aria-label` overrides content for the accessible name, so the
+ // mode was neither visible nor announced on the one control that decides
+ // whether edits leave this machine.
+ status = {
+ ...baseStatus,
+ syncMode: 'full',
+ state: 'idle',
+ pushPermission: { checkStatus: 'denied', deniedReason: 'no-collaborator' },
+ } as GitSyncStatus;
+ projectLocalConfig = { autoSync: { mode: 'full' } };
+ await renderBadge();
+ await openPopover();
+
+ expect(selectedMode()).toContain('Auto (Pull and Push)');
+ });
+
+ test('a genuine read-only collaborator cannot choose a pushing mode', async () => {
+ status = {
+ ...baseStatus,
+ syncMode: 'follow',
+ state: 'idle',
+ pushPermission: { checkStatus: 'denied', deniedReason: 'no-collaborator' },
+ } as GitSyncStatus;
+ projectLocalConfig = { autoSync: { mode: 'follow' } };
+ await renderBadge();
+ await openPopover();
+
+ await userEvent.click(screen.getByTestId('sync-mode-select'));
+ expect(screen.getByRole('option', { name: 'Manual' })).toBeTruthy();
+ expect(screen.getByRole('option', { name: 'Auto (Pull only)' })).toBeTruthy();
+ // Rendered but disabled, not omitted: selecting a mode the server will
+ // refuse must stay impossible, while a project already ON that mode still
+ // has to be able to read its own state off the trigger.
+ const pushing = screen.getByRole('option', { name: 'Auto (Pull and Push)' });
+ expect(pushing.getAttribute('aria-disabled')).toBe('true');
});
test('pull-only popover suppresses the signed-out reconnect line (push-framed)', async () => {
@@ -643,11 +966,14 @@ describe('SyncStatusBadge runtime behavior', () => {
await openPopover();
expect(screen.getByText(/signed out — sign in to resume syncing/)).toBeTruthy();
- // "Reconnect required" is the popover header here, and correctly so — a
- // signed-out denial IS reconnect-fixable. What must not appear is a
- // SECOND copy from the paused-reason arm, which would mean that arm won
- // the chain and the reconnect affordance was dropped.
- expect(screen.getAllByText('Reconnect required')).toHaveLength(1);
+ // "Reconnect required" is the trigger's accessible name here, and correctly
+ // so — a signed-out denial IS reconnect-fixable. What must not appear is a
+ // visible copy from the paused-reason arm, which would mean that arm won
+ // the chain and the reconnect affordance was dropped. (The redesigned
+ // popover has no state-label header, so the arm's copy is the only possible
+ // visible occurrence.)
+ expect(screen.getByRole('button', { name: 'Sync status: Reconnect required' })).toBeTruthy();
+ expect(screen.queryByText('Reconnect required')).toBeNull();
// The live region carries status text only — the Sign in row renders
// outside it, so a text change never re-announces a button label.
expect(within(screen.getByRole('status')).queryByRole('button')).toBeNull();
@@ -703,15 +1029,15 @@ describe('SyncStatusBadge runtime behavior', () => {
pausedReason: 'auth-error',
pushErrorCode: 'auth-not-found-as-identity',
};
- await renderBadge();
+ await renderBadge({ onSignIn: () => {} });
await openPopover();
expect(screen.getByText(/Repository not found — it may not exist/)).toBeTruthy();
expect(screen.queryByRole('button', { name: 'Sign in' })).toBeNull();
expect(screen.queryByText('Reconnect required')).toBeNull();
- // The header names the symptom instead.
- expect(screen.getAllByText('Repository not found').length).toBeGreaterThan(0);
// The accessible name reads the same derivation as the visible surfaces —
+ // the redesigned popover has no state-label header, so the trigger's name
+ // below is the surface that names the symptom —
// a screen reader must not hear the reconnect prescription the popover
// withdrew (queryByText matches text content, never aria-label, so only
// a role+name query can pin this).
@@ -743,7 +1069,10 @@ describe('SyncStatusBadge runtime behavior', () => {
// collaborator verdict — so the Mode chooser stays available here, the
// same call Settings makes for the identical status object. Two surfaces,
// one status, one answer.
- expect(screen.getByTestId('sync-popover-mode-toggle')).toBeTruthy();
+ // The redesign's mode control is a Select, not the old Full/Follow toggle —
+ // same intent: a failure that says nothing about push rights must not
+ // revoke the mode control.
+ expect(screen.getByTestId('sync-mode-select')).toBeTruthy();
expect(screen.getByText('Authenticated as bob.')).toBeTruthy();
expect(screen.queryByRole('button', { name: 'Sign in' })).toBeNull();
// Only the identity tail rides along — the denial's REASON sentence
@@ -783,16 +1112,17 @@ describe('SyncStatusBadge runtime behavior', () => {
pausedReason: 'auth-error',
pushErrorCode: 'auth-401',
};
- await renderBadge();
+ await renderBadge({ onSignIn: () => {} });
await openPopover();
expect(screen.getByRole('button', { name: 'Sign in' })).toBeTruthy();
expect(screen.getAllByText('Reconnect required').length).toBeGreaterThan(0);
});
- test('a paused (was-enabled) project stays visible and shows the paused popover', async () => {
- // Engine reports a paused project as disabled; the config (resumeMode set)
- // keeps the badge visible and drives the paused rendering.
+ test('a config left over from the old paused state reads as Manual', async () => {
+ // `resumeMode` was the pre-rewrite memory of what to resume into. Manual
+ // owns the actions now, so the key is inert — the project must simply read
+ // as Manual rather than as a paused dead end.
status = {
...baseStatus,
state: 'disabled',
@@ -802,22 +1132,14 @@ describe('SyncStatusBadge runtime behavior', () => {
} as GitSyncStatus;
projectLocalConfig = { autoSync: { mode: 'off', resumeMode: 'full' } };
await renderBadge();
-
- // Not hidden (the disabled-hide rule exempts a paused project).
- expect(screen.getByRole('button', { name: 'Sync status: Sync paused' })).toBeTruthy();
await openPopover();
- expect(screen.getByTestId('sync-popover-paused-line')).toBeTruthy();
- // Switch is off (resume), and a manual Sync is still offered (ever enabled).
- expect(screen.getByRole('switch', { name: 'Resume sync' }).getAttribute('aria-checked')).toBe(
- 'false',
- );
- expect(screen.getByRole('button', { name: 'Sync' })).toBeTruthy();
- // The mode is still editable while paused (push-capable user).
- expect(screen.getByTestId('sync-popover-mode-toggle')).toBeTruthy();
+ expect(selectedMode()).toContain('Manual');
+ expect(screen.getByTestId('sync-popover-pull')).toBeTruthy();
+ expect(screen.getByTestId('sync-popover-push')).toBeTruthy();
});
- test('changing the mode while paused only updates the resume memory (no sync)', async () => {
+ test('leaving Manual clears a stale resumeMode rather than carrying it forward', async () => {
status = {
...baseStatus,
state: 'disabled',
@@ -828,17 +1150,51 @@ describe('SyncStatusBadge runtime behavior', () => {
await renderBadge();
await openPopover();
- // Flip Full → Follow while paused: writes resumeMode only, mode stays off,
- // no confirmation (nothing syncs until the Switch is turned on).
- await userEvent.click(screen.getByTestId('sync-popover-mode-follow'));
- expect(patches).toEqual([{ autoSync: { resumeMode: 'follow' } }]);
+ await userEvent.click(screen.getByTestId('sync-mode-select'));
+ await userEvent.click(screen.getByRole('option', { name: 'Auto (Pull only)' }));
+ // The follow variant of the confirm dialog carries its own label.
+ await userEvent.click(screen.getByRole('button', { name: 'Enable Auto (Pull only)' }));
+
+ expect(patches).toEqual([{ autoSync: { mode: 'follow', enabled: null, resumeMode: null } }]);
});
- test('the manual Sync action is hidden for a never-enabled project', async () => {
- // Off with no resume memory = never enabled → no manual Sync affordance.
+ test('a pre-merge overlap gets the resolution panel, not the paused sentence', async () => {
+ // Every other paused reason is something the user cannot act on from here.
+ // This one they can, so it is the one that gets buttons.
status = {
...baseStatus,
- state: 'dormant',
+ state: 'idle',
+ pausedReason: 'external-changes-pending',
+ blockingPaths: ['.claude/launch.json', '.vscode/settings.json'],
+ } as GitSyncStatus;
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ await renderBadge();
+ await openPopover();
+
+ expect(screen.getByTestId('sync-blocking-commit')).toBeTruthy();
+ expect(screen.queryByTestId('sync-blocking-discard')).toBeNull();
+ expect(screen.getByText('.claude/launch.json')).toBeTruthy();
+ });
+
+ test('a paused reason with no actionable paths keeps the explanatory line', async () => {
+ status = {
+ ...baseStatus,
+ state: 'idle',
+ pausedReason: 'diverged-local-commits',
+ } as GitSyncStatus;
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ await renderBadge();
+ await openPopover();
+
+ expect(screen.queryByTestId('sync-blocking-commit')).toBeNull();
+ });
+
+ test('the manual actions are offered to a never-enabled project', async () => {
+ // Pre-rewrite this project got no manual affordance at all. Manual mode is
+ // exactly the case where the buttons have to be there.
+ status = {
+ ...baseStatus,
+ state: 'idle',
syncMode: 'off',
syncEnabled: false,
} as GitSyncStatus;
@@ -846,6 +1202,476 @@ describe('SyncStatusBadge runtime behavior', () => {
await renderBadge();
await openPopover();
- expect(screen.queryByRole('button', { name: 'Sync' })).toBeNull();
+ expect(screen.getByTestId('sync-popover-pull')).toBeTruthy();
+ expect(screen.getByTestId('sync-popover-push')).toBeTruthy();
+ expect(screen.getByTestId('sync-popover-sync')).toBeTruthy();
+ });
+});
+
+describe('SyncStatusBadge working-tree listing', () => {
+ afterEach(() => {
+ cleanup();
+ status = null;
+ projectLocalConfig = { autoSync: { enabled: false } };
+ projectLocalSynced = true;
+ patches.length = 0;
+ worktree = emptyWorktree;
+ triggered.length = 0;
+ triggerRejection = null;
+ });
+
+ test("groups by what Push will do, not by git's index state", async () => {
+ // OK stages into a throwaway index and commits the working tree, so a file
+ // git calls "not staged" is still pushed. Grouping on git's split would
+ // tell the user the opposite of what the button does.
+ status = { ...baseStatus, state: 'idle', ahead: 1, behind: 2 };
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ worktree = {
+ ...emptyWorktree,
+ staged: [{ path: 'docs/sync.mdx', code: 'M', syncScoped: true }],
+ notStaged: [{ path: 'src/git/status.ts', code: 'M', syncScoped: false }],
+ untracked: [{ path: 'notes/cadence-draft.md', code: '?', syncScoped: true }],
+ };
+ await renderBadge();
+ await openPopover();
+
+ // Tense-free and mode-independent: only `full` pushes on its own, so a
+ // "will be pushed" heading would overstate it in Manual and Follow.
+ expect(screen.getByText('Push includes')).toBeTruthy();
+ expect(screen.getByText('Push skips')).toBeTruthy();
+ // git's own vocabulary is gone from the UI.
+ expect(screen.queryByText('Staged')).toBeNull();
+ expect(screen.queryByText('Not staged')).toBeNull();
+
+ // An unstaged in-scope edit and an untracked in-scope file both ship.
+ expect(screen.getByText('docs/sync.mdx')).toBeTruthy();
+ expect(screen.getByText('notes/cadence-draft.md')).toBeTruthy();
+ // Out-of-scope lands in the other group with its explanation.
+ expect(screen.getByText('src/git/status.ts')).toBeTruthy();
+ expect(screen.getByText(/Outside what Open Knowledge commits/)).toBeTruthy();
+
+ // Divergence comes from the engine payload, not the worktree read.
+ expect(screen.getByText('2 behind')).toBeTruthy();
+ expect(screen.getByText('1 ahead')).toBeTruthy();
+ expect(screen.getByText('main → origin/main')).toBeTruthy();
+ });
+
+ test('a row opens what the sidebar would: docs to the doc route, the rest to the asset viewer', async () => {
+ status = { ...baseStatus, state: 'idle' };
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ worktree = {
+ ...emptyWorktree,
+ notStaged: [
+ {
+ path: 'notes/cadence.md',
+ code: 'M',
+ syncScoped: true,
+ open: { kind: 'doc', docName: 'notes/cadence' },
+ },
+ {
+ path: 'opencode.json',
+ code: 'M',
+ syncScoped: true,
+ open: { kind: 'asset', path: 'opencode.json' },
+ },
+ // No target: a deletion opens on nothing, so it stays plain text.
+ { path: 'notes/gone.md', code: 'D', syncScoped: true },
+ ],
+ };
+ await renderBadge();
+ await openPopover();
+
+ await userEvent.click(screen.getByRole('button', { name: 'opencode.json' }));
+ expect(window.location.hash).toBe('#/__asset__/opencode.json');
+
+ await openPopover();
+ expect(screen.queryByRole('button', { name: 'notes/gone.md' })).toBeNull();
+ expect(screen.getByText('notes/gone.md')).toBeTruthy();
+
+ // Layout is the actual contract and jsdom computes none, so the guard is
+ // the one class that decides it: the Button base ships `shrink-0`, and a
+ // row that keeps it grows to the length of its path and spills out of the
+ // popover instead of ellipsing.
+ // Token-wise, not substring: the base also carries a `[&_svg]:shrink-0`
+ // that a `.includes` would match.
+ const rowClasses = screen.getAllByTestId('worktree-row-open')[0].className.split(' ');
+ expect(rowClasses).toContain('shrink');
+ expect(rowClasses).not.toContain('shrink-0');
+
+ await userEvent.click(screen.getByRole('button', { name: 'notes/cadence.md' }));
+
+ expect(window.location.hash).toBe('#/notes/cadence');
+ // The popover overlays the editor, so it closes rather than hiding the
+ // document the click just asked for.
+ await waitFor(() => {
+ expect(screen.queryByTestId('sync-mode-select')).toBeNull();
+ });
+ });
+
+ test('clickability follows the document, not the group the row landed in', async () => {
+ // `docName` is orthogonal to `syncScoped`: a gitignored note is openable
+ // but never pushed, and an incoming row is openable whenever the file
+ // already exists locally. Neither group gets to gate navigation.
+ status = { ...baseStatus, state: 'idle' };
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ worktree = {
+ ...emptyWorktree,
+ notStaged: [
+ {
+ path: 'notes/private.md',
+ code: 'M',
+ syncScoped: false,
+ open: { kind: 'doc', docName: 'notes/private' },
+ },
+ ],
+ incoming: [
+ {
+ path: 'notes/from-remote.md',
+ code: 'M',
+ syncScoped: true,
+ open: { kind: 'doc', docName: 'notes/from-remote' },
+ },
+ ],
+ };
+ await renderBadge();
+ await openPopover();
+
+ expect(screen.getByText('Push skips')).toBeTruthy();
+ expect(screen.getByRole('button', { name: 'notes/private.md' })).toBeTruthy();
+ expect(screen.getByRole('button', { name: 'notes/from-remote.md' })).toBeTruthy();
+ });
+
+ test('an all-in-scope listing never shows the skipped group', async () => {
+ status = { ...baseStatus, state: 'idle' };
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ worktree = {
+ ...emptyWorktree,
+ notStaged: [{ path: 'docs/sync.mdx', code: 'M', syncScoped: true }],
+ };
+ await renderBadge();
+ await openPopover();
+
+ expect(screen.getByText('Push includes')).toBeTruthy();
+ expect(screen.queryByText('Push skips')).toBeNull();
+ expect(screen.queryByText(/Outside what Open Knowledge commits/)).toBeNull();
+ });
+
+ test('a path dirty in both columns renders once, keeping the index letter', async () => {
+ status = { ...baseStatus, state: 'idle' };
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ worktree = {
+ ...emptyWorktree,
+ staged: [{ path: 'docs/sync.mdx', code: 'A', syncScoped: true }],
+ notStaged: [{ path: 'docs/sync.mdx', code: 'M', syncScoped: true }],
+ };
+ await renderBadge();
+ await openPopover();
+
+ expect(screen.getAllByText('docs/sync.mdx')).toHaveLength(1);
+ // 'A' (staged add) is more specific than the worktree's 'M'.
+ expect(screen.getByText('A')).toBeTruthy();
+ });
+
+ test('a tree that could not be read never claims to be clean', async () => {
+ // Regression: a failed `git status` returned all-empty lists, which the
+ // renderer could not tell apart from a genuinely clean tree — so the panel
+ // asserted "Nothing to commit, working tree clean" about data it had not
+ // read, at the moment the user is deciding whether to reset or switch
+ // machines.
+ status = { ...baseStatus, state: 'idle' };
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ worktree = { ...emptyWorktree, readable: false };
+ await renderBadge();
+ await openPopover();
+
+ expect(screen.queryByText(/working tree clean/)).toBeNull();
+ expect(screen.getByTestId('worktree-unreadable')).toBeTruthy();
+ });
+
+ test('a clean tree says so instead of rendering empty groups', async () => {
+ status = { ...baseStatus, state: 'idle' };
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ worktree = emptyWorktree;
+ await renderBadge();
+ await openPopover();
+
+ expect(screen.getByText(/working tree clean/)).toBeTruthy();
+ expect(screen.queryByText('Staged')).toBeNull();
+ });
+
+ test('a truncated listing says files are missing rather than implying completeness', async () => {
+ status = { ...baseStatus, state: 'idle' };
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ worktree = {
+ ...emptyWorktree,
+ untracked: [{ path: 'a.md', code: '?', syncScoped: true }],
+ truncated: true,
+ };
+ await renderBadge();
+ await openPopover();
+
+ expect(screen.getByText(/too many changes/)).toBeTruthy();
+ });
+
+ test('shows what a pull would bring in, above what a push would send', async () => {
+ // The incoming half is the one the user did not author, so it leads.
+ status = { ...baseStatus, state: 'idle', behind: 1 };
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ worktree = {
+ ...emptyWorktree,
+ incoming: [{ path: 'notes/from-teammate.md', code: 'A', syncScoped: true }],
+ notStaged: [{ path: 'notes/mine.md', code: 'M', syncScoped: true }],
+ };
+ await renderBadge();
+ await openPopover();
+
+ expect(screen.getByText('Pull brings in')).toBeTruthy();
+ expect(screen.getByText('notes/from-teammate.md')).toBeTruthy();
+ expect(screen.getByText('Push includes')).toBeTruthy();
+ expect(screen.getByText('notes/mine.md')).toBeTruthy();
+ });
+
+ test('an up-to-date remote shows no incoming group', async () => {
+ status = { ...baseStatus, state: 'idle' };
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ worktree = {
+ ...emptyWorktree,
+ notStaged: [{ path: 'notes/mine.md', code: 'M', syncScoped: true }],
+ };
+ await renderBadge();
+ await openPopover();
+
+ expect(screen.queryByText('Pull brings in')).toBeNull();
+ });
+
+ test('incoming-only is not a clean tree', async () => {
+ // Nothing local has changed, but there IS something to report — saying
+ // "working tree clean" here would hide the whole reason to open the panel.
+ status = { ...baseStatus, state: 'idle', behind: 2 };
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ worktree = {
+ ...emptyWorktree,
+ incoming: [{ path: 'notes/from-teammate.md', code: 'M', syncScoped: true }],
+ };
+ await renderBadge();
+ await openPopover();
+
+ expect(screen.queryByText(/working tree clean/)).toBeNull();
+ expect(screen.getByText('Pull brings in')).toBeTruthy();
+ });
+
+ test('"Updated" tracks the last sync RUN, not the last content change', async () => {
+ // A Pull against an already-current repo changes nothing, so `lastSyncUtc`
+ // stays put. Showing that reads as "the button did nothing" to the user who
+ // just pressed it. `lastRunUtc` advances whenever an op completes.
+ status = {
+ ...baseStatus,
+ state: 'idle',
+ lastSyncUtc: new Date(Date.now() - 18 * 3_600_000).toISOString(),
+ lastRunUtc: new Date().toISOString(),
+ };
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ await renderBadge();
+ await openPopover();
+
+ const line = screen.getByTestId('sync-popover-last-sync').textContent ?? '';
+ expect(line).toContain('Updated');
+ expect(line).toContain('now');
+ });
+
+ test('never sources "Updated" from the fetch time', async () => {
+ // `lastFetchUtc` advances on the panel-open fetch. Falling back to it would
+ // make the line read "just now" every time the user opened the popover,
+ // claiming a sync that never ran — the exact bug this chain must not have.
+ status = {
+ ...baseStatus,
+ state: 'idle',
+ lastRunUtc: null,
+ lastFetchUtc: new Date().toISOString(),
+ lastSyncUtc: new Date(Date.now() - 18 * 3_600_000).toISOString(),
+ };
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ await renderBadge();
+ await openPopover();
+
+ const line = screen.getByTestId('sync-popover-last-sync').textContent ?? '';
+ expect(line).toContain('18h');
+ expect(line).not.toContain('now');
+ });
+
+ test('hides the line entirely when nothing has ever synced', async () => {
+ // "Updated never" is noise on a project that simply has not run yet.
+ status = {
+ ...baseStatus,
+ state: 'idle',
+ lastRunUtc: null,
+ lastFetchUtc: new Date().toISOString(),
+ lastSyncUtc: null,
+ };
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ await renderBadge();
+ await openPopover();
+
+ expect(screen.queryByTestId('sync-popover-last-sync')).toBeNull();
+ });
+
+ test('a detached HEAD is named rather than rendered as a branch', async () => {
+ status = { ...baseStatus, state: 'idle' };
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ worktree = { ...emptyWorktree, branch: null, detached: true, upstream: null };
+ await renderBadge();
+ await openPopover();
+
+ expect(screen.getByText('detached HEAD')).toBeTruthy();
+ });
+});
+
+describe('SyncStatusBadge settings affordance', () => {
+ beforeEach(() => {
+ settingsNavigations = [];
+ status = { ...baseStatus, lastRunUtc: new Date().toISOString() } as GitSyncStatus;
+ projectLocalConfig = { autoSync: { mode: 'full' } };
+ });
+
+ afterEach(() => {
+ cleanup();
+ status = null;
+ projectLocalConfig = { autoSync: { enabled: false } };
+ });
+
+ test('the popover offers a way into the Sync settings section', async () => {
+ // The popover deliberately hosts only the mid-edit controls; without this
+ // pointer the committed shared default and the cycle cadence are reachable
+ // only by knowing the header gear exists.
+ await renderBadge();
+ await openPopover();
+
+ await userEvent.click(screen.getByTestId('sync-popover-settings'));
+
+ expect(settingsNavigations).toEqual(['sync']);
+ });
+
+ test('choosing Settings closes the popover', async () => {
+ // Settings opens as a dialog over the editor; a popover left open would sit
+ // on top of it.
+ await renderBadge();
+ await openPopover();
+
+ await userEvent.click(screen.getByTestId('sync-popover-settings'));
+
+ await waitFor(() => {
+ expect(screen.queryByTestId('sync-mode-select')).toBeNull();
+ });
+ });
+
+ test('the settings link is present before the first cycle, when no freshness line is', async () => {
+ // The footer row pairs the two; an implementation that hung the link off
+ // the freshness line would hide it on a project that has never synced.
+ status = { ...baseStatus, lastRunUtc: null, lastSyncUtc: null } as GitSyncStatus;
+
+ await renderBadge();
+ await openPopover();
+
+ expect(screen.queryByTestId('sync-popover-last-sync')).toBeNull();
+ expect(screen.queryByTestId('sync-popover-settings')).not.toBeNull();
+ });
+});
+
+describe('SyncStatusBadge freshness line', () => {
+ const AT_2_MIN = new Date(Date.now() - 2 * 60_000).toISOString();
+ const AT_5_MIN = new Date(Date.now() - 5 * 60_000).toISOString();
+
+ afterEach(() => {
+ cleanup();
+ status = null;
+ });
+
+ /**
+ * The accessible sentence, not the visual row: the visual half is arrows plus
+ * bare durations, which reads as "4m" with no direction. Asserting the label
+ * checks the meaning a user actually gets.
+ */
+ function freshnessLabel(): string {
+ // The version-skew fallback renders its sentence visibly instead of via an
+ // sr-only twin, so fall back to the whole line when the label is absent.
+ return (
+ screen.queryByTestId('sync-popover-last-sync-label')?.textContent ??
+ screen.getByTestId('sync-popover-last-sync').textContent ??
+ ''
+ );
+ }
+
+ /** The abbreviated durations shown next to the arrows. */
+ function freshnessVisual(): string {
+ return (
+ screen.getByTestId('sync-popover-last-sync').textContent?.replace(freshnessLabel(), '') ?? ''
+ );
+ }
+
+ test('reports the two directions separately when both have run', async () => {
+ // One combined stamp could not say WHICH leg ran, so a prompt pull read as
+ // though the push had gone out too — the whole reason for the split.
+ status = {
+ ...baseStatus,
+ lastPullOkUtc: AT_2_MIN,
+ lastPushOkUtc: AT_5_MIN,
+ } as GitSyncStatus;
+
+ await renderBadge();
+ await openPopover();
+
+ expect(freshnessLabel()).toBe('Pulled 2m ago · pushed 5m ago');
+ // Visually it is ↓ 2m · ↑ 5m — the durations without the verbs.
+ expect(freshnessVisual()).toContain('2m');
+ expect(freshnessVisual()).toContain('5m');
+ expect(freshnessVisual()).not.toContain('Pulled');
+ });
+
+ test('a project that has only pulled shows one half, not "pushed never"', async () => {
+ // Pull-only mode schedules no push, so the push leg is legitimately absent.
+ status = { ...baseStatus, lastPullOkUtc: AT_2_MIN, lastPushOkUtc: null } as GitSyncStatus;
+
+ await renderBadge();
+ await openPopover();
+
+ expect(freshnessLabel()).toBe('Pulled 2m ago');
+ });
+
+ test('a project that has only pushed shows the push half', async () => {
+ status = { ...baseStatus, lastPullOkUtc: null, lastPushOkUtc: AT_5_MIN } as GitSyncStatus;
+
+ await renderBadge();
+ await openPopover();
+
+ expect(freshnessLabel()).toBe('Pushed 5m ago');
+ });
+
+ test('an engine without the split falls back to direction-blind wording', async () => {
+ // Version skew: naming a direction from the combined stamp would be a guess,
+ // since it records that SOMETHING ran, not which.
+ status = { ...baseStatus, lastRunUtc: AT_2_MIN } as GitSyncStatus;
+
+ await renderBadge();
+ await openPopover();
+
+ expect(freshnessLabel()).toBe('Updated 2m ago');
+ });
+
+ test('a project that has never run shows no freshness line but keeps the footer link', async () => {
+ // The row is justify-between; collapsing the empty slot would slide the
+ // settings link left.
+ status = {
+ ...baseStatus,
+ lastRunUtc: null,
+ lastSyncUtc: null,
+ lastPullOkUtc: null,
+ lastPushOkUtc: null,
+ } as GitSyncStatus;
+
+ await renderBadge();
+ await openPopover();
+
+ expect(screen.queryByTestId('sync-popover-last-sync')).toBeNull();
+ expect(screen.queryByTestId('sync-popover-settings')).not.toBeNull();
});
});
diff --git a/packages/app/src/components/SyncStatusBadge.tsx b/packages/app/src/components/SyncStatusBadge.tsx
index 88c5d2c92..a1f771570 100644
--- a/packages/app/src/components/SyncStatusBadge.tsx
+++ b/packages/app/src/components/SyncStatusBadge.tsx
@@ -10,43 +10,52 @@
// biome-ignore-all lint/plugin/no-physical-direction-utility: pre-rule backlog — physical margin/padding/inset utilities predate the rule; drain by swapping ml/mr → ms/me, pl/pr → ps/pe, left/right → start/end, then deleting this line. See https://github.com/inkeep/open-knowledge/blob/main/biome-plugins/README.md#no-physical-direction-utilitygrit
import {
- isSyncActiveMode,
- isSyncPaused,
+ type GitStatusCode,
+ type GitWorktreeEntry,
+ type GitWorktreeOpenTarget,
+ isSyncMode,
type PushPermissionWire,
- resolveLocalAutoSyncMode,
type SyncErrorCode,
- type SyncMode,
} from '@inkeep/open-knowledge-core';
import { plural, t } from '@lingui/core/macro';
import { Plural, Trans, useLingui } from '@lingui/react/macro';
import {
AlertTriangle,
+ ArrowDown,
+ ArrowUp,
ArrowUpRight,
Cloud,
CloudAlert,
CloudOff,
LogIn,
- Pause,
RefreshCw,
+ Settings2,
UserCog,
} from 'lucide-react';
+import { useEffect, useState } from 'react';
import { Spinner } from '@/components/ui/spinner';
import { useConflicts } from '@/hooks/use-conflicts';
import { useBadgeSyncControls } from '@/hooks/use-enable-sync-with-confirm';
import type { GitSyncStatus } from '@/hooks/use-git-sync-status';
import { useGitSyncStatusDetailed } from '@/hooks/use-git-sync-status';
+import type { GitWorktreeStatus } from '@/hooks/use-git-worktree-status';
+import { useGitWorktreeStatus } from '@/hooks/use-git-worktree-status';
import { useConfigContext } from '@/lib/config-provider';
-import { filePathToDocName, hashFromDocName, isSameHash } from '@/lib/doc-hash';
+import { filePathToDocName, hashFromAssetPath, hashFromDocName, isSameHash } from '@/lib/doc-hash';
import { triggerSync } from '@/lib/trigger-sync';
+import { openSyncSettings } from '@/lib/use-settings-route';
import { EnableSyncConfirmDialog } from './EnableSyncConfirmDialog';
+import { SyncBlockingChanges } from './SyncBlockingChanges';
+import { Badge } from './ui/badge';
import { Button } from './ui/button';
-import { Popover, PopoverContent, PopoverTrigger } from './ui/popover';
-import { Switch } from './ui/switch';
-import { ToggleGroup, ToggleGroupItem } from './ui/toggle-group';
+import { Popover, PopoverClose, PopoverContent, PopoverTrigger } from './ui/popover';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from './ui/select';
import { Tooltip, TooltipContent, TooltipTrigger } from './ui/tooltip';
// ── helpers ──────────────────────────────────────────────────────────────────
+type ManualSyncOp = 'sync' | 'push' | 'pull';
+
/**
* Fire-and-forget manual sync from a badge button. The badge's own status
* stream drives the visible state, so a rejected trigger (offline / server
@@ -56,22 +65,50 @@ import { Tooltip, TooltipContent, TooltipTrigger } from './ui/tooltip';
* A following (pull-only) project uses the `pull` op so the trigger runs the
* one-directional cycle; full sync uses `sync` (fetch + merge + push).
*/
-function triggerSyncFromBadge(op: 'sync' | 'pull' = 'sync'): void {
+function triggerSyncFromBadge(op: ManualSyncOp = 'sync', onFailure?: () => void): void {
triggerSync(op).catch((err) => {
console.warn(
'[sync-badge] manual sync trigger failed',
err instanceof Error ? err.message : err,
);
+ onFailure?.();
});
}
-function formatRelative(iso: string | null): string {
- if (!iso) return t`never`;
+/**
+ * Point the editor at a hash route. Shared by the conflict Review button and
+ * the working-tree rows so both spell navigation the same way; the same-hash
+ * guard keeps a re-click from pushing a duplicate history entry.
+ */
+function navigateToHash(nextHash: string): void {
+ if (typeof window === 'undefined') return;
+ if (!isSameHash(window.location.hash, nextHash)) {
+ window.location.hash = nextHash;
+ }
+}
+
+/**
+ * The hash for a row's open target. `doc` and `asset` are the same two routes
+ * the Files sidebar navigates to, so a row opens what the tree would — down to
+ * the asset viewer's fallback pane for a file it has no renderer for.
+ */
+function hashForOpenTarget(target: GitWorktreeOpenTarget): string {
+ return target.kind === 'doc' ? hashFromDocName(target.docName) : hashFromAssetPath(target.path);
+}
+
+/**
+ * Compact relative time for the popover footer, where two stamps share a row
+ * with the settings link inside a 320px popover — "4 min ago" twice overflows
+ * and wraps. Reuses the same `{minutes}m ago` / `{hours}h ago` vocabulary the
+ * activity panel and thread history already use, so the abbreviation is not
+ * novel to this surface.
+ */
+function formatRelativeCompact(iso: string): string {
const diff = Date.now() - new Date(iso).getTime();
if (diff < 60_000) return t`just now`;
if (diff < 3_600_000) {
const minutes = Math.floor(diff / 60_000);
- return t`${minutes} min ago`;
+ return t`${minutes}m ago`;
}
if (diff < 86_400_000) {
const hours = Math.floor(diff / 3_600_000);
@@ -88,14 +125,14 @@ function isFollowingMode(status: GitSyncStatus): boolean {
}
/**
- * The state the badge renders. A pull-only engine deliberately holds `idle`
- * while a same-line collision waits in the conflict ledger — that keeps the rest
- * of the repo fast-forwarding, but a following project must still surface the
- * collision, so promote it to `conflict` on the badge. Full sync sets the
- * `conflict` state directly, so this never changes what it renders.
+ * The state the badge renders. The unified B1 pull deliberately holds the
+ * engine `idle` while a same-line collision waits in the conflict ledger —
+ * that keeps the rest of the repo fast-forwarding in EVERY mode — but the
+ * collision must still surface, so promote idle-with-conflicts to `conflict`
+ * on the badge regardless of mode.
*/
export function displayState(status: GitSyncStatus): GitSyncStatus['state'] {
- if (isFollowingMode(status) && status.state === 'idle' && status.conflictCount > 0) {
+ if (status.state === 'idle' && status.conflictCount > 0) {
return 'conflict';
}
return status.state;
@@ -105,15 +142,10 @@ export function displayState(status: GitSyncStatus): GitSyncStatus['state'] {
interface BadgeIconProps {
status: GitSyncStatus;
- /** True when the user paused a previously-enabled project (config-driven). */
- paused?: boolean;
}
-function BadgeIcon({ status, paused }: BadgeIconProps) {
+function BadgeIcon({ status }: BadgeIconProps) {
const cls = 'size-3.5';
- // Paused is a config state the engine's `state` can't express (it reads as
- // disabled/dormant), so it wins the icon.
- if (paused) return <Pause className={`${cls} text-muted-foreground`} />;
switch (displayState(status)) {
case 'dormant':
// Available: remote exists but sync not yet enabled
@@ -146,9 +178,15 @@ function BadgeIcon({ status, paused }: BadgeIconProps) {
<LogIn className={`${cls} text-destructive`} />
);
case 'disabled':
- // Reachable only when an auto-disable carries a pausedReason
- // (manual user disable hides the badge via early return below).
- return <AlertTriangle className={`${cls} text-amber-500`} />;
+ // The engine reports `disabled` whenever no automation is scheduled —
+ // which is the NORMAL resting state of Manual mode, not a fault. Only an
+ // auto-disable (protected branch, lost push access) carries a
+ // `pausedReason`, and only that earns a warning glyph.
+ if (status.pausedReason) return <AlertTriangle className={`${cls} text-amber-500`} />;
+ if (status.ahead > 0 || status.behind > 0) {
+ return <RefreshCw className={`${cls} text-muted-foreground`} />;
+ }
+ return <Cloud className={`${cls} text-muted-foreground`} />;
default:
return <Cloud className={`${cls} text-muted-foreground`} />;
}
@@ -179,7 +217,9 @@ function badgeLabel(status: GitSyncStatus): string {
// ── popover content ───────────────────────────────────────────────────────────
-function stateLabel(state: GitSyncStatus['state'], following = false): string {
+function stateLabel(status: GitSyncStatus): string {
+ const following = isFollowingMode(status);
+ const state = displayState(status);
switch (state) {
case 'dormant':
return t`No git remote`;
@@ -200,7 +240,10 @@ function stateLabel(state: GitSyncStatus['state'], following = false): string {
case 'auth-error':
return t`Reconnect required`;
case 'disabled':
- return t`Sync disabled`;
+ // Manual is a resting mode the user chose, not a disabled product.
+ // "Sync disabled" reads as a fault and, next to a warning triangle, as a
+ // problem the user has to go fix.
+ return status.pausedReason ? t`Sync paused` : t`Manual`;
default:
return state;
}
@@ -237,6 +280,19 @@ type PushPermissionDeniedIdentity = Pick<
'resolvedLogin' | 'declaredLogin' | 'declaredSource'
>;
+/**
+ * Format the cause-specific message for a `denied` push-permission probe.
+ * Used when the user has not enabled sync yet (so `pausedReason` is unset)
+ * but the probe says they can't push — they should see the same actionable
+ * copy as a user whose engine paused after enabling sync.
+ *
+ * When the wire names the identity that was actually authenticated
+ * (`resolvedLogin`, always the post-fallback login), the denial copy ends
+ * with it so the user can spot an account mismatch themselves — for every
+ * denial reason that authenticated at all, since a read-only collaborator
+ * verdict is exactly as account-dependent as a private-repo 404. When it is
+ * absent the sentence is omitted — the message degrades, it never guesses.
+ */
/**
* Format the cause-specific message for a `denied` push-permission probe.
* Used when the user has not enabled sync yet (so `pausedReason` is unset)
@@ -545,10 +601,9 @@ export function computeSyncErrorLines(
* (which has its own affordance) or other `unknown` causes (network /
* rate-limit / malformed-response) where re-auth is not the remedy.
*
- * Sync stays enabled; only the affordance surfaces. The Switch is NOT
- * disabled in this case — `shouldDisableSyncSwitch` keys off `'denied'`
- * only. The probe couldn't reach a verdict, so the user's existing sync
- * preference is preserved while they re-authenticate.
+ * Only the affordance surfaces — the mode selector stays fully usable. The
+ * probe couldn't reach a verdict, so the user's existing sync preference is
+ * preserved while they re-authenticate.
*/
export function shouldOfferSignInAgain(pushPermission: PushPermissionWire | undefined): boolean {
return (
@@ -556,54 +611,27 @@ export function shouldOfferSignInAgain(pushPermission: PushPermissionWire | unde
);
}
-/**
- * Pure helper: decide whether the sync Switch should be disabled given the
- * Hocuspocus-synced flag and the push-permission probe outcome. Extracted so
- * a unit test can pin the truth table without touching React rendering.
- *
- * Returns true when the local config binding hasn't hydrated yet (cold start)
- * or the probe explicitly reports `denied`. Other probe states — `'allowed'`,
- * `'unknown'`, and missing entirely — preserve the existing gating behavior
- * (Switch enabled when synced). This is the read+write parity invariant:
- * a slow / failed / not-yet-resolved probe must never disable the toggle
- * for an `allowed`-historical user.
- */
-export function shouldDisableSyncSwitch(
- projectLocalSynced: boolean | undefined,
- pushPermissionCheckStatus: 'allowed' | 'denied' | 'unknown' | undefined,
- currentMode?: SyncMode,
-): boolean {
- if (!projectLocalSynced) return true;
- // A following (pull-only) project never pushes, so a denied push probe is
- // irrelevant to it — the toggle (whose only action is turning sync off) stays
- // enabled. A denied probe still disables an off/full project, where enabling
- // reaches the push-requiring full mode.
- if (currentMode === 'follow') return false;
- if (pushPermissionCheckStatus === 'denied') return true;
- return false;
-}
-
/**
* One home for the state → label rule every plain-state surface reads (the
- * tooltip tail, the popover header, and the trigger's accessible name), so
- * the not-found masquerade cannot read "Repository not found" on one surface
- * while another still prescribes the reconnect it withdrew.
+ * tooltip tail and the trigger's accessible name), so the not-found masquerade
+ * cannot read "Repository not found" on one surface while another still
+ * prescribes the reconnect it withdrew.
+ *
+ * `stateLabel` alone answers `auth-error` with "Reconnect required", which is
+ * the wrong prescription for a repository the account simply cannot see.
*/
-function syncStateLabelFor(status: GitSyncStatus, paused: boolean): string {
- if (paused) return t`Sync paused`;
- const state = displayState(status);
- if (state === 'auth-error' && hasNotFoundAsIdentityError(status)) {
+function syncStateLabelFor(status: GitSyncStatus): string {
+ if (displayState(status) === 'auth-error' && hasNotFoundAsIdentityError(status)) {
return t`Repository not found`;
}
- return stateLabel(state, isFollowingMode(status));
+ return stateLabel(status);
}
-export function tooltipLabel(status: GitSyncStatus, paused = false): string {
- if (paused) return t`Sync paused`;
+export function tooltipLabel(status: GitSyncStatus): string {
const following = isFollowingMode(status);
- // A following project is always on, so it never reads as "Sync off" — that
- // label is reserved for a genuinely disabled (mode off) project.
- if (!status.syncEnabled && !following) return t`Sync off`;
+ // `syncEnabled: false` is Manual — a resting mode, not an off switch. It
+ // still reports ahead/behind, so fall through to the state labels rather
+ // than short-circuiting on a "Sync off" that no longer exists.
const state = displayState(status);
if (state === 'conflict' && status.conflictCount > 0) {
const { conflictCount } = status;
@@ -624,7 +652,7 @@ export function tooltipLabel(status: GitSyncStatus, paused = false): string {
if (behind > 0) return t`${behind} behind`;
return t`Synced`;
}
- return syncStateLabelFor(status, paused);
+ return syncStateLabelFor(status);
}
interface PopoverBodyProps {
@@ -633,98 +661,532 @@ interface PopoverBodyProps {
onSetIdentity?: () => void;
}
+/** Section heading — the small uppercase rule the popover groups controls under. */
+function SectionLabel({ children }: { children: React.ReactNode }) {
+ return (
+ <span className="font-mono uppercase tracking-wide text-2xs text-muted-foreground">
+ {children}
+ </span>
+ );
+}
+
+/**
+ * Short, human label for a porcelain status letter. Total over the bounded wire
+ * enum so a letter can never render as a bare glyph with no meaning.
+ */
+function statusCodeLabel(code: GitStatusCode): string {
+ switch (code) {
+ case 'M':
+ return t`Modified`;
+ case 'A':
+ return t`Added`;
+ case 'D':
+ return t`Deleted`;
+ case 'R':
+ return t`Renamed`;
+ case 'C':
+ return t`Copied`;
+ case 'U':
+ return t`Unmerged`;
+ case 'T':
+ return t`Type changed`;
+ case '?':
+ return t`Untracked`;
+ case '!':
+ return t`Ignored`;
+ default:
+ return t`Changed`;
+ }
+}
+
+/**
+ * Badge variant for a status letter.
+ *
+ * Only the two letters that carry a real warning get a tinted variant; every
+ * other code renders neutral. Git itself colors by GROUP (staged vs not), not
+ * by letter, and the group headings already carry that — tinting all seven
+ * letters would invent a taxonomy the user has to learn to read a listing.
+ */
+function statusCodeVariant(code: GitStatusCode): 'gray' | 'warning' | 'destructive' {
+ switch (code) {
+ case 'D':
+ return 'destructive';
+ case 'U':
+ return 'warning';
+ default:
+ return 'gray';
+ }
+}
+
+/**
+ * One changed path: its porcelain letter and the path itself.
+ *
+ * The path becomes a button when the server resolved an open target for it —
+ * a document, or the asset viewer for everything else the sidebar would show.
+ * The rows that stay plain text are the ones that would open on nothing: a
+ * deletion, an incoming file that has not landed yet, a path outside the
+ * content dir, and the floors the sidebar hides too. The button carries no
+ * label of its own: the path IS its accessible name.
+ */
+function WorktreeRow({ entry, dimmed }: { entry: GitWorktreeEntry; dimmed: boolean }) {
+ // No locale subscription here, deliberately. `statusCodeLabel` reads the
+ // module `t`, which resolves at CALL time, so on a locale switch these
+ // tooltips render in the old language until something re-renders the row.
+ // That window is bounded to WORKTREE_POLL_MS (5s) — the poll in
+ // `useGitWorktreeStatus` calls `setStatus` with a fresh object each tick —
+ // which is not worth the two ways of closing it here: the macro `useLingui`
+ // must appear in a variable declaration (a bare call fails the macro
+ // transform), and the runtime `@lingui/react` one throws outright without an
+ // `I18nProvider`, which the tests for this file do not mount — they mock the
+ // macro module instead.
+ const codeLabel = statusCodeLabel(entry.code);
+ const openTarget = entry.open;
+ const pathClassName = `truncate font-mono text-2xs ${dimmed ? 'text-muted-foreground/60' : 'text-foreground'}`;
+ return (
+ <li className="flex min-w-0 items-center gap-2">
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Badge
+ variant={statusCodeVariant(entry.code)}
+ className="size-4 shrink-0 justify-center p-0 text-2xs leading-none"
+ >
+ <span aria-hidden>{entry.code}</span>
+ <span className="sr-only">{codeLabel}</span>
+ </Badge>
+ </TooltipTrigger>
+ <TooltipContent>{codeLabel}</TooltipContent>
+ </Tooltip>
+ {openTarget ? (
+ // Closing on navigate: the popover overlays the editor, so leaving it
+ // open would hide the document the click just asked for.
+ <PopoverClose asChild>
+ <Button
+ variant="link"
+ size="xs"
+ // `shrink` undoes the Button base's `shrink-0`, and `min-w-0`
+ // releases the content-width floor — a flex item honors neither
+ // truncation nor its parent's width without both, at every level
+ // of the nest (li → button → span). Without `shrink` the row grew
+ // to the length of the path and spilled out of the popover.
+ // `min-h-6` restores a clickable target: `h-auto p-0` collapsed
+ // these discrete list rows to the ~14px line box, under WCAG 2.2
+ // SC 2.5.8's 24px floor — and a mis-aimed click here navigates the
+ // editor. Horizontal p-0 stays for the flush-left alignment.
+ className="h-auto min-h-6 min-w-0 shrink justify-start overflow-hidden p-0 font-normal"
+ onClick={() => navigateToHash(hashForOpenTarget(openTarget))}
+ data-testid="worktree-row-open"
+ >
+ {/* `truncate` clips the END — the filename, the only identifying
+ part — so the full path rides on `title`, the same recovery
+ every git client offers. */}
+ <span title={entry.path} className={`min-w-0 ${pathClassName}`}>
+ {entry.path}
+ </span>
+ </Button>
+ </PopoverClose>
+ ) : (
+ <span title={entry.path} className={pathClassName}>
+ {entry.path}
+ </span>
+ )}
+ </li>
+ );
+}
+
+/** A titled group of changed paths; renders nothing when the group is empty. */
+function WorktreeGroup({
+ title,
+ note,
+ entries,
+ dimmed = false,
+}: {
+ title: React.ReactNode;
+ note?: React.ReactNode;
+ entries: GitWorktreeEntry[];
+ dimmed?: boolean;
+}) {
+ if (entries.length === 0) return null;
+ return (
+ <div className="flex flex-col gap-1">
+ <span className="text-2xs font-medium text-muted-foreground">{title}</span>
+ {note && <span className="text-2xs text-muted-foreground/80">{note}</span>}
+ <ul className="flex flex-col gap-1">
+ {entries.map((entry) => (
+ <WorktreeRow key={`${entry.code}:${entry.path}`} entry={entry} dimmed={dimmed} />
+ ))}
+ </ul>
+ </div>
+ );
+}
+
+/**
+ * Ahead/behind pill. Rendered only when the count is non-zero.
+ *
+ * Plain interpolation rather than `<Plural>`: "ahead"/"behind" are adverbs with
+ * no noun to inflect, so every plural category would carry the same string —
+ * a plural form whose branches are identical is a translation burden that buys
+ * nothing (and, for `ar`, six of them).
+ */
+function DivergenceChip({ direction, count }: { direction: 'ahead' | 'behind'; count: number }) {
+ const { t } = useLingui();
+ if (count <= 0) return null;
+ return (
+ <span className="flex flex-1 items-center gap-1.5 rounded-md bg-muted px-2 py-1 text-xs text-foreground">
+ {direction === 'behind' ? (
+ <ArrowDown className="size-3.5 shrink-0 text-muted-foreground" aria-hidden />
+ ) : (
+ <ArrowUp className="size-3.5 shrink-0 text-muted-foreground" aria-hidden />
+ )}
+ {direction === 'behind' ? t`${count} behind` : t`${count} ahead`}
+ </span>
+ );
+}
+
+/**
+ * Split the working-tree listing by what Push will actually do with each path.
+ *
+ * Deliberately NOT git's staged/unstaged/untracked split. Open Knowledge never
+ * touches the real index — it stages into a throwaway `GIT_INDEX_FILE` and
+ * commits the working tree directly — so under normal use "staged" is always
+ * empty and "not staged" reads as "Push will skip this" when Push will in fact
+ * send it. Grouping on `syncScoped` describes the button the user is about to
+ * press instead of a workflow the product bypasses.
+ *
+ * A path dirty in BOTH columns arrives in two of the source lists; it renders
+ * once, keeping the index letter (a staged add reads `A`, not the worktree `M`).
+ * The dedupe and precedence rules are pinned by the rendering tests.
+ */
+function partitionByPushScope(worktree: GitWorktreeStatus): {
+ willPush: GitWorktreeEntry[];
+ wontPush: GitWorktreeEntry[];
+} {
+ const seen = new Set<string>();
+ const willPush: GitWorktreeEntry[] = [];
+ const wontPush: GitWorktreeEntry[] = [];
+ for (const entry of [...worktree.staged, ...worktree.notStaged, ...worktree.untracked]) {
+ if (seen.has(entry.path)) continue;
+ seen.add(entry.path);
+ (entry.syncScoped ? willPush : wontPush).push(entry);
+ }
+ return { willPush, wontPush };
+}
+
+/**
+ * The working-tree block: tracking refs, divergence, and the changed paths
+ * grouped by whether Push will send them. Fed by its own endpoint rather than
+ * the CC1 sync-status payload — see `use-git-worktree-status.ts` for why.
+ */
+function WorktreeStatusSection({
+ status,
+ worktree,
+ loading,
+}: {
+ status: GitSyncStatus;
+ worktree: GitWorktreeStatus | null;
+ loading: boolean;
+}) {
+ const { willPush, wontPush } = worktree
+ ? partitionByPushScope(worktree)
+ : { willPush: [], wontPush: [] };
+ const incoming = worktree?.incoming ?? [];
+ // A failed read arrives as empty lists, byte-identical to a clean tree — so
+ // the render below has to branch on this BEFORE `clean`, or it states
+ // "working tree clean" about a tree it could not read.
+ const unreadable = worktree !== null && worktree.readable === false;
+ const clean =
+ worktree !== null && willPush.length === 0 && wontPush.length === 0 && incoming.length === 0;
+
+ return (
+ <div className="flex flex-col gap-2.5 border-t pt-3">
+ <div className="flex items-baseline justify-between gap-2">
+ <SectionLabel>
+ <Trans>Status</Trans>
+ </SectionLabel>
+ {worktree && (worktree.branch || worktree.detached) && (
+ <span className="min-w-0 truncate font-mono text-2xs text-muted-foreground">
+ {worktree.detached ? (
+ <Trans>detached HEAD</Trans>
+ ) : worktree.upstream ? (
+ `${worktree.branch} → ${worktree.upstream}`
+ ) : (
+ worktree.branch
+ )}
+ </span>
+ )}
+ </div>
+
+ {(status.behind > 0 || status.ahead > 0) && (
+ <div className="flex items-stretch gap-2">
+ <DivergenceChip direction="behind" count={status.behind} />
+ <DivergenceChip direction="ahead" count={status.ahead} />
+ </div>
+ )}
+
+ {loading ? (
+ <p className="text-xs text-muted-foreground">
+ <Trans>Reading working tree</Trans>
+ </p>
+ ) : unreadable ? (
+ <p className="text-xs text-muted-foreground" data-testid="worktree-unreadable">
+ <Trans>Couldn't read the working tree. Check the server logs.</Trans>
+ </p>
+ ) : clean ? (
+ <p className="text-xs text-muted-foreground">
+ <Trans>Nothing to commit — working tree clean.</Trans>
+ </p>
+ ) : (
+ worktree && (
+ <div className="flex flex-col gap-2.5">
+ {/* Headings name the button rather than predicting the future:
+ only `full` pushes on its own, so "will be pushed" would be a
+ promise the product does not keep in Manual or Follow. */}
+ <WorktreeGroup title={<Trans>Pull brings in</Trans>} entries={incoming} />
+ <WorktreeGroup title={<Trans>Push includes</Trans>} entries={willPush} />
+ <WorktreeGroup
+ title={<Trans>Push skips</Trans>}
+ note={<Trans>Outside what Open Knowledge commits.</Trans>}
+ entries={wontPush}
+ dimmed
+ />
+ {worktree.truncated && (
+ <p className="text-2xs text-muted-foreground">
+ <Trans>Some files are not listed — the working tree has too many changes.</Trans>
+ </p>
+ )}
+ </div>
+ )
+ )}
+ </div>
+ );
+}
+
+/**
+ * Freshness line, per direction: "Pulled 2 min ago · pushed 5 min ago".
+ *
+ * Split because the two legs run on independent schedules and diverge — a
+ * single combined stamp reported whichever finished last and could not say
+ * which, so a prompt pull read as though the push had also gone out.
+ *
+ * Each leg renders only once it has actually happened, so a Pull-only project
+ * (no scheduled push) shows one half rather than an empty "pushed never". Three
+ * whole-sentence messages rather than two fragments joined at runtime: the
+ * conjunction and word order are the translator's to choose.
+ *
+ * Relative strings are NAMED bindings — an inline call would extract as a
+ * positional `{0}`, leaving translators guessing what gets substituted.
+ */
+function UpdatedLine({
+ pulledAt,
+ pushedAt,
+ combinedAt,
+}: {
+ pulledAt: string | null;
+ pushedAt: string | null;
+ /**
+ * Direction-blind fallback for an engine that predates the split. Naming a
+ * direction here would be a guess — the combined stamp records that SOMETHING
+ * ran, not which — so this keeps the older, vaguer wording instead.
+ */
+ combinedAt: string | null;
+}) {
+ const { t } = useLingui();
+ const pulled = pulledAt === null ? null : formatRelativeCompact(pulledAt);
+ const pushed = pushedAt === null ? null : formatRelativeCompact(pushedAt);
+ const updatedRelative = combinedAt === null ? null : formatRelativeCompact(combinedAt);
+ // The visual row is arrows plus bare durations; this is the sentence a screen
+ // reader gets instead. Same messages either way, so a translator sees whole
+ // sentences rather than fragments an icon silently completes.
+ const label =
+ pulled !== null && pushed !== null
+ ? t`Pulled ${pulled} · pushed ${pushed}`
+ : pulled !== null
+ ? t`Pulled ${pulled}`
+ : pushed !== null
+ ? t`Pushed ${pushed}`
+ : updatedRelative === null
+ ? null
+ : t`Updated ${updatedRelative}`;
+ // An empty slot, not nothing: the footer row is `justify-between`, so
+ // collapsing this to null would slide the settings link over to the left on a
+ // project that has never run a cycle.
+ const showArrows = pulled !== null || pushed !== null;
+ if (label === null) return <span />;
+ return (
+ <span className="text-xs text-muted-foreground" data-testid="sync-popover-last-sync">
+ {/* Only when the visual row is arrows: the fallback branch below renders
+ the sentence itself, so a second copy would double it in the
+ accessibility tree. */}
+ {showArrows && (
+ <span className="sr-only" data-testid="sync-popover-last-sync-label">
+ {label}
+ </span>
+ )}
+ {/* Arrows rather than the words: the same ↓/↑ label the Pull and Push
+ buttons carry two rows up, so the mapping is already established and
+ the row fits beside the settings link. */}
+ {showArrows ? (
+ <span aria-hidden="true" className="inline-flex items-center gap-1">
+ {pulled !== null && (
+ <span className="inline-flex items-center gap-0.5">
+ <ArrowDown className="size-3" />
+ {pulled}
+ </span>
+ )}
+ {pulled !== null && pushed !== null && <span>·</span>}
+ {pushed !== null && (
+ <span className="inline-flex items-center gap-0.5">
+ <ArrowUp className="size-3" />
+ {pushed}
+ </span>
+ )}
+ </span>
+ ) : (
+ // Version-skew fallback has no direction to point at, so it stays words.
+ <span aria-hidden="true">{label}</span>
+ )}
+ </span>
+ );
+}
+
function PopoverBody({ status, onSignIn, onSetIdentity }: PopoverBodyProps) {
const { t } = useLingui();
- const { behind, conflictCount } = status;
+ const { conflictCount } = status;
const { projectLocalConfig, projectLocalSynced } = useConfigContext();
const autoSync = projectLocalConfig?.autoSync;
const {
- active,
- paused,
- everEnabled,
- toggleMode,
+ mode,
confirmOpen,
setConfirmOpen,
pendingMode,
strandedCommitCount,
- onToggleActive,
onModeSelect,
onConfirm,
} = useBadgeSyncControls(autoSync, status.ahead);
- const localMode = resolveLocalAutoSyncMode(autoSync) ?? 'off';
- // `following` (status-driven) is the ACTIVE pull state; the paused branch is
- // config-driven since the engine reports a paused project as disabled.
- const following = isFollowingMode(status);
+ // The popover is only ever rendered inside an open Popover, so mounting the
+ // working-tree poll unconditionally here is already scoped to "open".
+ const { status: worktree, loading: worktreeLoading } = useGitWorktreeStatus(true);
+
+ const following = mode === 'follow';
const state = displayState(status);
- const lastSyncedRelative = formatRelative(status.lastSyncUtc);
// The repository-not-found masquerade parks as auth-error but withdraws the
// sign-in affordance — see hasNotFoundAsIdentityError.
const notFoundAsIdentity = hasNotFoundAsIdentityError(status);
- // The Full/Follow control appears only for a user who can actually choose —
- // a genuine read-only collaborator can only follow, so it's hidden for them
- // (a signed-out user may gain push after auth, so they keep it). The
- // not-found masquerade is excluded: its probe also answers `denied`, but
- // that is not a collaborator verdict, and this row is the popover's only
- // mode control — a failure that says nothing about push rights must not
- // revoke it. (Settings excludes it from the sibling gate for a related but
- // distinct reason: there only Full greys out, so the exclusion also stops
- // one mode being singled out.)
+ // `lastRunUtc` advances whenever a push or pull completes, whether or not
+ // content moved — that is what makes a no-op Pull stop looking like a dead
+ // button. `lastSyncUtc` is the version-skew fallback: it only moves when
+ // something CHANGED, which understates but never lies.
+ //
+ // `lastFetchUtc` is deliberately NOT in this chain. It advances on the
+ // panel-open fetch, so including it would make the line read "just now" every
+ // time the user opened the popover — claiming a sync that never happened.
+ // Per-direction when the engine reports it; the combined stamp is the
+ // version-skew fallback for an engine that predates the split.
+ const pulledAt = status.lastPullOkUtc ?? null;
+ const pushedAt = status.lastPushOkUtc ?? null;
+ const combinedAt = status.lastRunUtc ?? status.lastSyncUtc ?? null;
+ // A genuine read-only collaborator can only ever follow, so the modes that
+ // push are removed from their menu entirely rather than offered and rejected.
+ // A signed-out user keeps them — authenticating may grant push. The not-found
+ // masquerade is excluded for a different reason: its probe also answers
+ // `denied`, but that is not a collaborator verdict, and a failure that says
+ // nothing about push rights must not revoke the mode control.
const genuineReadOnly =
status.pushPermission?.checkStatus === 'denied' &&
status.pushPermission.deniedReason !== 'not-authenticated' &&
!notFoundAsIdentity;
- const canChooseMode = !genuineReadOnly;
- // The "Review conflicts" affordance navigates to the first conflicted file
- // (so the editor-area DiffViewBoundary mounts via the lifecycle observer).
+
+ // Every mode gets all three manual actions. The mode selector governs what
+ // the AUTOMATION does; these buttons are the user acting directly, and a
+ // Follow user is still allowed to send their own work when they ask for it.
+ // The one case that hides them is a collaborator who genuinely cannot push:
+ // the remote would 403, so offering the button would be a lie.
+ const canPush = !genuineReadOnly;
+ // A cycle is mid-flight; a second trigger would be refused by the engine's
+ // single-flight guard, so disable rather than queue a no-op.
+ const busy = state === 'fetching' || state === 'pulling' || state === 'pushing';
+ // Which manual action the user launched. `busy` is direction-blind, so a
+ // single shared spinner has to be placed somewhere — and placing it on
+ // Pull and Push meant a plain Pull lit up the one button that was NOT
+ // running. Cleared when the cycle ends; a trigger the engine never picked up
+ // (offline, server down) shows nothing, because `busy` gates the render.
+ const [pendingAction, setPendingAction] = useState<ManualSyncOp | null>(null);
+ useEffect(() => {
+ if (!busy) setPendingAction(null);
+ }, [busy]);
+ // A trigger that never reached the engine leaves no cycle to end, so `busy`
+ // never flips and the effect above never fires — the dead attribution then
+ // sits until the NEXT cycle, which is likely an automatic one, and lights
+ // whichever button the failed click named instead of the one actually
+ // running. Clear it at the point of failure.
+ const clearFailedAction = (op: ManualSyncOp) => {
+ setPendingAction((current) => (current === op ? null : current));
+ };
+ // Automation-driven cycles have no click to attribute, so fall back to the
+ // engine's own direction rather than claiming an action the user never took.
+ const spinning: ManualSyncOp | null = !busy
+ ? null
+ : (pendingAction ?? (state === 'pushing' ? 'push' : 'pull'));
+ const runManualSync = (op: ManualSyncOp): void => {
+ setPendingAction(op);
+ triggerSyncFromBadge(op, () => clearFailedAction(op));
+ };
+ // Pull runs WITH ledger conflicts outstanding (`conflictCount > 0`, engine
+ // still idle) — the overlay cycle re-pins them against the new tip and
+ // fast-forwards the rest of the repo, exactly what the pull-only schedule
+ // keeps doing. Disabling Pull for those would leave a Manual project with one
+ // conflicted doc unable to receive anything.
+ //
+ // A real MERGE_HEAD is the different case: `runOneShotPull` refuses it
+ // outright, because git cannot merge into an unresolved merge. Leaving the
+ // button live there made it a no-op the user got no answer from — the refusal
+ // reaches the log and nothing else. Blocked rather than given a message: the
+ // popover already shows the conflict and its Review affordance, so the honest
+ // button needs no new sentence.
+ //
+ // Read off `status.state`, NOT the local `state`: `displayState` promotes
+ // idle-with-ledger-conflicts to 'conflict' for rendering, so the derived
+ // value cannot tell the two apart and would disable Pull for exactly the
+ // ledger case the paragraph above needs it enabled for.
+ const pullBlocked = state === 'dormant' || state === 'auth-error' || status.state === 'conflict';
+ const pushBlocked = pullBlocked || status.conflictCount > 0;
+
+ // Present only while the engine is paused on a pre-merge overlap: the status
+ // payload omits the field otherwise, so this cannot show a resolved pause.
+ const blockingPaths = status.blockingPaths ?? [];
+
const { conflicts } = useConflicts();
const firstConflict = conflicts[0] ?? null;
-
- const showConflictButton = !paused && state === 'conflict' && firstConflict !== null;
- const showAuthButton = !paused && state === 'auth-error' && !notFoundAsIdentity;
- const showSyncButton =
- everEnabled && !showConflictButton && !showAuthButton && (paused || state !== 'dormant');
- // A manual sync from a full-active project pushes too; every other case
- // (following, or paused) pulls only.
- const manualSyncOp: 'sync' | 'pull' = active && localMode === 'full' ? 'sync' : 'pull';
-
- // Which guidance renders under the error lines — one precedence chain,
- // evaluated once. The signed-out reconnect wins over the button-less
- // `pausedReason`/`denied` outcomes; a paused engine never falls through to
- // the mode lines (which would claim edits are syncing while it's parked).
- // For the parked not-found masquerade, the auth-error paused line would
- // read "Reconnect required" — the prescription this state withdraws — so
- // it gets its own outcome and the error line carries the copy instead.
- const guidance =
- !following && shouldOfferReconnect(status.pushPermission)
- ? 'reconnect'
- : status.pausedReason
- ? isParkedOnNotFoundAsIdentity(status)
- ? 'parked-not-found'
- : 'paused-reason'
- : following
- ? 'mode-follow'
- : active
- ? 'mode-full'
- : status.pushPermission?.checkStatus === 'denied'
- ? 'denied'
- : shouldOfferSignInAgain(status.pushPermission)
- ? 'sign-in-again'
- : 'none';
+ const showConflictButton = state === 'conflict' && firstConflict !== null;
return (
<div className="flex flex-col gap-3.5">
<div className="flex items-center justify-between gap-2">
- <div className="flex items-center gap-2 min-w-0">
- <BadgeIcon status={status} paused={paused} />
- <span className="text-1sm font-medium truncate">{syncStateLabelFor(status, paused)}</span>
+ {/* shrink-0 so a long `owner/repo` truncates instead of eating the
+ title — "Git s…" next to a half-shown repo name tells the user
+ nothing about either. */}
+ <div className="flex shrink-0 items-center gap-2">
+ <BadgeIcon status={status} />
+ <span className="text-1sm font-medium">
+ <Trans>Git sync</Trans>
+ </span>
</div>
- <Switch
- checked={active}
- disabled={!projectLocalSynced}
- onCheckedChange={onToggleActive}
- aria-label={active ? t`Pause sync` : t`Resume sync`}
- />
+ {status.remote &&
+ (status.remote.webUrl ? (
+ <a
+ href={status.remote.webUrl}
+ target="_blank"
+ rel="noopener noreferrer"
+ className="inline-flex min-w-0 items-center gap-0.5 text-xs text-foreground hover:text-primary hover:underline"
+ aria-label={t`Open ${status.remote.label} on GitHub (opens in a new tab)`}
+ >
+ <span className="truncate">{status.remote.label}</span>
+ <ArrowUpRight className="size-3.5 shrink-0" aria-hidden />
+ </a>
+ ) : (
+ <span className="min-w-0 truncate text-xs text-foreground">{status.remote.label}</span>
+ ))}
</div>
+
<EnableSyncConfirmDialog
open={confirmOpen}
onOpenChange={setConfirmOpen}
@@ -733,203 +1195,302 @@ function PopoverBody({ status, onSignIn, onSetIdentity }: PopoverBodyProps) {
strandedCommitCount={strandedCommitCount}
/>
- {paused ? (
- <p className="text-xs text-muted-foreground" data-testid="sync-popover-paused-line">
- <Trans>Sync is paused. Turn it back on to resume.</Trans>
+ {/* ── Sync mode ───────────────────────────────────────────────────── */}
+ <div className="flex flex-col gap-1.5">
+ <SectionLabel>
+ <Trans>Sync mode</Trans>
+ </SectionLabel>
+ <Select
+ value={mode}
+ onValueChange={(v) => {
+ if (isSyncMode(v)) onModeSelect(v);
+ }}
+ disabled={!projectLocalSynced}
+ >
+ <SelectTrigger
+ size="sm"
+ // shadcn's Select ships `text-sm` on both the trigger and its items.
+ // This popover's body scale is `text-xs`, and its "Git sync" title
+ // is `text-1sm` — an unscoped trigger renders the current mode
+ // LARGER than the popover's own heading. Pinned here rather than in
+ // ui/select.tsx so other Select surfaces keep the default scale.
+ className="w-full text-xs"
+ aria-label={t`Sync mode`}
+ data-testid="sync-mode-select"
+ >
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ <SelectItem value="off" className="text-xs">{t`Manual`}</SelectItem>
+ <SelectItem value="follow" className="text-xs">{t`Auto (Pull only)`}</SelectItem>
+ {/* Rendered even when denied, disabled rather than omitted. Radix
+ fills the trigger by portaling the SELECTED item's text into it,
+ so dropping the item a `full` project is already on leaves the
+ trigger blank and its accessible name empty — on the one control
+ that says whether edits leave the machine. The reason is already
+ on screen below (the push-permission line), so this needs no
+ tooltip; Settings shows-and-explains the same condition. */}
+ <SelectItem value="full" className="text-xs" disabled={genuineReadOnly}>
+ {t`Auto (Pull and Push)`}
+ </SelectItem>
+ </SelectContent>
+ </Select>
+ <p className="text-xs text-muted-foreground" data-testid="sync-popover-mode-line">
+ {mode === 'off' ? (
+ <Trans>Nothing moves until you ask.</Trans>
+ ) : mode === 'follow' ? (
+ <Trans>Updates flow in from your remote; your edits stay on this computer.</Trans>
+ ) : (
+ <Trans>Your edits are committed and pushed to your remote automatically.</Trans>
+ )}
</p>
- ) : (
- <>
- {/* The live region carries only status text — the error lines and
- the button-less guidance — so a state flip is announced to an
- open popover without re-reading button labels or mode sentences
- (role="status" is implicitly aria-atomic, so any text change
- re-announces the whole region; keep children non-interactive).
- The rows carrying a Button, and the steady-state mode sentences,
- render after it. `empty:sr-only` keeps the region mounted and
- pre-registered while healthy: a region that appears and fills in
- one commit is missed on VoiceOver/Safari, and `display:none`
- (like unmounting) drops it from the accessibility tree
- entirely. `sr-only` is absolutely positioned, so an empty
- region is not a flex item and adds no gap. */}
- <div role="status" aria-live="polite" className="flex flex-col gap-3.5 empty:sr-only">
- {computeSyncErrorLines(status).map((line) => (
- <p key={line.key} className="text-xs text-destructive">
- {line.direction === 'push' ? (
- <>
- <span className="font-medium">{t`Push`}: </span>
- {line.message}
- </>
- ) : line.direction === 'pull' ? (
- <>
- <span className="font-medium">{t`Pull`}: </span>
- {line.message}
- </>
- ) : (
- line.message
- )}
- </p>
- ))}
- {guidance === 'parked-not-found' && status.pushPermission?.checkStatus === 'denied'
- ? // Identity tail only — see formatDeniedIdentitySentences.
- formatDeniedIdentitySentences(status.pushPermission).map((sentence) => (
- <p key={sentence} className="text-xs text-muted-foreground">
- {sentence}
- </p>
- ))
- : null}
- {guidance === 'paused-reason' && status.pausedReason ? (
- <p className="text-xs text-muted-foreground">
- {formatPausedReason(status.pausedReason)}
+ </div>
+
+ {/* ── Manual actions ──────────────────────────────────────────────── */}
+ <div className="flex flex-col gap-2 border-t pt-3">
+ <SectionLabel>
+ <Trans>Manual</Trans>
+ </SectionLabel>
+ <div className="flex gap-2">
+ <Button
+ variant="outline"
+ size="xs"
+ className="flex-1"
+ disabled={busy || pullBlocked}
+ onClick={() => runManualSync('pull')}
+ data-testid="sync-popover-pull"
+ >
+ {spinning === 'pull' ? (
+ <Spinner aria-hidden="true" data-icon="inline-start" />
+ ) : (
+ <ArrowDown data-icon="inline-start" />
+ )}
+ <Trans>Pull</Trans>
+ </Button>
+ {canPush && (
+ <Button
+ variant="outline"
+ size="xs"
+ className="flex-1"
+ disabled={busy || pushBlocked}
+ onClick={() => runManualSync('push')}
+ data-testid="sync-popover-push"
+ >
+ {spinning === 'push' ? (
+ <Spinner aria-hidden="true" data-icon="inline-start" />
+ ) : (
+ <ArrowUp data-icon="inline-start" />
+ )}
+ <Trans>Push</Trans>
+ </Button>
+ )}
+ </div>
+ {canPush && (
+ <Button
+ size="xs"
+ className="w-full"
+ disabled={busy || pushBlocked}
+ onClick={() => runManualSync('sync')}
+ data-testid="sync-popover-sync"
+ >
+ {spinning === 'sync' ? (
+ <Spinner aria-hidden="true" icon={RefreshCw} data-icon="inline-start" />
+ ) : (
+ <RefreshCw data-icon="inline-start" />
+ )}
+ <Trans>Pull and Push</Trans>
+ </Button>
+ )}
+ </div>
+
+ {/* ── Problems ────────────────────────────────────────────────────── */}
+ {/* Live region carries only STATUS TEXT — error lines and the identity
+ tail — so a state flip is announced to an open popover without
+ re-reading button labels. role="status" is implicitly aria-atomic, so
+ any text change re-announces the whole region; keep children
+ non-interactive and render the button-bearing rows after it.
+ `empty:sr-only` keeps it mounted and pre-registered while healthy: a
+ region that appears and fills in one commit is missed on
+ VoiceOver/Safari, and `display:none` drops it from the accessibility
+ tree entirely. `sr-only` is absolutely positioned, so an empty region
+ is not a flex item and adds no gap. */}
+ <div role="status" aria-live="polite" className="flex flex-col gap-3.5 empty:sr-only">
+ {computeSyncErrorLines(status).map((line) => (
+ <p key={line.key} className="text-xs text-destructive">
+ {line.direction === 'push' ? (
+ <>
+ <span className="font-medium">{t`Push`}: </span>
+ {line.message}
+ </>
+ ) : line.direction === 'pull' ? (
+ <>
+ <span className="font-medium">{t`Pull`}: </span>
+ {line.message}
+ </>
+ ) : (
+ line.message
+ )}
+ </p>
+ ))}
+
+ {/* Identity tail — which account actually answered. Rendered under the
+ error lines exactly as it is elsewhere, because a two-account user
+ cannot otherwise tell WHY a push was refused: the reason sentence is
+ identical whichever account was used. */}
+ {isParkedOnNotFoundAsIdentity(status) && status.pushPermission?.checkStatus === 'denied'
+ ? // Identity only: the error line above already carries the full
+ // not-found copy, and every reason sentence either re-prescribes the
+ // sign-in this state withholds or asserts more than a 404 proves.
+ formatDeniedIdentitySentences(status.pushPermission).map((sentence) => (
+ <p key={sentence} className="text-xs text-muted-foreground">
+ {sentence}
</p>
- ) : null}
- {guidance === 'paused-reason' &&
- status.pausedReason === 'no-push-permission' &&
- status.pushPermission?.checkStatus === 'denied'
- ? // A push-permission pause and a genuine read-only collaborator
- // render the same sentence, so the identity tail is the only
- // thing that tells a two-account user which account was used.
- // Additive to the pause line: the engine really is parked, and
- // that stays the headline.
- formatDeniedIdentitySentences(status.pushPermission).map((sentence) => (
- <p key={sentence} className="text-xs text-muted-foreground">
- {sentence}
- </p>
- ))
- : null}
- {guidance === 'denied' && status.pushPermission?.checkStatus === 'denied'
- ? formatPushPermissionDenied(
- status.pushPermission.deniedReason,
- status.pushPermission,
- ).map((sentence) => (
- <p key={sentence} className="text-xs text-muted-foreground">
- {sentence}
- </p>
- ))
- : null}
- </div>
- {guidance === 'reconnect' ? (
- // Signed-out denial (no credential resolved) — reconnecting
- // resumes sync, so offer it here.
- <div className="flex items-start gap-2">
- <p className="text-xs text-muted-foreground flex-1 min-w-0">
- <Trans>You're signed out — sign in to resume syncing.</Trans>
+ ))
+ : null}
+ {status.pausedReason === 'no-push-permission' &&
+ status.pushPermission?.checkStatus === 'denied'
+ ? // Additive to the pause line below: the engine really is parked, and
+ // that stays the headline — but a push-permission pause and a genuine
+ // read-only collaborator render the same sentence, so the identity
+ // tail is the only thing that distinguishes them.
+ formatDeniedIdentitySentences(status.pushPermission).map((sentence) => (
+ <p key={sentence} className="text-xs text-muted-foreground">
+ {sentence}
</p>
- {onSignIn && (
- <Button variant="outline" size="xs" className="self-start" onClick={onSignIn}>
- <Trans>Sign in</Trans>
- </Button>
- )}
- </div>
- ) : guidance === 'mode-follow' ? (
- // A follower never pushes, so the push-permission verdict is
- // irrelevant — say what the project IS (the mode).
- <p className="text-xs text-muted-foreground" data-testid="sync-popover-mode-line">
- <Trans>
- Follow — updates flow in from your remote; your edits stay on this computer.
- </Trans>
- </p>
- ) : guidance === 'mode-full' ? (
- <p className="text-xs text-muted-foreground" data-testid="sync-popover-mode-line">
- <Trans>
- Full sync — your edits are committed and pushed to your remote automatically.
- </Trans>
+ ))
+ : null}
+ </div>
+
+ {!following && shouldOfferReconnect(status.pushPermission) ? (
+ // Signed-out denial (no credential resolved) — reconnecting resumes
+ // sync, so offer it here. Takes precedence over the button-less
+ // `pausedReason`/`denied` branches below.
+ <div className="flex items-start gap-2">
+ <p className="min-w-0 flex-1 text-xs text-muted-foreground">
+ <Trans>You're signed out — sign in to resume syncing.</Trans>
+ </p>
+ {onSignIn && (
+ <Button variant="outline" size="xs" className="self-start" onClick={onSignIn}>
+ <Trans>Sign in</Trans>
+ </Button>
+ )}
+ </div>
+ ) : blockingPaths.length > 0 ? (
+ // The one paused reason the user can clear from here, so it gets the
+ // panel instead of the sentence every other reason shares.
+ <SyncBlockingChanges paths={blockingPaths} />
+ ) : isParkedOnNotFoundAsIdentity(
+ status,
+ ) ? // Suppression, not copy: the error line already carries the full
+ // not-found sentence and the identity tail rides above. Falling through
+ // to `formatPausedReason('auth-error')` would read "Reconnect required" —
+ // the one prescription this state withdraws, since re-authenticating
+ // cannot make an unseeable repository visible.
+ null : status.pausedReason ? (
+ <p className="text-xs text-muted-foreground">{formatPausedReason(status.pausedReason)}</p>
+ ) : !following && genuineReadOnly && status.pushPermission?.checkStatus === 'denied' ? (
+ // A follower never pushes, so the push-permission verdict is not its
+ // problem — its mode line already says what the project does.
+ formatPushPermissionDenied(status.pushPermission.deniedReason, status.pushPermission).map(
+ (sentence) => (
+ <p key={sentence} className="text-xs text-muted-foreground">
+ {sentence}
</p>
- ) : guidance === 'sign-in-again' ? (
- // Probe-401 branch: surface a "Sign in again" affordance without
- // disabling sync — the probe couldn't reach a verdict.
- <div className="flex items-start gap-2">
- <p className="text-xs text-muted-foreground flex-1 min-w-0">
- <Trans>Your GitHub session expired — sign in again to verify push access.</Trans>
- </p>
- {onSignIn && (
- <Button variant="outline" size="xs" className="self-start" onClick={onSignIn}>
- <Trans>Sign in</Trans>
- </Button>
- )}
- </div>
- ) : null}
- </>
- )}
+ ),
+ )
+ ) : shouldOfferSignInAgain(status.pushPermission) ? (
+ // Probe-401 branch: surface a "Sign in again" affordance without
+ // disabling sync — the probe couldn't reach a verdict.
+ <div className="flex items-start gap-2">
+ <p className="min-w-0 flex-1 text-xs text-muted-foreground">
+ <Trans>Your GitHub session expired — sign in again to verify push access.</Trans>
+ </p>
+ {onSignIn && (
+ <Button variant="outline" size="xs" className="self-start" onClick={onSignIn}>
+ <Trans>Sign in</Trans>
+ </Button>
+ )}
+ </div>
+ ) : null}
- {!paused && state === 'conflict' && (
- <p className="text-xs text-amber-700 dark:text-amber-400">
- {following ? (
- // A follower keeps fast-forwarding the rest of the repo while a single
- // document waits on resolution, so it is never globally "paused".
+ {state === 'conflict' && (
+ <div className="flex items-start gap-2">
+ <p className="min-w-0 flex-1 text-xs text-amber-700 dark:text-amber-400">
+ {/* One line for every mode: the repo keeps fast-forwarding while a
+ document waits on resolution — only pushing is held — so the
+ retired "paused/resume" framing would describe automation that
+ is not actually stopped. */}
<Trans>A document has a conflict — resolve it to keep it up to date.</Trans>
- ) : (
- <Trans>Sync paused — resolve conflicts to resume.</Trans>
+ </p>
+ {showConflictButton && firstConflict && (
+ <Button
+ variant="outline"
+ size="xs"
+ className="self-start"
+ onClick={() => navigateToHash(hashFromDocName(filePathToDocName(firstConflict.file)))}
+ >
+ <Trans>Review</Trans>
+ </Button>
)}
+ </div>
+ )}
+
+ {state === 'auth-error' && !isParkedOnNotFoundAsIdentity(status) && onSignIn && (
+ // Withheld for the not-found masquerade: it parks as auth-error, but a
+ // re-sign-in is not the prescribed fix, and the copy and the affordance
+ // have to agree.
+ <div className="flex items-start gap-2">
+ <p className="min-w-0 flex-1 text-xs text-destructive">
+ <Trans>Reconnect required to keep syncing.</Trans>
+ </p>
+ <Button variant="outline" size="xs" className="self-start" onClick={onSignIn}>
+ <Trans>Sign in</Trans>
+ </Button>
+ </div>
+ )}
+
+ {conflictCount > 0 && (
+ <p className="text-xs text-muted-foreground">
+ <Plural value={conflictCount} one="# file conflicted" other="# files conflicted" />
</p>
)}
- <div className="text-xs text-muted-foreground space-y-2 border-t pt-3">
- {status.remote && (
- <div className="flex items-baseline justify-between gap-2">
- <span className="w-20 shrink-0 font-mono uppercase tracking-wide text-2xs">
- <Trans>Repository</Trans>
- </span>
- {status.remote.webUrl ? (
- <a
- href={status.remote.webUrl}
- target="_blank"
- rel="noopener noreferrer"
- className="inline-flex min-w-0 items-center gap-0.5 text-foreground hover:text-primary hover:underline"
- aria-label={t`Open ${status.remote.label} on GitHub (opens in a new tab)`}
- >
- <span className="truncate">{status.remote.label}</span>
- <ArrowUpRight className="size-3.5 shrink-0" aria-hidden />
- </a>
- ) : (
- <span className="min-w-0 truncate text-foreground">{status.remote.label}</span>
- )}
- </div>
- )}
- {active && !following && status.behind > 0 && (
- <div>
- <Plural value={behind} one="# commit behind" other="# commits behind" />
- </div>
- )}
- {status.conflictCount > 0 && (
- <div>
- <Plural value={conflictCount} one="# file conflicted" other="# files conflicted" />
- </div>
- )}
- {canChooseMode && (
- <div className="flex items-center justify-between gap-2 pt-0.5">
- <span className="w-20 shrink-0 font-mono uppercase tracking-wide text-2xs">
- <Trans>Mode</Trans>
- </span>
- <ToggleGroup
- type="single"
- variant="segmented"
- size="sm"
- spacing={1}
- className="bg-muted p-0.5 data-[size=sm]:rounded-[10px]"
- value={toggleMode}
- onValueChange={(v) => {
- // Radix emits '' on re-press (deselect) — keep exactly one mode.
- if (isSyncActiveMode(v)) onModeSelect(v);
- }}
- aria-label={t`Sync mode`}
- data-testid="sync-popover-mode-toggle"
- >
- <ToggleGroupItem value="full" data-testid="sync-popover-mode-full">
- <Trans>Full</Trans>
- </ToggleGroupItem>
- <ToggleGroupItem value="follow" data-testid="sync-popover-mode-follow">
- <Trans>Follow</Trans>
- </ToggleGroupItem>
- </ToggleGroup>
- </div>
- )}
+ {/* ── Status ──────────────────────────────────────────────────────── */}
+ <WorktreeStatusSection status={status} worktree={worktree} loading={worktreeLoading} />
+
+ {/* The popover hosts the controls you reach for mid-edit; the fuller set
+ (committed shared default, cycle cadence) lives in Settings, which this
+ opens with the Advanced disclosure already expanded. Paired on
+ one row with the freshness line so the footer stays a single band
+ instead of two stacked half-empty rows. `justify-between` with an
+ always-present left slot keeps the link pinned right even before the
+ first cycle, when the freshness line is deliberately absent. */}
+ <div className="flex items-center justify-between gap-2">
+ <UpdatedLine pulledAt={pulledAt} pushedAt={pushedAt} combinedAt={combinedAt} />
+ {/* Closing on navigate: the popover overlays the editor, and Settings
+ opens as a dialog on top — leaving it open would strand it there. */}
+ <PopoverClose asChild>
+ <Button
+ variant="link"
+ size="xs"
+ // The `link` variant ships `hover:underline`; this footer wants the
+ // quieter weight-shift instead, so the decoration is turned back off
+ // (cn() last-wins puts `no-underline` over the variant's rule).
+ className="h-auto p-0 text-xs text-muted-foreground hover:font-medium hover:text-foreground hover:no-underline"
+ onClick={() => openSyncSettings({ advanced: true })}
+ data-testid="sync-popover-settings"
+ >
+ <Settings2 data-icon="inline-start" />
+ <Trans>Advanced settings</Trans>
+ </Button>
+ </PopoverClose>
</div>
- {!paused && status.identityUnresolved && onSetIdentity && (
+ {status.identityUnresolved && onSetIdentity && (
<div className="flex items-start gap-2 rounded-md border border-dashed p-2">
- <UserCog className="size-3.5 mt-0.5 text-muted-foreground shrink-0" />
- <div className="flex flex-col gap-1.5 min-w-0">
- <p className="text-xs text-muted-foreground leading-snug">
+ <UserCog className="mt-0.5 size-3.5 shrink-0 text-muted-foreground" />
+ <div className="flex min-w-0 flex-col gap-1.5">
+ <p className="text-xs leading-snug text-muted-foreground">
<Trans>
Git identity isn't set — commits use a default author. Set yours so teammates see
your name.
@@ -941,56 +1502,6 @@ function PopoverBody({ status, onSignIn, onSetIdentity }: PopoverBodyProps) {
</div>
</div>
)}
-
- {(showSyncButton ||
- showAuthButton ||
- showConflictButton ||
- (active && state !== 'dormant')) && (
- <div className="flex items-center justify-between gap-2 pt-1">
- {active && state !== 'dormant' ? (
- // A follower pulls only, so "Synced" (two-way) would overstate it —
- // it reads "Updated"; full sync reads "Synced".
- <span className="text-xs text-muted-foreground" data-testid="sync-popover-last-sync">
- {following ? t`Updated ${lastSyncedRelative}` : t`Synced ${lastSyncedRelative}`}
- </span>
- ) : (
- <span />
- )}
- <div className="flex flex-wrap justify-end gap-1">
- {showSyncButton && (
- // One label for every mode ("Sync"); the op pushes only when full
- // and active, and pulls otherwise (following, or a paused one-shot).
- <Button
- variant="outline"
- size="xs"
- onClick={() => triggerSyncFromBadge(manualSyncOp)}
- >
- <Trans>Sync</Trans>
- </Button>
- )}
- {showAuthButton && (
- <Button variant="outline" size="xs" onClick={onSignIn}>
- <Trans>Sign in</Trans>
- </Button>
- )}
- {showConflictButton && firstConflict && (
- <Button
- variant="outline"
- size="xs"
- onClick={() => {
- if (typeof window === 'undefined') return;
- const nextHash = hashFromDocName(filePathToDocName(firstConflict.file));
- if (!isSameHash(window.location.hash, nextHash)) {
- window.location.hash = nextHash;
- }
- }}
- >
- <Trans>Review conflicts</Trans>
- </Button>
- )}
- </div>
- </div>
- )}
</div>
);
}
@@ -1007,17 +1518,6 @@ interface SyncStatusBadgeProps {
export function SyncStatusBadge({ onSignIn, onSetIdentity }: SyncStatusBadgeProps = {}) {
const { t } = useLingui();
const { status, fetchError } = useGitSyncStatusDetailed();
- const { projectLocalConfig } = useConfigContext();
- // Paused = the user turned off a previously-enabled project. It's config-only
- // (the engine reports it as disabled/dormant), so the badge reads it here to
- // stay visible and render the paused icon/label.
- const paused = isSyncPaused(projectLocalConfig?.autoSync);
- // The local config is the source of truth for user intent; the server status
- // lags a resume by a beat. When the config already resolves to an active mode
- // (follow/full) but the engine still reports the pre-resume `disabled`, keep
- // the badge visible so the resume doesn't unmount it — unmounting closes the
- // popover and flickers the icon until the status catches up.
- const localWantsSync = isSyncActiveMode(resolveLocalAutoSyncMode(projectLocalConfig?.autoSync));
// Surface a lightweight connectivity warning when the server has been
// reachable before (we have a prior status) but the last refresh failed.
@@ -1051,32 +1551,19 @@ export function SyncStatusBadge({ onSignIn, onSetIdentity }: SyncStatusBadgeProp
return null;
}
- // Hide when dormant with no remote (truly no git remote)
- if (status.state === 'dormant' && !status.hasRemote) return null;
-
- // Hide when sync is explicitly disabled by the user — they opted out, so
- // there's nothing actionable to surface in the header. Re-enabling goes
- // through Settings → Sync, which gates with a confirmation dialog. Keep
- // the badge visible when an auto-disable carries a `pausedReason` (e.g.
- // protected-branch) so the user can see *why* sync stopped — without it,
- // the only signal would be a missing badge. Manual disable clears
- // `pausedReason`; auto-disable sets it. (Unsafe states like auth-error /
- // conflict / offline already render — they need attention.) A following
- // (pull-only) project is always on, so it must always show its state.
- // A paused project (config: was enabled, now off) stays visible so the user
- // isn't stranded in Settings to resume — the engine reports it as disabled.
- if (
- status.state === 'disabled' &&
- !status.pausedReason &&
- status.syncMode !== 'follow' &&
- !paused &&
- !localWantsSync
- ) {
- return null;
- }
+ // A remote is the only precondition for showing the badge. Under the
+ // three-way mode selector there is no longer an "opted out" state to hide
+ // for: `off` is Manual, a resting mode whose whole point is the manual
+ // actions this popover hosts. Hiding it would strand the user in Settings to
+ // reach a Pull button.
+ if (!status.hasRemote) return null;
- const label = paused ? '' : badgeLabel(status);
- const syncStateLabel = syncStateLabelFor(status, paused);
+ const label = badgeLabel(status);
+ // Via syncStateLabelFor, not stateLabel: the trigger's visible label and
+ // accessible name must agree with the popover, or the not-found masquerade
+ // reads "Reconnect required" on the badge while the popover withdraws exactly
+ // that prescription.
+ const syncStateLabel = syncStateLabelFor(status);
const showIdentityDot = Boolean(status.identityUnresolved);
return (
@@ -1094,7 +1581,7 @@ export function SyncStatusBadge({ onSignIn, onSetIdentity }: SyncStatusBadgeProp
: t`Sync status: ${syncStateLabel}`
}
>
- <BadgeIcon status={status} paused={paused} />
+ <BadgeIcon status={status} />
{label && (
<span className="absolute -top-0.5 -right-0.5 text-[9px] leading-none font-medium bg-background border rounded-full px-0.5">
{label}
@@ -1109,9 +1596,18 @@ export function SyncStatusBadge({ onSignIn, onSetIdentity }: SyncStatusBadgeProp
</Button>
</PopoverTrigger>
</TooltipTrigger>
- <TooltipContent>{tooltipLabel(status, paused)}</TooltipContent>
+ <TooltipContent>{tooltipLabel(status)}</TooltipContent>
</Tooltip>
- <PopoverContent align="end" className="w-80 p-3">
+ {/* Ceiling here rather than on the shared PopoverContent primitive: the
+ server caps each status list at 100, so four lists can paint ~400 rows
+ and push the Status block and this popover's own footer past the
+ viewport. Upstream shadcn ships no ceiling on popover, and three
+ sibling surfaces in this app cap at their own content — so the fix
+ belongs to the content that overflows, not to every popover. */}
+ <PopoverContent
+ align="end"
+ className="flex max-h-(--radix-popover-content-available-height) w-80 flex-col overflow-y-auto p-3"
+ >
<PopoverBody status={status} onSignIn={onSignIn} onSetIdentity={onSetIdentity} />
</PopoverContent>
</Popover>
diff --git a/packages/app/src/components/handoff/terminal-command-events.ts b/packages/app/src/components/handoff/terminal-command-events.ts
index f55845042..39742aa09 100644
--- a/packages/app/src/components/handoff/terminal-command-events.ts
+++ b/packages/app/src/components/handoff/terminal-command-events.ts
@@ -20,7 +20,7 @@
*/
/** Commands a UI surface may ask the terminal to run. Closed by design. */
-export type TerminalCommandId = 'install-slidev';
+export type TerminalCommandId = 'install-slidev' | 'git-status';
/**
* The command each id maps to.
@@ -33,6 +33,12 @@ export type TerminalCommandId = 'install-slidev';
*/
const TERMINAL_COMMANDS: Record<TerminalCommandId, string> = {
'install-slidev': 'npm install -g @slidev/cli @slidev/theme-default',
+ // The sync panel's "Resolve in terminal": land the user in the project with
+ // the state of the working tree already printed, rather than in a bare shell
+ // they have to orient themselves in. Read-only by construction — resolving is
+ // theirs to drive, and a constant keeps the closed-union contract (no path,
+ // no branch name, nothing interpolated into shell text).
+ 'git-status': 'git status',
};
/** The shell text for `id`, or undefined when the id is not in the union (a
diff --git a/packages/app/src/components/settings/SettingsDialogBody.sections.dom.test.tsx b/packages/app/src/components/settings/SettingsDialogBody.sections.dom.test.tsx
index c57781334..43d1d9876 100644
--- a/packages/app/src/components/settings/SettingsDialogBody.sections.dom.test.tsx
+++ b/packages/app/src/components/settings/SettingsDialogBody.sections.dom.test.tsx
@@ -289,6 +289,13 @@ vi.doMock('@/hooks/use-enable-sync-with-confirm', () => ({
syncDefaultWriterCalls.push(next);
return { ok: true };
},
+ // Accept-and-discard stub: this file exercises section dispatch, not the
+ // cadence controls — those are covered against the real hook in
+ // SettingsDialogBody.sync-mode.dom.test.tsx.
+ useSyncIntervalWriter:
+ () => (_next: { pullIntervalSeconds: number; pushIntervalSeconds: number }) => ({
+ ok: true as const,
+ }),
// Thin recorder mirroring the real hook's gating so the section's wiring is
// exercised (deep confirm-flow behavior is covered against the real hook in
// SettingsDialogBody.sync-mode.dom.test.tsx and the hook's own test).
diff --git a/packages/app/src/components/settings/SettingsDialogBody.sync-mode.dom.test.tsx b/packages/app/src/components/settings/SettingsDialogBody.sync-mode.dom.test.tsx
index 5d2b4b976..4b158cbbe 100644
--- a/packages/app/src/components/settings/SettingsDialogBody.sync-mode.dom.test.tsx
+++ b/packages/app/src/components/settings/SettingsDialogBody.sync-mode.dom.test.tsx
@@ -7,9 +7,9 @@
* mode -> the consent dialog opens with the right copy -> confirming patches
* `autoSync.mode` on the project-local binding.
*/
-import { cleanup, fireEvent, render, screen } from '@testing-library/react';
+import { cleanup, fireEvent, render, screen, within } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
-import { createContext, type ReactNode, use } from 'react';
+import { createContext, type ReactNode, StrictMode, use } from 'react';
import { beforeEach, describe, expect, test, vi } from 'vitest';
import { TooltipProvider } from '@/components/ui/tooltip';
import { renderLinguiTemplate } from '@/test-utils/lingui-mock';
@@ -27,7 +27,12 @@ type SyncStatus = {
let syncStatus: SyncStatus = null;
let projectLocalConfig: {
- autoSync?: { enabled?: boolean; mode?: 'off' | 'follow' | 'full' };
+ autoSync?: {
+ enabled?: boolean;
+ mode?: 'off' | 'follow' | 'full';
+ pullIntervalSeconds?: number;
+ pushIntervalSeconds?: number;
+ };
} | null = null;
let projectConfig: {
autoSync?: { default?: boolean | string | null };
@@ -75,8 +80,13 @@ vi.doMock('@/components/ui/button', () => ({
),
}));
+// Content renders unconditionally so section tests need not open every
+// disclosure, but `open` is reflected onto `data-state` so a test CAN assert
+// expanded-vs-collapsed where that is the behavior under test.
vi.doMock('@/components/ui/collapsible', () => ({
- Collapsible: ({ children }: { children?: ReactNode }) => <div>{children}</div>,
+ Collapsible: ({ children, open }: { children?: ReactNode; open?: boolean }) => (
+ <div data-state={open === true ? 'open' : 'closed'}>{children}</div>
+ ),
CollapsibleContent: ({ children }: { children?: ReactNode }) => <div>{children}</div>,
CollapsibleTrigger: ({ children }: { children?: ReactNode }) => <>{children}</>,
}));
@@ -105,12 +115,61 @@ vi.doMock('@/components/ui/input', () => ({
Input: (props: React.InputHTMLAttributes<HTMLInputElement>) => <input {...props} />,
}));
+// Recorder Select, same shape as the ToggleGroup recorder below: forwards the
+// item value to the REAL onValueChange, keeps `data-testid` on the trigger, and
+// renders the selected item's label through SelectValue so a test can assert
+// what the control DISPLAYS, not just what it would write. Radix's real Select
+// portals its content and needs pointer capabilities jsdom lacks.
+const SelectHandlerCtx = createContext<
+ { onValueChange?: (value: string) => void; value?: string } | undefined
+>(undefined);
vi.doMock('@/components/ui/select', () => ({
- Select: ({ children }: { children?: ReactNode }) => <div>{children}</div>,
+ Select: ({
+ children,
+ value,
+ onValueChange,
+ }: {
+ children?: ReactNode;
+ value?: string;
+ onValueChange?: (value: string) => void;
+ }) => (
+ <SelectHandlerCtx.Provider value={{ onValueChange, value }}>
+ <div data-value={value}>{children}</div>
+ </SelectHandlerCtx.Provider>
+ ),
SelectContent: ({ children }: { children?: ReactNode }) => <div>{children}</div>,
- SelectItem: ({ children }: { children?: ReactNode }) => <div>{children}</div>,
- SelectTrigger: ({ children }: { children?: ReactNode }) => <div>{children}</div>,
- SelectValue: () => null,
+ SelectItem: ({
+ children,
+ value,
+ ...props
+ }: {
+ children?: ReactNode;
+ value?: string;
+ [key: string]: unknown;
+ }) => {
+ const ctx = use(SelectHandlerCtx);
+ return (
+ <button
+ type="button"
+ role="option"
+ aria-selected={ctx?.value === value}
+ onClick={() => ctx?.onValueChange?.(value as string)}
+ {...props}
+ >
+ {children}
+ </button>
+ );
+ },
+ SelectTrigger: ({ children, ...props }: { children?: ReactNode; [key: string]: unknown }) => (
+ <div {...props}>{children}</div>
+ ),
+ // The real SelectValue renders the selected item's label. Reproduced by
+ // reading the selected value off the context — otherwise every display
+ // assertion would be vacuous.
+ SelectValue: () => {
+ const ctx = use(SelectHandlerCtx);
+ return <span data-slot="select-value">{ctx?.value ?? ''}</span>;
+ },
}));
// Recorder ToggleGroup: reliable, deterministic clicks that forward the item
@@ -184,9 +243,9 @@ vi.doMock('@/lib/config-provider', () => ({
// while keeping the REAL sync hooks + REAL EnableSyncConfirmDialog. RTL itself
// depends on none of the mocked modules, so it stays a static top-level import
// (the Tier-3 filename contract requires it).
-async function renderSyncSection() {
+async function renderSyncSection({ strict = false }: { strict?: boolean } = {}) {
const { SettingsDialogBody } = await import('./SettingsDialogBody');
- render(
+ const tree = (
<TooltipProvider>
<SettingsDialogBody
activeId="sync"
@@ -194,8 +253,9 @@ async function renderSyncSection() {
okignoreBinding={null as never}
okignoreSynced={false}
/>
- </TooltipProvider>,
+ </TooltipProvider>
);
+ render(strict ? <StrictMode>{tree}</StrictMode> : tree);
}
describe('Settings Sync section — three-way mode control (real hooks + dialog)', () => {
@@ -226,11 +286,11 @@ describe('Settings Sync section — three-way mode control (real hooks + dialog)
fireEvent.click(screen.getByTestId('settings-sync-mode-follow'));
// The real pull-variant confirmation renders; no write yet.
- expect(screen.getByRole('button', { name: 'Enable Follow' })).not.toBeNull();
+ expect(screen.getByRole('button', { name: 'Enable Auto (Pull only)' })).not.toBeNull();
expect(screen.getByRole('note').textContent ?? '').toContain('Updates flow in');
expect(localPatchCalls).toEqual([]);
- fireEvent.click(screen.getByRole('button', { name: 'Enable Follow' }));
+ fireEvent.click(screen.getByRole('button', { name: 'Enable Auto (Pull only)' }));
expect(localPatchCalls).toEqual([{ autoSync: { mode: 'follow', enabled: null } }]);
});
@@ -239,10 +299,10 @@ describe('Settings Sync section — three-way mode control (real hooks + dialog)
fireEvent.click(screen.getByTestId('settings-sync-mode-full'));
- expect(screen.getByRole('button', { name: 'Enable auto-sync' })).not.toBeNull();
+ expect(screen.getByRole('button', { name: 'Enable Auto (Pull and Push)' })).not.toBeNull();
expect(screen.getByRole('note').textContent ?? '').toContain('Commits happen automatically');
- fireEvent.click(screen.getByRole('button', { name: 'Enable auto-sync' }));
+ fireEvent.click(screen.getByRole('button', { name: 'Enable Auto (Pull and Push)' }));
expect(localPatchCalls).toEqual([{ autoSync: { mode: 'full', enabled: null } }]);
});
@@ -283,7 +343,7 @@ describe('Settings Sync section — three-way mode control (real hooks + dialog)
screen.getByText("You have 2 changes you haven't shared. They will stay on this computer."),
).not.toBeNull();
- fireEvent.click(screen.getByRole('button', { name: 'Enable Follow' }));
+ fireEvent.click(screen.getByRole('button', { name: 'Enable Auto (Pull only)' }));
expect(localPatchCalls).toEqual([{ autoSync: { mode: 'follow', enabled: null } }]);
});
@@ -330,3 +390,219 @@ describe('Settings Sync section — three-way mode control (real hooks + dialog)
);
});
});
+
+describe('Settings Sync section — cycle cadence controls', () => {
+ beforeEach(() => {
+ cleanup();
+ localPatchCalls = [];
+ syncStatus = {
+ state: 'idle',
+ hasRemote: true,
+ syncEnabled: true,
+ syncMode: 'follow',
+ ahead: 0,
+ remote: {
+ label: 'inkeep/open-knowledge',
+ webUrl: 'https://github.com/inkeep/open-knowledge',
+ },
+ };
+ projectLocalConfig = { autoSync: { mode: 'follow' } };
+ projectConfig = { autoSync: { default: null }, content: { attachmentFolderPath: 'assets' } };
+ projectLocalSynced = true;
+ projectSynced = true;
+ });
+
+ test('Manual hides the cadence card entirely', async () => {
+ // Nothing is scheduled in Manual, so a disabled control would imply the
+ // setting applies here and is merely blocked.
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ syncStatus = { ...syncStatus, syncMode: 'off' } as SyncStatus;
+
+ await renderSyncSection();
+
+ expect(screen.queryByTestId('settings-sync-intervals')).toBeNull();
+ });
+
+ test('the cadence controls sit behind the Advanced disclosure', async () => {
+ // The module-level Collapsible stub renders its content unconditionally, so
+ // this asserts the TRIGGER exists rather than open/close behavior — enough
+ // to catch a regression that drops the disclosure and leaves the controls
+ // with no way in.
+ await renderSyncSection();
+
+ expect(screen.queryByTestId('settings-sync-advanced-trigger')).not.toBeNull();
+ });
+
+ test('Manual hides the disclosure along with the controls', async () => {
+ projectLocalConfig = { autoSync: { mode: 'off' } };
+ syncStatus = { ...syncStatus, syncMode: 'off' } as SyncStatus;
+
+ await renderSyncSection();
+
+ expect(screen.queryByTestId('settings-sync-advanced-trigger')).toBeNull();
+ });
+
+ test('Pull-only shows the pull cadence and hides the push one', async () => {
+ await renderSyncSection();
+
+ expect(screen.queryByTestId('settings-sync-pull-interval')).not.toBeNull();
+ // A follower never pushes on a schedule, so the push knob would be inert.
+ expect(screen.queryByTestId('settings-sync-push-interval')).toBeNull();
+ });
+
+ test('Pull and Push shows both cadence controls', async () => {
+ projectLocalConfig = { autoSync: { mode: 'full' } };
+ syncStatus = { ...syncStatus, syncMode: 'full' } as SyncStatus;
+
+ await renderSyncSection();
+
+ expect(screen.queryByTestId('settings-sync-pull-interval')).not.toBeNull();
+ expect(screen.queryByTestId('settings-sync-push-interval')).not.toBeNull();
+ });
+
+ /** The recorder Select stores the selected value on the wrapper it renders. */
+ function selectedSeconds(testId: string): string | null | undefined {
+ return screen.getByTestId(testId).closest('[data-value]')?.getAttribute('data-value');
+ }
+
+ test('an unset cadence selects the shipped default rather than nothing', async () => {
+ // A control opening on no value renders an empty trigger and writes nothing
+ // until touched, which reads as "sync has no cadence".
+ await renderSyncSection();
+
+ expect(selectedSeconds('settings-sync-pull-interval')).toBe('30');
+ });
+
+ test('a stored cadence is the selected one', async () => {
+ projectLocalConfig = { autoSync: { mode: 'follow', pullIntervalSeconds: 900 } };
+
+ await renderSyncSection();
+
+ expect(selectedSeconds('settings-sync-pull-interval')).toBe('900');
+ });
+
+ test('presets render as human durations, not raw seconds', async () => {
+ // Guards the label formatter: a missing case would surface "900 seconds".
+ await renderSyncSection();
+
+ const labels = screen.getAllByRole('option').map((o) => o.textContent);
+ expect(labels).toEqual(['30 seconds', '1 minute', '5 minutes', '15 minutes', '1 hour']);
+ });
+
+ test('changing one leg writes both, leaving the other at its resolved value', async () => {
+ // Both legs ride one patch so the engine re-arms from a single config
+ // persist; the untouched leg must carry its current value, not undefined.
+ projectLocalConfig = { autoSync: { mode: 'full', pushIntervalSeconds: 900 } };
+ syncStatus = { ...syncStatus, syncMode: 'full' } as SyncStatus;
+ const user = userEvent.setup();
+
+ await renderSyncSection();
+ const pullCard = screen.getByTestId('settings-sync-pull-interval').closest('[data-value]');
+ if (pullCard === null || pullCard === undefined) throw new Error('expected a pull select');
+ await user.click(within(pullCard as HTMLElement).getByRole('option', { name: '5 minutes' }));
+
+ expect(localPatchCalls).toContainEqual({
+ autoSync: { pullIntervalSeconds: 300, pushIntervalSeconds: 900 },
+ });
+ });
+
+ test('a signed-out follower is told the anonymous floor overrides the setting', async () => {
+ // Otherwise the control claims a 30 s cadence the server will not honor.
+ syncStatus = {
+ ...syncStatus,
+ pushPermission: { checkStatus: 'denied', deniedReason: 'not-authenticated' },
+ } as SyncStatus;
+
+ await renderSyncSection();
+
+ expect(screen.queryByTestId('settings-sync-anon-floor-hint')).not.toBeNull();
+ });
+
+ test('a signed-in follower sees no anonymous-floor caption', async () => {
+ syncStatus = { ...syncStatus, pushPermission: { checkStatus: 'allowed' } } as SyncStatus;
+
+ await renderSyncSection();
+
+ expect(screen.queryByTestId('settings-sync-anon-floor-hint')).toBeNull();
+ });
+});
+
+describe('Settings Sync section — Advanced disclosure intent', () => {
+ beforeEach(() => {
+ cleanup();
+ syncStatus = {
+ state: 'idle',
+ hasRemote: true,
+ syncEnabled: true,
+ syncMode: 'follow',
+ ahead: 0,
+ remote: {
+ label: 'inkeep/open-knowledge',
+ webUrl: 'https://github.com/inkeep/open-knowledge',
+ },
+ };
+ projectLocalConfig = { autoSync: { mode: 'follow' } };
+ projectConfig = { autoSync: { default: null }, content: { attachmentFolderPath: 'assets' } };
+ projectLocalSynced = true;
+ projectSynced = true;
+ });
+
+ /** The disclosure's open state, read off the recorder Collapsible. */
+ function disclosureState(): string | null | undefined {
+ return screen
+ .getByTestId('settings-sync-intervals')
+ .closest('[data-state]')
+ ?.getAttribute('data-state');
+ }
+
+ test('arriving with no intent leaves the disclosure collapsed', async () => {
+ // Reaching Sync any other way — header gear, sidebar, plain #settings/sync —
+ // must not expand it, which is the point of calling it Advanced.
+ await renderSyncSection();
+
+ expect(disclosureState()).toBe('closed');
+ });
+
+ test('the popover deep link lands on Sync with the disclosure expanded', async () => {
+ // The link names the cadence, so it must put the user ON the control rather
+ // than on a collapsed row they still have to find.
+ const { openSyncSettings } = await import('@/lib/use-settings-route');
+ openSyncSettings({ advanced: true });
+
+ await renderSyncSection();
+
+ expect(disclosureState()).toBe('open');
+ });
+
+ test('the deep link still lands expanded under StrictMode', async () => {
+ // The app mounts under StrictMode (main.tsx), so the deep link has to work
+ // with every render-phase hook double-invoked and every mount effect run
+ // twice against a flag that only one read can win.
+ //
+ // SCOPE: this does NOT distinguish consuming the flag in an effect from
+ // consuming it in a `useState` initializer — measured on React 19.2, the
+ // initializer is invoked twice but React commits the FIRST call's value,
+ // so both spellings land expanded. The effect is preferred for render
+ // purity (see SyncSection), not because this test can tell them apart.
+ const { openSyncSettings } = await import('@/lib/use-settings-route');
+ openSyncSettings({ advanced: true });
+
+ await renderSyncSection({ strict: true });
+
+ expect(disclosureState()).toBe('open');
+ });
+
+ test('the intent is one-shot — a later visit to Sync is collapsed again', async () => {
+ // A flag that stuck would make every subsequent Sync visit open, turning a
+ // deliberate deep link into permanent state.
+ const { openSyncSettings } = await import('@/lib/use-settings-route');
+ openSyncSettings({ advanced: true });
+ await renderSyncSection();
+ expect(disclosureState()).toBe('open');
+
+ cleanup();
+ await renderSyncSection();
+
+ expect(disclosureState()).toBe('closed');
+ });
+});
diff --git a/packages/app/src/components/settings/SyncSection.tsx b/packages/app/src/components/settings/SyncSection.tsx
index 545f00eb4..9678a10df 100644
--- a/packages/app/src/components/settings/SyncSection.tsx
+++ b/packages/app/src/components/settings/SyncSection.tsx
@@ -12,12 +12,14 @@
import {
isSyncMode,
modeFromCommittedDefault,
+ resolveAutoSyncIntervals,
resolveLocalAutoSyncMode,
+ SYNC_INTERVAL_PRESET_SECONDS,
type SyncMode,
} from '@inkeep/open-knowledge-core';
import { Trans, useLingui } from '@lingui/react/macro';
import { ArrowUpRight, ChevronRight } from 'lucide-react';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
import { toast } from 'sonner';
import { AuthModal } from '@/components/AuthModal';
import { EnableSyncConfirmDialog } from '@/components/EnableSyncConfirmDialog';
@@ -33,15 +35,24 @@ import {
} from '@/components/SyncStatusBadge';
import { Button } from '@/components/ui/button';
import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible';
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from '@/components/ui/select';
import { ToggleGroup, ToggleGroupItem } from '@/components/ui/toggle-group';
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
import {
useSyncDefaultWriter,
+ useSyncIntervalWriter,
useSyncModeSelection,
useSyncModeWriter,
} from '@/hooks/use-enable-sync-with-confirm';
import { useGitSyncStatus } from '@/hooks/use-git-sync-status';
import { useConfigContext } from '@/lib/config-provider';
+import { consumeSyncAdvancedIntent } from '@/lib/use-settings-route';
import { ScopeBadge } from './ScopeBadge';
import { SettingsSectionHeader } from './SettingsSectionHeader';
@@ -58,6 +69,30 @@ export function SyncSection() {
useConfigContext();
const modeWriter = useSyncModeWriter();
const defaultWriter = useSyncDefaultWriter();
+ const intervalWriter = useSyncIntervalWriter();
+ const [advancedOpen, setAdvancedOpen] = useState(false);
+ // Consumed in an EFFECT, not a `useState` initializer. `consumeSyncAdvancedIntent`
+ // mutates module state, and render must stay pure: React may call a component
+ // (and its state initializers) more times than it commits — StrictMode does so
+ // today, and a discarded or restarted render would silently swallow the intent
+ // under future concurrent behavior. An effect runs after commit, so the flag is
+ // consumed exactly as many times as the component actually mounts; its own
+ // StrictMode double-run re-reads an already-cleared flag and no-ops.
+ //
+ // Not a bug fix — today both spellings open the disclosure. Measured on React
+ // 19.2: StrictMode invokes the initializer twice but commits the FIRST call's
+ // value, so the burned flag never reaches the committed state. This is about
+ // not depending on that.
+ //
+ // This section renders only while `sync` is the active settings id, so the
+ // consume fires exactly when the user lands on Sync — never on some other
+ // section that happens to mount first.
+ useEffect(() => {
+ if (consumeSyncAdvancedIntent()) setAdvancedOpen(true);
+ }, []);
+ // Absent leaves resolve to the shipped 30 s / 60 s, so a project whose config
+ // predates these keys shows today's cadence rather than an empty control.
+ const intervals = resolveAutoSyncIntervals(projectLocalConfig?.autoSync);
// Per-machine mode: an explicit `autoSync.mode` wins, else derive from the
// legacy `enabled` boolean; never-answered resolves to off for display (the
// committed shared default has its own control below).
@@ -174,6 +209,13 @@ export function SyncSection() {
status?.pushPermission?.checkStatus === 'denied' &&
status.pushPermission.deniedReason !== 'not-authenticated' &&
!notFoundAsIdentity;
+ // No credentials at all — the same condition the server resolves as the
+ // anonymous pull tier, which floors this machine's pull cadence. Used only to
+ // caption the interval control, so a proxy off the push probe is enough; the
+ // tier itself is resolved server-side and not carried in the status payload.
+ const isSignedOut =
+ status?.pushPermission?.checkStatus === 'denied' &&
+ status.pushPermission.deniedReason === 'not-authenticated';
// The masquerade parks as auth-error, whose paused label reads "Reconnect
// required" — the prescription every other surface withdraws for it — so it
// shows the failure's own copy instead. Keyed on the same (pausedReason,
@@ -249,6 +291,58 @@ export function SyncSection() {
}
}
+ /**
+ * Preset labels. A switch over the fixed preset list rather than a plural
+ * macro: five known values give translators five natural strings instead of
+ * a unit-plus-number template that reads awkwardly in several locales.
+ */
+ function intervalLabel(seconds: number): string {
+ switch (seconds) {
+ case 30:
+ return t`30 seconds`;
+ case 60:
+ return t`1 minute`;
+ case 300:
+ return t`5 minutes`;
+ case 900:
+ return t`15 minutes`;
+ case 3600:
+ return t`1 hour`;
+ default:
+ // Reached via `intervalOptions` when a hand-edited config carries an
+ // off-preset value (the schema admits any integer in range). Showing
+ // the raw number keeps the control honest instead of snapping the
+ // display to a preset the file does not say.
+ return t`${seconds} seconds`;
+ }
+ }
+
+ /**
+ * The presets, plus the stored value when it is off-preset. Without the
+ * extra entry a hand-edited `pullIntervalSeconds: 45` matched no item, and
+ * Radix fills the trigger by portaling the SELECTED item's text — no item,
+ * no text: a blank control with no indication of the cadence in effect,
+ * where touching the other leg would silently rewrite this one.
+ */
+ function intervalOptions(current: number): number[] {
+ return (SYNC_INTERVAL_PRESET_SECONDS as readonly number[]).includes(current)
+ ? [...SYNC_INTERVAL_PRESET_SECONDS]
+ : [...SYNC_INTERVAL_PRESET_SECONDS, current].sort((a, b) => a - b);
+ }
+
+ function onIntervalChange(leg: 'pull' | 'push', raw: string): void {
+ const seconds = Number(raw);
+ if (!Number.isFinite(seconds) || intervalWriter === null) return;
+ const result = intervalWriter({
+ pullIntervalSeconds: leg === 'pull' ? seconds : intervals.pullIntervalSeconds,
+ pushIntervalSeconds: leg === 'push' ? seconds : intervals.pushIntervalSeconds,
+ });
+ if (!result.ok) {
+ const detail = result.error;
+ toast.error(t`Failed to update the sync interval — ${detail}`);
+ }
+ }
+
return (
<section aria-labelledby="settings-sync-title" className="space-y-3">
<SettingsSectionHeader
@@ -258,8 +352,9 @@ export function SyncSection() {
level="block"
>
<Trans>
- Keep this project in sync with your git remote. Follow fetches updates without pushing;
- full sync pushes your commits too. Turning sync on requires confirmation.
+ Keep this project in sync with your git remote. Auto (Pull only) brings in updates without
+ pushing; Auto (Pull and Push) sends your edits too. Turning auto-sync on requires
+ confirmation.
</Trans>
</SettingsSectionHeader>
<div className="rounded-md border p-3">
@@ -270,15 +365,13 @@ export function SyncSection() {
</div>
<p className="text-muted-foreground text-1sm" data-testid="settings-sync-body">
{localMode === 'full' ? (
- <Trans>Full sync — your commits push and remote changes pull automatically.</Trans>
+ <Trans>Your edits are committed and pushed to your remote automatically.</Trans>
) : localMode === 'follow' ? (
- <Trans>
- Follow — updates flow in from your remote; your edits stay on this computer.
- </Trans>
+ <Trans>Updates flow in from your remote; your edits stay on this computer.</Trans>
) : (
- <Trans>
- Sync is off — your edits stay on this computer until you commit and push manually.
- </Trans>
+ // Manual is a resting mode with in-app actions, not a dead end —
+ // the old "until you commit and push manually" implied a terminal.
+ <Trans>Nothing moves until you ask — pull and push from the sync menu.</Trans>
)}
</p>
{status?.remote ? (
@@ -325,14 +418,14 @@ export function SyncSection() {
className={SYNC_SELECTED_TOGGLE_CLASS}
data-testid="settings-sync-mode-off"
>
- <Trans>Off</Trans>
+ <Trans>Manual</Trans>
</ToggleGroupItem>
<ToggleGroupItem
value="follow"
className={SYNC_SELECTED_TOGGLE_CLASS}
data-testid="settings-sync-mode-follow"
>
- <Trans>Follow</Trans>
+ <Trans>Auto (Pull only)</Trans>
</ToggleGroupItem>
{genuineReadOnlyDenied ? (
<Tooltip>
@@ -353,7 +446,7 @@ export function SyncSection() {
}
data-testid="settings-sync-mode-full"
>
- <Trans>Full</Trans>
+ <Trans>Auto (Pull and Push)</Trans>
</ToggleGroupItem>
</span>
</TooltipTrigger>
@@ -367,7 +460,7 @@ export function SyncSection() {
className={SYNC_SELECTED_TOGGLE_CLASS}
data-testid="settings-sync-mode-full"
>
- <Trans>Full</Trans>
+ <Trans>Auto (Pull and Push)</Trans>
</ToggleGroupItem>
)}
</ToggleGroup>
@@ -394,8 +487,8 @@ export function SyncSection() {
<div className="mt-2 flex items-start gap-2" data-testid="settings-sync-switch-follow">
<p className="text-1sm text-muted-foreground flex-1 min-w-0">
<Trans>
- Auto-sync is paused — you don't have permission to push to this repo. Switch to
- Follow to keep receiving updates.
+ Auto-sync is paused — you don't have permission to push to this repo. Switch to Auto
+ (Pull only) to keep receiving updates.
</Trans>
</p>
<Button
@@ -405,7 +498,7 @@ export function SyncSection() {
onClick={() => onModeSelect('follow')}
data-testid="settings-sync-switch-follow-action"
>
- <Trans>Switch to Follow</Trans>
+ <Trans>Switch to Auto (Pull only)</Trans>
</Button>
</div>
)}
@@ -424,8 +517,8 @@ export function SyncSection() {
<Trans>You don't have permission to push to this repo.</Trans>
) : (
<Trans>
- You don't have permission to push to this repo. Follow can still keep your copy up
- to date.
+ You don't have permission to push to this repo. Auto (Pull only) can still keep your
+ copy up to date.
</Trans>
)}
</p>
@@ -471,6 +564,109 @@ export function SyncSection() {
</div>
)}
</div>
+ {/* Cadence is meaningless in Manual — nothing is scheduled — so the card
+ is absent rather than disabled: a greyed control implies the setting
+ applies here and is merely blocked. */}
+ {localMode !== 'off' && (
+ <Collapsible open={advancedOpen} onOpenChange={setAdvancedOpen}>
+ <CollapsibleTrigger asChild>
+ <Button
+ variant="ghost"
+ size="sm"
+ className="group gap-1 px-1.5 text-muted-foreground"
+ data-testid="settings-sync-advanced-trigger"
+ >
+ <ChevronRight
+ className="size-3.5 transition-transform group-data-[state=open]:rotate-90"
+ aria-hidden
+ />
+ <Trans>Advanced</Trans>
+ </Button>
+ </CollapsibleTrigger>
+ <CollapsibleContent className="pt-2">
+ <div className="rounded-md border p-3 space-y-3" data-testid="settings-sync-intervals">
+ <div className="flex items-start justify-between gap-4">
+ <div className="min-w-0 flex-1">
+ <div id="settings-sync-pull-interval-label" className="text-sm font-medium">
+ <Trans>Check for updates every</Trans>
+ </div>
+ <p className="text-muted-foreground text-1sm">
+ <Trans>How often this computer pulls changes from your remote.</Trans>
+ </p>
+ </div>
+ <Select
+ value={String(intervals.pullIntervalSeconds)}
+ onValueChange={(v) => onIntervalChange('pull', v)}
+ disabled={!projectLocalSynced}
+ >
+ <SelectTrigger
+ size="sm"
+ className="w-40 shrink-0"
+ aria-labelledby="settings-sync-pull-interval-label"
+ data-testid="settings-sync-pull-interval"
+ >
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ {intervalOptions(intervals.pullIntervalSeconds).map((seconds) => (
+ <SelectItem key={seconds} value={String(seconds)}>
+ {intervalLabel(seconds)}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ </div>
+ {isSignedOut && (
+ // The anonymous pull floor is enforced server-side, so a signed-out
+ // follower who picks 30 s silently keeps polling at the floor. Say so
+ // rather than letting the control claim a cadence it will not get.
+ <p
+ className="text-1sm text-muted-foreground"
+ data-testid="settings-sync-anon-floor-hint"
+ >
+ <Trans>
+ While you're signed out, updates are checked at most every 3 minutes regardless
+ of this setting.
+ </Trans>
+ </p>
+ )}
+ {localMode === 'full' && (
+ <div className="flex items-start justify-between gap-4 border-t pt-3">
+ <div className="min-w-0 flex-1">
+ <div id="settings-sync-push-interval-label" className="text-sm font-medium">
+ <Trans>Push my edits every</Trans>
+ </div>
+ <p className="text-muted-foreground text-1sm">
+ <Trans>Each push is one commit to your remote.</Trans>
+ </p>
+ </div>
+ <Select
+ value={String(intervals.pushIntervalSeconds)}
+ onValueChange={(v) => onIntervalChange('push', v)}
+ disabled={!projectLocalSynced}
+ >
+ <SelectTrigger
+ size="sm"
+ className="w-40 shrink-0"
+ aria-labelledby="settings-sync-push-interval-label"
+ data-testid="settings-sync-push-interval"
+ >
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ {intervalOptions(intervals.pushIntervalSeconds).map((seconds) => (
+ <SelectItem key={seconds} value={String(seconds)}>
+ {intervalLabel(seconds)}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ </div>
+ )}
+ </div>
+ </CollapsibleContent>
+ </Collapsible>
+ )}
<div className="rounded-md border p-3 space-y-2" data-testid="settings-sync-default">
<div className="space-y-0.5">
{/* The block heading is per-machine, but this one control is committed.
@@ -511,21 +707,21 @@ export function SyncSection() {
className={SYNC_SELECTED_TOGGLE_CLASS}
data-testid="settings-sync-default-off"
>
- <Trans>Off</Trans>
+ <Trans>Manual</Trans>
</ToggleGroupItem>
<ToggleGroupItem
value="follow"
className={SYNC_SELECTED_TOGGLE_CLASS}
data-testid="settings-sync-default-follow"
>
- <Trans>Follow</Trans>
+ <Trans>Auto (Pull only)</Trans>
</ToggleGroupItem>
<ToggleGroupItem
value="full"
className={SYNC_SELECTED_TOGGLE_CLASS}
data-testid="settings-sync-default-full"
>
- <Trans>Full</Trans>
+ <Trans>Auto (Pull and Push)</Trans>
</ToggleGroupItem>
</ToggleGroup>
</div>
diff --git a/packages/app/src/components/share-receive-miss-content.tsx b/packages/app/src/components/share-receive-miss-content.tsx
index 1e774fa09..3a5b7c585 100644
--- a/packages/app/src/components/share-receive-miss-content.tsx
+++ b/packages/app/src/components/share-receive-miss-content.tsx
@@ -133,7 +133,7 @@ function EnableAutoSyncButton({ onEnabled }: { onEnabled?: () => void }) {
<>
<Button onClick={() => onToggleRequest(true)} data-testid="share-receive-miss-enable-sync">
<RefreshCw className="size-4" aria-hidden="true" />
- <Trans>Enable auto-sync</Trans>
+ <Trans>Enable Auto (Pull and Push)</Trans>
</Button>
<EnableSyncConfirmDialog
open={confirmOpen}
diff --git a/packages/app/src/components/ui/popover.tsx b/packages/app/src/components/ui/popover.tsx
index b6a38e8a9..1f6873868 100644
--- a/packages/app/src/components/ui/popover.tsx
+++ b/packages/app/src/components/ui/popover.tsx
@@ -37,4 +37,8 @@ function PopoverAnchor({ ...props }: React.ComponentProps<typeof PopoverPrimitiv
return <PopoverPrimitive.Anchor data-slot="popover-anchor" {...props} />;
}
-export { Popover, PopoverAnchor, PopoverContent, PopoverTrigger };
+function PopoverClose({ ...props }: React.ComponentProps<typeof PopoverPrimitive.Close>) {
+ return <PopoverPrimitive.Close data-slot="popover-close" {...props} />;
+}
+
+export { Popover, PopoverAnchor, PopoverClose, PopoverContent, PopoverTrigger };
diff --git a/packages/app/src/hooks/use-enable-sync-with-confirm.ts b/packages/app/src/hooks/use-enable-sync-with-confirm.ts
index 1bfdafd7f..7ec4ed206 100644
--- a/packages/app/src/hooks/use-enable-sync-with-confirm.ts
+++ b/packages/app/src/hooks/use-enable-sync-with-confirm.ts
@@ -20,10 +20,7 @@
* hook.
*/
import {
- displayActiveMode,
- hasEverEnabledSync,
humanFormat,
- isSyncPaused,
resolveLocalAutoSyncMode,
type StoredSyncActiveMode,
type StoredSyncMode,
@@ -121,6 +118,35 @@ export function useSyncDefaultWriter(): SyncDefaultWriter | null {
};
}
+/**
+ * Adapter for the per-machine scheduled-cycle cadence
+ * (`autoSync.{pull,push}IntervalSeconds`). Project-local, alongside `mode` —
+ * how hard THIS machine polls is not a value to ship at teammates through git,
+ * so there is deliberately no committed counterpart the way `mode` has
+ * `autoSync.default`.
+ *
+ * Both legs are written together so a single config persist carries the whole
+ * cadence; the engine's `setIntervals` re-arms from one notification rather
+ * than two.
+ */
+type SyncIntervalWriter = (next: {
+ pullIntervalSeconds: number;
+ pushIntervalSeconds: number;
+}) => { ok: true } | { ok: false; error: string };
+
+/**
+ * Build a `SyncIntervalWriter` targeting the project-local config binding.
+ * Returns `null` until the binding mounts.
+ */
+export function useSyncIntervalWriter(): SyncIntervalWriter | null {
+ const { projectLocalBinding } = useConfigContext();
+ if (projectLocalBinding === null) return null;
+ return (next) => {
+ const result = projectLocalBinding.patch({ autoSync: next });
+ return result.ok ? { ok: true } : { ok: false, error: humanFormat(result.error) };
+ };
+}
+
interface UseEnableSyncWithConfirmResult {
/** Whether the confirmation dialog is open. */
confirmOpen: boolean;
@@ -289,36 +315,39 @@ export function useAutoSyncPatchWriter(): AutoSyncPatchWriter | null {
}
interface UseBadgeSyncControlsResult {
- /** Sync is running (mode pull or full) — the header Switch is on. */
- active: boolean;
- /** Sync was enabled then turned off — badge stays visible, mode still editable. */
- paused: boolean;
- /** Sync has ever been enabled — gates the manual "Sync" action. */
- everEnabled: boolean;
- /** The value the Full/Follow control shows: live mode when active, else the resume memory. */
- toggleMode: SyncActiveMode;
+ /**
+ * The resolved per-machine mode the selector shows. `off` is the product's
+ * "Manual" — nothing moves on a timer, but the manual actions still run.
+ */
+ mode: SyncMode;
confirmOpen: boolean;
setConfirmOpen: (open: boolean) => void;
/** Drives the confirm dialog variant ('follow' vs 'full'); null when idle. */
pendingMode: ConfirmableMode | null;
- /** Unpushed commits disclosed on a full→follow downgrade confirm (0 otherwise). */
+ /** Unpushed commits disclosed on a full to follow downgrade confirm (0 otherwise). */
strandedCommitCount: number;
- /** Header Switch handler: on = resume into `toggleMode`, off = pause. */
- onToggleActive: (next: boolean) => void;
- /** Full/Follow control handler. */
- onModeSelect: (next: SyncActiveMode) => void;
+ /** Mode selector handler. */
+ onModeSelect: (next: SyncMode) => void;
onConfirm: () => void;
}
/**
- * Sync controls for the badge popover, where the header Switch means
- * active-vs-paused (not a mode) and a separate Full/Follow control sets the
- * mode. Pausing persists as `mode: 'off'` plus a remembered `resumeMode`, so an
- * older app reads a paused project as not-syncing (never pushes) while this app
- * can restore the prior mode. Entering `full` (which pushes) always confirms;
- * resuming into or staying on `pull` never pushes, so it applies immediately.
- * While paused, changing the Full/Follow control only updates the resume memory
- * — nothing syncs until the Switch is turned back on.
+ * Sync-mode controls for the badge popover's three-way selector: Manual
+ * (`off`), Auto pull-only (`follow`), Auto push-and-pull (`full`).
+ *
+ * Manual is a resting mode, not an opt-out: the engine schedules nothing, but
+ * the popover's Pull / Push / Pull-and-Push actions still run one-shot cycles.
+ * That is why this hook no longer writes `resumeMode` — the old design stored a
+ * paused project as `off` plus a memory of which mode to resume into, because
+ * `off` had no affordances of its own. Manual has its own, so the memory has
+ * nothing left to remember. Configs written by an older build still carry the
+ * key; it is inert (`resolveLocalAutoSyncMode` never reads it) and every write
+ * here clears it.
+ *
+ * Selecting Manual applies immediately — standing an automation down never
+ * pushes or rewrites the tree. Selecting either auto mode crosses a consent
+ * boundary (`full` starts pushing on a timer; `follow` strands any unpushed
+ * commits), so both confirm.
*/
export function useBadgeSyncControls(
autoSync:
@@ -335,11 +364,7 @@ export function useBadgeSyncControls(
const [confirmOpen, setConfirmOpen] = useState(false);
const [pendingMode, setPendingMode] = useState<ConfirmableMode | null>(null);
- const localMode = resolveLocalAutoSyncMode(autoSync) ?? 'off';
- const active = localMode === 'follow' || localMode === 'full';
- const paused = isSyncPaused(autoSync);
- const everEnabled = hasEverEnabledSync(autoSync);
- const toggleMode = displayActiveMode(autoSync);
+ const mode = resolveLocalAutoSyncMode(autoSync) ?? 'off';
function apply(patch: AutoSyncPatch): boolean {
if (writer === null) {
@@ -356,36 +381,13 @@ export function useBadgeSyncControls(
return true;
}
- function onToggleActive(next: boolean) {
- if (next) {
- // Resume into the remembered mode. Full pushes, so it confirms; pull does
- // not, so it applies immediately (the user consented before pausing).
- if (toggleMode === 'full') {
- setPendingMode('full');
- setConfirmOpen(true);
- return;
- }
- apply({ mode: 'follow', enabled: null, resumeMode: null });
- return;
- }
- // Pause: store 'off' (so an old app never pushes) and remember the mode.
- apply({
- mode: 'off',
- enabled: null,
- resumeMode: active ? (localMode as SyncActiveMode) : toggleMode,
- });
- }
-
- function onModeSelect(next: SyncActiveMode) {
- if (next === toggleMode) return;
- if (!active) {
- // Paused/off: just remember which mode to resume into — nothing syncs yet,
- // so no push and no confirmation.
- apply({ resumeMode: next });
+ function onModeSelect(next: SyncMode) {
+ if (next === mode) return;
+ if (next === 'off') {
+ // Standing the timer down is the safe direction — apply immediately.
+ apply({ mode: 'off', enabled: null, resumeMode: null });
return;
}
- // Active: entering full pushes; downgrading full→follow strands unpushed
- // commits — both cross a consent boundary, so confirm.
setPendingMode(next);
setConfirmOpen(true);
}
@@ -399,15 +401,11 @@ export function useBadgeSyncControls(
}
return {
- active,
- paused,
- everEnabled,
- toggleMode,
+ mode,
confirmOpen,
setConfirmOpen,
pendingMode,
strandedCommitCount: pendingMode === 'follow' ? aheadCount : 0,
- onToggleActive,
onModeSelect,
onConfirm,
};
diff --git a/packages/app/src/hooks/use-git-sync-status.ts b/packages/app/src/hooks/use-git-sync-status.ts
index e2528204e..bf50fb8b3 100644
--- a/packages/app/src/hooks/use-git-sync-status.ts
+++ b/packages/app/src/hooks/use-git-sync-status.ts
@@ -9,6 +9,7 @@ import type {
PullOutcome,
SyncErrorCode,
SyncMode,
+ SyncStatusSchema,
} from '@inkeep/open-knowledge-core';
import { useEffect, useState } from 'react';
import { subscribeToDocumentsChanged } from '@/lib/documents-events';
@@ -34,9 +35,52 @@ type GitSyncState =
* narrower `GitPushPermission` name used elsewhere in the app.
*/
+/**
+ * Compile-time drift guard between this hand-maintained interface and the
+ * server's wire schema.
+ *
+ * The two are not aliases — `GitSyncStatus` deliberately narrows (it omits
+ * server-only bookkeeping like `lastPushedSha` and `consecutiveFailures`, which
+ * no UI reads) and relaxes required-ness where a version-skewed engine may omit
+ * a field. What it must NEVER do is declare a field the server does not send:
+ * that reads as `undefined` at runtime with no type error at the use site, so
+ * the UI silently renders a fallback forever. `Exclude` resolves to `never`
+ * while every key here exists on the wire, and to the offending key names
+ * otherwise — which fails assignment and names them in the error.
+ *
+ * Keyed off `SyncStatusSchema.shape`, NOT `keyof SyncStatusWire`: the schema is
+ * `.loose()`, so the inferred type carries an index signature and `keyof` on it
+ * includes `string` — which makes `Exclude` resolve to `never` unconditionally
+ * and turns this guard into decoration. The shape has only the declared keys.
+ */
+type ClientFieldsNotOnWire = Exclude<keyof GitSyncStatus, keyof typeof SyncStatusSchema.shape>;
+// Annotate-with-conditional, not `= null as never`: `never` is assignable to
+// EVERY type, so annotating the offending union and assigning `never` type-checks
+// no matter what drifts. Here the annotation collapses to `true` only while the
+// union is empty; otherwise it becomes the offending key names and rejects `true`.
+const _noClientOnlyFields: [ClientFieldsNotOnWire] extends [never] ? true : ClientFieldsNotOnWire =
+ true;
+void _noClientOnlyFields;
+
export interface GitSyncStatus {
state: GitSyncState;
lastSyncUtc: string | null;
+ /**
+ * When a sync op last completed successfully — a push or pull that reached
+ * the remote, whether or not content moved. NOT the panel-open fetch, which
+ * fires whenever the user looks and would pin this to "just now". The
+ * fallback behind the freshness line when the per-direction legs are absent.
+ * Optional for version-skew safety; absent from an engine that predates it.
+ */
+ lastRunUtc?: string | null;
+ /**
+ * The same successful-run signal split by direction, so the panel can say
+ * WHICH leg ran rather than collapsing both into one "Updated". Same
+ * version-skew optionality as `lastRunUtc`; an older engine sends neither and
+ * the panel falls back to the combined stamp.
+ */
+ lastPullOkUtc?: string | null;
+ lastPushOkUtc?: string | null;
lastFetchUtc: string | null;
/**
* Completion timestamp + bounded outcome of the last pull (background or
@@ -89,6 +133,12 @@ export interface GitSyncStatus {
pullError?: string;
pullErrorCode?: SyncErrorCode;
pausedReason?: string;
+ /**
+ * Tracked paths whose local edits overlap the incoming merge, present only
+ * while `pausedReason` is `external-changes-pending`. The sync popover lists
+ * them and offers commit/discard; absent (never empty) when nothing blocks.
+ */
+ blockingPaths?: string[];
/**
* Push-permission probe outcome. Absent when the probe hasn't resolved
* yet (cold start) or the origin isn't a github.com URL. UI consumers
diff --git a/packages/app/src/hooks/use-git-worktree-status.dom.test.tsx b/packages/app/src/hooks/use-git-worktree-status.dom.test.tsx
new file mode 100644
index 000000000..e864df2cc
--- /dev/null
+++ b/packages/app/src/hooks/use-git-worktree-status.dom.test.tsx
@@ -0,0 +1,199 @@
+/**
+ * Panel-open fetch behavior for {@link useGitWorktreeStatus}.
+ *
+ * The throttle is module-scoped state, so each case re-imports the module via
+ * `vi.resetModules()` to get a fresh window rather than inheriting the previous
+ * test's timestamp.
+ */
+import { cleanup, renderHook, waitFor } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
+
+const triggered: string[] = [];
+let triggerResult: Promise<void> = Promise.resolve();
+
+vi.mock('@/lib/trigger-sync', () => ({
+ triggerSync: (op: string) => {
+ triggered.push(op);
+ return triggerResult;
+ },
+}));
+
+const cc1Listeners: ((channels: string[]) => void)[] = [];
+
+vi.mock('@/lib/documents-events', () => ({
+ subscribeToDocumentsChanged: (fn: (channels: string[]) => void) => {
+ cc1Listeners.push(fn);
+ return () => {
+ const i = cc1Listeners.indexOf(fn);
+ if (i >= 0) cc1Listeners.splice(i, 1);
+ };
+ },
+}));
+
+/** Fire a CC1 `sync-status` signal at every mounted hook, as the engine does. */
+function signalSyncStatus() {
+ for (const fn of cc1Listeners) fn(['sync-status']);
+}
+
+async function loadHook() {
+ vi.resetModules();
+ const mod = await import('./use-git-worktree-status');
+ return mod.useGitWorktreeStatus;
+}
+
+beforeEach(() => {
+ triggered.length = 0;
+ cc1Listeners.length = 0;
+ triggerResult = Promise.resolve();
+ vi.stubGlobal(
+ 'fetch',
+ vi.fn(async () => ({ ok: true, json: async () => ({ staged: [] }) })),
+ );
+});
+
+afterEach(() => {
+ cleanup();
+ vi.unstubAllGlobals();
+});
+
+describe('useGitWorktreeStatus panel-open fetch', () => {
+ test('refreshes remote refs when the panel opens', async () => {
+ // Opening a panel headed "2 behind" is the user asking about remote state;
+ // `fetch` is the read-only op that can answer without moving their files.
+ const useGitWorktreeStatus = await loadHook();
+ renderHook(() => useGitWorktreeStatus(true));
+
+ await waitFor(() => expect(triggered).toEqual(['fetch']));
+ });
+
+ test('never fetches while the panel is closed', async () => {
+ const useGitWorktreeStatus = await loadHook();
+ renderHook(() => useGitWorktreeStatus(false));
+
+ expect(triggered).toEqual([]);
+ });
+
+ test('throttles a reopen — open/close/open is one network call', async () => {
+ const useGitWorktreeStatus = await loadHook();
+ const first = renderHook(() => useGitWorktreeStatus(true));
+ await waitFor(() => expect(triggered).toEqual(['fetch']));
+ first.unmount();
+
+ renderHook(() => useGitWorktreeStatus(true));
+ // The throttle outlives the unmount on purpose: without that, fidgeting
+ // with the popover would hit the remote on every open.
+ await waitFor(() => expect(triggered).toEqual(['fetch']));
+ });
+
+ test('a failed fetch frees the window so the next open can retry', async () => {
+ // Offline is the common failure. Burning the throttle window on a call that
+ // never reached the engine would leave the panel stale for no reason.
+ triggerResult = Promise.reject(new Error('offline'));
+ const useGitWorktreeStatus = await loadHook();
+ const first = renderHook(() => useGitWorktreeStatus(true));
+ await waitFor(() => expect(triggered).toEqual(['fetch']));
+ first.unmount();
+
+ triggerResult = Promise.resolve();
+ renderHook(() => useGitWorktreeStatus(true));
+ await waitFor(() => expect(triggered).toEqual(['fetch', 'fetch']));
+ });
+});
+
+describe('useGitWorktreeStatus single-flight', () => {
+ /**
+ * A status read is four git subprocesses, and a sync cycle signals CC1 on
+ * every state transition — so an open popover during a sync would otherwise
+ * issue a burst of them, and a slower EARLIER response could land after (and
+ * overwrite) a newer listing.
+ */
+ function deferredFetch() {
+ const resolvers: ((value: unknown) => void)[] = [];
+ const fetchMock = vi.fn(
+ () =>
+ new Promise((resolve) => {
+ resolvers.push(resolve);
+ }),
+ );
+ vi.stubGlobal('fetch', fetchMock);
+ const respond = (index: number, body: unknown) => {
+ resolvers[index]?.({ ok: true, json: async () => body });
+ };
+ return { fetchMock, resolvers, respond };
+ }
+
+ test('collapses a burst of signals into one trailing re-run', async () => {
+ const { fetchMock, respond } = deferredFetch();
+ const useGitWorktreeStatus = await loadHook();
+ renderHook(() => useGitWorktreeStatus(true));
+
+ // The mount read is in flight and unresolved.
+ await waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(1));
+
+ // Five transitions land while it is still open.
+ for (let i = 0; i < 5; i++) signalSyncStatus();
+ expect(fetchMock).toHaveBeenCalledTimes(1);
+
+ // Releasing the first issues exactly ONE trailing re-run, not five.
+ respond(0, { staged: [], readable: true });
+ await waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(2));
+
+ // And that re-run does not itself cascade.
+ respond(1, { staged: [], readable: true });
+ await waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(2));
+ });
+
+ test('a late slow response cannot overwrite a newer listing', async () => {
+ const { fetchMock, respond } = deferredFetch();
+ const useGitHook = await loadHook();
+ const { result } = renderHook(() => useGitHook(true));
+
+ await waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(1));
+ signalSyncStatus();
+
+ // Resolve the mount read with the OLD listing; the queued re-run fires.
+ respond(0, { staged: [{ path: 'stale.md', code: 'M' }], readable: true });
+ await waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(2));
+
+ respond(1, { staged: [{ path: 'fresh.md', code: 'M' }], readable: true });
+ await waitFor(() => expect(result.current.status?.staged?.[0]?.path).toBe('fresh.md'));
+
+ // Single-flight means there is no third in-flight read left to land late.
+ expect(fetchMock).toHaveBeenCalledTimes(2);
+ });
+
+ test('an unreadable read keeps the last good listing rather than blanking it', async () => {
+ // A 200 with empty lists is truthy, so the keep-last-good guard cannot see
+ // the difference — `readable: false` is what distinguishes "git failed"
+ // from "genuinely clean", and showing a false-clean tree would tell the
+ // user a push has nothing to send.
+ const { fetchMock, respond } = deferredFetch();
+ const useGitHook = await loadHook();
+ const { result } = renderHook(() => useGitHook(true));
+
+ await waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(1));
+ respond(0, { staged: [{ path: 'real.md', code: 'M' }], readable: true });
+ await waitFor(() => expect(result.current.status?.staged?.[0]?.path).toBe('real.md'));
+
+ signalSyncStatus();
+ await waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(2));
+ respond(1, { staged: [], readable: false });
+
+ await waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(2));
+ expect(result.current.status?.staged?.[0]?.path).toBe('real.md');
+ });
+
+ test('a server predating the readable field is still trusted', async () => {
+ // `readable !== false`, not `readable === true`: under version skew an old
+ // server sends nothing, and treating that as unreadable would freeze the
+ // panel permanently.
+ const { fetchMock, respond } = deferredFetch();
+ const useGitHook = await loadHook();
+ const { result } = renderHook(() => useGitHook(true));
+
+ await waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(1));
+ respond(0, { staged: [{ path: 'old-server.md', code: 'M' }] });
+
+ await waitFor(() => expect(result.current.status?.staged?.[0]?.path).toBe('old-server.md'));
+ });
+});
diff --git a/packages/app/src/hooks/use-git-worktree-status.ts b/packages/app/src/hooks/use-git-worktree-status.ts
new file mode 100644
index 000000000..0f99e922c
--- /dev/null
+++ b/packages/app/src/hooks/use-git-worktree-status.ts
@@ -0,0 +1,150 @@
+/**
+ * Hook for `GET /api/git/worktree-status` — the `git status` listing the sync
+ * popover renders under its action buttons.
+ *
+ * Deliberately separate from `useGitSyncStatus`. That one is the engine's state
+ * machine, pushed over CC1 on every transition and mounted app-wide by the
+ * badge. This one is a working-tree read that only matters while the popover is
+ * open, so it is `enabled`-gated and polled rather than broadcast: putting a
+ * file listing on the CC1 hot path would make every engine transition ship a
+ * potentially large payload to every client.
+ *
+ * Refreshes on three triggers: mount (when enabled), a CC1 `sync-status` signal
+ * (a completed push/pull changes what is dirty), and a slow interval that
+ * catches edits made outside the app while the popover sits open.
+ */
+import type { GitWorktreeStatusSuccess } from '@inkeep/open-knowledge-core';
+import { useEffect, useState } from 'react';
+import { subscribeToDocumentsChanged } from '@/lib/documents-events';
+import { triggerSync } from '@/lib/trigger-sync';
+
+export type GitWorktreeStatus = GitWorktreeStatusSuccess;
+
+/**
+ * Poll cadence while the popover is open. Slow on purpose — the CC1 signal
+ * already covers every change the engine itself makes, so this interval exists
+ * only to catch a terminal `git add` the app never hears about.
+ */
+const WORKTREE_POLL_MS = 5_000;
+
+/**
+ * Minimum gap between panel-open fetches. Opening, closing, and reopening the
+ * popover is a normal fidget; without this it would be a network call each
+ * time. The outgoing listing is read live off disk regardless, so a suppressed
+ * fetch only means the ahead/behind counts and the incoming list stay as fresh
+ * as the last 30 seconds.
+ */
+const FETCH_THROTTLE_MS = 30_000;
+
+/**
+ * Module-scoped rather than per-hook: two surfaces mounting this hook at once
+ * (badge popover plus a future settings pane) should share one budget, and the
+ * value has to outlive the popover's unmount to throttle a reopen at all.
+ */
+let lastFetchAt = 0;
+
+/**
+ * Refresh remote-tracking refs when a panel opens, at most once per throttle
+ * window.
+ *
+ * `fetch` is the read-only op: it updates `refs/remotes/origin/*` and never
+ * merges, so answering "what's waiting for me?" cannot move the user's files.
+ * Rejections are swallowed — offline is the common case and the panel simply
+ * shows the counts it already had.
+ */
+function maybeFetch(): void {
+ const now = Date.now();
+ if (now - lastFetchAt < FETCH_THROTTLE_MS) return;
+ lastFetchAt = now;
+ triggerSync('fetch').catch(() => {
+ // Passive refresh: the user opened a panel, they did not ask to sync.
+ // Allow an immediate retry on the next open rather than burning the window
+ // on a call that never reached the engine — but only if this call still
+ // owns the window: a slow rejection must not discard the throttle a newer
+ // surface's successful call just claimed.
+ if (lastFetchAt === now) lastFetchAt = 0;
+ });
+}
+
+async function fetchWorktreeStatus(): Promise<GitWorktreeStatus | null> {
+ try {
+ const res = await fetch('/api/git/worktree-status');
+ if (!res.ok) return null;
+ return (await res.json()) as GitWorktreeStatus;
+ } catch {
+ return null;
+ }
+}
+
+/**
+ * Read the working tree's status while `enabled` is true.
+ *
+ * Returns `null` before the first successful response and keeps the last good
+ * value across a failed refresh — a transient fetch failure should not blank a
+ * listing the user is reading. `loading` is true only for the initial fetch, so
+ * the poll never flashes a skeleton over already-rendered rows.
+ */
+export function useGitWorktreeStatus(enabled: boolean): {
+ status: GitWorktreeStatus | null;
+ loading: boolean;
+} {
+ const [status, setStatus] = useState<GitWorktreeStatus | null>(null);
+
+ useEffect(() => {
+ if (!enabled) return;
+ let cancelled = false;
+
+ // Single-flight: the mount call, the poll, and the CC1 subscription all
+ // funnel here, and a sync cycle signals on every state transition — so an
+ // open popover during a sync otherwise issues a burst of four-subprocess
+ // status reads, and a slower EARLIER response could land after (and
+ // overwrite) a newer listing. One request in flight; signals that arrive
+ // meanwhile collapse into a single trailing re-run.
+ let inFlight = false;
+ let rerunQueued = false;
+ function refresh() {
+ if (inFlight) {
+ rerunQueued = true;
+ return;
+ }
+ inFlight = true;
+ void fetchWorktreeStatus().then((next) => {
+ inFlight = false;
+ // Keep the previous listing on a failed refresh rather than blanking it.
+ // `readable !== false`, not `readable === true`: a server that predates
+ // the field sends nothing, and treating that as unreadable would freeze
+ // the panel permanently under version skew. An unreadable read keeps the
+ // last good listing rather than overwriting it with a false-clean one —
+ // the keep-last-good guard below could not see the difference, because a
+ // 200 with empty lists is truthy.
+ if (!cancelled && next && next.readable !== false) setStatus(next);
+ if (rerunQueued && !cancelled) {
+ rerunQueued = false;
+ refresh();
+ }
+ });
+ }
+
+ refresh();
+ // Opening the panel is the user asking about remote state; answer it with
+ // current refs rather than whatever the last sync happened to leave behind.
+ // The CC1 `sync-status` signal the fetch emits drives the re-render.
+ maybeFetch();
+
+ const interval = setInterval(refresh, WORKTREE_POLL_MS);
+ const unsubscribe = subscribeToDocumentsChanged((channels) => {
+ if (channels.includes('sync-status')) refresh();
+ });
+
+ return () => {
+ cancelled = true;
+ clearInterval(interval);
+ unsubscribe();
+ };
+ }, [enabled]);
+
+ // Derived rather than tracked: a separate `loading` flag would need clearing
+ // on every refresh path, and getting that wrong flashes a skeleton over rows
+ // the user is already reading. Null status while enabled IS the initial load.
+ return { status, loading: enabled && status === null };
+}
diff --git a/packages/app/src/hooks/use-worktree-autosync-notice.dom.test.tsx b/packages/app/src/hooks/use-worktree-autosync-notice.dom.test.tsx
index 0a5743ecc..f7afe9594 100644
--- a/packages/app/src/hooks/use-worktree-autosync-notice.dom.test.tsx
+++ b/packages/app/src/hooks/use-worktree-autosync-notice.dom.test.tsx
@@ -65,7 +65,9 @@ describe('useWorktreeAutoSyncNotice', () => {
};
render(<Probe />);
await waitFor(() => expect(toast).toHaveBeenCalledTimes(1));
- expect(lastToastText()).toContain('Follow is on for this worktree, inherited from my-repo');
+ expect(lastToastText()).toContain(
+ 'Sync is set to Auto (Pull only) for this worktree, inherited from my-repo',
+ );
});
test('phrases the notice for an inherited off worktree via the legacy enabled seed', async () => {
@@ -74,7 +76,7 @@ describe('useWorktreeAutoSyncNotice', () => {
};
render(<Probe />);
await waitFor(() => expect(toast).toHaveBeenCalledTimes(1));
- expect(lastToastText()).toContain('Auto-sync is off for this worktree');
+ expect(lastToastText()).toContain('Sync is set to Manual for this worktree');
});
test('does nothing when the flag is not set', () => {
diff --git a/packages/app/src/hooks/use-worktree-autosync-notice.tsx b/packages/app/src/hooks/use-worktree-autosync-notice.tsx
index f8fbae652..8480168aa 100644
--- a/packages/app/src/hooks/use-worktree-autosync-notice.tsx
+++ b/packages/app/src/hooks/use-worktree-autosync-notice.tsx
@@ -29,24 +29,31 @@ interface InheritedAutoSync {
inheritedFrom?: unknown;
}
+// Each branch names the mode exactly as the Settings → Sync control labels it.
+// The toast's whole job is to point at that control, so a name it does not show
+// ("Follow", "on"/"off") leaves the user hunting for a setting that is right
+// there under the name they were not told.
function inheritedNoticeMessage(mode: SyncMode | null, project: string) {
if (mode === 'follow') {
return (
<Trans>
- Follow is on for this worktree, inherited from {project}. Change it in Settings → Sync.
+ Sync is set to Auto (Pull only) for this worktree, inherited from {project}. Change it in
+ Settings → Sync.
</Trans>
);
}
if (mode === 'full') {
return (
<Trans>
- Auto-sync is on for this worktree, inherited from {project}. Change it in Settings → Sync.
+ Sync is set to Auto (Pull and Push) for this worktree, inherited from {project}. Change it
+ in Settings → Sync.
</Trans>
);
}
return (
<Trans>
- Auto-sync is off for this worktree, inherited from {project}. Change it in Settings → Sync.
+ Sync is set to Manual for this worktree, inherited from {project}. Change it in Settings →
+ Sync.
</Trans>
);
}
diff --git a/packages/app/src/lib/resolve-blocking.ts b/packages/app/src/lib/resolve-blocking.ts
new file mode 100644
index 000000000..e05c71576
--- /dev/null
+++ b/packages/app/src/lib/resolve-blocking.ts
@@ -0,0 +1,24 @@
+/**
+ * Resolve a pre-merge overlap pause by committing the local
+ * edits that caused it. POSTs to `/api/sync/resolve-blocking`.
+ *
+ * The request names the ACTION only. The server acts on the engine's own
+ * blocking set, so this call cannot aim at a file the user is not being shown —
+ * the same reason the endpoint refuses a body-supplied path list.
+ *
+ * Rejects when the action did not land, including the 409 the server returns
+ * when nothing is blocking any more (a stale panel, or a second click after the
+ * first already cleared it). Callers surface that rather than swallowing it:
+ * the panel is showing state the user is acting on, so a silent no-op reads as
+ * a dead button.
+ */
+export async function resolveBlockingChanges(action: 'commit'): Promise<void> {
+ const res = await fetch('/api/sync/resolve-blocking', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ action }),
+ });
+ if (!res.ok) {
+ throw new Error(`sync resolve-blocking failed: ${res.status}`);
+ }
+}
diff --git a/packages/app/src/lib/trigger-sync.ts b/packages/app/src/lib/trigger-sync.ts
index 2f5571378..901f83c65 100644
--- a/packages/app/src/lib/trigger-sync.ts
+++ b/packages/app/src/lib/trigger-sync.ts
@@ -4,6 +4,11 @@
* so callers watch the sync-status hook for the result rather than awaiting a
* meaningful body here.
*
+ * `'fetch'` is the read-only op — it refreshes remote-tracking refs and the
+ * ahead/behind counts without merging or touching the working tree, so a
+ * passive surface (opening the sync panel) may call it. Every other op moves
+ * files and belongs behind an explicit user action.
+ *
* Rejects when the trigger itself did not land — a network failure (fetch
* rejects) or a non-2xx response. A caller with UI state gated on the trigger
* (the share popover's "Sync now" in-flight row) must `.catch` this to recover;
@@ -14,7 +19,7 @@
* Shared by the sync status badge and the share popover's "Sync now" CTA so
* both hit the same endpoint the same way.
*/
-export async function triggerSync(op: 'sync' | 'push' | 'pull'): Promise<void> {
+export async function triggerSync(op: 'sync' | 'push' | 'pull' | 'fetch'): Promise<void> {
const res = await fetch('/api/sync/trigger', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
diff --git a/packages/app/src/lib/use-settings-route.ts b/packages/app/src/lib/use-settings-route.ts
index 7cb834ed0..fb71b9660 100644
--- a/packages/app/src/lib/use-settings-route.ts
+++ b/packages/app/src/lib/use-settings-route.ts
@@ -103,6 +103,49 @@ export function openAgentSettings(): void {
openSettingsSection(CONFIGURE_AGENTS_SECTION);
}
+/** Sidebar item id for the This project → Sync section. */
+const PROJECT_SYNC_SECTION = 'sync';
+
+/**
+ * One-shot request to open the Sync section's Advanced disclosure expanded.
+ *
+ * A module flag rather than the `SECTION_INTENT_EVENT` pattern above because
+ * the two cases differ: that event targets an ALREADY-MOUNTED dialog, while
+ * this intent is set while Settings is still closed and must survive until the
+ * lazy body chunk resolves and `SyncSection` mounts. An event dispatched now
+ * would land before anything is listening.
+ *
+ * Consumed on mount and cleared, so arriving at Sync any other way — the header
+ * gear, the sidebar, a plain `#settings/sync` link — leaves the disclosure
+ * collapsed, which is the point of calling it Advanced.
+ */
+let pendingSyncAdvanced = false;
+
+/**
+ * Read and clear the pending Advanced-disclosure intent. Call once, from the
+ * consuming component's mount.
+ */
+export function consumeSyncAdvancedIntent(): boolean {
+ const pending = pendingSyncAdvanced;
+ pendingSyncAdvanced = false;
+ return pending;
+}
+
+/**
+ * Open Settings straight to This project → Sync — the sync popover's own
+ * pointer at the fuller controls it does not host (the committed shared default
+ * and the cycle cadence). Single-sources the deep-link literal the same way
+ * `openAgentSettings` does.
+ *
+ * `advanced` additionally expands the Sync section's Advanced disclosure, so a
+ * caller that names the cadence in its own label lands the user on the control
+ * rather than on a collapsed row they have to find.
+ */
+export function openSyncSettings(opts?: { advanced?: boolean }): void {
+ if (opts?.advanced === true) pendingSyncAdvanced = true;
+ openSettingsSection(PROJECT_SYNC_SECTION);
+}
+
/** Sidebar item id for the This project → Plugins manage section. */
const PROJECT_PLUGINS_SECTION = 'plugins-manage';
diff --git a/packages/app/src/locales/ar/messages.json b/packages/app/src/locales/ar/messages.json
index 8e23e4b95..21fbb1d01 100644
--- a/packages/app/src/locales/ar/messages.json
+++ b/packages/app/src/locales/ar/messages.json
@@ -47,11 +47,7 @@
"-YV1Uo": ["النمط ", ["patternNumber"]],
"-bFGPF": ["التغيير التالي"],
"-dNlfM": ["تم التراجع عن آخر تعديل في ", ["docName"]],
- "-f2Ogn": [
- "أبقِ هذا المشروع متزامنًا مع مستودعك البعيد. تجلب المتابعة التحديثات دون دفع؛ أما المزامنة الكاملة فتدفع إيداعاتك أيضًا. يتطلب تشغيل المزامنة تأكيدًا."
- ],
"-g6KIS": ["رابط غير معروف"],
- "-imiMK": ["متابعة — تتدفق التحديثات من مستودعك البعيد؛ وتبقى تعديلاتك على هذا الجهاز."],
"-kKdCC": ["تم تثبيت ", ["imported"], " مهارة من ", ["0"]],
"-kbIAr": ["الروابط والصور"],
"-ksoxk": [
@@ -156,7 +152,6 @@
"0wswKc": ["خط أفقي يفصل بين الأقسام."],
"0xnQ_X": ["تتدفق التحديثات إلى الداخل"],
"0xnmlQ": ["اسم المستودع"],
- "0yL--g": ["مراجعة التعارضات"],
"0ySP5u": ["تُحفظ التغييرات تلقائيًا في هذه السمة."],
"0zAhu6": ["كل مستند"],
"1-flC9": ["منفذ الخادم المحلي"],
@@ -192,6 +187,7 @@
"1NgrlY": ["طرق أخرى للتثبيت"],
"1QfxQT": ["تجاهل"],
"1RluQD": ["إظهار الاستبدال"],
+ "1TA-aJ": ["تم السحب ", ["pulled"], " · تم الدفع ", ["pushed"]],
"1TNIig": ["فتح"],
"1Ta7Fd": ["فتح ", ["basename"]],
"1V17kO": ["يجري تحميل النسختين"],
@@ -263,6 +259,11 @@
["FULLSCREEN_HUB_LIMIT"],
" نتيجة."
],
+ "2okwy4": [
+ "المزامنة لشجرة العمل هذه مضبوطة على «تلقائي (سحب فقط)»، موروثة من ",
+ ["project"],
+ ". غيّرها في الإعدادات ← المزامنة."
+ ],
"2pR7ad": ["مفتاح API للتضمينات"],
"2q_Q7x": ["الظهور"],
"2rLM8r": ["تعذّر بدء سلسلة الوكيل — يرجى المحاولة مرة أخرى."],
@@ -396,7 +397,6 @@
"4A3Yzu": ["كتلة كود"],
"4BITzH": ["خطأ:"],
"4CfgPM": ["أُنشئ مجلد المشروع، لكن فشل git init. أعد المحاولة."],
- "4DcimZ": ["حُدِّث ", ["lastSyncedRelative"]],
"4E9jPa": ["أنشئ مشروعك الأول"],
"4EZrJN": ["القواعد"],
"4ErgAf": ["ثبّت OpenKnowledge مهارة"],
@@ -424,6 +424,7 @@
"4m-xuX": ["الإصلاح التلقائي — لا شيء لإصلاحه"],
"4mDIcg": ["اختر المهارات المراد تثبيتها. تصل كل واحدة كمهارة قابلة للتحرير تملكها."],
"4mLBx9": ["الاشتراكات غير متاحة الآن."],
+ "4mbrAq": ["دقيقة واحدة"],
"4mp6Tv": ["عرض OpenKnowledge المهارات المثبّتة"],
"4niEzY": ["تضمين HTML معزول — اكتب HTML وشاهد المعاينة المعروضة مباشرةً."],
"4nj6n8": ["أعاد /api/config الرمز ", ["code"]],
@@ -433,11 +434,6 @@
"4uNLmk": ["يجري السحب"],
"4v2Yyz": ["حدّد كل صفوف شجرة الملفات الظاهرة عندما يكون التركيز في شريط الملفات الجانبي."],
"4xtLTl": ["أُخفي المجلد “", ["basename"], "”"],
- "4zEZS5": [
- "المزامنة التلقائية مفعّلة لشجرة العمل هذه، موروثة من ",
- ["project"],
- ". غيّرها في الإعدادات ← المزامنة."
- ],
"4zGlN_": ["الصق رابط صورة أو انقر «رفع»"],
"4z_1j2": ["معروض"],
"5-FeN2": ["رابط المشاركة"],
@@ -527,6 +523,7 @@
],
"5hFl0U": ["نسخ المرجع"],
"5jEnaB": ["غير متاح على هذه المنصة"],
+ "5k0NLb": ["مراجعة"],
"5kWklo": ["(قد يكون بعضها مخفيًا بالفعل بقواعد أخرى)"],
"5lWFkC": ["تسجيل الدخول"],
"5mksg0": ["فشل تعطيل البحث الدلالي — ", ["detail"]],
@@ -561,6 +558,7 @@
"تُنفَّذ الأوامر بكامل صلاحيات حساب المستخدم الخاص بك على هذا الجهاز. أوقف هذا الخيار لتعطيل الصدفة."
],
"6Aih4U": ["غير متصل"],
+ "6EoD0z": ["الحل في الطرفية"],
"6FCixu": ["إعادة فتح محادثة سابقة"],
"6HCOwA": ["فشل الفتح."],
"6KCH4m": ["الملفات المخفية"],
@@ -648,6 +646,11 @@
],
"6ur2Mk": ["ساعد وكلاءك على اكتشاف OpenKnowledge واستخدامه في أي مشروع."],
"6vEr3W": ["وجهة الرابط"],
+ "6xPJIj": [
+ "المزامنة لشجرة العمل هذه مضبوطة على «يدوي»، موروثة من ",
+ ["project"],
+ ". غيّرها في الإعدادات ← المزامنة."
+ ],
"6xeZX9": ["تُطبّق التعديلات مباشرة. تحدد السمة الوضع الفاتح أو الداكن."],
"6zzhQL": ["أرسل تقريرك بالبريد الإلكتروني"],
"72xhRD": ["وضع عرض المخطط"],
@@ -796,7 +799,6 @@
"8qgfac": ["خوادم MCP"],
"8rZ1pk": ["تمكين ", ["id"]],
"8ruqQi": ["روابط داخلية معطلة"],
- "8sMErm": ["هل تفعّل المتابعة؟"],
"8t9CRE": ["يجري تشغيل ", ["agentName"], "…"],
"8t9T3-": ["لم يُعثر على مهارات."],
"8tjQCz": ["استكشاف"],
@@ -859,6 +861,7 @@
]
],
"9Y6cCI": ["تعذر تحميل الصفحات"],
+ "9ZxzfT": [["count"], " للأمام"],
"9_2oe6": [
"أعِد ",
["0"],
@@ -953,11 +956,6 @@
"AVW-K9": ["فشل تحميل الصفحات اليتيمة"],
"AWOSPo": ["تكبير"],
"AYoYhU": ["فشل التحديث: ", ["0"]],
- "AaaESH": [
- "المزامنة التلقائية معطّلة لشجرة العمل هذه، موروثة من ",
- ["project"],
- ". غيّرها في الإعدادات ← المزامنة."
- ],
"AcK_r0": ["واجهة Claude السطرية"],
"AczYxH": ["مدخل open-knowledge مخصص — غير مُدار من OpenKnowledge"],
"AdcGcG": ["يجري تطبيق تغييرك"],
@@ -1046,6 +1044,7 @@
"BVkqD9": [
"تم إيقاف صيانة الفهرس مؤقتًا لأن سمة Git أخرى تتحكم في index.md. قم بتحديث .gitattributes بحيث تستخدم مسارات index.md المحددة النطاق merge=union، ثم حاول مرة أخرى."
],
+ "BWTzAb": ["يدوي"],
"BY-g4_": ["إضافة نمط"],
"Ba4D2x": ["تم استيراد القالب"],
"Bdha5y": ["يجري النشر..."],
@@ -1090,6 +1089,7 @@
],
"C0Ciaj": ["استُورد باسم «", ["0"], "» — الاسم «", ["1"], "» كان مأخوذًا."],
"C0hoX6": ["مُدرج دائمًا"],
+ "C2abof": ["غير متتبَّع"],
"C3Zc44": ["استكشاف المهارات"],
"C62P6b": ["تحديد المحرر"],
"C7PKTv": ["إرسال التعليقات المحددة إلى المحادثة"],
@@ -1129,9 +1129,6 @@
"CTJLpz": ["«", ["trimmed"], "» موجود هنا بالفعل"],
"CU3AiE": ["يجري تبديل الفروع"],
"CUmCwI": ["إدراج صف أدناه"],
- "CVRM5N": [
- "تجلب المتابعة التحديثات من مستودع git البعيد وتقدّم نسختك تلقائيًا. تبقى تعديلاتك المحلية على هذا الجهاز ولا تُدفع أبدًا."
- ],
"CWjM1r": ["مستندات مباشرةً في ", ["0"], "/"],
"CWzc2T": [
"يبقى <0>~/.ok/bin</0> و<1>~/.ok/env.sh</1> في الحالتين — يتولى التطبيق صيانتهما دائمًا."
@@ -1168,6 +1165,7 @@
"في مشاريع Git، يضيف Open Knowledge قاعدة محددة النطاق إلى ملف .gitattributes في جذر المستودع لدمج تغييرات الفهرس المتزامنة."
],
"CxVk-w": ["تعليق على ", ["address"]],
+ "Cz-K13": ["15 دقيقة"],
"D-NlUC": ["النظام"],
"D-Oh1s": ["كيفية إعداد ", ["0"], " (يفتح في المتصفح)"],
"D-_B7l": ["متصل — تُرجع نقطة النهاية هذه متجهات بـ ", ["0"], " بُعدًا."],
@@ -1240,7 +1238,6 @@
"DmkTrb": ["تعذّر إنشاء هذه السمة. حاول مرة أخرى."],
"Dnn2XG": ["تلقائي"],
"DpjYd6": ["الانتقال إلى النص المرتبط"],
- "DrYM2Z": ["المزامنة معطّلة"],
"DsDwR-": [
[
"0",
@@ -1439,6 +1436,7 @@
],
"Fqx38P": ["ما الذي وقف عائقًا؟"],
"Fr8JGg": ["ملف Zip"],
+ "FsEXax": ["لم تكتمل العملية. راجع سجلات الخادم ثم أعد المحاولة."],
"Fsx78O": ["أضف الأمر <0>ok</0> إلى طرفيتك"],
"FvMSms": [
"تغيّر إعادة التسمية الملف على القرص والمعرّف الذي يستخدمه الوكلاء لاختيار هذا القالب."
@@ -1566,6 +1564,7 @@
"H0WlWQ": ["شبكة من الصفوف والأعمدة مع صف رأس."],
"H1TmTu": ["توقف الإصلاح. تبقى الملفات المُصلَحة بالفعل كما هي."],
"H3oH0g": ["إعادة"],
+ "H4doZt": ["المزامنة متوقفة مؤقتًا. ثبّت هذه التعديلات المحلية للمتابعة، أو عالجها في الطرفية."],
"H86f9p": ["طيّ"],
"H8DVOJ": ["متطابقة في الاثنين، وسيظل ", ["pick"], " يقرأها."],
"HAkEqR": ["الملفات الأخيرة"],
@@ -1672,6 +1671,7 @@
"IWGfGF": ["يجري التحقق من اتصالك بـ GitHub"],
"IX7-sq": ["حدث خطأ ما أثناء فتح «", ["docName"], "»."],
"IX_uXB": ["my-feature"],
+ "IXiG0B": ["تلقائي (سحب ودفع)"],
"IYciRC": ["شكرًا على التقرير!"],
"IajAbS": ["إضافة حزمة بداية"],
"If0crP": ["الفتح بالذكاء الاصطناعي ", ["targetDisplayName"], "، ", ["hint"]],
@@ -1733,6 +1733,7 @@
"JLzQi_": ["إغلاق ", ["accessibleLabel"]],
"JM_aq-": ["استخدم رابط https:// — لا يُسمح بـ http:// إلا للمضيف المحلي."],
"JOcPqH": ["أحضر مستودعًا بعيدًا إلى هذا الجهاز."],
+ "JOhCT9": ["الدفع يشمل"],
"JWsZlx": ["افتح مشروعًا للتحرير."],
"JZ8cO6": ["فاتح أو داكن أو تتبع نظام التشغيل."],
"J_jZ5z": [
@@ -1821,6 +1822,9 @@
"KjTmeO": ["حدّث OpenKnowledge لفتح هذه المشاركة."],
"KkEAud": ["أنشئ ملفًا من سياق المستند أو المجلد الحالي."],
"KkRyMI": ["تعذّر تصنيف الدمج — حاول مرة أخرى."],
+ "KmVekT": [
+ "تلقائي (سحب فقط) يجلب التحديثات من مستودع git البعيد ويقدّم نسختك تلقائيًا. تبقى تعديلاتك المحلية على هذا الجهاز ولا تُدفع أبدًا."
+ ],
"KmydK6": ["عريض"],
"KnoB--": ["سيُحفظ باسم <0>", ["sanitized"], "</0>."],
"KpOJFY": ["تفعيل معاينات الروابط الخارجية"],
@@ -1828,6 +1832,7 @@
"KsAPaB": ["هذا الفرع مسحوب في:"],
"KtACeE": ["الافتراضي: <0>", ["0"], "</0>"],
"KujtjC": ["بحث"],
+ "KvwJv8": ["بعض الملفات غير مدرجة: شجرة العمل تحتوي على تغييرات كثيرة جدًا."],
"Kx881F": ["تمت استعادة ", ["0"], "."],
"L-rMC9": ["إعادة التعيين إلى الافتراضي"],
"L1BQTH": [["0"], " غير مثبَّت بعد — يجري فتح صفحة تنزيله."],
@@ -1845,6 +1850,7 @@
"L83DKQ": ["فشل التثبيت في PATH: ", ["summary"]],
"L8fKuc": ["شغّل هذا في طرفيتك"],
"L9Y9Om": ["أكثر الصفحات ارتباطًا"],
+ "L9ox9k": ["تعذّرت قراءة شجرة العمل. راجع سجلات الخادم."],
"LAR9ub": ["سيستبدل إدخال OpenKnowledge الحالي في ", ["0"]],
"LBv_TR": ["تحويل المواقع إلى روابط رمزية"],
"LBwUR6": ["انتهت مهلة تبديل الفرع — حاول فتح ", ["targetNoun"], " يدويًا."],
@@ -1872,7 +1878,6 @@
]
],
"LKOLNn": ["لا توجد وكلاء ذكاء اصطناعي مثبَّتون"],
- "LNum6A": ["قبل ", ["minutes"], " دقيقة"],
"LPAv9E": ["قبل ", ["days"], " يوم"],
"LQdLio": ["مخطط جديد"],
"LQsCPn": ["تمنع الإيداعات المحلية هذه النسخة من التحديث"],
@@ -1999,7 +2004,6 @@
"MCjC9A": ["حذف ", ["deleteDescriptorLabel"]],
"MDBJwN": ["صعب الاستخدام"],
"MDZSJe": ["متى ينفّذ الوكيل عمله المجدول."],
- "MGBNwj": ["إيقاف المزامنة مؤقتًا"],
"MGb89P": [
"أدرج أسطر محرر المصدر واحذفها وانقلها وانسخها وأزحها عبر خريطة مفاتيح CodeMirror الافتراضية."
],
@@ -2008,7 +2012,6 @@
"MIF36T": ["تعذّر حل التفرّع: ", ["0"]],
"MILoeL": ["الخدمات"],
"MJuO1q": ["نافذة السياق:"],
- "MKEPCY": ["متابعة"],
"MLVPcm": [["0"], " الإصدار ", ["1"]],
"MOAoFO": ["لا توجد مجلدات وكلاء بعد"],
"MPpSAg": ["إنشاء مشروع جديد من ", ["selectedPackName"]],
@@ -2071,6 +2074,7 @@
],
"N5rzKJ": ["حذف ", ["0"], " مهارات"],
"N6j2JH": ["تحرير ", ["0"]],
+ "N7Lau6": ["إيداع ومزامنة"],
"NBdIgR": ["تعليق"],
"NErvOX": ["حُفظ في"],
"NEzPEh": ["أنشئ فرعًا جديدًا، أو اسحب فرعًا موجودًا، في نافذته الخاصة."],
@@ -2098,6 +2102,7 @@
"Nay2Yr": ["لا يوجد وكلاء يطابقون بحثك."],
"NcUznW": [["0"], "، لا توجد مساحة عمل"],
"NcurBF": ["تحريك لأسفل"],
+ "NcwbBM": ["السحب يجلب"],
"NeQ_0G": ["اعمل على هذه التعليقات"],
"NeY1Np": ["انتهت مهلة بدء تشغيل Slidev. حاول مرة أخرى."],
"NfraGd": ["طرق أخرى لتثبيت Slidev"],
@@ -2137,6 +2142,7 @@
"O6yEPk": ["أنشئ مشروع OpenKnowledge جديدًا في المجلد الذي تختاره."],
"O7_W_a": ["الفتح بالذكاء الاصطناعي"],
"O9oQJS": ["إرسال التقرير"],
+ "OBdkpo": ["HEAD منفصل"],
"OD0FCX": ["أُخفي “", ["basename"], "”"],
"ODGGlj": ["اسم المجلد: ", ["detail"]],
"OEEQKT": ["جيد"],
@@ -2196,6 +2202,7 @@
"Oo_WWc": ["لم يُعثر على صفحات"],
"Oos8fo": ["نسخ الأمر"],
"OplnBG": ["إدارة أدوات الذكاء الاصطناعي غير متاحة في هذه النسخة."],
+ "OqqecQ": ["30 ثانية"],
"OsSaYm": ["فشل الاستنساخ: ", ["title"]],
"OuQezS": ["يسري عند استئناف هذه المحادثة"],
"OuY8t9": ["الفتح في الفرع الحالي"],
@@ -2228,7 +2235,9 @@
"PBwmDJ": ["يجري البحث حسب المعنى"],
"PBxg_E": ["ليس الآن"],
"PCSkw2": ["المهارات"],
+ "PEGxvo": ["5 دقائق"],
"PGPGsL": ["إضافة وصف"],
+ "PGRnbw": ["تصل التحديثات من المستودع البعيد؛ وتبقى تعديلاتك على هذا الجهاز."],
"PHHEuH": ["إخفاء التعليقات المحلولة (", ["0"], ")"],
"PIMM5l": ["تم اشتراكك!"],
"PKLY-1": ["يجري الفتح..."],
@@ -2241,7 +2250,6 @@
"PRgIJh": ["تعذّر تحديث ", ["subRoot"], ": ", ["0"]],
"PRnH8G": ["من ", ["0"]],
"PTUuoc": ["تعذّر إلغاء تحديد ذلك التعليق — لا يزال في انتظار الإرسال."],
- "PTb1Nx": ["المزامنة موقوفة مؤقتًا. أعد تشغيلها للمتابعة."],
"PVSwOe": ["إعادة توجيه — في انتظار توقّف التشغيل الحالي…"],
"PVUn_c": ["فتح مجلد"],
"PVggyD": ["مخططات frontmatter"],
@@ -2294,6 +2302,7 @@
"PrWQiT": ["نقل Terminal إلى اليمين"],
"PrhzDE": ["تحريك لأعلى"],
"Pw5PTU": ["الأصل الخارجي"],
+ "PxZCNM": ["خارج نطاق ما يودعه Open Knowledge."],
"Q-DKvr": ["التثبيت من ", ["source"]],
"Q1mtyd": ["إخفاء الشريط الجانبي"],
"Q5fqMz": ["خطأ في الاتصال — أعد المحاولة"],
@@ -2344,6 +2353,7 @@
}
]
],
+ "QeREu8": ["معاد التسمية"],
"QfFBdJ": ["اسم ملف القالب (بدون `.md`)."],
"Qft6eW": ["نقل ", ["0"], " مهارات إلى العام"],
"Qj4RL5": ["مكتمل:"],
@@ -2560,13 +2570,9 @@
"Sr9xtj": ["اختر المجلدات التي ينطبق عليها هذا المخطط"],
"SrOuyg": ["لوحات المستند"],
"SvBFYA": ["لا توجد مشاريع حديثة"],
- "Sxx_Zz": [
- "المتابعة مفعّلة لشجرة العمل هذه، موروثة من ",
- ["project"],
- ". غيّرها في الإعدادات ← المزامنة."
- ],
"T-654M": ["يجري تحميل ملف PDF"],
"T0OVm7": ["الفرع الافتراضي محمي — يتطلب الدفع طلب سحب."],
+ "T1fMJ6": ["عدد مرات جلب هذا الجهاز للتغييرات من مستودعك البعيد."],
"T2fvhw": ["إلغاء تحديد كل التعليقات في ", ["0"]],
"T3Mld1": ["نافذة"],
"T3j-7o": ["مثال: تبديل المشاريع أثناء تشغيل مزامنة"],
@@ -2625,10 +2631,10 @@
"U2pMtf": ["tag-name"],
"U3IvM5": ["الدليل الكامل"],
"U3RIJu": ["الملفات المحلية"],
- "U4nTfu": ["تفعيل المتابعة"],
"U5Spo9": ["يجب أن يكون مجلد المحتوى داخل المشروع"],
"U6Mdhd": ["لنبدأ الإعداد."],
"U6wmNc": ["المزامنة موقوفة مؤقتًا"],
+ "U7Iesw": [["seconds"], " ثانية"],
"U88xbi": ["فشل إنشاء ملف المخطط"],
"U8CD-l": ["نسخ المسار الكامل، لا مساحة عمل"],
"UBv8UK": ["حذف نهائي"],
@@ -2675,7 +2681,6 @@
"URmyfc": ["التفاصيل"],
"UTNVyS": ["حدّد مستند المصدر بالكامل."],
"UTZ97u": ["يجب أن يكون التحديد داخل المشروع"],
- "UVDasf": ["المزامنة معطّلة — تبقى تعديلاتك على هذا الجهاز حتى تودعها وتدفعها يدويًا."],
"UVLlMV": ["تعذّر الوصول إلى GitHub. هل تعيد المحاولة؟"],
"UW2Fg3": ["لا يدعم خادم هذا المشروع العامل التحرير الحي. أعد تشغيل OpenKnowledge للإصلاح."],
"UW93oq": ["استبدال المفتاح"],
@@ -2710,6 +2715,7 @@
"UhpfxY": ["تحريك لليسار"],
"UkQGhd": ["إخفاء الاستبدال"],
"UlVARL": ["تمكين Slidev"],
+ "Uo2Rj7": ["تفعيل تلقائي (سحب ودفع)؟"],
"Uobeu9": ["يضيف المهارة إلى ", ["rootRel"], " — يقرأها ", ["0"], " أيضًا"],
"Up2_7p": ["نسخ المسار الكامل"],
"UpCz01": ["هذا المستند"],
@@ -2814,6 +2820,7 @@
"Vftef5": [
"مشكلات Markdown الشائعة — علامات الجدولة الصريحة، وتدرّج العناوين، وعلامات القوائم، وغيرها."
],
+ "Vl1H8I": ["يلزم إعادة الاتصال لمتابعة المزامنة."],
"Vlc75q": ["إبقاء الملف محذوفًا"],
"VmJT51": ["يجري تحميل تقاريرك"],
"VmXASo": ["(رابط رمزي)"],
@@ -2861,6 +2868,7 @@
["rootPath"],
"</0>. اختر موقعًا خارجه، أو افتح ذلك المشروع بدلًا من ذلك."
],
+ "W7mERj": ["تفعيل تلقائي (سحب فقط)؟"],
"W8vpBM": ["حزمة بداية"],
"W9NSe0": ["جارٍ التحقق من الروابط"],
"W9_Bub": ["تتداخل التغييرات المحلية مع المزامنة الواردة"],
@@ -2878,6 +2886,7 @@
" عنصرًا محددًا؟ ستُحذف المجلدات وكل الملفات بداخلها. لا يمكن التراجع عن هذا الإجراء."
],
"WMsoIm": ["هل سجّلت الدخول بالفعل؟"],
+ "WOfp4H": ["تعذّر تحديث فاصل المزامنة — ", ["detail"]],
"WOr-hW": ["توكنات"],
"WPwDin": ["فتح المجلد على القرص"],
"WR0y2O": ["مشاركة المجلد"],
@@ -2896,6 +2905,7 @@
"Wcv-Zi": ["أتِح قاعدة المعرفة هذه كمهارة Claude."],
"We7h2I": ["📝 أو assets/icon.png"],
"Weq9zb": ["عام"],
+ "WfcERq": ["لا شيء لإيداعه: شجرة العمل نظيفة."],
"Wfy3rU": ["إعدادات الوكيل"],
"Wgmlsw": ["يجري الجلب"],
"Wh0im4": ["يحرّر [[", ["realCurrentDoc"], "]]"],
@@ -2949,7 +2959,6 @@
"XRuL0i": ["إنشاء صفحة"],
"XSb9HS": ["تجاهل التعديلات المحلية واستعد النسخة المثبتة"],
"XT-L4j": ["شغّل وكيلًا للإنشاء بالذكاء الاصطناعي"],
- "XU0OXn": ["تفعيل المزامنة التلقائية"],
"XU5AOg": ["إدخال"],
"XV5sC0": ["فتح شجرة العمل"],
"XW18jo": ["لم تطابق استجابة عناوين الصفحة مخطط النجاح"],
@@ -3016,6 +3025,7 @@
"Xp7Kq4": ["توجد عملية مزامنة أخرى قيد التنفيذ. أعد المحاولة بعد قليل."],
"Xp94R1": ["محاولة أخيرة"],
"XpIZmv": ["كتلة كود محصورة بنص أحادي التباعد."],
+ "Xs1kjx": ["التحقق من التحديثات كل"],
"Xs7IcT": ["تعذّر الوصول إلى ", ["displayName"], ". هل تريد المحاولة مرة أخرى؟"],
"XszXjc": ["أُعيدت التسمية إلى ", ["0"]],
"XtRoxT": ["الصفحة ", ["pageNumber"]],
@@ -3048,6 +3058,7 @@
"تُضبط إضافات الفحص — أي عائلات القواعد تعمل وإعداداتها لكل قاعدة — في تبويبها الخاص تحت «هذا المشروع ← الإضافات»."
],
"YEP3X2": ["احذف جدولًا عندما يغطي تحديد الخلايا النشط الجدول بأكمله."],
+ "YEzhIr": ["سحب ودفع"],
"YGIi_c": ["إعادة التثبيت"],
"YGNRB5": ["— باستثناء"],
"YGt-0e": ["يجري القراءة…"],
@@ -3083,20 +3094,6 @@
"YlDuro": ["ملاءمة الارتفاع"],
"YlwI5F": ["ينطبق على هذا المشروع على هذا الكمبيوتر فقط. يُخزَّن في ‎.ok/local ولا يُشارك عبر git."],
"Yp-Hi_": ["فتح الإعدادات"],
- "YsEYYS": [
- [
- "behind",
- "plural",
- {
- "zero": ["متأخر بـ ", "#", " إيداع"],
- "one": ["متأخر بإيداع واحد"],
- "two": ["متأخر بإيداعين"],
- "few": ["متأخر بـ ", "#", " إيداعات"],
- "many": ["متأخر بـ ", "#", " إيداعًا"],
- "other": ["متأخر بـ ", "#", " إيداع"]
- }
- ]
- ],
"YvwwqC": ["أين"],
"YwPUUP": ["هذه الحزمة مُعدّة هنا بالفعل."],
"YxZDGh": [
@@ -3213,7 +3210,6 @@
"ZscwQ0": ["تعذّر التبديل إلى «أنا فقط»"],
"Zt7Ktx": ["لا يمكن للمسار مغادرة المهارة (بدون . أو ..)"],
"Zue_jx": ["ينقص رمز GitHub لديك نطاقات مطلوبة. حاول تسجيل الدخول مرة أخرى."],
- "Zul8Ry": ["أبدًا"],
"ZvzbDF": ["أضفه مباشرةً إلى هذا المشروع."],
"ZwpggY": ["قرأ OpenKnowledge إعدادات المشروع"],
"_0JUKX": ["يتطلب الإبلاغ عن العلل تطبيق OpenKnowledge لسطح المكتب."],
@@ -3342,9 +3338,6 @@
"ai40UJ": ["رقم قياسي جديد · اضغط <0>مسافة</0> للعب مرة أخرى"],
"aiArms": ["تعذّر علينا استنساخ هذا المستودع."],
"aiOceC": ["تمكين الفهارس"],
- "ajHi4O": [
- "المزامنة التلقائية موقوفة مؤقتًا — ليس لديك إذن بالدفع إلى هذا المستودع. بدّل إلى «متابعة» لمواصلة تلقّي التحديثات."
- ],
"ajz9F8": ["تعذّر تحميل محتوى التعارض لـ ", ["filePath"], ". حاول إعادة تحميل الصفحة."],
"ak4LLg": ["مسح القائمة"],
"akOe4q": [
@@ -3361,7 +3354,6 @@
"arUUsK": ["تحديثات المنتج"],
"ax9kie": ["لم تُحمَّل إعدادات معاينة الروابط بعد — أعد المحاولة بعد قليل"],
"axQ1h6": ["هل تودّ إضافة شيء؟ (اختياري)"],
- "az8lvo": ["معطّل"],
"b18t0_": ["إغلاق الفروق"],
"b1FDss": ["التمرير إلى البداية"],
"b2ezG_": ["تم الاحتفاظ بكليهما — «", ["0"], "» أصبحت مهارة قائمة بذاتها الآن"],
@@ -3456,6 +3448,9 @@
"cFSbbh": ["خاص بهذا الجهاز. ينطبق على كل مشروع تفتحه هنا ولا يُشارك مع المتعاونين أبدًا."],
"cH0dkG": ["كان ينقصه ميزة أحتاجها"],
"cHhH3i": ["أداة git مطلوبة"],
+ "cIFYZn": [
+ "أثناء تسجيل خروجك، يجري التحقق من التحديثات كل 3 دقائق على الأكثر بغض النظر عن هذا الإعداد."
+ ],
"cIptmH": ["في تطبيق Claude Desktop"],
"cKjLuT": ["(المشروع + المستخدم)"],
"cLP0Lf": ["مصدر مهارة بعيد"],
@@ -3534,6 +3529,8 @@
"ct2kv5": ["لا توجد عناوين في ", ["pageTarget"]],
"cuA8QW": ["تنظيم المواصفات"],
"cuHhjo": ["إنشاء وتحرير"],
+ "cyoNqf": ["غير مدموج"],
+ "czQDKY": ["كل عملية دفع هي تثبيت واحد في مستودعك البعيد."],
"d-GtJt": ["عرض في مصدر Markdown"],
"d1JjXo": [
"نسختك المحلية من الفرع <0>",
@@ -3665,6 +3662,9 @@
"eGUbmF": ["نسخ الملف أو المجلد المحدد"],
"eJitUk": ["الرفع من الجهاز"],
"eKThTQ": ["فشلت إعادة الترتيب"],
+ "eNOyTV": [
+ "ليست لديك صلاحية الدفع إلى هذا المستودع. تلقائي (سحب فقط) يمكنه مع ذلك إبقاء نسختك محدثة."
+ ],
"eNQGRb": ["رياضيات LaTeX مضمَّنة تُعرض بواسطة KaTeX."],
"eNhWUl": ["مراجع لطلبات السحب، كاتب ملاحظات إصدار، قائمة تحقق للنشر..."],
"ePK91l": ["تحرير"],
@@ -3705,12 +3705,12 @@
"emMrXQ": ["أعاد الخادم استجابة نسخ مشوّهة."],
"emgiet": ["محتوى مرجعي؛ يُعكس حرفيًا في كل مكان يُشار إليه فيه."],
"enPTnx": ["السطر ", ["displayLine"]],
+ "eolhcI": ["جارٍ قراءة شجرة العمل"],
"eps54V": ["أُزيل"],
"epuNYK": ["حدّد كتلة كمرجع أساسي. تتحدث المرايا في الأماكن الأخرى مباشرةً أثناء تحريرك لها."],
"erenF-": ["لا يمكن حذف ملفات لم تُحَل تعارضاتها"],
"euGaS0": ["تعذّرت قراءة ", ["fileName"], "."],
"euc6Ns": ["تكرار"],
- "evHlIg": ["لا تدفع المتابعة تغييراتك المحلية ولا تودعها أبدًا. تبقى على هذا الجهاز وحده."],
"evs0iw": ["وسوم تطابق «", ["tagListQuery"], "»"],
"ewSbS_": ["جلسة Shell"],
"ezUmoU": ["قيم العناصر المسموح بها (فارغ = أي قيمة)"],
@@ -3800,7 +3800,6 @@
}
]
],
- "g2Tj8R": ["كامل"],
"g3UF2V": ["قبول"],
"g4WlQK": [
"إدارة أدوات الذكاء الاصطناعي للمشروع متاحة فقط في تطبيق OpenKnowledge لسطح المكتب."
@@ -3818,7 +3817,6 @@
["display"],
". يصبح ذلك المجلد رابطًا رمزيًا إلى هذا، فيقرأ وكيله كل ما يوضع هنا. يبقى هذا المجلد حقيقيًا. المهارات المتعارضة تُبطل الدمج."
],
- "g85bAo": ["تمت المزامنة ", ["lastSyncedRelative"]],
"g9Nj4l": ["// ملاحظة"],
"gAhHu7": ["ينطبق الإصلاح التلقائي فقط على المشكلات التي لها إصلاح آلي معروف."],
"gBbxn_": ["يجري التحقق من حالة تسجيل الدخول"],
@@ -3895,6 +3893,7 @@
"gwEcOD": ["نسختك المحلية متأخرة."],
"gwykHF": ["لم يُزامَن هذا المستند مع GitHub بعد. سيعمل الرابط بعد المزامنة التالية."],
"gyHDWC": ["إصلاح الكل بالذكاء الاصطناعي (", ["count"], ")"],
+ "gyYvCN": ["دفع تعديلاتي كل"],
"h-AdvS": ["المجلدات والقوالب موجودة هنا بالفعل، فلا شيء لإضافته."],
"h06R3C": ["لا توجد صفحات تفتقر إلى روابط صادرة في الرسم البياني."],
"h16FyT": ["القوائم"],
@@ -3966,7 +3965,6 @@
"hwFOFD": ["فشل تحميل الإعدادات"],
"hxBHxQ": ["سطر مع حاشية<0><1>[1]</1></0> وتعريف معروض أدناه."],
"hxEUVJ": ["تهيئة ", ["selectedPackName"]],
- "hxYFzm": ["مزامنة كاملة — تُدفع إيداعاتك وتُسحب تغييرات المستودع البعيد تلقائيًا."],
"hxnF0I": ["خصائص ", ["0"]],
"hyCxJY": ["افتح شجرة العمل تلك بدلًا من ذلك"],
"hynz2K": ["بدأ التنزيل"],
@@ -3977,7 +3975,6 @@
"i09An-": ["تمت استعادة نسخة سابقة (", ["0"], ")"],
"i1flq_": ["اقتراحات روابط الويكي"],
"i3f2kh": ["لا توجد أوامر مطابقة."],
- "i6ng22": ["التبديل إلى «متابعة»"],
"i92eAT": ["سننشئ مستودعًا ونبدأ المزامنة — بلا حاجة إلى طرفية."],
"i94lQe": ["تحقق OpenKnowledge من التعارضات"],
"i9OyGp": ["تراجع أو إعادة"],
@@ -4070,11 +4067,11 @@
],
"iqugog": ["فشلت التهيئة: ", ["errorDetail"]],
"irFGwu": ["قائمة القوالب"],
+ "irnKr_": ["تم التحديث ", ["updatedRelative"]],
"irrm_E": ["إزالة التحديد"],
"isRobC": ["جديد"],
"iuTKci": ["لا توجد تعديلات بعد."],
"iv452l": ["توثيق ", ["0"], " (يفتح في المتصفح)"],
- "iy64Li": ["مزامنة كاملة — تُودَع تعديلاتك وتُدفع إلى مستودعك البعيد تلقائيًا."],
"iycx_A": ["يجري الدفع"],
"iz1LdD": ["تغيّر خارج OK منذ آخر كتابة هنا — الحالة المعروضة هي ما على القرص الآن"],
"j-o6Z2": [
@@ -4118,6 +4115,7 @@
"jSO1X5": ["لا يمكن إعادة تسمية القوالب الموروثة هنا — أعد تسميتها في المجلد الذي يملكها."],
"jSY41h": ["استغرق «", ["docName"], "» وقتًا طويلًا. تحقق من اتصالك."],
"jTLWxh": ["ضمّن صفحة خارجية في إطار مضمَّن (مستندات، عروض، Figma، CodeSandbox)."],
+ "jTUxaN": ["تفعيل تلقائي (سحب فقط)"],
"jWzDfC": ["جارٍ التحقق من أدوات الذكاء الاصطناعي المتوفّرة لديك"],
"jZ_E5M": ["فشل الجلب — راجع سجلات الخادم للتفاصيل."],
"j_Z6g7": ["الافتراضي المشترك"],
@@ -4204,13 +4202,15 @@
"وجّه البحث الدلالي إلى أي نقطة نهاية تضمينات متوافقة مع OpenAI — خادم ذاتي الاستضافة أو مزوّد آخر. مفتاح API أعلاه يخص أي نقطة نهاية تضبطها هنا."
],
"kSiB3X": ["تعذّر النقل إلى ", ["trashNoun"]],
- "kUn-CN": ["المزامنة معطّلة"],
"kV2YZv": [
"لا ترى <0>المهارات</0>؟ فعّل <1>الإعدادات <2/> القدرات <3/> تنفيذ الكود وإنشاء الملفات</1> أولًا."
],
"kVS5tE": ["هل تريد الحفاظ على فهارس generated في كل مجلد؟"],
"kVgQUA": ["هل تريد حذف هذه المحادثة؟"],
"kVzuTI": ["مهارة الوكيل الموصى بها"],
+ "kXNv8P": [
+ "تلقائي (سحب فقط) لا يدفع تغييراتك المحلية ولا يودعها أبدًا. تبقى على هذا الجهاز فقط."
+ ],
"kYL1lH": ["نشاط الوكيل"],
"k_Dqw1": [
[
@@ -4305,6 +4305,7 @@
"lM4c-I": [
"مسار داخل المهارة — أي مجلد يصلح (مثل references/notes.md). تُنشأ المجلدات الواردة في المسار نيابةً عنك."
],
+ "lPkjpD": ["تم الدفع ", ["pushed"]],
"lPzyrU": ["تم حل كل المقاطع"],
"lS83Sg": ["تعذّر الوصول إلى الحافظة."],
"lScd1O": ["تُفتح شرائح Slidev في تطبيق OpenKnowledge لسطح المكتب فقط."],
@@ -4666,6 +4667,7 @@
"pJ7XCo": ["لا تشير هذه الصفحة إلى أي ملفات أو صور محلية."],
"pMPnZv": ["تم حذف ", ["deleted"], " مهارات"],
"pOo4Aa": ["نص عادي"],
+ "pPiV8s": ["تفعيل تلقائي (سحب ودفع)"],
"pSimwP": ["اسم جديد لنسخة ", ["editor"]],
"pTPqMK": ["بدّل كتلة الكود المحصورة."],
"pTyA_t": ["وسوم"],
@@ -4768,6 +4770,7 @@
"qAx7xG": ["مجلد ثابت في جذر المحتوى"],
"qBi_YG": ["تثبيت OpenKnowledge في أدوات الذكاء الاصطناعي لديك"],
"qC7PwZ": ["فشلت إزالة الحقل"],
+ "qD3krc": ["لا شيء يتحرك حتى تطلب ذلك."],
"qEEfPk": ["تقرير علة ", ["0"]],
"qEIFZu": ["مفتاح ينتهي بـ ", ["keyHint"]],
"qEue6Q": [" أو "],
@@ -4776,6 +4779,9 @@
"qIJIrD": ["يجري الاختبار"],
"qJSo0_": ["ما الفرق بين النسخ والروابط الرمزية؟"],
"qKMfPp": ["إخفاء عقد المهارات"],
+ "qLXJTB": [
+ "أبقِ هذا المشروع متزامنًا مع مستودعك البعيد. تلقائي (سحب فقط) يجلب التحديثات دون دفع؛ وتلقائي (سحب ودفع) يرسل تعديلاتك أيضًا. تشغيل المزامنة التلقائية يتطلب تأكيدًا."
+ ],
"qNOgUu": ["تصل التعديلات من المصدر إلى هنا — بلا انحراف نسخ ولصق."],
"qQi_um": ["تم استيراد السمة."],
"qRZh7J": ["دع مفتاح Tab يخرج من محرر المصدر بدلًا من الإزاحة."],
@@ -4791,7 +4797,6 @@
"qXg5W9": ["يُحفظ الملف في <0>~/Downloads/openknowledge.skill</0>."],
"qXsafh": ["النشر على GitHub"],
"qZv5ZR": ["فشل تبديل مشاركة الإعدادات"],
- "q_9EcE": ["هل تفعّل مزامنة git التلقائية؟"],
"q_Q1-i": [
[
"count",
@@ -4893,7 +4898,6 @@
["boldName"],
" — مهارة مدمجة تُشحن مع Open Knowledge. وهي للقراءة فقط."
],
- "rn7n0G": ["استئناف المزامنة"],
"rnX-1S": ["تفعيل الإضافات"],
"rnrdEX": ["الأساسي"],
"roAe2K": ["رابط الوجهة"],
@@ -4946,6 +4950,7 @@
"sJK6pq": ["الإذن مرفوض"],
"sJWhgo": ["مكوّن غير معروف: ", ["unregisteredComponentName"]],
"sKEgGd": ["الإرسال إلى المحادثة"],
+ "sKHiNR": [["count"], " للخلف"],
"sNeKjP": ["فشل تخزين الرمز — أعد المحاولة"],
"sOxZaS": ["فشل تحميل الرسم البياني"],
"sQoLn0": ["إنهاء"],
@@ -4969,6 +4974,7 @@
"scyoP9": [
"لا تحمل مستندات الفهرس frontmatter، باستثناء تلك الموجودة في جذر قاعدة المعرفة الخاصة بك. لا تتم تغطية مستندات السجل — OKF لا يقيد frontmatter الخاصة بها."
],
+ "sdvHp3": ["تغيّرت هنا وعلى المستودع البعيد"],
"se-tU0": ["تعذّر إصلاح ", ["0"], " من أصل ", ["total"], " ملفًا."],
"seeS6l": ["هل تعدّ OpenKnowledge في هذا المجلد؟"],
"sgmRY8": ["تم تخطي تنزيل ", ["0"], "."],
@@ -4995,6 +5001,9 @@
"snrVQ7": ["فشل الفحص"],
"sq4WQH": ["استخدام ", ["0"], " كسمة فاتحة"],
"sqUrlK": ["يجري التفكّر…"],
+ "srdlOs": [
+ "المزامنة التلقائية متوقفة مؤقتًا: ليست لديك صلاحية الدفع إلى هذا المستودع. بدّل إلى تلقائي (سحب فقط) لمواصلة تلقي التحديثات."
+ ],
"ssk6rl": [
"مجلد المهارة نفسه (",
["path"],
@@ -5014,12 +5023,12 @@
"szy9BS": ["استخدم الحروف الصغيرة والأرقام والشرطات فقط"],
"t-JXbf": ["صف مضمَّن بأسلوب Notion لملف قابل للتنزيل. السحب والإفلات يعمل أيضًا."],
"t18QYR": ["إلغاء تثبيت ", ["accessibleLabel"]],
- "t2TkQ3": ["المزامنة موقوفة مؤقتًا — احلل التعارضات للمتابعة."],
"t4sFKC": [
"سيُنشأ الفرع الجديد <0>",
["trimmed"],
"</0> من الإيداع الحالي، في شجرة عمل خاصة به تحت <1>.ok/worktrees/</1>."
],
+ "t5I7P_": ["لا شيء يتحرك حتى تطلب ذلك — اسحب وادفع من قائمة المزامنة."],
"t6w1cq": ["افتح تبويب محرر فارغًا."],
"t7YoBO": ["إرسال هذا التعليق"],
"t9Qn8y": ["لا يوجد وكلاء مفعَّلون"],
@@ -5058,6 +5067,7 @@
"tjXez2": ["blog-post"],
"tjbyOy": ["تفاصيل المشروع"],
"tkIXtS": ["تم تثبيت ", ["imported"], " مهارة (", ["alreadyImported"], " كانت موجودة بالفعل)"],
+ "tlGXxX": ["تلقائي (سحب فقط)"],
"tnG-m6": ["المزامنة التلقائية موقوفة مؤقتًا — سجّل الدخول للمتابعة."],
"toyw51": ["عناصر تحكم مخطط Mermaid"],
"tqQBwN": ["تُعرض أي نصوص برمجية للمراجعة، ولا تُنفَّذ أبدًا."],
@@ -5097,6 +5107,7 @@
"u779EG": ["استخدم أصلًا يبدأ بـ http:// أو https://."],
"u7H-Wn": ["إظهار اللوحة (", ["panelShortcutLabel"], ")"],
"u7U_Ij": ["اربط النص المحدد، أو حرّر الرابط الواقع تحت المؤشر."],
+ "uAQUqI": ["الحالة"],
"uA_jXp": ["تبديل الفرع وتحديثه"],
"uBAxNB": ["المحرر"],
"uCaIdy": ["تسجيل الدخول إلى GitHub مفقود أو منتهي الصلاحية. أعد الاتصال لاستئناف المزامنة."],
@@ -5125,9 +5136,6 @@
"تعذّرت إعادة تشغيل الخادم — يعمل تحت حساب مختلف. أعد تشغيل جهازك لتحريره، ثم أعد فتح هذا المشروع."
],
"uUCrBv": ["رابط رمزي"],
- "uUiiyC": [
- "ليس لديك إذن بالدفع إلى هذا المستودع. لا تزال «المتابعة» قادرة على إبقاء نسختك محدَّثة."
- ],
"uVbUP8": ["الإعدادات…"],
"uY5Z7P": ["انتهت اللعبة · اضغط <0>مسافة</0> للعب مرة أخرى"],
"uYZTcW": ["لا يمكن مشاركة عنوان URL هذا على GitHub."],
@@ -5197,6 +5205,7 @@
"v15iQB": [
"عقد الحساب المصدق. ينطبق فقط على المستندات المكتوبة Attested Computation، حيث يتطلب OKF runtime؛ المفاهيم العادية لا تتأثر."
],
+ "v16Pzh": ["التبديل إلى تلقائي (سحب فقط)"],
"v2ZW0K": ["تفعيل الطرفية"],
"v2a04T": ["قواعد markdownlint"],
"v41fCm": ["الملف غير موجود"],
@@ -5222,6 +5231,7 @@
"vF68cg": ["الحقول"],
"vGQxBT": ["تُطبَّق تحديثات المصدر تلقائيًا (ما لم تُحرَّر محليًا)"],
"vGeNNQ": ["انسخ موجّهًا والصقه في وكيلك لإعداد مشروعك."],
+ "vGjmyl": ["محذوف"],
"vHlhDc": ["انقر نقرًا مزدوجًا للتحرير"],
"vIxrEk": ["ملاءمة العرض"],
"vLyv1R": ["إخفاء"],
@@ -5283,8 +5293,10 @@
}
]
],
+ "vp5vfW": ["ساعة واحدة"],
"vppAju": ["أين توضع المرفقات المضافة حديثًا."],
"vqJXNe": ["تثبيت مهارة <0>open-knowledge-discovery</0>"],
+ "vsFXfP": ["الدفع يتخطى"],
"vv7kpg": ["أُلغي"],
"vvWZnu": ["الفروق غير متاحة"],
"vwV-kH": ["توقّف إصلاح الملفات بشكل غير متوقع."],
@@ -5345,6 +5357,11 @@
"wdzBgi": ["أصبحت مشاركة الإعدادات مقصورة عليك وحدك."],
"weP6me": ["تعذّر تحميل المستندات — اكتب @ مرة أخرى لإعادة المحاولة"],
"wgNoIs": ["تحديد الكل"],
+ "wk_v1X": [
+ "المزامنة لشجرة العمل هذه مضبوطة على «تلقائي (سحب ودفع)»، موروثة من ",
+ ["project"],
+ ". غيّرها في الإعدادات ← المزامنة."
+ ],
"wlwXUk": ["اخترت ~/Downloads. الملفات هناك عابرة عادةً — ففكّر في مجلد ثابت بدلًا من ذلك."],
"wndeIl": ["صفحات على مستوى المشروع بلا حواف واردة ولا صادرة في الرسم البياني."],
"wqD3pI": ["تعذّر تحديث ", ["failed"], " من ", ["0"], " تعليقات."],
@@ -5394,6 +5411,7 @@
"xCdTnb": ["إغلاق التبويب الجديد"],
"xDBki3": ["اقتراحات العناوين"],
"xDEcka": ["المزوّد يحدّ من معدل استخدام هذا المفتاح. أعد المحاولة بعد قليل."],
+ "xDKOFk": ["متجاهَل"],
"xEb24l": ["دعنا نتواصل معك بالبريد الإلكتروني"],
"xFQRu4": ["لديّ نسخة محلية بالفعل"],
"xG4tb6": ["فُقد الاتصال بـ «", ["docName"], "»."],
@@ -5405,6 +5423,7 @@
"xOTzt5": ["الآن"],
"xSVO3J": ["ما الذي يُنشأ"],
"xV5sXw": ["قبل ", ["0"], " أسبوع"],
+ "xW5AUw": ["تم السحب ", ["pulled"]],
"xWEvuo": ["اسأل الذكاء الاصطناعي"],
"xWomUD": ["استخدام نسخة ", ["editor"]],
"xXo8FT": ["فشل الحفظ: ", ["error"]],
@@ -5573,6 +5592,7 @@
"zAJzIg": ["مشكلات في ", ["0"]],
"zAsDLY": ["عرض بياني لروابط المستندات"],
"zBUqvf": ["إعداد تكاملات OpenKnowledge…"],
+ "zBiFZh": ["تُودَع تعديلاتك وتُدفع إلى المستودع البعيد تلقائيًا."],
"zC5jrM": ["سيتم إنشاؤه باسم <0>", ["effective"], "</0>"],
"zD1Nqf": [
[
@@ -5599,6 +5619,7 @@
"zLak8b": ["تنشيط تبويب جديد"],
"zMmwh4": ["اختر سمة أو أنشئ سمتك الخاصة."],
"zQBg2C": ["حرّك الكتلة الحالية موضعًا واحدًا لأعلى أو لأسفل."],
+ "zWZBPx": ["تغيّر النوع"],
"zXj1rA": ["البحث حسب المعنى"],
"zYp8Sr": [
"تشير شارة <0>معدَّل</0> إلى القواعد التي يضبطها إعدادك صراحةً — مباشرةً أو موروثةً عبر <1>extends</1>. تحتفظ القواعد غير المؤشَّرة بحالتها الافتراضية."
@@ -5637,7 +5658,6 @@
". هل تختار مجلدًا مستنسخًا من ",
["expectedHost"],
"؟"
- ],
- "zz_Wd_": ["الوضع"]
+ ]
}
}
diff --git a/packages/app/src/locales/ar/messages.po b/packages/app/src/locales/ar/messages.po
index 572f89b11..76684801e 100644
--- a/packages/app/src/locales/ar/messages.po
+++ b/packages/app/src/locales/ar/messages.po
@@ -517,10 +517,6 @@ msgstr "{ahead} أمام، {behind} خلف"
msgid "{basename} — text editor"
msgstr "{basename} — محرر نصوص"
-#: src/components/SyncStatusBadge.tsx
-msgid "{behind, plural, one {# commit behind} other {# commits behind}}"
-msgstr "{behind, plural, zero {متأخر بـ # إيداع} one {متأخر بإيداع واحد} two {متأخر بإيداعين} few {متأخر بـ # إيداعات} many {متأخر بـ # إيداعًا} other {متأخر بـ # إيداع}}"
-
#: src/components/SyncStatusBadge.tsx
msgid "{behind} behind"
msgstr "{behind} خلف"
@@ -616,6 +612,14 @@ msgstr "{count, plural, zero {يصلح فورًا المشكلات # التي ل
msgid "{count, plural, one {matches # file} other {matches # files}}"
msgstr "{count, plural, zero {يطابق # ملف} one {يطابق ملفًا واحدًا} two {يطابق ملفين} few {يطابق # ملفات} many {يطابق # ملفًا} other {يطابق # ملف}}"
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} ahead"
+msgstr "{count} للأمام"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} behind"
+msgstr "{count} للخلف"
+
#: src/components/SkillBulkDeleteDialog.tsx
msgid "{count} skills"
msgstr "{count} مهارات"
@@ -811,14 +815,11 @@ msgstr "{localizedMessage} في السطر {displayLine}"
msgid "{mins, plural, one {# min ago} other {# min ago}}"
msgstr "{mins, plural, zero {قبل # دقيقة} one {قبل # دقيقة} two {قبل # دقيقة} few {قبل # دقائق} many {قبل # دقيقة} other {قبل # دقيقة}}"
-#: src/components/SyncStatusBadge.tsx
-msgid "{minutes} min ago"
-msgstr "قبل {minutes} دقيقة"
-
#: src/components/acp/ThreadHistoryMenu.tsx
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "{minutes}m ago"
msgstr "قبل {minutes} دقيقة"
@@ -910,6 +911,10 @@ msgstr "{propertyCount, plural, zero {# خاصية} one {خاصية واحدة}
msgid "{propPanelDescriptorLabel} Properties"
msgstr "خصائص {propPanelDescriptorLabel}"
+#: src/components/settings/SyncSection.tsx
+msgid "{seconds} seconds"
+msgstr "{seconds} ثانية"
+
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
@@ -1127,6 +1132,26 @@ msgstr "📝 أو assets/icon.png"
msgid "0/0"
msgstr "0/0"
+#: src/components/settings/SyncSection.tsx
+msgid "1 hour"
+msgstr "ساعة واحدة"
+
+#: src/components/settings/SyncSection.tsx
+msgid "1 minute"
+msgstr "دقيقة واحدة"
+
+#: src/components/settings/SyncSection.tsx
+msgid "15 minutes"
+msgstr "15 دقيقة"
+
+#: src/components/settings/SyncSection.tsx
+msgid "30 seconds"
+msgstr "30 ثانية"
+
+#: src/components/settings/SyncSection.tsx
+msgid "5 minutes"
+msgstr "5 دقائق"
+
#: src/components/ImportSkillForm.tsx
msgid "A .zip or .skill archive."
msgstr "أرشيف بصيغة .zip أو .skill."
@@ -1521,6 +1546,7 @@ msgstr "أضف تعليقاتك إلى هذه الرسالة"
#: src/components/PropertyDiffBlock.tsx
#: src/components/SkillDirectoryResult.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Added"
msgstr "أُضيف"
@@ -1565,11 +1591,13 @@ msgstr "يضيف هذه الملفات"
msgid "Adds these folders"
msgstr "يضيف هذه المجلدات"
+#: src/components/settings/SyncSection.tsx
#: src/editor/components/PropPanel.tsx
msgid "Advanced"
msgstr "متقدم"
#: src/components/ConsentDialogBody.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Advanced settings"
msgstr "إعدادات متقدمة"
@@ -1979,6 +2007,24 @@ msgstr "محتوى مرجعي؛ يُعكس حرفيًا في كل مكان يُ
msgid "Authorize in browser"
msgstr "التفويض في المتصفح"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull and Push)"
+msgstr "تلقائي (سحب ودفع)"
+
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull only)"
+msgstr "تلقائي (سحب فقط)"
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
+msgstr "تلقائي (سحب فقط) يجلب التحديثات من مستودع git البعيد ويقدّم نسختك تلقائيًا. تبقى تعديلاتك المحلية على هذا الجهاز ولا تُدفع أبدًا."
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) never pushes or commits your local changes. They stay only on this machine."
+msgstr "تلقائي (سحب فقط) لا يدفع تغييراتك المحلية ولا يودعها أبدًا. تبقى على هذا الجهاز فقط."
+
#: src/components/settings/TerminalSection.tsx
msgid "Auto-approve settings not yet loaded — try again in a moment"
msgstr "لم تُحمَّل إعدادات الموافقة التلقائية بعد — أعد المحاولة بعد قليل"
@@ -2012,21 +2058,13 @@ msgstr "ينطبق الإصلاح التلقائي فقط على المشكلا
msgid "Auto-save"
msgstr "الحفظ التلقائي"
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is off for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "المزامنة التلقائية معطّلة لشجرة العمل هذه، موروثة من {project}. غيّرها في الإعدادات ← المزامنة."
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "المزامنة التلقائية مفعّلة لشجرة العمل هذه، موروثة من {project}. غيّرها في الإعدادات ← المزامنة."
-
#: src/components/settings/SyncSection.tsx
msgid "Auto-sync is paused — sign in to resume."
msgstr "المزامنة التلقائية موقوفة مؤقتًا — سجّل الدخول للمتابعة."
#: src/components/settings/SyncSection.tsx
-msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Follow to keep receiving updates."
-msgstr "المزامنة التلقائية موقوفة مؤقتًا — ليس لديك إذن بالدفع إلى هذا المستودع. بدّل إلى «متابعة» لمواصلة تلقّي التحديثات."
+msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Auto (Pull only) to keep receiving updates."
+msgstr "المزامنة التلقائية متوقفة مؤقتًا: ليست لديك صلاحية الدفع إلى هذا المستودع. بدّل إلى تلقائي (سحب فقط) لمواصلة تلقي التحديثات."
#: src/components/AutoSyncEnableWarning.tsx
msgid "Auto-sync periodically fetches, pulls, and pushes commits to your remote git repository so your edits stay in sync across machines."
@@ -2424,9 +2462,14 @@ msgid "Change the embeddings provider?"
msgstr "هل تريد تغيير مزوّد التضمينات؟"
#: src/components/PropertyDiffBlock.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Changed"
msgstr "تغيّر"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Changed here and on the remote"
+msgstr "تغيّرت هنا وعلى المستودع البعيد"
+
#: src/components/ChangedOutsideBadge.tsx
msgid "changed outside"
msgstr "تغيّر خارجًا"
@@ -2451,6 +2494,10 @@ msgstr "حُفظت التغييرات تلقائيًا."
msgid "Check for updates"
msgstr "التحقق من التحديثات"
+#: src/components/settings/SyncSection.tsx
+msgid "Check for updates every"
+msgstr "التحقق من التحديثات كل"
+
#: src/components/AppMenubar.tsx
msgid "Check for updates…"
msgstr "التحقق من التحديثات…"
@@ -2970,6 +3017,10 @@ msgstr "علّق على كتلة الشيفرة هذه أو اسأل الذكا
msgid "Comments"
msgstr "التعليقات"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Commit and sync"
+msgstr "إيداع ومزامنة"
+
#: src/components/ShareBranchSwitchDialog.tsx
msgid "Commit or stash changes to switch:"
msgstr "أودع التغييرات أو خزّنها مؤقتًا للتبديل:"
@@ -3271,6 +3322,7 @@ msgstr "يجري التحويل..."
#: src/components/empty-state/CopyablePromptList.tsx
#: src/components/InstallInClaudeDesktopDialog.tsx
+#: src/components/SyncStatusBadge.tsx
#: src/editor/extensions/CodeBlockView.tsx
msgid "Copied"
msgstr "تم النسخ"
@@ -3886,6 +3938,10 @@ msgstr "تعذّرت قراءة التعليقات المنتظرة للإرسا
msgid "Couldn't read the comments waiting to send: {0}"
msgstr "تعذّرت قراءة التعليقات المنتظرة للإرسال: {0}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Couldn't read the working tree. Check the server logs."
+msgstr "تعذّرت قراءة شجرة العمل. راجع سجلات الخادم."
+
#. placeholder {0}: warning.code
#: src/components/settings/SavedThemesTiles.tsx
msgid "Couldn’t read this theme ({0})"
@@ -4459,6 +4515,10 @@ msgstr "هل تريد حذف هذه المحادثة؟"
msgid "Delete this comment"
msgstr "حذف هذا التعليق"
+#: src/components/SyncStatusBadge.tsx
+msgid "Deleted"
+msgstr "محذوف"
+
#. placeholder {0}: deletedTheme.label
#: src/components/settings/SavedThemesTiles.tsx
msgid "Deleted {0}."
@@ -4554,6 +4614,10 @@ msgstr "توكنات الوصف"
msgid "Design"
msgstr "التصميم"
+#: src/components/SyncStatusBadge.tsx
+msgid "detached HEAD"
+msgstr "HEAD منفصل"
+
#: src/components/SyncStatusBadge.tsx
msgid "Detached HEAD — checkout a branch to resume"
msgstr "HEAD منفصل — اسحب فرعًا للمتابعة"
@@ -4926,6 +4990,10 @@ msgstr "تقرأ كل أداة ذكاء اصطناعي المهارات من م
msgid "Each pack scaffolds your project with ready-made folders and templates."
msgstr "تبني كل حزمة هيكل مشروعك بمجلدات وقوالب جاهزة."
+#: src/components/settings/SyncSection.tsx
+msgid "Each push is one commit to your remote."
+msgstr "كل عملية دفع هي تثبيت واحد في مستودعك البعيد."
+
#: src/components/AppMenubar.tsx
#: src/components/settings/LintingSection.tsx
#: src/components/SkillsTree.tsx
@@ -5174,25 +5242,25 @@ msgstr "تمكين {id}"
#: src/components/EnableSyncConfirmDialog.tsx
#: src/components/share-receive-miss-content.tsx
#: src/components/ShareFreshnessWarning.tsx
-msgid "Enable auto-sync"
-msgstr "تفعيل المزامنة التلقائية"
+msgid "Enable Auto (Pull and Push)"
+msgstr "تفعيل تلقائي (سحب ودفع)"
-#: src/components/settings/LinkPreviewsSection.tsx
-msgid "Enable external link previews"
-msgstr "تفعيل معاينات الروابط الخارجية"
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Enable Auto (Pull and Push)?"
+msgstr "تفعيل تلقائي (سحب ودفع)؟"
#: src/components/AutoSyncOnboardingDialog.tsx
#: src/components/EnableSyncConfirmDialog.tsx
-msgid "Enable Follow"
-msgstr "تفعيل المتابعة"
+msgid "Enable Auto (Pull only)"
+msgstr "تفعيل تلقائي (سحب فقط)"
#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable Follow?"
-msgstr "هل تفعّل المتابعة؟"
+msgid "Enable Auto (Pull only)?"
+msgstr "تفعيل تلقائي (سحب فقط)؟"
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable git auto-sync?"
-msgstr "هل تفعّل مزامنة git التلقائية؟"
+#: src/components/settings/LinkPreviewsSection.tsx
+msgid "Enable external link previews"
+msgstr "تفعيل معاينات الروابط الخارجية"
#: src/components/settings/LintingSection.tsx
msgid "Enable indexes"
@@ -5788,6 +5856,10 @@ msgstr "فشل تحديث مزوّد التضمينات — {detail}"
msgid "Failed to update the project sync default — {detail}"
msgstr "فشل تحديث افتراضي مزامنة المشروع — {detail}"
+#: src/components/settings/SyncSection.tsx
+msgid "Failed to update the sync interval — {detail}"
+msgstr "تعذّر تحديث فاصل المزامنة — {detail}"
+
#: src/components/FileTree.tsx
msgid "Failed to upload file"
msgstr "فشل رفع الملف"
@@ -6047,28 +6119,6 @@ msgstr "تم نسخ رابط مشاركة المجلد."
msgid "Folder target: {linkTitle}. Click to open the overview."
msgstr "الوجهة المجلدية: {linkTitle}. انقر لفتح النظرة العامة."
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow"
-msgstr "متابعة"
-
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow — updates flow in from your remote; your edits stay on this computer."
-msgstr "متابعة — تتدفق التحديثات من مستودعك البعيد؛ وتبقى تعديلاتك على هذا الجهاز."
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
-msgstr "تجلب المتابعة التحديثات من مستودع git البعيد وتقدّم نسختك تلقائيًا. تبقى تعديلاتك المحلية على هذا الجهاز ولا تُدفع أبدًا."
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Follow is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "المتابعة مفعّلة لشجرة العمل هذه، موروثة من {project}. غيّرها في الإعدادات ← المزامنة."
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow never pushes or commits your local changes. They stay only on this machine."
-msgstr "لا تدفع المتابعة تغييراتك المحلية ولا تودعها أبدًا. تبقى على هذا الجهاز وحده."
-
#: src/components/acp/ThreadView.tsx
msgid "Follow the agent's edits"
msgstr "تابع تعديلات الوكيل"
@@ -6159,11 +6209,6 @@ msgstr "الـ frontmatter الذي يبدأ به كل مستند يُنشأ م
msgid "Frontmatter schemas"
msgstr "مخططات frontmatter"
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Full"
-msgstr "كامل"
-
#: src/components/InstallInClaudeDesktopDialog.tsx
msgid "Full guide"
msgstr "الدليل الكامل"
@@ -6177,14 +6222,6 @@ msgstr "المسار الكامل"
msgid "Full Path"
msgstr "المسار الكامل"
-#: src/components/settings/SyncSection.tsx
-msgid "Full sync — your commits push and remote changes pull automatically."
-msgstr "مزامنة كاملة — تُدفع إيداعاتك وتُسحب تغييرات المستودع البعيد تلقائيًا."
-
-#: src/components/SyncStatusBadge.tsx
-msgid "Full sync — your edits are committed and pushed to your remote automatically."
-msgstr "مزامنة كاملة — تُودَع تعديلاتك وتُدفع إلى مستودعك البعيد تلقائيًا."
-
#: src/components/OkBlobRunner.tsx
msgid "Game over · press <0>Space</0> to play again"
msgstr "انتهت اللعبة · اضغط <0>مسافة</0> للعب مرة أخرى"
@@ -6243,6 +6280,7 @@ msgid "Git needs a helper tool (such as git-lfs) that isn't installed or couldn'
msgstr "يحتاج Git إلى أداة مساعدة (مثل git-lfs) غير مثبَّتة أو تعذّر العثور عليها. ثبّتها، ثم أعد المحاولة."
#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Git sync"
msgstr "مزامنة Git"
@@ -6620,6 +6658,10 @@ msgstr "كيف تعمل المشاركة؟"
msgid "How missing project-local documents, files, and images are reported in Problems, editor diagnostics, audits, and agent tools."
msgstr "كيفية الإبلاغ عن مستندات المشروع المحلية والملفات والصور المفقودة في المشكلات وتشخيصات المحرر وعمليات التدقيق وأدوات الوكيل."
+#: src/components/settings/SyncSection.tsx
+msgid "How often this computer pulls changes from your remote."
+msgstr "عدد مرات جلب هذا الجهاز للتغييرات من مستودعك البعيد."
+
#: src/components/ShareFreshnessWarning.tsx
msgid "How to push manually"
msgstr "كيفية الدفع يدويًا"
@@ -6705,6 +6747,10 @@ msgstr "أنماط التجاهل"
msgid "Ignore patterns (raw text)"
msgstr "أنماط التجاهل (نص خام)"
+#: src/components/SyncStatusBadge.tsx
+msgid "Ignored"
+msgstr "متجاهَل"
+
#: src/components/LinksPanel.tsx
msgid "Image {identity}. Go to reference."
msgstr "الصورة {identity}. انتقل إلى المرجع."
@@ -7301,8 +7347,8 @@ msgid "Keep the name to 64 characters or fewer."
msgstr "اجعل الاسم 64 حرفًا أو أقل."
#: src/components/settings/SyncSection.tsx
-msgid "Keep this project in sync with your git remote. Follow fetches updates without pushing; full sync pushes your commits too. Turning sync on requires confirmation."
-msgstr "أبقِ هذا المشروع متزامنًا مع مستودعك البعيد. تجلب المتابعة التحديثات دون دفع؛ أما المزامنة الكاملة فتدفع إيداعاتك أيضًا. يتطلب تشغيل المزامنة تأكيدًا."
+msgid "Keep this project in sync with your git remote. Auto (Pull only) brings in updates without pushing; Auto (Pull and Push) sends your edits too. Turning auto-sync on requires confirmation."
+msgstr "أبقِ هذا المشروع متزامنًا مع مستودعك البعيد. تلقائي (سحب فقط) يجلب التحديثات دون دفع؛ وتلقائي (سحب ودفع) يرسل تعديلاتك أيضًا. تشغيل المزامنة التلقائية يتطلب تأكيدًا."
#: src/lib/pack-copy.ts
msgid "Keep track of the people and companies you work with and the meetings you have with them. Good for remembering who someone is, how you know them, and what you last talked about."
@@ -7782,6 +7828,11 @@ msgstr "إدارة أدوات الذكاء الاصطناعي غير متاحة
msgid "Managing project AI tools is unavailable in this build."
msgstr "إدارة أدوات الذكاء الاصطناعي للمشروع غير متاحة في هذه النسخة."
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Manual"
+msgstr "يدوي"
+
#: src/components/empty-state/use-create-suggestions.ts
msgid "Map the architecture"
msgstr "ارسم خريطة البنية"
@@ -7920,10 +7971,6 @@ msgstr "ألوان لوحة الألوان مفقودة"
msgid "Missing theme name"
msgstr "اسم السمة مفقود"
-#: src/components/SyncStatusBadge.tsx
-msgid "Mode"
-msgstr "الوضع"
-
#: src/components/settings/SearchSection.tsx
msgid "Model"
msgstr "النموذج"
@@ -7940,6 +7987,7 @@ msgstr "الجهد الافتراضي للنموذج"
#: src/components/FolderOverview.tsx
#: src/components/settings/markdownlint-rule-browser.tsx
#: src/components/SkillOriginInline.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Modified"
msgstr "معدَّل"
@@ -8232,10 +8280,6 @@ msgstr "خطأ في الشبكة أثناء التنظيف"
msgid "Network settings not yet loaded. Try again in a moment."
msgstr "لم يتم تحميل إعدادات الشبكة بعد. أعد المحاولة بعد لحظة."
-#: src/components/SyncStatusBadge.tsx
-msgid "never"
-msgstr "أبدًا"
-
#: src/components/FolderOverview.tsx
#: src/editor/tag-suggestion/TagSuggestionMenu.tsx
msgid "New"
@@ -8850,10 +8894,22 @@ msgstr "لا شيء ({0} لا يمكن أن يطابق مستندًا)"
msgid "nothing ({0} is not a valid pattern)"
msgstr "لا شيء ({0} ليس نمطًا صالحًا)"
+#: src/components/settings/SyncSection.tsx
+msgid "Nothing moves until you ask — pull and push from the sync menu."
+msgstr "لا شيء يتحرك حتى تطلب ذلك — اسحب وادفع من قائمة المزامنة."
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing moves until you ask."
+msgstr "لا شيء يتحرك حتى تطلب ذلك."
+
#: src/components/FolderPropertiesCard.tsx
msgid "Nothing set yet."
msgstr "لم يُضبط شيء بعد."
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing to commit — working tree clean."
+msgstr "لا شيء لإيداعه: شجرة العمل نظيفة."
+
#: src/components/BugReportSendToast.tsx
msgid "Nothing was uploaded. The report stays on this computer until you email it to us."
msgstr "لم يُرفع أي شيء. يبقى التقرير على هذا الجهاز حتى ترسله إلينا بالبريد الإلكتروني."
@@ -8887,10 +8943,6 @@ msgstr "من {0}"
msgid "of {totalPages}"
msgstr "من {totalPages}"
-#: src/components/settings/SyncSection.tsx
-msgid "Off"
-msgstr "معطّل"
-
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Off — external links show only their URL. No requests leave this computer."
msgstr "معطّل — تعرض الروابط الخارجية رابطها فقط. لا تغادر أي طلبات هذا الجهاز."
@@ -9645,6 +9697,10 @@ msgstr "صادر"
msgid "Outline"
msgstr "المخطط"
+#: src/components/SyncStatusBadge.tsx
+msgid "Outside what Open Knowledge commits."
+msgstr "خارج نطاق ما يودعه Open Knowledge."
+
#: src/components/SkillCostValue.tsx
msgid "over the {budgetLabel} token budget"
msgstr "يتجاوز ميزانية التوكنات {budgetLabel}"
@@ -9855,10 +9911,6 @@ msgstr "خطأ في صيغة النمط: {message}"
msgid "Pattern warnings: {summary}"
msgstr "تحذيرات النمط: {summary}"
-#: src/components/SyncStatusBadge.tsx
-msgid "Pause sync"
-msgstr "إيقاف المزامنة مؤقتًا"
-
#: src/components/acp/ThreadView.tsx
msgid "pending"
msgstr "معلّق"
@@ -10252,10 +10304,26 @@ msgstr "يجري النشر..."
msgid "Pull"
msgstr "سحب"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull and Push"
+msgstr "سحب ودفع"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull brings in"
+msgstr "السحب يجلب"
+
#: src/components/share-receive-miss-content.tsx
msgid "Pull latest changes"
msgstr "سحب أحدث التغييرات"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled}"
+msgstr "تم السحب {pulled}"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled} · pushed {pushed}"
+msgstr "تم السحب {pulled} · تم الدفع {pushed}"
+
#: src/components/share-receive-miss-content.tsx
#: src/components/SyncStatusBadge.tsx
msgid "Pulling"
@@ -10281,10 +10349,26 @@ msgstr "ادفع الفرع {branch} إلى GitHub قبل المشاركة."
msgid "Push failed — check the server logs for details."
msgstr "فشل الدفع — راجع سجلات الخادم للتفاصيل."
+#: src/components/SyncStatusBadge.tsx
+msgid "Push includes"
+msgstr "الدفع يشمل"
+
+#: src/components/settings/SyncSection.tsx
+msgid "Push my edits every"
+msgstr "دفع تعديلاتي كل"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Push skips"
+msgstr "الدفع يتخطى"
+
#: src/lib/share/run-share-action.ts
msgid "Push this branch to GitHub before sharing."
msgstr "ادفع هذا الفرع إلى GitHub قبل المشاركة."
+#: src/components/SyncStatusBadge.tsx
+msgid "Pushed {pushed}"
+msgstr "تم الدفع {pushed}"
+
#: src/components/SyncStatusBadge.tsx
msgid "Pushing"
msgstr "يجري الدفع"
@@ -10358,6 +10442,10 @@ msgstr "نسخة للقراءة فقط من كتلة MirrorSource في مستن
msgid "Read-only file in the {name} skill"
msgstr "ملف للقراءة فقط في مهارة {name}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reading working tree"
+msgstr "جارٍ قراءة شجرة العمل"
+
#: src/components/acp/working-status.ts
msgid "Reading…"
msgstr "يجري القراءة…"
@@ -10411,6 +10499,10 @@ msgstr "مهارة الوكيل الموصى بها"
msgid "Reconnect required"
msgstr "إعادة الاتصال مطلوبة"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reconnect required to keep syncing."
+msgstr "يلزم إعادة الاتصال لمتابعة المزامنة."
+
#: src/presence/use-sync-toasts.ts
msgid "Reconnected"
msgstr "أُعيد الاتصال"
@@ -10677,6 +10769,10 @@ msgstr "إعادة تسمية المهارة"
msgid "Rename succeeded but the sidebar may be out of date — refresh to resync"
msgstr "نجحت إعادة التسمية لكن الشريط الجانبي قد يكون قديمًا — حدّث لإعادة المزامنة"
+#: src/components/SyncStatusBadge.tsx
+msgid "Renamed"
+msgstr "معاد التسمية"
+
#. placeholder {0}: docLeaf(descriptor.from)
#. placeholder {1}: docLeaf(descriptor.to)
#: src/components/TimelinePanel.tsx
@@ -10828,7 +10924,6 @@ msgstr "قد تستمر المستودعات التي استنسختها بال
#: src/components/CloneDialog.tsx
#: src/components/share-metadata-rows.tsx
#: src/components/SkillPreviewTab.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Repository"
msgstr "المستودع"
@@ -10911,6 +11006,10 @@ msgstr "تغيير حجم لوحة المهارات"
msgid "Resolve conflict in your terminal"
msgstr "حل التعارض في طرفيتك"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Resolve in terminal"
+msgstr "الحل في الطرفية"
+
#: src/components/FileTree.tsx
msgid "Resolve the conflict on {files} before deleting."
msgstr "احسم التعارض في {files} قبل الحذف."
@@ -11026,10 +11125,6 @@ msgstr "تمت الاستعادة إلى نسخة {0}"
msgid "Results capped — this workspace has more files than search can index. A missing file may be a cap artifact, not a typo."
msgstr "النتائج محدودة — تحتوي مساحة العمل هذه على ملفات أكثر مما يستطيع البحث فهرسته. قد يكون الملف المفقود أثرًا للحد، لا خطأً إملائيًا."
-#: src/components/SyncStatusBadge.tsx
-msgid "Resume sync"
-msgstr "استئناف المزامنة"
-
#: src/components/acp/ThreadView.tsx
msgid "Resuming the chat"
msgstr "جارٍ استئناف المحادثة"
@@ -11101,8 +11196,8 @@ msgid "Reverting"
msgstr "يجري التراجع"
#: src/components/SyncStatusBadge.tsx
-msgid "Review conflicts"
-msgstr "مراجعة التعارضات"
+msgid "Review"
+msgstr "مراجعة"
#: src/components/ReportBugDialogBody.tsx
msgid "Review your report"
@@ -12248,6 +12343,10 @@ msgstr "انتهت مهلة بدء تشغيل Slidev. حاول مرة أخرى."
msgid "Small section heading."
msgstr "عنوان قسم صغير."
+#: src/components/SyncStatusBadge.tsx
+msgid "Some files are not listed — the working tree has too many changes."
+msgstr "بعض الملفات غير مدرجة: شجرة العمل تحتوي على تغييرات كثيرة جدًا."
+
#: src/components/settings/SavedThemesTiles.tsx
msgid "Some saved themes aren’t shown because the theme folder exceeds the scan limit."
msgstr "لا تظهر بعض السمات المحفوظة لأن مجلد السمات يتجاوز حد الفحص."
@@ -12439,6 +12538,10 @@ msgstr "يجري تشغيل الوكيل…"
msgid "status"
msgstr "الحالة"
+#: src/components/SyncStatusBadge.tsx
+msgid "Status"
+msgstr "الحالة"
+
#: src/components/SubscribeCard.tsx
#: src/components/SubscribeForm.tsx
msgid "Stay in the loop"
@@ -12586,8 +12689,8 @@ msgid "Switch to a branch to share."
msgstr "انتقل إلى أحد الفروع للمشاركة."
#: src/components/settings/SyncSection.tsx
-msgid "Switch to Follow"
-msgstr "التبديل إلى «متابعة»"
+msgid "Switch to Auto (Pull only)"
+msgstr "التبديل إلى تلقائي (سحب فقط)"
#: src/components/command-palette-commands.ts
msgid "Switch worktree"
@@ -12626,7 +12729,6 @@ msgid "Symlinks the skill to {path}"
msgstr "يربط المهارة رمزيًا بـ {path}"
#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Sync"
msgstr "مزامنة"
@@ -12635,10 +12737,6 @@ msgstr "مزامنة"
msgid "Sync & sharing"
msgstr "المزامنة والمشاركة"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync disabled"
-msgstr "المزامنة معطّلة"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync failed — check the server logs for details."
msgstr "فشلت المزامنة — راجع سجلات الخادم للتفاصيل."
@@ -12647,13 +12745,21 @@ msgstr "فشلت المزامنة — راجع سجلات الخادم للتف
msgid "Sync is failing. See the sync status for details."
msgstr "المزامنة تفشل. راجع حالة المزامنة للتفاصيل."
-#: src/components/settings/SyncSection.tsx
-msgid "Sync is off — your edits stay on this computer until you commit and push manually."
-msgstr "المزامنة معطّلة — تبقى تعديلاتك على هذا الجهاز حتى تودعها وتدفعها يدويًا."
+#: src/components/SyncBlockingChanges.tsx
+msgid "Sync is paused. Commit these local edits to continue, or sort them out in a terminal."
+msgstr "المزامنة متوقفة مؤقتًا. ثبّت هذه التعديلات المحلية للمتابعة، أو عالجها في الطرفية."
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync is paused. Turn it back on to resume."
-msgstr "المزامنة موقوفة مؤقتًا. أعد تشغيلها للمتابعة."
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull and Push) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "المزامنة لشجرة العمل هذه مضبوطة على «تلقائي (سحب ودفع)»، موروثة من {project}. غيّرها في الإعدادات ← المزامنة."
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull only) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "المزامنة لشجرة العمل هذه مضبوطة على «تلقائي (سحب فقط)»، موروثة من {project}. غيّرها في الإعدادات ← المزامنة."
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Manual for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "المزامنة لشجرة العمل هذه مضبوطة على «يدوي»، موروثة من {project}. غيّرها في الإعدادات ← المزامنة."
#: src/components/SyncStatusBadge.tsx
msgid "Sync mode"
@@ -12664,18 +12770,10 @@ msgstr "وضع المزامنة"
msgid "Sync now"
msgstr "المزامنة الآن"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync off"
-msgstr "المزامنة معطّلة"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync paused"
msgstr "المزامنة موقوفة مؤقتًا"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync paused — resolve conflicts to resume."
-msgstr "المزامنة موقوفة مؤقتًا — احلل التعارضات للمتابعة."
-
#: src/hooks/use-no-push-permission-toast.ts
msgid "Sync paused — you don't have permission to push to this repo"
msgstr "المزامنة موقوفة مؤقتًا — ليس لديك إذن بالدفع إلى هذا المستودع"
@@ -12710,10 +12808,6 @@ msgstr "حالة المزامنة: {syncStateLabel} — هوية git غير مض
msgid "Synced"
msgstr "متزامن"
-#: src/components/SyncStatusBadge.tsx
-msgid "Synced {lastSyncedRelative}"
-msgstr "تمت المزامنة {lastSyncedRelative}"
-
#: src/components/TimelinePanel.tsx
msgid "Synced from disk"
msgstr "متزامن من القرص"
@@ -12937,6 +13031,10 @@ msgstr "شكرًا على التقرير!"
msgid "That branch is already open in another worktree."
msgstr "ذلك الفرع مفتوح بالفعل في شجرة عمل أخرى."
+#: src/components/SyncBlockingChanges.tsx
+msgid "That did not go through. Check the server logs and try again."
+msgstr "لم تكتمل العملية. راجع سجلات الخادم ثم أعد المحاولة."
+
#: src/comments/reveal-comment.ts
msgid "That document didn't open in time. Try again once it has synced."
msgstr "لم يُفتح ذلك المستند في الوقت المناسب. حاول مرة أخرى بعد اكتمال المزامنة."
@@ -13972,6 +14070,10 @@ msgstr "اكتب '/' لعرض الأوامر"
msgid "Type a query, then press <0>↵</0> to search your pages by meaning."
msgstr "اكتب استعلامًا، ثم اضغط <0>↵</0> للبحث في صفحاتك حسب المعنى."
+#: src/components/SyncStatusBadge.tsx
+msgid "Type changed"
+msgstr "تغيّر النوع"
+
#: src/editor/components/CodePreviewEditModal.tsx
msgid "Type to edit; <0>Cmd/Ctrl+Enter</0> saves, <1>Esc</1> cancels."
msgstr "اكتب للتحرير؛ <0>Cmd/Ctrl+Enter</0> يحفظ، و<1>Esc</1> يلغي."
@@ -14100,6 +14202,10 @@ msgstr "إلغاء تحديد كل التعليقات"
msgid "Unmark every comment in {0}"
msgstr "إلغاء تحديد كل التعليقات في {0}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Unmerged"
+msgstr "غير مدموج"
+
#: src/editor/slash-command/items.tsx
msgid "Unordered list of items."
msgstr "قائمة عناصر غير مرتّبة."
@@ -14140,6 +14246,10 @@ msgstr "تعذّر حل الصورة {identity}. انتقل إلى المرجع.
msgid "Untitled report"
msgstr "تقرير بلا عنوان"
+#: src/components/SyncStatusBadge.tsx
+msgid "Untracked"
+msgstr "غير متتبَّع"
+
#: src/components/SyncStatusBadge.tsx
msgid "Up to date"
msgstr "محدَّث"
@@ -14187,8 +14297,8 @@ msgid "Updated \"{name}\" from {0}"
msgstr "حُدِّث «{name}» من {0}"
#: src/components/SyncStatusBadge.tsx
-msgid "Updated {lastSyncedRelative}"
-msgstr "حُدِّث {lastSyncedRelative}"
+msgid "Updated {updatedRelative}"
+msgstr "تم التحديث {updatedRelative}"
#: src/components/FolderTimelineCard.tsx
msgid "updated folder properties"
@@ -14202,6 +14312,11 @@ msgstr "حُدِّث إلى الإصدار {version}"
msgid "Updates flow in"
msgstr "تتدفق التحديثات إلى الداخل"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Updates flow in from your remote; your edits stay on this computer."
+msgstr "تصل التحديثات من المستودع البعيد؛ وتبقى تعديلاتك على هذا الجهاز."
+
#: src/components/SkillOriginInline.tsx
msgid "Updates from the source apply automatically (unless edited locally)"
msgstr "تُطبَّق تحديثات المصدر تلقائيًا (ما لم تُحرَّر محليًا)"
@@ -14654,6 +14769,10 @@ msgstr "أين ينبغي أن يعيش؟"
msgid "Which skill"
msgstr "أي مهارة"
+#: src/components/settings/SyncSection.tsx
+msgid "While you're signed out, updates are checked at most every 3 minutes regardless of this setting."
+msgstr "أثناء تسجيل خروجك، يجري التحقق من التحديثات كل 3 دقائق على الأكثر بغض النظر عن هذا الإعداد."
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "Whitespace"
msgstr "المسافات البيضاء"
@@ -14830,8 +14949,8 @@ msgid "You don't have permission to push to this repo."
msgstr "ليس لديك إذن بالدفع إلى هذا المستودع."
#: src/components/settings/SyncSection.tsx
-msgid "You don't have permission to push to this repo. Follow can still keep your copy up to date."
-msgstr "ليس لديك إذن بالدفع إلى هذا المستودع. لا تزال «المتابعة» قادرة على إبقاء نسختك محدَّثة."
+msgid "You don't have permission to push to this repo. Auto (Pull only) can still keep your copy up to date."
+msgstr "ليست لديك صلاحية الدفع إلى هذا المستودع. تلقائي (سحب فقط) يمكنه مع ذلك إبقاء نسختك محدثة."
#: src/components/ShareFreshnessWarning.tsx
msgid "You don't have write access to this repo."
@@ -14903,6 +15022,11 @@ msgstr "تحتوي نسختك من الفرع <0>{shareBranch}</0> على تغي
msgid "Your current version is saved first, so this is reversible."
msgstr "تُحفظ نسختك الحالية أولًا، فهذا قابل للتراجع."
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Your edits are committed and pushed to your remote automatically."
+msgstr "تُودَع تعديلاتك وتُدفع إلى المستودع البعيد تلقائيًا."
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "Your edits stay on this computer"
msgstr "تبقى تعديلاتك على هذا الجهاز"
diff --git a/packages/app/src/locales/bn/messages.json b/packages/app/src/locales/bn/messages.json
index d3da0ca33..37ecce088 100644
--- a/packages/app/src/locales/bn/messages.json
+++ b/packages/app/src/locales/bn/messages.json
@@ -23,11 +23,7 @@
"-YV1Uo": ["প্যাটার্ন ", ["patternNumber"]],
"-bFGPF": ["পরবর্তী পরিবর্তন"],
"-dNlfM": [["docName"], "-এর শেষ সম্পাদনাটি পূর্বাবস্থায় ফেরানো হয়েছে"],
- "-f2Ogn": [
- "এই প্রকল্পটি আপনার git রিমোটের সঙ্গে মিলিয়ে রাখুন। Follow না পাঠিয়ে হালনাগাদ আনে; পূর্ণ সিঙ্ক আপনার কমিটও পাঠায়। সিঙ্ক চালু করতে নিশ্চিতকরণ লাগে।"
- ],
"-g6KIS": ["অচেনা লিংক"],
- "-imiMK": ["Follow — হালনাগাদ আপনার রিমোট থেকে আসতে থাকে; আপনার সম্পাদনা এই কম্পিউটারেই থাকে।"],
"-kKdCC": [["0"], " থেকে ", ["imported"], "টি স্কিল ইনস্টল করা হয়েছে"],
"-kbIAr": ["লিংক ও ছবি"],
"-ksoxk": [
@@ -129,7 +125,6 @@
"0wswKc": ["বিভাগ ভাগ করে দেওয়া অনুভূমিক রেখা।"],
"0xnQ_X": ["হালনাগাদ আসতে থাকে"],
"0xnmlQ": ["রিপোজিটরির নাম"],
- "0yL--g": ["দ্বন্দ্ব পর্যালোচনা করুন"],
"0ySP5u": ["পরিবর্তনগুলি এই থিমে স্বয়ংক্রিয়ভাবে সংরক্ষিত হয়।"],
"0zAhu6": ["প্রতিটি নথি"],
"1-flC9": ["লোকাল সার্ভার পোর্ট"],
@@ -165,6 +160,7 @@
"1NgrlY": ["ইনস্টল করার অন্যান্য উপায়"],
"1QfxQT": ["সরিয়ে দিন"],
"1RluQD": ["বদলানো দেখান"],
+ "1TA-aJ": [["pulled"], " টানা · ", ["pushed"], " পাঠানো"],
"1TNIig": ["খুলুন"],
"1Ta7Fd": [["basename"], " খুলুন"],
"1V17kO": ["দুটি সংস্করণই লোড হচ্ছে"],
@@ -238,6 +234,11 @@
["FULLSCREEN_HUB_LIMIT"],
"টি ফলাফল।"
],
+ "2okwy4": [
+ "এই ওয়ার্কট্রির সিঙ্ক “স্বয়ংক্রিয় (শুধু টানুন)”-এ সেট করা, যা ",
+ ["project"],
+ " থেকে উত্তরাধিকারসূত্রে পাওয়া। Settings → Sync-এ এটি বদলান।"
+ ],
"2pR7ad": ["এমবেডিং API কী"],
"2q_Q7x": ["দৃশ্যমানতা"],
"2rLM8r": ["এজেন্ট থ্রেড শুরু করা যায়নি — অনুগ্রহ করে আবার চেষ্টা করুন।"],
@@ -342,7 +343,6 @@
"4A3Yzu": ["কোড ব্লক"],
"4BITzH": ["ত্রুটি:"],
"4CfgPM": ["প্রকল্পের ফোল্ডার তৈরি হয়েছে, কিন্তু git init ব্যর্থ হয়েছে। আবার চেষ্টা করুন।"],
- "4DcimZ": [["lastSyncedRelative"], " হালনাগাদ হয়েছে"],
"4E9jPa": ["আপনার প্রথম প্রকল্প তৈরি করুন"],
"4EZrJN": ["নিয়ম"],
"4ErgAf": ["OpenKnowledge একটি স্কিল ইনস্টল করেছে"],
@@ -370,6 +370,7 @@
"4m-xuX": ["স্বয়ংক্রিয় সংশোধন — ঠিক করার কিছু নেই"],
"4mDIcg": ["ইনস্টল করার জন্য স্কিলগুলো বাছুন। প্রতিটিই আপনার নিজের একটি সম্পাদনাযোগ্য স্কিল হিসেবে আসে।"],
"4mLBx9": ["সদস্যতা এখন পাওয়া যাচ্ছে না।"],
+ "4mbrAq": ["1 মিনিট"],
"4mp6Tv": ["OpenKnowledge ইনস্টল করা স্কিলগুলির তালিকা দেখিয়েছে"],
"4niEzY": ["স্যান্ডবক্স করা HTML এমবেড — HTML লিখুন, রেন্ডার করা প্রাকদর্শন সঙ্গে সঙ্গে দেখুন।"],
"4nj6n8": ["/api/config HTTP ", ["code"], " ফিরিয়েছে"],
@@ -379,11 +380,6 @@
"4uNLmk": ["টানা হচ্ছে"],
"4v2Yyz": ["ফোকাস Files সাইডবারে থাকলে দৃশ্যমান প্রতিটি ফাইল-ট্রি সারি নির্বাচন করুন।"],
"4xtLTl": ["লুকানো ফোল্ডার “", ["basename"], "”"],
- "4zEZS5": [
- "এই ওয়ার্কট্রির জন্য স্বয়ংক্রিয় সিঙ্ক চালু, যা ",
- ["project"],
- " থেকে উত্তরাধিকারসূত্রে পাওয়া। Settings → Sync-এ এটি বদলান।"
- ],
"4zGlN_": ["ছবির URL পেস্ট করুন বা আপলোডে ক্লিক করুন"],
"4z_1j2": ["রেন্ডার করা"],
"5-FeN2": ["শেয়ার URL"],
@@ -451,6 +447,7 @@
],
"5hFl0U": ["রেফারেন্স কপি করুন"],
"5jEnaB": ["এই প্ল্যাটফর্মে নেই"],
+ "5k0NLb": ["পর্যালোচনা"],
"5kWklo": ["(কিছু হয়তো অন্য নিয়মে আগেই লুকানো আছে)"],
"5lWFkC": ["সাইন ইন করুন"],
"5mksg0": ["অর্থভিত্তিক অনুসন্ধান নিষ্ক্রিয় করতে ব্যর্থ — ", ["detail"]],
@@ -487,6 +484,7 @@
"এই মেশিনে কমান্ডগুলো আপনার ইউজার অ্যাকাউন্টের পূর্ণ অ্যাক্সেস নিয়ে চলে। শেল বন্ধ করতে এটি বন্ধ করুন।"
],
"6Aih4U": ["অফলাইন"],
+ "6EoD0z": ["টার্মিনালে সমাধান করুন"],
"6FCixu": ["আগের চ্যাট আবার খুলুন"],
"6HCOwA": ["খুলতে ব্যর্থ।"],
"6KCH4m": ["লুকানো ফাইল"],
@@ -544,6 +542,11 @@
"6u9LvN": [["days", "plural", { "one": ["#", " দিন আগে"], "other": ["#", " দিন আগে"] }]],
"6ur2Mk": ["আপনার এজেন্টকে যেকোনো প্রকল্পে OpenKnowledge খুঁজে পেতে ও ব্যবহার করতে সাহায্য করুন।"],
"6vEr3W": ["লিংকের লক্ষ্য"],
+ "6xPJIj": [
+ "এই ওয়ার্কট্রির সিঙ্ক “ম্যানুয়াল”-এ সেট করা, যা ",
+ ["project"],
+ " থেকে উত্তরাধিকারসূত্রে পাওয়া। Settings → Sync-এ এটি বদলান।"
+ ],
"6xeZX9": ["সম্পাদনাগুলি সঙ্গে সঙ্গে প্রয়োগ হয়। হালকা বা গাঢ় থিম থেকে নির্ধারিত হয়।"],
"6zzhQL": ["আপনার রিপোর্ট ইমেইলে পাঠান"],
"72xhRD": ["চিত্র দেখার মোড"],
@@ -672,7 +675,6 @@
"8qgfac": ["MCP সার্ভার"],
"8rZ1pk": [["id"], " সক্ষম করুন"],
"8ruqQi": ["ভাঙা অভ্যন্তরীণ লিংক"],
- "8sMErm": ["Follow চালু করবেন?"],
"8t9CRE": [["agentName"], " শুরু করা হচ্ছে…"],
"8t9T3-": ["কোনো স্কিল পাওয়া যায়নি।"],
"8tjQCz": ["ঘুরে দেখুন"],
@@ -726,6 +728,7 @@
["0", "plural", { "one": ["#", " স্কিল ইনস্টল করুন"], "other": ["#", " স্কিল ইনস্টল করুন"] }]
],
"9Y6cCI": ["পৃষ্ঠা লোড করা যায়নি"],
+ "9ZxzfT": [["count"], " এগিয়ে"],
"9_2oe6": [
["0"],
"-কে আবার একটি সত্যিকারের ডিরেক্টরি বানান যাতে এখন দেখা প্রতিটি স্কিলের জন্য আলাদা সিমলিংক থাকে — কিছুই কাজ করা বন্ধ করে না, আর তারপর প্রতিটি স্কিলের মেনু সেটি সামলায়।"
@@ -804,11 +807,6 @@
"AVW-K9": ["অনাথ পাতা লোড করতে ব্যর্থ"],
"AWOSPo": ["বড় করুন"],
"AYoYhU": ["হালনাগাদ ব্যর্থ: ", ["0"]],
- "AaaESH": [
- "এই ওয়ার্কট্রির জন্য স্বয়ংক্রিয় সিঙ্ক বন্ধ, যা ",
- ["project"],
- " থেকে উত্তরাধিকারসূত্রে পাওয়া। Settings → Sync-এ এটি বদলান।"
- ],
"AcK_r0": ["Claude CLI"],
"AczYxH": ["কাস্টম open-knowledge এন্ট্রি — OpenKnowledge দ্বারা পরিচালিত নয়"],
"AdcGcG": ["আপনার পরিবর্তন প্রয়োগ করা হচ্ছে"],
@@ -873,6 +871,7 @@
"BVkqD9": [
"সূচী রক্ষণাবেক্ষণ বিরাম দেওয়া হয়েছে কারণ অন্য Git বৈশিষ্ট্য নিয়ন্ত্রণ করে index.md। .gitattributes আপডেট করুন যাতে স্কোপযুক্ত index.md পাথগুলি merge=union ব্যবহার করে, তারপর আবার চেষ্টা করুন।"
],
+ "BWTzAb": ["ম্যানুয়াল"],
"BY-g4_": ["প্যাটার্ন যোগ করুন"],
"Ba4D2x": ["টেমপ্লেট আমদানি করা হয়েছে"],
"Bdha5y": ["প্রকাশ করা হচ্ছে…"],
@@ -904,6 +903,7 @@
"C0C43b": [["warningCount", "plural", { "one": ["#", " সতর্কতা"], "other": ["#", " সতর্কতা"] }]],
"C0Ciaj": ["\"", ["0"], "\" হিসেবে আমদানি করা হয়েছে — \"", ["1"], "\" নামটি আগেই নেওয়া ছিল।"],
"C0hoX6": ["সবসময় অন্তর্ভুক্ত"],
+ "C2abof": ["ট্র্যাক করা হয়নি"],
"C3Zc44": ["স্কিল ঘুরে দেখুন"],
"C62P6b": ["সম্পাদকের নির্বাচন"],
"C7PKTv": ["চেক করা মন্তব্য আলাপে পাঠান"],
@@ -932,9 +932,6 @@
"CTJLpz": ["\"", ["trimmed"], "\" এখানে আগে থেকেই আছে"],
"CU3AiE": ["ব্রাঞ্চ বদলানো হচ্ছে"],
"CUmCwI": ["নিচে সারি যোগ করুন"],
- "CVRM5N": [
- "Follow আপনার রিমোট git রিপোজিটরি থেকে হালনাগাদ আনে এবং আপনার অনুলিপি নিজে থেকেই এগিয়ে নেয়। আপনার স্থানীয় সম্পাদনা এই কম্পিউটারেই থাকে এবং কখনও পাঠানো হয় না।"
- ],
"CWjM1r": ["সরাসরি ", ["0"], "/-এ থাকা নথি"],
"CWzc2T": [
"<0>~/.ok/bin</0> ও <1>~/.ok/env.sh</1> দুই ক্ষেত্রেই থেকে যায় — অ্যাপ সবসময় সেগুলো রক্ষণাবেক্ষণ করে।"
@@ -971,6 +968,7 @@
"Git প্রকল্পে, Open Knowledge রিপোজিটরির রুটের .gitattributes ফাইলে একটি সীমিত নিয়ম যোগ করে, যাতে একই সময়ে হওয়া ইনডেক্স পরিবর্তনগুলো একত্রিত হয়।"
],
"CxVk-w": [["address"], "-এ মন্তব্য"],
+ "Cz-K13": ["15 মিনিট"],
"D-NlUC": ["সিস্টেম"],
"D-Oh1s": [["0"], " কীভাবে সেট আপ করবেন (ব্রাউজারে খোলে)"],
"D-_B7l": ["যুক্ত হয়েছে — এই এন্ডপয়েন্ট ", ["0"], "-মাত্রার ভেক্টর ফেরায়।"],
@@ -1030,7 +1028,6 @@
"DmkTrb": ["এই থিম তৈরি করা যায়নি। আবার চেষ্টা করুন।"],
"Dnn2XG": ["স্বয়ংক্রিয়"],
"DpjYd6": ["অ্যাংকর করা লেখায় যান"],
- "DrYM2Z": ["সিঙ্ক নিষ্ক্রিয়"],
"DsDwR-": [["0", "plural", { "one": ["#", " ত্রুটি"], "other": ["#", " ত্রুটি"] }]],
"DskIkK": ["সাইন-ইন স্ট্রিম নিশ্চিতকরণ ছাড়াই শেষ হয়েছে — অনুগ্রহ করে আবার চেষ্টা করুন"],
"DuCPiG": [
@@ -1224,6 +1221,7 @@
"Fqr8BP": ["টুলবার নিয়ন্ত্রণসহ বহু-পাতার PDF দর্শক (থাম্বনেইল, পাতা নেভিগেশন, জুম)।"],
"Fqx38P": ["কী বাধা হয়ে দাঁড়িয়েছিল?"],
"Fr8JGg": ["Zip ফাইল"],
+ "FsEXax": ["এটি সম্পন্ন হয়নি। সার্ভার লগ দেখে আবার চেষ্টা করুন।"],
"Fsx78O": ["আপনার টার্মিনালে <0>ok</0> কমান্ড যোগ করুন"],
"FvMSms": ["নাম বদলালে ডিস্কের ফাইল এবং এজেন্টরা এই টেমপ্লেটটি বাছতে যে id ব্যবহার করে দুটোই বদলে যায়।"],
"Fx9aOF": ["OpenKnowledge একটি নথি সম্পাদনা করেছে"],
@@ -1334,6 +1332,9 @@
"H0WlWQ": ["একটি শিরোনাম সারিসহ সারি ও কলামের জাল।"],
"H1TmTu": ["ঠিক করা থামানো হয়েছে। যেসব ফাইল আগেই ঠিক হয়েছে সেগুলো ঠিকই থাকে।"],
"H3oH0g": ["পুনরায় করুন"],
+ "H4doZt": [
+ "সিঙ্ক থেমে আছে। চালিয়ে যেতে এই স্থানীয় সম্পাদনাগুলি কমিট করুন, অথবা টার্মিনালে সেগুলি মিটিয়ে নিন।"
+ ],
"H86f9p": ["গুটিয়ে নিন"],
"H8DVOJ": ["দুই জায়গাতেই এক — ", ["pick"], " এগুলো পড়তেই থাকবে।"],
"HAkEqR": ["সাম্প্রতিক ফাইল"],
@@ -1410,6 +1411,7 @@
"IWGfGF": ["আপনার GitHub সংযোগ পরীক্ষা করা হচ্ছে"],
"IX7-sq": ["\"", ["docName"], "\" খোলার সময় কিছু একটা ভুল হয়েছে।"],
"IX_uXB": ["my-feature"],
+ "IXiG0B": ["স্বয়ংক্রিয় (টানুন ও পাঠান)"],
"IYciRC": ["রিপোর্টের জন্য ধন্যবাদ!"],
"IajAbS": ["একটি স্টার্টার প্যাক যোগ করুন"],
"If0crP": ["AI ", ["targetDisplayName"], " দিয়ে খুলুন, ", ["hint"]],
@@ -1460,6 +1462,7 @@
"JLzQi_": [["accessibleLabel"], " বন্ধ করুন"],
"JM_aq-": ["একটি https:// URL ব্যবহার করুন — http:// কেবল localhost-এর জন্য অনুমোদিত।"],
"JOcPqH": ["একটি রিমোট রিপোজিটরি এই মেশিনে আনুন।"],
+ "JOhCT9": ["পাঠানোতে অন্তর্ভুক্ত"],
"JWsZlx": ["সম্পাদনা করতে একটি প্রকল্প খুলুন।"],
"JZ8cO6": ["হালকা, গাঢ়, বা OS অনুসরণ করুন।"],
"J_jZ5z": [
@@ -1546,6 +1549,9 @@
"KjTmeO": ["এই শেয়ার করা জিনিসটি খুলতে OpenKnowledge আপডেট করুন।"],
"KkEAud": ["বর্তমান নথি বা ফোল্ডারের প্রসঙ্গ থেকে একটি ফাইল তৈরি করুন।"],
"KkRyMI": ["মার্জটি শ্রেণিবদ্ধ করা যায়নি — আবার চেষ্টা করুন।"],
+ "KmVekT": [
+ "স্বয়ংক্রিয় (শুধু টানুন) আপনার রিমোট git রিপোজিটরি থেকে আপডেট আনে এবং আপনার কপি স্বয়ংক্রিয়ভাবে এগিয়ে নেয়। আপনার স্থানীয় সম্পাদনা এই কম্পিউটারেই থাকে এবং কখনো পাঠানো হয় না।"
+ ],
"KmydK6": ["গাঢ়"],
"KnoB--": ["<0>", ["sanitized"], "</0> হিসেবে সংরক্ষিত হবে।"],
"KpOJFY": ["বাইরের লিংকের প্রাকদর্শন চালু করুন"],
@@ -1553,6 +1559,7 @@
"KsAPaB": ["এই ব্রাঞ্চটি এখানে চেক আউট করা আছে:"],
"KtACeE": ["ডিফল্ট: <0>", ["0"], "</0>"],
"KujtjC": ["খুঁজুন"],
+ "KvwJv8": ["কিছু ফাইল তালিকায় নেই: ওয়ার্কিং ট্রিতে অনেক বেশি পরিবর্তন আছে।"],
"Kx881F": [["0"], " পুনরুদ্ধার করা হয়েছে।"],
"L-rMC9": ["ডিফল্টে রিসেট করুন"],
"L1BQTH": [["0"], " এখনও ইনস্টল করা নেই — এর ডাউনলোড পাতা খোলা হচ্ছে।"],
@@ -1570,6 +1577,7 @@
"L83DKQ": ["PATH ইনস্টল ব্যর্থ হয়েছে: ", ["summary"]],
"L8fKuc": ["এটি আপনার টার্মিনালে চালান"],
"L9Y9Om": ["সবচেয়ে বেশি লিংক করা পাতা"],
+ "L9ox9k": ["ওয়ার্কিং ট্রি পড়া যায়নি। সার্ভার লগ দেখুন।"],
"LAR9ub": [["0"], "-এ থাকা বিদ্যমান OpenKnowledge এন্ট্রি প্রতিস্থাপন করবে"],
"LBv_TR": ["জায়গাগুলোকে সিমলিংকে রূপান্তর করুন"],
"LBwUR6": ["ব্রাঞ্চ বদলের সময় শেষ — ", ["targetNoun"], " হাতে খুলে দেখুন।"],
@@ -1593,7 +1601,6 @@
]
],
"LKOLNn": ["কোনো AI এজেন্ট ইনস্টল করা নেই"],
- "LNum6A": [["minutes"], " মিনিট আগে"],
"LPAv9E": [["days"], " দিন আগে"],
"LQdLio": ["নতুন স্কিমা"],
"LQsCPn": ["স্থানীয় কমিটগুলো এই অনুলিপিকে হালনাগাদ হতে দিচ্ছে না"],
@@ -1671,7 +1678,6 @@
"MCjC9A": [["deleteDescriptorLabel"], " মুছুন"],
"MDBJwN": ["ব্যবহার করা কঠিন"],
"MDZSJe": ["এজেন্ট কখন তার নির্ধারিত কাজ চালায়।"],
- "MGBNwj": ["সিঙ্ক থামান"],
"MGb89P": [
"CodeMirror-এর ডিফল্ট কীম্যাপ দিয়ে সোর্স সম্পাদকের লাইন ঢোকান, মুছুন, সরান, কপি করুন ও ভেতরে নিন।"
],
@@ -1680,7 +1686,6 @@
"MIF36T": ["ফর্কটি মীমাংসা করা যায়নি: ", ["0"]],
"MILoeL": ["পরিষেবা"],
"MJuO1q": ["প্রসঙ্গ জানালা:"],
- "MKEPCY": ["Follow"],
"MLVPcm": [["0"], " সংস্করণ ", ["1"]],
"MOAoFO": ["এখনও কোনো এজেন্ট ফোল্ডার নেই"],
"MPpSAg": [["selectedPackName"], " থেকে নতুন প্রকল্প তৈরি করুন"],
@@ -1741,6 +1746,7 @@
],
"N5rzKJ": [["0"], "টি স্কিল মুছুন"],
"N6j2JH": [["0"], " সম্পাদনা করুন"],
+ "N7Lau6": ["কমিট করে সিঙ্ক করুন"],
"NBdIgR": ["মন্তব্য করুন"],
"NErvOX": ["যেখানে সংরক্ষিত"],
"NEzPEh": ["একটি নতুন ব্রাঞ্চ তৈরি করুন, বা বিদ্যমান কোনোটি নিজের জানালায় চেক আউট করুন।"],
@@ -1768,6 +1774,7 @@
"Nay2Yr": ["আপনার অনুসন্ধানের সঙ্গে কোনো এজেন্ট মেলে না।"],
"NcUznW": [["0"], ", কোনো ওয়ার্কস্পেস নেই"],
"NcurBF": ["নিচে সরান"],
+ "NcwbBM": ["টানলে আসবে"],
"NeQ_0G": ["এই মন্তব্যগুলো নিয়ে কাজ করুন"],
"NeY1Np": ["Slidev চালু হতে সময় শেষ হয়ে গেছে। আবার চেষ্টা করুন।"],
"NfraGd": ["Slidev ইনস্টল করার অন্যান্য উপায়"],
@@ -1811,6 +1818,7 @@
"O6yEPk": ["আপনার পছন্দের ফোল্ডারে একটি নতুন OpenKnowledge প্রকল্প তৈরি করুন।"],
"O7_W_a": ["AI দিয়ে খুলুন"],
"O9oQJS": ["রিপোর্ট পাঠান"],
+ "OBdkpo": ["বিচ্ছিন্ন HEAD"],
"OD0FCX": ["লুকানো “", ["basename"], "”"],
"ODGGlj": ["ফোল্ডারের নাম: ", ["detail"]],
"OEEQKT": ["ভালো"],
@@ -1868,6 +1876,7 @@
"Oo_WWc": ["কোনো পাতা পাওয়া যায়নি"],
"Oos8fo": ["কমান্ড কপি করুন"],
"OplnBG": ["এই বিল্ডে AI টুল সামলানো যায় না।"],
+ "OqqecQ": ["30 সেকেন্ড"],
"OsSaYm": ["ক্লোন ব্যর্থ: ", ["title"]],
"OuQezS": ["আপনি এই কথোপকথন আবার শুরু করলে প্রযোজ্য হবে"],
"OuY8t9": ["বর্তমান ব্রাঞ্চে খুলুন"],
@@ -1902,7 +1911,9 @@
"PBwmDJ": ["অর্থের ভিত্তিতে খোঁজা হচ্ছে"],
"PBxg_E": ["এখন নয়"],
"PCSkw2": ["স্কিল"],
+ "PEGxvo": ["5 মিনিট"],
"PGPGsL": ["বিবরণ যোগ করুন"],
+ "PGRnbw": ["আপডেট আপনার রিমোট থেকে আসে; আপনার সম্পাদনা এই কম্পিউটারেই থাকে।"],
"PHHEuH": ["সমাধান হওয়া মন্তব্য লুকান (", ["0"], ")"],
"PIMM5l": ["আপনি সদস্য হয়েছেন!"],
"PKLY-1": ["খোলা হচ্ছে…"],
@@ -1915,7 +1926,6 @@
"PRgIJh": [["subRoot"], " হালনাগাদ করা যায়নি: ", ["0"]],
"PRnH8G": [["0"], "-এর মধ্যে"],
"PTUuoc": ["ওই মন্তব্যের চিহ্ন সরানো যায়নি — সেটি এখনও পাঠানোর অপেক্ষায়।"],
- "PTb1Nx": ["সিঙ্ক থেমে আছে। আবার শুরু করতে এটি চালু করুন।"],
"PVSwOe": ["দিক পরিবর্তন করা হচ্ছে — বর্তমান কাজ থামার অপেক্ষায়…"],
"PVUn_c": ["ফোল্ডার খুলুন"],
"PVggyD": ["Frontmatter স্কিমা"],
@@ -1964,6 +1974,7 @@
"PrWQiT": ["Terminal ডান দিকে সরান"],
"PrhzDE": ["উপরে সরান"],
"Pw5PTU": ["বাহ্যিক অরিজিন"],
+ "PxZCNM": ["Open Knowledge যা কমিট করে তার বাইরে।"],
"Q-DKvr": [["source"], " থেকে ইনস্টল করুন"],
"Q1mtyd": ["সাইডবার লুকান"],
"Q5fqMz": ["সংযোগ ত্রুটি — আবার চেষ্টা করুন"],
@@ -2007,6 +2018,7 @@
["childCount", "plural", { "one": ["#", " আইটেম"], "other": ["#", " আইটেম"] }],
" আছে"
],
+ "QeREu8": ["নাম বদলানো হয়েছে"],
"QfFBdJ": ["টেমপ্লেটের ফাইলের নাম (`.md` ছাড়া)।"],
"Qft6eW": [["0"], "টি স্কিল গ্লোবালে সরান"],
"Qj4RL5": ["সম্পন্ন:"],
@@ -2194,13 +2206,9 @@
"Sr9xtj": ["এই স্কিমা যে ফোল্ডারগুলোর ক্ষেত্রে প্রযোজ্য সেগুলো বেছে নিন"],
"SrOuyg": ["নথি প্যানেল"],
"SvBFYA": ["কোনো সাম্প্রতিক প্রকল্প নেই"],
- "Sxx_Zz": [
- "এই ওয়ার্কট্রির জন্য Follow চালু, যা ",
- ["project"],
- " থেকে উত্তরাধিকারসূত্রে পাওয়া। Settings → Sync-এ এটি বদলান।"
- ],
"T-654M": ["PDF লোড হচ্ছে"],
"T0OVm7": ["ডিফল্ট ব্রাঞ্চটি সুরক্ষিত — পাঠাতে একটি পুল রিকোয়েস্ট লাগে।"],
+ "T1fMJ6": ["এই কম্পিউটার কত ঘন ঘন আপনার রিমোট থেকে পরিবর্তন টেনে আনে।"],
"T2fvhw": [["0"], "-এর সব মন্তব্যের চিহ্ন সরান"],
"T3Mld1": ["জানালা"],
"T3j-7o": ["যেমন সিঙ্ক চলার সময় প্রকল্প বদলানো"],
@@ -2246,10 +2254,10 @@
"U2pMtf": ["tag-name"],
"U3IvM5": ["পূর্ণ নির্দেশিকা"],
"U3RIJu": ["স্থানীয় ফাইল"],
- "U4nTfu": ["Follow চালু করুন"],
"U5Spo9": ["বিষয়বস্তুর ডিরেক্টরি প্রকল্পের ভেতরে হতে হবে"],
"U6Mdhd": ["চলুন সেটআপ করি।"],
"U6wmNc": ["সিঙ্ক থেমে আছে"],
+ "U7Iesw": [["seconds"], " সেকেন্ড"],
"U88xbi": ["স্কিমা ফাইল তৈরি করতে ব্যর্থ"],
"U8CD-l": ["পূর্ণ পথ কপি করুন, কোনো ওয়ার্কস্পেস নেই"],
"UBv8UK": ["স্থায়ীভাবে মুছুন"],
@@ -2283,7 +2291,6 @@
"URmyfc": ["বিস্তারিত"],
"UTNVyS": ["পুরো সোর্স নথিটি নির্বাচন করুন।"],
"UTZ97u": ["নির্বাচন প্রকল্পের ভেতরে হতে হবে"],
- "UVDasf": ["সিঙ্ক বন্ধ — আপনি হাতে কমিট ও পুশ না করা পর্যন্ত আপনার সম্পাদনা এই কম্পিউটারেই থাকে।"],
"UVLlMV": ["GitHub-এর নাগাল পাওয়া যায়নি। আবার চেষ্টা করবেন?"],
"UW2Fg3": ["এই প্রকল্পের চলমান সার্ভার সরাসরি সম্পাদনা সমর্থন করে না। ঠিক করতে OpenKnowledge পুনরায় চালু করুন।"],
"UW93oq": ["কী বদলান"],
@@ -2318,6 +2325,7 @@
"UhpfxY": ["বাঁয়ে সরান"],
"UkQGhd": ["বদলানো লুকান"],
"UlVARL": ["Slidev চালু করুন"],
+ "Uo2Rj7": ["স্বয়ংক্রিয় (টানুন ও পাঠান) চালু করবেন?"],
"Uobeu9": ["স্কিলটি ", ["rootRel"], "-এ যোগ করে — যা ", ["0"], "-ও পড়ে"],
"Up2_7p": ["পূর্ণ পথ কপি করুন"],
"UpCz01": ["এই নথি"],
@@ -2389,6 +2397,7 @@
"VdXv4D": ["GitHub থেকে ক্লোন করুন"],
"VeVIIk": ["স্কিল লোড হচ্ছে"],
"Vftef5": ["সাধারণ markdown সমস্যা — হার্ড ট্যাব, শিরোনামের ধাপ, তালিকা চিহ্ন, আরও অনেক কিছু।"],
+ "Vl1H8I": ["সিঙ্ক চালিয়ে যেতে আবার সংযোগ করতে হবে।"],
"Vlc75q": ["ফাইলটি মুছে ফেলাই রাখুন"],
"VmJT51": ["আপনার রিপোর্ট লোড হচ্ছে"],
"VmXASo": ["(সিমলিংক)"],
@@ -2410,6 +2419,7 @@
["rootPath"],
"</0>-এ আগে থেকেই একটি OpenKnowledge প্রকল্প আছে। এর বাইরে কোনো জায়গা বাছুন, নয়তো সেই প্রকল্পটিই খুলুন।"
],
+ "W7mERj": ["স্বয়ংক্রিয় (শুধু টানুন) চালু করবেন?"],
"W8vpBM": ["স্টার্টার প্যাক"],
"W9NSe0": ["লিংক যাচাই করা হচ্ছে"],
"W9_Bub": ["স্থানীয় পরিবর্তন আগত সিঙ্কের সঙ্গে মিলে যাচ্ছে"],
@@ -2427,6 +2437,7 @@
"টি আইটেম মুছে ফেলতে চান? ফোল্ডার ও তার ভেতরের সব ফাইল মুছে যাবে। এই কাজ ফেরানো যাবে না।"
],
"WMsoIm": ["আগে থেকেই সাইন ইন করা আছে?"],
+ "WOfp4H": ["সিঙ্ক ব্যবধান আপডেট করা যায়নি — ", ["detail"]],
"WOr-hW": ["টোকেন"],
"WPwDin": ["ফোল্ডারটি ডিস্কে খুলুন"],
"WR0y2O": ["ফোল্ডার ভাগ করুন"],
@@ -2445,6 +2456,7 @@
"Wcv-Zi": ["এই জ্ঞানভাণ্ডারটি একটি Claude Skill হিসেবে উপলব্ধ করুন।"],
"We7h2I": ["📝 বা assets/icon.png"],
"Weq9zb": ["সাধারণ"],
+ "WfcERq": ["কমিট করার কিছু নেই: ওয়ার্কিং ট্রি পরিষ্কার।"],
"Wfy3rU": ["এজেন্ট সেটিং"],
"Wgmlsw": ["আনা হচ্ছে"],
"Wh0im4": ["[[", ["realCurrentDoc"], "]] সম্পাদনা করা হচ্ছে"],
@@ -2498,7 +2510,6 @@
"XRuL0i": ["পাতা তৈরি করুন"],
"XSb9HS": ["স্থানীয় সম্পাদনা বাদ দিন, ইনস্টল করা সংস্করণ ফিরিয়ে আনুন"],
"XT-L4j": ["AI দিয়ে তৈরি করতে একটি এজেন্ট চালু করুন"],
- "XU0OXn": ["স্বয়ংক্রিয় সিঙ্ক চালু করুন"],
"XU5AOg": ["ইনপুট"],
"XV5sC0": ["ওয়ার্কট্রি খুলুন"],
"XW18jo": ["পাতার শিরোনামের সাড়া সাফল্য স্কিমার সঙ্গে মেলেনি"],
@@ -2547,6 +2558,7 @@
"Xp7Kq4": ["আরেকটি সিঙ্ক কাজ চলছে। একটু পরে আবার চেষ্টা করুন।"],
"Xp94R1": ["আর একবার চেষ্টা করুন"],
"XpIZmv": ["মনোস্পেস লেখাসহ বেড়া দেওয়া কোড ব্লক।"],
+ "Xs1kjx": ["আপডেট দেখার ব্যবধান"],
"Xs7IcT": [["displayName"], "-এ পৌঁছানো যায়নি। আবার চেষ্টা করবেন?"],
"XszXjc": ["নাম বদলে ", ["0"], " করা হয়েছে"],
"XtRoxT": ["পাতা ", ["pageNumber"]],
@@ -2579,6 +2591,7 @@
"Lint প্লাগইন — কোন নিয়ম-পরিবারগুলো চলে ও তাদের প্রতি-নিয়ম সেটিং — এই প্রকল্প → Plugins-এর নিচে নিজেদের ট্যাবে কনফিগার করা হয়।"
],
"YEP3X2": ["সক্রিয় টেবিল-ঘরের নির্বাচন পুরো টেবিল ঘিরে থাকলে টেবিলটি মুছুন।"],
+ "YEzhIr": ["টানুন ও পাঠান"],
"YGIi_c": ["আবার ইনস্টল করুন"],
"YGNRB5": ["— ছাড়া"],
"YGt-0e": ["পড়া হচ্ছে…"],
@@ -2616,9 +2629,6 @@
"শুধু এই কম্পিউটারে এই প্রকল্পের জন্য প্রযোজ্য। .ok/local-এ সংরক্ষিত, git-এর মাধ্যমে ভাগ করা হয় না।"
],
"Yp-Hi_": ["সেটিং খুলুন"],
- "YsEYYS": [
- ["behind", "plural", { "one": ["#", " কমিট পিছিয়ে"], "other": ["#", " কমিট পিছিয়ে"] }]
- ],
"YvwwqC": ["কোথায়"],
"YwPUUP": ["এই প্যাকটি এখানে আগে থেকেই সেট আপ করা আছে।"],
"YxZDGh": [
@@ -2719,7 +2729,6 @@
"ZscwQ0": ["শুধু আমার-এ যাওয়া যায়নি"],
"Zt7Ktx": ["পাথ স্কিলের বাইরে যেতে পারে না (. বা .. নয়)"],
"Zue_jx": ["আপনার GitHub টোকেনে আবশ্যক স্কোপ নেই। আবার সাইন ইন করে দেখুন।"],
- "Zul8Ry": ["কখনও নয়"],
"ZvzbDF": ["এটি সরাসরি এই প্রকল্পে যোগ করুন।"],
"ZwpggY": ["OpenKnowledge প্রকল্পের সেটিংস পড়েছে"],
"_0JUKX": ["বাগ রিপোর্ট করতে OpenKnowledge ডেস্কটপ অ্যাপ দরকার।"],
@@ -2847,9 +2856,6 @@
"ai40UJ": ["নতুন রেকর্ড · আবার খেলতে <0>স্পেস</0> চাপুন"],
"aiArms": ["আমরা এই রিপোজিটরিটি ক্লোন করতে পারিনি।"],
"aiOceC": ["সূচী সক্রিয় করুন"],
- "ajHi4O": [
- "স্বয়ংক্রিয় সিঙ্ক থেমে আছে — এই রিপোজিটরিতে পুশ করার অনুমতি আপনার নেই। হালনাগাদ পেতে থাকতে Follow-এ যান।"
- ],
"ajz9F8": [["filePath"], "-এর দ্বন্দ্বের বিষয়বস্তু লোড করা যায়নি। পাতাটি আবার লোড করে দেখুন।"],
"ak4LLg": ["মেনু মুছুন"],
"akOe4q": [
@@ -2866,7 +2872,6 @@
"arUUsK": ["পণ্যের হালনাগাদ"],
"ax9kie": ["লিংক প্রাকদর্শনের সেটিং এখনও লোড হয়নি — একটু পরে আবার চেষ্টা করুন"],
"axQ1h6": ["আর কিছু যোগ করতে চান? (ঐচ্ছিক)"],
- "az8lvo": ["বন্ধ"],
"b18t0_": ["পার্থক্য বন্ধ করুন"],
"b1FDss": ["শুরুতে স্ক্রল করুন"],
"b2ezG_": ["দুটোই রাখা হয়েছে — \"", ["0"], "\" এখন নিজেই একটি স্কিল"],
@@ -2948,6 +2953,7 @@
],
"cH0dkG": ["আমার যে বৈশিষ্ট্যটি দরকার ছিল সেটি ছিল না"],
"cHhH3i": ["একটি প্রয়োজনীয় git টুল"],
+ "cIFYZn": ["আপনি সাইন আউট থাকা অবস্থায় এই সেটিং যা-ই হোক, আপডেট সর্বোচ্চ প্রতি 3 মিনিটে একবার দেখা হয়।"],
"cIptmH": ["Claude Desktop App-এ"],
"cKjLuT": ["(প্রকল্প + ব্যবহারকারী)"],
"cLP0Lf": ["রিমোট স্কিল উৎস"],
@@ -3009,6 +3015,8 @@
"ct2kv5": [["pageTarget"], "-এ কোনো শিরোনাম নেই"],
"cuA8QW": ["স্পেক সাজান"],
"cuHhjo": ["তৈরি ও সম্পাদনা"],
+ "cyoNqf": ["মার্জ হয়নি"],
+ "czQDKY": ["প্রতিটি পুশ আপনার রিমোটে একটি কমিট।"],
"d-GtJt": ["উৎস Markdown-এ দেখুন"],
"d1JjXo": [
"ব্রাঞ্চ <0>",
@@ -3092,6 +3100,9 @@
"eGUbmF": ["নির্বাচিত ফাইল বা ফোল্ডার কপি করুন"],
"eJitUk": ["কম্পিউটার থেকে আপলোড করুন"],
"eKThTQ": ["ক্রম বদলাতে ব্যর্থ"],
+ "eNOyTV": [
+ "এই রিপোজিটরিতে পুশ করার অনুমতি আপনার নেই। স্বয়ংক্রিয় (শুধু টানুন) তবুও আপনার কপি হালনাগাদ রাখতে পারে।"
+ ],
"eNQGRb": ["KaTeX দিয়ে রেন্ডার করা ইনলাইন LaTeX গণিত।"],
"eNhWUl": ["একজন PR পর্যালোচক, একজন রিলিজ-নোট লেখক, একটি মোতায়েন চেকলিস্ট…"],
"ePK91l": ["সম্পাদনা করুন"],
@@ -3119,6 +3130,7 @@
"emMrXQ": ["সার্ভার একটি ত্রুটিপূর্ণ গঠনের ডুপ্লিকেট প্রতিক্রিয়া ফেরত দিয়েছে।"],
"emgiet": ["প্রামাণিক বিষয়বস্তু; যেখানেই উল্লেখ করা হোক হুবহু প্রতিফলিত।"],
"enPTnx": ["লাইন ", ["displayLine"]],
+ "eolhcI": ["ওয়ার্কিং ট্রি পড়া হচ্ছে"],
"eps54V": ["সরানো হয়েছে"],
"epuNYK": [
"একটি ব্লককে সত্যের উৎস হিসেবে চিহ্নিত করুন। আপনি সেটি সম্পাদনা করার সঙ্গে সঙ্গে অন্য জায়গার মিররগুলো হালনাগাদ হয়।"
@@ -3126,7 +3138,6 @@
"erenF-": ["যেসব ফাইলের দ্বন্দ্ব এখনও মেটেনি সেগুলো মোছা যাবে না"],
"euGaS0": [["fileName"], " পড়া যায়নি।"],
"euc6Ns": ["প্রতিলিপি করুন"],
- "evHlIg": ["Follow কখনও আপনার স্থানীয় পরিবর্তন পাঠায় না বা কমিট করে না। সেগুলো কেবল এই মেশিনেই থাকে।"],
"evs0iw": ["\"", ["tagListQuery"], "\"-এর সঙ্গে মিলে যাওয়া ট্যাগ"],
"ewSbS_": ["Shell সেশন"],
"ezUmoU": ["অনুমোদিত উপাদান মান (খালি = যেকোনো)"],
@@ -3201,7 +3212,6 @@
}
]
],
- "g2Tj8R": ["পূর্ণ"],
"g3UF2V": ["গ্রহণ করুন"],
"g4WlQK": ["প্রকল্পের AI টুল সামলানো কেবল OpenKnowledge ডেস্কটপ অ্যাপেই আছে।"],
"g4XBm0": ["ছোট বিভাগ শিরোনাম।"],
@@ -3216,7 +3226,6 @@
["display"],
"-এর মধ্যে মেলানোর জন্য একটি ফোল্ডার বাছুন। ওই ফোল্ডারটি এটির সিমলিংক হয়ে যায়, তাই তার এজেন্ট এখানে রাখা সবকিছু পড়ে। এই ফোল্ডারটি সত্যিকারের থেকে যায়। দ্বন্দ্বপূর্ণ স্কিল মার্জ বাতিল করে দেয়।"
],
- "g85bAo": [["lastSyncedRelative"], " সিঙ্ক হয়েছে"],
"g9Nj4l": ["// নোট"],
"gAhHu7": ["স্বয়ংক্রিয় সংশোধন কেবল সেই সমস্যাগুলোর ক্ষেত্রেই প্রযোজ্য যাদের পরিচিত যান্ত্রিক সমাধান আছে।"],
"gBbxn_": ["সাইন-ইন অবস্থা পরীক্ষা করা হচ্ছে"],
@@ -3280,6 +3289,7 @@
"gwEcOD": ["আপনার স্থানীয় অনুলিপি পিছিয়ে আছে।"],
"gwykHF": ["এই নথিটি এখনও GitHub-এ সিঙ্ক হয়নি। পরের সিঙ্কের পর লিংকটি কাজ করবে।"],
"gyHDWC": ["AI দিয়ে সব ঠিক করুন (", ["count"], ")"],
+ "gyYvCN": ["আমার সম্পাদনা পাঠানোর ব্যবধান"],
"h-AdvS": ["ফোল্ডার ও টেমপ্লেট আগে থেকেই এখানে আছে, তাই যোগ করার কিছু নেই।"],
"h06R3C": ["কোনো পাতার বহির্গামী গ্রাফ লিংক অনুপস্থিত নয়।"],
"h16FyT": ["তালিকা"],
@@ -3351,7 +3361,6 @@
"hwFOFD": ["সেটিং লোড করা যায়নি"],
"hxBHxQ": ["একটি পাদটীকা<0><1>[1]</1></0> সহ একটি লাইন এবং নিচে দেখানো একটি সংজ্ঞা।"],
"hxEUVJ": [["selectedPackName"], " চালু করুন"],
- "hxYFzm": ["পূর্ণ সিঙ্ক — আপনার কমিট পাঠানো হয় এবং রিমোটের পরিবর্তন নিজে থেকেই চলে আসে।"],
"hxnF0I": [["0"], " প্রপার্টি"],
"hyCxJY": ["বদলে ওই ওয়ার্কট্রিটি খুলুন"],
"hynz2K": ["ডাউনলোড শুরু হয়েছে"],
@@ -3365,7 +3374,6 @@
"i09An-": ["একটি পুরোনো সংস্করণ ফিরিয়ে আনা হয়েছে (", ["0"], ")"],
"i1flq_": ["উইকি লিংকের পরামর্শ"],
"i3f2kh": ["মিলে যাওয়া কোনো কমান্ড নেই।"],
- "i6ng22": ["Follow-এ যান"],
"i92eAT": ["আমরা একটি রিপোজিটরি তৈরি করে সিঙ্ক শুরু করব — কোনো টার্মিনাল লাগবে না।"],
"i94lQe": ["OpenKnowledge দ্বন্দ্ব পরীক্ষা করেছে"],
"i9OyGp": ["পূর্বাবস্থা বা পুনরায়"],
@@ -3452,11 +3460,11 @@
],
"iqugog": ["চালু করা ব্যর্থ: ", ["errorDetail"]],
"irFGwu": ["টেমপ্লেট তালিকা"],
+ "irnKr_": [["updatedRelative"], " আপডেট হয়েছে"],
"irrm_E": ["নির্বাচন সরান"],
"isRobC": ["নতুন"],
"iuTKci": ["এখনও কোনো সম্পাদনা নেই।"],
"iv452l": [["0"], "-এর নথিপত্র (ব্রাউজারে খোলে)"],
- "iy64Li": ["পূর্ণ সিঙ্ক — আপনার সম্পাদনা নিজে থেকেই কমিট হয়ে আপনার রিমোটে পাঠানো হয়।"],
"iycx_A": ["পাঠানো হচ্ছে"],
"iz1LdD": ["OK শেষবার এখানে লেখার পর বাইরে থেকে বদলানো হয়েছে — দেখানো অবস্থাটি এখন ডিস্কে যা আছে তাই"],
"j-o6Z2": [
@@ -3502,6 +3510,7 @@
"jSO1X5": ["উত্তরাধিকারসূত্রে পাওয়া টেমপ্লেটের নাম এখানে বদলানো যায় না — যে ফোল্ডারের এটি, সেখানেই নাম বদলান।"],
"jSY41h": ["\"", ["docName"], "\" খুব বেশি সময় নিয়েছে। আপনার সংযোগ দেখুন।"],
"jTLWxh": ["একটি বাইরের পাতা ইনলাইন iframe-এ এমবেড করুন (নথি, ডেমো, Figma, CodeSandbox)।"],
+ "jTUxaN": ["স্বয়ংক্রিয় (শুধু টানুন) চালু করুন"],
"jWzDfC": ["আপনার কোন AI টুল আছে তা যাচাই করা হচ্ছে"],
"jZ_E5M": ["আনা ব্যর্থ — বিস্তারিত জানতে সার্ভার লগ দেখুন।"],
"j_Z6g7": ["ভাগ করা ডিফল্ট"],
@@ -3592,13 +3601,15 @@
"অর্থভিত্তিক অনুসন্ধানকে যেকোনো OpenAI-সঙ্গতিপূর্ণ এমবেডিং এন্ডপয়েন্টে লাগান — নিজে হোস্ট করা সার্ভার বা অন্য কোনো সরবরাহকারী। উপরের API কী-টি আপনি এখানে যে এন্ডপয়েন্ট নির্ধারণ করেন তার জন্যই।"
],
"kSiB3X": [["trashNoun"], "-এ পাঠানো যায়নি"],
- "kUn-CN": ["সিঙ্ক বন্ধ"],
"kV2YZv": [
"<0>Skills</0> দেখতে পাচ্ছেন না? আগে <1>Settings <2/> Capabilities <3/> Code execution and file creation</1> চালু করুন।"
],
"kVS5tE": ["প্রতি ফোল্ডারে generated সূচী বজায় রাখুন?"],
"kVgQUA": ["এই চ্যাট মুছবেন?"],
"kVzuTI": ["প্রস্তাবিত এজেন্ট দক্ষতা"],
+ "kXNv8P": [
+ "স্বয়ংক্রিয় (শুধু টানুন) আপনার স্থানীয় পরিবর্তন কখনো পুশ বা কমিট করে না। সেগুলি শুধু এই মেশিনেই থাকে।"
+ ],
"kYL1lH": ["এজেন্ট কার্যকলাপ"],
"k_Dqw1": [
[
@@ -3685,6 +3696,7 @@
"lM4c-I": [
"স্কিলের ভেতরের একটি পথ — যেকোনো ফোল্ডার চলে (যেমন references/notes.md)। পথের ফোল্ডারগুলো আপনার জন্য তৈরি করে দেওয়া হয়।"
],
+ "lPkjpD": [["pushed"], " পাঠানো হয়েছে"],
"lPzyrU": ["সব হাংক মীমাংসিত"],
"lS83Sg": ["ক্লিপবোর্ডে পৌঁছানো যায়নি।"],
"lScd1O": ["Slidev ডেক শুধু OpenKnowledge ডেস্কটপ অ্যাপে খোলে।"],
@@ -3993,6 +4005,7 @@
"pJ7XCo": ["এই পাতাটি কোনো স্থানীয় ফাইল বা ছবি উল্লেখ করে না।"],
"pMPnZv": [["deleted"], "টি স্কিল মুছে ফেলা হয়েছে"],
"pOo4Aa": ["সাধারণ টেক্সট"],
+ "pPiV8s": ["স্বয়ংক্রিয় (টানুন ও পাঠান) চালু করুন"],
"pSimwP": [["editor"], " সংস্করণের জন্য নতুন নাম"],
"pTPqMK": ["বেড়া দেওয়া কোড ব্লক চালু বা বন্ধ করুন।"],
"pTyA_t": ["ট্যাগ"],
@@ -4057,6 +4070,7 @@
"qAx7xG": ["বিষয়বস্তুর রুটে নির্দিষ্ট ফোল্ডার"],
"qBi_YG": ["আপনার AI টুলে OpenKnowledge ইনস্টল করুন"],
"qC7PwZ": ["ফিল্ডটি সরাতে ব্যর্থ"],
+ "qD3krc": ["আপনি না বলা পর্যন্ত কিছুই সরবে না।"],
"qEEfPk": ["বাগ রিপোর্ট ", ["0"]],
"qEIFZu": [["keyHint"], "-এ শেষ হওয়া কী"],
"qEue6Q": [" বা "],
@@ -4065,6 +4079,9 @@
"qIJIrD": ["পরীক্ষা করা হচ্ছে"],
"qJSo0_": ["অনুলিপি ও সিমলিংকের মধ্যে পার্থক্য কী?"],
"qKMfPp": ["স্কিল নোড লুকান"],
+ "qLXJTB": [
+ "এই প্রজেক্টটি আপনার git রিমোটের সাথে সিঙ্কে রাখুন। স্বয়ংক্রিয় (শুধু টানুন) পুশ ছাড়াই আপডেট আনে; স্বয়ংক্রিয় (টানুন ও পাঠান) আপনার সম্পাদনাও পাঠায়। স্বয়ংক্রিয় সিঙ্ক চালু করতে নিশ্চিতকরণ লাগে।"
+ ],
"qNOgUu": ["উৎসে করা সম্পাদনা এখানে এসে পড়ে — কপি-পেস্টের কোনো বিচ্যুতি নেই।"],
"qQi_um": ["থিম আমদানি করা হয়েছে।"],
"qRZh7J": ["Tab যেন ভেতরে না নিয়ে সোর্স সম্পাদক থেকে বেরিয়ে যায়।"],
@@ -4080,7 +4097,6 @@
"qXg5W9": ["ফাইলটি <0>~/Downloads/openknowledge.skill</0>-এ সংরক্ষিত হয়।"],
"qXsafh": ["GitHub-এ প্রকাশ করুন"],
"qZv5ZR": ["কনফিগ ভাগাভাগি টগল করতে ব্যর্থ"],
- "q_9EcE": ["git স্বয়ংক্রিয় সিঙ্ক চালু করবেন?"],
"q_Q1-i": [
[
"count",
@@ -4171,7 +4187,6 @@
["boldName"],
"-এর একটি প্রাকদর্শন — Open Knowledge-এর সঙ্গে আসা একটি অন্তর্নির্মিত স্কিল। এটি শুধু পড়ার জন্য।"
],
- "rn7n0G": ["সিঙ্ক আবার শুরু করুন"],
"rnX-1S": ["প্লাগইন চালু করুন"],
"rnrdEX": ["প্রাথমিক"],
"roAe2K": ["লিংক URL"],
@@ -4215,6 +4230,7 @@
"sJK6pq": ["অনুমতি নেই"],
"sJWhgo": ["অজানা কম্পোনেন্ট: ", ["unregisteredComponentName"]],
"sKEgGd": ["আলাপে পাঠান"],
+ "sKHiNR": [["count"], " পিছিয়ে"],
"sNeKjP": ["টোকেন সংরক্ষণ করতে ব্যর্থ — আবার চেষ্টা করুন"],
"sOxZaS": ["গ্রাফ লোড করতে ব্যর্থ"],
"sQoLn0": ["প্রস্থান"],
@@ -4238,6 +4254,7 @@
"scyoP9": [
"ইনডেক্স ডকুমেন্টে frontmatter নেই, আপনার জ্ঞানের মূলে থাকা একটি ছাড়া। লগ ডকুমেন্ট কভার করা হয় না — OKF তাদের frontmatter সীমাবদ্ধ করে না।"
],
+ "sdvHp3": ["এখানে এবং রিমোটে দুই জায়গাতেই বদলেছে"],
"se-tU0": [["total"], "টির মধ্যে ", ["0"], "টি ফাইল ঠিক করা যায়নি।"],
"seeS6l": ["এই ফোল্ডারে OpenKnowledge সেট আপ করবেন?"],
"sgmRY8": [["0"], " ডাউনলোড এড়িয়ে যাওয়া হয়েছে।"],
@@ -4253,6 +4270,9 @@
"snrVQ7": ["পরখ ব্যর্থ"],
"sq4WQH": [["0"], "-কে হালকা থিম হিসেবে ব্যবহার করুন"],
"sqUrlK": ["চিন্তা করা হচ্ছে…"],
+ "srdlOs": [
+ "স্বয়ংক্রিয় সিঙ্ক বিরতিতে আছে: এই রিপোজিটরিতে পুশ করার অনুমতি আপনার নেই। আপডেট পেতে থাকতে স্বয়ংক্রিয় (শুধু টানুন)-এ যান।"
+ ],
"ssk6rl": [
"স্কিলের নিজের ফোল্ডার (",
["path"],
@@ -4272,12 +4292,12 @@
"szy9BS": ["কেবল ছোট হাতের অক্ষর, সংখ্যা ও হাইফেন ব্যবহার করুন"],
"t-JXbf": ["ডাউনলোডযোগ্য ফাইলের জন্য Notion-ধাঁচের ইনলাইন সারি। টেনে-ফেলাও কাজ করে।"],
"t18QYR": [["accessibleLabel"], " আনপিন করুন"],
- "t2TkQ3": ["সিঙ্ক থেমে আছে — আবার শুরু করতে দ্বন্দ্ব মীমাংসা করুন।"],
"t4sFKC": [
"নতুন ব্রাঞ্চ <0>",
["trimmed"],
"</0> বর্তমান কমিট থেকে তৈরি হবে, <1>.ok/worktrees/</1>-এর নিচে নিজের ওয়ার্কট্রিতে।"
],
+ "t5I7P_": ["আপনি না বলা পর্যন্ত কিছুই সরবে না — সিঙ্ক মেনু থেকে টানুন ও পাঠান।"],
"t6w1cq": ["একটি খালি সম্পাদক ট্যাব খুলুন।"],
"t7YoBO": ["এই মন্তব্যটি পাঠান"],
"t9Qn8y": ["কোনো এজেন্ট চালু নেই"],
@@ -4316,6 +4336,7 @@
"tjXez2": ["blog-post"],
"tjbyOy": ["প্রকল্পের বিবরণ"],
"tkIXtS": [["imported"], "টি স্কিল ইনস্টল করা হয়েছে (", ["alreadyImported"], "টি আগে থেকেই ছিল)"],
+ "tlGXxX": ["স্বয়ংক্রিয় (শুধু টানুন)"],
"tnG-m6": ["স্বয়ংক্রিয় সিঙ্ক থেমে আছে — আবার শুরু করতে সাইন ইন করুন।"],
"toyw51": ["Mermaid চিত্রের নিয়ন্ত্রণ"],
"tqQBwN": ["যেকোনো স্ক্রিপ্ট পর্যালোচনার জন্য দেখানো হয়, কখনও চালানো হয় না।"],
@@ -4342,6 +4363,7 @@
"u779EG": ["একটি http:// বা https:// অরিজিন ব্যবহার করুন।"],
"u7H-Wn": ["প্যানেল দেখান (", ["panelShortcutLabel"], ")"],
"u7U_Ij": ["নির্বাচিত লেখাটি লিংক করুন, বা কার্সরের নিচের লিংকটি সম্পাদনা করুন।"],
+ "uAQUqI": ["অবস্থা"],
"uA_jXp": ["ব্রাঞ্চ বদলে হালনাগাদ করুন"],
"uBAxNB": ["সম্পাদক"],
"uCaIdy": ["GitHub সাইন-ইন অনুপস্থিত বা এর মেয়াদ শেষ। সিঙ্ক আবার শুরু করতে পুনরায় যুক্ত হোন।"],
@@ -4370,7 +4392,6 @@
"সার্ভার পুনরায় চালু করা যায়নি — এটি অন্য অ্যাকাউন্টের অধীনে চলছে। এটি পরিষ্কার করতে কম্পিউটার পুনরায় চালু করুন, তারপর এই প্রকল্পটি আবার খুলুন।"
],
"uUCrBv": ["সিমলিংক"],
- "uUiiyC": ["এই রিপোজিটরিতে পুশ করার অনুমতি আপনার নেই। Follow তবুও আপনার অনুলিপি হালনাগাদ রাখতে পারে।"],
"uVbUP8": ["সেটিং…"],
"uY5Z7P": ["খেলা শেষ · আবার খেলতে <0>স্পেস</0> চাপুন"],
"uYZTcW": ["এই GitHub URL শেয়ার করা যাবে না।"],
@@ -4416,6 +4437,7 @@
"v15iQB": [
"প্রত্যয়িত-গণনা চুক্তি। শুধুমাত্র Attested Computation টাইপ করা নথিতে প্রযোজ্য, যেখানে OKF একটি runtime প্রয়োজন; সাধারণ ধারণাগুলি প্রভাবিত হয় না।"
],
+ "v16Pzh": ["স্বয়ংক্রিয় (শুধু টানুন)-এ যান"],
"v2ZW0K": ["টার্মিনাল চালু করুন"],
"v2a04T": ["markdownlint নিয়ম"],
"v41fCm": ["ফাইল পাওয়া যায়নি"],
@@ -4434,6 +4456,7 @@
"vF68cg": ["ফিল্ড"],
"vGQxBT": ["উৎসের হালনাগাদ নিজে থেকেই প্রয়োগ হয় (স্থানীয়ভাবে সম্পাদনা না করা থাকলে)"],
"vGeNNQ": ["আপনার প্রকল্প সেট আপ করতে একটি প্রম্পট কপি করে আপনার এজেন্টে পেস্ট করুন।"],
+ "vGjmyl": ["মোছা হয়েছে"],
"vHlhDc": ["সম্পাদনা করতে ডাবল-ক্লিক করুন"],
"vIxrEk": ["প্রস্থ অনুযায়ী"],
"vLyv1R": ["লুকান"],
@@ -4480,8 +4503,10 @@
}
]
],
+ "vp5vfW": ["1 ঘণ্টা"],
"vppAju": ["নতুন যোগ করা সংযুক্তি কোথায় রাখা হয়।"],
"vqJXNe": ["<0>open-knowledge-discovery</0> স্কিল ইনস্টল করুন"],
+ "vsFXfP": ["পাঠানোতে বাদ"],
"vv7kpg": ["বাতিল করা হয়েছে"],
"vvWZnu": ["পার্থক্য অনুপলব্ধ"],
"vwV-kH": ["ফাইল ঠিক করার কাজ অপ্রত্যাশিতভাবে থেমে গেছে।"],
@@ -4540,6 +4565,11 @@
"wdzBgi": ["কনফিগ ভাগাভাগি এখন শুধু আমার।"],
"weP6me": ["নথি লোড করা যায়নি — আবার চেষ্টা করতে @ আবার লিখুন"],
"wgNoIs": ["সব নির্বাচন করুন"],
+ "wk_v1X": [
+ "এই ওয়ার্কট্রির সিঙ্ক “স্বয়ংক্রিয় (টানুন ও পাঠান)”-এ সেট করা, যা ",
+ ["project"],
+ " থেকে উত্তরাধিকারসূত্রে পাওয়া। Settings → Sync-এ এটি বদলান।"
+ ],
"wlwXUk": [
"আপনি ~/Downloads বেছেছেন। সেখানকার ফাইল সাধারণত ক্ষণস্থায়ী — বদলে একটি স্থায়ী ফোল্ডার বিবেচনা করুন।"
],
@@ -4579,6 +4609,7 @@
"xCdTnb": ["নতুন ট্যাব বন্ধ করুন"],
"xDBki3": ["শিরোনামের পরামর্শ"],
"xDEcka": ["সরবরাহকারী এই কী-টির হার সীমিত করছে। একটু পরে আবার চেষ্টা করুন।"],
+ "xDKOFk": ["উপেক্ষিত"],
"xEb24l": ["আমাদের ইমেইলে যোগাযোগ করতে দিন"],
"xFQRu4": ["এটি আমার কাছে আগে থেকেই স্থানীয়ভাবে আছে"],
"xG4tb6": ["\"", ["docName"], "\"-এর সঙ্গে সংযোগ হারিয়েছে।"],
@@ -4590,6 +4621,7 @@
"xOTzt5": ["এইমাত্র"],
"xSVO3J": ["যা যা তৈরি হয়"],
"xV5sXw": [["0"], " সপ্তাহ আগে"],
+ "xW5AUw": [["pulled"], " টানা হয়েছে"],
"xWEvuo": ["AI-কে জিজ্ঞেস করুন"],
"xWomUD": [["editor"], " সংস্করণ ব্যবহার করুন"],
"xXo8FT": ["সংরক্ষণ ব্যর্থ: ", ["error"]],
@@ -4722,6 +4754,7 @@
"zAJzIg": [["0"], "-এ সমস্যা"],
"zAsDLY": ["নথির লিংকের গ্রাফ চিত্রায়ণ"],
"zBUqvf": ["OpenKnowledge সংযুক্তি সেট আপ করুন…"],
+ "zBiFZh": ["আপনার সম্পাদনা স্বয়ংক্রিয়ভাবে কমিট হয়ে রিমোটে পাঠানো হয়।"],
"zC5jrM": ["<0>", ["effective"], "</0> হিসেবে তৈরি হবে"],
"zD1Nqf": [["count", "plural", { "one": ["#", " টি নথি"], "other": ["#", " টি নথি"] }]],
"zFH7iU": ["নেটওয়ার্ক সেটিংস সম্পূর্ণ পরিষ্কার করা যায়নি, তবে এক্সপোজার বন্ধ করা হচ্ছে। ", ["0"]],
@@ -4733,6 +4766,7 @@
"zLak8b": ["নতুন ট্যাব সক্রিয় করুন"],
"zMmwh4": ["একটি থিম বেছে নিন বা নিজের থিম তৈরি করুন।"],
"zQBg2C": ["বর্তমান ব্লকটি এক ধাপ উপরে বা নিচে সরান।"],
+ "zWZBPx": ["ধরন বদলেছে"],
"zXj1rA": ["অর্থ অনুযায়ী খুঁজুন"],
"zYp8Sr": [
"<0>পরিবর্তিত</0> ব্যাজ সেই নিয়মগুলো চিহ্নিত করে যেগুলো আপনার কনফিগ স্পষ্টভাবে নির্ধারণ করে — সরাসরি, বা <1>extends</1>-এর মাধ্যমে উত্তরাধিকারসূত্রে। চিহ্নহীন নিয়মগুলো তাদের ডিফল্ট অবস্থায় থাকে।"
@@ -4771,7 +4805,6 @@
"-এর নয়। ",
["expectedHost"],
" থেকে ক্লোন করা কোনো ফোল্ডার বেছে নেবেন?"
- ],
- "zz_Wd_": ["মোড"]
+ ]
}
}
diff --git a/packages/app/src/locales/bn/messages.po b/packages/app/src/locales/bn/messages.po
index a6cb0c8af..473db013b 100644
--- a/packages/app/src/locales/bn/messages.po
+++ b/packages/app/src/locales/bn/messages.po
@@ -517,10 +517,6 @@ msgstr "{ahead} এগিয়ে, {behind} পিছিয়ে"
msgid "{basename} — text editor"
msgstr "{basename} — টেক্সট সম্পাদক"
-#: src/components/SyncStatusBadge.tsx
-msgid "{behind, plural, one {# commit behind} other {# commits behind}}"
-msgstr "{behind, plural, one {# কমিট পিছিয়ে} other {# কমিট পিছিয়ে}}"
-
#: src/components/SyncStatusBadge.tsx
msgid "{behind} behind"
msgstr "{behind} পিছিয়ে"
@@ -616,6 +612,14 @@ msgstr "{count, plural, one {যে # সমস্যার পরিচিত
msgid "{count, plural, one {matches # file} other {matches # files}}"
msgstr "{count, plural, one {# ফাইলের সঙ্গে মেলে} other {# ফাইলের সঙ্গে মেলে}}"
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} ahead"
+msgstr "{count} এগিয়ে"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} behind"
+msgstr "{count} পিছিয়ে"
+
#: src/components/SkillBulkDeleteDialog.tsx
msgid "{count} skills"
msgstr "{count}টি স্কিল"
@@ -811,14 +815,11 @@ msgstr "{displayLine} নম্বর লাইনে {localizedMessage}"
msgid "{mins, plural, one {# min ago} other {# min ago}}"
msgstr "{mins, plural, one {# মিনিট আগে} other {# মিনিট আগে}}"
-#: src/components/SyncStatusBadge.tsx
-msgid "{minutes} min ago"
-msgstr "{minutes} মিনিট আগে"
-
#: src/components/acp/ThreadHistoryMenu.tsx
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "{minutes}m ago"
msgstr "{minutes} মিনিট আগে"
@@ -910,6 +911,10 @@ msgstr "{propertyCount, plural, one {# প্রপার্টি} other {# প
msgid "{propPanelDescriptorLabel} Properties"
msgstr "{propPanelDescriptorLabel} প্রপার্টি"
+#: src/components/settings/SyncSection.tsx
+msgid "{seconds} seconds"
+msgstr "{seconds} সেকেন্ড"
+
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
@@ -1123,6 +1128,26 @@ msgstr "📝 বা assets/icon.png"
msgid "0/0"
msgstr "0/0"
+#: src/components/settings/SyncSection.tsx
+msgid "1 hour"
+msgstr "1 ঘণ্টা"
+
+#: src/components/settings/SyncSection.tsx
+msgid "1 minute"
+msgstr "1 মিনিট"
+
+#: src/components/settings/SyncSection.tsx
+msgid "15 minutes"
+msgstr "15 মিনিট"
+
+#: src/components/settings/SyncSection.tsx
+msgid "30 seconds"
+msgstr "30 সেকেন্ড"
+
+#: src/components/settings/SyncSection.tsx
+msgid "5 minutes"
+msgstr "5 মিনিট"
+
#: src/components/ImportSkillForm.tsx
msgid "A .zip or .skill archive."
msgstr "একটি .zip বা .skill আর্কাইভ।"
@@ -1517,6 +1542,7 @@ msgstr "এই বার্তায় আপনার মন্তব্য
#: src/components/PropertyDiffBlock.tsx
#: src/components/SkillDirectoryResult.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Added"
msgstr "যোগ করা হয়েছে"
@@ -1561,11 +1587,13 @@ msgstr "এই ফাইলগুলো যোগ করে"
msgid "Adds these folders"
msgstr "এই ফোল্ডারগুলো যোগ করে"
+#: src/components/settings/SyncSection.tsx
#: src/editor/components/PropPanel.tsx
msgid "Advanced"
msgstr "উন্নত"
#: src/components/ConsentDialogBody.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Advanced settings"
msgstr "উন্নত সেটিং"
@@ -1975,6 +2003,24 @@ msgstr "প্রামাণিক বিষয়বস্তু; যেখা
msgid "Authorize in browser"
msgstr "ব্রাউজারে অনুমোদন দিন"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull and Push)"
+msgstr "স্বয়ংক্রিয় (টানুন ও পাঠান)"
+
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull only)"
+msgstr "স্বয়ংক্রিয় (শুধু টানুন)"
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
+msgstr "স্বয়ংক্রিয় (শুধু টানুন) আপনার রিমোট git রিপোজিটরি থেকে আপডেট আনে এবং আপনার কপি স্বয়ংক্রিয়ভাবে এগিয়ে নেয়। আপনার স্থানীয় সম্পাদনা এই কম্পিউটারেই থাকে এবং কখনো পাঠানো হয় না।"
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) never pushes or commits your local changes. They stay only on this machine."
+msgstr "স্বয়ংক্রিয় (শুধু টানুন) আপনার স্থানীয় পরিবর্তন কখনো পুশ বা কমিট করে না। সেগুলি শুধু এই মেশিনেই থাকে।"
+
#: src/components/settings/TerminalSection.tsx
msgid "Auto-approve settings not yet loaded — try again in a moment"
msgstr "স্বয়ংক্রিয় অনুমোদনের সেটিং এখনও লোড হয়নি — একটু পরে আবার চেষ্টা করুন"
@@ -2008,21 +2054,13 @@ msgstr "স্বয়ংক্রিয় সংশোধন কেবল স
msgid "Auto-save"
msgstr "স্বয়ংক্রিয় সংরক্ষণ"
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is off for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "এই ওয়ার্কট্রির জন্য স্বয়ংক্রিয় সিঙ্ক বন্ধ, যা {project} থেকে উত্তরাধিকারসূত্রে পাওয়া। Settings → Sync-এ এটি বদলান।"
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "এই ওয়ার্কট্রির জন্য স্বয়ংক্রিয় সিঙ্ক চালু, যা {project} থেকে উত্তরাধিকারসূত্রে পাওয়া। Settings → Sync-এ এটি বদলান।"
-
#: src/components/settings/SyncSection.tsx
msgid "Auto-sync is paused — sign in to resume."
msgstr "স্বয়ংক্রিয় সিঙ্ক থেমে আছে — আবার শুরু করতে সাইন ইন করুন।"
#: src/components/settings/SyncSection.tsx
-msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Follow to keep receiving updates."
-msgstr "স্বয়ংক্রিয় সিঙ্ক থেমে আছে — এই রিপোজিটরিতে পুশ করার অনুমতি আপনার নেই। হালনাগাদ পেতে থাকতে Follow-এ যান।"
+msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Auto (Pull only) to keep receiving updates."
+msgstr "স্বয়ংক্রিয় সিঙ্ক বিরতিতে আছে: এই রিপোজিটরিতে পুশ করার অনুমতি আপনার নেই। আপডেট পেতে থাকতে স্বয়ংক্রিয় (শুধু টানুন)-এ যান।"
#: src/components/AutoSyncEnableWarning.tsx
msgid "Auto-sync periodically fetches, pulls, and pushes commits to your remote git repository so your edits stay in sync across machines."
@@ -2420,9 +2458,14 @@ msgid "Change the embeddings provider?"
msgstr "এমবেডিং সরবরাহকারী বদলাবেন?"
#: src/components/PropertyDiffBlock.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Changed"
msgstr "পরিবর্তিত"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Changed here and on the remote"
+msgstr "এখানে এবং রিমোটে দুই জায়গাতেই বদলেছে"
+
#: src/components/ChangedOutsideBadge.tsx
msgid "changed outside"
msgstr "বাইরে বদলেছে"
@@ -2447,6 +2490,10 @@ msgstr "পরিবর্তনগুলি স্বয়ংক্রিয
msgid "Check for updates"
msgstr "হালনাগাদ দেখুন"
+#: src/components/settings/SyncSection.tsx
+msgid "Check for updates every"
+msgstr "আপডেট দেখার ব্যবধান"
+
#: src/components/AppMenubar.tsx
msgid "Check for updates…"
msgstr "হালনাগাদ দেখুন…"
@@ -2966,6 +3013,10 @@ msgstr "এই কোড ব্লক নিয়ে মন্তব্য ক
msgid "Comments"
msgstr "মন্তব্য"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Commit and sync"
+msgstr "কমিট করে সিঙ্ক করুন"
+
#: src/components/ShareBranchSwitchDialog.tsx
msgid "Commit or stash changes to switch:"
msgstr "বদলাতে পরিবর্তন কমিট বা স্ট্যাশ করুন:"
@@ -3267,6 +3318,7 @@ msgstr "রূপান্তর করা হচ্ছে…"
#: src/components/empty-state/CopyablePromptList.tsx
#: src/components/InstallInClaudeDesktopDialog.tsx
+#: src/components/SyncStatusBadge.tsx
#: src/editor/extensions/CodeBlockView.tsx
msgid "Copied"
msgstr "কপি হয়েছে"
@@ -3882,6 +3934,10 @@ msgstr "পাঠানোর অপেক্ষায় থাকা মন্
msgid "Couldn't read the comments waiting to send: {0}"
msgstr "পাঠানোর অপেক্ষায় থাকা মন্তব্যগুলো পড়া যায়নি: {0}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Couldn't read the working tree. Check the server logs."
+msgstr "ওয়ার্কিং ট্রি পড়া যায়নি। সার্ভার লগ দেখুন।"
+
#. placeholder {0}: warning.code
#: src/components/settings/SavedThemesTiles.tsx
msgid "Couldn’t read this theme ({0})"
@@ -4455,6 +4511,10 @@ msgstr "এই চ্যাট মুছবেন?"
msgid "Delete this comment"
msgstr "এই মন্তব্যটি মুছুন"
+#: src/components/SyncStatusBadge.tsx
+msgid "Deleted"
+msgstr "মোছা হয়েছে"
+
#. placeholder {0}: deletedTheme.label
#: src/components/settings/SavedThemesTiles.tsx
msgid "Deleted {0}."
@@ -4550,6 +4610,10 @@ msgstr "বিবরণ টোকেন"
msgid "Design"
msgstr "নকশা"
+#: src/components/SyncStatusBadge.tsx
+msgid "detached HEAD"
+msgstr "বিচ্ছিন্ন HEAD"
+
#: src/components/SyncStatusBadge.tsx
msgid "Detached HEAD — checkout a branch to resume"
msgstr "বিচ্ছিন্ন HEAD — আবার শুরু করতে কোনো ব্রাঞ্চ চেক আউট করুন"
@@ -4922,6 +4986,10 @@ msgstr "প্রতিটি AI টুল নিজের ফোল্ডার
msgid "Each pack scaffolds your project with ready-made folders and templates."
msgstr "প্রতিটি প্যাক আপনার প্রকল্পকে তৈরি ফোল্ডার ও টেমপ্লেট দিয়ে কাঠামো দেয়।"
+#: src/components/settings/SyncSection.tsx
+msgid "Each push is one commit to your remote."
+msgstr "প্রতিটি পুশ আপনার রিমোটে একটি কমিট।"
+
#: src/components/AppMenubar.tsx
#: src/components/settings/LintingSection.tsx
#: src/components/SkillsTree.tsx
@@ -5170,25 +5238,25 @@ msgstr "{id} সক্ষম করুন"
#: src/components/EnableSyncConfirmDialog.tsx
#: src/components/share-receive-miss-content.tsx
#: src/components/ShareFreshnessWarning.tsx
-msgid "Enable auto-sync"
-msgstr "স্বয়ংক্রিয় সিঙ্ক চালু করুন"
+msgid "Enable Auto (Pull and Push)"
+msgstr "স্বয়ংক্রিয় (টানুন ও পাঠান) চালু করুন"
-#: src/components/settings/LinkPreviewsSection.tsx
-msgid "Enable external link previews"
-msgstr "বাইরের লিংকের প্রাকদর্শন চালু করুন"
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Enable Auto (Pull and Push)?"
+msgstr "স্বয়ংক্রিয় (টানুন ও পাঠান) চালু করবেন?"
#: src/components/AutoSyncOnboardingDialog.tsx
#: src/components/EnableSyncConfirmDialog.tsx
-msgid "Enable Follow"
-msgstr "Follow চালু করুন"
+msgid "Enable Auto (Pull only)"
+msgstr "স্বয়ংক্রিয় (শুধু টানুন) চালু করুন"
#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable Follow?"
-msgstr "Follow চালু করবেন?"
+msgid "Enable Auto (Pull only)?"
+msgstr "স্বয়ংক্রিয় (শুধু টানুন) চালু করবেন?"
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable git auto-sync?"
-msgstr "git স্বয়ংক্রিয় সিঙ্ক চালু করবেন?"
+#: src/components/settings/LinkPreviewsSection.tsx
+msgid "Enable external link previews"
+msgstr "বাইরের লিংকের প্রাকদর্শন চালু করুন"
#: src/components/settings/LintingSection.tsx
msgid "Enable indexes"
@@ -5784,6 +5852,10 @@ msgstr "এমবেডিং সরবরাহকারী হালনাগ
msgid "Failed to update the project sync default — {detail}"
msgstr "প্রকল্পের সিঙ্ক ডিফল্ট হালনাগাদ করতে ব্যর্থ — {detail}"
+#: src/components/settings/SyncSection.tsx
+msgid "Failed to update the sync interval — {detail}"
+msgstr "সিঙ্ক ব্যবধান আপডেট করা যায়নি — {detail}"
+
#: src/components/FileTree.tsx
msgid "Failed to upload file"
msgstr "ফাইল আপলোড করতে ব্যর্থ"
@@ -6043,28 +6115,6 @@ msgstr "ফোল্ডার শেয়ার লিংক কপি কর
msgid "Folder target: {linkTitle}. Click to open the overview."
msgstr "ফোল্ডার লক্ষ্য: {linkTitle}। সংক্ষিপ্তসার খুলতে ক্লিক করুন।"
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow"
-msgstr "Follow"
-
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow — updates flow in from your remote; your edits stay on this computer."
-msgstr "Follow — হালনাগাদ আপনার রিমোট থেকে আসতে থাকে; আপনার সম্পাদনা এই কম্পিউটারেই থাকে।"
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
-msgstr "Follow আপনার রিমোট git রিপোজিটরি থেকে হালনাগাদ আনে এবং আপনার অনুলিপি নিজে থেকেই এগিয়ে নেয়। আপনার স্থানীয় সম্পাদনা এই কম্পিউটারেই থাকে এবং কখনও পাঠানো হয় না।"
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Follow is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "এই ওয়ার্কট্রির জন্য Follow চালু, যা {project} থেকে উত্তরাধিকারসূত্রে পাওয়া। Settings → Sync-এ এটি বদলান।"
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow never pushes or commits your local changes. They stay only on this machine."
-msgstr "Follow কখনও আপনার স্থানীয় পরিবর্তন পাঠায় না বা কমিট করে না। সেগুলো কেবল এই মেশিনেই থাকে।"
-
#: src/components/acp/ThreadView.tsx
msgid "Follow the agent's edits"
msgstr "এজেন্টের সম্পাদনা অনুসরণ করুন"
@@ -6155,11 +6205,6 @@ msgstr "এই টেমপ্লেট থেকে তৈরি প্রত
msgid "Frontmatter schemas"
msgstr "Frontmatter স্কিমা"
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Full"
-msgstr "পূর্ণ"
-
#: src/components/InstallInClaudeDesktopDialog.tsx
msgid "Full guide"
msgstr "পূর্ণ নির্দেশিকা"
@@ -6173,14 +6218,6 @@ msgstr "পূর্ণ পথ"
msgid "Full Path"
msgstr "পূর্ণ পথ"
-#: src/components/settings/SyncSection.tsx
-msgid "Full sync — your commits push and remote changes pull automatically."
-msgstr "পূর্ণ সিঙ্ক — আপনার কমিট পাঠানো হয় এবং রিমোটের পরিবর্তন নিজে থেকেই চলে আসে।"
-
-#: src/components/SyncStatusBadge.tsx
-msgid "Full sync — your edits are committed and pushed to your remote automatically."
-msgstr "পূর্ণ সিঙ্ক — আপনার সম্পাদনা নিজে থেকেই কমিট হয়ে আপনার রিমোটে পাঠানো হয়।"
-
#: src/components/OkBlobRunner.tsx
msgid "Game over · press <0>Space</0> to play again"
msgstr "খেলা শেষ · আবার খেলতে <0>স্পেস</0> চাপুন"
@@ -6239,6 +6276,7 @@ msgid "Git needs a helper tool (such as git-lfs) that isn't installed or couldn'
msgstr "Git-এর একটি সহায়ক টুল (যেমন git-lfs) দরকার যা ইনস্টল করা নেই বা পাওয়া যায়নি। সেটি ইনস্টল করে আবার চেষ্টা করুন।"
#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Git sync"
msgstr "Git সিঙ্ক"
@@ -6616,6 +6654,10 @@ msgstr "ভাগাভাগি কীভাবে কাজ করে?"
msgid "How missing project-local documents, files, and images are reported in Problems, editor diagnostics, audits, and agent tools."
msgstr "অনুপস্থিত প্রজেক্ট-লোকাল ডকুমেন্ট, ফাইল ও ছবিগুলো সমস্যা, এডিটর ডায়াগনস্টিকস, অডিট এবং এজেন্ট টুলে কীভাবে রিপোর্ট করা হয়।"
+#: src/components/settings/SyncSection.tsx
+msgid "How often this computer pulls changes from your remote."
+msgstr "এই কম্পিউটার কত ঘন ঘন আপনার রিমোট থেকে পরিবর্তন টেনে আনে।"
+
#: src/components/ShareFreshnessWarning.tsx
msgid "How to push manually"
msgstr "হাতে কীভাবে পাঠাবেন"
@@ -6701,6 +6743,10 @@ msgstr "উপেক্ষার প্যাটার্ন"
msgid "Ignore patterns (raw text)"
msgstr "উপেক্ষার প্যাটার্ন (কাঁচা লেখা)"
+#: src/components/SyncStatusBadge.tsx
+msgid "Ignored"
+msgstr "উপেক্ষিত"
+
#: src/components/LinksPanel.tsx
msgid "Image {identity}. Go to reference."
msgstr "ছবি {identity}। রেফারেন্সে যান।"
@@ -7297,8 +7343,8 @@ msgid "Keep the name to 64 characters or fewer."
msgstr "নামটি ৬৪ অক্ষর বা তার কমে রাখুন।"
#: src/components/settings/SyncSection.tsx
-msgid "Keep this project in sync with your git remote. Follow fetches updates without pushing; full sync pushes your commits too. Turning sync on requires confirmation."
-msgstr "এই প্রকল্পটি আপনার git রিমোটের সঙ্গে মিলিয়ে রাখুন। Follow না পাঠিয়ে হালনাগাদ আনে; পূর্ণ সিঙ্ক আপনার কমিটও পাঠায়। সিঙ্ক চালু করতে নিশ্চিতকরণ লাগে।"
+msgid "Keep this project in sync with your git remote. Auto (Pull only) brings in updates without pushing; Auto (Pull and Push) sends your edits too. Turning auto-sync on requires confirmation."
+msgstr "এই প্রজেক্টটি আপনার git রিমোটের সাথে সিঙ্কে রাখুন। স্বয়ংক্রিয় (শুধু টানুন) পুশ ছাড়াই আপডেট আনে; স্বয়ংক্রিয় (টানুন ও পাঠান) আপনার সম্পাদনাও পাঠায়। স্বয়ংক্রিয় সিঙ্ক চালু করতে নিশ্চিতকরণ লাগে।"
#: src/lib/pack-copy.ts
msgid "Keep track of the people and companies you work with and the meetings you have with them. Good for remembering who someone is, how you know them, and what you last talked about."
@@ -7778,6 +7824,11 @@ msgstr "এই বিল্ডে AI টুল সামলানো যায
msgid "Managing project AI tools is unavailable in this build."
msgstr "এই বিল্ডে প্রকল্পের AI টুল সামলানো যায় না।"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Manual"
+msgstr "ম্যানুয়াল"
+
#: src/components/empty-state/use-create-suggestions.ts
msgid "Map the architecture"
msgstr "স্থাপত্যের মানচিত্র আঁকুন"
@@ -7916,10 +7967,6 @@ msgstr "প্যালেটের রং অনুপস্থিত"
msgid "Missing theme name"
msgstr "থিমের নাম অনুপস্থিত"
-#: src/components/SyncStatusBadge.tsx
-msgid "Mode"
-msgstr "মোড"
-
#: src/components/settings/SearchSection.tsx
msgid "Model"
msgstr "মডেল"
@@ -7936,6 +7983,7 @@ msgstr "মডেলের ডিফল্ট প্রচেষ্টা"
#: src/components/FolderOverview.tsx
#: src/components/settings/markdownlint-rule-browser.tsx
#: src/components/SkillOriginInline.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Modified"
msgstr "পরিবর্তিত"
@@ -8228,10 +8276,6 @@ msgstr "পরিষ্কারের সময় নেটওয়ার্
msgid "Network settings not yet loaded. Try again in a moment."
msgstr "নেটওয়ার্ক সেটিংস এখনও লোড হয়নি। কিছুক্ষণ পরে আবার চেষ্টা করুন।"
-#: src/components/SyncStatusBadge.tsx
-msgid "never"
-msgstr "কখনও নয়"
-
#: src/components/FolderOverview.tsx
#: src/editor/tag-suggestion/TagSuggestionMenu.tsx
msgid "New"
@@ -8846,10 +8890,22 @@ msgstr "কিছুই নয় ({0} কোনো নথির সঙ্গে
msgid "nothing ({0} is not a valid pattern)"
msgstr "কিছুই নয় ({0} একটি বৈধ প্যাটার্ন নয়)"
+#: src/components/settings/SyncSection.tsx
+msgid "Nothing moves until you ask — pull and push from the sync menu."
+msgstr "আপনি না বলা পর্যন্ত কিছুই সরবে না — সিঙ্ক মেনু থেকে টানুন ও পাঠান।"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing moves until you ask."
+msgstr "আপনি না বলা পর্যন্ত কিছুই সরবে না।"
+
#: src/components/FolderPropertiesCard.tsx
msgid "Nothing set yet."
msgstr "এখনও কিছুই নির্ধারিত হয়নি।"
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing to commit — working tree clean."
+msgstr "কমিট করার কিছু নেই: ওয়ার্কিং ট্রি পরিষ্কার।"
+
#: src/components/BugReportSendToast.tsx
msgid "Nothing was uploaded. The report stays on this computer until you email it to us."
msgstr "কিছুই আপলোড করা হয়নি। আপনি আমাদের ইমেল না করা পর্যন্ত রিপোর্টটি এই কম্পিউটারেই থাকে।"
@@ -8883,10 +8939,6 @@ msgstr "{0}-এর মধ্যে"
msgid "of {totalPages}"
msgstr "{totalPages}-এর মধ্যে"
-#: src/components/settings/SyncSection.tsx
-msgid "Off"
-msgstr "বন্ধ"
-
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Off — external links show only their URL. No requests leave this computer."
msgstr "বন্ধ — বাইরের লিংক কেবল তাদের URL দেখায়। কোনো অনুরোধ এই কম্পিউটার ছেড়ে যায় না।"
@@ -9641,6 +9693,10 @@ msgstr "বহির্গামী"
msgid "Outline"
msgstr "রূপরেখা"
+#: src/components/SyncStatusBadge.tsx
+msgid "Outside what Open Knowledge commits."
+msgstr "Open Knowledge যা কমিট করে তার বাইরে।"
+
#: src/components/SkillCostValue.tsx
msgid "over the {budgetLabel} token budget"
msgstr "{budgetLabel} টোকেন বাজেটের বেশি"
@@ -9851,10 +9907,6 @@ msgstr "প্যাটার্নের বাক্যরীতি ত্র
msgid "Pattern warnings: {summary}"
msgstr "প্যাটার্নের সতর্কতা: {summary}"
-#: src/components/SyncStatusBadge.tsx
-msgid "Pause sync"
-msgstr "সিঙ্ক থামান"
-
#: src/components/acp/ThreadView.tsx
msgid "pending"
msgstr "অপেক্ষমাণ"
@@ -10248,10 +10300,26 @@ msgstr "প্রকাশ করা হচ্ছে…"
msgid "Pull"
msgstr "টানুন"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull and Push"
+msgstr "টানুন ও পাঠান"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull brings in"
+msgstr "টানলে আসবে"
+
#: src/components/share-receive-miss-content.tsx
msgid "Pull latest changes"
msgstr "সর্বশেষ পরিবর্তন টানুন"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled}"
+msgstr "{pulled} টানা হয়েছে"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled} · pushed {pushed}"
+msgstr "{pulled} টানা · {pushed} পাঠানো"
+
#: src/components/share-receive-miss-content.tsx
#: src/components/SyncStatusBadge.tsx
msgid "Pulling"
@@ -10277,10 +10345,26 @@ msgstr "শেয়ার করার আগে {branch} ব্রাঞ্চ
msgid "Push failed — check the server logs for details."
msgstr "পাঠানো ব্যর্থ — বিস্তারিত জানতে সার্ভার লগ দেখুন।"
+#: src/components/SyncStatusBadge.tsx
+msgid "Push includes"
+msgstr "পাঠানোতে অন্তর্ভুক্ত"
+
+#: src/components/settings/SyncSection.tsx
+msgid "Push my edits every"
+msgstr "আমার সম্পাদনা পাঠানোর ব্যবধান"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Push skips"
+msgstr "পাঠানোতে বাদ"
+
#: src/lib/share/run-share-action.ts
msgid "Push this branch to GitHub before sharing."
msgstr "শেয়ার করার আগে এই ব্রাঞ্চটি GitHub-এ পুশ করুন।"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pushed {pushed}"
+msgstr "{pushed} পাঠানো হয়েছে"
+
#: src/components/SyncStatusBadge.tsx
msgid "Pushing"
msgstr "পাঠানো হচ্ছে"
@@ -10354,6 +10438,10 @@ msgstr "অন্য নথির একটি MirrorSource ব্লকের
msgid "Read-only file in the {name} skill"
msgstr "{name} স্কিলের শুধু-পড়ার ফাইল"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reading working tree"
+msgstr "ওয়ার্কিং ট্রি পড়া হচ্ছে"
+
#: src/components/acp/working-status.ts
msgid "Reading…"
msgstr "পড়া হচ্ছে…"
@@ -10407,6 +10495,10 @@ msgstr "প্রস্তাবিত এজেন্ট দক্ষতা"
msgid "Reconnect required"
msgstr "পুনরায় যুক্ত হওয়া দরকার"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reconnect required to keep syncing."
+msgstr "সিঙ্ক চালিয়ে যেতে আবার সংযোগ করতে হবে।"
+
#: src/presence/use-sync-toasts.ts
msgid "Reconnected"
msgstr "পুনরায় যুক্ত হয়েছে"
@@ -10673,6 +10765,10 @@ msgstr "স্কিলের নাম বদলান"
msgid "Rename succeeded but the sidebar may be out of date — refresh to resync"
msgstr "নাম বদলানো সফল হয়েছে কিন্তু সাইডবার পুরোনো হতে পারে — আবার সিঙ্ক করতে সতেজ করুন"
+#: src/components/SyncStatusBadge.tsx
+msgid "Renamed"
+msgstr "নাম বদলানো হয়েছে"
+
#. placeholder {0}: docLeaf(descriptor.from)
#. placeholder {1}: docLeaf(descriptor.to)
#: src/components/TimelinePanel.tsx
@@ -10824,7 +10920,6 @@ msgstr "আপনি যেসব রিপোজিটরি আগে ক্
#: src/components/CloneDialog.tsx
#: src/components/share-metadata-rows.tsx
#: src/components/SkillPreviewTab.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Repository"
msgstr "রিপোজিটরি"
@@ -10907,6 +11002,10 @@ msgstr "স্কিল প্যানেলের আকার পরিবর
msgid "Resolve conflict in your terminal"
msgstr "আপনার টার্মিনালে দ্বন্দ্ব মীমাংসা করুন"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Resolve in terminal"
+msgstr "টার্মিনালে সমাধান করুন"
+
#: src/components/FileTree.tsx
msgid "Resolve the conflict on {files} before deleting."
msgstr "মোছার আগে {files}-এর দ্বন্দ্ব মিটিয়ে নিন।"
@@ -11022,10 +11121,6 @@ msgstr "{0}-এর সংস্করণে ফিরিয়ে আনা হ
msgid "Results capped — this workspace has more files than search can index. A missing file may be a cap artifact, not a typo."
msgstr "ফলাফল সীমিত — এই ওয়ার্কস্পেসে অনুসন্ধান যত সূচিভুক্ত করতে পারে তার চেয়ে বেশি ফাইল আছে। অনুপস্থিত কোনো ফাইল এই সীমার ফল হতে পারে, বানান ভুল নয়।"
-#: src/components/SyncStatusBadge.tsx
-msgid "Resume sync"
-msgstr "সিঙ্ক আবার শুরু করুন"
-
#: src/components/acp/ThreadView.tsx
msgid "Resuming the chat"
msgstr "চ্যাট পুনরায় শুরু হচ্ছে"
@@ -11097,8 +11192,8 @@ msgid "Reverting"
msgstr "ফিরিয়ে নেওয়া হচ্ছে"
#: src/components/SyncStatusBadge.tsx
-msgid "Review conflicts"
-msgstr "দ্বন্দ্ব পর্যালোচনা করুন"
+msgid "Review"
+msgstr "পর্যালোচনা"
#: src/components/ReportBugDialogBody.tsx
msgid "Review your report"
@@ -12244,6 +12339,10 @@ msgstr "Slidev চালু হতে সময় শেষ হয়ে গে
msgid "Small section heading."
msgstr "ছোট বিভাগ শিরোনাম।"
+#: src/components/SyncStatusBadge.tsx
+msgid "Some files are not listed — the working tree has too many changes."
+msgstr "কিছু ফাইল তালিকায় নেই: ওয়ার্কিং ট্রিতে অনেক বেশি পরিবর্তন আছে।"
+
#: src/components/settings/SavedThemesTiles.tsx
msgid "Some saved themes aren’t shown because the theme folder exceeds the scan limit."
msgstr "থিম ফোল্ডারটি স্ক্যানের সীমা ছাড়িয়ে যাওয়ায় কিছু সংরক্ষিত থিম দেখানো হচ্ছে না।"
@@ -12435,6 +12534,10 @@ msgstr "এজেন্ট শুরু করা হচ্ছে…"
msgid "status"
msgstr "অবস্থা"
+#: src/components/SyncStatusBadge.tsx
+msgid "Status"
+msgstr "অবস্থা"
+
#: src/components/SubscribeCard.tsx
#: src/components/SubscribeForm.tsx
msgid "Stay in the loop"
@@ -12582,8 +12685,8 @@ msgid "Switch to a branch to share."
msgstr "শেয়ার করতে কোনো ব্রাঞ্চে যান।"
#: src/components/settings/SyncSection.tsx
-msgid "Switch to Follow"
-msgstr "Follow-এ যান"
+msgid "Switch to Auto (Pull only)"
+msgstr "স্বয়ংক্রিয় (শুধু টানুন)-এ যান"
#: src/components/command-palette-commands.ts
msgid "Switch worktree"
@@ -12622,7 +12725,6 @@ msgid "Symlinks the skill to {path}"
msgstr "স্কিলটি {path}-এ সিমলিংক করে"
#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Sync"
msgstr "সিঙ্ক"
@@ -12631,10 +12733,6 @@ msgstr "সিঙ্ক"
msgid "Sync & sharing"
msgstr "সিঙ্ক ও ভাগাভাগি"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync disabled"
-msgstr "সিঙ্ক নিষ্ক্রিয়"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync failed — check the server logs for details."
msgstr "সিঙ্ক ব্যর্থ — বিস্তারিত জানতে সার্ভার লগ দেখুন।"
@@ -12643,13 +12741,21 @@ msgstr "সিঙ্ক ব্যর্থ — বিস্তারিত জ
msgid "Sync is failing. See the sync status for details."
msgstr "সিঙ্ক ব্যর্থ হচ্ছে। বিস্তারিত জানতে সিঙ্কের অবস্থা দেখুন।"
-#: src/components/settings/SyncSection.tsx
-msgid "Sync is off — your edits stay on this computer until you commit and push manually."
-msgstr "সিঙ্ক বন্ধ — আপনি হাতে কমিট ও পুশ না করা পর্যন্ত আপনার সম্পাদনা এই কম্পিউটারেই থাকে।"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Sync is paused. Commit these local edits to continue, or sort them out in a terminal."
+msgstr "সিঙ্ক থেমে আছে। চালিয়ে যেতে এই স্থানীয় সম্পাদনাগুলি কমিট করুন, অথবা টার্মিনালে সেগুলি মিটিয়ে নিন।"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync is paused. Turn it back on to resume."
-msgstr "সিঙ্ক থেমে আছে। আবার শুরু করতে এটি চালু করুন।"
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull and Push) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "এই ওয়ার্কট্রির সিঙ্ক “স্বয়ংক্রিয় (টানুন ও পাঠান)”-এ সেট করা, যা {project} থেকে উত্তরাধিকারসূত্রে পাওয়া। Settings → Sync-এ এটি বদলান।"
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull only) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "এই ওয়ার্কট্রির সিঙ্ক “স্বয়ংক্রিয় (শুধু টানুন)”-এ সেট করা, যা {project} থেকে উত্তরাধিকারসূত্রে পাওয়া। Settings → Sync-এ এটি বদলান।"
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Manual for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "এই ওয়ার্কট্রির সিঙ্ক “ম্যানুয়াল”-এ সেট করা, যা {project} থেকে উত্তরাধিকারসূত্রে পাওয়া। Settings → Sync-এ এটি বদলান।"
#: src/components/SyncStatusBadge.tsx
msgid "Sync mode"
@@ -12660,18 +12766,10 @@ msgstr "সিঙ্ক মোড"
msgid "Sync now"
msgstr "এখনই সিঙ্ক করুন"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync off"
-msgstr "সিঙ্ক বন্ধ"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync paused"
msgstr "সিঙ্ক থেমে আছে"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync paused — resolve conflicts to resume."
-msgstr "সিঙ্ক থেমে আছে — আবার শুরু করতে দ্বন্দ্ব মীমাংসা করুন।"
-
#: src/hooks/use-no-push-permission-toast.ts
msgid "Sync paused — you don't have permission to push to this repo"
msgstr "সিঙ্ক থেমে আছে — এই রিপোজিটরিতে পুশ করার অনুমতি আপনার নেই"
@@ -12706,10 +12804,6 @@ msgstr "সিঙ্কের অবস্থা: {syncStateLabel} — git প
msgid "Synced"
msgstr "সিঙ্ক হয়েছে"
-#: src/components/SyncStatusBadge.tsx
-msgid "Synced {lastSyncedRelative}"
-msgstr "{lastSyncedRelative} সিঙ্ক হয়েছে"
-
#: src/components/TimelinePanel.tsx
msgid "Synced from disk"
msgstr "ডিস্ক থেকে সিঙ্ক করা"
@@ -12933,6 +13027,10 @@ msgstr "রিপোর্টের জন্য ধন্যবাদ!"
msgid "That branch is already open in another worktree."
msgstr "ওই ব্রাঞ্চটি আগে থেকেই অন্য একটি ওয়ার্কট্রিতে খোলা।"
+#: src/components/SyncBlockingChanges.tsx
+msgid "That did not go through. Check the server logs and try again."
+msgstr "এটি সম্পন্ন হয়নি। সার্ভার লগ দেখে আবার চেষ্টা করুন।"
+
#: src/comments/reveal-comment.ts
msgid "That document didn't open in time. Try again once it has synced."
msgstr "সেই নথিটি সময়মতো খোলেনি। সিঙ্ক হয়ে গেলে আবার চেষ্টা করুন।"
@@ -13968,6 +14066,10 @@ msgstr "কমান্ড দেখতে '/' টাইপ করুন"
msgid "Type a query, then press <0>↵</0> to search your pages by meaning."
msgstr "একটি প্রশ্ন লিখুন, তারপর অর্থের ভিত্তিতে আপনার পাতাগুলো খুঁজতে <0>↵</0> চাপুন।"
+#: src/components/SyncStatusBadge.tsx
+msgid "Type changed"
+msgstr "ধরন বদলেছে"
+
#: src/editor/components/CodePreviewEditModal.tsx
msgid "Type to edit; <0>Cmd/Ctrl+Enter</0> saves, <1>Esc</1> cancels."
msgstr "সম্পাদনা করতে লিখুন; <0>Cmd/Ctrl+Enter</0> সংরক্ষণ করে, <1>Esc</1> বাতিল করে।"
@@ -14096,6 +14198,10 @@ msgstr "সব মন্তব্যের চিহ্ন সরান"
msgid "Unmark every comment in {0}"
msgstr "{0}-এর সব মন্তব্যের চিহ্ন সরান"
+#: src/components/SyncStatusBadge.tsx
+msgid "Unmerged"
+msgstr "মার্জ হয়নি"
+
#: src/editor/slash-command/items.tsx
msgid "Unordered list of items."
msgstr "আইটেমের অক্রমিক তালিকা।"
@@ -14136,6 +14242,10 @@ msgstr "সমাধান করা যায় না এমন ছবি {id
msgid "Untitled report"
msgstr "শিরোনামহীন রিপোর্ট"
+#: src/components/SyncStatusBadge.tsx
+msgid "Untracked"
+msgstr "ট্র্যাক করা হয়নি"
+
#: src/components/SyncStatusBadge.tsx
msgid "Up to date"
msgstr "হালনাগাদ"
@@ -14183,8 +14293,8 @@ msgid "Updated \"{name}\" from {0}"
msgstr "\"{name}\" {0} থেকে হালনাগাদ হয়েছে"
#: src/components/SyncStatusBadge.tsx
-msgid "Updated {lastSyncedRelative}"
-msgstr "{lastSyncedRelative} হালনাগাদ হয়েছে"
+msgid "Updated {updatedRelative}"
+msgstr "{updatedRelative} আপডেট হয়েছে"
#: src/components/FolderTimelineCard.tsx
msgid "updated folder properties"
@@ -14198,6 +14308,11 @@ msgstr "সংস্করণ {version}-এ হালনাগাদ হয়
msgid "Updates flow in"
msgstr "হালনাগাদ আসতে থাকে"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Updates flow in from your remote; your edits stay on this computer."
+msgstr "আপডেট আপনার রিমোট থেকে আসে; আপনার সম্পাদনা এই কম্পিউটারেই থাকে।"
+
#: src/components/SkillOriginInline.tsx
msgid "Updates from the source apply automatically (unless edited locally)"
msgstr "উৎসের হালনাগাদ নিজে থেকেই প্রয়োগ হয় (স্থানীয়ভাবে সম্পাদনা না করা থাকলে)"
@@ -14650,6 +14765,10 @@ msgstr "এটি কোথায় থাকবে?"
msgid "Which skill"
msgstr "কোন স্কিল"
+#: src/components/settings/SyncSection.tsx
+msgid "While you're signed out, updates are checked at most every 3 minutes regardless of this setting."
+msgstr "আপনি সাইন আউট থাকা অবস্থায় এই সেটিং যা-ই হোক, আপডেট সর্বোচ্চ প্রতি 3 মিনিটে একবার দেখা হয়।"
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "Whitespace"
msgstr "ফাঁকা জায়গা"
@@ -14826,8 +14945,8 @@ msgid "You don't have permission to push to this repo."
msgstr "এই রিপোজিটরিতে পুশ করার অনুমতি আপনার নেই।"
#: src/components/settings/SyncSection.tsx
-msgid "You don't have permission to push to this repo. Follow can still keep your copy up to date."
-msgstr "এই রিপোজিটরিতে পুশ করার অনুমতি আপনার নেই। Follow তবুও আপনার অনুলিপি হালনাগাদ রাখতে পারে।"
+msgid "You don't have permission to push to this repo. Auto (Pull only) can still keep your copy up to date."
+msgstr "এই রিপোজিটরিতে পুশ করার অনুমতি আপনার নেই। স্বয়ংক্রিয় (শুধু টানুন) তবুও আপনার কপি হালনাগাদ রাখতে পারে।"
#: src/components/ShareFreshnessWarning.tsx
msgid "You don't have write access to this repo."
@@ -14899,6 +15018,11 @@ msgstr "ব্রাঞ্চ <0>{shareBranch}</0>-এর আপনার অন
msgid "Your current version is saved first, so this is reversible."
msgstr "আপনার বর্তমান সংস্করণটি আগে সংরক্ষণ করা হয়, তাই এটি ফেরানো যায়।"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Your edits are committed and pushed to your remote automatically."
+msgstr "আপনার সম্পাদনা স্বয়ংক্রিয়ভাবে কমিট হয়ে রিমোটে পাঠানো হয়।"
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "Your edits stay on this computer"
msgstr "আপনার সম্পাদনা এই কম্পিউটারেই থাকে"
diff --git a/packages/app/src/locales/en/messages.json b/packages/app/src/locales/en/messages.json
index 1fbacb545..b8950a9b0 100644
--- a/packages/app/src/locales/en/messages.json
+++ b/packages/app/src/locales/en/messages.json
@@ -27,11 +27,7 @@
"-YV1Uo": ["Pattern ", ["patternNumber"]],
"-bFGPF": ["Next change"],
"-dNlfM": ["Undid the last edit on ", ["docName"]],
- "-f2Ogn": [
- "Keep this project in sync with your git remote. Follow fetches updates without pushing; full sync pushes your commits too. Turning sync on requires confirmation."
- ],
"-g6KIS": ["Unrecognized link"],
- "-imiMK": ["Follow — updates flow in from your remote; your edits stay on this computer."],
"-kKdCC": ["Installed ", ["imported"], " skills from ", ["0"]],
"-kbIAr": ["Links & images"],
"-ksoxk": [
@@ -133,7 +129,6 @@
"0wswKc": ["Horizontal rule that divides sections."],
"0xnQ_X": ["Updates flow in"],
"0xnmlQ": ["Repository name"],
- "0yL--g": ["Review conflicts"],
"0ySP5u": ["Changes save automatically to this theme."],
"0zAhu6": ["every doc"],
"1-flC9": ["Local server port"],
@@ -169,6 +164,7 @@
"1NgrlY": ["Other ways to install"],
"1QfxQT": ["Dismiss"],
"1RluQD": ["Show replace"],
+ "1TA-aJ": ["Pulled ", ["pulled"], " · pushed ", ["pushed"]],
"1TNIig": ["Open"],
"1Ta7Fd": ["Open ", ["basename"]],
"1V17kO": ["Loading both versions"],
@@ -242,6 +238,11 @@
["FULLSCREEN_HUB_LIMIT"],
" results."
],
+ "2okwy4": [
+ "Sync is set to Auto (Pull only) for this worktree, inherited from ",
+ ["project"],
+ ". Change it in Settings → Sync."
+ ],
"2pR7ad": ["Embeddings API key"],
"2q_Q7x": ["Visibility"],
"2rLM8r": ["Couldn't start the agent thread — please try again."],
@@ -347,7 +348,6 @@
"4A3Yzu": ["Code block"],
"4BITzH": ["Error:"],
"4CfgPM": ["Project folder created, but git init failed. Try again."],
- "4DcimZ": ["Updated ", ["lastSyncedRelative"]],
"4E9jPa": ["Create your first project"],
"4EZrJN": ["Rules"],
"4ErgAf": ["OpenKnowledge installed a skill"],
@@ -375,6 +375,7 @@
"4m-xuX": ["Auto-fix — nothing to fix"],
"4mDIcg": ["Pick the skills to install. Each one lands as an editable skill you own."],
"4mLBx9": ["Subscriptions aren't available right now."],
+ "4mbrAq": ["1 minute"],
"4mp6Tv": ["OpenKnowledge listed the installed skills"],
"4niEzY": ["Sandboxed HTML embed — write HTML, see the rendered preview live."],
"4nj6n8": ["/api/config returned HTTP ", ["code"]],
@@ -384,11 +385,6 @@
"4uNLmk": ["Pulling"],
"4v2Yyz": ["Select every visible file-tree row when focus is in the Files sidebar."],
"4xtLTl": ["Hidden folder “", ["basename"], "”"],
- "4zEZS5": [
- "Auto-sync is on for this worktree, inherited from ",
- ["project"],
- ". Change it in Settings → Sync."
- ],
"4zGlN_": ["Paste image URL or click upload"],
"4z_1j2": ["Rendered"],
"5-FeN2": ["Share URL"],
@@ -456,6 +452,7 @@
],
"5hFl0U": ["Copy reference"],
"5jEnaB": ["Not available on this platform"],
+ "5k0NLb": ["Review"],
"5kWklo": ["(some may already be hidden by other rules)"],
"5lWFkC": ["Sign in"],
"5mksg0": ["Failed to disable semantic search — ", ["detail"]],
@@ -490,6 +487,7 @@
"Commands run with the full access of your user account on this machine. Turn this off to disable the shell."
],
"6Aih4U": ["Offline"],
+ "6EoD0z": ["Resolve in terminal"],
"6FCixu": ["Reopen a past chat"],
"6HCOwA": ["Failed to open."],
"6KCH4m": ["Hidden files"],
@@ -547,6 +545,11 @@
"6u9LvN": [["days", "plural", { "one": ["#", " day ago"], "other": ["#", " days ago"] }]],
"6ur2Mk": ["Help your agents discover and use OpenKnowledge in any project."],
"6vEr3W": ["Link target"],
+ "6xPJIj": [
+ "Sync is set to Manual for this worktree, inherited from ",
+ ["project"],
+ ". Change it in Settings → Sync."
+ ],
"6xeZX9": ["Edits apply live. Light or dark comes from the theme."],
"6zzhQL": ["Send your report by email"],
"72xhRD": ["Diagram view mode"],
@@ -689,7 +692,6 @@
"8qgfac": ["MCP servers"],
"8rZ1pk": ["Enable ", ["id"]],
"8ruqQi": ["Broken internal links"],
- "8sMErm": ["Enable Follow?"],
"8t9CRE": ["Starting ", ["agentName"], "…"],
"8t9T3-": ["No skills found."],
"8tjQCz": ["Explore"],
@@ -743,6 +745,7 @@
["0", "plural", { "one": ["Install ", "#", " skill"], "other": ["Install ", "#", " skills"] }]
],
"9Y6cCI": ["Failed to load pages"],
+ "9ZxzfT": [["count"], " ahead"],
"9_2oe6": [
"Turn ",
["0"],
@@ -822,11 +825,6 @@
"AVW-K9": ["Failed to load orphan pages"],
"AWOSPo": ["Zoom in"],
"AYoYhU": ["Update failed: ", ["0"]],
- "AaaESH": [
- "Auto-sync is off for this worktree, inherited from ",
- ["project"],
- ". Change it in Settings → Sync."
- ],
"AcK_r0": ["Claude CLI"],
"AczYxH": ["Custom open-knowledge entry — not managed by OpenKnowledge"],
"AdcGcG": ["Applying your change"],
@@ -901,6 +899,7 @@
"BVkqD9": [
"Index maintenance is paused because another Git attribute controls index.md. Update .gitattributes so the scoped index.md paths use merge=union, then try again."
],
+ "BWTzAb": ["Manual"],
"BY-g4_": ["Add pattern"],
"Ba4D2x": ["Template imported"],
"Bdha5y": ["Publishing..."],
@@ -934,6 +933,7 @@
],
"C0Ciaj": ["Imported as \"", ["0"], "\" — the name \"", ["1"], "\" was taken."],
"C0hoX6": ["Always included"],
+ "C2abof": ["Untracked"],
"C3Zc44": ["Explore skills"],
"C62P6b": ["Editor selection"],
"C7PKTv": ["Send checked comments to chat"],
@@ -962,9 +962,6 @@
"CTJLpz": ["\"", ["trimmed"], "\" already exists here"],
"CU3AiE": ["Switching branches"],
"CUmCwI": ["Insert row below"],
- "CVRM5N": [
- "Follow fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
- ],
"CWjM1r": ["docs directly in ", ["0"], "/"],
"CWzc2T": [
"<0>~/.ok/bin</0> and <1>~/.ok/env.sh</1> stay either way — the app always maintains them."
@@ -1001,6 +998,7 @@
"In Git projects, Open Knowledge adds a scoped rule to the repository-root .gitattributes file so concurrent index changes combine."
],
"CxVk-w": ["Comment on ", ["address"]],
+ "Cz-K13": ["15 minutes"],
"D-NlUC": ["System"],
"D-Oh1s": ["How to set up ", ["0"], " (opens in browser)"],
"D-_B7l": ["Connected — this endpoint returns ", ["0"], "-dimension vectors."],
@@ -1060,7 +1058,6 @@
"DmkTrb": ["Couldn’t create this theme. Try again."],
"Dnn2XG": ["Automatic"],
"DpjYd6": ["Jump to the anchored text"],
- "DrYM2Z": ["Sync disabled"],
"DsDwR-": [["0", "plural", { "one": ["#", " error"], "other": ["#", " errors"] }]],
"DskIkK": ["Sign-in stream ended without confirmation — please try again"],
"DuCPiG": [
@@ -1254,6 +1251,7 @@
"Fqr8BP": ["Multi-page PDF viewer with toolbar controls (thumbnails, page nav, zoom)."],
"Fqx38P": ["What got in the way?"],
"Fr8JGg": ["Zip file"],
+ "FsEXax": ["That did not go through. Check the server logs and try again."],
"Fsx78O": ["Add the <0>ok</0> command to your terminal"],
"FvMSms": ["Renaming changes the file on disk and the id agents use to pick this template."],
"Fx9aOF": ["OpenKnowledge edited a document"],
@@ -1369,6 +1367,9 @@
"H0WlWQ": ["Grid of rows and columns with a header row."],
"H1TmTu": ["Stopped fixing. Files already fixed stay fixed."],
"H3oH0g": ["Redo"],
+ "H4doZt": [
+ "Sync is paused. Commit these local edits to continue, or sort them out in a terminal."
+ ],
"H86f9p": ["Collapse"],
"H8DVOJ": ["Identical in both — ", ["pick"], " still reads them."],
"HAkEqR": ["Recent files"],
@@ -1451,6 +1452,7 @@
"IWGfGF": ["Checking your GitHub connection"],
"IX7-sq": ["Something went wrong opening \"", ["docName"], "\"."],
"IX_uXB": ["my-feature"],
+ "IXiG0B": ["Auto (Pull and Push)"],
"IYciRC": ["Thanks for the report!"],
"IajAbS": ["Add a starter pack"],
"If0crP": ["Open with AI ", ["targetDisplayName"], ", ", ["hint"]],
@@ -1501,6 +1503,7 @@
"JLzQi_": ["Close ", ["accessibleLabel"]],
"JM_aq-": ["Use an https:// URL — http:// is only allowed for localhost."],
"JOcPqH": ["Bring a remote repository onto this machine."],
+ "JOhCT9": ["Push includes"],
"JWsZlx": ["Open a project to edit."],
"JZ8cO6": ["Light, dark, or follow the OS."],
"J_jZ5z": [
@@ -1590,6 +1593,9 @@
"KjTmeO": ["Update OpenKnowledge to open this share."],
"KkEAud": ["Create a file from the current document or folder context."],
"KkRyMI": ["Could not classify the merge — try again."],
+ "KmVekT": [
+ "Auto (Pull only) fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
+ ],
"KmydK6": ["Bold"],
"KnoB--": ["Will be saved as <0>", ["sanitized"], "</0>."],
"KpOJFY": ["Enable external link previews"],
@@ -1597,6 +1603,7 @@
"KsAPaB": ["This branch is checked out in:"],
"KtACeE": ["Default: <0>", ["0"], "</0>"],
"KujtjC": ["Find"],
+ "KvwJv8": ["Some files are not listed — the working tree has too many changes."],
"Kx881F": ["Restored ", ["0"], "."],
"L-rMC9": ["Reset to default"],
"L1BQTH": [["0"], " isn't installed yet — opening its download page."],
@@ -1614,6 +1621,7 @@
"L83DKQ": ["PATH install failed: ", ["summary"]],
"L8fKuc": ["Run this in your terminal"],
"L9Y9Om": ["Top linked pages"],
+ "L9ox9k": ["Couldn't read the working tree. Check the server logs."],
"LAR9ub": ["Replaces the existing OpenKnowledge entry in ", ["0"]],
"LBv_TR": ["Convert locations to symlinks"],
"LBwUR6": ["Branch switch timed out — try opening the ", ["targetNoun"], " manually."],
@@ -1637,7 +1645,6 @@
]
],
"LKOLNn": ["No AI agents installed"],
- "LNum6A": [["minutes"], " min ago"],
"LPAv9E": [["days"], "d ago"],
"LQdLio": ["New schema"],
"LQsCPn": ["Local commits are keeping this copy from updating"],
@@ -1724,7 +1731,6 @@
"MCjC9A": ["Delete ", ["deleteDescriptorLabel"]],
"MDBJwN": ["Hard to use"],
"MDZSJe": ["When the agent runs its scheduled work."],
- "MGBNwj": ["Pause sync"],
"MGb89P": [
"Insert, delete, move, copy, and indent source editor lines through CodeMirror's default keymap."
],
@@ -1733,7 +1739,6 @@
"MIF36T": ["Couldn't resolve the fork: ", ["0"]],
"MILoeL": ["Services"],
"MJuO1q": ["Context window:"],
- "MKEPCY": ["Follow"],
"MLVPcm": [["0"], " version ", ["1"]],
"MOAoFO": ["No agent folders yet"],
"MPpSAg": ["Create new project from ", ["selectedPackName"]],
@@ -1796,6 +1801,7 @@
],
"N5rzKJ": ["Delete ", ["0"], " skills"],
"N6j2JH": ["Edit ", ["0"]],
+ "N7Lau6": ["Commit and sync"],
"NBdIgR": ["Comment"],
"NErvOX": ["Saved to"],
"NEzPEh": ["Create a new branch, or check out an existing one, in its own window."],
@@ -1823,6 +1829,7 @@
"Nay2Yr": ["No agents match your search."],
"NcUznW": [["0"], ", No workspace"],
"NcurBF": ["Pan down"],
+ "NcwbBM": ["Pull brings in"],
"NeQ_0G": ["Work through these comments"],
"NeY1Np": ["Slidev timed out while starting. Try again."],
"NfraGd": ["Other ways to install Slidev"],
@@ -1866,6 +1873,7 @@
"O6yEPk": ["Create a new OpenKnowledge project in the folder of your choice."],
"O7_W_a": ["Open with AI"],
"O9oQJS": ["Send report"],
+ "OBdkpo": ["detached HEAD"],
"OD0FCX": ["Hidden “", ["basename"], "”"],
"ODGGlj": ["Folder name: ", ["detail"]],
"OEEQKT": ["Good"],
@@ -1923,6 +1931,7 @@
"Oo_WWc": ["No pages found"],
"Oos8fo": ["Copy command"],
"OplnBG": ["Managing AI tools is unavailable in this build."],
+ "OqqecQ": ["30 seconds"],
"OsSaYm": ["Clone failed: ", ["title"]],
"OuQezS": ["Applies when you pick this conversation back up"],
"OuY8t9": ["Open in current branch"],
@@ -1957,7 +1966,9 @@
"PBwmDJ": ["Searching by meaning"],
"PBxg_E": ["Not now"],
"PCSkw2": ["Skills"],
+ "PEGxvo": ["5 minutes"],
"PGPGsL": ["Add description"],
+ "PGRnbw": ["Updates flow in from your remote; your edits stay on this computer."],
"PHHEuH": ["Hide resolved comments (", ["0"], ")"],
"PIMM5l": ["You're subscribed!"],
"PKLY-1": ["Opening..."],
@@ -1970,7 +1981,6 @@
"PRgIJh": ["Couldn't update ", ["subRoot"], ": ", ["0"]],
"PRnH8G": ["of ", ["0"]],
"PTUuoc": ["Couldn't unmark that comment — it's still waiting to send."],
- "PTb1Nx": ["Sync is paused. Turn it back on to resume."],
"PVSwOe": ["Steering — waiting for the current run to stop…"],
"PVUn_c": ["Open folder"],
"PVggyD": ["Frontmatter schemas"],
@@ -2017,6 +2027,7 @@
"PrWQiT": ["Move Terminal to right"],
"PrhzDE": ["Pan up"],
"Pw5PTU": ["External origin"],
+ "PxZCNM": ["Outside what Open Knowledge commits."],
"Q-DKvr": ["Install from ", ["source"]],
"Q1mtyd": ["Hide sidebar"],
"Q5fqMz": ["Connection error — try again"],
@@ -2060,6 +2071,7 @@
" with ",
["childCount", "plural", { "one": ["#", " item"], "other": ["#", " items"] }]
],
+ "QeREu8": ["Renamed"],
"QfFBdJ": ["The template's filename (without `.md`)."],
"Qft6eW": ["Move ", ["0"], " to Global"],
"Qj4RL5": ["Completed:"],
@@ -2245,13 +2257,9 @@
"Sr9xtj": ["Pick folders this schema applies to"],
"SrOuyg": ["Document panels"],
"SvBFYA": ["No recent projects"],
- "Sxx_Zz": [
- "Follow is on for this worktree, inherited from ",
- ["project"],
- ". Change it in Settings → Sync."
- ],
"T-654M": ["Loading PDF"],
"T0OVm7": ["The default branch is protected — pushes need a pull request."],
+ "T1fMJ6": ["How often this computer pulls changes from your remote."],
"T2fvhw": ["Unmark every comment in ", ["0"]],
"T3Mld1": ["Window"],
"T3j-7o": ["e.g. Switching projects while a sync was running"],
@@ -2299,10 +2307,10 @@
"U2pMtf": ["tag-name"],
"U3IvM5": ["Full guide"],
"U3RIJu": ["Local files"],
- "U4nTfu": ["Enable Follow"],
"U5Spo9": ["Content directory must be inside the project"],
"U6Mdhd": ["Let's get set up."],
"U6wmNc": ["Sync paused"],
+ "U7Iesw": [["seconds"], " seconds"],
"U88xbi": ["Failed to create the schema file"],
"U8CD-l": ["Copy full path, No workspace"],
"UBv8UK": ["Delete Permanently"],
@@ -2338,9 +2346,6 @@
"URmyfc": ["Details"],
"UTNVyS": ["Select the full source document."],
"UTZ97u": ["Selection must be inside the project"],
- "UVDasf": [
- "Sync is off — your edits stay on this computer until you commit and push manually."
- ],
"UVLlMV": ["Couldn't reach GitHub. Try again?"],
"UW2Fg3": [
"This project's running server doesn't support live editing. Restart OpenKnowledge to fix."
@@ -2381,6 +2386,7 @@
"UhpfxY": ["Pan left"],
"UkQGhd": ["Hide replace"],
"UlVARL": ["Enable Slidev"],
+ "Uo2Rj7": ["Enable Auto (Pull and Push)?"],
"Uobeu9": ["Adds the skill to ", ["rootRel"], " — also read by ", ["0"]],
"Up2_7p": ["Copy full path"],
"UpCz01": ["This doc"],
@@ -2448,6 +2454,7 @@
"VdXv4D": ["Clone from GitHub"],
"VeVIIk": ["Loading skills"],
"Vftef5": ["Common markdown issues — hard tabs, heading increments, list markers, and more."],
+ "Vl1H8I": ["Reconnect required to keep syncing."],
"Vlc75q": ["Keep file deleted"],
"VmJT51": ["Loading your reports"],
"VmXASo": ["(symlink)"],
@@ -2469,6 +2476,7 @@
["rootPath"],
"</0>. Choose a location outside it, or open that project instead."
],
+ "W7mERj": ["Enable Auto (Pull only)?"],
"W8vpBM": ["starter pack"],
"W9NSe0": ["Checking links"],
"W9_Bub": ["Local changes overlap with incoming sync"],
@@ -2486,6 +2494,7 @@
" selected items? Folders and all files inside them will be deleted. This action cannot be undone."
],
"WMsoIm": ["Already signed in?"],
+ "WOfp4H": ["Failed to update the sync interval — ", ["detail"]],
"WOr-hW": ["tokens"],
"WPwDin": ["Open folder on disk"],
"WR0y2O": ["Share folder"],
@@ -2504,6 +2513,7 @@
"Wcv-Zi": ["Make this knowledge base available as a Claude Skill."],
"We7h2I": ["📝 or assets/icon.png"],
"Weq9zb": ["General"],
+ "WfcERq": ["Nothing to commit — working tree clean."],
"Wfy3rU": ["Agent settings"],
"Wgmlsw": ["Fetching"],
"Wh0im4": ["editing [[", ["realCurrentDoc"], "]]"],
@@ -2557,7 +2567,6 @@
"XRuL0i": ["Create page"],
"XSb9HS": ["Discard local edits, restore the installed version"],
"XT-L4j": ["Turn on an agent to create with AI"],
- "XU0OXn": ["Enable auto-sync"],
"XU5AOg": ["Input"],
"XV5sC0": ["Open worktree"],
"XW18jo": ["Page headings response did not match success schema"],
@@ -2606,6 +2615,7 @@
"Xp7Kq4": ["Another sync operation is in progress. Try again in a moment."],
"Xp94R1": ["Try one more time"],
"XpIZmv": ["Fenced code block with monospace text."],
+ "Xs1kjx": ["Check for updates every"],
"Xs7IcT": ["Couldn't reach ", ["displayName"], " — try again?"],
"XszXjc": ["Renamed to ", ["0"]],
"XtRoxT": ["Page ", ["pageNumber"]],
@@ -2638,6 +2648,7 @@
"Lint plugins — which rule families run and their per-rule settings — are configured on their own tab under This project → Plugins."
],
"YEP3X2": ["Delete a table when the active table cell selection covers the full table."],
+ "YEzhIr": ["Pull and Push"],
"YGIi_c": ["Reinstall"],
"YGNRB5": ["— except"],
"YGt-0e": ["Reading…"],
@@ -2675,9 +2686,6 @@
"Applies to this project on this computer only. Stored in .ok/local, not shared via git."
],
"Yp-Hi_": ["Open settings"],
- "YsEYYS": [
- ["behind", "plural", { "one": ["#", " commit behind"], "other": ["#", " commits behind"] }]
- ],
"YvwwqC": ["Where"],
"YwPUUP": ["This pack is already set up here."],
"YxZDGh": [
@@ -2779,7 +2787,6 @@
"ZscwQ0": ["Couldn't switch to Only me"],
"Zt7Ktx": ["The path can't leave the skill (no . or ..)"],
"Zue_jx": ["Your GitHub token is missing required scopes. Try signing in again."],
- "Zul8Ry": ["never"],
"ZvzbDF": ["Add it directly to this project."],
"ZwpggY": ["OpenKnowledge read the project settings"],
"_0JUKX": ["Bug reporting needs the OpenKnowledge desktop app."],
@@ -2908,9 +2915,6 @@
"ai40UJ": ["New best · press <0>Space</0> to play again"],
"aiArms": ["We couldn't clone this repository."],
"aiOceC": ["Enable indexes"],
- "ajHi4O": [
- "Auto-sync is paused — you don't have permission to push to this repo. Switch to Follow to keep receiving updates."
- ],
"ajz9F8": ["Couldn't load conflict content for ", ["filePath"], ". Try reloading the page."],
"ak4LLg": ["Clear menu"],
"akOe4q": [
@@ -2927,7 +2931,6 @@
"arUUsK": ["Product updates"],
"ax9kie": ["Link preview settings not yet loaded — try again in a moment"],
"axQ1h6": ["Anything you'd like to add? (optional)"],
- "az8lvo": ["Off"],
"b18t0_": ["Close diff"],
"b1FDss": ["Scroll to start"],
"b2ezG_": ["Kept both — \"", ["0"], "\" is its own skill now"],
@@ -3011,6 +3014,9 @@
],
"cH0dkG": ["It was missing a feature I needed"],
"cHhH3i": ["a required git tool"],
+ "cIFYZn": [
+ "While you're signed out, updates are checked at most every 3 minutes regardless of this setting."
+ ],
"cIptmH": ["In the Claude Desktop App"],
"cKjLuT": ["(project + user)"],
"cLP0Lf": ["Remote skill source"],
@@ -3080,6 +3086,8 @@
"ct2kv5": ["No headings in ", ["pageTarget"]],
"cuA8QW": ["Organize specs"],
"cuHhjo": ["Create & edit"],
+ "cyoNqf": ["Unmerged"],
+ "czQDKY": ["Each push is one commit to your remote."],
"d-GtJt": ["View in Source Markdown"],
"d1JjXo": [
"Your local copy of branch <0>",
@@ -3173,6 +3181,9 @@
"eGUbmF": ["Copy selected file or folder"],
"eJitUk": ["Upload from computer"],
"eKThTQ": ["Failed to reorder"],
+ "eNOyTV": [
+ "You don't have permission to push to this repo. Auto (Pull only) can still keep your copy up to date."
+ ],
"eNQGRb": ["Inline LaTeX math rendered with KaTeX."],
"eNhWUl": ["A PR reviewer, a release-notes writer, a deploy checklist..."],
"ePK91l": ["Edit"],
@@ -3202,6 +3213,7 @@
"emMrXQ": ["Server returned a malformed duplicate response."],
"emgiet": ["Authoritative content; mirrored verbatim everywhere it's referenced."],
"enPTnx": ["line ", ["displayLine"]],
+ "eolhcI": ["Reading working tree"],
"eps54V": ["Removed"],
"epuNYK": [
"Mark a block as the source of truth. Mirrors elsewhere update live as you edit it."
@@ -3209,9 +3221,6 @@
"erenF-": ["Cannot delete files with unresolved conflicts"],
"euGaS0": ["Couldn't read ", ["fileName"], "."],
"euc6Ns": ["Duplicate"],
- "evHlIg": [
- "Follow never pushes or commits your local changes. They stay only on this machine."
- ],
"evs0iw": ["Tags matching \"", ["tagListQuery"], "\""],
"ewSbS_": ["Shell session"],
"ezUmoU": ["Allowed element values (empty = any)"],
@@ -3292,7 +3301,6 @@
}
]
],
- "g2Tj8R": ["Full"],
"g3UF2V": ["Accept"],
"g4WlQK": ["Project AI tool management is only available in the OpenKnowledge desktop app."],
"g4XBm0": ["Small section heading."],
@@ -3308,7 +3316,6 @@
["display"],
". That folder becomes a symlink to this one, so its agent reads everything placed here. This folder stays real. Conflicting skills abort the merge."
],
- "g85bAo": ["Synced ", ["lastSyncedRelative"]],
"g9Nj4l": ["// note"],
"gAhHu7": ["Auto-fix applies only to problems with a known mechanical fix."],
"gBbxn_": ["Checking sign-in status"],
@@ -3380,6 +3387,7 @@
"gwEcOD": ["Your local copy is behind."],
"gwykHF": ["This doc hasn't synced to GitHub yet. The link will work after the next sync."],
"gyHDWC": ["Fix all with AI (", ["count"], ")"],
+ "gyYvCN": ["Push my edits every"],
"h-AdvS": ["The folders and templates are already here, so there's nothing to add."],
"h06R3C": ["No pages are missing outgoing graph links."],
"h16FyT": ["Lists"],
@@ -3455,7 +3463,6 @@
"hwFOFD": ["Settings failed to load"],
"hxBHxQ": ["A line with a footnote<0><1>[1]</1></0> and a definition shown below."],
"hxEUVJ": ["Initialize ", ["selectedPackName"]],
- "hxYFzm": ["Full sync — your commits push and remote changes pull automatically."],
"hxnF0I": [["0"], " Properties"],
"hyCxJY": ["Open that worktree instead"],
"hynz2K": ["Download started"],
@@ -3466,7 +3473,6 @@
"i09An-": ["Restored an earlier version (", ["0"], ")"],
"i1flq_": ["Wiki link suggestions"],
"i3f2kh": ["No matching commands."],
- "i6ng22": ["Switch to Follow"],
"i92eAT": ["We'll create a repository and start syncing — no terminal needed."],
"i94lQe": ["OpenKnowledge checked for conflicts"],
"i9OyGp": ["Undo or redo"],
@@ -3554,11 +3560,11 @@
],
"iqugog": ["Initialize failed: ", ["errorDetail"]],
"irFGwu": ["Template list"],
+ "irnKr_": ["Updated ", ["updatedRelative"]],
"irrm_E": ["Remove selection"],
"isRobC": ["New"],
"iuTKci": ["No edits yet."],
"iv452l": ["Documentation for ", ["0"], " (opens in browser)"],
- "iy64Li": ["Full sync — your edits are committed and pushed to your remote automatically."],
"iycx_A": ["Pushing"],
"iz1LdD": [
"Changed outside OK since it last wrote here — the state shown is what's on disk now"
@@ -3606,6 +3612,7 @@
"jSO1X5": ["Inherited templates can't be renamed here — rename it in the folder that owns it."],
"jSY41h": ["\"", ["docName"], "\" took too long. Check your connection."],
"jTLWxh": ["Embed an external page in an inline iframe (docs, demos, Figma, CodeSandbox)."],
+ "jTUxaN": ["Enable Auto (Pull only)"],
"jWzDfC": ["Checking which AI tools you have"],
"jZ_E5M": ["Fetch failed — check the server logs for details."],
"j_Z6g7": ["Shared default"],
@@ -3698,13 +3705,15 @@
"Point semantic search at any OpenAI-compatible embeddings endpoint — a self-hosted server or another provider. The API key above is for whichever endpoint you set here."
],
"kSiB3X": ["Couldn't move to ", ["trashNoun"]],
- "kUn-CN": ["Sync off"],
"kV2YZv": [
"Don't see <0>Skills</0>? Enable <1>Settings <2/> Capabilities <3/> Code execution and file creation</1> first."
],
"kVS5tE": ["Maintain generated indexes in every folder?"],
"kVgQUA": ["Delete this chat?"],
"kVzuTI": ["Recommended agent skill"],
+ "kXNv8P": [
+ "Auto (Pull only) never pushes or commits your local changes. They stay only on this machine."
+ ],
"kYL1lH": ["Agent activity"],
"k_Dqw1": [
[
@@ -3794,6 +3803,7 @@
"lM4c-I": [
"A path inside the skill — any folder works (e.g. references/notes.md). Folders in the path are created for you."
],
+ "lPkjpD": ["Pushed ", ["pushed"]],
"lPzyrU": ["All hunks resolved"],
"lS83Sg": ["Couldn’t reach the clipboard."],
"lScd1O": ["Slidev decks open in the OpenKnowledge desktop app only."],
@@ -4116,6 +4126,7 @@
"pJ7XCo": ["This page references no local files or images."],
"pMPnZv": ["Deleted ", ["deleted"], " skills"],
"pOo4Aa": ["Plain text"],
+ "pPiV8s": ["Enable Auto (Pull and Push)"],
"pSimwP": ["New name for the ", ["editor"], " version"],
"pTPqMK": ["Toggle a fenced code block."],
"pTyA_t": ["tags"],
@@ -4181,6 +4192,7 @@
"qAx7xG": ["Fixed folder in content root"],
"qBi_YG": ["Install OpenKnowledge in your AI tools"],
"qC7PwZ": ["Failed to remove the field"],
+ "qD3krc": ["Nothing moves until you ask."],
"qEEfPk": ["Bug report ", ["0"]],
"qEIFZu": ["Key ending in ", ["keyHint"]],
"qEue6Q": [" or "],
@@ -4189,6 +4201,9 @@
"qIJIrD": ["Testing"],
"qJSo0_": ["What is the difference between copies and symlinks?"],
"qKMfPp": ["Hide skill nodes"],
+ "qLXJTB": [
+ "Keep this project in sync with your git remote. Auto (Pull only) brings in updates without pushing; Auto (Pull and Push) sends your edits too. Turning auto-sync on requires confirmation."
+ ],
"qNOgUu": ["Edits at the source land here — no copy-paste drift."],
"qQi_um": ["Theme imported."],
"qRZh7J": ["Let Tab leave the source editor instead of indenting."],
@@ -4204,7 +4219,6 @@
"qXg5W9": ["File saves to <0>~/Downloads/openknowledge.skill</0>."],
"qXsafh": ["Publish to GitHub"],
"qZv5ZR": ["Config sharing toggle failed"],
- "q_9EcE": ["Enable git auto-sync?"],
"q_Q1-i": [
[
"count",
@@ -4305,7 +4319,6 @@
["boldName"],
" — a built-in skill shipped with Open Knowledge. It's read-only."
],
- "rn7n0G": ["Resume sync"],
"rnX-1S": ["Enable plugins"],
"rnrdEX": ["primary"],
"roAe2K": ["Link URL"],
@@ -4349,6 +4362,7 @@
"sJK6pq": ["Permission denied"],
"sJWhgo": ["Unknown component: ", ["unregisteredComponentName"]],
"sKEgGd": ["Send to chat"],
+ "sKHiNR": [["count"], " behind"],
"sNeKjP": ["Failed to store the token — try again"],
"sOxZaS": ["Failed to load graph"],
"sQoLn0": ["Quit"],
@@ -4372,6 +4386,7 @@
"scyoP9": [
"Index documents carry no frontmatter, except the one at your knowledge base's root. Log documents are not covered — OKF does not constrain their frontmatter."
],
+ "sdvHp3": ["Changed here and on the remote"],
"se-tU0": ["Could not fix ", ["0"], " of ", ["total"], " files."],
"seeS6l": ["Setup OpenKnowledge in this folder?"],
"sgmRY8": ["Skipped downloading ", ["0"], "."],
@@ -4387,6 +4402,9 @@
"snrVQ7": ["probe failed"],
"sq4WQH": ["Use ", ["0"], " as the light theme"],
"sqUrlK": ["Musing…"],
+ "srdlOs": [
+ "Auto-sync is paused — you don't have permission to push to this repo. Switch to Auto (Pull only) to keep receiving updates."
+ ],
"ssk6rl": [
"The skill's own folder (",
["path"],
@@ -4406,12 +4424,12 @@
"szy9BS": ["Use lowercase letters, numbers, and hyphens only"],
"t-JXbf": ["Notion-style inline row for a downloadable file. Drag-drop also works."],
"t18QYR": ["Unpin ", ["accessibleLabel"]],
- "t2TkQ3": ["Sync paused — resolve conflicts to resume."],
"t4sFKC": [
"New branch <0>",
["trimmed"],
"</0> will be created from the current commit, in its own worktree under <1>.ok/worktrees/</1>."
],
+ "t5I7P_": ["Nothing moves until you ask — pull and push from the sync menu."],
"t6w1cq": ["Open a blank editor tab."],
"t7YoBO": ["Send this comment"],
"t9Qn8y": ["No agents enabled"],
@@ -4456,6 +4474,7 @@
["alreadyImported"],
" were already present)"
],
+ "tlGXxX": ["Auto (Pull only)"],
"tnG-m6": ["Auto-sync is paused — sign in to resume."],
"toyw51": ["Mermaid diagram controls"],
"tqQBwN": ["Any scripts are shown for review, never run."],
@@ -4482,6 +4501,7 @@
"u779EG": ["Use an http:// or https:// origin."],
"u7H-Wn": ["Show panel (", ["panelShortcutLabel"], ")"],
"u7U_Ij": ["Link the selected text, or edit the link under the caret."],
+ "uAQUqI": ["Status"],
"uA_jXp": ["Switch and update branch"],
"uBAxNB": ["Editor"],
"uCaIdy": ["GitHub sign-in is missing or expired. Reconnect to resume syncing."],
@@ -4510,9 +4530,6 @@
"Couldn't restart the server — it's running under a different account. Restart your computer to clear it, then reopen this project."
],
"uUCrBv": ["symlink"],
- "uUiiyC": [
- "You don't have permission to push to this repo. Follow can still keep your copy up to date."
- ],
"uVbUP8": ["Settings…"],
"uY5Z7P": ["Game over · press <0>Space</0> to play again"],
"uYZTcW": ["This GitHub URL can't be shared."],
@@ -4558,6 +4575,7 @@
"v15iQB": [
"The attested-computation contract. Only applies to documents typed Attested Computation, where OKF requires a runtime; ordinary concepts are unaffected."
],
+ "v16Pzh": ["Switch to Auto (Pull only)"],
"v2ZW0K": ["Enable terminal"],
"v2a04T": ["markdownlint rules"],
"v41fCm": ["File not found"],
@@ -4576,6 +4594,7 @@
"vF68cg": ["Fields"],
"vGQxBT": ["Updates from the source apply automatically (unless edited locally)"],
"vGeNNQ": ["Copy a prompt and paste it into your agent to set up your project."],
+ "vGjmyl": ["Deleted"],
"vHlhDc": ["Double-click to edit"],
"vIxrEk": ["Fit width"],
"vLyv1R": ["Hide"],
@@ -4626,8 +4645,10 @@
}
]
],
+ "vp5vfW": ["1 hour"],
"vppAju": ["Where newly added attachments are placed."],
"vqJXNe": ["Install the <0>open-knowledge-discovery</0> skill"],
+ "vsFXfP": ["Push skips"],
"vv7kpg": ["Cancelled"],
"vvWZnu": ["Diff unavailable"],
"vwV-kH": ["Fixing files stopped unexpectedly."],
@@ -4692,6 +4713,11 @@
"wdzBgi": ["Config sharing is now Only me."],
"weP6me": ["Couldn't load docs — type @ again to retry"],
"wgNoIs": ["Select all"],
+ "wk_v1X": [
+ "Sync is set to Auto (Pull and Push) for this worktree, inherited from ",
+ ["project"],
+ ". Change it in Settings → Sync."
+ ],
"wlwXUk": [
"You picked ~/Downloads. Files there are usually transient — consider a stable folder instead."
],
@@ -4733,6 +4759,7 @@
"xCdTnb": ["Close new tab"],
"xDBki3": ["Heading suggestions"],
"xDEcka": ["The provider is rate-limiting this key. Try again in a moment."],
+ "xDKOFk": ["Ignored"],
"xEb24l": ["Let us follow up by email"],
"xFQRu4": ["I already have it locally"],
"xG4tb6": ["Lost connection to \"", ["docName"], "\"."],
@@ -4744,6 +4771,7 @@
"xOTzt5": ["just now"],
"xSVO3J": ["What gets created"],
"xV5sXw": [["0"], "w ago"],
+ "xW5AUw": ["Pulled ", ["pulled"]],
"xWEvuo": ["Ask AI"],
"xWomUD": ["Use ", ["editor"], " version"],
"xXo8FT": ["Save failed: ", ["error"]],
@@ -4881,6 +4909,7 @@
"zAJzIg": ["Problems in ", ["0"]],
"zAsDLY": ["Graph visualization of document links"],
"zBUqvf": ["Set up OpenKnowledge integrations…"],
+ "zBiFZh": ["Your edits are committed and pushed to your remote automatically."],
"zC5jrM": ["Will be created as <0>", ["effective"], "</0>"],
"zD1Nqf": [["count", "plural", { "one": ["#", " doc"], "other": ["#", " docs"] }]],
"zFH7iU": ["Couldn't fully clear network settings, but exposure is turning off. ", ["0"]],
@@ -4892,6 +4921,7 @@
"zLak8b": ["Activate new tab"],
"zMmwh4": ["Pick a theme or create your own."],
"zQBg2C": ["Move the current block up or down one position."],
+ "zWZBPx": ["Type changed"],
"zXj1rA": ["Search by meaning"],
"zYp8Sr": [
"A <0>Modified</0> badge marks rules your config sets explicitly — directly, or inherited through <1>extends</1>. Unmarked rules keep their default state."
@@ -4932,7 +4962,6 @@
". Pick a folder cloned from ",
["expectedHost"],
"?"
- ],
- "zz_Wd_": ["Mode"]
+ ]
}
}
diff --git a/packages/app/src/locales/en/messages.po b/packages/app/src/locales/en/messages.po
index 1e4bd4a67..d2ede6cb7 100644
--- a/packages/app/src/locales/en/messages.po
+++ b/packages/app/src/locales/en/messages.po
@@ -517,10 +517,6 @@ msgstr "{ahead} ahead, {behind} behind"
msgid "{basename} — text editor"
msgstr "{basename} — text editor"
-#: src/components/SyncStatusBadge.tsx
-msgid "{behind, plural, one {# commit behind} other {# commits behind}}"
-msgstr "{behind, plural, one {# commit behind} other {# commits behind}}"
-
#: src/components/SyncStatusBadge.tsx
msgid "{behind} behind"
msgstr "{behind} behind"
@@ -616,6 +612,14 @@ msgstr "{count, plural, one {Instantly fixes the # problem that has a known auto
msgid "{count, plural, one {matches # file} other {matches # files}}"
msgstr "{count, plural, one {matches # file} other {matches # files}}"
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} ahead"
+msgstr "{count} ahead"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} behind"
+msgstr "{count} behind"
+
#: src/components/SkillBulkDeleteDialog.tsx
msgid "{count} skills"
msgstr "{count} skills"
@@ -811,14 +815,11 @@ msgstr "{localizedMessage} at line {displayLine}"
msgid "{mins, plural, one {# min ago} other {# min ago}}"
msgstr "{mins, plural, one {# min ago} other {# min ago}}"
-#: src/components/SyncStatusBadge.tsx
-msgid "{minutes} min ago"
-msgstr "{minutes} min ago"
-
#: src/components/acp/ThreadHistoryMenu.tsx
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "{minutes}m ago"
msgstr "{minutes}m ago"
@@ -910,6 +911,10 @@ msgstr "{propertyCount, plural, one {# property} other {# properties}}"
msgid "{propPanelDescriptorLabel} Properties"
msgstr "{propPanelDescriptorLabel} Properties"
+#: src/components/settings/SyncSection.tsx
+msgid "{seconds} seconds"
+msgstr "{seconds} seconds"
+
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
@@ -1127,6 +1132,26 @@ msgstr "📝 or assets/icon.png"
msgid "0/0"
msgstr "0/0"
+#: src/components/settings/SyncSection.tsx
+msgid "1 hour"
+msgstr "1 hour"
+
+#: src/components/settings/SyncSection.tsx
+msgid "1 minute"
+msgstr "1 minute"
+
+#: src/components/settings/SyncSection.tsx
+msgid "15 minutes"
+msgstr "15 minutes"
+
+#: src/components/settings/SyncSection.tsx
+msgid "30 seconds"
+msgstr "30 seconds"
+
+#: src/components/settings/SyncSection.tsx
+msgid "5 minutes"
+msgstr "5 minutes"
+
#: src/components/ImportSkillForm.tsx
msgid "A .zip or .skill archive."
msgstr "A .zip or .skill archive."
@@ -1521,6 +1546,7 @@ msgstr "Add your comments to this message"
#: src/components/PropertyDiffBlock.tsx
#: src/components/SkillDirectoryResult.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Added"
msgstr "Added"
@@ -1565,11 +1591,13 @@ msgstr "Adds these files"
msgid "Adds these folders"
msgstr "Adds these folders"
+#: src/components/settings/SyncSection.tsx
#: src/editor/components/PropPanel.tsx
msgid "Advanced"
msgstr "Advanced"
#: src/components/ConsentDialogBody.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Advanced settings"
msgstr "Advanced settings"
@@ -1979,6 +2007,24 @@ msgstr "Authoritative content; mirrored verbatim everywhere it's referenced."
msgid "Authorize in browser"
msgstr "Authorize in browser"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull and Push)"
+msgstr "Auto (Pull and Push)"
+
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull only)"
+msgstr "Auto (Pull only)"
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
+msgstr "Auto (Pull only) fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) never pushes or commits your local changes. They stay only on this machine."
+msgstr "Auto (Pull only) never pushes or commits your local changes. They stay only on this machine."
+
#: src/components/settings/TerminalSection.tsx
msgid "Auto-approve settings not yet loaded — try again in a moment"
msgstr "Auto-approve settings not yet loaded — try again in a moment"
@@ -2012,21 +2058,13 @@ msgstr "Auto-fix applies only to problems with a known mechanical fix."
msgid "Auto-save"
msgstr "Auto-save"
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is off for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "Auto-sync is off for this worktree, inherited from {project}. Change it in Settings → Sync."
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "Auto-sync is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-
#: src/components/settings/SyncSection.tsx
msgid "Auto-sync is paused — sign in to resume."
msgstr "Auto-sync is paused — sign in to resume."
#: src/components/settings/SyncSection.tsx
-msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Follow to keep receiving updates."
-msgstr "Auto-sync is paused — you don't have permission to push to this repo. Switch to Follow to keep receiving updates."
+msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Auto (Pull only) to keep receiving updates."
+msgstr "Auto-sync is paused — you don't have permission to push to this repo. Switch to Auto (Pull only) to keep receiving updates."
#: src/components/AutoSyncEnableWarning.tsx
msgid "Auto-sync periodically fetches, pulls, and pushes commits to your remote git repository so your edits stay in sync across machines."
@@ -2424,9 +2462,14 @@ msgid "Change the embeddings provider?"
msgstr "Change the embeddings provider?"
#: src/components/PropertyDiffBlock.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Changed"
msgstr "Changed"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Changed here and on the remote"
+msgstr "Changed here and on the remote"
+
#: src/components/ChangedOutsideBadge.tsx
msgid "changed outside"
msgstr "changed outside"
@@ -2451,6 +2494,10 @@ msgstr "Changes saved automatically."
msgid "Check for updates"
msgstr "Check for updates"
+#: src/components/settings/SyncSection.tsx
+msgid "Check for updates every"
+msgstr "Check for updates every"
+
#: src/components/AppMenubar.tsx
msgid "Check for updates…"
msgstr "Check for updates…"
@@ -2970,6 +3017,10 @@ msgstr "Comment or ask AI about this code block"
msgid "Comments"
msgstr "Comments"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Commit and sync"
+msgstr "Commit and sync"
+
#: src/components/ShareBranchSwitchDialog.tsx
msgid "Commit or stash changes to switch:"
msgstr "Commit or stash changes to switch:"
@@ -3271,6 +3322,7 @@ msgstr "Converting..."
#: src/components/empty-state/CopyablePromptList.tsx
#: src/components/InstallInClaudeDesktopDialog.tsx
+#: src/components/SyncStatusBadge.tsx
#: src/editor/extensions/CodeBlockView.tsx
msgid "Copied"
msgstr "Copied"
@@ -3886,6 +3938,10 @@ msgstr "Couldn't read the comments waiting to send — nothing was sent."
msgid "Couldn't read the comments waiting to send: {0}"
msgstr "Couldn't read the comments waiting to send: {0}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Couldn't read the working tree. Check the server logs."
+msgstr "Couldn't read the working tree. Check the server logs."
+
#. placeholder {0}: warning.code
#: src/components/settings/SavedThemesTiles.tsx
msgid "Couldn’t read this theme ({0})"
@@ -4459,6 +4515,10 @@ msgstr "Delete this chat?"
msgid "Delete this comment"
msgstr "Delete this comment"
+#: src/components/SyncStatusBadge.tsx
+msgid "Deleted"
+msgstr "Deleted"
+
#. placeholder {0}: deletedTheme.label
#: src/components/settings/SavedThemesTiles.tsx
msgid "Deleted {0}."
@@ -4554,6 +4614,10 @@ msgstr "description tokens"
msgid "Design"
msgstr "Design"
+#: src/components/SyncStatusBadge.tsx
+msgid "detached HEAD"
+msgstr "detached HEAD"
+
#: src/components/SyncStatusBadge.tsx
msgid "Detached HEAD — checkout a branch to resume"
msgstr "Detached HEAD — checkout a branch to resume"
@@ -4926,6 +4990,10 @@ msgstr "Each AI tool reads skills from its own folder. Point one folder at anoth
msgid "Each pack scaffolds your project with ready-made folders and templates."
msgstr "Each pack scaffolds your project with ready-made folders and templates."
+#: src/components/settings/SyncSection.tsx
+msgid "Each push is one commit to your remote."
+msgstr "Each push is one commit to your remote."
+
#: src/components/AppMenubar.tsx
#: src/components/settings/LintingSection.tsx
#: src/components/SkillsTree.tsx
@@ -5174,25 +5242,25 @@ msgstr "Enable {id}"
#: src/components/EnableSyncConfirmDialog.tsx
#: src/components/share-receive-miss-content.tsx
#: src/components/ShareFreshnessWarning.tsx
-msgid "Enable auto-sync"
-msgstr "Enable auto-sync"
+msgid "Enable Auto (Pull and Push)"
+msgstr "Enable Auto (Pull and Push)"
-#: src/components/settings/LinkPreviewsSection.tsx
-msgid "Enable external link previews"
-msgstr "Enable external link previews"
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Enable Auto (Pull and Push)?"
+msgstr "Enable Auto (Pull and Push)?"
#: src/components/AutoSyncOnboardingDialog.tsx
#: src/components/EnableSyncConfirmDialog.tsx
-msgid "Enable Follow"
-msgstr "Enable Follow"
+msgid "Enable Auto (Pull only)"
+msgstr "Enable Auto (Pull only)"
#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable Follow?"
-msgstr "Enable Follow?"
+msgid "Enable Auto (Pull only)?"
+msgstr "Enable Auto (Pull only)?"
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable git auto-sync?"
-msgstr "Enable git auto-sync?"
+#: src/components/settings/LinkPreviewsSection.tsx
+msgid "Enable external link previews"
+msgstr "Enable external link previews"
#: src/components/settings/LintingSection.tsx
msgid "Enable indexes"
@@ -5788,6 +5856,10 @@ msgstr "Failed to update the embeddings provider — {detail}"
msgid "Failed to update the project sync default — {detail}"
msgstr "Failed to update the project sync default — {detail}"
+#: src/components/settings/SyncSection.tsx
+msgid "Failed to update the sync interval — {detail}"
+msgstr "Failed to update the sync interval — {detail}"
+
#: src/components/FileTree.tsx
msgid "Failed to upload file"
msgstr "Failed to upload file"
@@ -6047,28 +6119,6 @@ msgstr "Folder share link copied."
msgid "Folder target: {linkTitle}. Click to open the overview."
msgstr "Folder target: {linkTitle}. Click to open the overview."
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow"
-msgstr "Follow"
-
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow — updates flow in from your remote; your edits stay on this computer."
-msgstr "Follow — updates flow in from your remote; your edits stay on this computer."
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
-msgstr "Follow fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Follow is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "Follow is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow never pushes or commits your local changes. They stay only on this machine."
-msgstr "Follow never pushes or commits your local changes. They stay only on this machine."
-
#: src/components/acp/ThreadView.tsx
msgid "Follow the agent's edits"
msgstr "Follow the agent's edits"
@@ -6159,11 +6209,6 @@ msgstr "Frontmatter every document created from this template starts with. Value
msgid "Frontmatter schemas"
msgstr "Frontmatter schemas"
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Full"
-msgstr "Full"
-
#: src/components/InstallInClaudeDesktopDialog.tsx
msgid "Full guide"
msgstr "Full guide"
@@ -6177,14 +6222,6 @@ msgstr "Full path"
msgid "Full Path"
msgstr "Full Path"
-#: src/components/settings/SyncSection.tsx
-msgid "Full sync — your commits push and remote changes pull automatically."
-msgstr "Full sync — your commits push and remote changes pull automatically."
-
-#: src/components/SyncStatusBadge.tsx
-msgid "Full sync — your edits are committed and pushed to your remote automatically."
-msgstr "Full sync — your edits are committed and pushed to your remote automatically."
-
#: src/components/OkBlobRunner.tsx
msgid "Game over · press <0>Space</0> to play again"
msgstr "Game over · press <0>Space</0> to play again"
@@ -6243,6 +6280,7 @@ msgid "Git needs a helper tool (such as git-lfs) that isn't installed or couldn'
msgstr "Git needs a helper tool (such as git-lfs) that isn't installed or couldn't be found. Install it, then try again."
#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Git sync"
msgstr "Git sync"
@@ -6620,6 +6658,10 @@ msgstr "How does sharing work?"
msgid "How missing project-local documents, files, and images are reported in Problems, editor diagnostics, audits, and agent tools."
msgstr "How missing project-local documents, files, and images are reported in Problems, editor diagnostics, audits, and agent tools."
+#: src/components/settings/SyncSection.tsx
+msgid "How often this computer pulls changes from your remote."
+msgstr "How often this computer pulls changes from your remote."
+
#: src/components/ShareFreshnessWarning.tsx
msgid "How to push manually"
msgstr "How to push manually"
@@ -6705,6 +6747,10 @@ msgstr "Ignore patterns"
msgid "Ignore patterns (raw text)"
msgstr "Ignore patterns (raw text)"
+#: src/components/SyncStatusBadge.tsx
+msgid "Ignored"
+msgstr "Ignored"
+
#: src/components/LinksPanel.tsx
msgid "Image {identity}. Go to reference."
msgstr "Image {identity}. Go to reference."
@@ -7301,8 +7347,8 @@ msgid "Keep the name to 64 characters or fewer."
msgstr "Keep the name to 64 characters or fewer."
#: src/components/settings/SyncSection.tsx
-msgid "Keep this project in sync with your git remote. Follow fetches updates without pushing; full sync pushes your commits too. Turning sync on requires confirmation."
-msgstr "Keep this project in sync with your git remote. Follow fetches updates without pushing; full sync pushes your commits too. Turning sync on requires confirmation."
+msgid "Keep this project in sync with your git remote. Auto (Pull only) brings in updates without pushing; Auto (Pull and Push) sends your edits too. Turning auto-sync on requires confirmation."
+msgstr "Keep this project in sync with your git remote. Auto (Pull only) brings in updates without pushing; Auto (Pull and Push) sends your edits too. Turning auto-sync on requires confirmation."
#: src/lib/pack-copy.ts
msgid "Keep track of the people and companies you work with and the meetings you have with them. Good for remembering who someone is, how you know them, and what you last talked about."
@@ -7782,6 +7828,11 @@ msgstr "Managing AI tools is unavailable in this build."
msgid "Managing project AI tools is unavailable in this build."
msgstr "Managing project AI tools is unavailable in this build."
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Manual"
+msgstr "Manual"
+
#: src/components/empty-state/use-create-suggestions.ts
msgid "Map the architecture"
msgstr "Map the architecture"
@@ -7920,10 +7971,6 @@ msgstr "Missing palette colors"
msgid "Missing theme name"
msgstr "Missing theme name"
-#: src/components/SyncStatusBadge.tsx
-msgid "Mode"
-msgstr "Mode"
-
#: src/components/settings/SearchSection.tsx
msgid "Model"
msgstr "Model"
@@ -7940,6 +7987,7 @@ msgstr "Model's default effort"
#: src/components/FolderOverview.tsx
#: src/components/settings/markdownlint-rule-browser.tsx
#: src/components/SkillOriginInline.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Modified"
msgstr "Modified"
@@ -8232,10 +8280,6 @@ msgstr "Network error during cleanup"
msgid "Network settings not yet loaded. Try again in a moment."
msgstr "Network settings not yet loaded. Try again in a moment."
-#: src/components/SyncStatusBadge.tsx
-msgid "never"
-msgstr "never"
-
#: src/components/FolderOverview.tsx
#: src/editor/tag-suggestion/TagSuggestionMenu.tsx
msgid "New"
@@ -8850,10 +8894,22 @@ msgstr "nothing ({0} cannot match a doc)"
msgid "nothing ({0} is not a valid pattern)"
msgstr "nothing ({0} is not a valid pattern)"
+#: src/components/settings/SyncSection.tsx
+msgid "Nothing moves until you ask — pull and push from the sync menu."
+msgstr "Nothing moves until you ask — pull and push from the sync menu."
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing moves until you ask."
+msgstr "Nothing moves until you ask."
+
#: src/components/FolderPropertiesCard.tsx
msgid "Nothing set yet."
msgstr "Nothing set yet."
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing to commit — working tree clean."
+msgstr "Nothing to commit — working tree clean."
+
#: src/components/BugReportSendToast.tsx
msgid "Nothing was uploaded. The report stays on this computer until you email it to us."
msgstr "Nothing was uploaded. The report stays on this computer until you email it to us."
@@ -8887,10 +8943,6 @@ msgstr "of {0}"
msgid "of {totalPages}"
msgstr "of {totalPages}"
-#: src/components/settings/SyncSection.tsx
-msgid "Off"
-msgstr "Off"
-
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Off — external links show only their URL. No requests leave this computer."
msgstr "Off — external links show only their URL. No requests leave this computer."
@@ -9645,6 +9697,10 @@ msgstr "Outgoing"
msgid "Outline"
msgstr "Outline"
+#: src/components/SyncStatusBadge.tsx
+msgid "Outside what Open Knowledge commits."
+msgstr "Outside what Open Knowledge commits."
+
#: src/components/SkillCostValue.tsx
msgid "over the {budgetLabel} token budget"
msgstr "over the {budgetLabel} token budget"
@@ -9855,10 +9911,6 @@ msgstr "Pattern syntax error: {message}"
msgid "Pattern warnings: {summary}"
msgstr "Pattern warnings: {summary}"
-#: src/components/SyncStatusBadge.tsx
-msgid "Pause sync"
-msgstr "Pause sync"
-
#: src/components/acp/ThreadView.tsx
msgid "pending"
msgstr "pending"
@@ -10252,10 +10304,26 @@ msgstr "Publishing..."
msgid "Pull"
msgstr "Pull"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull and Push"
+msgstr "Pull and Push"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull brings in"
+msgstr "Pull brings in"
+
#: src/components/share-receive-miss-content.tsx
msgid "Pull latest changes"
msgstr "Pull latest changes"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled}"
+msgstr "Pulled {pulled}"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled} · pushed {pushed}"
+msgstr "Pulled {pulled} · pushed {pushed}"
+
#: src/components/share-receive-miss-content.tsx
#: src/components/SyncStatusBadge.tsx
msgid "Pulling"
@@ -10281,10 +10349,26 @@ msgstr "Push {branch} to GitHub before sharing."
msgid "Push failed — check the server logs for details."
msgstr "Push failed — check the server logs for details."
+#: src/components/SyncStatusBadge.tsx
+msgid "Push includes"
+msgstr "Push includes"
+
+#: src/components/settings/SyncSection.tsx
+msgid "Push my edits every"
+msgstr "Push my edits every"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Push skips"
+msgstr "Push skips"
+
#: src/lib/share/run-share-action.ts
msgid "Push this branch to GitHub before sharing."
msgstr "Push this branch to GitHub before sharing."
+#: src/components/SyncStatusBadge.tsx
+msgid "Pushed {pushed}"
+msgstr "Pushed {pushed}"
+
#: src/components/SyncStatusBadge.tsx
msgid "Pushing"
msgstr "Pushing"
@@ -10358,6 +10442,10 @@ msgstr "Read-only copy of a MirrorSource block from another doc. Edit at the sou
msgid "Read-only file in the {name} skill"
msgstr "Read-only file in the {name} skill"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reading working tree"
+msgstr "Reading working tree"
+
#: src/components/acp/working-status.ts
msgid "Reading…"
msgstr "Reading…"
@@ -10411,6 +10499,10 @@ msgstr "Recommended agent skill"
msgid "Reconnect required"
msgstr "Reconnect required"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reconnect required to keep syncing."
+msgstr "Reconnect required to keep syncing."
+
#: src/presence/use-sync-toasts.ts
msgid "Reconnected"
msgstr "Reconnected"
@@ -10677,6 +10769,10 @@ msgstr "Rename skill"
msgid "Rename succeeded but the sidebar may be out of date — refresh to resync"
msgstr "Rename succeeded but the sidebar may be out of date — refresh to resync"
+#: src/components/SyncStatusBadge.tsx
+msgid "Renamed"
+msgstr "Renamed"
+
#. placeholder {0}: docLeaf(descriptor.from)
#. placeholder {1}: docLeaf(descriptor.to)
#: src/components/TimelinePanel.tsx
@@ -10828,7 +10924,6 @@ msgstr "Repositories you've already cloned may keep syncing through git's own sa
#: src/components/CloneDialog.tsx
#: src/components/share-metadata-rows.tsx
#: src/components/SkillPreviewTab.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Repository"
msgstr "Repository"
@@ -10911,6 +11006,10 @@ msgstr "Resize skills panel"
msgid "Resolve conflict in your terminal"
msgstr "Resolve conflict in your terminal"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Resolve in terminal"
+msgstr "Resolve in terminal"
+
#: src/components/FileTree.tsx
msgid "Resolve the conflict on {files} before deleting."
msgstr "Resolve the conflict on {files} before deleting."
@@ -11026,10 +11125,6 @@ msgstr "Restored to the version from {0}"
msgid "Results capped — this workspace has more files than search can index. A missing file may be a cap artifact, not a typo."
msgstr "Results capped — this workspace has more files than search can index. A missing file may be a cap artifact, not a typo."
-#: src/components/SyncStatusBadge.tsx
-msgid "Resume sync"
-msgstr "Resume sync"
-
#: src/components/acp/ThreadView.tsx
msgid "Resuming the chat"
msgstr "Resuming the chat"
@@ -11101,8 +11196,8 @@ msgid "Reverting"
msgstr "Reverting"
#: src/components/SyncStatusBadge.tsx
-msgid "Review conflicts"
-msgstr "Review conflicts"
+msgid "Review"
+msgstr "Review"
#: src/components/ReportBugDialogBody.tsx
msgid "Review your report"
@@ -12248,6 +12343,10 @@ msgstr "Slidev timed out while starting. Try again."
msgid "Small section heading."
msgstr "Small section heading."
+#: src/components/SyncStatusBadge.tsx
+msgid "Some files are not listed — the working tree has too many changes."
+msgstr "Some files are not listed — the working tree has too many changes."
+
#: src/components/settings/SavedThemesTiles.tsx
msgid "Some saved themes aren’t shown because the theme folder exceeds the scan limit."
msgstr "Some saved themes aren’t shown because the theme folder exceeds the scan limit."
@@ -12439,6 +12538,10 @@ msgstr "Starting the agent…"
msgid "status"
msgstr "status"
+#: src/components/SyncStatusBadge.tsx
+msgid "Status"
+msgstr "Status"
+
#: src/components/SubscribeCard.tsx
#: src/components/SubscribeForm.tsx
msgid "Stay in the loop"
@@ -12586,8 +12689,8 @@ msgid "Switch to a branch to share."
msgstr "Switch to a branch to share."
#: src/components/settings/SyncSection.tsx
-msgid "Switch to Follow"
-msgstr "Switch to Follow"
+msgid "Switch to Auto (Pull only)"
+msgstr "Switch to Auto (Pull only)"
#: src/components/command-palette-commands.ts
msgid "Switch worktree"
@@ -12626,7 +12729,6 @@ msgid "Symlinks the skill to {path}"
msgstr "Symlinks the skill to {path}"
#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Sync"
msgstr "Sync"
@@ -12635,10 +12737,6 @@ msgstr "Sync"
msgid "Sync & sharing"
msgstr "Sync & sharing"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync disabled"
-msgstr "Sync disabled"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync failed — check the server logs for details."
msgstr "Sync failed — check the server logs for details."
@@ -12647,13 +12745,21 @@ msgstr "Sync failed — check the server logs for details."
msgid "Sync is failing. See the sync status for details."
msgstr "Sync is failing. See the sync status for details."
-#: src/components/settings/SyncSection.tsx
-msgid "Sync is off — your edits stay on this computer until you commit and push manually."
-msgstr "Sync is off — your edits stay on this computer until you commit and push manually."
+#: src/components/SyncBlockingChanges.tsx
+msgid "Sync is paused. Commit these local edits to continue, or sort them out in a terminal."
+msgstr "Sync is paused. Commit these local edits to continue, or sort them out in a terminal."
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync is paused. Turn it back on to resume."
-msgstr "Sync is paused. Turn it back on to resume."
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull and Push) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "Sync is set to Auto (Pull and Push) for this worktree, inherited from {project}. Change it in Settings → Sync."
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull only) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "Sync is set to Auto (Pull only) for this worktree, inherited from {project}. Change it in Settings → Sync."
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Manual for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "Sync is set to Manual for this worktree, inherited from {project}. Change it in Settings → Sync."
#: src/components/SyncStatusBadge.tsx
msgid "Sync mode"
@@ -12664,18 +12770,10 @@ msgstr "Sync mode"
msgid "Sync now"
msgstr "Sync now"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync off"
-msgstr "Sync off"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync paused"
msgstr "Sync paused"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync paused — resolve conflicts to resume."
-msgstr "Sync paused — resolve conflicts to resume."
-
#: src/hooks/use-no-push-permission-toast.ts
msgid "Sync paused — you don't have permission to push to this repo"
msgstr "Sync paused — you don't have permission to push to this repo"
@@ -12710,10 +12808,6 @@ msgstr "Sync status: {syncStateLabel} — git identity unset"
msgid "Synced"
msgstr "Synced"
-#: src/components/SyncStatusBadge.tsx
-msgid "Synced {lastSyncedRelative}"
-msgstr "Synced {lastSyncedRelative}"
-
#: src/components/TimelinePanel.tsx
msgid "Synced from disk"
msgstr "Synced from disk"
@@ -12937,6 +13031,10 @@ msgstr "Thanks for the report!"
msgid "That branch is already open in another worktree."
msgstr "That branch is already open in another worktree."
+#: src/components/SyncBlockingChanges.tsx
+msgid "That did not go through. Check the server logs and try again."
+msgstr "That did not go through. Check the server logs and try again."
+
#: src/comments/reveal-comment.ts
msgid "That document didn't open in time. Try again once it has synced."
msgstr "That document didn't open in time. Try again once it has synced."
@@ -13972,6 +14070,10 @@ msgstr "Type '/' for commands"
msgid "Type a query, then press <0>↵</0> to search your pages by meaning."
msgstr "Type a query, then press <0>↵</0> to search your pages by meaning."
+#: src/components/SyncStatusBadge.tsx
+msgid "Type changed"
+msgstr "Type changed"
+
#: src/editor/components/CodePreviewEditModal.tsx
msgid "Type to edit; <0>Cmd/Ctrl+Enter</0> saves, <1>Esc</1> cancels."
msgstr "Type to edit; <0>Cmd/Ctrl+Enter</0> saves, <1>Esc</1> cancels."
@@ -14100,6 +14202,10 @@ msgstr "Unmark every comment"
msgid "Unmark every comment in {0}"
msgstr "Unmark every comment in {0}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Unmerged"
+msgstr "Unmerged"
+
#: src/editor/slash-command/items.tsx
msgid "Unordered list of items."
msgstr "Unordered list of items."
@@ -14140,6 +14246,10 @@ msgstr "Unresolvable image {identity}. Go to reference."
msgid "Untitled report"
msgstr "Untitled report"
+#: src/components/SyncStatusBadge.tsx
+msgid "Untracked"
+msgstr "Untracked"
+
#: src/components/SyncStatusBadge.tsx
msgid "Up to date"
msgstr "Up to date"
@@ -14187,8 +14297,8 @@ msgid "Updated \"{name}\" from {0}"
msgstr "Updated \"{name}\" from {0}"
#: src/components/SyncStatusBadge.tsx
-msgid "Updated {lastSyncedRelative}"
-msgstr "Updated {lastSyncedRelative}"
+msgid "Updated {updatedRelative}"
+msgstr "Updated {updatedRelative}"
#: src/components/FolderTimelineCard.tsx
msgid "updated folder properties"
@@ -14202,6 +14312,11 @@ msgstr "Updated to Version {version}"
msgid "Updates flow in"
msgstr "Updates flow in"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Updates flow in from your remote; your edits stay on this computer."
+msgstr "Updates flow in from your remote; your edits stay on this computer."
+
#: src/components/SkillOriginInline.tsx
msgid "Updates from the source apply automatically (unless edited locally)"
msgstr "Updates from the source apply automatically (unless edited locally)"
@@ -14654,6 +14769,10 @@ msgstr "Where should it live?"
msgid "Which skill"
msgstr "Which skill"
+#: src/components/settings/SyncSection.tsx
+msgid "While you're signed out, updates are checked at most every 3 minutes regardless of this setting."
+msgstr "While you're signed out, updates are checked at most every 3 minutes regardless of this setting."
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "Whitespace"
msgstr "Whitespace"
@@ -14830,8 +14949,8 @@ msgid "You don't have permission to push to this repo."
msgstr "You don't have permission to push to this repo."
#: src/components/settings/SyncSection.tsx
-msgid "You don't have permission to push to this repo. Follow can still keep your copy up to date."
-msgstr "You don't have permission to push to this repo. Follow can still keep your copy up to date."
+msgid "You don't have permission to push to this repo. Auto (Pull only) can still keep your copy up to date."
+msgstr "You don't have permission to push to this repo. Auto (Pull only) can still keep your copy up to date."
#: src/components/ShareFreshnessWarning.tsx
msgid "You don't have write access to this repo."
@@ -14903,6 +15022,11 @@ msgstr "Your copy of branch <0>{shareBranch}</0> has changes that aren't on GitH
msgid "Your current version is saved first, so this is reversible."
msgstr "Your current version is saved first, so this is reversible."
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Your edits are committed and pushed to your remote automatically."
+msgstr "Your edits are committed and pushed to your remote automatically."
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "Your edits stay on this computer"
msgstr "Your edits stay on this computer"
diff --git a/packages/app/src/locales/es/messages.json b/packages/app/src/locales/es/messages.json
index e78b03be1..e925f44bd 100644
--- a/packages/app/src/locales/es/messages.json
+++ b/packages/app/src/locales/es/messages.json
@@ -37,13 +37,7 @@
"-YV1Uo": ["Patrón ", ["patternNumber"]],
"-bFGPF": ["Cambio siguiente"],
"-dNlfM": ["Se deshizo la última edición en ", ["docName"]],
- "-f2Ogn": [
- "Mantén este proyecto sincronizado con tu remoto de git. Seguir obtiene actualizaciones sin hacer push; la sincronización completa también sube tus commits. Activar la sincronización requiere confirmación."
- ],
"-g6KIS": ["Enlace no reconocido"],
- "-imiMK": [
- "Seguir: las actualizaciones llegan desde tu remoto; tus ediciones se quedan en este equipo."
- ],
"-kKdCC": ["Se instalaron ", ["imported"], " habilidades desde ", ["0"]],
"-kbIAr": ["Enlaces e imágenes"],
"-ksoxk": [
@@ -153,7 +147,6 @@
"0wswKc": ["Línea horizontal que separa secciones."],
"0xnQ_X": ["Las actualizaciones llegan solas"],
"0xnmlQ": ["Nombre del repositorio"],
- "0yL--g": ["Revisar los conflictos"],
"0ySP5u": ["Los cambios se guardan automáticamente en este tema."],
"0zAhu6": ["todos los documentos"],
"1-flC9": ["Puerto del servidor local"],
@@ -193,6 +186,7 @@
"1NgrlY": ["Otras formas de instalarlo"],
"1QfxQT": ["Descartar"],
"1RluQD": ["Mostrar reemplazar"],
+ "1TA-aJ": ["Traído ", ["pulled"], " · enviado ", ["pushed"]],
"1TNIig": ["Abrir"],
"1Ta7Fd": ["Abrir ", ["basename"]],
"1V17kO": ["Cargando ambas versiones"],
@@ -270,6 +264,11 @@
["FULLSCREEN_HUB_LIMIT"],
" resultados."
],
+ "2okwy4": [
+ "La sincronización de este worktree está en Automático (solo Pull), heredada de ",
+ ["project"],
+ ". Cámbiala en Ajustes → Sincronización."
+ ],
"2pR7ad": ["Clave de API de embeddings"],
"2q_Q7x": ["Visibilidad"],
"2rLM8r": ["No se pudo iniciar el hilo del agente; inténtalo de nuevo."],
@@ -402,7 +401,6 @@
"4A3Yzu": ["Bloque de código"],
"4BITzH": ["Error:"],
"4CfgPM": ["Se creó la carpeta del proyecto, pero falló git init. Inténtalo de nuevo."],
- "4DcimZ": ["Actualizado ", ["lastSyncedRelative"]],
"4E9jPa": ["Crea tu primer proyecto"],
"4EZrJN": ["Reglas"],
"4ErgAf": ["OpenKnowledge instaló una habilidad"],
@@ -434,6 +432,7 @@
"Elige las habilidades que quieres instalar. Cada una llega como una habilidad editable que es tuya."
],
"4mLBx9": ["Ahora mismo no hay suscripciones disponibles."],
+ "4mbrAq": ["1 minuto"],
"4mp6Tv": ["OpenKnowledge listó las habilidades instaladas"],
"4niEzY": [
"Incrustación de HTML aislada: escribe HTML y ve la vista previa renderizada en vivo."
@@ -451,11 +450,6 @@
"Selecciona todas las filas visibles del árbol de archivos cuando el foco está en la barra lateral Archivos."
],
"4xtLTl": ["Carpeta “", ["basename"], "” oculta"],
- "4zEZS5": [
- "La sincronización automática está activada en este worktree, heredado de ",
- ["project"],
- ". Cámbialo en Ajustes → Sincronización."
- ],
"4zGlN_": ["Pega la URL de la imagen o haz clic en subir"],
"4z_1j2": ["Renderizado"],
"5-FeN2": ["URL para compartir"],
@@ -543,6 +537,7 @@
],
"5hFl0U": ["Copiar referencia"],
"5jEnaB": ["No disponible en esta plataforma"],
+ "5k0NLb": ["Revisar"],
"5kWklo": ["(puede que otras reglas ya oculten algunos)"],
"5lWFkC": ["Iniciar sesión"],
"5mksg0": ["No se pudo desactivar la búsqueda semántica — ", ["detail"]],
@@ -581,6 +576,7 @@
"Los comandos se ejecutan con todo el acceso de tu cuenta de usuario en este equipo. Desactiva esto para deshabilitar el shell."
],
"6Aih4U": ["Sin conexión"],
+ "6EoD0z": ["Resolver en la terminal"],
"6FCixu": ["Reabrir un chat anterior"],
"6HCOwA": ["No se pudo abrir."],
"6KCH4m": ["Archivos ocultos"],
@@ -655,6 +651,11 @@
],
"6ur2Mk": ["Ayuda a tus agentes a descubrir y usar OpenKnowledge en cualquier proyecto."],
"6vEr3W": ["Destino del enlace"],
+ "6xPJIj": [
+ "La sincronización de este worktree está en Manual, heredada de ",
+ ["project"],
+ ". Cámbiala en Ajustes → Sincronización."
+ ],
"6xeZX9": ["Los cambios se aplican al instante. El tema determina si es claro u oscuro."],
"6zzhQL": ["Envía tu informe por correo"],
"72xhRD": ["Modo de vista del diagrama"],
@@ -811,7 +812,6 @@
"8qgfac": ["Servidores MCP"],
"8rZ1pk": ["Habilitar ", ["id"]],
"8ruqQi": ["Enlaces internos rotos"],
- "8sMErm": ["¿Activar Seguir?"],
"8t9CRE": ["Iniciando ", ["agentName"], "…"],
"8t9T3-": ["No se encontraron habilidades."],
"8tjQCz": ["Explorar"],
@@ -877,6 +877,7 @@
]
],
"9Y6cCI": ["No se pudieron cargar las páginas"],
+ "9ZxzfT": [["count"], " por delante"],
"9_2oe6": [
"Vuelve a convertir ",
["0"],
@@ -969,11 +970,6 @@
"AVW-K9": ["No se pudieron cargar las páginas huérfanas"],
"AWOSPo": ["Acercar"],
"AYoYhU": ["Falló la actualización: ", ["0"]],
- "AaaESH": [
- "La sincronización automática está desactivada en este worktree, heredado de ",
- ["project"],
- ". Cámbialo en Ajustes → Sincronización."
- ],
"AcK_r0": ["Claude CLI"],
"AczYxH": ["Entrada open-knowledge personalizada, no gestionada por OpenKnowledge"],
"AdcGcG": ["Aplicando tu cambio"],
@@ -1060,6 +1056,7 @@
"BVkqD9": [
"El mantenimiento del índice está en pausa porque otro atributo de Git controla index.md. Actualiza .gitattributes para que las rutas index.md de ese ámbito usen merge=union y vuelve a intentarlo."
],
+ "BWTzAb": ["Manual"],
"BY-g4_": ["Añadir patrón"],
"Ba4D2x": ["Plantilla importada"],
"Bdha5y": ["Publicando..."],
@@ -1103,6 +1100,7 @@
],
"C0Ciaj": ["Se importó como \"", ["0"], "\": el nombre \"", ["1"], "\" ya estaba ocupado."],
"C0hoX6": ["Siempre incluido"],
+ "C2abof": ["Sin seguimiento"],
"C3Zc44": ["Explorar habilidades"],
"C62P6b": ["Selección del editor"],
"C7PKTv": ["Enviar los comentarios marcados al chat"],
@@ -1139,9 +1137,6 @@
"CTJLpz": ["\"", ["trimmed"], "\" ya existe aquí"],
"CU3AiE": ["Cambiando de rama"],
"CUmCwI": ["Insertar fila debajo"],
- "CVRM5N": [
- "Seguir obtiene las actualizaciones de tu repositorio git remoto y avanza tu copia automáticamente. Tus ediciones locales se quedan en este equipo y nunca se suben."
- ],
"CWjM1r": ["documentos directamente en ", ["0"], "/"],
"CWzc2T": [
"<0>~/.ok/bin</0> y <1>~/.ok/env.sh</1> se conservan en cualquier caso: la aplicación siempre los mantiene."
@@ -1182,6 +1177,7 @@
"En los proyectos Git, Open Knowledge añade una regla con alcance al archivo .gitattributes de la raíz del repositorio para combinar los cambios simultáneos del índice."
],
"CxVk-w": ["Comentar en ", ["address"]],
+ "Cz-K13": ["15 minutos"],
"D-NlUC": ["Sistema"],
"D-Oh1s": ["Cómo configurar ", ["0"], " (se abre en el navegador)"],
"D-_B7l": ["Conectado: este endpoint devuelve vectores de ", ["0"], " dimensiones."],
@@ -1249,7 +1245,6 @@
"DmkTrb": ["No se pudo crear este tema. Inténtalo de nuevo."],
"Dnn2XG": ["Automático"],
"DpjYd6": ["Ir al texto anclado"],
- "DrYM2Z": ["Sincronización desactivada"],
"DsDwR-": [
[
"0",
@@ -1453,6 +1448,7 @@
],
"Fqx38P": ["¿Qué te lo impidió?"],
"Fr8JGg": ["Archivo zip"],
+ "FsEXax": ["Eso no se completó. Revisa los registros del servidor e inténtalo de nuevo."],
"Fsx78O": ["Añade el comando <0>ok</0> a tu terminal"],
"FvMSms": [
"Renombrarlo cambia el archivo en el disco y el id con el que los agentes eligen esta plantilla."
@@ -1592,6 +1588,9 @@
"H0WlWQ": ["Cuadrícula de filas y columnas con una fila de encabezado."],
"H1TmTu": ["Se dejó de arreglar. Los archivos ya arreglados se quedan como están."],
"H3oH0g": ["Rehacer"],
+ "H4doZt": [
+ "La sincronización está en pausa. Confirma estas ediciones locales para continuar, o resuélvelas en una terminal."
+ ],
"H86f9p": ["Contraer"],
"H8DVOJ": ["Idénticas en ambas: ", ["pick"], " las sigue leyendo."],
"HAkEqR": ["Archivos recientes"],
@@ -1700,6 +1699,7 @@
"IWGfGF": ["Comprobando tu conexión con GitHub"],
"IX7-sq": ["Algo salió mal al abrir \"", ["docName"], "\"."],
"IX_uXB": ["mi-funcion"],
+ "IXiG0B": ["Automático (Pull y Push)"],
"IYciRC": ["¡Gracias por el informe!"],
"IajAbS": ["Añadir un paquete inicial"],
"If0crP": ["Abrir con la IA ", ["targetDisplayName"], ", ", ["hint"]],
@@ -1762,6 +1762,7 @@
"JLzQi_": ["Cerrar ", ["accessibleLabel"]],
"JM_aq-": ["Usa una URL https://; http:// solo se admite para localhost."],
"JOcPqH": ["Trae un repositorio remoto a este equipo."],
+ "JOhCT9": ["Push incluye"],
"JWsZlx": ["Abre un proyecto para editarlo."],
"JZ8cO6": ["Claro, oscuro o seguir al sistema."],
"J_jZ5z": [
@@ -1857,6 +1858,9 @@
"KjTmeO": ["Actualiza OpenKnowledge para abrir este elemento compartido."],
"KkEAud": ["Crea un archivo a partir del documento o la carpeta actuales."],
"KkRyMI": ["No se pudo clasificar la fusión. Inténtalo de nuevo."],
+ "KmVekT": [
+ "Automático (solo Pull) obtiene actualizaciones de tu repositorio git remoto y avanza tu copia automáticamente. Tus ediciones locales se quedan en este equipo y nunca se envían."
+ ],
"KmydK6": ["Negrita"],
"KnoB--": ["Se guardará como <0>", ["sanitized"], "</0>."],
"KpOJFY": ["Activar la vista previa de enlaces externos"],
@@ -1866,6 +1870,7 @@
"KsAPaB": ["Esta rama está extraída en:"],
"KtACeE": ["Por defecto: <0>", ["0"], "</0>"],
"KujtjC": ["Buscar"],
+ "KvwJv8": ["Algunos archivos no aparecen: el árbol de trabajo tiene demasiados cambios."],
"Kx881F": ["Se restauró ", ["0"], "."],
"L-rMC9": ["Restablecer al valor por defecto"],
"L1BQTH": [["0"], " todavía no está instalado: abriendo su página de descarga."],
@@ -1883,6 +1888,7 @@
"L83DKQ": ["Falló la instalación en PATH: ", ["summary"]],
"L8fKuc": ["Ejecuta esto en tu terminal"],
"L9Y9Om": ["Páginas más enlazadas"],
+ "L9ox9k": ["No se pudo leer el árbol de trabajo. Revisa los registros del servidor."],
"LAR9ub": ["Reemplaza la entrada de OpenKnowledge existente en ", ["0"]],
"LBv_TR": ["Convertir las ubicaciones en enlaces simbólicos"],
"LBwUR6": [
@@ -1911,7 +1917,6 @@
]
],
"LKOLNn": ["No hay agentes de IA instalados"],
- "LNum6A": ["hace ", ["minutes"], " min"],
"LPAv9E": ["hace ", ["days"], " d"],
"LQdLio": ["Esquema nuevo"],
"LQsCPn": ["Hay commits locales que impiden actualizar esta copia"],
@@ -2020,7 +2025,6 @@
"MCjC9A": ["Eliminar ", ["deleteDescriptorLabel"]],
"MDBJwN": ["Difícil de usar"],
"MDZSJe": ["Cuándo ejecuta el agente su trabajo programado."],
- "MGBNwj": ["Pausar la sincronización"],
"MGb89P": [
"Inserta, elimina, mueve, copia y sangra líneas del editor de código con el mapa de teclas por defecto de CodeMirror."
],
@@ -2029,7 +2033,6 @@
"MIF36T": ["No se pudo resolver la bifurcación: ", ["0"]],
"MILoeL": ["Servicios"],
"MJuO1q": ["Ventana de contexto:"],
- "MKEPCY": ["Seguir"],
"MLVPcm": [["0"], " versión ", ["1"]],
"MOAoFO": ["Aún no hay carpetas de agentes"],
"MPpSAg": ["Crear proyecto a partir de ", ["selectedPackName"]],
@@ -2094,6 +2097,7 @@
],
"N5rzKJ": ["Eliminar ", ["0"], " habilidades"],
"N6j2JH": ["Editar ", ["0"]],
+ "N7Lau6": ["Confirmar y sincronizar"],
"NBdIgR": ["Comentar"],
"NErvOX": ["Guardado en"],
"NEzPEh": ["Crea una rama nueva, o extrae una existente, en su propia ventana."],
@@ -2123,6 +2127,7 @@
"Nay2Yr": ["Ningún agente coincide con tu búsqueda."],
"NcUznW": [["0"], ", sin espacio de trabajo"],
"NcurBF": ["Desplazar hacia abajo"],
+ "NcwbBM": ["Pull trae"],
"NeQ_0G": ["Trabaja sobre estos comentarios"],
"NeY1Np": ["Slidev tardó demasiado en iniciarse. Inténtalo de nuevo."],
"NfraGd": ["Otras formas de instalar Slidev"],
@@ -2168,6 +2173,7 @@
"O6yEPk": ["Crea un proyecto de OpenKnowledge en la carpeta que elijas."],
"O7_W_a": ["Abrir con IA"],
"O9oQJS": ["Enviar el informe"],
+ "OBdkpo": ["HEAD desacoplado"],
"OD0FCX": ["“", ["basename"], "” oculto"],
"ODGGlj": ["Nombre de la carpeta: ", ["detail"]],
"OEEQKT": ["Bien"],
@@ -2227,6 +2233,7 @@
"Oo_WWc": ["No se encontraron páginas"],
"Oos8fo": ["Copiar comando"],
"OplnBG": ["La gestión de herramientas de IA no está disponible en esta compilación."],
+ "OqqecQ": ["30 segundos"],
"OsSaYm": ["No se pudo clonar: ", ["title"]],
"OuQezS": ["Se aplica cuando retomes esta conversación"],
"OuY8t9": ["Abrir en la rama actual"],
@@ -2261,7 +2268,11 @@
"PBwmDJ": ["Buscando por significado"],
"PBxg_E": ["Ahora no"],
"PCSkw2": ["Habilidades"],
+ "PEGxvo": ["5 minutos"],
"PGPGsL": ["Añadir descripción"],
+ "PGRnbw": [
+ "Las actualizaciones llegan desde tu remoto; tus ediciones se quedan en este equipo."
+ ],
"PHHEuH": ["Ocultar comentarios resueltos (", ["0"], ")"],
"PIMM5l": ["¡Te has suscrito!"],
"PKLY-1": ["Abriendo..."],
@@ -2274,7 +2285,6 @@
"PRgIJh": ["No se pudo actualizar ", ["subRoot"], ": ", ["0"]],
"PRnH8G": ["de ", ["0"]],
"PTUuoc": ["No se pudo desmarcar ese comentario: sigue pendiente de envío."],
- "PTb1Nx": ["La sincronización está en pausa. Vuelve a activarla para reanudarla."],
"PVSwOe": ["Redirigiendo: esperando a que se detenga la ejecución actual…"],
"PVUn_c": ["Abrir carpeta"],
"PVggyD": ["Esquemas de frontmatter"],
@@ -2328,6 +2338,7 @@
"PrWQiT": ["Mover Terminal a la derecha"],
"PrhzDE": ["Desplazar hacia arriba"],
"Pw5PTU": ["Origen externo"],
+ "PxZCNM": ["Fuera de lo que confirma Open Knowledge."],
"Q-DKvr": ["Instalar desde ", ["source"]],
"Q1mtyd": ["Ocultar la barra lateral"],
"Q5fqMz": ["Error de conexión: inténtalo de nuevo"],
@@ -2383,6 +2394,7 @@
{ "one": ["#", " elemento"], "many": ["#", " elementos"], "other": ["#", " elementos"] }
]
],
+ "QeREu8": ["Renombrado"],
"QfFBdJ": ["El nombre de archivo de la plantilla (sin `.md`)."],
"Qft6eW": ["Mover ", ["0"], " a Global"],
"Qj4RL5": ["Completado:"],
@@ -2598,13 +2610,9 @@
"Sr9xtj": ["Elegir las carpetas a las que se aplica este esquema"],
"SrOuyg": ["Paneles del documento"],
"SvBFYA": ["No hay proyectos recientes"],
- "Sxx_Zz": [
- "Seguir está activado en este worktree, heredado de ",
- ["project"],
- ". Cámbialo en Ajustes → Sincronización."
- ],
"T-654M": ["Cargando el PDF"],
"T0OVm7": ["La rama por defecto está protegida: los push requieren una pull request."],
+ "T1fMJ6": ["Con qué frecuencia este equipo trae cambios de tu remoto."],
"T2fvhw": ["Desmarcar todos los comentarios de ", ["0"]],
"T3Mld1": ["Ventana"],
"T3j-7o": ["p. ej. Cambiar de proyecto mientras se sincronizaba"],
@@ -2662,10 +2670,10 @@
"U2pMtf": ["nombre-de-etiqueta"],
"U3IvM5": ["Guía completa"],
"U3RIJu": ["Archivos locales"],
- "U4nTfu": ["Activar Seguir"],
"U5Spo9": ["El directorio de contenido debe estar dentro del proyecto"],
"U6Mdhd": ["Vamos a configurarlo."],
"U6wmNc": ["Sincronización en pausa"],
+ "U7Iesw": [["seconds"], " segundos"],
"U88xbi": ["No se pudo crear el archivo de esquema"],
"U8CD-l": ["Copiar ruta completa, sin espacio de trabajo"],
"UBv8UK": ["Eliminar definitivamente"],
@@ -2709,9 +2717,6 @@
"URmyfc": ["Detalles"],
"UTNVyS": ["Selecciona el documento de código completo."],
"UTZ97u": ["La selección debe estar dentro del proyecto"],
- "UVDasf": [
- "La sincronización está desactivada: tus ediciones se quedan en este equipo hasta que hagas commit y push a mano."
- ],
"UVLlMV": ["No se pudo contactar con GitHub. ¿Reintentar?"],
"UW2Fg3": [
"El servidor en marcha de este proyecto no admite edición en vivo. Reinicia OpenKnowledge para arreglarlo."
@@ -2754,6 +2759,7 @@
"UhpfxY": ["Desplazar a la izquierda"],
"UkQGhd": ["Ocultar reemplazar"],
"UlVARL": ["Activar Slidev"],
+ "Uo2Rj7": ["¿Activar Automático (Pull y Push)?"],
"Uobeu9": ["Añade la habilidad a ", ["rootRel"], ", que también lee ", ["0"]],
"Up2_7p": ["Copiar ruta completa"],
"UpCz01": ["Este documento"],
@@ -2855,6 +2861,7 @@
"Vftef5": [
"Problemas habituales de markdown: tabulaciones, saltos de nivel en los encabezados, marcadores de lista y más."
],
+ "Vl1H8I": ["Se requiere volver a conectar para seguir sincronizando."],
"Vlc75q": ["Mantener el archivo eliminado"],
"VmJT51": ["Cargando tus informes"],
"VmXASo": ["(enlace simbólico)"],
@@ -2892,6 +2899,7 @@
["rootPath"],
"</0>. Elige una ubicación fuera de él o abre ese proyecto."
],
+ "W7mERj": ["¿Activar Automático (solo Pull)?"],
"W8vpBM": ["paquete inicial"],
"W9NSe0": ["Comprobando enlaces"],
"W9_Bub": ["Los cambios locales se solapan con la sincronización entrante"],
@@ -2911,6 +2919,7 @@
" elementos seleccionados? Se eliminarán las carpetas y todos los archivos que contienen. Esta acción no se puede deshacer."
],
"WMsoIm": ["¿Ya iniciaste sesión?"],
+ "WOfp4H": ["No se pudo actualizar el intervalo de sincronización — ", ["detail"]],
"WOr-hW": ["tokens"],
"WPwDin": ["Abrir la carpeta en el disco"],
"WR0y2O": ["Compartir la carpeta"],
@@ -2929,6 +2938,7 @@
"Wcv-Zi": ["Haz que esta base de conocimiento esté disponible como habilidad de Claude."],
"We7h2I": ["📝 o assets/icon.png"],
"Weq9zb": ["General"],
+ "WfcERq": ["Nada que confirmar: el árbol de trabajo está limpio."],
"Wfy3rU": ["Ajustes del agente"],
"Wgmlsw": ["Obteniendo"],
"Wh0im4": ["editando [[", ["realCurrentDoc"], "]]"],
@@ -2982,7 +2992,6 @@
"XRuL0i": ["Crear página"],
"XSb9HS": ["Descartar las ediciones locales y restaurar la versión instalada"],
"XT-L4j": ["Activa un agente para crear con IA"],
- "XU0OXn": ["Activar la sincronización automática"],
"XU5AOg": ["Entrada"],
"XV5sC0": ["Abrir el worktree"],
"XW18jo": ["La respuesta de los encabezados de página no coincide con el esquema de éxito"],
@@ -3048,6 +3057,7 @@
"Xp7Kq4": ["Hay otra operación de sincronización en curso. Inténtalo de nuevo en un momento."],
"Xp94R1": ["Intentar una vez más"],
"XpIZmv": ["Bloque de código delimitado con texto monoespaciado."],
+ "Xs1kjx": ["Buscar actualizaciones cada"],
"Xs7IcT": ["No se pudo conectar con ", ["displayName"], ". ¿Reintentar?"],
"XszXjc": ["Se renombró a ", ["0"]],
"XtRoxT": ["Página ", ["pageNumber"]],
@@ -3082,6 +3092,7 @@
"Los complementos de análisis (qué familias de reglas se ejecutan y sus ajustes por regla) se configuran en su propia pestaña, en Este proyecto → Complementos."
],
"YEP3X2": ["Elimina una tabla cuando la selección de celdas activa cubre la tabla entera."],
+ "YEzhIr": ["Pull y Push"],
"YGIi_c": ["Reinstalar"],
"YGNRB5": ["— excepto"],
"YGt-0e": ["Leyendo…"],
@@ -3128,17 +3139,6 @@
"Se aplica a este proyecto solo en este equipo. Se guarda en .ok/local y no se comparte mediante git."
],
"Yp-Hi_": ["Abrir los ajustes"],
- "YsEYYS": [
- [
- "behind",
- "plural",
- {
- "one": ["#", " commit por detrás"],
- "many": ["#", " commits por detrás"],
- "other": ["#", " commits por detrás"]
- }
- ]
- ],
"YvwwqC": ["Dónde"],
"YwPUUP": ["Este paquete ya está configurado aquí."],
"YxZDGh": [
@@ -3247,7 +3247,6 @@
"Zue_jx": [
"A tu token de GitHub le faltan ámbitos obligatorios. Prueba a iniciar sesión de nuevo."
],
- "Zul8Ry": ["nunca"],
"ZvzbDF": ["Añádelo directamente a este proyecto."],
"ZwpggY": ["OpenKnowledge leyó la configuración del proyecto"],
"_0JUKX": ["Para informar de errores necesitas la aplicación de escritorio de OpenKnowledge."],
@@ -3386,9 +3385,6 @@
"ai40UJ": ["Nuevo récord · pulsa <0>Espacio</0> para jugar de nuevo"],
"aiArms": ["No pudimos clonar este repositorio."],
"aiOceC": ["Habilitar índices"],
- "ajHi4O": [
- "La sincronización automática está en pausa: no tienes permiso para hacer push a este repositorio. Cambia a Seguir para seguir recibiendo actualizaciones."
- ],
"ajz9F8": [
"No se pudo cargar el contenido del conflicto de ",
["filePath"],
@@ -3411,7 +3407,6 @@
"Los ajustes de vista previa de enlaces aún no se han cargado; inténtalo de nuevo en un momento"
],
"axQ1h6": ["¿Quieres añadir algo? (opcional)"],
- "az8lvo": ["Desactivado"],
"b18t0_": ["Cerrar diferencias"],
"b1FDss": ["Desplazar hasta el principio"],
"b2ezG_": ["Se conservaron ambos: \"", ["0"], "\" ahora es una habilidad aparte"],
@@ -3516,6 +3511,9 @@
],
"cH0dkG": ["Le faltaba una función que necesitaba"],
"cHhH3i": ["una herramienta de git necesaria"],
+ "cIFYZn": [
+ "Mientras tengas la sesión cerrada, las actualizaciones se buscan como mucho cada 3 minutos, independientemente de este ajuste."
+ ],
"cIptmH": ["En la aplicación Claude Desktop"],
"cKjLuT": ["(proyecto + usuario)"],
"cLP0Lf": ["Origen remoto de habilidades"],
@@ -3597,6 +3595,8 @@
"ct2kv5": ["No hay encabezados en ", ["pageTarget"]],
"cuA8QW": ["Organizar las especificaciones"],
"cuHhjo": ["Crear y editar"],
+ "cyoNqf": ["Sin fusionar"],
+ "czQDKY": ["Cada push es un commit en tu remoto."],
"d-GtJt": ["Ver en el Markdown de origen"],
"d1JjXo": [
"Tu copia local de la rama <0>",
@@ -3713,6 +3713,9 @@
"eGUbmF": ["Copiar el archivo o la carpeta seleccionados"],
"eJitUk": ["Subir desde el equipo"],
"eKThTQ": ["No se pudo reordenar"],
+ "eNOyTV": [
+ "No tienes permiso para hacer push en este repositorio. Automático (solo Pull) puede mantener tu copia al día."
+ ],
"eNQGRb": ["Fórmula LaTeX en línea renderizada con KaTeX."],
"eNhWUl": [
"Un revisor de PR, un redactor de notas de versión, una lista de comprobación de despliegue..."
@@ -3756,6 +3759,7 @@
"emMrXQ": ["El servidor devolvió una respuesta de duplicación con formato incorrecto."],
"emgiet": ["Contenido autoritativo; se replica literalmente allí donde se referencia."],
"enPTnx": ["línea ", ["displayLine"]],
+ "eolhcI": ["Leyendo el árbol de trabajo"],
"eps54V": ["Eliminado"],
"epuNYK": [
"Marca un bloque como fuente de verdad. Los espejos de otros sitios se actualizan en vivo mientras lo editas."
@@ -3763,9 +3767,6 @@
"erenF-": ["No se pueden eliminar archivos con conflictos sin resolver"],
"euGaS0": ["No se pudo leer ", ["fileName"], "."],
"euc6Ns": ["Duplicar"],
- "evHlIg": [
- "Seguir nunca hace push ni commit de tus cambios locales. Se quedan solo en este equipo."
- ],
"evs0iw": ["Etiquetas que coinciden con \"", ["tagListQuery"], "\""],
"ewSbS_": ["Sesión de shell"],
"ezUmoU": ["Valores de elemento permitidos (vacío = cualquiera)"],
@@ -3865,7 +3866,6 @@
}
]
],
- "g2Tj8R": ["Completo"],
"g3UF2V": ["Aceptar"],
"g4WlQK": [
"La gestión de herramientas de IA del proyecto solo está disponible en la aplicación de escritorio de OpenKnowledge."
@@ -3883,7 +3883,6 @@
["display"],
". Esa carpeta se convierte en un enlace simbólico a esta, así que su agente lee todo lo que pongas aquí. Esta carpeta sigue siendo real. Si hay habilidades en conflicto, la fusión se cancela."
],
- "g85bAo": ["Sincronizado ", ["lastSyncedRelative"]],
"g9Nj4l": ["// nota"],
"gAhHu7": [
"El arreglo automático solo se aplica a los problemas con un arreglo mecánico conocido."
@@ -3961,6 +3960,7 @@
"Este documento todavía no se ha sincronizado con GitHub. El enlace funcionará tras la próxima sincronización."
],
"gyHDWC": ["Arreglarlo todo con IA (", ["count"], ")"],
+ "gyYvCN": ["Enviar mis ediciones cada"],
"h-AdvS": ["Las carpetas y las plantillas ya están aquí, así que no hay nada que añadir."],
"h06R3C": ["No hay páginas sin enlaces salientes en el grafo."],
"h16FyT": ["Listas"],
@@ -4040,9 +4040,6 @@
"Una línea con una nota al pie<0><1>[1]</1></0> y una definición que se muestra abajo."
],
"hxEUVJ": ["Inicializar ", ["selectedPackName"]],
- "hxYFzm": [
- "Sincronización completa: tus commits se suben y los cambios remotos se descargan automáticamente."
- ],
"hxnF0I": ["Propiedades de ", ["0"]],
"hyCxJY": ["Abrir ese worktree en su lugar"],
"hynz2K": ["Descarga iniciada"],
@@ -4057,7 +4054,6 @@
"i09An-": ["Se restauró una versión anterior (", ["0"], ")"],
"i1flq_": ["Sugerencias de enlaces wiki"],
"i3f2kh": ["Ningún comando coincide."],
- "i6ng22": ["Cambiar a Seguir"],
"i92eAT": ["Crearemos un repositorio y empezaremos a sincronizar; no hace falta terminal."],
"i94lQe": ["OpenKnowledge buscó conflictos"],
"i9OyGp": ["Deshacer o rehacer"],
@@ -4151,13 +4147,11 @@
],
"iqugog": ["Falló la inicialización: ", ["errorDetail"]],
"irFGwu": ["Lista de plantillas"],
+ "irnKr_": ["Actualizado ", ["updatedRelative"]],
"irrm_E": ["Quitar la selección"],
"isRobC": ["Nuevo"],
"iuTKci": ["Todavía no hay ediciones."],
"iv452l": ["Documentación de ", ["0"], " (se abre en el navegador)"],
- "iy64Li": [
- "Sincronización completa: tus ediciones se confirman y se suben a tu remoto automáticamente."
- ],
"iycx_A": ["Haciendo push"],
"iz1LdD": [
"Se modificó fuera de OK desde la última vez que escribió aquí; el estado que se muestra es el que hay ahora en el disco"
@@ -4211,6 +4205,7 @@
"jTLWxh": [
"Incrusta una página externa en un iframe en línea (documentación, demos, Figma, CodeSandbox)."
],
+ "jTUxaN": ["Activar Automático (solo Pull)"],
"jWzDfC": ["Comprobando qué herramientas de IA tienes"],
"jZ_E5M": ["Falló el fetch: consulta los registros del servidor para ver los detalles."],
"j_Z6g7": ["Valor compartido por defecto"],
@@ -4303,13 +4298,15 @@
"Apunta la búsqueda semántica a cualquier endpoint de embeddings compatible con OpenAI: un servidor propio u otro proveedor. La clave de API de arriba vale para el endpoint que definas aquí."
],
"kSiB3X": ["No se pudo mover a la ", ["trashNoun"]],
- "kUn-CN": ["Sincronización desactivada"],
"kV2YZv": [
"¿No ves <0>Habilidades</0>? Activa antes <1>Ajustes <2/> Capacidades <3/> Ejecución de código y creación de archivos</1>."
],
"kVS5tE": ["¿Mantener índices generados en cada carpeta?"],
"kVgQUA": ["¿Eliminar este chat?"],
"kVzuTI": ["Habilidad de agente recomendada"],
+ "kXNv8P": [
+ "Automático (solo Pull) nunca hace push ni confirma tus cambios locales. Se quedan solo en esta máquina."
+ ],
"kYL1lH": ["Actividad del agente"],
"k_Dqw1": [
[
@@ -4406,6 +4403,7 @@
"lM4c-I": [
"Una ruta dentro de la habilidad; cualquier carpeta sirve (p. ej. references/notes.md). Las carpetas de la ruta se crean automáticamente."
],
+ "lPkjpD": ["Enviado ", ["pushed"]],
"lPzyrU": ["Todos los fragmentos resueltos"],
"lS83Sg": ["No se pudo acceder al portapapeles."],
"lScd1O": [
@@ -4767,6 +4765,7 @@
"pJ7XCo": ["Esta página no hace referencia a ningún archivo o imagen local."],
"pMPnZv": [["deleted"], " habilidades eliminadas"],
"pOo4Aa": ["Texto sin formato"],
+ "pPiV8s": ["Activar Automático (Pull y Push)"],
"pSimwP": ["Nombre nuevo para la versión de ", ["editor"]],
"pTPqMK": ["Activa o desactiva un bloque de código delimitado."],
"pTyA_t": ["etiquetas"],
@@ -4844,6 +4843,7 @@
"qAx7xG": ["Carpeta fija en la raíz del contenido"],
"qBi_YG": ["Instalar OpenKnowledge en tus herramientas de IA"],
"qC7PwZ": ["No se pudo eliminar el campo"],
+ "qD3krc": ["Nada se mueve hasta que lo pidas."],
"qEEfPk": ["Informe de error ", ["0"]],
"qEIFZu": ["Clave terminada en ", ["keyHint"]],
"qEue6Q": [" o "],
@@ -4852,6 +4852,9 @@
"qIJIrD": ["Probando"],
"qJSo0_": ["¿Qué diferencia hay entre las copias y los enlaces simbólicos?"],
"qKMfPp": ["Ocultar los nodos de habilidades"],
+ "qLXJTB": [
+ "Mantén este proyecto sincronizado con tu remoto de git. Automático (solo Pull) trae actualizaciones sin hacer push; Automático (Pull y Push) también envía tus ediciones. Activar la sincronización automática requiere confirmación."
+ ],
"qNOgUu": [
"Las ediciones hechas en el origen llegan aquí: sin desviaciones por copiar y pegar."
],
@@ -4871,7 +4874,6 @@
"qXg5W9": ["El archivo se guarda en <0>~/Downloads/openknowledge.skill</0>."],
"qXsafh": ["Publicar en GitHub"],
"qZv5ZR": ["No se pudo cambiar la compartición de la configuración"],
- "q_9EcE": ["¿Activar la sincronización automática de git?"],
"q_Q1-i": [
[
"count",
@@ -4979,7 +4981,6 @@
["boldName"],
", una habilidad integrada que viene con Open Knowledge. Es de solo lectura."
],
- "rn7n0G": ["Reanudar la sincronización"],
"rnX-1S": ["Activar los complementos"],
"rnrdEX": ["principal"],
"roAe2K": ["URL del enlace"],
@@ -5029,6 +5030,7 @@
"sJK6pq": ["Permiso denegado"],
"sJWhgo": ["Componente desconocido: ", ["unregisteredComponentName"]],
"sKEgGd": ["Enviar al chat"],
+ "sKHiNR": [["count"], " por detrás"],
"sNeKjP": ["No se pudo guardar el token: inténtalo de nuevo"],
"sOxZaS": ["No se pudo cargar el grafo"],
"sQoLn0": ["Salir"],
@@ -5052,6 +5054,7 @@
"scyoP9": [
"Los documentos de índice no llevan frontmatter, salvo el que está en la raíz de tu base de conocimiento. Los documentos de registro no están incluidos: OKF no limita su frontmatter."
],
+ "sdvHp3": ["Cambiados aquí y en el remoto"],
"se-tU0": ["No se pudieron corregir ", ["0"], " de ", ["total"], " archivos."],
"seeS6l": ["¿Configurar OpenKnowledge en esta carpeta?"],
"sgmRY8": ["Se omitió la descarga de ", ["0"], "."],
@@ -5075,6 +5078,9 @@
"snrVQ7": ["falló la comprobación"],
"sq4WQH": ["Usar ", ["0"], " como tema claro"],
"sqUrlK": ["Cavilando…"],
+ "srdlOs": [
+ "La sincronización automática está en pausa: no tienes permiso para hacer push en este repositorio. Cambia a Automático (solo Pull) para seguir recibiendo actualizaciones."
+ ],
"ssk6rl": [
"La carpeta propia de la habilidad (",
["path"],
@@ -5096,12 +5102,14 @@
"Fila en línea al estilo Notion para un archivo descargable. También funciona arrastrar y soltar."
],
"t18QYR": ["Dejar de fijar ", ["accessibleLabel"]],
- "t2TkQ3": ["Sincronización en pausa: resuelve los conflictos para reanudarla."],
"t4sFKC": [
"La rama nueva <0>",
["trimmed"],
"</0> se creará a partir del commit actual, en su propio worktree dentro de <1>.ok/worktrees/</1>."
],
+ "t5I7P_": [
+ "Nada se mueve hasta que lo pidas: usa Pull y Push desde el menú de sincronización."
+ ],
"t6w1cq": ["Abre una pestaña de editor en blanco."],
"t7YoBO": ["Enviar este comentario"],
"t9Qn8y": ["No hay agentes activados"],
@@ -5146,6 +5154,7 @@
["alreadyImported"],
" ya estaban)"
],
+ "tlGXxX": ["Automático (solo Pull)"],
"tnG-m6": ["La sincronización automática está en pausa: inicia sesión para reanudarla."],
"toyw51": ["Controles del diagrama de Mermaid"],
"tqQBwN": ["Los scripts se muestran para que los revises; nunca se ejecutan."],
@@ -5178,6 +5187,7 @@
"u779EG": ["Usa un origen http:// o https://."],
"u7H-Wn": ["Mostrar el panel (", ["panelShortcutLabel"], ")"],
"u7U_Ij": ["Enlaza el texto seleccionado o edita el enlace bajo el cursor."],
+ "uAQUqI": ["Estado"],
"uA_jXp": ["Cambiar de rama y actualizar"],
"uBAxNB": ["Editor"],
"uCaIdy": [
@@ -5208,9 +5218,6 @@
"No se pudo reiniciar el servidor: se está ejecutando con otra cuenta. Reinicia el equipo para liberarlo y vuelve a abrir este proyecto."
],
"uUCrBv": ["enlace simbólico"],
- "uUiiyC": [
- "No tienes permiso para hacer push a este repositorio. Seguir puede mantener tu copia al día igualmente."
- ],
"uVbUP8": ["Ajustes…"],
"uY5Z7P": ["Fin del juego · pulsa <0>Espacio</0> para jugar de nuevo"],
"uYZTcW": ["No se puede compartir esta URL de GitHub."],
@@ -5261,6 +5268,7 @@
"v15iQB": [
"El contrato de cálculo certificado. Solo se aplica a documentos de tipo Attested Computation, para los que OKF requiere un runtime; los conceptos normales no se ven afectados."
],
+ "v16Pzh": ["Cambiar a Automático (solo Pull)"],
"v2ZW0K": ["Activar la terminal"],
"v2a04T": ["Reglas de markdownlint"],
"v41fCm": ["No se encontró el archivo"],
@@ -5285,6 +5293,7 @@
"Las actualizaciones del origen se aplican automáticamente (salvo que se haya editado en local)"
],
"vGeNNQ": ["Copia un prompt y pégalo en tu agente para configurar tu proyecto."],
+ "vGjmyl": ["Eliminado"],
"vHlhDc": ["Haz doble clic para editar"],
"vIxrEk": ["Ajustar al ancho"],
"vLyv1R": ["Ocultar"],
@@ -5356,8 +5365,10 @@
}
]
],
+ "vp5vfW": ["1 hora"],
"vppAju": ["Dónde se colocan los adjuntos recién añadidos."],
"vqJXNe": ["Instalar la habilidad <0>open-knowledge-discovery</0>"],
+ "vsFXfP": ["Push omite"],
"vv7kpg": ["Cancelado"],
"vvWZnu": ["No hay diferencias disponibles"],
"vwV-kH": ["La corrección de archivos se detuvo inesperadamente."],
@@ -5428,6 +5439,11 @@
"wdzBgi": ["Compartir configuración ahora está en Solo yo."],
"weP6me": ["No se pudieron cargar los documentos: escribe @ otra vez para reintentarlo"],
"wgNoIs": ["Seleccionar todo"],
+ "wk_v1X": [
+ "La sincronización de este worktree está en Automático (Pull y Push), heredada de ",
+ ["project"],
+ ". Cámbiala en Ajustes → Sincronización."
+ ],
"wlwXUk": [
"Elegiste ~/Downloads. Los archivos de ahí suelen ser pasajeros; plantéate una carpeta más estable."
],
@@ -5473,6 +5489,7 @@
"xDEcka": [
"El proveedor está limitando la frecuencia de esta clave. Inténtalo de nuevo en un momento."
],
+ "xDKOFk": ["Ignorado"],
"xEb24l": ["Permítenos escribirte por correo"],
"xFQRu4": ["Ya lo tengo en local"],
"xG4tb6": ["Se perdió la conexión con \"", ["docName"], "\"."],
@@ -5484,6 +5501,7 @@
"xOTzt5": ["ahora mismo"],
"xSVO3J": ["Qué se crea"],
"xV5sXw": ["hace ", ["0"], " sem"],
+ "xW5AUw": ["Traído ", ["pulled"]],
"xWEvuo": ["Preguntar a la IA"],
"xWomUD": ["Usar la versión de ", ["editor"]],
"xXo8FT": ["Falló al guardar: ", ["error"]],
@@ -5647,6 +5665,7 @@
"zAJzIg": ["Problemas en ", ["0"]],
"zAsDLY": ["Visualización en grafo de los enlaces entre documentos"],
"zBUqvf": ["Configurar las integraciones de OpenKnowledge…"],
+ "zBiFZh": ["Tus ediciones se confirman y se envían a tu remoto automáticamente."],
"zC5jrM": ["Se creará como <0>", ["effective"], "</0>"],
"zD1Nqf": [
[
@@ -5669,6 +5688,7 @@
"zLak8b": ["Activar pestaña nueva"],
"zMmwh4": ["Elige un tema o crea el tuyo."],
"zQBg2C": ["Sube o baja una posición el bloque actual."],
+ "zWZBPx": ["Tipo cambiado"],
"zXj1rA": ["Buscar por significado"],
"zYp8Sr": [
"La etiqueta <0>Modificada</0> marca las reglas que tu configuración define de forma explícita, directamente o heredadas mediante <1>extends</1>. Las reglas sin marcar conservan su estado por defecto."
@@ -5711,7 +5731,6 @@
". ¿Eliges una carpeta clonada desde ",
["expectedHost"],
"?"
- ],
- "zz_Wd_": ["Modo"]
+ ]
}
}
diff --git a/packages/app/src/locales/es/messages.po b/packages/app/src/locales/es/messages.po
index 57ae0ca05..7e2a1d25f 100644
--- a/packages/app/src/locales/es/messages.po
+++ b/packages/app/src/locales/es/messages.po
@@ -517,10 +517,6 @@ msgstr "{ahead} por delante, {behind} por detrás"
msgid "{basename} — text editor"
msgstr "{basename} — editor de texto"
-#: src/components/SyncStatusBadge.tsx
-msgid "{behind, plural, one {# commit behind} other {# commits behind}}"
-msgstr "{behind, plural, one {# commit por detrás} many {# commits por detrás} other {# commits por detrás}}"
-
#: src/components/SyncStatusBadge.tsx
msgid "{behind} behind"
msgstr "{behind} por detrás"
@@ -616,6 +612,14 @@ msgstr "{count, plural, one {Arregla al instante el # problema que tiene un arre
msgid "{count, plural, one {matches # file} other {matches # files}}"
msgstr "{count, plural, one {coincide con # archivo} many {coincide con # archivos} other {coincide con # archivos}}"
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} ahead"
+msgstr "{count} por delante"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} behind"
+msgstr "{count} por detrás"
+
#: src/components/SkillBulkDeleteDialog.tsx
msgid "{count} skills"
msgstr "{count} habilidades"
@@ -811,14 +815,11 @@ msgstr "{localizedMessage} en la línea {displayLine}"
msgid "{mins, plural, one {# min ago} other {# min ago}}"
msgstr "{mins, plural, one {hace # min} many {hace # min} other {hace # min}}"
-#: src/components/SyncStatusBadge.tsx
-msgid "{minutes} min ago"
-msgstr "hace {minutes} min"
-
#: src/components/acp/ThreadHistoryMenu.tsx
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "{minutes}m ago"
msgstr "hace {minutes} min"
@@ -910,6 +911,10 @@ msgstr "{propertyCount, plural, one {# propiedad} many {# propiedades} other {#
msgid "{propPanelDescriptorLabel} Properties"
msgstr "Propiedades de {propPanelDescriptorLabel}"
+#: src/components/settings/SyncSection.tsx
+msgid "{seconds} seconds"
+msgstr "{seconds} segundos"
+
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
@@ -1127,6 +1132,26 @@ msgstr "📝 o assets/icon.png"
msgid "0/0"
msgstr "0/0"
+#: src/components/settings/SyncSection.tsx
+msgid "1 hour"
+msgstr "1 hora"
+
+#: src/components/settings/SyncSection.tsx
+msgid "1 minute"
+msgstr "1 minuto"
+
+#: src/components/settings/SyncSection.tsx
+msgid "15 minutes"
+msgstr "15 minutos"
+
+#: src/components/settings/SyncSection.tsx
+msgid "30 seconds"
+msgstr "30 segundos"
+
+#: src/components/settings/SyncSection.tsx
+msgid "5 minutes"
+msgstr "5 minutos"
+
#: src/components/ImportSkillForm.tsx
msgid "A .zip or .skill archive."
msgstr "Un archivo .zip o .skill."
@@ -1521,6 +1546,7 @@ msgstr "Añade tus comentarios a este mensaje"
#: src/components/PropertyDiffBlock.tsx
#: src/components/SkillDirectoryResult.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Added"
msgstr "Añadido"
@@ -1565,11 +1591,13 @@ msgstr "Añade estos archivos"
msgid "Adds these folders"
msgstr "Añade estas carpetas"
+#: src/components/settings/SyncSection.tsx
#: src/editor/components/PropPanel.tsx
msgid "Advanced"
msgstr "Avanzado"
#: src/components/ConsentDialogBody.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Advanced settings"
msgstr "Ajustes avanzados"
@@ -1979,6 +2007,24 @@ msgstr "Contenido autoritativo; se replica literalmente allí donde se referenci
msgid "Authorize in browser"
msgstr "Autorizar en el navegador"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull and Push)"
+msgstr "Automático (Pull y Push)"
+
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull only)"
+msgstr "Automático (solo Pull)"
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
+msgstr "Automático (solo Pull) obtiene actualizaciones de tu repositorio git remoto y avanza tu copia automáticamente. Tus ediciones locales se quedan en este equipo y nunca se envían."
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) never pushes or commits your local changes. They stay only on this machine."
+msgstr "Automático (solo Pull) nunca hace push ni confirma tus cambios locales. Se quedan solo en esta máquina."
+
#: src/components/settings/TerminalSection.tsx
msgid "Auto-approve settings not yet loaded — try again in a moment"
msgstr "Los ajustes de aprobación automática aún no se han cargado; inténtalo de nuevo en un momento"
@@ -2012,21 +2058,13 @@ msgstr "El arreglo automático solo se aplica a los problemas con un arreglo mec
msgid "Auto-save"
msgstr "Guardado automático"
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is off for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "La sincronización automática está desactivada en este worktree, heredado de {project}. Cámbialo en Ajustes → Sincronización."
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "La sincronización automática está activada en este worktree, heredado de {project}. Cámbialo en Ajustes → Sincronización."
-
#: src/components/settings/SyncSection.tsx
msgid "Auto-sync is paused — sign in to resume."
msgstr "La sincronización automática está en pausa: inicia sesión para reanudarla."
#: src/components/settings/SyncSection.tsx
-msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Follow to keep receiving updates."
-msgstr "La sincronización automática está en pausa: no tienes permiso para hacer push a este repositorio. Cambia a Seguir para seguir recibiendo actualizaciones."
+msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Auto (Pull only) to keep receiving updates."
+msgstr "La sincronización automática está en pausa: no tienes permiso para hacer push en este repositorio. Cambia a Automático (solo Pull) para seguir recibiendo actualizaciones."
#: src/components/AutoSyncEnableWarning.tsx
msgid "Auto-sync periodically fetches, pulls, and pushes commits to your remote git repository so your edits stay in sync across machines."
@@ -2424,9 +2462,14 @@ msgid "Change the embeddings provider?"
msgstr "¿Cambiar el proveedor de embeddings?"
#: src/components/PropertyDiffBlock.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Changed"
msgstr "Modificado"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Changed here and on the remote"
+msgstr "Cambiados aquí y en el remoto"
+
#: src/components/ChangedOutsideBadge.tsx
msgid "changed outside"
msgstr "modificado fuera"
@@ -2451,6 +2494,10 @@ msgstr "Los cambios se guardaron automáticamente."
msgid "Check for updates"
msgstr "Buscar actualizaciones"
+#: src/components/settings/SyncSection.tsx
+msgid "Check for updates every"
+msgstr "Buscar actualizaciones cada"
+
#: src/components/AppMenubar.tsx
msgid "Check for updates…"
msgstr "Buscar actualizaciones…"
@@ -2970,6 +3017,10 @@ msgstr "Comenta o pregunta a la IA sobre este bloque de código"
msgid "Comments"
msgstr "Comentarios"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Commit and sync"
+msgstr "Confirmar y sincronizar"
+
#: src/components/ShareBranchSwitchDialog.tsx
msgid "Commit or stash changes to switch:"
msgstr "Haz commit o stash de tus cambios para cambiar:"
@@ -3271,6 +3322,7 @@ msgstr "Convirtiendo..."
#: src/components/empty-state/CopyablePromptList.tsx
#: src/components/InstallInClaudeDesktopDialog.tsx
+#: src/components/SyncStatusBadge.tsx
#: src/editor/extensions/CodeBlockView.tsx
msgid "Copied"
msgstr "Copiado"
@@ -3886,6 +3938,10 @@ msgstr "No se pudieron leer los comentarios pendientes de envío; no se envió n
msgid "Couldn't read the comments waiting to send: {0}"
msgstr "No se pudieron leer los comentarios pendientes de envío: {0}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Couldn't read the working tree. Check the server logs."
+msgstr "No se pudo leer el árbol de trabajo. Revisa los registros del servidor."
+
#. placeholder {0}: warning.code
#: src/components/settings/SavedThemesTiles.tsx
msgid "Couldn’t read this theme ({0})"
@@ -4459,6 +4515,10 @@ msgstr "¿Eliminar este chat?"
msgid "Delete this comment"
msgstr "Eliminar este comentario"
+#: src/components/SyncStatusBadge.tsx
+msgid "Deleted"
+msgstr "Eliminado"
+
#. placeholder {0}: deletedTheme.label
#: src/components/settings/SavedThemesTiles.tsx
msgid "Deleted {0}."
@@ -4554,6 +4614,10 @@ msgstr "tokens de descripción"
msgid "Design"
msgstr "Diseño"
+#: src/components/SyncStatusBadge.tsx
+msgid "detached HEAD"
+msgstr "HEAD desacoplado"
+
#: src/components/SyncStatusBadge.tsx
msgid "Detached HEAD — checkout a branch to resume"
msgstr "HEAD desacoplado: extrae una rama para continuar"
@@ -4926,6 +4990,10 @@ msgstr "Cada herramienta de IA lee las habilidades desde su propia carpeta. Apun
msgid "Each pack scaffolds your project with ready-made folders and templates."
msgstr "Cada paquete prepara tu proyecto con carpetas y plantillas ya hechas."
+#: src/components/settings/SyncSection.tsx
+msgid "Each push is one commit to your remote."
+msgstr "Cada push es un commit en tu remoto."
+
#: src/components/AppMenubar.tsx
#: src/components/settings/LintingSection.tsx
#: src/components/SkillsTree.tsx
@@ -5174,25 +5242,25 @@ msgstr "Habilitar {id}"
#: src/components/EnableSyncConfirmDialog.tsx
#: src/components/share-receive-miss-content.tsx
#: src/components/ShareFreshnessWarning.tsx
-msgid "Enable auto-sync"
-msgstr "Activar la sincronización automática"
+msgid "Enable Auto (Pull and Push)"
+msgstr "Activar Automático (Pull y Push)"
-#: src/components/settings/LinkPreviewsSection.tsx
-msgid "Enable external link previews"
-msgstr "Activar la vista previa de enlaces externos"
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Enable Auto (Pull and Push)?"
+msgstr "¿Activar Automático (Pull y Push)?"
#: src/components/AutoSyncOnboardingDialog.tsx
#: src/components/EnableSyncConfirmDialog.tsx
-msgid "Enable Follow"
-msgstr "Activar Seguir"
+msgid "Enable Auto (Pull only)"
+msgstr "Activar Automático (solo Pull)"
#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable Follow?"
-msgstr "¿Activar Seguir?"
+msgid "Enable Auto (Pull only)?"
+msgstr "¿Activar Automático (solo Pull)?"
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable git auto-sync?"
-msgstr "¿Activar la sincronización automática de git?"
+#: src/components/settings/LinkPreviewsSection.tsx
+msgid "Enable external link previews"
+msgstr "Activar la vista previa de enlaces externos"
#: src/components/settings/LintingSection.tsx
msgid "Enable indexes"
@@ -5788,6 +5856,10 @@ msgstr "No se pudo actualizar el proveedor de embeddings — {detail}"
msgid "Failed to update the project sync default — {detail}"
msgstr "No se pudo actualizar la sincronización por defecto del proyecto — {detail}"
+#: src/components/settings/SyncSection.tsx
+msgid "Failed to update the sync interval — {detail}"
+msgstr "No se pudo actualizar el intervalo de sincronización — {detail}"
+
#: src/components/FileTree.tsx
msgid "Failed to upload file"
msgstr "No se pudo subir el archivo"
@@ -6047,28 +6119,6 @@ msgstr "Se copió el enlace para compartir la carpeta."
msgid "Folder target: {linkTitle}. Click to open the overview."
msgstr "Carpeta de destino: {linkTitle}. Haz clic para abrir la vista general."
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow"
-msgstr "Seguir"
-
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow — updates flow in from your remote; your edits stay on this computer."
-msgstr "Seguir: las actualizaciones llegan desde tu remoto; tus ediciones se quedan en este equipo."
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
-msgstr "Seguir obtiene las actualizaciones de tu repositorio git remoto y avanza tu copia automáticamente. Tus ediciones locales se quedan en este equipo y nunca se suben."
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Follow is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "Seguir está activado en este worktree, heredado de {project}. Cámbialo en Ajustes → Sincronización."
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow never pushes or commits your local changes. They stay only on this machine."
-msgstr "Seguir nunca hace push ni commit de tus cambios locales. Se quedan solo en este equipo."
-
#: src/components/acp/ThreadView.tsx
msgid "Follow the agent's edits"
msgstr "Seguir las ediciones del agente"
@@ -6159,11 +6209,6 @@ msgstr "El frontmatter con el que empieza cada documento creado a partir de esta
msgid "Frontmatter schemas"
msgstr "Esquemas de frontmatter"
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Full"
-msgstr "Completo"
-
#: src/components/InstallInClaudeDesktopDialog.tsx
msgid "Full guide"
msgstr "Guía completa"
@@ -6177,14 +6222,6 @@ msgstr "Ruta completa"
msgid "Full Path"
msgstr "Ruta completa"
-#: src/components/settings/SyncSection.tsx
-msgid "Full sync — your commits push and remote changes pull automatically."
-msgstr "Sincronización completa: tus commits se suben y los cambios remotos se descargan automáticamente."
-
-#: src/components/SyncStatusBadge.tsx
-msgid "Full sync — your edits are committed and pushed to your remote automatically."
-msgstr "Sincronización completa: tus ediciones se confirman y se suben a tu remoto automáticamente."
-
#: src/components/OkBlobRunner.tsx
msgid "Game over · press <0>Space</0> to play again"
msgstr "Fin del juego · pulsa <0>Espacio</0> para jugar de nuevo"
@@ -6243,6 +6280,7 @@ msgid "Git needs a helper tool (such as git-lfs) that isn't installed or couldn'
msgstr "Git necesita una herramienta auxiliar (como git-lfs) que no está instalada o no se ha encontrado. Instálala y vuelve a intentarlo."
#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Git sync"
msgstr "Sincronización con git"
@@ -6620,6 +6658,10 @@ msgstr "¿Cómo funciona compartir?"
msgid "How missing project-local documents, files, and images are reported in Problems, editor diagnostics, audits, and agent tools."
msgstr "Cómo se notifican los documentos, archivos e imágenes locales del proyecto que faltan en Problemas, los diagnósticos del editor, las auditorías y las herramientas de agentes."
+#: src/components/settings/SyncSection.tsx
+msgid "How often this computer pulls changes from your remote."
+msgstr "Con qué frecuencia este equipo trae cambios de tu remoto."
+
#: src/components/ShareFreshnessWarning.tsx
msgid "How to push manually"
msgstr "Cómo hacer push manualmente"
@@ -6705,6 +6747,10 @@ msgstr "Patrones de exclusión"
msgid "Ignore patterns (raw text)"
msgstr "Patrones de exclusión (texto sin formato)"
+#: src/components/SyncStatusBadge.tsx
+msgid "Ignored"
+msgstr "Ignorado"
+
#: src/components/LinksPanel.tsx
msgid "Image {identity}. Go to reference."
msgstr "Imagen {identity}. Ir a la referencia."
@@ -7301,8 +7347,8 @@ msgid "Keep the name to 64 characters or fewer."
msgstr "El nombre debe tener 64 caracteres o menos."
#: src/components/settings/SyncSection.tsx
-msgid "Keep this project in sync with your git remote. Follow fetches updates without pushing; full sync pushes your commits too. Turning sync on requires confirmation."
-msgstr "Mantén este proyecto sincronizado con tu remoto de git. Seguir obtiene actualizaciones sin hacer push; la sincronización completa también sube tus commits. Activar la sincronización requiere confirmación."
+msgid "Keep this project in sync with your git remote. Auto (Pull only) brings in updates without pushing; Auto (Pull and Push) sends your edits too. Turning auto-sync on requires confirmation."
+msgstr "Mantén este proyecto sincronizado con tu remoto de git. Automático (solo Pull) trae actualizaciones sin hacer push; Automático (Pull y Push) también envía tus ediciones. Activar la sincronización automática requiere confirmación."
#: src/lib/pack-copy.ts
msgid "Keep track of the people and companies you work with and the meetings you have with them. Good for remembering who someone is, how you know them, and what you last talked about."
@@ -7782,6 +7828,11 @@ msgstr "La gestión de herramientas de IA no está disponible en esta compilaci
msgid "Managing project AI tools is unavailable in this build."
msgstr "La gestión de herramientas de IA del proyecto no está disponible en esta compilación."
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Manual"
+msgstr "Manual"
+
#: src/components/empty-state/use-create-suggestions.ts
msgid "Map the architecture"
msgstr "Trazar la arquitectura"
@@ -7920,10 +7971,6 @@ msgstr "Faltan colores de la paleta"
msgid "Missing theme name"
msgstr "Falta el nombre del tema"
-#: src/components/SyncStatusBadge.tsx
-msgid "Mode"
-msgstr "Modo"
-
#: src/components/settings/SearchSection.tsx
msgid "Model"
msgstr "Modelo"
@@ -7940,6 +7987,7 @@ msgstr "Esfuerzo predeterminado del modelo"
#: src/components/FolderOverview.tsx
#: src/components/settings/markdownlint-rule-browser.tsx
#: src/components/SkillOriginInline.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Modified"
msgstr "Modificado"
@@ -8232,10 +8280,6 @@ msgstr "Error de red durante la limpieza"
msgid "Network settings not yet loaded. Try again in a moment."
msgstr "La configuración de red aún no se ha cargado. Vuelve a intentarlo en un momento."
-#: src/components/SyncStatusBadge.tsx
-msgid "never"
-msgstr "nunca"
-
#: src/components/FolderOverview.tsx
#: src/editor/tag-suggestion/TagSuggestionMenu.tsx
msgid "New"
@@ -8850,10 +8894,22 @@ msgstr "nada ({0} no puede coincidir con un documento)"
msgid "nothing ({0} is not a valid pattern)"
msgstr "nada ({0} no es un patrón válido)"
+#: src/components/settings/SyncSection.tsx
+msgid "Nothing moves until you ask — pull and push from the sync menu."
+msgstr "Nada se mueve hasta que lo pidas: usa Pull y Push desde el menú de sincronización."
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing moves until you ask."
+msgstr "Nada se mueve hasta que lo pidas."
+
#: src/components/FolderPropertiesCard.tsx
msgid "Nothing set yet."
msgstr "Todavía no hay nada definido."
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing to commit — working tree clean."
+msgstr "Nada que confirmar: el árbol de trabajo está limpio."
+
#: src/components/BugReportSendToast.tsx
msgid "Nothing was uploaded. The report stays on this computer until you email it to us."
msgstr "No se subió nada. El informe permanece en este equipo hasta que nos lo envíes por correo."
@@ -8887,10 +8943,6 @@ msgstr "de {0}"
msgid "of {totalPages}"
msgstr "de {totalPages}"
-#: src/components/settings/SyncSection.tsx
-msgid "Off"
-msgstr "Desactivado"
-
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Off — external links show only their URL. No requests leave this computer."
msgstr "Desactivado: los enlaces externos solo muestran su URL. No sale ninguna solicitud de este equipo."
@@ -9645,6 +9697,10 @@ msgstr "Salientes"
msgid "Outline"
msgstr "Esquema"
+#: src/components/SyncStatusBadge.tsx
+msgid "Outside what Open Knowledge commits."
+msgstr "Fuera de lo que confirma Open Knowledge."
+
#: src/components/SkillCostValue.tsx
msgid "over the {budgetLabel} token budget"
msgstr "supera el presupuesto de tokens de {budgetLabel}"
@@ -9855,10 +9911,6 @@ msgstr "Error de sintaxis en el patrón: {message}"
msgid "Pattern warnings: {summary}"
msgstr "Advertencias del patrón: {summary}"
-#: src/components/SyncStatusBadge.tsx
-msgid "Pause sync"
-msgstr "Pausar la sincronización"
-
#: src/components/acp/ThreadView.tsx
msgid "pending"
msgstr "pendiente"
@@ -10252,10 +10304,26 @@ msgstr "Publicando..."
msgid "Pull"
msgstr "Pull"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull and Push"
+msgstr "Pull y Push"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull brings in"
+msgstr "Pull trae"
+
#: src/components/share-receive-miss-content.tsx
msgid "Pull latest changes"
msgstr "Traer los últimos cambios"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled}"
+msgstr "Traído {pulled}"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled} · pushed {pushed}"
+msgstr "Traído {pulled} · enviado {pushed}"
+
#: src/components/share-receive-miss-content.tsx
#: src/components/SyncStatusBadge.tsx
msgid "Pulling"
@@ -10281,10 +10349,26 @@ msgstr "Envía la rama {branch} a GitHub antes de compartir."
msgid "Push failed — check the server logs for details."
msgstr "Falló el push: consulta los registros del servidor para ver los detalles."
+#: src/components/SyncStatusBadge.tsx
+msgid "Push includes"
+msgstr "Push incluye"
+
+#: src/components/settings/SyncSection.tsx
+msgid "Push my edits every"
+msgstr "Enviar mis ediciones cada"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Push skips"
+msgstr "Push omite"
+
#: src/lib/share/run-share-action.ts
msgid "Push this branch to GitHub before sharing."
msgstr "Envía esta rama a GitHub antes de compartir."
+#: src/components/SyncStatusBadge.tsx
+msgid "Pushed {pushed}"
+msgstr "Enviado {pushed}"
+
#: src/components/SyncStatusBadge.tsx
msgid "Pushing"
msgstr "Haciendo push"
@@ -10358,6 +10442,10 @@ msgstr "Copia de solo lectura de un bloque MirrorSource de otro documento. Edít
msgid "Read-only file in the {name} skill"
msgstr "Archivo de solo lectura en la habilidad {name}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reading working tree"
+msgstr "Leyendo el árbol de trabajo"
+
#: src/components/acp/working-status.ts
msgid "Reading…"
msgstr "Leyendo…"
@@ -10411,6 +10499,10 @@ msgstr "Habilidad de agente recomendada"
msgid "Reconnect required"
msgstr "Hay que reconectar"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reconnect required to keep syncing."
+msgstr "Se requiere volver a conectar para seguir sincronizando."
+
#: src/presence/use-sync-toasts.ts
msgid "Reconnected"
msgstr "Reconectado"
@@ -10677,6 +10769,10 @@ msgstr "Renombrar la habilidad"
msgid "Rename succeeded but the sidebar may be out of date — refresh to resync"
msgstr "Se renombró correctamente, pero puede que la barra lateral esté desactualizada; actualízala para resincronizar"
+#: src/components/SyncStatusBadge.tsx
+msgid "Renamed"
+msgstr "Renombrado"
+
#. placeholder {0}: docLeaf(descriptor.from)
#. placeholder {1}: docLeaf(descriptor.to)
#: src/components/TimelinePanel.tsx
@@ -10828,7 +10924,6 @@ msgstr "Los repositorios que ya has clonado pueden seguir sincronizándose con l
#: src/components/CloneDialog.tsx
#: src/components/share-metadata-rows.tsx
#: src/components/SkillPreviewTab.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Repository"
msgstr "Repositorio"
@@ -10911,6 +11006,10 @@ msgstr "Redimensionar el panel de Habilidades"
msgid "Resolve conflict in your terminal"
msgstr "Resuelve el conflicto en tu terminal"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Resolve in terminal"
+msgstr "Resolver en la terminal"
+
#: src/components/FileTree.tsx
msgid "Resolve the conflict on {files} before deleting."
msgstr "Resuelve el conflicto en {files} antes de eliminar."
@@ -11026,10 +11125,6 @@ msgstr "Se restauró la versión de {0}"
msgid "Results capped — this workspace has more files than search can index. A missing file may be a cap artifact, not a typo."
msgstr "Resultados limitados: este espacio de trabajo tiene más archivos de los que la búsqueda puede indexar. Un archivo que falte puede deberse al límite, no a una errata."
-#: src/components/SyncStatusBadge.tsx
-msgid "Resume sync"
-msgstr "Reanudar la sincronización"
-
#: src/components/acp/ThreadView.tsx
msgid "Resuming the chat"
msgstr "Reanudando el chat"
@@ -11101,8 +11196,8 @@ msgid "Reverting"
msgstr "Revirtiendo"
#: src/components/SyncStatusBadge.tsx
-msgid "Review conflicts"
-msgstr "Revisar los conflictos"
+msgid "Review"
+msgstr "Revisar"
#: src/components/ReportBugDialogBody.tsx
msgid "Review your report"
@@ -12248,6 +12343,10 @@ msgstr "Slidev tardó demasiado en iniciarse. Inténtalo de nuevo."
msgid "Small section heading."
msgstr "Encabezado de sección pequeño."
+#: src/components/SyncStatusBadge.tsx
+msgid "Some files are not listed — the working tree has too many changes."
+msgstr "Algunos archivos no aparecen: el árbol de trabajo tiene demasiados cambios."
+
#: src/components/settings/SavedThemesTiles.tsx
msgid "Some saved themes aren’t shown because the theme folder exceeds the scan limit."
msgstr "Algunos temas guardados no se muestran porque la carpeta de temas supera el límite de análisis."
@@ -12439,6 +12538,10 @@ msgstr "Iniciando el agente…"
msgid "status"
msgstr "estado"
+#: src/components/SyncStatusBadge.tsx
+msgid "Status"
+msgstr "Estado"
+
#: src/components/SubscribeCard.tsx
#: src/components/SubscribeForm.tsx
msgid "Stay in the loop"
@@ -12586,8 +12689,8 @@ msgid "Switch to a branch to share."
msgstr "Cambia a una rama para compartir."
#: src/components/settings/SyncSection.tsx
-msgid "Switch to Follow"
-msgstr "Cambiar a Seguir"
+msgid "Switch to Auto (Pull only)"
+msgstr "Cambiar a Automático (solo Pull)"
#: src/components/command-palette-commands.ts
msgid "Switch worktree"
@@ -12626,7 +12729,6 @@ msgid "Symlinks the skill to {path}"
msgstr "Enlaza simbólicamente la habilidad a {path}"
#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Sync"
msgstr "Sincronización"
@@ -12635,10 +12737,6 @@ msgstr "Sincronización"
msgid "Sync & sharing"
msgstr "Sincronización y uso compartido"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync disabled"
-msgstr "Sincronización desactivada"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync failed — check the server logs for details."
msgstr "Falló la sincronización: consulta los registros del servidor para ver los detalles."
@@ -12647,13 +12745,21 @@ msgstr "Falló la sincronización: consulta los registros del servidor para ver
msgid "Sync is failing. See the sync status for details."
msgstr "La sincronización está fallando. Consulta el estado de sincronización para ver los detalles."
-#: src/components/settings/SyncSection.tsx
-msgid "Sync is off — your edits stay on this computer until you commit and push manually."
-msgstr "La sincronización está desactivada: tus ediciones se quedan en este equipo hasta que hagas commit y push a mano."
+#: src/components/SyncBlockingChanges.tsx
+msgid "Sync is paused. Commit these local edits to continue, or sort them out in a terminal."
+msgstr "La sincronización está en pausa. Confirma estas ediciones locales para continuar, o resuélvelas en una terminal."
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync is paused. Turn it back on to resume."
-msgstr "La sincronización está en pausa. Vuelve a activarla para reanudarla."
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull and Push) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "La sincronización de este worktree está en Automático (Pull y Push), heredada de {project}. Cámbiala en Ajustes → Sincronización."
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull only) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "La sincronización de este worktree está en Automático (solo Pull), heredada de {project}. Cámbiala en Ajustes → Sincronización."
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Manual for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "La sincronización de este worktree está en Manual, heredada de {project}. Cámbiala en Ajustes → Sincronización."
#: src/components/SyncStatusBadge.tsx
msgid "Sync mode"
@@ -12664,18 +12770,10 @@ msgstr "Modo de sincronización"
msgid "Sync now"
msgstr "Sincronizar ahora"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync off"
-msgstr "Sincronización desactivada"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync paused"
msgstr "Sincronización en pausa"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync paused — resolve conflicts to resume."
-msgstr "Sincronización en pausa: resuelve los conflictos para reanudarla."
-
#: src/hooks/use-no-push-permission-toast.ts
msgid "Sync paused — you don't have permission to push to this repo"
msgstr "Sincronización en pausa: no tienes permiso para hacer push a este repositorio"
@@ -12710,10 +12808,6 @@ msgstr "Estado de sincronización: {syncStateLabel} — identidad de git sin def
msgid "Synced"
msgstr "Sincronizado"
-#: src/components/SyncStatusBadge.tsx
-msgid "Synced {lastSyncedRelative}"
-msgstr "Sincronizado {lastSyncedRelative}"
-
#: src/components/TimelinePanel.tsx
msgid "Synced from disk"
msgstr "Sincronizado desde el disco"
@@ -12937,6 +13031,10 @@ msgstr "¡Gracias por el informe!"
msgid "That branch is already open in another worktree."
msgstr "Esa rama ya está abierta en otro worktree."
+#: src/components/SyncBlockingChanges.tsx
+msgid "That did not go through. Check the server logs and try again."
+msgstr "Eso no se completó. Revisa los registros del servidor e inténtalo de nuevo."
+
#: src/comments/reveal-comment.ts
msgid "That document didn't open in time. Try again once it has synced."
msgstr "Ese documento no se abrió a tiempo. Vuelve a intentarlo cuando se haya sincronizado."
@@ -13972,6 +14070,10 @@ msgstr "Escribe '/' para ver los comandos"
msgid "Type a query, then press <0>↵</0> to search your pages by meaning."
msgstr "Escribe una consulta y pulsa <0>↵</0> para buscar en tus páginas por significado."
+#: src/components/SyncStatusBadge.tsx
+msgid "Type changed"
+msgstr "Tipo cambiado"
+
#: src/editor/components/CodePreviewEditModal.tsx
msgid "Type to edit; <0>Cmd/Ctrl+Enter</0> saves, <1>Esc</1> cancels."
msgstr "Escribe para editar; <0>Cmd/Ctrl+Enter</0> guarda, <1>Esc</1> cancela."
@@ -14100,6 +14202,10 @@ msgstr "Desmarcar todos los comentarios"
msgid "Unmark every comment in {0}"
msgstr "Desmarcar todos los comentarios de {0}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Unmerged"
+msgstr "Sin fusionar"
+
#: src/editor/slash-command/items.tsx
msgid "Unordered list of items."
msgstr "Lista de elementos sin numerar."
@@ -14140,6 +14246,10 @@ msgstr "No se puede resolver la imagen {identity}. Ir a la referencia."
msgid "Untitled report"
msgstr "Informe sin título"
+#: src/components/SyncStatusBadge.tsx
+msgid "Untracked"
+msgstr "Sin seguimiento"
+
#: src/components/SyncStatusBadge.tsx
msgid "Up to date"
msgstr "Al día"
@@ -14187,8 +14297,8 @@ msgid "Updated \"{name}\" from {0}"
msgstr "Se actualizó \"{name}\" desde {0}"
#: src/components/SyncStatusBadge.tsx
-msgid "Updated {lastSyncedRelative}"
-msgstr "Actualizado {lastSyncedRelative}"
+msgid "Updated {updatedRelative}"
+msgstr "Actualizado {updatedRelative}"
#: src/components/FolderTimelineCard.tsx
msgid "updated folder properties"
@@ -14202,6 +14312,11 @@ msgstr "Actualizado a la versión {version}"
msgid "Updates flow in"
msgstr "Las actualizaciones llegan solas"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Updates flow in from your remote; your edits stay on this computer."
+msgstr "Las actualizaciones llegan desde tu remoto; tus ediciones se quedan en este equipo."
+
#: src/components/SkillOriginInline.tsx
msgid "Updates from the source apply automatically (unless edited locally)"
msgstr "Las actualizaciones del origen se aplican automáticamente (salvo que se haya editado en local)"
@@ -14654,6 +14769,10 @@ msgstr "¿Dónde debería vivir?"
msgid "Which skill"
msgstr "Qué habilidad"
+#: src/components/settings/SyncSection.tsx
+msgid "While you're signed out, updates are checked at most every 3 minutes regardless of this setting."
+msgstr "Mientras tengas la sesión cerrada, las actualizaciones se buscan como mucho cada 3 minutos, independientemente de este ajuste."
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "Whitespace"
msgstr "Espacios en blanco"
@@ -14830,8 +14949,8 @@ msgid "You don't have permission to push to this repo."
msgstr "No tienes permiso para hacer push a este repositorio."
#: src/components/settings/SyncSection.tsx
-msgid "You don't have permission to push to this repo. Follow can still keep your copy up to date."
-msgstr "No tienes permiso para hacer push a este repositorio. Seguir puede mantener tu copia al día igualmente."
+msgid "You don't have permission to push to this repo. Auto (Pull only) can still keep your copy up to date."
+msgstr "No tienes permiso para hacer push en este repositorio. Automático (solo Pull) puede mantener tu copia al día."
#: src/components/ShareFreshnessWarning.tsx
msgid "You don't have write access to this repo."
@@ -14903,6 +15022,11 @@ msgstr "Tu copia de la rama <0>{shareBranch}</0> tiene cambios que no están en
msgid "Your current version is saved first, so this is reversible."
msgstr "Tu versión actual se guarda primero, así que esto es reversible."
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Your edits are committed and pushed to your remote automatically."
+msgstr "Tus ediciones se confirman y se envían a tu remoto automáticamente."
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "Your edits stay on this computer"
msgstr "Tus ediciones se quedan en este equipo"
diff --git a/packages/app/src/locales/fr/messages.json b/packages/app/src/locales/fr/messages.json
index a0b692df5..782f71f82 100644
--- a/packages/app/src/locales/fr/messages.json
+++ b/packages/app/src/locales/fr/messages.json
@@ -37,13 +37,7 @@
"-YV1Uo": ["Motif ", ["patternNumber"]],
"-bFGPF": ["Modification suivante"],
"-dNlfM": ["Dernière modification annulée sur ", ["docName"]],
- "-f2Ogn": [
- "Gardez ce projet synchronisé avec votre dépôt git distant. Suivre récupère les mises à jour sans pousser ; la synchronisation complète pousse aussi vos commits. Activer la synchronisation demande une confirmation."
- ],
"-g6KIS": ["Lien non reconnu"],
- "-imiMK": [
- "Suivre — les mises à jour arrivent depuis votre dépôt distant ; vos modifications restent sur cet ordinateur."
- ],
"-kKdCC": [["imported"], " compétences installées depuis ", ["0"]],
"-kbIAr": ["Liens et images"],
"-ksoxk": [
@@ -155,7 +149,6 @@
"0wswKc": ["Filet horizontal qui sépare les sections."],
"0xnQ_X": ["Les mises à jour arrivent"],
"0xnmlQ": ["Nom du dépôt"],
- "0yL--g": ["Examiner les conflits"],
"0ySP5u": ["Les modifications sont automatiquement enregistrées dans ce thème."],
"0zAhu6": ["tous les documents"],
"1-flC9": ["Port du serveur local"],
@@ -199,6 +192,7 @@
"1NgrlY": ["Autres méthodes d'installation"],
"1QfxQT": ["Ignorer"],
"1RluQD": ["Afficher le remplacement"],
+ "1TA-aJ": ["Récupéré ", ["pulled"], " · envoyé ", ["pushed"]],
"1TNIig": ["Ouvrir"],
"1Ta7Fd": ["Ouvrir ", ["basename"]],
"1V17kO": ["Chargement des deux versions"],
@@ -282,6 +276,11 @@
["FULLSCREEN_HUB_LIMIT"],
" résultats."
],
+ "2okwy4": [
+ "La synchronisation de ce worktree est réglée sur Auto (Tirer seulement), héritée de ",
+ ["project"],
+ ". Modifiez-la dans Paramètres → Synchronisation."
+ ],
"2pR7ad": ["Clé API des embeddings"],
"2q_Q7x": ["Visibilité"],
"2rLM8r": ["Impossible de démarrer le fil de l'agent — veuillez réessayer."],
@@ -416,7 +415,6 @@
"4A3Yzu": ["Bloc de code"],
"4BITzH": ["Erreur :"],
"4CfgPM": ["Dossier de projet créé, mais git init a échoué. Réessayez."],
- "4DcimZ": ["Mis à jour ", ["lastSyncedRelative"]],
"4E9jPa": ["Créez votre premier projet"],
"4EZrJN": ["Règles"],
"4ErgAf": ["OpenKnowledge a installé une compétence"],
@@ -448,6 +446,7 @@
"Choisissez les compétences à installer. Chacune devient une compétence modifiable qui vous appartient."
],
"4mLBx9": ["Les abonnements ne sont pas disponibles pour le moment."],
+ "4mbrAq": ["1 minute"],
"4mp6Tv": ["OpenKnowledge a listé les compétences installées"],
"4niEzY": [
"Intégration HTML en bac à sable — écrivez du HTML, voyez l'aperçu se rendre en direct."
@@ -465,11 +464,6 @@
"Sélectionne toutes les lignes visibles de l'arborescence lorsque le focus est dans la barre latérale Fichiers."
],
"4xtLTl": ["Dossier « ", ["basename"], " » masqué"],
- "4zEZS5": [
- "La synchronisation automatique est activée pour ce worktree, hérité de ",
- ["project"],
- ". Modifiez-la dans Paramètres → Synchronisation."
- ],
"4zGlN_": ["Collez l'URL d'une image ou cliquez pour l'envoyer"],
"4z_1j2": ["Rendu"],
"5-FeN2": ["URL de partage"],
@@ -561,6 +555,7 @@
],
"5hFl0U": ["Copier la référence"],
"5jEnaB": ["Non disponible sur cette plateforme"],
+ "5k0NLb": ["Examiner"],
"5kWklo": ["(certains sont peut-être déjà masqués par d'autres règles)"],
"5lWFkC": ["Se connecter"],
"5mksg0": ["Échec de la désactivation de la recherche sémantique — ", ["detail"]],
@@ -599,6 +594,7 @@
"Les commandes s'exécutent avec tous les droits de votre compte utilisateur sur cette machine. Désactivez ceci pour désactiver le shell."
],
"6Aih4U": ["Hors ligne"],
+ "6EoD0z": ["Résoudre dans le terminal"],
"6FCixu": ["Rouvrir un chat précédent"],
"6HCOwA": ["Échec de l'ouverture."],
"6KCH4m": ["Fichiers masqués"],
@@ -675,6 +671,11 @@
"Aidez vos agents à découvrir et utiliser OpenKnowledge dans n'importe quel projet."
],
"6vEr3W": ["Cible du lien"],
+ "6xPJIj": [
+ "La synchronisation de ce worktree est réglée sur Manuel, héritée de ",
+ ["project"],
+ ". Modifiez-la dans Paramètres → Synchronisation."
+ ],
"6xeZX9": [
"Les modifications s’appliquent immédiatement. Le thème détermine le mode clair ou sombre."
],
@@ -833,7 +834,6 @@
"8qgfac": ["Serveurs MCP"],
"8rZ1pk": ["Activer ", ["id"]],
"8ruqQi": ["Liens internes cassés"],
- "8sMErm": ["Activer Suivre ?"],
"8t9CRE": ["Démarrage de ", ["agentName"], "…"],
"8t9T3-": ["Aucune compétence trouvée."],
"8tjQCz": ["Explorer"],
@@ -899,6 +899,7 @@
]
],
"9Y6cCI": ["Échec du chargement des pages"],
+ "9ZxzfT": [["count"], " en avance"],
"9_2oe6": [
"Retransformez ",
["0"],
@@ -991,11 +992,6 @@
"AVW-K9": ["Échec du chargement des pages orphelines"],
"AWOSPo": ["Zoom avant"],
"AYoYhU": ["Échec de la mise à jour : ", ["0"]],
- "AaaESH": [
- "La synchronisation automatique est désactivée pour ce worktree, hérité de ",
- ["project"],
- ". Modifiez-la dans Paramètres → Synchronisation."
- ],
"AcK_r0": ["CLI Claude"],
"AczYxH": ["Entrée open-knowledge personnalisée — non gérée par OpenKnowledge"],
"AdcGcG": ["Application de votre modification"],
@@ -1082,6 +1078,7 @@
"BVkqD9": [
"La maintenance de l'index est suspendue car un autre attribut Git contrôle index.md. Mettez à jour .gitattributes pour que les chemins index.md définis utilisent merge=union, puis réessayez."
],
+ "BWTzAb": ["Manuel"],
"BY-g4_": ["Ajouter un motif"],
"Ba4D2x": ["Modèle importé"],
"Bdha5y": ["Publication…"],
@@ -1125,6 +1122,7 @@
],
"C0Ciaj": ["Importé sous « ", ["0"], " » — le nom « ", ["1"], " » était déjà pris."],
"C0hoX6": ["Toujours inclus"],
+ "C2abof": ["Non suivi"],
"C3Zc44": ["Explorer les compétences"],
"C62P6b": ["Sélection de l'éditeur"],
"C7PKTv": ["Envoyer les commentaires cochés dans la discussion"],
@@ -1159,9 +1157,6 @@
"CTJLpz": ["« ", ["trimmed"], " » existe déjà ici"],
"CU3AiE": ["Changement de branche"],
"CUmCwI": ["Insérer une ligne en dessous"],
- "CVRM5N": [
- "Suivre récupère les mises à jour depuis votre dépôt git distant et avance automatiquement votre copie. Vos modifications locales restent sur cet ordinateur et ne sont jamais poussées."
- ],
"CWjM1r": ["documents directement dans ", ["0"], "/"],
"CWzc2T": [
"<0>~/.ok/bin</0> et <1>~/.ok/env.sh</1> restent dans les deux cas — l'application les maintient toujours."
@@ -1204,6 +1199,7 @@
"Dans les projets Git, Open Knowledge ajoute une règle ciblée au fichier .gitattributes à la racine du dépôt afin de combiner les modifications simultanées des index."
],
"CxVk-w": ["Commenter ", ["address"]],
+ "Cz-K13": ["15 minutes"],
"D-NlUC": ["Système"],
"D-Oh1s": ["Comment configurer ", ["0"], " (s'ouvre dans le navigateur)"],
"D-_B7l": ["Connecté — ce point de terminaison renvoie des vecteurs de dimension ", ["0"], "."],
@@ -1275,7 +1271,6 @@
"DmkTrb": ["Impossible de créer ce thème. Réessayez."],
"Dnn2XG": ["Automatique"],
"DpjYd6": ["Aller au texte ancré"],
- "DrYM2Z": ["Synchronisation désactivée"],
"DsDwR-": [
[
"0",
@@ -1480,6 +1475,7 @@
"Fqr8BP": ["Visionneuse PDF multipage avec barre d'outils (miniatures, navigation, zoom)."],
"Fqx38P": ["Qu'est-ce qui vous a gêné ?"],
"Fr8JGg": ["Fichier zip"],
+ "FsEXax": ["Cela n'a pas abouti. Consultez les journaux du serveur et réessayez."],
"Fsx78O": ["Ajoutez la commande <0>ok</0> à votre terminal"],
"FvMSms": [
"Renommer modifie le fichier sur le disque ainsi que l'id que les agents utilisent pour choisir ce modèle."
@@ -1617,6 +1613,9 @@
"H0WlWQ": ["Grille de lignes et de colonnes avec une ligne d'en-tête."],
"H1TmTu": ["Correction arrêtée. Les fichiers déjà corrigés le restent."],
"H3oH0g": ["Rétablir"],
+ "H4doZt": [
+ "La synchronisation est en pause. Validez ces modifications locales pour continuer, ou réglez-les dans un terminal."
+ ],
"H86f9p": ["Réduire"],
"H8DVOJ": ["Identiques dans les deux : ", ["pick"], " continue de les lire."],
"HAkEqR": ["Fichiers récents"],
@@ -1723,6 +1722,7 @@
"IWGfGF": ["Vérification de votre connexion GitHub"],
"IX7-sq": ["Une erreur s'est produite à l'ouverture de « ", ["docName"], " »."],
"IX_uXB": ["my-feature"],
+ "IXiG0B": ["Auto (Tirer et Pousser)"],
"IYciRC": ["Merci pour ce rapport !"],
"IajAbS": ["Ajouter un pack de démarrage"],
"If0crP": ["Ouvrir avec l'IA ", ["targetDisplayName"], ", ", ["hint"]],
@@ -1785,6 +1785,7 @@
"JLzQi_": ["Fermer ", ["accessibleLabel"]],
"JM_aq-": ["Utilisez une URL https:// — http:// n'est autorisé que pour localhost."],
"JOcPqH": ["Récupérer un dépôt distant sur cette machine."],
+ "JOhCT9": ["Pousser inclut"],
"JWsZlx": ["Ouvrez un projet pour le modifier."],
"JZ8cO6": ["Clair, sombre, ou suivre le système."],
"J_jZ5z": [
@@ -1884,6 +1885,9 @@
"KjTmeO": ["Mettez OpenKnowledge à jour pour ouvrir ce partage."],
"KkEAud": ["Crée un fichier à partir du document ou du dossier courant."],
"KkRyMI": ["Impossible de classer la fusion. Réessayez."],
+ "KmVekT": [
+ "Auto (Tirer seulement) récupère les mises à jour depuis votre dépôt git distant et fait avancer votre copie automatiquement. Vos modifications locales restent sur cet ordinateur et ne sont jamais poussées."
+ ],
"KmydK6": ["Gras"],
"KnoB--": ["Sera enregistré sous <0>", ["sanitized"], "</0>."],
"KpOJFY": ["Activer les aperçus de liens externes"],
@@ -1893,6 +1897,9 @@
"KsAPaB": ["Cette branche est extraite dans :"],
"KtACeE": ["Par défaut : <0>", ["0"], "</0>"],
"KujtjC": ["Rechercher"],
+ "KvwJv8": [
+ "Certains fichiers ne sont pas listés : l'arbre de travail contient trop de modifications."
+ ],
"Kx881F": [["0"], " a été restauré."],
"L-rMC9": ["Réinitialiser à la valeur par défaut"],
"L1BQTH": [["0"], " n'est pas encore installé — ouverture de sa page de téléchargement."],
@@ -1910,6 +1917,7 @@
"L83DKQ": ["L'installation dans PATH a échoué : ", ["summary"]],
"L8fKuc": ["Exécutez ceci dans votre terminal"],
"L9Y9Om": ["Pages les plus liées"],
+ "L9ox9k": ["Impossible de lire l'arbre de travail. Consultez les journaux du serveur."],
"LAR9ub": ["Remplace l'entrée OpenKnowledge existante dans ", ["0"]],
"LBv_TR": ["Convertir les emplacements en liens symboliques"],
"LBwUR6": [
@@ -1938,7 +1946,6 @@
]
],
"LKOLNn": ["Aucun agent IA installé"],
- "LNum6A": ["il y a ", ["minutes"], " min"],
"LPAv9E": ["il y a ", ["days"], " j"],
"LQdLio": ["Nouveau schéma"],
"LQsCPn": ["Des commits locaux empêchent cette copie de se mettre à jour"],
@@ -2045,7 +2052,6 @@
"MCjC9A": ["Supprimer ", ["deleteDescriptorLabel"]],
"MDBJwN": ["Difficile à utiliser"],
"MDZSJe": ["Quand l'agent effectue son travail planifié."],
- "MGBNwj": ["Suspendre la synchronisation"],
"MGb89P": [
"Insérez, supprimez, déplacez, copiez et mettez en retrait les lignes de l'éditeur de source via le mappage clavier par défaut de CodeMirror."
],
@@ -2054,7 +2060,6 @@
"MIF36T": ["Impossible de résoudre la divergence : ", ["0"]],
"MILoeL": ["Services"],
"MJuO1q": ["Fenêtre de contexte :"],
- "MKEPCY": ["Suivre"],
"MLVPcm": [["0"], " version ", ["1"]],
"MOAoFO": ["Aucun dossier d'agent pour l'instant"],
"MPpSAg": ["Créer un projet à partir de ", ["selectedPackName"]],
@@ -2119,6 +2124,7 @@
],
"N5rzKJ": ["Supprimer ", ["0"], " compétences"],
"N6j2JH": ["Modifier ", ["0"]],
+ "N7Lau6": ["Valider et synchroniser"],
"NBdIgR": ["Commenter"],
"NErvOX": ["Enregistré dans"],
"NEzPEh": ["Créez une nouvelle branche, ou extrayez-en une existante, dans sa propre fenêtre."],
@@ -2146,6 +2152,7 @@
"Nay2Yr": ["Aucun agent ne correspond à votre recherche."],
"NcUznW": [["0"], ", aucun espace de travail"],
"NcurBF": ["Faire défiler vers le bas"],
+ "NcwbBM": ["Tirer apporte"],
"NeQ_0G": ["Traiter ces commentaires"],
"NeY1Np": ["Slidev a mis trop de temps à démarrer. Réessayez."],
"NfraGd": ["Autres méthodes d'installation de Slidev"],
@@ -2191,6 +2198,7 @@
"O6yEPk": ["Créez un nouveau projet OpenKnowledge dans le dossier de votre choix."],
"O7_W_a": ["Ouvrir avec l'IA"],
"O9oQJS": ["Envoyer le rapport"],
+ "OBdkpo": ["HEAD détaché"],
"OD0FCX": ["« ", ["basename"], " » masqué"],
"ODGGlj": ["Nom du dossier : ", ["detail"]],
"OEEQKT": ["Bien"],
@@ -2250,6 +2258,7 @@
"Oo_WWc": ["Aucune page trouvée"],
"Oos8fo": ["Copier la commande"],
"OplnBG": ["La gestion des outils IA n'est pas disponible dans cette version."],
+ "OqqecQ": ["30 secondes"],
"OsSaYm": ["Échec du clonage : ", ["title"]],
"OuQezS": ["S'applique lorsque vous reprendrez cette conversation"],
"OuY8t9": ["Ouvrir dans la branche actuelle"],
@@ -2284,7 +2293,11 @@
"PBwmDJ": ["Recherche par le sens"],
"PBxg_E": ["Pas maintenant"],
"PCSkw2": ["Compétences"],
+ "PEGxvo": ["5 minutes"],
"PGPGsL": ["Ajouter une description"],
+ "PGRnbw": [
+ "Les mises à jour arrivent depuis votre dépôt distant ; vos modifications restent sur cet ordinateur."
+ ],
"PHHEuH": ["Masquer les commentaires résolus (", ["0"], ")"],
"PIMM5l": ["Vous êtes abonné !"],
"PKLY-1": ["Ouverture…"],
@@ -2299,7 +2312,6 @@
"PTUuoc": [
"Impossible de retirer la marque de ce commentaire — il attend toujours d'être envoyé."
],
- "PTb1Nx": ["La synchronisation est en pause. Réactivez-la pour la reprendre."],
"PVSwOe": ["Réorientation : attente de l’arrêt de l’exécution en cours…"],
"PVUn_c": ["Ouvrir le dossier"],
"PVggyD": ["Schémas de frontmatter"],
@@ -2351,6 +2363,7 @@
"PrWQiT": ["Déplacer Terminal à droite"],
"PrhzDE": ["Faire défiler vers le haut"],
"Pw5PTU": ["Origine externe"],
+ "PxZCNM": ["En dehors de ce que valide Open Knowledge."],
"Q-DKvr": ["Installer depuis ", ["source"]],
"Q1mtyd": ["Masquer la barre latérale"],
"Q5fqMz": ["Erreur de connexion — réessayez"],
@@ -2404,6 +2417,7 @@
{ "one": ["#", " élément"], "many": ["#", " éléments"], "other": ["#", " éléments"] }
]
],
+ "QeREu8": ["Renommé"],
"QfFBdJ": ["Le nom de fichier du modèle (sans `.md`)."],
"Qft6eW": ["Déplacer ", ["0"], " vers Global"],
"Qj4RL5": ["Terminé :"],
@@ -2620,13 +2634,11 @@
"Sr9xtj": ["Choisir les dossiers auxquels ce schéma s'applique"],
"SrOuyg": ["Panneaux du document"],
"SvBFYA": ["Aucun projet récent"],
- "Sxx_Zz": [
- "Suivre est activé pour ce worktree, hérité de ",
- ["project"],
- ". Modifiez-le dans Paramètres → Synchronisation."
- ],
"T-654M": ["Chargement du PDF"],
"T0OVm7": ["La branche par défaut est protégée — les push nécessitent une pull request."],
+ "T1fMJ6": [
+ "À quelle fréquence cet ordinateur récupère les modifications de votre dépôt distant."
+ ],
"T2fvhw": ["Décocher tous les commentaires de ", ["0"]],
"T3Mld1": ["Fenêtre"],
"T3j-7o": ["par ex. Changement de projet pendant une synchronisation"],
@@ -2688,10 +2700,10 @@
"U2pMtf": ["tag-name"],
"U3IvM5": ["Guide complet"],
"U3RIJu": ["Fichiers locaux"],
- "U4nTfu": ["Activer Suivre"],
"U5Spo9": ["Le répertoire de contenu doit se trouver dans le projet"],
"U6Mdhd": ["Commençons la configuration."],
"U6wmNc": ["Synchronisation en pause"],
+ "U7Iesw": [["seconds"], " secondes"],
"U88xbi": ["Échec de la création du fichier de schéma"],
"U8CD-l": ["Copier le chemin complet, sans espace de travail"],
"UBv8UK": ["Supprimer définitivement"],
@@ -2731,9 +2743,6 @@
"URmyfc": ["Détails"],
"UTNVyS": ["Sélectionne l'intégralité du document source."],
"UTZ97u": ["La sélection doit se trouver dans le projet"],
- "UVDasf": [
- "La synchronisation est désactivée — vos modifications restent sur cet ordinateur jusqu'à ce que vous les validiez et poussiez manuellement."
- ],
"UVLlMV": ["Impossible de joindre GitHub. Réessayer ?"],
"UW2Fg3": [
"Le serveur en cours d'exécution de ce projet ne prend pas en charge l'édition en direct. Redémarrez OpenKnowledge pour corriger cela."
@@ -2776,6 +2785,7 @@
"UhpfxY": ["Faire défiler vers la gauche"],
"UkQGhd": ["Masquer le remplacement"],
"UlVARL": ["Activer Slidev"],
+ "Uo2Rj7": ["Activer Auto (Tirer et Pousser) ?"],
"Uobeu9": ["Ajoute la compétence à ", ["rootRel"], " — également lu par ", ["0"]],
"Up2_7p": ["Copier le chemin complet"],
"UpCz01": ["Ce document"],
@@ -2881,6 +2891,7 @@
"Vftef5": [
"Problèmes markdown courants — tabulations, sauts de niveau de titre, marqueurs de liste, et plus encore."
],
+ "Vl1H8I": ["Reconnexion requise pour continuer la synchronisation."],
"Vlc75q": ["Laisser le fichier supprimé"],
"VmJT51": ["Chargement de vos rapports"],
"VmXASo": ["(lien symbolique)"],
@@ -2920,6 +2931,7 @@
["rootPath"],
"</0>. Choisissez un emplacement en dehors, ou ouvrez plutôt ce projet."
],
+ "W7mERj": ["Activer Auto (Tirer seulement) ?"],
"W8vpBM": ["pack de démarrage"],
"W9NSe0": ["Vérification des liens"],
"W9_Bub": ["Les modifications locales chevauchent la synchronisation entrante"],
@@ -2939,6 +2951,7 @@
" éléments sélectionnés ? Les dossiers et tous les fichiers qu'ils contiennent seront supprimés. Cette action est irréversible."
],
"WMsoIm": ["Déjà connecté ?"],
+ "WOfp4H": ["Échec de la mise à jour de l'intervalle de synchronisation — ", ["detail"]],
"WOr-hW": ["tokens"],
"WPwDin": ["Ouvrir le dossier sur le disque"],
"WR0y2O": ["Partager le dossier"],
@@ -2957,6 +2970,7 @@
"Wcv-Zi": ["Rendre cette base de connaissances disponible en tant que compétence Claude."],
"We7h2I": ["📝 ou assets/icon.png"],
"Weq9zb": ["Général"],
+ "WfcERq": ["Rien à valider : l'arbre de travail est propre."],
"Wfy3rU": ["Paramètres de l'agent"],
"Wgmlsw": ["Récupération"],
"Wh0im4": ["modifie [[", ["realCurrentDoc"], "]]"],
@@ -3010,7 +3024,6 @@
"XRuL0i": ["Créer la page"],
"XSb9HS": ["Abandonner les modifications locales, restaurer la version installée"],
"XT-L4j": ["Activez un agent pour créer avec l'IA"],
- "XU0OXn": ["Activer la synchronisation automatique"],
"XU5AOg": ["Entrée"],
"XV5sC0": ["Ouvrir le worktree"],
"XW18jo": ["La réponse des titres de page ne correspond pas au schéma de succès"],
@@ -3069,6 +3082,7 @@
"Xp7Kq4": ["Une autre opération de synchronisation est en cours. Réessayez dans un instant."],
"Xp94R1": ["Réessayer une dernière fois"],
"XpIZmv": ["Bloc de code délimité en police à chasse fixe."],
+ "Xs1kjx": ["Rechercher des mises à jour toutes les"],
"Xs7IcT": ["Impossible de joindre ", ["displayName"], ". Réessayer ?"],
"XszXjc": ["Renommé en ", ["0"]],
"XtRoxT": ["Page ", ["pageNumber"]],
@@ -3105,6 +3119,7 @@
"YEP3X2": [
"Supprime un tableau lorsque la sélection de cellules active couvre tout le tableau."
],
+ "YEzhIr": ["Tirer et Pousser"],
"YGIi_c": ["Réinstaller"],
"YGNRB5": ["— sauf"],
"YGt-0e": ["Lecture…"],
@@ -3155,17 +3170,6 @@
"S'applique à ce projet sur cet ordinateur uniquement. Stocké dans .ok/local, non partagé via git."
],
"Yp-Hi_": ["Ouvrir les paramètres"],
- "YsEYYS": [
- [
- "behind",
- "plural",
- {
- "one": ["#", " commit de retard"],
- "many": ["#", " commits de retard"],
- "other": ["#", " commits de retard"]
- }
- ]
- ],
"YvwwqC": ["Où"],
"YwPUUP": ["Ce pack est déjà configuré ici."],
"YxZDGh": [
@@ -3272,7 +3276,6 @@
"Zue_jx": [
"Il manque des portées obligatoires à votre jeton GitHub. Essayez de vous reconnecter."
],
- "Zul8Ry": ["jamais"],
"ZvzbDF": ["Ajoutez-le directement à ce projet."],
"ZwpggY": ["OpenKnowledge a lu les paramètres du projet"],
"_0JUKX": ["Le signalement de bugs nécessite l'application de bureau OpenKnowledge."],
@@ -3411,9 +3414,6 @@
"ai40UJ": ["Nouveau record · appuyez sur <0>Espace</0> pour rejouer"],
"aiArms": ["Nous n'avons pas pu cloner ce dépôt."],
"aiOceC": ["Activer les index"],
- "ajHi4O": [
- "La synchronisation automatique est en pause — vous n'avez pas la permission de pousser vers ce dépôt. Passez à Suivre pour continuer à recevoir les mises à jour."
- ],
"ajz9F8": [
"Impossible de charger le contenu du conflit pour ",
["filePath"],
@@ -3436,7 +3436,6 @@
"Les paramètres d'aperçu des liens ne sont pas encore chargés — réessayez dans un instant"
],
"axQ1h6": ["Vous souhaitez ajouter quelque chose ? (facultatif)"],
- "az8lvo": ["Désactivé"],
"b18t0_": ["Fermer les différences"],
"b1FDss": ["Défiler jusqu'au début"],
"b2ezG_": ["Les deux conservés — « ", ["0"], " » est désormais une compétence à part entière"],
@@ -3545,6 +3544,9 @@
],
"cH0dkG": ["Il manquait une fonctionnalité dont j'avais besoin"],
"cHhH3i": ["un outil git requis"],
+ "cIFYZn": [
+ "Tant que vous êtes déconnecté, les mises à jour sont recherchées au plus toutes les 3 minutes, quel que soit ce réglage."
+ ],
"cIptmH": ["Dans l'application Claude Desktop"],
"cKjLuT": ["(projet + utilisateur)"],
"cLP0Lf": ["Source de compétence distante"],
@@ -3627,6 +3629,8 @@
"ct2kv5": ["Aucun titre dans ", ["pageTarget"]],
"cuA8QW": ["Organiser les spécifications"],
"cuHhjo": ["Créer et modifier"],
+ "cyoNqf": ["Non fusionné"],
+ "czQDKY": ["Chaque push est un commit sur votre dépôt distant."],
"d-GtJt": ["Afficher dans la source Markdown"],
"d1JjXo": [
"Votre copie locale de la branche <0>",
@@ -3739,6 +3743,9 @@
"eGUbmF": ["Copier le fichier ou dossier sélectionné"],
"eJitUk": ["Envoyer depuis l'ordinateur"],
"eKThTQ": ["Échec de la réorganisation"],
+ "eNOyTV": [
+ "Vous n'avez pas la permission de pousser vers ce dépôt. Auto (Tirer seulement) peut quand même garder votre copie à jour."
+ ],
"eNQGRb": ["Formule LaTeX en ligne rendue avec KaTeX."],
"eNhWUl": [
"Un relecteur de PR, un rédacteur de notes de version, une checklist de déploiement…"
@@ -3780,6 +3787,7 @@
"emMrXQ": ["Le serveur a renvoyé une réponse de duplication mal formée."],
"emgiet": ["Contenu faisant autorité ; reproduit tel quel partout où il est référencé."],
"enPTnx": ["ligne ", ["displayLine"]],
+ "eolhcI": ["Lecture de l'arbre de travail"],
"eps54V": ["Supprimé"],
"epuNYK": [
"Marque un bloc comme source de vérité. Les miroirs situés ailleurs se mettent à jour en direct pendant que vous le modifiez."
@@ -3787,9 +3795,6 @@
"erenF-": ["Impossible de supprimer des fichiers dont les conflits ne sont pas résolus"],
"euGaS0": ["Impossible de lire ", ["fileName"], "."],
"euc6Ns": ["Dupliquer"],
- "evHlIg": [
- "Suivre ne pousse ni ne valide jamais vos modifications locales. Elles restent uniquement sur cette machine."
- ],
"evs0iw": ["Étiquettes correspondant à « ", ["tagListQuery"], " »"],
"ewSbS_": ["Session shell"],
"ezUmoU": ["Valeurs d'élément autorisées (vide = toutes)"],
@@ -3885,7 +3890,6 @@
}
]
],
- "g2Tj8R": ["Complet"],
"g3UF2V": ["Accepter"],
"g4WlQK": [
"La gestion des outils IA du projet n'est disponible que dans l'application de bureau OpenKnowledge."
@@ -3903,7 +3907,6 @@
["display"],
". Ce dossier devient un lien symbolique vers celui-ci, donc son agent lit tout ce qui est placé ici. Ce dossier reste réel. Des compétences en conflit annulent la fusion."
],
- "g85bAo": ["Synchronisé ", ["lastSyncedRelative"]],
"g9Nj4l": ["// note"],
"gAhHu7": [
"La correction automatique ne s'applique qu'aux problèmes ayant une correction mécanique connue."
@@ -3981,6 +3984,7 @@
"Ce document n'est pas encore synchronisé avec GitHub. Le lien fonctionnera après la prochaine synchronisation."
],
"gyHDWC": ["Tout corriger avec l'IA (", ["count"], ")"],
+ "gyYvCN": ["Envoyer mes modifications toutes les"],
"h-AdvS": ["Les dossiers et les modèles sont déjà là, il n'y a donc rien à ajouter."],
"h06R3C": ["Aucune page ne manque de liens sortants dans le graphe."],
"h16FyT": ["Listes"],
@@ -4060,9 +4064,6 @@
"Une ligne avec une note de bas de page<0><1>[1]</1></0> et une définition affichée en dessous."
],
"hxEUVJ": ["Initialiser ", ["selectedPackName"]],
- "hxYFzm": [
- "Synchronisation complète — vos commits sont poussés et les modifications distantes tirées automatiquement."
- ],
"hxnF0I": ["Propriétés de ", ["0"]],
"hyCxJY": ["Ouvrir plutôt ce worktree"],
"hynz2K": ["Téléchargement démarré"],
@@ -4077,7 +4078,6 @@
"i09An-": ["Version antérieure restaurée (", ["0"], ")"],
"i1flq_": ["Suggestions de liens wiki"],
"i3f2kh": ["Aucune commande correspondante."],
- "i6ng22": ["Passer à Suivre"],
"i92eAT": [
"Nous allons créer un dépôt et démarrer la synchronisation — aucun terminal nécessaire."
],
@@ -4173,13 +4173,11 @@
],
"iqugog": ["Échec de l'initialisation : ", ["errorDetail"]],
"irFGwu": ["Liste des modèles"],
+ "irnKr_": ["Mis à jour ", ["updatedRelative"]],
"irrm_E": ["Retirer la sélection"],
"isRobC": ["Nouveau"],
"iuTKci": ["Pas encore de modifications."],
"iv452l": ["Documentation de ", ["0"], " (s'ouvre dans le navigateur)"],
- "iy64Li": [
- "Synchronisation complète — vos modifications sont validées et poussées automatiquement vers votre dépôt distant."
- ],
"iycx_A": ["Push en cours"],
"iz1LdD": [
"Modifié en dehors d'OK depuis sa dernière écriture ici — l'état affiché est celui qui se trouve sur le disque maintenant"
@@ -4233,6 +4231,7 @@
"jTLWxh": [
"Intègre une page externe dans une iframe en ligne (docs, démos, Figma, CodeSandbox)."
],
+ "jTUxaN": ["Activer Auto (Tirer seulement)"],
"jWzDfC": ["Vérification des outils IA dont vous disposez"],
"jZ_E5M": ["Échec de la récupération — consultez les journaux du serveur pour les détails."],
"j_Z6g7": ["Valeur par défaut partagée"],
@@ -4327,13 +4326,15 @@
"Dirigez la recherche sémantique vers n'importe quel point de terminaison d'embeddings compatible OpenAI — un serveur auto-hébergé ou un autre fournisseur. La clé API ci-dessus vaut pour le point de terminaison que vous définissez ici."
],
"kSiB3X": ["Impossible de mettre à la ", ["trashNoun"]],
- "kUn-CN": ["Synchronisation désactivée"],
"kV2YZv": [
"Vous ne voyez pas <0>Compétences</0> ? Activez d'abord <1>Paramètres <2/> Fonctionnalités <3/> Exécution de code et création de fichiers</1>."
],
"kVS5tE": ["Conserver les index generated dans chaque dossier ?"],
"kVgQUA": ["Supprimer ce chat ?"],
"kVzuTI": ["Compétence d'agent recommandée"],
+ "kXNv8P": [
+ "Auto (Tirer seulement) ne pousse ni ne valide jamais vos changements locaux. Ils restent uniquement sur cette machine."
+ ],
"kYL1lH": ["Activité de l'agent"],
"k_Dqw1": [
[
@@ -4432,6 +4433,7 @@
"lM4c-I": [
"Un chemin à l'intérieur de la compétence — n'importe quel dossier convient (par ex. references/notes.md). Les dossiers du chemin sont créés pour vous."
],
+ "lPkjpD": ["Envoyé ", ["pushed"]],
"lPzyrU": ["Tous les blocs sont résolus"],
"lS83Sg": ["Impossible d’accéder au presse-papiers."],
"lScd1O": [
@@ -4795,6 +4797,7 @@
"pJ7XCo": ["Cette page ne référence aucun fichier ou image local."],
"pMPnZv": [["deleted"], " compétences supprimées"],
"pOo4Aa": ["Texte brut"],
+ "pPiV8s": ["Activer Auto (Tirer et Pousser)"],
"pSimwP": ["Nouveau nom pour la version ", ["editor"]],
"pTPqMK": ["Bascule un bloc de code délimité."],
"pTyA_t": ["étiquettes"],
@@ -4886,6 +4889,7 @@
"qAx7xG": ["Dossier fixe dans la racine du contenu"],
"qBi_YG": ["Installer OpenKnowledge dans vos outils d'IA"],
"qC7PwZ": ["Échec de la suppression du champ"],
+ "qD3krc": ["Rien ne bouge tant que vous ne le demandez pas."],
"qEEfPk": ["Rapport de bug ", ["0"]],
"qEIFZu": ["Clé se terminant par ", ["keyHint"]],
"qEue6Q": [" ou "],
@@ -4894,6 +4898,9 @@
"qIJIrD": ["Test en cours"],
"qJSo0_": ["Quelle est la différence entre les copies et les liens symboliques ?"],
"qKMfPp": ["Masquer les nœuds de compétences"],
+ "qLXJTB": [
+ "Gardez ce projet synchronisé avec votre dépôt distant. Auto (Tirer seulement) apporte les mises à jour sans pousser ; Auto (Tirer et Pousser) envoie aussi vos modifications. Activer la synchronisation automatique demande une confirmation."
+ ],
"qNOgUu": [
"Les modifications faites à la source arrivent ici — aucune dérive due au copier-coller."
],
@@ -4915,7 +4922,6 @@
"qXg5W9": ["Le fichier est enregistré dans <0>~/Downloads/openknowledge.skill</0>."],
"qXsafh": ["Publier sur GitHub"],
"qZv5ZR": ["Échec du basculement du partage de configuration"],
- "q_9EcE": ["Activer la synchronisation git automatique ?"],
"q_Q1-i": [
[
"count",
@@ -5029,7 +5035,6 @@
["boldName"],
" — une compétence intégrée livrée avec Open Knowledge. Elle est en lecture seule."
],
- "rn7n0G": ["Reprendre la synchronisation"],
"rnX-1S": ["Activer les plugins"],
"rnrdEX": ["principal"],
"roAe2K": ["URL du lien"],
@@ -5075,6 +5080,7 @@
"sJK6pq": ["Permission refusée"],
"sJWhgo": ["Composant inconnu : ", ["unregisteredComponentName"]],
"sKEgGd": ["Envoyer dans la discussion"],
+ "sKHiNR": [["count"], " en retard"],
"sNeKjP": ["Échec de l'enregistrement du jeton — réessayez"],
"sOxZaS": ["Échec du chargement du graphe"],
"sQoLn0": ["Quitter"],
@@ -5098,6 +5104,7 @@
"scyoP9": [
"Les documents d'index ne portent pas de frontmatter, à l'exception de celui à la racine de votre base de connaissances. Les documents de journal ne sont pas couverts — OKF ne limite pas leur frontmatter."
],
+ "sdvHp3": ["Modifiés ici et sur le distant"],
"se-tU0": ["Impossible de corriger ", ["0"], " fichiers sur ", ["total"], "."],
"seeS6l": ["Configurer OpenKnowledge dans ce dossier ?"],
"sgmRY8": ["Téléchargement de ", ["0"], " ignoré."],
@@ -5121,6 +5128,9 @@
"snrVQ7": ["échec du test"],
"sq4WQH": ["Utiliser ", ["0"], " comme thème clair"],
"sqUrlK": ["Songerie…"],
+ "srdlOs": [
+ "La synchronisation automatique est en pause : vous n'avez pas la permission de pousser vers ce dépôt. Passez à Auto (Tirer seulement) pour continuer à recevoir les mises à jour."
+ ],
"ssk6rl": [
"Le dossier propre à la compétence (",
["path"],
@@ -5142,12 +5152,14 @@
"Ligne en ligne façon Notion pour un fichier téléchargeable. Le glisser-déposer fonctionne aussi."
],
"t18QYR": ["Détacher ", ["accessibleLabel"]],
- "t2TkQ3": ["Synchronisation en pause — résolvez les conflits pour la reprendre."],
"t4sFKC": [
"La nouvelle branche <0>",
["trimmed"],
"</0> sera créée à partir du commit actuel, dans son propre worktree sous <1>.ok/worktrees/</1>."
],
+ "t5I7P_": [
+ "Rien ne bouge tant que vous ne le demandez pas — tirez et poussez depuis le menu de synchronisation."
+ ],
"t6w1cq": ["Ouvre un onglet d'éditeur vierge."],
"t7YoBO": ["Envoyer ce commentaire"],
"t9Qn8y": ["Aucun agent activé"],
@@ -5193,6 +5205,7 @@
["alreadyImported"],
" étaient déjà présentes)"
],
+ "tlGXxX": ["Auto (Tirer seulement)"],
"tnG-m6": ["La synchronisation automatique est en pause — connectez-vous pour la reprendre."],
"toyw51": ["Contrôles du diagramme Mermaid"],
"tqQBwN": ["Les scripts sont affichés pour relecture, jamais exécutés."],
@@ -5225,6 +5238,7 @@
"u779EG": ["Utilisez une origine http:// ou https://."],
"u7H-Wn": ["Afficher le panneau (", ["panelShortcutLabel"], ")"],
"u7U_Ij": ["Ajoute un lien au texte sélectionné, ou modifie le lien situé sous le curseur."],
+ "uAQUqI": ["État"],
"uA_jXp": ["Changer de branche et mettre à jour"],
"uBAxNB": ["Éditeur"],
"uCaIdy": [
@@ -5255,9 +5269,6 @@
"Impossible de redémarrer le serveur — il s'exécute sous un autre compte. Redémarrez votre ordinateur pour le libérer, puis rouvrez ce projet."
],
"uUCrBv": ["lien symbolique"],
- "uUiiyC": [
- "Vous n'avez pas la permission de pousser vers ce dépôt. Suivre peut tout de même maintenir votre copie à jour."
- ],
"uVbUP8": ["Paramètres…"],
"uY5Z7P": ["Partie terminée · appuyez sur <0>Espace</0> pour rejouer"],
"uYZTcW": ["Cette URL GitHub ne peut pas être partagée."],
@@ -5308,6 +5319,7 @@
"v15iQB": [
"Le contrat de calcul attesté. S'applique uniquement aux documents tapés Attested Computation, où OKF nécessite un runtime ; les concepts ordinaires ne sont pas affectés."
],
+ "v16Pzh": ["Passer à Auto (Tirer seulement)"],
"v2ZW0K": ["Activer le terminal"],
"v2a04T": ["Règles markdownlint"],
"v41fCm": ["Fichier introuvable"],
@@ -5332,6 +5344,7 @@
"Les mises à jour de la source s'appliquent automatiquement (sauf en cas de modification locale)"
],
"vGeNNQ": ["Copiez une invite et collez-la dans votre agent pour configurer votre projet."],
+ "vGjmyl": ["Supprimé"],
"vHlhDc": ["Double-cliquez pour modifier"],
"vIxrEk": ["Ajuster à la largeur"],
"vLyv1R": ["Masquer"],
@@ -5411,8 +5424,10 @@
}
]
],
+ "vp5vfW": ["1 heure"],
"vppAju": ["Où sont placées les pièces jointes nouvellement ajoutées."],
"vqJXNe": ["Installer la compétence <0>open-knowledge-discovery</0>"],
+ "vsFXfP": ["Pousser ignore"],
"vv7kpg": ["Annulé"],
"vvWZnu": ["Différences indisponibles"],
"vwV-kH": ["La correction des fichiers s’est interrompue de façon inattendue."],
@@ -5479,6 +5494,11 @@
"wdzBgi": ["Le partage de la configuration est maintenant réglé sur Moi uniquement."],
"weP6me": ["Impossible de charger les documents — saisissez @ à nouveau pour réessayer"],
"wgNoIs": ["Tout sélectionner"],
+ "wk_v1X": [
+ "La synchronisation de ce worktree est réglée sur Auto (Tirer et Pousser), héritée de ",
+ ["project"],
+ ". Modifiez-la dans Paramètres → Synchronisation."
+ ],
"wlwXUk": [
"Vous avez choisi ~/Downloads. Les fichiers y sont généralement temporaires — envisagez plutôt un dossier stable."
],
@@ -5524,6 +5544,7 @@
"xCdTnb": ["Fermer le nouvel onglet"],
"xDBki3": ["Suggestions de titres"],
"xDEcka": ["Le fournisseur limite le débit de cette clé. Réessayez dans un instant."],
+ "xDKOFk": ["Ignoré"],
"xEb24l": ["Autorisez-nous à vous recontacter par e-mail"],
"xFQRu4": ["Je l'ai déjà en local"],
"xG4tb6": ["Connexion perdue avec « ", ["docName"], " »."],
@@ -5535,6 +5556,7 @@
"xOTzt5": ["à l'instant"],
"xSVO3J": ["Ce qui est créé"],
"xV5sXw": ["il y a ", ["0"], " sem"],
+ "xW5AUw": ["Récupéré ", ["pulled"]],
"xWEvuo": ["Demander à l'IA"],
"xWomUD": ["Utiliser la version ", ["editor"]],
"xXo8FT": ["Échec de l'enregistrement : ", ["error"]],
@@ -5702,6 +5724,9 @@
"zAJzIg": ["Problèmes dans ", ["0"]],
"zAsDLY": ["Visualisation en graphe des liens entre documents"],
"zBUqvf": ["Configurer les intégrations OpenKnowledge…"],
+ "zBiFZh": [
+ "Vos modifications sont validées et poussées automatiquement vers votre dépôt distant."
+ ],
"zC5jrM": ["Sera créé sous <0>", ["effective"], "</0>"],
"zD1Nqf": [
[
@@ -5724,6 +5749,7 @@
"zLak8b": ["Activer le nouvel onglet"],
"zMmwh4": ["Choisissez un thème ou créez le vôtre."],
"zQBg2C": ["Déplace le bloc courant d'une position vers le haut ou vers le bas."],
+ "zWZBPx": ["Type modifié"],
"zXj1rA": ["Rechercher par le sens"],
"zYp8Sr": [
"Un badge <0>Modifié</0> signale les règles que votre configuration définit explicitement — directement, ou héritées via <1>extends</1>. Les règles sans badge conservent leur état par défaut."
@@ -5768,7 +5794,6 @@
". Choisir un dossier cloné depuis ",
["expectedHost"],
" ?"
- ],
- "zz_Wd_": ["Mode"]
+ ]
}
}
diff --git a/packages/app/src/locales/fr/messages.po b/packages/app/src/locales/fr/messages.po
index e60a4aa0d..8b4f66a05 100644
--- a/packages/app/src/locales/fr/messages.po
+++ b/packages/app/src/locales/fr/messages.po
@@ -517,10 +517,6 @@ msgstr "{ahead} en avance, {behind} en retard"
msgid "{basename} — text editor"
msgstr "{basename} — éditeur de texte"
-#: src/components/SyncStatusBadge.tsx
-msgid "{behind, plural, one {# commit behind} other {# commits behind}}"
-msgstr "{behind, plural, one {# commit de retard} many {# commits de retard} other {# commits de retard}}"
-
#: src/components/SyncStatusBadge.tsx
msgid "{behind} behind"
msgstr "{behind} en retard"
@@ -616,6 +612,14 @@ msgstr "{count, plural, one {Corrige immédiatement le # problème qui a une cor
msgid "{count, plural, one {matches # file} other {matches # files}}"
msgstr "{count, plural, one {correspond à # fichier} many {correspond à # fichiers} other {correspond à # fichiers}}"
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} ahead"
+msgstr "{count} en avance"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} behind"
+msgstr "{count} en retard"
+
#: src/components/SkillBulkDeleteDialog.tsx
msgid "{count} skills"
msgstr "{count} compétences"
@@ -811,14 +815,11 @@ msgstr "{localizedMessage} à la ligne {displayLine}"
msgid "{mins, plural, one {# min ago} other {# min ago}}"
msgstr "{mins, plural, one {il y a # min} many {il y a # min} other {il y a # min}}"
-#: src/components/SyncStatusBadge.tsx
-msgid "{minutes} min ago"
-msgstr "il y a {minutes} min"
-
#: src/components/acp/ThreadHistoryMenu.tsx
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "{minutes}m ago"
msgstr "il y a {minutes} min"
@@ -910,6 +911,10 @@ msgstr "{propertyCount, plural, one {# propriété} many {# propriétés} other
msgid "{propPanelDescriptorLabel} Properties"
msgstr "Propriétés de {propPanelDescriptorLabel}"
+#: src/components/settings/SyncSection.tsx
+msgid "{seconds} seconds"
+msgstr "{seconds} secondes"
+
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
@@ -1127,6 +1132,26 @@ msgstr "📝 ou assets/icon.png"
msgid "0/0"
msgstr "0/0"
+#: src/components/settings/SyncSection.tsx
+msgid "1 hour"
+msgstr "1 heure"
+
+#: src/components/settings/SyncSection.tsx
+msgid "1 minute"
+msgstr "1 minute"
+
+#: src/components/settings/SyncSection.tsx
+msgid "15 minutes"
+msgstr "15 minutes"
+
+#: src/components/settings/SyncSection.tsx
+msgid "30 seconds"
+msgstr "30 secondes"
+
+#: src/components/settings/SyncSection.tsx
+msgid "5 minutes"
+msgstr "5 minutes"
+
#: src/components/ImportSkillForm.tsx
msgid "A .zip or .skill archive."
msgstr "Une archive .zip ou .skill."
@@ -1521,6 +1546,7 @@ msgstr "Ajoutez vos commentaires à ce message"
#: src/components/PropertyDiffBlock.tsx
#: src/components/SkillDirectoryResult.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Added"
msgstr "Ajouté"
@@ -1565,11 +1591,13 @@ msgstr "Ajoute ces fichiers"
msgid "Adds these folders"
msgstr "Ajoute ces dossiers"
+#: src/components/settings/SyncSection.tsx
#: src/editor/components/PropPanel.tsx
msgid "Advanced"
msgstr "Avancé"
#: src/components/ConsentDialogBody.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Advanced settings"
msgstr "Paramètres avancés"
@@ -1979,6 +2007,24 @@ msgstr "Contenu faisant autorité ; reproduit tel quel partout où il est réfé
msgid "Authorize in browser"
msgstr "Autoriser dans le navigateur"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull and Push)"
+msgstr "Auto (Tirer et Pousser)"
+
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull only)"
+msgstr "Auto (Tirer seulement)"
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
+msgstr "Auto (Tirer seulement) récupère les mises à jour depuis votre dépôt git distant et fait avancer votre copie automatiquement. Vos modifications locales restent sur cet ordinateur et ne sont jamais poussées."
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) never pushes or commits your local changes. They stay only on this machine."
+msgstr "Auto (Tirer seulement) ne pousse ni ne valide jamais vos changements locaux. Ils restent uniquement sur cette machine."
+
#: src/components/settings/TerminalSection.tsx
msgid "Auto-approve settings not yet loaded — try again in a moment"
msgstr "Les paramètres d'approbation automatique ne sont pas encore chargés — réessayez dans un instant"
@@ -2012,21 +2058,13 @@ msgstr "La correction automatique ne s'applique qu'aux problèmes ayant une corr
msgid "Auto-save"
msgstr "Enregistrement automatique"
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is off for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "La synchronisation automatique est désactivée pour ce worktree, hérité de {project}. Modifiez-la dans Paramètres → Synchronisation."
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "La synchronisation automatique est activée pour ce worktree, hérité de {project}. Modifiez-la dans Paramètres → Synchronisation."
-
#: src/components/settings/SyncSection.tsx
msgid "Auto-sync is paused — sign in to resume."
msgstr "La synchronisation automatique est en pause — connectez-vous pour la reprendre."
#: src/components/settings/SyncSection.tsx
-msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Follow to keep receiving updates."
-msgstr "La synchronisation automatique est en pause — vous n'avez pas la permission de pousser vers ce dépôt. Passez à Suivre pour continuer à recevoir les mises à jour."
+msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Auto (Pull only) to keep receiving updates."
+msgstr "La synchronisation automatique est en pause : vous n'avez pas la permission de pousser vers ce dépôt. Passez à Auto (Tirer seulement) pour continuer à recevoir les mises à jour."
#: src/components/AutoSyncEnableWarning.tsx
msgid "Auto-sync periodically fetches, pulls, and pushes commits to your remote git repository so your edits stay in sync across machines."
@@ -2424,9 +2462,14 @@ msgid "Change the embeddings provider?"
msgstr "Changer de fournisseur d'embeddings ?"
#: src/components/PropertyDiffBlock.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Changed"
msgstr "Modifié"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Changed here and on the remote"
+msgstr "Modifiés ici et sur le distant"
+
#: src/components/ChangedOutsideBadge.tsx
msgid "changed outside"
msgstr "modifié à l'extérieur"
@@ -2451,6 +2494,10 @@ msgstr "Modifications enregistrées automatiquement."
msgid "Check for updates"
msgstr "Rechercher les mises à jour"
+#: src/components/settings/SyncSection.tsx
+msgid "Check for updates every"
+msgstr "Rechercher des mises à jour toutes les"
+
#: src/components/AppMenubar.tsx
msgid "Check for updates…"
msgstr "Rechercher les mises à jour…"
@@ -2970,6 +3017,10 @@ msgstr "Commenter ce bloc de code ou interroger l’IA à son sujet"
msgid "Comments"
msgstr "Commentaires"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Commit and sync"
+msgstr "Valider et synchroniser"
+
#: src/components/ShareBranchSwitchDialog.tsx
msgid "Commit or stash changes to switch:"
msgstr "Validez ou remisez vos modifications pour changer :"
@@ -3271,6 +3322,7 @@ msgstr "Conversion…"
#: src/components/empty-state/CopyablePromptList.tsx
#: src/components/InstallInClaudeDesktopDialog.tsx
+#: src/components/SyncStatusBadge.tsx
#: src/editor/extensions/CodeBlockView.tsx
msgid "Copied"
msgstr "Copié"
@@ -3886,6 +3938,10 @@ msgstr "Impossible de lire les commentaires en attente d'envoi — rien n'a ét
msgid "Couldn't read the comments waiting to send: {0}"
msgstr "Impossible de lire les commentaires en attente d'envoi : {0}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Couldn't read the working tree. Check the server logs."
+msgstr "Impossible de lire l'arbre de travail. Consultez les journaux du serveur."
+
#. placeholder {0}: warning.code
#: src/components/settings/SavedThemesTiles.tsx
msgid "Couldn’t read this theme ({0})"
@@ -4459,6 +4515,10 @@ msgstr "Supprimer ce chat ?"
msgid "Delete this comment"
msgstr "Supprimer ce commentaire"
+#: src/components/SyncStatusBadge.tsx
+msgid "Deleted"
+msgstr "Supprimé"
+
#. placeholder {0}: deletedTheme.label
#: src/components/settings/SavedThemesTiles.tsx
msgid "Deleted {0}."
@@ -4554,6 +4614,10 @@ msgstr "tokens de description"
msgid "Design"
msgstr "Conception"
+#: src/components/SyncStatusBadge.tsx
+msgid "detached HEAD"
+msgstr "HEAD détaché"
+
#: src/components/SyncStatusBadge.tsx
msgid "Detached HEAD — checkout a branch to resume"
msgstr "HEAD détachée — extrayez une branche pour reprendre"
@@ -4926,6 +4990,10 @@ msgstr "Chaque outil IA lit les compétences depuis son propre dossier. Pointez
msgid "Each pack scaffolds your project with ready-made folders and templates."
msgstr "Chaque pack équipe votre projet de dossiers et de modèles prêts à l'emploi."
+#: src/components/settings/SyncSection.tsx
+msgid "Each push is one commit to your remote."
+msgstr "Chaque push est un commit sur votre dépôt distant."
+
#: src/components/AppMenubar.tsx
#: src/components/settings/LintingSection.tsx
#: src/components/SkillsTree.tsx
@@ -5174,25 +5242,25 @@ msgstr "Activer {id}"
#: src/components/EnableSyncConfirmDialog.tsx
#: src/components/share-receive-miss-content.tsx
#: src/components/ShareFreshnessWarning.tsx
-msgid "Enable auto-sync"
-msgstr "Activer la synchronisation automatique"
+msgid "Enable Auto (Pull and Push)"
+msgstr "Activer Auto (Tirer et Pousser)"
-#: src/components/settings/LinkPreviewsSection.tsx
-msgid "Enable external link previews"
-msgstr "Activer les aperçus de liens externes"
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Enable Auto (Pull and Push)?"
+msgstr "Activer Auto (Tirer et Pousser) ?"
#: src/components/AutoSyncOnboardingDialog.tsx
#: src/components/EnableSyncConfirmDialog.tsx
-msgid "Enable Follow"
-msgstr "Activer Suivre"
+msgid "Enable Auto (Pull only)"
+msgstr "Activer Auto (Tirer seulement)"
#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable Follow?"
-msgstr "Activer Suivre ?"
+msgid "Enable Auto (Pull only)?"
+msgstr "Activer Auto (Tirer seulement) ?"
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable git auto-sync?"
-msgstr "Activer la synchronisation git automatique ?"
+#: src/components/settings/LinkPreviewsSection.tsx
+msgid "Enable external link previews"
+msgstr "Activer les aperçus de liens externes"
#: src/components/settings/LintingSection.tsx
msgid "Enable indexes"
@@ -5788,6 +5856,10 @@ msgstr "Échec de la mise à jour du fournisseur d'embeddings — {detail}"
msgid "Failed to update the project sync default — {detail}"
msgstr "Échec de la mise à jour de la synchronisation par défaut du projet — {detail}"
+#: src/components/settings/SyncSection.tsx
+msgid "Failed to update the sync interval — {detail}"
+msgstr "Échec de la mise à jour de l'intervalle de synchronisation — {detail}"
+
#: src/components/FileTree.tsx
msgid "Failed to upload file"
msgstr "Échec de l'envoi du fichier"
@@ -6047,28 +6119,6 @@ msgstr "Lien de partage du dossier copié."
msgid "Folder target: {linkTitle}. Click to open the overview."
msgstr "Dossier cible : {linkTitle}. Cliquez pour ouvrir la synthèse."
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow"
-msgstr "Suivre"
-
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow — updates flow in from your remote; your edits stay on this computer."
-msgstr "Suivre — les mises à jour arrivent depuis votre dépôt distant ; vos modifications restent sur cet ordinateur."
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
-msgstr "Suivre récupère les mises à jour depuis votre dépôt git distant et avance automatiquement votre copie. Vos modifications locales restent sur cet ordinateur et ne sont jamais poussées."
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Follow is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "Suivre est activé pour ce worktree, hérité de {project}. Modifiez-le dans Paramètres → Synchronisation."
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow never pushes or commits your local changes. They stay only on this machine."
-msgstr "Suivre ne pousse ni ne valide jamais vos modifications locales. Elles restent uniquement sur cette machine."
-
#: src/components/acp/ThreadView.tsx
msgid "Follow the agent's edits"
msgstr "Suivre les modifications de l'agent"
@@ -6159,11 +6209,6 @@ msgstr "Le frontmatter par lequel commence chaque document créé à partir de c
msgid "Frontmatter schemas"
msgstr "Schémas de frontmatter"
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Full"
-msgstr "Complet"
-
#: src/components/InstallInClaudeDesktopDialog.tsx
msgid "Full guide"
msgstr "Guide complet"
@@ -6177,14 +6222,6 @@ msgstr "Chemin complet"
msgid "Full Path"
msgstr "Chemin complet"
-#: src/components/settings/SyncSection.tsx
-msgid "Full sync — your commits push and remote changes pull automatically."
-msgstr "Synchronisation complète — vos commits sont poussés et les modifications distantes tirées automatiquement."
-
-#: src/components/SyncStatusBadge.tsx
-msgid "Full sync — your edits are committed and pushed to your remote automatically."
-msgstr "Synchronisation complète — vos modifications sont validées et poussées automatiquement vers votre dépôt distant."
-
#: src/components/OkBlobRunner.tsx
msgid "Game over · press <0>Space</0> to play again"
msgstr "Partie terminée · appuyez sur <0>Espace</0> pour rejouer"
@@ -6243,6 +6280,7 @@ msgid "Git needs a helper tool (such as git-lfs) that isn't installed or couldn'
msgstr "Git a besoin d'un outil auxiliaire (comme git-lfs) qui n'est pas installé ou est introuvable. Installez-le, puis réessayez."
#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Git sync"
msgstr "Synchronisation git"
@@ -6620,6 +6658,10 @@ msgstr "Comment fonctionne le partage ?"
msgid "How missing project-local documents, files, and images are reported in Problems, editor diagnostics, audits, and agent tools."
msgstr "Comment les documents, fichiers et images locaux au projet manquants sont signalés dans Problèmes, les diagnostics de l’éditeur, les audits et les outils d’agent."
+#: src/components/settings/SyncSection.tsx
+msgid "How often this computer pulls changes from your remote."
+msgstr "À quelle fréquence cet ordinateur récupère les modifications de votre dépôt distant."
+
#: src/components/ShareFreshnessWarning.tsx
msgid "How to push manually"
msgstr "Comment pousser manuellement"
@@ -6705,6 +6747,10 @@ msgstr "Motifs d'exclusion"
msgid "Ignore patterns (raw text)"
msgstr "Motifs d'exclusion (texte brut)"
+#: src/components/SyncStatusBadge.tsx
+msgid "Ignored"
+msgstr "Ignoré"
+
#: src/components/LinksPanel.tsx
msgid "Image {identity}. Go to reference."
msgstr "Image {identity}. Accéder à la référence."
@@ -7301,8 +7347,8 @@ msgid "Keep the name to 64 characters or fewer."
msgstr "Limitez le nom à 64 caractères maximum."
#: src/components/settings/SyncSection.tsx
-msgid "Keep this project in sync with your git remote. Follow fetches updates without pushing; full sync pushes your commits too. Turning sync on requires confirmation."
-msgstr "Gardez ce projet synchronisé avec votre dépôt git distant. Suivre récupère les mises à jour sans pousser ; la synchronisation complète pousse aussi vos commits. Activer la synchronisation demande une confirmation."
+msgid "Keep this project in sync with your git remote. Auto (Pull only) brings in updates without pushing; Auto (Pull and Push) sends your edits too. Turning auto-sync on requires confirmation."
+msgstr "Gardez ce projet synchronisé avec votre dépôt distant. Auto (Tirer seulement) apporte les mises à jour sans pousser ; Auto (Tirer et Pousser) envoie aussi vos modifications. Activer la synchronisation automatique demande une confirmation."
#: src/lib/pack-copy.ts
msgid "Keep track of the people and companies you work with and the meetings you have with them. Good for remembering who someone is, how you know them, and what you last talked about."
@@ -7782,6 +7828,11 @@ msgstr "La gestion des outils IA n'est pas disponible dans cette version."
msgid "Managing project AI tools is unavailable in this build."
msgstr "La gestion des outils IA du projet n'est pas disponible dans cette version."
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Manual"
+msgstr "Manuel"
+
#: src/components/empty-state/use-create-suggestions.ts
msgid "Map the architecture"
msgstr "Cartographier l'architecture"
@@ -7920,10 +7971,6 @@ msgstr "Des couleurs de la palette sont manquantes"
msgid "Missing theme name"
msgstr "Le nom du thème est manquant"
-#: src/components/SyncStatusBadge.tsx
-msgid "Mode"
-msgstr "Mode"
-
#: src/components/settings/SearchSection.tsx
msgid "Model"
msgstr "Modèle"
@@ -7940,6 +7987,7 @@ msgstr "Effort par défaut du modèle"
#: src/components/FolderOverview.tsx
#: src/components/settings/markdownlint-rule-browser.tsx
#: src/components/SkillOriginInline.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Modified"
msgstr "Modifié"
@@ -8232,10 +8280,6 @@ msgstr "Erreur réseau pendant le nettoyage"
msgid "Network settings not yet loaded. Try again in a moment."
msgstr "Les paramètres réseau ne sont pas encore chargés. Réessayez dans un instant."
-#: src/components/SyncStatusBadge.tsx
-msgid "never"
-msgstr "jamais"
-
#: src/components/FolderOverview.tsx
#: src/editor/tag-suggestion/TagSuggestionMenu.tsx
msgid "New"
@@ -8850,10 +8894,22 @@ msgstr "rien ({0} ne peut correspondre à aucun document)"
msgid "nothing ({0} is not a valid pattern)"
msgstr "rien ({0} n'est pas un motif valide)"
+#: src/components/settings/SyncSection.tsx
+msgid "Nothing moves until you ask — pull and push from the sync menu."
+msgstr "Rien ne bouge tant que vous ne le demandez pas — tirez et poussez depuis le menu de synchronisation."
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing moves until you ask."
+msgstr "Rien ne bouge tant que vous ne le demandez pas."
+
#: src/components/FolderPropertiesCard.tsx
msgid "Nothing set yet."
msgstr "Rien de défini pour l'instant."
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing to commit — working tree clean."
+msgstr "Rien à valider : l'arbre de travail est propre."
+
#: src/components/BugReportSendToast.tsx
msgid "Nothing was uploaded. The report stays on this computer until you email it to us."
msgstr "Rien n'a été envoyé. Le rapport reste sur cet ordinateur jusqu'à ce que vous nous l'envoyiez par e-mail."
@@ -8887,10 +8943,6 @@ msgstr "sur {0}"
msgid "of {totalPages}"
msgstr "sur {totalPages}"
-#: src/components/settings/SyncSection.tsx
-msgid "Off"
-msgstr "Désactivé"
-
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Off — external links show only their URL. No requests leave this computer."
msgstr "Désactivé — les liens externes n'affichent que leur URL. Aucune requête ne quitte cet ordinateur."
@@ -9645,6 +9697,10 @@ msgstr "Sortants"
msgid "Outline"
msgstr "Plan"
+#: src/components/SyncStatusBadge.tsx
+msgid "Outside what Open Knowledge commits."
+msgstr "En dehors de ce que valide Open Knowledge."
+
#: src/components/SkillCostValue.tsx
msgid "over the {budgetLabel} token budget"
msgstr "dépasse le budget de tokens {budgetLabel}"
@@ -9855,10 +9911,6 @@ msgstr "Erreur de syntaxe du motif : {message}"
msgid "Pattern warnings: {summary}"
msgstr "Avertissements sur les motifs : {summary}"
-#: src/components/SyncStatusBadge.tsx
-msgid "Pause sync"
-msgstr "Suspendre la synchronisation"
-
#: src/components/acp/ThreadView.tsx
msgid "pending"
msgstr "en attente"
@@ -10252,10 +10304,26 @@ msgstr "Publication…"
msgid "Pull"
msgstr "Tirer"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull and Push"
+msgstr "Tirer et Pousser"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull brings in"
+msgstr "Tirer apporte"
+
#: src/components/share-receive-miss-content.tsx
msgid "Pull latest changes"
msgstr "Tirer les dernières modifications"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled}"
+msgstr "Récupéré {pulled}"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled} · pushed {pushed}"
+msgstr "Récupéré {pulled} · envoyé {pushed}"
+
#: src/components/share-receive-miss-content.tsx
#: src/components/SyncStatusBadge.tsx
msgid "Pulling"
@@ -10281,10 +10349,26 @@ msgstr "Envoyez la branche {branch} sur GitHub avant de partager."
msgid "Push failed — check the server logs for details."
msgstr "Échec du push — consultez les journaux du serveur pour les détails."
+#: src/components/SyncStatusBadge.tsx
+msgid "Push includes"
+msgstr "Pousser inclut"
+
+#: src/components/settings/SyncSection.tsx
+msgid "Push my edits every"
+msgstr "Envoyer mes modifications toutes les"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Push skips"
+msgstr "Pousser ignore"
+
#: src/lib/share/run-share-action.ts
msgid "Push this branch to GitHub before sharing."
msgstr "Envoyez cette branche sur GitHub avant de partager."
+#: src/components/SyncStatusBadge.tsx
+msgid "Pushed {pushed}"
+msgstr "Envoyé {pushed}"
+
#: src/components/SyncStatusBadge.tsx
msgid "Pushing"
msgstr "Push en cours"
@@ -10358,6 +10442,10 @@ msgstr "Copie en lecture seule d'un bloc MirrorSource d'un autre document. Modif
msgid "Read-only file in the {name} skill"
msgstr "Fichier en lecture seule dans la compétence {name}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reading working tree"
+msgstr "Lecture de l'arbre de travail"
+
#: src/components/acp/working-status.ts
msgid "Reading…"
msgstr "Lecture…"
@@ -10411,6 +10499,10 @@ msgstr "Compétence d'agent recommandée"
msgid "Reconnect required"
msgstr "Reconnexion nécessaire"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reconnect required to keep syncing."
+msgstr "Reconnexion requise pour continuer la synchronisation."
+
#: src/presence/use-sync-toasts.ts
msgid "Reconnected"
msgstr "Reconnecté"
@@ -10677,6 +10769,10 @@ msgstr "Renommer la compétence"
msgid "Rename succeeded but the sidebar may be out of date — refresh to resync"
msgstr "Renommage réussi, mais la barre latérale n'est peut-être pas à jour — actualisez pour resynchroniser"
+#: src/components/SyncStatusBadge.tsx
+msgid "Renamed"
+msgstr "Renommé"
+
#. placeholder {0}: docLeaf(descriptor.from)
#. placeholder {1}: docLeaf(descriptor.to)
#: src/components/TimelinePanel.tsx
@@ -10828,7 +10924,6 @@ msgstr "Les dépôts que vous avez déjà clonés peuvent continuer à se synchr
#: src/components/CloneDialog.tsx
#: src/components/share-metadata-rows.tsx
#: src/components/SkillPreviewTab.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Repository"
msgstr "Dépôt"
@@ -10911,6 +11006,10 @@ msgstr "Redimensionner le panneau Compétences"
msgid "Resolve conflict in your terminal"
msgstr "Résoudre le conflit dans votre terminal"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Resolve in terminal"
+msgstr "Résoudre dans le terminal"
+
#: src/components/FileTree.tsx
msgid "Resolve the conflict on {files} before deleting."
msgstr "Résolvez le conflit sur {files} avant de supprimer."
@@ -11026,10 +11125,6 @@ msgstr "Restauré à la version du {0}"
msgid "Results capped — this workspace has more files than search can index. A missing file may be a cap artifact, not a typo."
msgstr "Résultats plafonnés — cet espace de travail contient plus de fichiers que la recherche ne peut en indexer. Un fichier absent peut venir de ce plafond, pas d'une faute de frappe."
-#: src/components/SyncStatusBadge.tsx
-msgid "Resume sync"
-msgstr "Reprendre la synchronisation"
-
#: src/components/acp/ThreadView.tsx
msgid "Resuming the chat"
msgstr "Reprise du chat"
@@ -11101,8 +11196,8 @@ msgid "Reverting"
msgstr "Rétablissement"
#: src/components/SyncStatusBadge.tsx
-msgid "Review conflicts"
-msgstr "Examiner les conflits"
+msgid "Review"
+msgstr "Examiner"
#: src/components/ReportBugDialogBody.tsx
msgid "Review your report"
@@ -12248,6 +12343,10 @@ msgstr "Slidev a mis trop de temps à démarrer. Réessayez."
msgid "Small section heading."
msgstr "Petit titre de section."
+#: src/components/SyncStatusBadge.tsx
+msgid "Some files are not listed — the working tree has too many changes."
+msgstr "Certains fichiers ne sont pas listés : l'arbre de travail contient trop de modifications."
+
#: src/components/settings/SavedThemesTiles.tsx
msgid "Some saved themes aren’t shown because the theme folder exceeds the scan limit."
msgstr "Certains thèmes enregistrés ne sont pas affichés car le dossier des thèmes dépasse la limite d’analyse."
@@ -12439,6 +12538,10 @@ msgstr "Démarrage de l'agent…"
msgid "status"
msgstr "statut"
+#: src/components/SyncStatusBadge.tsx
+msgid "Status"
+msgstr "État"
+
#: src/components/SubscribeCard.tsx
#: src/components/SubscribeForm.tsx
msgid "Stay in the loop"
@@ -12586,8 +12689,8 @@ msgid "Switch to a branch to share."
msgstr "Passez sur une branche pour partager."
#: src/components/settings/SyncSection.tsx
-msgid "Switch to Follow"
-msgstr "Passer à Suivre"
+msgid "Switch to Auto (Pull only)"
+msgstr "Passer à Auto (Tirer seulement)"
#: src/components/command-palette-commands.ts
msgid "Switch worktree"
@@ -12626,7 +12729,6 @@ msgid "Symlinks the skill to {path}"
msgstr "Crée un lien symbolique de la compétence vers {path}"
#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Sync"
msgstr "Synchronisation"
@@ -12635,10 +12737,6 @@ msgstr "Synchronisation"
msgid "Sync & sharing"
msgstr "Synchronisation et partage"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync disabled"
-msgstr "Synchronisation désactivée"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync failed — check the server logs for details."
msgstr "Échec de la synchronisation — consultez les journaux du serveur pour les détails."
@@ -12647,13 +12745,21 @@ msgstr "Échec de la synchronisation — consultez les journaux du serveur pour
msgid "Sync is failing. See the sync status for details."
msgstr "La synchronisation échoue. Consultez l'état de la synchronisation pour les détails."
-#: src/components/settings/SyncSection.tsx
-msgid "Sync is off — your edits stay on this computer until you commit and push manually."
-msgstr "La synchronisation est désactivée — vos modifications restent sur cet ordinateur jusqu'à ce que vous les validiez et poussiez manuellement."
+#: src/components/SyncBlockingChanges.tsx
+msgid "Sync is paused. Commit these local edits to continue, or sort them out in a terminal."
+msgstr "La synchronisation est en pause. Validez ces modifications locales pour continuer, ou réglez-les dans un terminal."
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync is paused. Turn it back on to resume."
-msgstr "La synchronisation est en pause. Réactivez-la pour la reprendre."
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull and Push) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "La synchronisation de ce worktree est réglée sur Auto (Tirer et Pousser), héritée de {project}. Modifiez-la dans Paramètres → Synchronisation."
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull only) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "La synchronisation de ce worktree est réglée sur Auto (Tirer seulement), héritée de {project}. Modifiez-la dans Paramètres → Synchronisation."
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Manual for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "La synchronisation de ce worktree est réglée sur Manuel, héritée de {project}. Modifiez-la dans Paramètres → Synchronisation."
#: src/components/SyncStatusBadge.tsx
msgid "Sync mode"
@@ -12664,18 +12770,10 @@ msgstr "Mode de synchronisation"
msgid "Sync now"
msgstr "Synchroniser maintenant"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync off"
-msgstr "Synchronisation désactivée"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync paused"
msgstr "Synchronisation en pause"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync paused — resolve conflicts to resume."
-msgstr "Synchronisation en pause — résolvez les conflits pour la reprendre."
-
#: src/hooks/use-no-push-permission-toast.ts
msgid "Sync paused — you don't have permission to push to this repo"
msgstr "Synchronisation en pause — vous n'avez pas la permission de pousser vers ce dépôt"
@@ -12710,10 +12808,6 @@ msgstr "État de la synchronisation : {syncStateLabel} — identité git non dé
msgid "Synced"
msgstr "Synchronisé"
-#: src/components/SyncStatusBadge.tsx
-msgid "Synced {lastSyncedRelative}"
-msgstr "Synchronisé {lastSyncedRelative}"
-
#: src/components/TimelinePanel.tsx
msgid "Synced from disk"
msgstr "Synchronisé depuis le disque"
@@ -12937,6 +13031,10 @@ msgstr "Merci pour ce rapport !"
msgid "That branch is already open in another worktree."
msgstr "Cette branche est déjà ouverte dans un autre worktree."
+#: src/components/SyncBlockingChanges.tsx
+msgid "That did not go through. Check the server logs and try again."
+msgstr "Cela n'a pas abouti. Consultez les journaux du serveur et réessayez."
+
#: src/comments/reveal-comment.ts
msgid "That document didn't open in time. Try again once it has synced."
msgstr "Ce document ne s'est pas ouvert à temps. Réessayez une fois qu'il sera synchronisé."
@@ -13972,6 +14070,10 @@ msgstr "Tapez « / » pour afficher les commandes"
msgid "Type a query, then press <0>↵</0> to search your pages by meaning."
msgstr "Saisissez une requête, puis appuyez sur <0>↵</0> pour chercher dans vos pages par le sens."
+#: src/components/SyncStatusBadge.tsx
+msgid "Type changed"
+msgstr "Type modifié"
+
#: src/editor/components/CodePreviewEditModal.tsx
msgid "Type to edit; <0>Cmd/Ctrl+Enter</0> saves, <1>Esc</1> cancels."
msgstr "Saisissez pour modifier ; <0>Cmd/Ctrl+Enter</0> enregistre, <1>Échap</1> annule."
@@ -14100,6 +14202,10 @@ msgstr "Décocher tous les commentaires"
msgid "Unmark every comment in {0}"
msgstr "Décocher tous les commentaires de {0}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Unmerged"
+msgstr "Non fusionné"
+
#: src/editor/slash-command/items.tsx
msgid "Unordered list of items."
msgstr "Liste d'éléments sans numérotation."
@@ -14140,6 +14246,10 @@ msgstr "Image {identity} impossible à résoudre. Accéder à la référence."
msgid "Untitled report"
msgstr "Rapport sans titre"
+#: src/components/SyncStatusBadge.tsx
+msgid "Untracked"
+msgstr "Non suivi"
+
#: src/components/SyncStatusBadge.tsx
msgid "Up to date"
msgstr "À jour"
@@ -14187,8 +14297,8 @@ msgid "Updated \"{name}\" from {0}"
msgstr "« {name} » mis à jour depuis {0}"
#: src/components/SyncStatusBadge.tsx
-msgid "Updated {lastSyncedRelative}"
-msgstr "Mis à jour {lastSyncedRelative}"
+msgid "Updated {updatedRelative}"
+msgstr "Mis à jour {updatedRelative}"
#: src/components/FolderTimelineCard.tsx
msgid "updated folder properties"
@@ -14202,6 +14312,11 @@ msgstr "Mis à jour vers la version {version}"
msgid "Updates flow in"
msgstr "Les mises à jour arrivent"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Updates flow in from your remote; your edits stay on this computer."
+msgstr "Les mises à jour arrivent depuis votre dépôt distant ; vos modifications restent sur cet ordinateur."
+
#: src/components/SkillOriginInline.tsx
msgid "Updates from the source apply automatically (unless edited locally)"
msgstr "Les mises à jour de la source s'appliquent automatiquement (sauf en cas de modification locale)"
@@ -14654,6 +14769,10 @@ msgstr "Où doit-elle résider ?"
msgid "Which skill"
msgstr "Quelle compétence"
+#: src/components/settings/SyncSection.tsx
+msgid "While you're signed out, updates are checked at most every 3 minutes regardless of this setting."
+msgstr "Tant que vous êtes déconnecté, les mises à jour sont recherchées au plus toutes les 3 minutes, quel que soit ce réglage."
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "Whitespace"
msgstr "Espaces"
@@ -14830,8 +14949,8 @@ msgid "You don't have permission to push to this repo."
msgstr "Vous n'avez pas la permission de pousser vers ce dépôt."
#: src/components/settings/SyncSection.tsx
-msgid "You don't have permission to push to this repo. Follow can still keep your copy up to date."
-msgstr "Vous n'avez pas la permission de pousser vers ce dépôt. Suivre peut tout de même maintenir votre copie à jour."
+msgid "You don't have permission to push to this repo. Auto (Pull only) can still keep your copy up to date."
+msgstr "Vous n'avez pas la permission de pousser vers ce dépôt. Auto (Tirer seulement) peut quand même garder votre copie à jour."
#: src/components/ShareFreshnessWarning.tsx
msgid "You don't have write access to this repo."
@@ -14903,6 +15022,11 @@ msgstr "Votre copie de la branche <0>{shareBranch}</0> contient des modification
msgid "Your current version is saved first, so this is reversible."
msgstr "Votre version actuelle est enregistrée au préalable, cette opération est donc réversible."
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Your edits are committed and pushed to your remote automatically."
+msgstr "Vos modifications sont validées et poussées automatiquement vers votre dépôt distant."
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "Your edits stay on this computer"
msgstr "Vos modifications restent sur cet ordinateur"
diff --git a/packages/app/src/locales/hi/messages.json b/packages/app/src/locales/hi/messages.json
index 12f3edc8c..fe38a2283 100644
--- a/packages/app/src/locales/hi/messages.json
+++ b/packages/app/src/locales/hi/messages.json
@@ -27,11 +27,7 @@
"-YV1Uo": ["पैटर्न ", ["patternNumber"]],
"-bFGPF": ["अगला बदलाव"],
"-dNlfM": [["docName"], " पर आख़िरी संपादन पूर्ववत किया गया"],
- "-f2Ogn": [
- "इस प्रोजेक्ट को अपने git रिमोट के साथ तालमेल में रखें। Follow बिना भेजे अपडेट लाता है; पूर्ण सिंक आपके कमिट भी भेजता है। सिंक चालू करने के लिए पुष्टि ज़रूरी है।"
- ],
"-g6KIS": ["अपरिचित लिंक"],
- "-imiMK": ["Follow — अपडेट आपके रिमोट से आते रहते हैं; आपके संपादन इसी कंप्यूटर पर रहते हैं।"],
"-kKdCC": [["0"], " से ", ["imported"], " स्किल इंस्टॉल की गईं"],
"-kbIAr": ["लिंक और छवियाँ"],
"-ksoxk": [
@@ -131,7 +127,6 @@
"0wswKc": ["अनुभागों को विभाजित करने वाली क्षैतिज रेखा।"],
"0xnQ_X": ["अपडेट आते रहते हैं"],
"0xnmlQ": ["रिपॉज़िटरी का नाम"],
- "0yL--g": ["टकराव देखें"],
"0ySP5u": ["बदलाव इस थीम में अपने आप सहेजे जाते हैं।"],
"0zAhu6": ["हर दस्तावेज़"],
"1-flC9": ["स्थानीय सर्वर port"],
@@ -167,6 +162,7 @@
"1NgrlY": ["इंस्टॉल करने के अन्य तरीके"],
"1QfxQT": ["ख़ारिज करें"],
"1RluQD": ["बदलें दिखाएँ"],
+ "1TA-aJ": [["pulled"], " खींचा · ", ["pushed"], " भेजा"],
"1TNIig": ["खोलें"],
"1Ta7Fd": [["basename"], " खोलें"],
"1V17kO": ["दोनों संस्करण लोड हो रहे हैं"],
@@ -240,6 +236,11 @@
["FULLSCREEN_HUB_LIMIT"],
" परिणाम।"
],
+ "2okwy4": [
+ "इस वर्कट्री के लिए सिंक “स्वचालित (केवल खींचें)” पर सेट है, जो ",
+ ["project"],
+ " से विरासत में मिला है। इसे Settings → Sync में बदलें।"
+ ],
"2pR7ad": ["एम्बेडिंग API कुंजी"],
"2q_Q7x": ["दृश्यता"],
"2rLM8r": ["एजेंट थ्रेड शुरू नहीं किया जा सका — कृपया फिर कोशिश करें।"],
@@ -342,7 +343,6 @@
"4A3Yzu": ["कोड ब्लॉक"],
"4BITzH": ["त्रुटि:"],
"4CfgPM": ["प्रोजेक्ट फ़ोल्डर बन गया, पर git init विफल रहा। फिर कोशिश करें।"],
- "4DcimZ": [["lastSyncedRelative"], " अपडेट हुआ"],
"4E9jPa": ["अपना पहला प्रोजेक्ट बनाएँ"],
"4EZrJN": ["नियम"],
"4ErgAf": ["OpenKnowledge ने एक स्किल इंस्टॉल की"],
@@ -370,6 +370,7 @@
"4m-xuX": ["स्वत: सुधार — ठीक करने को कुछ नहीं"],
"4mDIcg": ["इंस्टॉल करने के लिए स्किल चुनें। हर एक आपकी अपनी संपादन योग्य स्किल के रूप में आती है।"],
"4mLBx9": ["सदस्यता अभी उपलब्ध नहीं है।"],
+ "4mbrAq": ["1 मिनट"],
"4mp6Tv": ["OpenKnowledge ने इंस्टॉल की गई स्किल सूचीबद्ध कीं"],
"4niEzY": ["सैंडबॉक्स किया गया HTML एम्बेड — HTML लिखें, रेंडर किया गया पूर्वावलोकन तुरंत देखें।"],
"4nj6n8": ["/api/config ने HTTP ", ["code"], " लौटाया"],
@@ -379,11 +380,6 @@
"4uNLmk": ["खींचा जा रहा है"],
"4v2Yyz": ["जब फ़ोकस Files साइडबार में हो तब हर दिखाई देने वाली फ़ाइल-ट्री पंक्ति चुनें।"],
"4xtLTl": ["छिपा हुआ फ़ोल्डर “", ["basename"], "”"],
- "4zEZS5": [
- "इस वर्कट्री के लिए स्वत: सिंक चालू है, जो ",
- ["project"],
- " से विरासत में मिला है। इसे Settings → Sync में बदलें।"
- ],
"4zGlN_": ["छवि URL चिपकाएँ या अपलोड पर क्लिक करें"],
"4z_1j2": ["रेंडर किया गया"],
"5-FeN2": ["साझा URL"],
@@ -452,6 +448,7 @@
],
"5hFl0U": ["संदर्भ कॉपी करें"],
"5jEnaB": ["इस प्लेटफ़ॉर्म पर उपलब्ध नहीं"],
+ "5k0NLb": ["समीक्षा करें"],
"5kWklo": ["(कुछ पहले से ही अन्य नियमों द्वारा छिपे हो सकते हैं)"],
"5lWFkC": ["साइन इन करें"],
"5mksg0": ["अर्थ-आधारित खोज अक्षम करने में विफल — ", ["detail"]],
@@ -488,6 +485,7 @@
"कमांड इस मशीन पर आपके उपयोगकर्ता खाते की पूरी पहुँच के साथ चलते हैं। शेल बंद करने के लिए इसे बंद करें।"
],
"6Aih4U": ["ऑफ़लाइन"],
+ "6EoD0z": ["टर्मिनल में हल करें"],
"6FCixu": ["पिछली चैट फिर से खोलें"],
"6HCOwA": ["खोलने में विफल।"],
"6KCH4m": ["छिपी हुई फ़ाइलें"],
@@ -545,6 +543,11 @@
"6u9LvN": [["days", "plural", { "one": ["#", " दिन पहले"], "other": ["#", " दिन पहले"] }]],
"6ur2Mk": ["अपने एजेंट को किसी भी प्रोजेक्ट में OpenKnowledge खोजने और उपयोग करने में मदद करें।"],
"6vEr3W": ["लिंक लक्ष्य"],
+ "6xPJIj": [
+ "इस वर्कट्री के लिए सिंक “मैन्युअल” पर सेट है, जो ",
+ ["project"],
+ " से विरासत में मिला है। इसे Settings → Sync में बदलें।"
+ ],
"6xeZX9": ["संपादन तुरंत लागू होते हैं। हल्का या गहरा थीम से तय होता है।"],
"6zzhQL": ["अपनी रिपोर्ट ईमेल से भेजें"],
"72xhRD": ["आरेख दृश्य मोड"],
@@ -671,7 +674,6 @@
"8qgfac": ["MCP सर्वर"],
"8rZ1pk": [["id"], " सक्षम करें"],
"8ruqQi": ["टूटे हुए आंतरिक लिंक"],
- "8sMErm": ["Follow सक्षम करें?"],
"8t9CRE": [["agentName"], " शुरू किया जा रहा है…"],
"8t9T3-": ["कोई स्किल नहीं मिली।"],
"8tjQCz": ["खोजें"],
@@ -725,6 +727,7 @@
["0", "plural", { "one": ["#", " स्किल इंस्टॉल करें"], "other": ["#", " स्किलें इंस्टॉल करें"] }]
],
"9Y6cCI": ["पेज लोड नहीं हो सके"],
+ "9ZxzfT": [["count"], " आगे"],
"9_2oe6": [
["0"],
" को फिर से एक असली निर्देशिका बनाएँ जिसमें उसे अभी दिखने वाली हर स्किल के लिए एक अलग सिमलिंक हो — कुछ भी काम करना बंद नहीं करता, और उसके बाद हर स्किल का मेन्यू उसे सँभालता है।"
@@ -800,11 +803,6 @@
"AVW-K9": ["अनाथ पेज लोड करने में विफल"],
"AWOSPo": ["बड़ा करें"],
"AYoYhU": ["अपडेट विफल: ", ["0"]],
- "AaaESH": [
- "इस वर्कट्री के लिए स्वत: सिंक बंद है, जो ",
- ["project"],
- " से विरासत में मिला है। इसे Settings → Sync में बदलें।"
- ],
"AcK_r0": ["Claude CLI"],
"AczYxH": ["कस्टम open-knowledge प्रविष्टि — OpenKnowledge द्वारा प्रबंधित नहीं"],
"AdcGcG": ["आपका बदलाव लागू किया जा रहा है"],
@@ -873,6 +871,7 @@
"BVkqD9": [
"सूचकांक रखरखाव रोक दिया गया है क्योंकि एक अन्य Git विशेषता index.md को नियंत्रित करती है। .gitattributes को अपडेट करें ताकि दायरे वाले index.md पथ merge=union का उपयोग करें, फिर पुनः प्रयास करें।"
],
+ "BWTzAb": ["मैन्युअल"],
"BY-g4_": ["पैटर्न जोड़ें"],
"Ba4D2x": ["टेम्पलेट आयात किया गया"],
"Bdha5y": ["प्रकाशित किया जा रहा है…"],
@@ -908,6 +907,7 @@
],
"C0Ciaj": ["\"", ["0"], "\" के रूप में आयात किया गया — नाम \"", ["1"], "\" पहले से लिया जा चुका था।"],
"C0hoX6": ["हमेशा शामिल"],
+ "C2abof": ["ट्रैक नहीं किया गया"],
"C3Zc44": ["स्किल खोजें"],
"C62P6b": ["संपादक चयन"],
"C7PKTv": ["चुनी हुई टिप्पणियाँ चैट में भेजें"],
@@ -936,9 +936,6 @@
"CTJLpz": ["\"", ["trimmed"], "\" यहाँ पहले से मौजूद है"],
"CU3AiE": ["ब्रांच बदली जा रही हैं"],
"CUmCwI": ["नीचे पंक्ति जोड़ें"],
- "CVRM5N": [
- "Follow आपकी रिमोट git रिपॉज़िटरी से अपडेट लाता है और आपकी प्रति को अपने आप आगे बढ़ा देता है। आपके स्थानीय संपादन इसी कंप्यूटर पर रहते हैं और कभी नहीं भेजे जाते।"
- ],
"CWjM1r": ["सीधे ", ["0"], "/ में मौजूद दस्तावेज़"],
"CWzc2T": [
"<0>~/.ok/bin</0> और <1>~/.ok/env.sh</1> दोनों ही स्थिति में बने रहते हैं — ऐप हमेशा इनका रखरखाव करता है।"
@@ -975,6 +972,7 @@
"Git प्रोजेक्ट में, Open Knowledge रिपॉजिटरी के रूट की .gitattributes फ़ाइल में सीमित दायरे वाला नियम जोड़ता है, ताकि एक साथ किए गए इंडेक्स बदलाव जुड़ सकें।"
],
"CxVk-w": [["address"], " पर टिप्पणी"],
+ "Cz-K13": ["15 मिनट"],
"D-NlUC": ["सिस्टम"],
"D-Oh1s": [["0"], " कैसे सेट अप करें (ब्राउज़र में खुलता है)"],
"D-_B7l": ["जुड़ गया — यह एंडपॉइंट ", ["0"], "-आयाम वाले वेक्टर लौटाता है।"],
@@ -1034,7 +1032,6 @@
"DmkTrb": ["यह थीम नहीं बनाई जा सकी। फिर से कोशिश करें।"],
"Dnn2XG": ["स्वचालित"],
"DpjYd6": ["एंकर किए गए पाठ पर जाएँ"],
- "DrYM2Z": ["सिंक अक्षम"],
"DsDwR-": [["0", "plural", { "one": ["#", " त्रुटि"], "other": ["#", " त्रुटियाँ"] }]],
"DskIkK": ["साइन-इन स्ट्रीम बिना पुष्टि के समाप्त हुई — कृपया फिर कोशिश करें"],
"DuCPiG": [
@@ -1224,6 +1221,7 @@
"Fqr8BP": ["टूलबार नियंत्रणों वाला बहु-पृष्ठ PDF दर्शक (थंबनेल, पेज नेविगेशन, ज़ूम)।"],
"Fqx38P": ["क्या रुकावट बनी?"],
"Fr8JGg": ["Zip फ़ाइल"],
+ "FsEXax": ["यह पूरा नहीं हुआ। सर्वर लॉग देखें और फिर से कोशिश करें।"],
"Fsx78O": ["अपने टर्मिनल में <0>ok</0> कमांड जोड़ें"],
"FvMSms": ["नाम बदलने पर डिस्क की फ़ाइल और वह id दोनों बदल जाते हैं जिससे एजेंट यह टेम्पलेट चुनते हैं।"],
"Fx9aOF": ["OpenKnowledge ने एक दस्तावेज़ संपादित किया"],
@@ -1330,6 +1328,7 @@
"H0WlWQ": ["एक शीर्षक पंक्ति के साथ पंक्तियों और स्तंभों की जालिका।"],
"H1TmTu": ["ठीक करना रोक दिया गया। जो फ़ाइलें पहले ही ठीक हो चुकी हैं वे ठीक ही रहेंगी।"],
"H3oH0g": ["फिर से करें"],
+ "H4doZt": ["सिंक रुका हुआ है। जारी रखने के लिए इन स्थानीय संपादनों को कमिट करें, या टर्मिनल में इन्हें निपटाएँ।"],
"H86f9p": ["समेटें"],
"H8DVOJ": ["दोनों में एक जैसी हैं — ", ["pick"], " इन्हें फिर भी पढ़ता रहेगा।"],
"HAkEqR": ["हाल की फ़ाइलें"],
@@ -1408,6 +1407,7 @@
"IWGfGF": ["आपका GitHub कनेक्शन जाँचा जा रहा है"],
"IX7-sq": ["\"", ["docName"], "\" खोलते समय कुछ ग़लत हो गया।"],
"IX_uXB": ["my-feature"],
+ "IXiG0B": ["स्वचालित (खींचें और भेजें)"],
"IYciRC": ["रिपोर्ट के लिए धन्यवाद!"],
"IajAbS": ["एक स्टार्टर पैक जोड़ें"],
"If0crP": ["AI ", ["targetDisplayName"], " से खोलें, ", ["hint"]],
@@ -1458,6 +1458,7 @@
"JLzQi_": [["accessibleLabel"], " बंद करें"],
"JM_aq-": ["कोई https:// URL उपयोग करें — http:// केवल localhost के लिए अनुमत है।"],
"JOcPqH": ["एक रिमोट रिपॉज़िटरी को इस मशीन पर लाएँ।"],
+ "JOhCT9": ["भेजें में शामिल"],
"JWsZlx": ["संपादित करने के लिए कोई प्रोजेक्ट खोलें।"],
"JZ8cO6": ["हल्का, गहरा, या OS का अनुसरण।"],
"J_jZ5z": [
@@ -1548,6 +1549,9 @@
"KjTmeO": ["इस साझा सामग्री को खोलने के लिए OpenKnowledge अपडेट करें।"],
"KkEAud": ["मौजूदा दस्तावेज़ या फ़ोल्डर संदर्भ से एक फ़ाइल बनाएँ।"],
"KkRyMI": ["मर्ज को वर्गीकृत नहीं किया जा सका — फिर से कोशिश करें।"],
+ "KmVekT": [
+ "स्वचालित (केवल खींचें) आपके git रिमोट रिपॉज़िटरी से अपडेट लाता है और आपकी कॉपी को अपने आप आगे बढ़ाता है। आपके स्थानीय संपादन इसी कंप्यूटर पर रहते हैं और कभी पुश नहीं होते।"
+ ],
"KmydK6": ["गाढ़ा"],
"KnoB--": ["<0>", ["sanitized"], "</0> के रूप में सहेजा जाएगा।"],
"KpOJFY": ["बाहरी लिंक पूर्वावलोकन सक्षम करें"],
@@ -1555,6 +1559,7 @@
"KsAPaB": ["यह ब्रांच यहाँ चेक आउट है:"],
"KtACeE": ["डिफ़ॉल्ट: <0>", ["0"], "</0>"],
"KujtjC": ["खोजें"],
+ "KvwJv8": ["कुछ फ़ाइलें सूचीबद्ध नहीं हैं: वर्किंग ट्री में बहुत अधिक बदलाव हैं।"],
"Kx881F": [["0"], " बहाल कर दिया गया।"],
"L-rMC9": ["डिफ़ॉल्ट पर रीसेट करें"],
"L1BQTH": [["0"], " अभी इंस्टॉल नहीं है — इसका डाउनलोड पेज खोला जा रहा है।"],
@@ -1572,6 +1577,7 @@
"L83DKQ": ["PATH इंस्टॉल विफल रहा: ", ["summary"]],
"L8fKuc": ["इसे अपने टर्मिनल में चलाएँ"],
"L9Y9Om": ["सबसे ज़्यादा लिंक किए गए पेज"],
+ "L9ox9k": ["वर्किंग ट्री नहीं पढ़ा जा सका। सर्वर लॉग देखें।"],
"LAR9ub": [["0"], " में मौजूदा OpenKnowledge प्रविष्टि को बदल देगा"],
"LBv_TR": ["स्थानों को सिमलिंक में बदलें"],
"LBwUR6": ["ब्रांच बदलने में समय समाप्त — ", ["targetNoun"], " को हाथ से खोलने की कोशिश करें।"],
@@ -1595,7 +1601,6 @@
]
],
"LKOLNn": ["कोई AI एजेंट इंस्टॉल नहीं है"],
- "LNum6A": [["minutes"], " मिनट पहले"],
"LPAv9E": [["days"], " दिन पहले"],
"LQdLio": ["नई स्कीमा"],
"LQsCPn": ["स्थानीय कमिट इस प्रति को अद्यतित होने से रोक रहे हैं"],
@@ -1676,7 +1681,6 @@
"MCjC9A": [["deleteDescriptorLabel"], " हटाएँ"],
"MDBJwN": ["उपयोग करना कठिन"],
"MDZSJe": ["एजेंट अपना निर्धारित काम कब करता है।"],
- "MGBNwj": ["सिंक रोकें"],
"MGb89P": [
"CodeMirror के डिफ़ॉल्ट कीमैप से स्रोत संपादक की पंक्तियाँ डालें, हटाएँ, हिलाएँ, कॉपी करें और अंदर करें।"
],
@@ -1685,7 +1689,6 @@
"MIF36T": ["फ़ोर्क नहीं सुलझाया जा सका: ", ["0"]],
"MILoeL": ["सेवाएँ"],
"MJuO1q": ["संदर्भ विंडो:"],
- "MKEPCY": ["Follow"],
"MLVPcm": [["0"], " संस्करण ", ["1"]],
"MOAoFO": ["अभी तक कोई एजेंट फ़ोल्डर नहीं"],
"MPpSAg": [["selectedPackName"], " से नया प्रोजेक्ट बनाएँ"],
@@ -1744,6 +1747,7 @@
],
"N5rzKJ": [["0"], " स्किलें हटाएँ"],
"N6j2JH": [["0"], " संपादित करें"],
+ "N7Lau6": ["कमिट करें और सिंक करें"],
"NBdIgR": ["टिप्पणी करें"],
"NErvOX": ["यहाँ सहेजा गया"],
"NEzPEh": ["एक नई ब्रांच बनाएँ, या किसी मौजूदा को उसकी अपनी विंडो में चेक आउट करें।"],
@@ -1771,6 +1775,7 @@
"Nay2Yr": ["आपकी खोज से कोई एजेंट मेल नहीं खाता।"],
"NcUznW": [["0"], ", कोई कार्यक्षेत्र नहीं"],
"NcurBF": ["नीचे खिसकाएँ"],
+ "NcwbBM": ["खींचें से आएगा"],
"NeQ_0G": ["इन टिप्पणियों पर काम करें"],
"NeY1Np": ["Slidev शुरू होने में बहुत समय लगा। फिर से कोशिश करें।"],
"NfraGd": ["Slidev इंस्टॉल करने के अन्य तरीके"],
@@ -1814,6 +1819,7 @@
"O6yEPk": ["अपनी पसंद के फ़ोल्डर में एक नया OpenKnowledge प्रोजेक्ट बनाएँ।"],
"O7_W_a": ["AI से खोलें"],
"O9oQJS": ["रिपोर्ट भेजें"],
+ "OBdkpo": ["अलग किया गया HEAD"],
"OD0FCX": ["छिपी हुई “", ["basename"], "”"],
"ODGGlj": ["फ़ोल्डर का नाम: ", ["detail"]],
"OEEQKT": ["अच्छा"],
@@ -1869,6 +1875,7 @@
"Oo_WWc": ["कोई पेज नहीं मिला"],
"Oos8fo": ["कमांड कॉपी करें"],
"OplnBG": ["इस बिल्ड में AI टूल सँभालना उपलब्ध नहीं है।"],
+ "OqqecQ": ["30 सेकंड"],
"OsSaYm": ["क्लोन विफल: ", ["title"]],
"OuQezS": ["जब आप यह बातचीत फिर से शुरू करेंगे तब लागू होगा"],
"OuY8t9": ["मौजूदा ब्रांच में खोलें"],
@@ -1903,7 +1910,9 @@
"PBwmDJ": ["अर्थ के आधार पर खोजा जा रहा है"],
"PBxg_E": ["अभी नहीं"],
"PCSkw2": ["स्किल"],
+ "PEGxvo": ["5 मिनट"],
"PGPGsL": ["विवरण जोड़ें"],
+ "PGRnbw": ["अपडेट आपके रिमोट से आते हैं; आपके संपादन इसी कंप्यूटर पर रहते हैं।"],
"PHHEuH": ["हल की गई टिप्पणियाँ छिपाएँ (", ["0"], ")"],
"PIMM5l": ["आपने सदस्यता ले ली!"],
"PKLY-1": ["खोला जा रहा है…"],
@@ -1916,7 +1925,6 @@
"PRgIJh": [["subRoot"], " अपडेट नहीं किया जा सका: ", ["0"]],
"PRnH8G": [["0"], " में से"],
"PTUuoc": ["उस टिप्पणी का चिह्न नहीं हटाया जा सका — यह अब भी भेजे जाने की प्रतीक्षा में है।"],
- "PTb1Nx": ["सिंक रुका हुआ है। फिर से शुरू करने के लिए इसे वापस चालू करें।"],
"PVSwOe": ["दिशा बदली जा रही है — मौजूदा प्रक्रिया के रुकने की प्रतीक्षा…"],
"PVUn_c": ["फ़ोल्डर खोलें"],
"PVggyD": ["Frontmatter स्कीमा"],
@@ -1965,6 +1973,7 @@
"PrWQiT": ["Terminal को दाईं ओर ले जाएँ"],
"PrhzDE": ["ऊपर खिसकाएँ"],
"Pw5PTU": ["बाहरी origin"],
+ "PxZCNM": ["Open Knowledge जो कमिट करता है उसके दायरे से बाहर।"],
"Q-DKvr": [["source"], " से इंस्टॉल करें"],
"Q1mtyd": ["साइडबार छिपाएँ"],
"Q5fqMz": ["कनेक्शन त्रुटि — फिर कोशिश करें"],
@@ -2004,6 +2013,7 @@
["childCount", "plural", { "one": ["#", " आइटम"], "other": ["#", " आइटम"] }],
" हैं"
],
+ "QeREu8": ["नाम बदला गया"],
"QfFBdJ": ["टेम्पलेट का फ़ाइल-नाम (`.md` के बिना)।"],
"Qft6eW": [["0"], " स्किलें ग्लोबल में ले जाएँ"],
"Qj4RL5": ["पूर्ण हुआ:"],
@@ -2184,13 +2194,9 @@
"Sr9xtj": ["वे फ़ोल्डर चुनें जिन पर यह स्कीमा लागू होती है"],
"SrOuyg": ["दस्तावेज़ पैनल"],
"SvBFYA": ["कोई हाल का प्रोजेक्ट नहीं"],
- "Sxx_Zz": [
- "इस वर्कट्री के लिए Follow चालू है, जो ",
- ["project"],
- " से विरासत में मिला है। इसे Settings → Sync में बदलें।"
- ],
"T-654M": ["PDF लोड हो रही है"],
"T0OVm7": ["डिफ़ॉल्ट ब्रांच सुरक्षित है — भेजने के लिए एक पुल रिक्वेस्ट चाहिए।"],
+ "T1fMJ6": ["यह कंप्यूटर आपके रिमोट से कितनी बार बदलाव खींचता है।"],
"T2fvhw": [["0"], " की सभी टिप्पणियाँ अचिह्नित करें"],
"T3Mld1": ["विंडो"],
"T3j-7o": ["जैसे सिंक चलते समय प्रोजेक्ट बदलना"],
@@ -2234,10 +2240,10 @@
"U2pMtf": ["tag-name"],
"U3IvM5": ["पूरी मार्गदर्शिका"],
"U3RIJu": ["स्थानीय फ़ाइलें"],
- "U4nTfu": ["Follow सक्षम करें"],
"U5Spo9": ["सामग्री निर्देशिका प्रोजेक्ट के भीतर होनी चाहिए"],
"U6Mdhd": ["चलिए सेटअप करते हैं।"],
"U6wmNc": ["सिंक रुका हुआ"],
+ "U7Iesw": [["seconds"], " सेकंड"],
"U88xbi": ["स्कीमा फ़ाइल बनाने में विफल"],
"U8CD-l": ["पूरा पथ कॉपी करें, कोई कार्यक्षेत्र नहीं"],
"UBv8UK": ["स्थायी रूप से हटाएँ"],
@@ -2273,7 +2279,6 @@
"URmyfc": ["विवरण"],
"UTNVyS": ["पूरा स्रोत दस्तावेज़ चुनें।"],
"UTZ97u": ["चयन प्रोजेक्ट के भीतर होना चाहिए"],
- "UVDasf": ["सिंक बंद है — जब तक आप हाथ से कमिट और पुश नहीं करते तब तक आपके संपादन इसी कंप्यूटर पर रहते हैं।"],
"UVLlMV": ["GitHub तक नहीं पहुँचा जा सका। फिर कोशिश करें?"],
"UW2Fg3": [
"इस प्रोजेक्ट का चल रहा सर्वर जीवंत संपादन का समर्थन नहीं करता। ठीक करने के लिए OpenKnowledge पुनः आरंभ करें।"
@@ -2310,6 +2315,7 @@
"UhpfxY": ["बाएँ खिसकाएँ"],
"UkQGhd": ["बदलें छिपाएँ"],
"UlVARL": ["Slidev चालू करें"],
+ "Uo2Rj7": ["स्वचालित (खींचें और भेजें) चालू करें?"],
"Uobeu9": ["स्किल को ", ["rootRel"], " में जोड़ता है — जिसे ", ["0"], " भी पढ़ता है"],
"Up2_7p": ["पूरा पथ कॉपी करें"],
"UpCz01": ["यह दस्तावेज़"],
@@ -2375,6 +2381,7 @@
"VdXv4D": ["GitHub से क्लोन करें"],
"VeVIIk": ["स्किल लोड हो रही हैं"],
"Vftef5": ["सामान्य markdown समस्याएँ — हार्ड टैब, शीर्षक स्तर, सूची चिह्न, और भी बहुत कुछ।"],
+ "Vl1H8I": ["सिंक जारी रखने के लिए फिर से कनेक्ट करना ज़रूरी है।"],
"Vlc75q": ["फ़ाइल हटी हुई ही रखें"],
"VmJT51": ["आपकी रिपोर्ट लोड हो रही हैं"],
"VmXASo": ["(सिमलिंक)"],
@@ -2396,6 +2403,7 @@
["rootPath"],
"</0> पर पहले से एक OpenKnowledge प्रोजेक्ट मौजूद है। उसके बाहर कोई स्थान चुनें, या उसी प्रोजेक्ट को खोलें।"
],
+ "W7mERj": ["स्वचालित (केवल खींचें) चालू करें?"],
"W8vpBM": ["स्टार्टर पैक"],
"W9NSe0": ["लिंक की जाँच की जा रही है"],
"W9_Bub": ["स्थानीय बदलाव आने वाले सिंक से टकराते हैं"],
@@ -2413,6 +2421,7 @@
" चयनित आइटम हटाना चाहते हैं? फ़ोल्डर और उनके भीतर की सभी फ़ाइलें हट जाएँगी। यह क्रिया वापस नहीं ली जा सकती।"
],
"WMsoIm": ["पहले से साइन इन हैं?"],
+ "WOfp4H": ["सिंक अंतराल अपडेट नहीं हो सका — ", ["detail"]],
"WOr-hW": ["टोकन"],
"WPwDin": ["फ़ोल्डर डिस्क पर खोलें"],
"WR0y2O": ["फ़ोल्डर साझा करें"],
@@ -2431,6 +2440,7 @@
"Wcv-Zi": ["इस ज्ञान आधार को एक Claude Skill के रूप में उपलब्ध कराएँ।"],
"We7h2I": ["📝 या assets/icon.png"],
"Weq9zb": ["सामान्य"],
+ "WfcERq": ["कमिट करने को कुछ नहीं: वर्किंग ट्री साफ़ है।"],
"Wfy3rU": ["एजेंट सेटिंग"],
"Wgmlsw": ["लाया जा रहा है"],
"Wh0im4": ["[[", ["realCurrentDoc"], "]] संपादित किया जा रहा है"],
@@ -2484,7 +2494,6 @@
"XRuL0i": ["पेज बनाएँ"],
"XSb9HS": ["स्थानीय संपादन छोड़ें, इंस्टॉल किया गया संस्करण बहाल करें"],
"XT-L4j": ["AI से बनाने के लिए कोई एजेंट चालू करें"],
- "XU0OXn": ["स्वत: सिंक सक्षम करें"],
"XU5AOg": ["इनपुट"],
"XV5sC0": ["वर्कट्री खोलें"],
"XW18jo": ["पेज शीर्षकों की प्रतिक्रिया सफलता स्कीमा से मेल नहीं खाई"],
@@ -2533,6 +2542,7 @@
"Xp7Kq4": ["एक और सिंक कार्रवाई चल रही है। कुछ देर बाद फिर कोशिश करें।"],
"Xp94R1": ["एक बार और कोशिश करें"],
"XpIZmv": ["मोनोस्पेस पाठ वाला बाड़बंद कोड ब्लॉक।"],
+ "Xs1kjx": ["अपडेट जाँचने की आवृत्ति"],
"Xs7IcT": [["displayName"], " तक नहीं पहुँचा जा सका। फिर कोशिश करें?"],
"XszXjc": ["नाम बदलकर ", ["0"], " किया गया"],
"XtRoxT": ["पेज ", ["pageNumber"]],
@@ -2565,6 +2575,7 @@
"Lint प्लगइन — कौन से नियम परिवार चलते हैं और उनकी प्रति-नियम सेटिंग — इस प्रोजेक्ट → Plugins के अंतर्गत उनके अपने टैब पर कॉन्फ़िगर होते हैं।"
],
"YEP3X2": ["जब सक्रिय तालिका सेल चयन पूरी तालिका को घेरता हो तब तालिका हटाएँ।"],
+ "YEzhIr": ["खींचें और भेजें"],
"YGIi_c": ["फिर से इंस्टॉल करें"],
"YGNRB5": ["— सिवाय"],
"YGt-0e": ["पढ़ा जा रहा है…"],
@@ -2602,7 +2613,6 @@
"केवल इस कंप्यूटर पर इस प्रोजेक्ट पर लागू होता है। .ok/local में सहेजा जाता है, git के ज़रिए साझा नहीं होता।"
],
"Yp-Hi_": ["सेटिंग खोलें"],
- "YsEYYS": [["behind", "plural", { "one": ["#", " कमिट पीछे"], "other": ["#", " कमिट पीछे"] }]],
"YvwwqC": ["कहाँ"],
"YwPUUP": ["यह पैक यहाँ पहले से सेट अप है।"],
"YxZDGh": [
@@ -2701,7 +2711,6 @@
"ZscwQ0": ["केवल मेरे लिए पर नहीं जाया जा सका"],
"Zt7Ktx": ["पथ स्किल से बाहर नहीं जा सकता (. या .. नहीं)"],
"Zue_jx": ["आपके GitHub टोकन में आवश्यक स्कोप नहीं हैं। फिर से साइन इन करके देखें।"],
- "Zul8Ry": ["कभी नहीं"],
"ZvzbDF": ["इसे सीधे इस प्रोजेक्ट में जोड़ें।"],
"ZwpggY": ["OpenKnowledge ने प्रोजेक्ट सेटिंग्स पढ़ीं"],
"_0JUKX": ["बग रिपोर्टिंग के लिए OpenKnowledge डेस्कटॉप ऐप चाहिए।"],
@@ -2828,9 +2837,6 @@
"ai40UJ": ["नया रिकॉर्ड · फिर से खेलने के लिए <0>स्पेस</0> दबाएँ"],
"aiArms": ["हम यह रिपॉज़िटरी क्लोन नहीं कर सके।"],
"aiOceC": ["अनुक्रमणिका सक्षम करें"],
- "ajHi4O": [
- "स्वत: सिंक रुका हुआ है — आपके पास इस रिपॉज़िटरी में पुश करने की अनुमति नहीं है। अपडेट पाते रहने के लिए Follow पर जाएँ।"
- ],
"ajz9F8": [["filePath"], " की टकराव सामग्री लोड नहीं हो सकी। पेज फिर से लोड करने की कोशिश करें।"],
"ak4LLg": ["मेन्यू साफ़ करें"],
"akOe4q": [
@@ -2847,7 +2853,6 @@
"arUUsK": ["उत्पाद अपडेट"],
"ax9kie": ["लिंक पूर्वावलोकन सेटिंग अभी लोड नहीं हुई — कुछ देर बाद फिर कोशिश करें"],
"axQ1h6": ["कुछ और जोड़ना चाहेंगे? (वैकल्पिक)"],
- "az8lvo": ["बंद"],
"b18t0_": ["अंतर बंद करें"],
"b1FDss": ["शुरुआत तक स्क्रॉल करें"],
"b2ezG_": ["दोनों रखे गए — \"", ["0"], "\" अब अपनी अलग स्किल है"],
@@ -2934,6 +2939,7 @@
],
"cH0dkG": ["इसमें वह सुविधा नहीं थी जो मुझे चाहिए थी"],
"cHhH3i": ["एक आवश्यक git टूल"],
+ "cIFYZn": ["जब तक आप साइन आउट हैं, इस सेटिंग के बावजूद अपडेट अधिकतम हर 3 मिनट में जाँचे जाते हैं।"],
"cIptmH": ["Claude Desktop App में"],
"cKjLuT": ["(प्रोजेक्ट + उपयोगकर्ता)"],
"cLP0Lf": ["रिमोट स्किल स्रोत"],
@@ -2995,6 +3001,8 @@
"ct2kv5": [["pageTarget"], " में कोई शीर्षक नहीं"],
"cuA8QW": ["स्पेक व्यवस्थित करें"],
"cuHhjo": ["बनाएँ और संपादित करें"],
+ "cyoNqf": ["मर्ज नहीं हुआ"],
+ "czQDKY": ["हर पुश आपके रिमोट पर एक कमिट है।"],
"d-GtJt": ["स्रोत Markdown में देखें"],
"d1JjXo": [
"ब्रांच <0>",
@@ -3078,6 +3086,9 @@
"eGUbmF": ["चयनित फ़ाइल या फ़ोल्डर कॉपी करें"],
"eJitUk": ["कंप्यूटर से अपलोड करें"],
"eKThTQ": ["क्रम बदलने में विफल"],
+ "eNOyTV": [
+ "आपके पास इस रिपॉज़िटरी में पुश करने की अनुमति नहीं है। स्वचालित (केवल खींचें) फिर भी आपकी कॉपी अद्यतित रख सकता है।"
+ ],
"eNQGRb": ["KaTeX द्वारा रेंडर किया गया इनलाइन LaTeX गणित।"],
"eNhWUl": ["एक PR समीक्षक, एक रिलीज़-नोट्स लेखक, एक तैनाती चेकलिस्ट…"],
"ePK91l": ["संपादित करें"],
@@ -3107,6 +3118,7 @@
"emMrXQ": ["सर्वर ने गलत प्रारूप वाली डुप्लिकेट प्रतिक्रिया लौटाई।"],
"emgiet": ["आधिकारिक सामग्री; जहाँ भी संदर्भित हो वहाँ हूबहू प्रतिबिंबित।"],
"enPTnx": ["पंक्ति ", ["displayLine"]],
+ "eolhcI": ["वर्किंग ट्री पढ़ी जा रही है"],
"eps54V": ["हटाया गया"],
"epuNYK": [
"किसी ब्लॉक को सत्य के स्रोत के रूप में चिह्नित करें। जैसे-जैसे आप उसे संपादित करते हैं, बाकी जगहों के मिरर तुरंत अद्यतित होते हैं।"
@@ -3114,7 +3126,6 @@
"erenF-": ["जिन फ़ाइलों के विरोध हल नहीं हुए हैं, उन्हें हटाया नहीं जा सकता"],
"euGaS0": [["fileName"], " पढ़ नहीं सका।"],
"euc6Ns": ["नकल बनाएँ"],
- "evHlIg": ["Follow आपके स्थानीय बदलाव कभी नहीं भेजता या कमिट करता। वे केवल इसी मशीन पर रहते हैं।"],
"evs0iw": ["\"", ["tagListQuery"], "\" से मेल खाते टैग"],
"ewSbS_": ["Shell सत्र"],
"ezUmoU": ["अनुमत तत्व मान (खाली = कोई भी)"],
@@ -3189,7 +3200,6 @@
}
]
],
- "g2Tj8R": ["पूर्ण"],
"g3UF2V": ["स्वीकारें"],
"g4WlQK": ["प्रोजेक्ट के AI टूल सँभालना केवल OpenKnowledge डेस्कटॉप ऐप में उपलब्ध है।"],
"g4XBm0": ["छोटा अनुभाग शीर्षक।"],
@@ -3205,7 +3215,6 @@
["display"],
" में मिलाना है। वह फ़ोल्डर इसका सिमलिंक बन जाता है, इसलिए उसका एजेंट यहाँ रखी हर चीज़ पढ़ता है। यह फ़ोल्डर असली बना रहता है। टकराने वाली स्किल मर्ज रोक देती हैं।"
],
- "g85bAo": [["lastSyncedRelative"], " सिंक हुआ"],
"g9Nj4l": ["// नोट"],
"gAhHu7": ["स्वत: सुधार केवल उन्हीं समस्याओं पर लागू होता है जिनका कोई ज्ञात यांत्रिक समाधान है।"],
"gBbxn_": ["साइन-इन स्थिति जाँची जा रही है"],
@@ -3269,6 +3278,7 @@
"gwEcOD": ["आपकी स्थानीय प्रति पीछे है।"],
"gwykHF": ["यह दस्तावेज़ अभी GitHub पर सिंक नहीं हुआ है। अगले सिंक के बाद लिंक काम करेगा।"],
"gyHDWC": ["AI से सब ठीक करें (", ["count"], ")"],
+ "gyYvCN": ["मेरे संपादन भेजने की आवृत्ति"],
"h-AdvS": ["फ़ोल्डर और टेम्पलेट पहले से यहीं हैं, इसलिए जोड़ने को कुछ नहीं है।"],
"h06R3C": ["किसी पेज पर जाने वाले ग्राफ़ लिंक अनुपस्थित नहीं हैं।"],
"h16FyT": ["सूचियाँ"],
@@ -3340,7 +3350,6 @@
"hwFOFD": ["सेटिंग लोड नहीं हो सकीं"],
"hxBHxQ": ["फ़ुटनोट<0><1>[1]</1></0> वाली एक पंक्ति और नीचे दिखाई गई परिभाषा।"],
"hxEUVJ": [["selectedPackName"], " आरंभ करें"],
- "hxYFzm": ["पूर्ण सिंक — आपके कमिट भेजे जाते हैं और रिमोट बदलाव अपने आप आ जाते हैं।"],
"hxnF0I": [["0"], " प्रॉपर्टी"],
"hyCxJY": ["इसके बजाय वह वर्कट्री खोलें"],
"hynz2K": ["डाउनलोड शुरू हुआ"],
@@ -3354,7 +3363,6 @@
"i09An-": ["एक पुराना संस्करण बहाल किया गया (", ["0"], ")"],
"i1flq_": ["विकी लिंक सुझाव"],
"i3f2kh": ["कोई मेल खाता कमांड नहीं।"],
- "i6ng22": ["Follow पर जाएँ"],
"i92eAT": ["हम एक रिपॉज़िटरी बनाकर सिंक शुरू कर देंगे — किसी टर्मिनल की ज़रूरत नहीं।"],
"i94lQe": ["OpenKnowledge ने विरोधों की जाँच की"],
"i9OyGp": ["पूर्ववत या फिर से करें"],
@@ -3439,11 +3447,11 @@
],
"iqugog": ["आरंभ विफल: ", ["errorDetail"]],
"irFGwu": ["टेम्पलेट सूची"],
+ "irnKr_": [["updatedRelative"], " अपडेट हुआ"],
"irrm_E": ["चयन हटाएँ"],
"isRobC": ["नया"],
"iuTKci": ["अभी कोई संपादन नहीं।"],
"iv452l": [["0"], " का दस्तावेज़ीकरण (ब्राउज़र में खुलता है)"],
- "iy64Li": ["पूर्ण सिंक — आपके संपादन अपने आप कमिट होकर आपके रिमोट पर भेज दिए जाते हैं।"],
"iycx_A": ["भेजा जा रहा है"],
"iz1LdD": [
"OK के पिछली बार यहाँ लिखने के बाद से बाहर बदला गया — दिखाई गई स्थिति वही है जो अभी डिस्क पर है"
@@ -3493,6 +3501,7 @@
],
"jSY41h": ["\"", ["docName"], "\" में बहुत समय लगा। अपना कनेक्शन जाँचें।"],
"jTLWxh": ["एक बाहरी पेज को इनलाइन iframe में एम्बेड करें (दस्तावेज़, डेमो, Figma, CodeSandbox)।"],
+ "jTUxaN": ["स्वचालित (केवल खींचें) चालू करें"],
"jWzDfC": ["जाँच रहे हैं कि आपके पास कौन-से AI टूल हैं"],
"jZ_E5M": ["फ़ेच विफल — विवरण के लिए सर्वर लॉग देखें।"],
"j_Z6g7": ["साझा डिफ़ॉल्ट"],
@@ -3583,13 +3592,15 @@
"अर्थ-आधारित खोज को किसी भी OpenAI-संगत एम्बेडिंग एंडपॉइंट पर लगाएँ — कोई स्वयं-होस्ट किया सर्वर या कोई दूसरा प्रदाता। ऊपर दी API कुंजी उसी एंडपॉइंट के लिए है जो आप यहाँ सेट करते हैं।"
],
"kSiB3X": [["trashNoun"], " में नहीं ले जाया जा सका"],
- "kUn-CN": ["सिंक बंद"],
"kV2YZv": [
"<0>Skills</0> नहीं दिख रहा? पहले <1>Settings <2/> Capabilities <3/> Code execution and file creation</1> सक्षम करें।"
],
"kVS5tE": ["प्रत्येक फ़ोल्डर में generated अनुक्रमणिका बनाए रखें?"],
"kVgQUA": ["यह चैट हटाएं?"],
"kVzuTI": ["अनुशंसित एजेंट कौशल"],
+ "kXNv8P": [
+ "स्वचालित (केवल खींचें) आपके स्थानीय बदलावों को कभी पुश या कमिट नहीं करता। वे केवल इसी मशीन पर रहते हैं।"
+ ],
"kYL1lH": ["एजेंट गतिविधि"],
"k_Dqw1": [
[
@@ -3676,6 +3687,7 @@
"lM4c-I": [
"स्किल के भीतर का एक पथ — कोई भी फ़ोल्डर चलेगा (जैसे references/notes.md)। पथ के फ़ोल्डर आपके लिए बना दिए जाते हैं।"
],
+ "lPkjpD": [["pushed"], " भेजा"],
"lPzyrU": ["सभी हंक सुलझा दिए गए"],
"lS83Sg": ["क्लिपबोर्ड तक नहीं पहुँचा जा सका।"],
"lScd1O": ["Slidev डेक केवल OpenKnowledge डेस्कटॉप ऐप में खुलते हैं।"],
@@ -3984,6 +3996,7 @@
"pJ7XCo": ["यह पेज किसी स्थानीय फ़ाइल या छवि को संदर्भित नहीं करता।"],
"pMPnZv": [["deleted"], " स्किलें हटाई गईं"],
"pOo4Aa": ["सादा टेक्स्ट"],
+ "pPiV8s": ["स्वचालित (खींचें और भेजें) चालू करें"],
"pSimwP": [["editor"], " संस्करण के लिए नया नाम"],
"pTPqMK": ["बाड़बंद कोड ब्लॉक चालू या बंद करें।"],
"pTyA_t": ["टैग"],
@@ -4048,6 +4061,7 @@
"qAx7xG": ["सामग्री रूट में निश्चित फ़ोल्डर"],
"qBi_YG": ["अपने AI टूल में OpenKnowledge इंस्टॉल करें"],
"qC7PwZ": ["फ़ील्ड हटाने में विफल"],
+ "qD3krc": ["जब तक आप न कहें, कुछ नहीं चलेगा।"],
"qEEfPk": ["बग रिपोर्ट ", ["0"]],
"qEIFZu": [["keyHint"], " पर समाप्त होने वाली कुंजी"],
"qEue6Q": [" या "],
@@ -4056,6 +4070,9 @@
"qIJIrD": ["जाँचा जा रहा है"],
"qJSo0_": ["प्रतियों और सिमलिंक में क्या अंतर है?"],
"qKMfPp": ["स्किल नोड छिपाएँ"],
+ "qLXJTB": [
+ "इस प्रोजेक्ट को अपने git रिमोट के साथ सिंक में रखें। स्वचालित (केवल खींचें) बिना पुश किए अपडेट लाता है; स्वचालित (खींचें और भेजें) आपके संपादन भी भेजता है। स्वचालित सिंक चालू करने के लिए पुष्टि ज़रूरी है।"
+ ],
"qNOgUu": ["स्रोत पर किए गए संपादन यहाँ आते हैं — कॉपी-पेस्ट का कोई बिखराव नहीं।"],
"qQi_um": ["थीम आयात की गई।"],
"qRZh7J": ["Tab को अंदर करने के बजाय स्रोत संपादक से बाहर जाने दें।"],
@@ -4071,7 +4088,6 @@
"qXg5W9": ["फ़ाइल <0>~/Downloads/openknowledge.skill</0> में सहेजी जाती है।"],
"qXsafh": ["GitHub पर प्रकाशित करें"],
"qZv5ZR": ["कॉन्फ़िग साझाकरण टॉगल विफल"],
- "q_9EcE": ["git स्वत: सिंक सक्षम करें?"],
"q_Q1-i": [
[
"count",
@@ -4154,7 +4170,6 @@
["boldName"],
" का पूर्वावलोकन है — एक अंतर्निहित स्किल जो Open Knowledge के साथ आती है। यह केवल पढ़ने के लिए है।"
],
- "rn7n0G": ["सिंक फिर से शुरू करें"],
"rnX-1S": ["प्लगइन सक्षम करें"],
"rnrdEX": ["प्राथमिक"],
"roAe2K": ["लिंक URL"],
@@ -4194,6 +4209,7 @@
"sJK6pq": ["अनुमति नहीं"],
"sJWhgo": ["अज्ञात कंपोनेंट: ", ["unregisteredComponentName"]],
"sKEgGd": ["चैट में भेजें"],
+ "sKHiNR": [["count"], " पीछे"],
"sNeKjP": ["टोकन सहेजने में विफल — फिर कोशिश करें"],
"sOxZaS": ["ग्राफ़ लोड करने में विफल"],
"sQoLn0": ["बाहर निकलें"],
@@ -4217,6 +4233,7 @@
"scyoP9": [
"आपके ज्ञानकोष के मूल दस्तावेज़ को छोड़कर, अनुक्रमणिका दस्तावेज़ों में कोई frontmatter नहीं होता है। लॉग दस्तावेज़ कवर नहीं किए गए हैं - OKF उनके frontmatter को बाधित नहीं करता है।"
],
+ "sdvHp3": ["यहाँ और रिमोट दोनों पर बदले गए"],
"se-tU0": [["total"], " में से ", ["0"], " फ़ाइलें ठीक नहीं की जा सकीं।"],
"seeS6l": ["इस फ़ोल्डर में OpenKnowledge सेट अप करें?"],
"sgmRY8": [["0"], " डाउनलोड करना छोड़ दिया गया।"],
@@ -4232,6 +4249,9 @@
"snrVQ7": ["जाँच विफल"],
"sq4WQH": [["0"], " को हल्की थीम के रूप में उपयोग करें"],
"sqUrlK": ["मनन किया जा रहा है…"],
+ "srdlOs": [
+ "स्वचालित सिंक रुका हुआ है: आपके पास इस रिपॉज़िटरी में पुश करने की अनुमति नहीं है। अपडेट पाते रहने के लिए स्वचालित (केवल खींचें) पर जाएँ।"
+ ],
"ssk6rl": [
"स्किल का अपना फ़ोल्डर (",
["path"],
@@ -4253,12 +4273,12 @@
"डाउनलोड की जा सकने वाली फ़ाइल के लिए Notion-शैली की इनलाइन पंक्ति। खींचकर छोड़ना भी काम करता है।"
],
"t18QYR": [["accessibleLabel"], " अनपिन करें"],
- "t2TkQ3": ["सिंक रुका हुआ — फिर से शुरू करने के लिए टकराव सुलझाएँ।"],
"t4sFKC": [
"नई ब्रांच <0>",
["trimmed"],
"</0> मौजूदा कमिट से बनाई जाएगी, <1>.ok/worktrees/</1> के अंतर्गत उसके अपने वर्कट्री में।"
],
+ "t5I7P_": ["जब तक आप न कहें, कुछ नहीं चलेगा — सिंक मेनू से खींचें और भेजें।"],
"t6w1cq": ["एक खाली संपादक टैब खोलें।"],
"t7YoBO": ["यह टिप्पणी भेजें"],
"t9Qn8y": ["कोई एजेंट सक्षम नहीं"],
@@ -4295,6 +4315,7 @@
"tjXez2": ["blog-post"],
"tjbyOy": ["प्रोजेक्ट विवरण"],
"tkIXtS": [["imported"], " स्किल इंस्टॉल की गईं (", ["alreadyImported"], " पहले से मौजूद थीं)"],
+ "tlGXxX": ["स्वचालित (केवल खींचें)"],
"tnG-m6": ["स्वत: सिंक रुका हुआ है — फिर से शुरू करने के लिए साइन इन करें।"],
"toyw51": ["Mermaid आरेख नियंत्रण"],
"tqQBwN": ["कोई भी स्क्रिप्ट समीक्षा के लिए दिखाई जाती है, कभी चलाई नहीं जाती।"],
@@ -4321,6 +4342,7 @@
"u779EG": ["एक http:// या https:// origin का उपयोग करें।"],
"u7H-Wn": ["पैनल दिखाएँ (", ["panelShortcutLabel"], ")"],
"u7U_Ij": ["चयनित पाठ को लिंक करें, या कर्सर के नीचे वाला लिंक संपादित करें।"],
+ "uAQUqI": ["स्थिति"],
"uA_jXp": ["ब्रांच बदलें और अपडेट करें"],
"uBAxNB": ["संपादक"],
"uCaIdy": [
@@ -4351,9 +4373,6 @@
"सर्वर पुनः आरंभ नहीं किया जा सका — यह किसी दूसरे खाते के अंतर्गत चल रहा है। इसे साफ़ करने के लिए अपना कंप्यूटर पुनः आरंभ करें, फिर यह प्रोजेक्ट दोबारा खोलें।"
],
"uUCrBv": ["सिमलिंक"],
- "uUiiyC": [
- "आपके पास इस रिपॉज़िटरी में पुश करने की अनुमति नहीं है। Follow फिर भी आपकी प्रति को अद्यतित रख सकता है।"
- ],
"uVbUP8": ["सेटिंग…"],
"uY5Z7P": ["खेल समाप्त · फिर से खेलने के लिए <0>स्पेस</0> दबाएँ"],
"uYZTcW": ["यह GitHub URL साझा नहीं किया जा सकता।"],
@@ -4395,6 +4414,7 @@
"v15iQB": [
"प्रमाणित-गणना अनुबंध। केवल Attested Computation टाइप किए गए दस्तावेज़ों पर लागू होता है, जहां OKF को runtime की आवश्यकता होती है; सामान्य अवधारणाएँ अप्रभावित रहती हैं।"
],
+ "v16Pzh": ["स्वचालित (केवल खींचें) पर जाएँ"],
"v2ZW0K": ["टर्मिनल सक्षम करें"],
"v2a04T": ["markdownlint नियम"],
"v41fCm": ["फ़ाइल नहीं मिली"],
@@ -4413,6 +4433,7 @@
"vF68cg": ["फ़ील्ड"],
"vGQxBT": ["स्रोत के अपडेट अपने आप लागू होते हैं (जब तक स्थानीय रूप से संपादित न किया गया हो)"],
"vGeNNQ": ["अपना प्रोजेक्ट सेट अप करने के लिए एक प्रॉम्प्ट कॉपी करके अपने एजेंट में चिपकाएँ।"],
+ "vGjmyl": ["हटाया गया"],
"vHlhDc": ["संपादित करने के लिए डबल-क्लिक करें"],
"vIxrEk": ["चौड़ाई के अनुसार"],
"vLyv1R": ["छिपाएँ"],
@@ -4459,8 +4480,10 @@
}
]
],
+ "vp5vfW": ["1 घंटा"],
"vppAju": ["नए जोड़े गए संलग्नक कहाँ रखे जाते हैं।"],
"vqJXNe": ["<0>open-knowledge-discovery</0> स्किल इंस्टॉल करें"],
+ "vsFXfP": ["भेजें में शामिल नहीं"],
"vv7kpg": ["रद्द किया गया"],
"vvWZnu": ["अंतर अनुपलब्ध"],
"vwV-kH": ["फ़ाइलें ठीक करना अप्रत्याशित रूप से रुक गया।"],
@@ -4525,6 +4548,11 @@
"wdzBgi": ["कॉन्फ़िग साझाकरण अब केवल मेरे लिए है।"],
"weP6me": ["दस्तावेज़ लोड नहीं हो सके — फिर कोशिश करने के लिए @ दोबारा टाइप करें"],
"wgNoIs": ["सब चुनें"],
+ "wk_v1X": [
+ "इस वर्कट्री के लिए सिंक “स्वचालित (खींचें और भेजें)” पर सेट है, जो ",
+ ["project"],
+ " से विरासत में मिला है। इसे Settings → Sync में बदलें।"
+ ],
"wlwXUk": [
"आपने ~/Downloads चुना। वहाँ की फ़ाइलें आमतौर पर अस्थायी होती हैं — इसके बजाय किसी स्थिर फ़ोल्डर पर विचार करें।"
],
@@ -4564,6 +4592,7 @@
"xCdTnb": ["नया टैब बंद करें"],
"xDBki3": ["शीर्षक सुझाव"],
"xDEcka": ["प्रदाता इस कुंजी की दर सीमित कर रहा है। कुछ देर बाद फिर कोशिश करें।"],
+ "xDKOFk": ["अनदेखा किया गया"],
"xEb24l": ["हमें ईमेल से आगे संपर्क करने दें"],
"xFQRu4": ["यह मेरे पास पहले से स्थानीय रूप से है"],
"xG4tb6": ["\"", ["docName"], "\" से कनेक्शन टूट गया।"],
@@ -4575,6 +4604,7 @@
"xOTzt5": ["अभी-अभी"],
"xSVO3J": ["क्या बनता है"],
"xV5sXw": [["0"], " सप्ताह पहले"],
+ "xW5AUw": [["pulled"], " खींचा"],
"xWEvuo": ["AI से पूछें"],
"xWomUD": [["editor"], " संस्करण उपयोग करें"],
"xXo8FT": ["सहेजना विफल: ", ["error"]],
@@ -4707,6 +4737,7 @@
"zAJzIg": [["0"], " में समस्याएँ"],
"zAsDLY": ["दस्तावेज़ लिंक का ग्राफ़ चित्रण"],
"zBUqvf": ["OpenKnowledge एकीकरण सेट अप करें…"],
+ "zBiFZh": ["आपके संपादन अपने आप कमिट होकर आपके रिमोट पर भेज दिए जाते हैं।"],
"zC5jrM": ["<0>", ["effective"], "</0> के रूप में बनाया जाएगा"],
"zD1Nqf": [["count", "plural", { "one": ["#", " दस्तावेज़"], "other": ["#", " दस्तावेज़"] }]],
"zFH7iU": ["नेटवर्क सेटिंग्स पूरी तरह साफ़ नहीं हो सकीं, लेकिन एक्सपोज़र बंद किया जा रहा है। ", ["0"]],
@@ -4720,6 +4751,7 @@
"zLak8b": ["नया टैब सक्रिय करें"],
"zMmwh4": ["कोई थीम चुनें या अपनी थीम बनाएँ।"],
"zQBg2C": ["मौजूदा ब्लॉक को एक स्थान ऊपर या नीचे ले जाएँ।"],
+ "zWZBPx": ["प्रकार बदला गया"],
"zXj1rA": ["अर्थ के अनुसार खोजें"],
"zYp8Sr": [
"<0>संशोधित</0> बैज उन नियमों को चिह्नित करता है जिन्हें आपका कॉन्फ़िग स्पष्ट रूप से सेट करता है — सीधे, या <1>extends</1> के माध्यम से विरासत में। बिना चिह्न वाले नियम अपनी डिफ़ॉल्ट स्थिति में रहते हैं।"
@@ -4760,7 +4792,6 @@
" पर नहीं। ",
["expectedHost"],
" से क्लोन किया गया कोई फ़ोल्डर चुनें?"
- ],
- "zz_Wd_": ["मोड"]
+ ]
}
}
diff --git a/packages/app/src/locales/hi/messages.po b/packages/app/src/locales/hi/messages.po
index 075620778..929dcec3a 100644
--- a/packages/app/src/locales/hi/messages.po
+++ b/packages/app/src/locales/hi/messages.po
@@ -517,10 +517,6 @@ msgstr "{ahead} आगे, {behind} पीछे"
msgid "{basename} — text editor"
msgstr "{basename} — टेक्स्ट संपादक"
-#: src/components/SyncStatusBadge.tsx
-msgid "{behind, plural, one {# commit behind} other {# commits behind}}"
-msgstr "{behind, plural, one {# कमिट पीछे} other {# कमिट पीछे}}"
-
#: src/components/SyncStatusBadge.tsx
msgid "{behind} behind"
msgstr "{behind} पीछे"
@@ -616,6 +612,14 @@ msgstr "{count, plural, one {# समस्या तुरंत ठीक क
msgid "{count, plural, one {matches # file} other {matches # files}}"
msgstr "{count, plural, one {# फ़ाइल से मेल खाता है} other {# फ़ाइलों से मेल खाता है}}"
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} ahead"
+msgstr "{count} आगे"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} behind"
+msgstr "{count} पीछे"
+
#: src/components/SkillBulkDeleteDialog.tsx
msgid "{count} skills"
msgstr "{count} स्किलें"
@@ -811,14 +815,11 @@ msgstr "{displayLine} पंक्ति पर {localizedMessage}"
msgid "{mins, plural, one {# min ago} other {# min ago}}"
msgstr "{mins, plural, one {# मिनट पहले} other {# मिनट पहले}}"
-#: src/components/SyncStatusBadge.tsx
-msgid "{minutes} min ago"
-msgstr "{minutes} मिनट पहले"
-
#: src/components/acp/ThreadHistoryMenu.tsx
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "{minutes}m ago"
msgstr "{minutes} मिनट पहले"
@@ -910,6 +911,10 @@ msgstr "{propertyCount, plural, one {# प्रॉपर्टी} other {# प
msgid "{propPanelDescriptorLabel} Properties"
msgstr "{propPanelDescriptorLabel} प्रॉपर्टी"
+#: src/components/settings/SyncSection.tsx
+msgid "{seconds} seconds"
+msgstr "{seconds} सेकंड"
+
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
@@ -1123,6 +1128,26 @@ msgstr "📝 या assets/icon.png"
msgid "0/0"
msgstr "0/0"
+#: src/components/settings/SyncSection.tsx
+msgid "1 hour"
+msgstr "1 घंटा"
+
+#: src/components/settings/SyncSection.tsx
+msgid "1 minute"
+msgstr "1 मिनट"
+
+#: src/components/settings/SyncSection.tsx
+msgid "15 minutes"
+msgstr "15 मिनट"
+
+#: src/components/settings/SyncSection.tsx
+msgid "30 seconds"
+msgstr "30 सेकंड"
+
+#: src/components/settings/SyncSection.tsx
+msgid "5 minutes"
+msgstr "5 मिनट"
+
#: src/components/ImportSkillForm.tsx
msgid "A .zip or .skill archive."
msgstr "एक .zip या .skill संग्रह।"
@@ -1517,6 +1542,7 @@ msgstr "इस संदेश में अपनी टिप्पणिय
#: src/components/PropertyDiffBlock.tsx
#: src/components/SkillDirectoryResult.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Added"
msgstr "जोड़ा गया"
@@ -1561,11 +1587,13 @@ msgstr "ये फ़ाइलें जोड़ता है"
msgid "Adds these folders"
msgstr "ये फ़ोल्डर जोड़ता है"
+#: src/components/settings/SyncSection.tsx
#: src/editor/components/PropPanel.tsx
msgid "Advanced"
msgstr "उन्नत"
#: src/components/ConsentDialogBody.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Advanced settings"
msgstr "उन्नत सेटिंग"
@@ -1975,6 +2003,24 @@ msgstr "आधिकारिक सामग्री; जहाँ भी स
msgid "Authorize in browser"
msgstr "ब्राउज़र में प्राधिकृत करें"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull and Push)"
+msgstr "स्वचालित (खींचें और भेजें)"
+
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull only)"
+msgstr "स्वचालित (केवल खींचें)"
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
+msgstr "स्वचालित (केवल खींचें) आपके git रिमोट रिपॉज़िटरी से अपडेट लाता है और आपकी कॉपी को अपने आप आगे बढ़ाता है। आपके स्थानीय संपादन इसी कंप्यूटर पर रहते हैं और कभी पुश नहीं होते।"
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) never pushes or commits your local changes. They stay only on this machine."
+msgstr "स्वचालित (केवल खींचें) आपके स्थानीय बदलावों को कभी पुश या कमिट नहीं करता। वे केवल इसी मशीन पर रहते हैं।"
+
#: src/components/settings/TerminalSection.tsx
msgid "Auto-approve settings not yet loaded — try again in a moment"
msgstr "स्वत: स्वीकृति सेटिंग अभी लोड नहीं हुई — कुछ देर बाद फिर कोशिश करें"
@@ -2008,21 +2054,13 @@ msgstr "स्वत: सुधार केवल उन्हीं समस
msgid "Auto-save"
msgstr "स्वत: सहेजना"
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is off for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "इस वर्कट्री के लिए स्वत: सिंक बंद है, जो {project} से विरासत में मिला है। इसे Settings → Sync में बदलें।"
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "इस वर्कट्री के लिए स्वत: सिंक चालू है, जो {project} से विरासत में मिला है। इसे Settings → Sync में बदलें।"
-
#: src/components/settings/SyncSection.tsx
msgid "Auto-sync is paused — sign in to resume."
msgstr "स्वत: सिंक रुका हुआ है — फिर से शुरू करने के लिए साइन इन करें।"
#: src/components/settings/SyncSection.tsx
-msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Follow to keep receiving updates."
-msgstr "स्वत: सिंक रुका हुआ है — आपके पास इस रिपॉज़िटरी में पुश करने की अनुमति नहीं है। अपडेट पाते रहने के लिए Follow पर जाएँ।"
+msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Auto (Pull only) to keep receiving updates."
+msgstr "स्वचालित सिंक रुका हुआ है: आपके पास इस रिपॉज़िटरी में पुश करने की अनुमति नहीं है। अपडेट पाते रहने के लिए स्वचालित (केवल खींचें) पर जाएँ।"
#: src/components/AutoSyncEnableWarning.tsx
msgid "Auto-sync periodically fetches, pulls, and pushes commits to your remote git repository so your edits stay in sync across machines."
@@ -2420,9 +2458,14 @@ msgid "Change the embeddings provider?"
msgstr "एम्बेडिंग प्रदाता बदलें?"
#: src/components/PropertyDiffBlock.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Changed"
msgstr "बदला गया"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Changed here and on the remote"
+msgstr "यहाँ और रिमोट दोनों पर बदले गए"
+
#: src/components/ChangedOutsideBadge.tsx
msgid "changed outside"
msgstr "बाहर बदला गया"
@@ -2447,6 +2490,10 @@ msgstr "बदलाव अपने आप सहेज दिए गए।"
msgid "Check for updates"
msgstr "अपडेट देखें"
+#: src/components/settings/SyncSection.tsx
+msgid "Check for updates every"
+msgstr "अपडेट जाँचने की आवृत्ति"
+
#: src/components/AppMenubar.tsx
msgid "Check for updates…"
msgstr "अपडेट देखें…"
@@ -2966,6 +3013,10 @@ msgstr "इस कोड ब्लॉक पर टिप्पणी करे
msgid "Comments"
msgstr "टिप्पणियाँ"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Commit and sync"
+msgstr "कमिट करें और सिंक करें"
+
#: src/components/ShareBranchSwitchDialog.tsx
msgid "Commit or stash changes to switch:"
msgstr "बदलने के लिए बदलाव कमिट या स्टैश करें:"
@@ -3267,6 +3318,7 @@ msgstr "बदला जा रहा है…"
#: src/components/empty-state/CopyablePromptList.tsx
#: src/components/InstallInClaudeDesktopDialog.tsx
+#: src/components/SyncStatusBadge.tsx
#: src/editor/extensions/CodeBlockView.tsx
msgid "Copied"
msgstr "कॉपी किया गया"
@@ -3882,6 +3934,10 @@ msgstr "भेजे जाने की प्रतीक्षा में
msgid "Couldn't read the comments waiting to send: {0}"
msgstr "भेजे जाने की प्रतीक्षा में मौजूद टिप्पणियाँ नहीं पढ़ी जा सकीं: {0}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Couldn't read the working tree. Check the server logs."
+msgstr "वर्किंग ट्री नहीं पढ़ा जा सका। सर्वर लॉग देखें।"
+
#. placeholder {0}: warning.code
#: src/components/settings/SavedThemesTiles.tsx
msgid "Couldn’t read this theme ({0})"
@@ -4455,6 +4511,10 @@ msgstr "यह चैट हटाएं?"
msgid "Delete this comment"
msgstr "यह टिप्पणी हटाएँ"
+#: src/components/SyncStatusBadge.tsx
+msgid "Deleted"
+msgstr "हटाया गया"
+
#. placeholder {0}: deletedTheme.label
#: src/components/settings/SavedThemesTiles.tsx
msgid "Deleted {0}."
@@ -4550,6 +4610,10 @@ msgstr "विवरण टोकन"
msgid "Design"
msgstr "डिज़ाइन"
+#: src/components/SyncStatusBadge.tsx
+msgid "detached HEAD"
+msgstr "अलग किया गया HEAD"
+
#: src/components/SyncStatusBadge.tsx
msgid "Detached HEAD — checkout a branch to resume"
msgstr "अलग किया हुआ HEAD — फिर से शुरू करने के लिए कोई ब्रांच चेक आउट करें"
@@ -4922,6 +4986,10 @@ msgstr "हर AI टूल स्किल अपने ही फ़ोल्
msgid "Each pack scaffolds your project with ready-made folders and templates."
msgstr "हर पैक आपके प्रोजेक्ट को तैयार फ़ोल्डर और टेम्पलेट के साथ ढाँचा देता है।"
+#: src/components/settings/SyncSection.tsx
+msgid "Each push is one commit to your remote."
+msgstr "हर पुश आपके रिमोट पर एक कमिट है।"
+
#: src/components/AppMenubar.tsx
#: src/components/settings/LintingSection.tsx
#: src/components/SkillsTree.tsx
@@ -5170,25 +5238,25 @@ msgstr "{id} सक्षम करें"
#: src/components/EnableSyncConfirmDialog.tsx
#: src/components/share-receive-miss-content.tsx
#: src/components/ShareFreshnessWarning.tsx
-msgid "Enable auto-sync"
-msgstr "स्वत: सिंक सक्षम करें"
+msgid "Enable Auto (Pull and Push)"
+msgstr "स्वचालित (खींचें और भेजें) चालू करें"
-#: src/components/settings/LinkPreviewsSection.tsx
-msgid "Enable external link previews"
-msgstr "बाहरी लिंक पूर्वावलोकन सक्षम करें"
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Enable Auto (Pull and Push)?"
+msgstr "स्वचालित (खींचें और भेजें) चालू करें?"
#: src/components/AutoSyncOnboardingDialog.tsx
#: src/components/EnableSyncConfirmDialog.tsx
-msgid "Enable Follow"
-msgstr "Follow सक्षम करें"
+msgid "Enable Auto (Pull only)"
+msgstr "स्वचालित (केवल खींचें) चालू करें"
#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable Follow?"
-msgstr "Follow सक्षम करें?"
+msgid "Enable Auto (Pull only)?"
+msgstr "स्वचालित (केवल खींचें) चालू करें?"
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable git auto-sync?"
-msgstr "git स्वत: सिंक सक्षम करें?"
+#: src/components/settings/LinkPreviewsSection.tsx
+msgid "Enable external link previews"
+msgstr "बाहरी लिंक पूर्वावलोकन सक्षम करें"
#: src/components/settings/LintingSection.tsx
msgid "Enable indexes"
@@ -5784,6 +5852,10 @@ msgstr "एम्बेडिंग प्रदाता अपडेट कर
msgid "Failed to update the project sync default — {detail}"
msgstr "प्रोजेक्ट सिंक डिफ़ॉल्ट अपडेट करने में विफल — {detail}"
+#: src/components/settings/SyncSection.tsx
+msgid "Failed to update the sync interval — {detail}"
+msgstr "सिंक अंतराल अपडेट नहीं हो सका — {detail}"
+
#: src/components/FileTree.tsx
msgid "Failed to upload file"
msgstr "फ़ाइल अपलोड करने में विफल"
@@ -6043,28 +6115,6 @@ msgstr "फ़ोल्डर साझा करने का लिंक क
msgid "Folder target: {linkTitle}. Click to open the overview."
msgstr "फ़ोल्डर लक्ष्य: {linkTitle}. सिंहावलोकन खोलने के लिए क्लिक करें।"
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow"
-msgstr "Follow"
-
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow — updates flow in from your remote; your edits stay on this computer."
-msgstr "Follow — अपडेट आपके रिमोट से आते रहते हैं; आपके संपादन इसी कंप्यूटर पर रहते हैं।"
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
-msgstr "Follow आपकी रिमोट git रिपॉज़िटरी से अपडेट लाता है और आपकी प्रति को अपने आप आगे बढ़ा देता है। आपके स्थानीय संपादन इसी कंप्यूटर पर रहते हैं और कभी नहीं भेजे जाते।"
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Follow is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "इस वर्कट्री के लिए Follow चालू है, जो {project} से विरासत में मिला है। इसे Settings → Sync में बदलें।"
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow never pushes or commits your local changes. They stay only on this machine."
-msgstr "Follow आपके स्थानीय बदलाव कभी नहीं भेजता या कमिट करता। वे केवल इसी मशीन पर रहते हैं।"
-
#: src/components/acp/ThreadView.tsx
msgid "Follow the agent's edits"
msgstr "एजेंट के संपादन का अनुसरण करें"
@@ -6155,11 +6205,6 @@ msgstr "वह frontmatter जिससे इस टेम्पलेट स
msgid "Frontmatter schemas"
msgstr "Frontmatter स्कीमा"
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Full"
-msgstr "पूर्ण"
-
#: src/components/InstallInClaudeDesktopDialog.tsx
msgid "Full guide"
msgstr "पूरी मार्गदर्शिका"
@@ -6173,14 +6218,6 @@ msgstr "पूरा पथ"
msgid "Full Path"
msgstr "पूरा पथ"
-#: src/components/settings/SyncSection.tsx
-msgid "Full sync — your commits push and remote changes pull automatically."
-msgstr "पूर्ण सिंक — आपके कमिट भेजे जाते हैं और रिमोट बदलाव अपने आप आ जाते हैं।"
-
-#: src/components/SyncStatusBadge.tsx
-msgid "Full sync — your edits are committed and pushed to your remote automatically."
-msgstr "पूर्ण सिंक — आपके संपादन अपने आप कमिट होकर आपके रिमोट पर भेज दिए जाते हैं।"
-
#: src/components/OkBlobRunner.tsx
msgid "Game over · press <0>Space</0> to play again"
msgstr "खेल समाप्त · फिर से खेलने के लिए <0>स्पेस</0> दबाएँ"
@@ -6239,6 +6276,7 @@ msgid "Git needs a helper tool (such as git-lfs) that isn't installed or couldn'
msgstr "Git को एक सहायक टूल (जैसे git-lfs) चाहिए जो इंस्टॉल नहीं है या मिला नहीं। इसे इंस्टॉल करें, फिर कोशिश करें।"
#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Git sync"
msgstr "Git सिंक"
@@ -6616,6 +6654,10 @@ msgstr "साझाकरण कैसे काम करता है?"
msgid "How missing project-local documents, files, and images are reported in Problems, editor diagnostics, audits, and agent tools."
msgstr "गायब प्रोजेक्ट-स्थानीय दस्तावेज़ों, फ़ाइलों और इमेज को समस्याएँ, एडिटर डायग्नोस्टिक्स, ऑडिट और एजेंट टूल में कैसे रिपोर्ट किया जाता है।"
+#: src/components/settings/SyncSection.tsx
+msgid "How often this computer pulls changes from your remote."
+msgstr "यह कंप्यूटर आपके रिमोट से कितनी बार बदलाव खींचता है।"
+
#: src/components/ShareFreshnessWarning.tsx
msgid "How to push manually"
msgstr "हाथ से कैसे भेजें"
@@ -6701,6 +6743,10 @@ msgstr "अनदेखा करने के पैटर्न"
msgid "Ignore patterns (raw text)"
msgstr "अनदेखा करने के पैटर्न (कच्चा पाठ)"
+#: src/components/SyncStatusBadge.tsx
+msgid "Ignored"
+msgstr "अनदेखा किया गया"
+
#: src/components/LinksPanel.tsx
msgid "Image {identity}. Go to reference."
msgstr "चित्र {identity}। संदर्भ पर जाएँ।"
@@ -7297,8 +7343,8 @@ msgid "Keep the name to 64 characters or fewer."
msgstr "नाम 64 अक्षरों या उससे कम रखें।"
#: src/components/settings/SyncSection.tsx
-msgid "Keep this project in sync with your git remote. Follow fetches updates without pushing; full sync pushes your commits too. Turning sync on requires confirmation."
-msgstr "इस प्रोजेक्ट को अपने git रिमोट के साथ तालमेल में रखें। Follow बिना भेजे अपडेट लाता है; पूर्ण सिंक आपके कमिट भी भेजता है। सिंक चालू करने के लिए पुष्टि ज़रूरी है।"
+msgid "Keep this project in sync with your git remote. Auto (Pull only) brings in updates without pushing; Auto (Pull and Push) sends your edits too. Turning auto-sync on requires confirmation."
+msgstr "इस प्रोजेक्ट को अपने git रिमोट के साथ सिंक में रखें। स्वचालित (केवल खींचें) बिना पुश किए अपडेट लाता है; स्वचालित (खींचें और भेजें) आपके संपादन भी भेजता है। स्वचालित सिंक चालू करने के लिए पुष्टि ज़रूरी है।"
#: src/lib/pack-copy.ts
msgid "Keep track of the people and companies you work with and the meetings you have with them. Good for remembering who someone is, how you know them, and what you last talked about."
@@ -7778,6 +7824,11 @@ msgstr "इस बिल्ड में AI टूल सँभालना उ
msgid "Managing project AI tools is unavailable in this build."
msgstr "इस बिल्ड में प्रोजेक्ट के AI टूल सँभालना उपलब्ध नहीं है।"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Manual"
+msgstr "मैन्युअल"
+
#: src/components/empty-state/use-create-suggestions.ts
msgid "Map the architecture"
msgstr "संरचना का नक्शा बनाएँ"
@@ -7916,10 +7967,6 @@ msgstr "पैलेट के रंग मौजूद नहीं हैं"
msgid "Missing theme name"
msgstr "थीम का नाम मौजूद नहीं है"
-#: src/components/SyncStatusBadge.tsx
-msgid "Mode"
-msgstr "मोड"
-
#: src/components/settings/SearchSection.tsx
msgid "Model"
msgstr "मॉडल"
@@ -7936,6 +7983,7 @@ msgstr "मॉडल का डिफ़ॉल्ट प्रयास स्
#: src/components/FolderOverview.tsx
#: src/components/settings/markdownlint-rule-browser.tsx
#: src/components/SkillOriginInline.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Modified"
msgstr "संशोधित"
@@ -8228,10 +8276,6 @@ msgstr "सफ़ाई के दौरान नेटवर्क त्र
msgid "Network settings not yet loaded. Try again in a moment."
msgstr "नेटवर्क सेटिंग्स अभी लोड नहीं हुई हैं। कुछ ही देर में फिर से प्रयास करें।"
-#: src/components/SyncStatusBadge.tsx
-msgid "never"
-msgstr "कभी नहीं"
-
#: src/components/FolderOverview.tsx
#: src/editor/tag-suggestion/TagSuggestionMenu.tsx
msgid "New"
@@ -8846,10 +8890,22 @@ msgstr "कुछ नहीं ({0} किसी दस्तावेज़ स
msgid "nothing ({0} is not a valid pattern)"
msgstr "कुछ नहीं ({0} एक मान्य पैटर्न नहीं है)"
+#: src/components/settings/SyncSection.tsx
+msgid "Nothing moves until you ask — pull and push from the sync menu."
+msgstr "जब तक आप न कहें, कुछ नहीं चलेगा — सिंक मेनू से खींचें और भेजें।"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing moves until you ask."
+msgstr "जब तक आप न कहें, कुछ नहीं चलेगा।"
+
#: src/components/FolderPropertiesCard.tsx
msgid "Nothing set yet."
msgstr "अभी कुछ भी सेट नहीं।"
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing to commit — working tree clean."
+msgstr "कमिट करने को कुछ नहीं: वर्किंग ट्री साफ़ है।"
+
#: src/components/BugReportSendToast.tsx
msgid "Nothing was uploaded. The report stays on this computer until you email it to us."
msgstr "कुछ भी अपलोड नहीं किया गया। जब तक आप हमें ईमेल नहीं करते, रिपोर्ट इसी कंप्यूटर पर रहती है।"
@@ -8883,10 +8939,6 @@ msgstr "{0} में से"
msgid "of {totalPages}"
msgstr "{totalPages} में से"
-#: src/components/settings/SyncSection.tsx
-msgid "Off"
-msgstr "बंद"
-
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Off — external links show only their URL. No requests leave this computer."
msgstr "बंद — बाहरी लिंक केवल अपना URL दिखाते हैं। कोई अनुरोध इस कंप्यूटर से बाहर नहीं जाता।"
@@ -9641,6 +9693,10 @@ msgstr "बाहर जाने वाले"
msgid "Outline"
msgstr "रूपरेखा"
+#: src/components/SyncStatusBadge.tsx
+msgid "Outside what Open Knowledge commits."
+msgstr "Open Knowledge जो कमिट करता है उसके दायरे से बाहर।"
+
#: src/components/SkillCostValue.tsx
msgid "over the {budgetLabel} token budget"
msgstr "{budgetLabel} टोकन बजट से अधिक"
@@ -9851,10 +9907,6 @@ msgstr "पैटर्न वाक्यविन्यास त्रुट
msgid "Pattern warnings: {summary}"
msgstr "पैटर्न चेतावनियाँ: {summary}"
-#: src/components/SyncStatusBadge.tsx
-msgid "Pause sync"
-msgstr "सिंक रोकें"
-
#: src/components/acp/ThreadView.tsx
msgid "pending"
msgstr "लंबित"
@@ -10248,10 +10300,26 @@ msgstr "प्रकाशित किया जा रहा है…"
msgid "Pull"
msgstr "खींचें"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull and Push"
+msgstr "खींचें और भेजें"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull brings in"
+msgstr "खींचें से आएगा"
+
#: src/components/share-receive-miss-content.tsx
msgid "Pull latest changes"
msgstr "नवीनतम बदलाव खींचें"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled}"
+msgstr "{pulled} खींचा"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled} · pushed {pushed}"
+msgstr "{pulled} खींचा · {pushed} भेजा"
+
#: src/components/share-receive-miss-content.tsx
#: src/components/SyncStatusBadge.tsx
msgid "Pulling"
@@ -10277,10 +10345,26 @@ msgstr "साझा करने से पहले ब्रांच {branch
msgid "Push failed — check the server logs for details."
msgstr "भेजना विफल — विवरण के लिए सर्वर लॉग देखें।"
+#: src/components/SyncStatusBadge.tsx
+msgid "Push includes"
+msgstr "भेजें में शामिल"
+
+#: src/components/settings/SyncSection.tsx
+msgid "Push my edits every"
+msgstr "मेरे संपादन भेजने की आवृत्ति"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Push skips"
+msgstr "भेजें में शामिल नहीं"
+
#: src/lib/share/run-share-action.ts
msgid "Push this branch to GitHub before sharing."
msgstr "साझा करने से पहले इस ब्रांच को GitHub पर पुश करें।"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pushed {pushed}"
+msgstr "{pushed} भेजा"
+
#: src/components/SyncStatusBadge.tsx
msgid "Pushing"
msgstr "भेजा जा रहा है"
@@ -10354,6 +10438,10 @@ msgstr "किसी दूसरे दस्तावेज़ के MirrorSo
msgid "Read-only file in the {name} skill"
msgstr "{name} स्किल में केवल पढ़ने योग्य फ़ाइल"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reading working tree"
+msgstr "वर्किंग ट्री पढ़ी जा रही है"
+
#: src/components/acp/working-status.ts
msgid "Reading…"
msgstr "पढ़ा जा रहा है…"
@@ -10407,6 +10495,10 @@ msgstr "अनुशंसित एजेंट कौशल"
msgid "Reconnect required"
msgstr "फिर से जुड़ना ज़रूरी"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reconnect required to keep syncing."
+msgstr "सिंक जारी रखने के लिए फिर से कनेक्ट करना ज़रूरी है।"
+
#: src/presence/use-sync-toasts.ts
msgid "Reconnected"
msgstr "फिर से जुड़ गया"
@@ -10673,6 +10765,10 @@ msgstr "स्किल का नाम बदलें"
msgid "Rename succeeded but the sidebar may be out of date — refresh to resync"
msgstr "नाम बदल गया पर साइडबार पुराना हो सकता है — फिर से सिंक करने के लिए ताज़ा करें"
+#: src/components/SyncStatusBadge.tsx
+msgid "Renamed"
+msgstr "नाम बदला गया"
+
#. placeholder {0}: docLeaf(descriptor.from)
#. placeholder {1}: docLeaf(descriptor.to)
#: src/components/TimelinePanel.tsx
@@ -10824,7 +10920,6 @@ msgstr "जिन रिपॉज़िटरी को आप पहले ह
#: src/components/CloneDialog.tsx
#: src/components/share-metadata-rows.tsx
#: src/components/SkillPreviewTab.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Repository"
msgstr "रिपॉज़िटरी"
@@ -10907,6 +11002,10 @@ msgstr "स्किल पैनल का आकार बदलें"
msgid "Resolve conflict in your terminal"
msgstr "अपने टर्मिनल में टकराव सुलझाएँ"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Resolve in terminal"
+msgstr "टर्मिनल में हल करें"
+
#: src/components/FileTree.tsx
msgid "Resolve the conflict on {files} before deleting."
msgstr "हटाने से पहले {files} का विरोध हल करें।"
@@ -11022,10 +11121,6 @@ msgstr "{0} वाले संस्करण पर बहाल किया
msgid "Results capped — this workspace has more files than search can index. A missing file may be a cap artifact, not a typo."
msgstr "परिणाम सीमित — इस कार्यक्षेत्र में खोज के अनुक्रमण से ज़्यादा फ़ाइलें हैं। कोई अनुपस्थित फ़ाइल इस सीमा का नतीजा हो सकती है, वर्तनी की ग़लती नहीं।"
-#: src/components/SyncStatusBadge.tsx
-msgid "Resume sync"
-msgstr "सिंक फिर से शुरू करें"
-
#: src/components/acp/ThreadView.tsx
msgid "Resuming the chat"
msgstr "चैट फिर से शुरू हो रही है"
@@ -11097,8 +11192,8 @@ msgid "Reverting"
msgstr "वापस लिया जा रहा है"
#: src/components/SyncStatusBadge.tsx
-msgid "Review conflicts"
-msgstr "टकराव देखें"
+msgid "Review"
+msgstr "समीक्षा करें"
#: src/components/ReportBugDialogBody.tsx
msgid "Review your report"
@@ -12244,6 +12339,10 @@ msgstr "Slidev शुरू होने में बहुत समय लग
msgid "Small section heading."
msgstr "छोटा अनुभाग शीर्षक।"
+#: src/components/SyncStatusBadge.tsx
+msgid "Some files are not listed — the working tree has too many changes."
+msgstr "कुछ फ़ाइलें सूचीबद्ध नहीं हैं: वर्किंग ट्री में बहुत अधिक बदलाव हैं।"
+
#: src/components/settings/SavedThemesTiles.tsx
msgid "Some saved themes aren’t shown because the theme folder exceeds the scan limit."
msgstr "कुछ सहेजी गई थीम नहीं दिखाई जा रही हैं क्योंकि थीम फ़ोल्डर स्कैन सीमा से बड़ा है।"
@@ -12435,6 +12534,10 @@ msgstr "एजेंट शुरू किया जा रहा है…"
msgid "status"
msgstr "स्थिति"
+#: src/components/SyncStatusBadge.tsx
+msgid "Status"
+msgstr "स्थिति"
+
#: src/components/SubscribeCard.tsx
#: src/components/SubscribeForm.tsx
msgid "Stay in the loop"
@@ -12582,8 +12685,8 @@ msgid "Switch to a branch to share."
msgstr "साझा करने के लिए किसी ब्रांच पर स्विच करें।"
#: src/components/settings/SyncSection.tsx
-msgid "Switch to Follow"
-msgstr "Follow पर जाएँ"
+msgid "Switch to Auto (Pull only)"
+msgstr "स्वचालित (केवल खींचें) पर जाएँ"
#: src/components/command-palette-commands.ts
msgid "Switch worktree"
@@ -12622,7 +12725,6 @@ msgid "Symlinks the skill to {path}"
msgstr "स्किल को {path} पर सिमलिंक करता है"
#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Sync"
msgstr "सिंक"
@@ -12631,10 +12733,6 @@ msgstr "सिंक"
msgid "Sync & sharing"
msgstr "सिंक और साझाकरण"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync disabled"
-msgstr "सिंक अक्षम"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync failed — check the server logs for details."
msgstr "सिंक विफल — विवरण के लिए सर्वर लॉग देखें।"
@@ -12643,13 +12741,21 @@ msgstr "सिंक विफल — विवरण के लिए सर्
msgid "Sync is failing. See the sync status for details."
msgstr "सिंक विफल हो रहा है। विवरण के लिए सिंक स्थिति देखें।"
-#: src/components/settings/SyncSection.tsx
-msgid "Sync is off — your edits stay on this computer until you commit and push manually."
-msgstr "सिंक बंद है — जब तक आप हाथ से कमिट और पुश नहीं करते तब तक आपके संपादन इसी कंप्यूटर पर रहते हैं।"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Sync is paused. Commit these local edits to continue, or sort them out in a terminal."
+msgstr "सिंक रुका हुआ है। जारी रखने के लिए इन स्थानीय संपादनों को कमिट करें, या टर्मिनल में इन्हें निपटाएँ।"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync is paused. Turn it back on to resume."
-msgstr "सिंक रुका हुआ है। फिर से शुरू करने के लिए इसे वापस चालू करें।"
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull and Push) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "इस वर्कट्री के लिए सिंक “स्वचालित (खींचें और भेजें)” पर सेट है, जो {project} से विरासत में मिला है। इसे Settings → Sync में बदलें।"
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull only) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "इस वर्कट्री के लिए सिंक “स्वचालित (केवल खींचें)” पर सेट है, जो {project} से विरासत में मिला है। इसे Settings → Sync में बदलें।"
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Manual for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "इस वर्कट्री के लिए सिंक “मैन्युअल” पर सेट है, जो {project} से विरासत में मिला है। इसे Settings → Sync में बदलें।"
#: src/components/SyncStatusBadge.tsx
msgid "Sync mode"
@@ -12660,18 +12766,10 @@ msgstr "सिंक मोड"
msgid "Sync now"
msgstr "अभी सिंक करें"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync off"
-msgstr "सिंक बंद"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync paused"
msgstr "सिंक रुका हुआ"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync paused — resolve conflicts to resume."
-msgstr "सिंक रुका हुआ — फिर से शुरू करने के लिए टकराव सुलझाएँ।"
-
#: src/hooks/use-no-push-permission-toast.ts
msgid "Sync paused — you don't have permission to push to this repo"
msgstr "सिंक रुका हुआ — आपके पास इस रिपॉज़िटरी में पुश करने की अनुमति नहीं है"
@@ -12706,10 +12804,6 @@ msgstr "सिंक स्थिति: {syncStateLabel} — git पहचा
msgid "Synced"
msgstr "सिंक हो गया"
-#: src/components/SyncStatusBadge.tsx
-msgid "Synced {lastSyncedRelative}"
-msgstr "{lastSyncedRelative} सिंक हुआ"
-
#: src/components/TimelinePanel.tsx
msgid "Synced from disk"
msgstr "डिस्क से सिंक किया गया"
@@ -12933,6 +13027,10 @@ msgstr "रिपोर्ट के लिए धन्यवाद!"
msgid "That branch is already open in another worktree."
msgstr "वह ब्रांच पहले से किसी दूसरे वर्कट्री में खुली है।"
+#: src/components/SyncBlockingChanges.tsx
+msgid "That did not go through. Check the server logs and try again."
+msgstr "यह पूरा नहीं हुआ। सर्वर लॉग देखें और फिर से कोशिश करें।"
+
#: src/comments/reveal-comment.ts
msgid "That document didn't open in time. Try again once it has synced."
msgstr "वह दस्तावेज़ समय पर नहीं खुला। सिंक होने के बाद फिर से कोशिश करें।"
@@ -13968,6 +14066,10 @@ msgstr "कमांड देखने के लिए '/' टाइप कर
msgid "Type a query, then press <0>↵</0> to search your pages by meaning."
msgstr "कोई क्वेरी लिखें, फिर अपने पेज अर्थ के आधार पर खोजने के लिए <0>↵</0> दबाएँ।"
+#: src/components/SyncStatusBadge.tsx
+msgid "Type changed"
+msgstr "प्रकार बदला गया"
+
#: src/editor/components/CodePreviewEditModal.tsx
msgid "Type to edit; <0>Cmd/Ctrl+Enter</0> saves, <1>Esc</1> cancels."
msgstr "संपादित करने के लिए लिखें; <0>Cmd/Ctrl+Enter</0> सहेजता है, <1>Esc</1> रद्द करता है।"
@@ -14096,6 +14198,10 @@ msgstr "सभी टिप्पणियों का चयन हटाए
msgid "Unmark every comment in {0}"
msgstr "{0} की सभी टिप्पणियाँ अचिह्नित करें"
+#: src/components/SyncStatusBadge.tsx
+msgid "Unmerged"
+msgstr "मर्ज नहीं हुआ"
+
#: src/editor/slash-command/items.tsx
msgid "Unordered list of items."
msgstr "आइटम की अक्रमित सूची।"
@@ -14136,6 +14242,10 @@ msgstr "हल न की जा सकने वाला चित्र {iden
msgid "Untitled report"
msgstr "बिना शीर्षक रिपोर्ट"
+#: src/components/SyncStatusBadge.tsx
+msgid "Untracked"
+msgstr "ट्रैक नहीं किया गया"
+
#: src/components/SyncStatusBadge.tsx
msgid "Up to date"
msgstr "अद्यतित"
@@ -14183,8 +14293,8 @@ msgid "Updated \"{name}\" from {0}"
msgstr "\"{name}\" को {0} से अपडेट किया गया"
#: src/components/SyncStatusBadge.tsx
-msgid "Updated {lastSyncedRelative}"
-msgstr "{lastSyncedRelative} अपडेट हुआ"
+msgid "Updated {updatedRelative}"
+msgstr "{updatedRelative} अपडेट हुआ"
#: src/components/FolderTimelineCard.tsx
msgid "updated folder properties"
@@ -14198,6 +14308,11 @@ msgstr "संस्करण {version} पर अपडेट किया ग
msgid "Updates flow in"
msgstr "अपडेट आते रहते हैं"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Updates flow in from your remote; your edits stay on this computer."
+msgstr "अपडेट आपके रिमोट से आते हैं; आपके संपादन इसी कंप्यूटर पर रहते हैं।"
+
#: src/components/SkillOriginInline.tsx
msgid "Updates from the source apply automatically (unless edited locally)"
msgstr "स्रोत के अपडेट अपने आप लागू होते हैं (जब तक स्थानीय रूप से संपादित न किया गया हो)"
@@ -14650,6 +14765,10 @@ msgstr "यह कहाँ रहना चाहिए?"
msgid "Which skill"
msgstr "कौन सी स्किल"
+#: src/components/settings/SyncSection.tsx
+msgid "While you're signed out, updates are checked at most every 3 minutes regardless of this setting."
+msgstr "जब तक आप साइन आउट हैं, इस सेटिंग के बावजूद अपडेट अधिकतम हर 3 मिनट में जाँचे जाते हैं।"
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "Whitespace"
msgstr "रिक्त स्थान"
@@ -14826,8 +14945,8 @@ msgid "You don't have permission to push to this repo."
msgstr "आपके पास इस रिपॉज़िटरी में पुश करने की अनुमति नहीं है।"
#: src/components/settings/SyncSection.tsx
-msgid "You don't have permission to push to this repo. Follow can still keep your copy up to date."
-msgstr "आपके पास इस रिपॉज़िटरी में पुश करने की अनुमति नहीं है। Follow फिर भी आपकी प्रति को अद्यतित रख सकता है।"
+msgid "You don't have permission to push to this repo. Auto (Pull only) can still keep your copy up to date."
+msgstr "आपके पास इस रिपॉज़िटरी में पुश करने की अनुमति नहीं है। स्वचालित (केवल खींचें) फिर भी आपकी कॉपी अद्यतित रख सकता है।"
#: src/components/ShareFreshnessWarning.tsx
msgid "You don't have write access to this repo."
@@ -14899,6 +15018,11 @@ msgstr "ब्रांच <0>{shareBranch}</0> की आपकी प्रत
msgid "Your current version is saved first, so this is reversible."
msgstr "आपका मौजूदा संस्करण पहले सहेजा जाता है, इसलिए यह वापस लिया जा सकता है।"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Your edits are committed and pushed to your remote automatically."
+msgstr "आपके संपादन अपने आप कमिट होकर आपके रिमोट पर भेज दिए जाते हैं।"
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "Your edits stay on this computer"
msgstr "आपके संपादन इसी कंप्यूटर पर रहते हैं"
diff --git a/packages/app/src/locales/id/messages.json b/packages/app/src/locales/id/messages.json
index c80f628f9..9de69e0f9 100644
--- a/packages/app/src/locales/id/messages.json
+++ b/packages/app/src/locales/id/messages.json
@@ -21,13 +21,7 @@
"-YV1Uo": ["Pola ", ["patternNumber"]],
"-bFGPF": ["Perubahan berikutnya"],
"-dNlfM": ["Suntingan terakhir pada ", ["docName"], " dibatalkan"],
- "-f2Ogn": [
- "Jaga proyek ini tetap selaras dengan remote git Anda. Ikuti mengambil pembaruan tanpa mengirim; sinkronisasi penuh juga mengirim commit Anda. Menyalakan sinkronisasi memerlukan konfirmasi."
- ],
"-g6KIS": ["Tautan tidak dikenali"],
- "-imiMK": [
- "Ikuti — pembaruan mengalir masuk dari remote Anda; suntingan Anda tetap di komputer ini."
- ],
"-kKdCC": [["imported"], " keterampilan dipasang dari ", ["0"]],
"-kbIAr": ["Tautan & gambar"],
"-ksoxk": [
@@ -135,7 +129,6 @@
"0wswKc": ["Garis mendatar yang memisahkan bagian."],
"0xnQ_X": ["Pembaruan mengalir masuk"],
"0xnmlQ": ["Nama repositori"],
- "0yL--g": ["Tinjau konflik"],
"0ySP5u": ["Perubahan disimpan otomatis ke tema ini."],
"0zAhu6": ["semua dokumen"],
"1-flC9": ["Port server lokal"],
@@ -171,6 +164,7 @@
"1NgrlY": ["Cara lain untuk memasang"],
"1QfxQT": ["Tutup"],
"1RluQD": ["Tampilkan penggantian"],
+ "1TA-aJ": ["Ditarik ", ["pulled"], " · dikirim ", ["pushed"]],
"1TNIig": ["Buka"],
"1Ta7Fd": ["Buka ", ["basename"]],
"1V17kO": ["Memuat kedua versinya"],
@@ -246,6 +240,11 @@
["FULLSCREEN_HUB_LIMIT"],
" hasil."
],
+ "2okwy4": [
+ "Sinkronisasi worktree ini disetel ke Otomatis (hanya Pull), diwarisi dari ",
+ ["project"],
+ ". Ubah di Pengaturan → Sinkronisasi."
+ ],
"2pR7ad": ["Kunci API embedding"],
"2q_Q7x": ["Visibilitas"],
"2rLM8r": ["Utas agen tidak bisa dimulai — silakan coba lagi."],
@@ -350,7 +349,6 @@
"4A3Yzu": ["Blok kode"],
"4BITzH": ["Galat:"],
"4CfgPM": ["Folder proyek dibuat, tetapi git init gagal. Coba lagi."],
- "4DcimZ": ["Diperbarui ", ["lastSyncedRelative"]],
"4E9jPa": ["Buat proyek pertama Anda"],
"4EZrJN": ["Aturan"],
"4ErgAf": ["OpenKnowledge memasang sebuah keterampilan"],
@@ -382,6 +380,7 @@
"Pilih keterampilan yang akan dipasang. Masing-masing masuk sebagai keterampilan milik Anda yang bisa disunting."
],
"4mLBx9": ["Langganan tidak tersedia saat ini."],
+ "4mbrAq": ["1 menit"],
"4mp6Tv": ["OpenKnowledge menampilkan daftar keterampilan yang terpasang"],
"4niEzY": ["Sematan HTML tersekat — tulis HTML, lihat pratinjau terendernya secara langsung."],
"4nj6n8": ["/api/config mengembalikan HTTP ", ["code"]],
@@ -393,11 +392,6 @@
"Memilih semua baris pohon berkas yang terlihat ketika fokus ada di bilah sisi Berkas."
],
"4xtLTl": ["Folder “", ["basename"], "” disembunyikan"],
- "4zEZS5": [
- "Sinkronisasi otomatis aktif untuk worktree ini, diwarisi dari ",
- ["project"],
- ". Ubah di Pengaturan → Sinkronisasi."
- ],
"4zGlN_": ["Tempelkan URL gambar atau klik unggah"],
"4z_1j2": ["Dirender"],
"5-FeN2": ["URL berbagi"],
@@ -473,6 +467,7 @@
],
"5hFl0U": ["Salin referensi"],
"5jEnaB": ["Tidak tersedia di platform ini"],
+ "5k0NLb": ["Tinjau"],
"5kWklo": ["(sebagian mungkin sudah disembunyikan oleh aturan lain)"],
"5lWFkC": ["Masuk"],
"5mksg0": ["Gagal menonaktifkan pencarian semantik — ", ["detail"]],
@@ -511,6 +506,7 @@
"Perintah berjalan dengan akses penuh akun pengguna Anda di mesin ini. Matikan ini untuk menonaktifkan shell."
],
"6Aih4U": ["Luring"],
+ "6EoD0z": ["Selesaikan di terminal"],
"6FCixu": ["Buka kembali obrolan sebelumnya"],
"6HCOwA": ["Gagal membuka."],
"6KCH4m": ["Berkas tersembunyi"],
@@ -561,6 +557,11 @@
"6u9LvN": [["days", "plural", { "other": ["#", " hari lalu"] }]],
"6ur2Mk": ["Bantu agen Anda menemukan dan menggunakan OpenKnowledge di proyek mana pun."],
"6vEr3W": ["Tujuan tautan"],
+ "6xPJIj": [
+ "Sinkronisasi worktree ini disetel ke Manual, diwarisi dari ",
+ ["project"],
+ ". Ubah di Pengaturan → Sinkronisasi."
+ ],
"6xeZX9": ["Suntingan langsung diterapkan. Tema menentukan mode terang atau gelap."],
"6zzhQL": ["Kirim laporan Anda lewat surel"],
"72xhRD": ["Mode tampilan diagram"],
@@ -699,7 +700,6 @@
"8qgfac": ["Server MCP"],
"8rZ1pk": ["Aktifkan ", ["id"]],
"8ruqQi": ["Tautan internal rusak"],
- "8sMErm": ["Aktifkan Ikuti?"],
"8t9CRE": ["Memulai ", ["agentName"], "…"],
"8t9T3-": ["Tidak ada keterampilan yang ditemukan."],
"8tjQCz": ["Jelajahi"],
@@ -755,6 +755,7 @@
"9Vnjc9": ["Enter"],
"9XwoPv": [["0", "plural", { "other": ["Pasang ", "#", " keterampilan"] }]],
"9Y6cCI": ["Gagal memuat halaman"],
+ "9ZxzfT": [["count"], " di depan"],
"9_2oe6": [
"Mengubah ",
["0"],
@@ -825,11 +826,6 @@
"AVW-K9": ["Gagal memuat halaman yatim"],
"AWOSPo": ["Perbesar"],
"AYoYhU": ["Pembaruan gagal: ", ["0"]],
- "AaaESH": [
- "Sinkronisasi otomatis mati untuk worktree ini, diwarisi dari ",
- ["project"],
- ". Ubah di Pengaturan → Sinkronisasi."
- ],
"AcK_r0": ["Claude CLI"],
"AczYxH": ["Entri open-knowledge khusus — tidak dikelola OpenKnowledge"],
"AdcGcG": ["Menerapkan perubahan Anda"],
@@ -890,6 +886,7 @@
"BVkqD9": [
"Pemeliharaan indeks dihentikan sementara karena atribut Git lainnya mengontrol index.md. Perbarui .gitattributes sehingga jalur index.md yang dicakup menggunakan merge=union, lalu coba lagi."
],
+ "BWTzAb": ["Manual"],
"BY-g4_": ["Tambahkan pola"],
"Ba4D2x": ["Templat diimpor"],
"Bdha5y": ["Menerbitkan..."],
@@ -923,6 +920,7 @@
"C0C43b": [["warningCount", "plural", { "other": ["#", " peringatan"] }]],
"C0Ciaj": ["Diimpor sebagai \"", ["0"], "\" — nama \"", ["1"], "\" sudah dipakai."],
"C0hoX6": ["Selalu disertakan"],
+ "C2abof": ["Tidak dilacak"],
"C3Zc44": ["Jelajahi keterampilan"],
"C62P6b": ["Pilihan penyunting"],
"C7PKTv": ["Kirim komentar yang dicentang ke obrolan"],
@@ -951,9 +949,6 @@
"CTJLpz": ["\"", ["trimmed"], "\" sudah ada di sini"],
"CU3AiE": ["Mengganti cabang"],
"CUmCwI": ["Sisipkan baris di bawah"],
- "CVRM5N": [
- "Ikuti mengambil pembaruan dari repositori git remote Anda dan memajukan salinan Anda secara otomatis. Suntingan lokal Anda tetap di komputer ini dan tidak pernah dikirim."
- ],
"CWjM1r": ["dokumen langsung di ", ["0"], "/"],
"CWzc2T": [
"<0>~/.ok/bin</0> dan <1>~/.ok/env.sh</1> tetap ada apa pun pilihannya — aplikasi selalu memeliharanya."
@@ -990,6 +985,7 @@
"Dalam proyek Git, Open Knowledge menambahkan aturan tercakup ke file .gitattributes di root repositori agar perubahan indeks yang bersamaan dapat digabungkan."
],
"CxVk-w": ["Komentari ", ["address"]],
+ "Cz-K13": ["15 menit"],
"D-NlUC": ["Sistem"],
"D-Oh1s": ["Cara menyiapkan ", ["0"], " (terbuka di peramban)"],
"D-_B7l": ["Terhubung — endpoint ini mengembalikan vektor berdimensi ", ["0"], "."],
@@ -1054,7 +1050,6 @@
"DmkTrb": ["Tema ini tidak dapat dibuat. Coba lagi."],
"Dnn2XG": ["Otomatis"],
"DpjYd6": ["Lompat ke teks berjangkar"],
- "DrYM2Z": ["Sinkronisasi dinonaktifkan"],
"DsDwR-": [["0", "plural", { "other": ["#", " galat"] }]],
"DskIkK": ["Aliran proses masuk berakhir tanpa konfirmasi — silakan coba lagi"],
"DuCPiG": [
@@ -1254,6 +1249,7 @@
],
"Fqx38P": ["Apa yang menghambat?"],
"Fr8JGg": ["Berkas zip"],
+ "FsEXax": ["Itu tidak berhasil. Periksa log server lalu coba lagi."],
"Fsx78O": ["Tambahkan perintah <0>ok</0> ke terminal Anda"],
"FvMSms": [
"Mengganti nama mengubah berkas di disk dan id yang dipakai agen untuk memilih templat ini."
@@ -1373,6 +1369,9 @@
"H0WlWQ": ["Kisi baris dan kolom dengan satu baris kepala."],
"H1TmTu": ["Perbaikan dihentikan. Berkas yang sudah diperbaiki tetap terperbaiki."],
"H3oH0g": ["Ulangi"],
+ "H4doZt": [
+ "Sinkronisasi dijeda. Commit suntingan lokal ini untuk melanjutkan, atau selesaikan di terminal."
+ ],
"H86f9p": ["Ciutkan"],
"H8DVOJ": ["Identik di keduanya — ", ["pick"], " tetap membacanya."],
"HAkEqR": ["Berkas terbaru"],
@@ -1464,6 +1463,7 @@
"IWGfGF": ["Memeriksa koneksi GitHub Anda"],
"IX7-sq": ["Ada yang tidak beres saat membuka \"", ["docName"], "\"."],
"IX_uXB": ["fitur-saya"],
+ "IXiG0B": ["Otomatis (Pull dan Push)"],
"IYciRC": ["Terima kasih atas laporannya!"],
"IajAbS": ["Tambahkan paket awal"],
"If0crP": ["Buka dengan AI ", ["targetDisplayName"], ", ", ["hint"]],
@@ -1516,6 +1516,7 @@
"JLzQi_": ["Tutup ", ["accessibleLabel"]],
"JM_aq-": ["Pakai URL https:// — http:// hanya diizinkan untuk localhost."],
"JOcPqH": ["Bawa repositori remote ke komputer ini."],
+ "JOhCT9": ["Push menyertakan"],
"JWsZlx": ["Buka sebuah proyek untuk menyunting."],
"JZ8cO6": ["Terang, gelap, atau ikuti sistem."],
"J_jZ5z": [
@@ -1609,6 +1610,9 @@
"KjTmeO": ["Perbarui OpenKnowledge untuk membuka konten berbagi ini."],
"KkEAud": ["Membuat berkas dari konteks dokumen atau folder saat ini."],
"KkRyMI": ["Penggabungan tidak dapat diklasifikasikan — coba lagi."],
+ "KmVekT": [
+ "Otomatis (hanya Pull) mengambil pembaruan dari repositori git remote Anda dan memajukan salinan Anda secara otomatis. Suntingan lokal Anda tetap di komputer ini dan tidak pernah dikirim."
+ ],
"KmydK6": ["Tebal"],
"KnoB--": ["Akan disimpan sebagai <0>", ["sanitized"], "</0>."],
"KpOJFY": ["Aktifkan pratinjau tautan eksternal"],
@@ -1618,6 +1622,7 @@
"KsAPaB": ["Cabang ini sedang dipakai di:"],
"KtACeE": ["Bawaan: <0>", ["0"], "</0>"],
"KujtjC": ["Cari"],
+ "KvwJv8": ["Sebagian file tidak ditampilkan: working tree memiliki terlalu banyak perubahan."],
"Kx881F": [["0"], " dipulihkan."],
"L-rMC9": ["Setel ulang ke bawaan"],
"L1BQTH": [["0"], " belum terpasang — membuka halaman unduhannya."],
@@ -1635,6 +1640,7 @@
"L83DKQ": ["Pemasangan PATH gagal: ", ["summary"]],
"L8fKuc": ["Jalankan ini di terminal Anda"],
"L9Y9Om": ["Halaman paling banyak ditaut"],
+ "L9ox9k": ["Tidak bisa membaca working tree. Periksa log server."],
"LAR9ub": ["Mengganti entri OpenKnowledge yang ada di ", ["0"]],
"LBv_TR": ["Ubah lokasi menjadi symlink"],
"LBwUR6": [
@@ -1659,7 +1665,6 @@
]
],
"LKOLNn": ["Tidak ada agen AI yang terpasang"],
- "LNum6A": [["minutes"], " mnt lalu"],
"LPAv9E": [["days"], " hr lalu"],
"LQdLio": ["Skema baru"],
"LQsCPn": ["Commit lokal menghalangi salinan ini diperbarui"],
@@ -1732,7 +1737,6 @@
"MCjC9A": ["Hapus ", ["deleteDescriptorLabel"]],
"MDBJwN": ["Sulit dipakai"],
"MDZSJe": ["Kapan agennya menjalankan pekerjaan terjadwalnya."],
- "MGBNwj": ["Jeda sinkronisasi"],
"MGb89P": [
"Menyisipkan, menghapus, memindahkan, menyalin, dan mengindentasi baris penyunting sumber lewat peta tombol bawaan CodeMirror."
],
@@ -1741,7 +1745,6 @@
"MIF36T": ["Percabangannya tidak bisa diselesaikan: ", ["0"]],
"MILoeL": ["Layanan"],
"MJuO1q": ["Jendela konteks:"],
- "MKEPCY": ["Ikuti"],
"MLVPcm": [["0"], " versi ", ["1"]],
"MOAoFO": ["Belum ada folder agen"],
"MPpSAg": ["Buat proyek baru dari ", ["selectedPackName"]],
@@ -1806,6 +1809,7 @@
],
"N5rzKJ": ["Hapus ", ["0"], " keterampilan"],
"N6j2JH": ["Sunting ", ["0"]],
+ "N7Lau6": ["Commit dan sinkronkan"],
"NBdIgR": ["Komentari"],
"NErvOX": ["Disimpan ke"],
"NEzPEh": ["Buat cabang baru, atau ambil cabang yang sudah ada, di jendelanya sendiri."],
@@ -1833,6 +1837,7 @@
"Nay2Yr": ["Tidak ada agen yang cocok dengan pencarian Anda."],
"NcUznW": [["0"], ", tidak ada ruang kerja"],
"NcurBF": ["Geser ke bawah"],
+ "NcwbBM": ["Pull membawa"],
"NeQ_0G": ["Kerjakan komentar-komentar ini"],
"NeY1Np": ["Slidev terlalu lama saat memulai. Coba lagi."],
"NfraGd": ["Cara lain untuk memasang Slidev"],
@@ -1876,6 +1881,7 @@
"O6yEPk": ["Membuat proyek OpenKnowledge baru di folder pilihan Anda."],
"O7_W_a": ["Buka dengan AI"],
"O9oQJS": ["Kirim laporan"],
+ "OBdkpo": ["HEAD terlepas"],
"OD0FCX": ["“", ["basename"], "” disembunyikan"],
"ODGGlj": ["Nama folder: ", ["detail"]],
"OEEQKT": ["Bagus"],
@@ -1935,6 +1941,7 @@
"Oo_WWc": ["Tidak ada halaman yang ditemukan"],
"Oos8fo": ["Salin perintah"],
"OplnBG": ["Pengelolaan alat AI tidak tersedia pada build ini."],
+ "OqqecQ": ["30 detik"],
"OsSaYm": ["Kloning gagal: ", ["title"]],
"OuQezS": ["Berlaku saat Anda melanjutkan percakapan ini"],
"OuY8t9": ["Buka di cabang saat ini"],
@@ -1969,7 +1976,9 @@
"PBwmDJ": ["Mencari berdasarkan makna"],
"PBxg_E": ["Nanti saja"],
"PCSkw2": ["Keterampilan"],
+ "PEGxvo": ["5 menit"],
"PGPGsL": ["Tambahkan deskripsi"],
+ "PGRnbw": ["Pembaruan masuk dari remote Anda; suntingan Anda tetap di komputer ini."],
"PHHEuH": ["Sembunyikan komentar yang selesai (", ["0"], ")"],
"PIMM5l": ["Anda sudah berlangganan!"],
"PKLY-1": ["Membuka..."],
@@ -1982,7 +1991,6 @@
"PRgIJh": [["subRoot"], " tidak bisa diperbarui: ", ["0"]],
"PRnH8G": ["dari ", ["0"]],
"PTUuoc": ["Tanda pada komentar itu tidak bisa dilepas — ia masih menunggu dikirim."],
- "PTb1Nx": ["Sinkronisasi dijeda. Nyalakan lagi untuk melanjutkan."],
"PVSwOe": ["Mengalihkan — menunggu proses saat ini berhenti…"],
"PVUn_c": ["Buka folder"],
"PVggyD": ["Skema frontmatter"],
@@ -2026,6 +2034,7 @@
"PrWQiT": ["Pindahkan Terminal ke kanan"],
"PrhzDE": ["Geser ke atas"],
"Pw5PTU": ["Origin eksternal"],
+ "PxZCNM": ["Di luar cakupan commit Open Knowledge."],
"Q-DKvr": ["Pasang dari ", ["source"]],
"Q1mtyd": ["Sembunyikan bilah sisi"],
"Q5fqMz": ["Galat koneksi — coba lagi"],
@@ -2075,6 +2084,7 @@
" dengan ",
["childCount", "plural", { "other": ["#", " item"] }]
],
+ "QeREu8": ["Diganti nama"],
"QfFBdJ": ["Nama berkas templatnya (tanpa `.md`)."],
"Qft6eW": ["Pindahkan ", ["0"], " ke Global"],
"Qj4RL5": ["Selesai:"],
@@ -2253,13 +2263,9 @@
"Sr9xtj": ["Pilih folder tempat skema ini berlaku"],
"SrOuyg": ["Panel dokumen"],
"SvBFYA": ["Tidak ada proyek terbaru"],
- "Sxx_Zz": [
- "Ikuti aktif untuk worktree ini, diwarisi dari ",
- ["project"],
- ". Ubah di Pengaturan → Sinkronisasi."
- ],
"T-654M": ["Memuat PDF"],
"T0OVm7": ["Cabang bawaannya terlindungi — push memerlukan pull request."],
+ "T1fMJ6": ["Seberapa sering komputer ini menarik perubahan dari remote Anda."],
"T2fvhw": ["Hapus tanda semua komentar di ", ["0"]],
"T3Mld1": ["Jendela"],
"T3j-7o": ["mis. Berpindah proyek saat sinkronisasi sedang berjalan"],
@@ -2311,10 +2317,10 @@
"U2pMtf": ["nama-tag"],
"U3IvM5": ["Panduan lengkap"],
"U3RIJu": ["Berkas lokal"],
- "U4nTfu": ["Aktifkan Ikuti"],
"U5Spo9": ["Direktori konten harus berada di dalam proyek"],
"U6Mdhd": ["Mari kita siapkan."],
"U6wmNc": ["Sinkronisasi dijeda"],
+ "U7Iesw": [["seconds"], " detik"],
"U88xbi": ["Gagal membuat berkas skema"],
"U8CD-l": ["Salin jalur lengkap, tanpa ruang kerja"],
"UBv8UK": ["Hapus Permanen"],
@@ -2348,9 +2354,6 @@
"URmyfc": ["Detail"],
"UTNVyS": ["Memilih seluruh dokumen sumber."],
"UTZ97u": ["Pilihan harus berada di dalam proyek"],
- "UVDasf": [
- "Sinkronisasi mati — suntingan Anda tetap di komputer ini sampai Anda melakukan commit dan push secara manual."
- ],
"UVLlMV": ["GitHub tidak bisa dihubungi. Coba lagi?"],
"UW2Fg3": [
"Server proyek ini yang sedang berjalan tidak mendukung penyuntingan langsung. Mulai ulang OpenKnowledge untuk memperbaikinya."
@@ -2388,6 +2391,7 @@
"UhpfxY": ["Geser ke kiri"],
"UkQGhd": ["Sembunyikan penggantian"],
"UlVARL": ["Aktifkan Slidev"],
+ "Uo2Rj7": ["Aktifkan Otomatis (Pull dan Push)?"],
"Uobeu9": ["Menambahkan keterampilan ke ", ["rootRel"], " — juga dibaca oleh ", ["0"]],
"Up2_7p": ["Salin jalur lengkap"],
"UpCz01": ["Dokumen ini"],
@@ -2464,6 +2468,7 @@
"Vftef5": [
"Masalah markdown yang umum — tab keras, lompatan tingkat judul, penanda daftar, dan lainnya."
],
+ "Vl1H8I": ["Perlu menyambung ulang untuk melanjutkan sinkronisasi."],
"Vlc75q": ["Biarkan berkas terhapus"],
"VmJT51": ["Memuat laporan Anda"],
"VmXASo": ["(symlink)"],
@@ -2489,6 +2494,7 @@
["rootPath"],
"</0>. Pilih lokasi di luarnya, atau buka proyek itu saja."
],
+ "W7mERj": ["Aktifkan Otomatis (hanya Pull)?"],
"W8vpBM": ["paket awal"],
"W9NSe0": ["Memeriksa tautan"],
"W9_Bub": ["Perubahan lokal bertumpang tindih dengan sinkronisasi yang masuk"],
@@ -2508,6 +2514,7 @@
" item terpilih? Folder dan semua berkas di dalamnya akan dihapus. Tindakan ini tidak bisa dibatalkan."
],
"WMsoIm": ["Sudah masuk?"],
+ "WOfp4H": ["Gagal memperbarui interval sinkronisasi — ", ["detail"]],
"WOr-hW": ["token"],
"WPwDin": ["Buka folder di disk"],
"WR0y2O": ["Bagikan folder"],
@@ -2526,6 +2533,7 @@
"Wcv-Zi": ["Jadikan basis pengetahuan ini tersedia sebagai Keterampilan Claude."],
"We7h2I": ["📝 atau assets/icon.png"],
"Weq9zb": ["Umum"],
+ "WfcERq": ["Tidak ada yang perlu di-commit: working tree bersih."],
"Wfy3rU": ["Pengaturan agen"],
"Wgmlsw": ["Mengambil"],
"Wh0im4": ["menyunting [[", ["realCurrentDoc"], "]]"],
@@ -2579,7 +2587,6 @@
"XRuL0i": ["Buat halaman"],
"XSb9HS": ["Buang suntingan lokal, pulihkan versi yang terpasang"],
"XT-L4j": ["Nyalakan sebuah agen untuk membuat dengan AI"],
- "XU0OXn": ["Aktifkan sinkronisasi otomatis"],
"XU5AOg": ["Masukan"],
"XV5sC0": ["Buka worktree"],
"XW18jo": ["Respons judul halaman tidak sesuai skema sukses"],
@@ -2624,6 +2631,7 @@
"Xp7Kq4": ["Operasi sinkronisasi lain sedang berjalan. Coba lagi sebentar."],
"Xp94R1": ["Coba sekali lagi"],
"XpIZmv": ["Blok kode berpagar dengan teks monospasi."],
+ "Xs1kjx": ["Periksa pembaruan setiap"],
"Xs7IcT": ["Tidak dapat menghubungi ", ["displayName"], ". Coba lagi?"],
"XszXjc": ["Diganti nama menjadi ", ["0"]],
"XtRoxT": ["Halaman ", ["pageNumber"]],
@@ -2656,6 +2664,7 @@
"Plugin lint — keluarga aturan mana yang berjalan dan pengaturan tiap aturannya — diatur di tab tersendiri di bawah Proyek ini → Plugin."
],
"YEP3X2": ["Menghapus tabel ketika pilihan sel aktif mencakup seluruh tabel."],
+ "YEzhIr": ["Pull dan Push"],
"YGIi_c": ["Pasang ulang"],
"YGNRB5": ["— kecuali"],
"YGt-0e": ["Membaca…"],
@@ -2695,7 +2704,6 @@
"Berlaku untuk proyek ini hanya di komputer ini. Disimpan di .ok/local, tidak dibagikan lewat git."
],
"Yp-Hi_": ["Buka pengaturan"],
- "YsEYYS": [["behind", "plural", { "other": ["#", " commit di belakang"] }]],
"YvwwqC": ["Di mana"],
"YwPUUP": ["Paket ini sudah disiapkan di sini."],
"YxZDGh": [
@@ -2791,7 +2799,6 @@
"ZscwQ0": ["Tidak bisa berpindah ke Hanya saya"],
"Zt7Ktx": ["Jalur tidak boleh keluar dari skill (tanpa . atau ..)"],
"Zue_jx": ["Token GitHub Anda kehilangan cakupan yang wajib. Coba masuk lagi."],
- "Zul8Ry": ["tidak pernah"],
"ZvzbDF": ["Tambahkan langsung ke proyek ini."],
"ZwpggY": ["OpenKnowledge membaca pengaturan proyek"],
"_0JUKX": ["Pelaporan bug memerlukan aplikasi desktop OpenKnowledge."],
@@ -2919,9 +2926,6 @@
"ai40UJ": ["Rekor baru · tekan <0>Spasi</0> untuk main lagi"],
"aiArms": ["Kami tidak bisa mengkloning repositori ini."],
"aiOceC": ["Aktifkan indeks"],
- "ajHi4O": [
- "Sinkronisasi otomatis dijeda — Anda tidak punya izin push ke repo ini. Beralih ke Ikuti agar tetap menerima pembaruan."
- ],
"ajz9F8": [
"Isi konflik untuk ",
["filePath"],
@@ -2942,7 +2946,6 @@
"arUUsK": ["Kabar terbaru produk"],
"ax9kie": ["Pengaturan pratinjau tautan belum dimuat — coba lagi sebentar"],
"axQ1h6": ["Ada yang ingin Anda tambahkan? (opsional)"],
- "az8lvo": ["Mati"],
"b18t0_": ["Tutup perbedaan"],
"b1FDss": ["Gulir ke awal"],
"b2ezG_": ["Keduanya disimpan — \"", ["0"], "\" kini menjadi keterampilan tersendiri"],
@@ -3041,6 +3044,9 @@
],
"cH0dkG": ["Ada fitur yang saya butuhkan tetapi tidak ada"],
"cHhH3i": ["sebuah alat git yang diperlukan"],
+ "cIFYZn": [
+ "Selama Anda keluar dari akun, pembaruan diperiksa paling cepat setiap 3 menit, terlepas dari pengaturan ini."
+ ],
"cIptmH": ["Di aplikasi Claude Desktop"],
"cKjLuT": ["(proyek + pengguna)"],
"cLP0Lf": ["Sumber keterampilan remote"],
@@ -3105,6 +3111,8 @@
"ct2kv5": ["Tidak ada judul di ", ["pageTarget"]],
"cuA8QW": ["Tata spesifikasi"],
"cuHhjo": ["Buat dan sunting"],
+ "cyoNqf": ["Belum digabungkan"],
+ "czQDKY": ["Setiap push adalah satu commit ke remote Anda."],
"d-GtJt": ["Lihat di sumber Markdown"],
"d1JjXo": [
"Salinan lokal cabang <0>",
@@ -3195,6 +3203,9 @@
"eGUbmF": ["Salin berkas atau folder terpilih"],
"eJitUk": ["Unggah dari komputer"],
"eKThTQ": ["Gagal menata ulang"],
+ "eNOyTV": [
+ "Anda tidak punya izin push ke repositori ini. Otomatis (hanya Pull) tetap bisa menjaga salinan Anda mutakhir."
+ ],
"eNQGRb": ["Matematika LaTeX sebaris yang dirender dengan KaTeX."],
"eNhWUl": ["Peninjau PR, penulis catatan rilis, daftar periksa penerapan..."],
"ePK91l": ["Sunting"],
@@ -3224,6 +3235,7 @@
"emMrXQ": ["Server mengembalikan respons duplikasi yang salah bentuk."],
"emgiet": ["Konten otoritatif; dicerminkan apa adanya di mana pun ia dirujuk."],
"enPTnx": ["baris ", ["displayLine"]],
+ "eolhcI": ["Membaca working tree"],
"eps54V": ["Dihapus"],
"epuNYK": [
"Menandai sebuah blok sebagai sumber kebenaran. Cermin di tempat lain diperbarui langsung saat Anda menyuntingnya."
@@ -3231,9 +3243,6 @@
"erenF-": ["Tidak dapat menghapus berkas yang konfliknya belum diselesaikan"],
"euGaS0": ["Tidak dapat membaca ", ["fileName"], "."],
"euc6Ns": ["Gandakan"],
- "evHlIg": [
- "Ikuti tidak pernah melakukan push atau commit pada perubahan lokal Anda. Semuanya hanya tinggal di komputer ini."
- ],
"evs0iw": ["Tag yang cocok dengan \"", ["tagListQuery"], "\""],
"ewSbS_": ["Sesi shell"],
"ezUmoU": ["Nilai elemen yang diizinkan (kosong = apa saja)"],
@@ -3307,7 +3316,6 @@
{ "other": ["Yakin ingin menghapus ", "#", " berkas/folder berikut beserta isinya?"] }
]
],
- "g2Tj8R": ["Penuh"],
"g3UF2V": ["Terima"],
"g4WlQK": ["Pengelolaan alat AI proyek hanya tersedia di aplikasi desktop OpenKnowledge."],
"g4XBm0": ["Judul bagian kecil."],
@@ -3323,7 +3331,6 @@
["display"],
". Folder itu menjadi symlink ke folder ini, jadi agennya membaca semua yang ditaruh di sini. Folder ini tetap nyata. Keterampilan yang berkonflik membatalkan penggabungan."
],
- "g85bAo": ["Tersinkron ", ["lastSyncedRelative"]],
"g9Nj4l": ["// catatan"],
"gAhHu7": [
"Perbaikan otomatis hanya berlaku untuk masalah yang punya perbaikan mekanis yang diketahui."
@@ -3399,6 +3406,7 @@
"Dokumen ini belum tersinkron ke GitHub. Tautannya akan berfungsi setelah sinkronisasi berikutnya."
],
"gyHDWC": ["Perbaiki semua dengan AI (", ["count"], ")"],
+ "gyYvCN": ["Kirim suntingan saya setiap"],
"h-AdvS": ["Folder dan templatnya sudah ada di sini, jadi tidak ada yang perlu ditambahkan."],
"h06R3C": ["Tidak ada halaman yang kehilangan tautan graf keluar."],
"h16FyT": ["Daftar"],
@@ -3478,9 +3486,6 @@
"Sebuah baris dengan catatan kaki<0><1>[1]</1></0> dan definisi yang ditampilkan di bawah."
],
"hxEUVJ": ["Inisialisasi ", ["selectedPackName"]],
- "hxYFzm": [
- "Sinkronisasi penuh — commit Anda dikirim dan perubahan remote ditarik secara otomatis."
- ],
"hxnF0I": ["Properti ", ["0"]],
"hyCxJY": ["Buka worktree itu saja"],
"hynz2K": ["Unduhan dimulai"],
@@ -3495,7 +3500,6 @@
"i09An-": ["Versi terdahulu dipulihkan (", ["0"], ")"],
"i1flq_": ["Saran tautan wiki"],
"i3f2kh": ["Tidak ada perintah yang cocok."],
- "i6ng22": ["Beralih ke Ikuti"],
"i92eAT": [
"Kami akan membuat sebuah repositori dan mulai menyinkronkan — tanpa perlu terminal."
],
@@ -3584,13 +3588,11 @@
],
"iqugog": ["Inisialisasi gagal: ", ["errorDetail"]],
"irFGwu": ["Daftar templat"],
+ "irnKr_": ["Diperbarui ", ["updatedRelative"]],
"irrm_E": ["Hapus pilihan"],
"isRobC": ["Baru"],
"iuTKci": ["Belum ada suntingan."],
"iv452l": ["Dokumentasi untuk ", ["0"], " (terbuka di peramban)"],
- "iy64Li": [
- "Sinkronisasi penuh — suntingan Anda di-commit dan dikirim ke remote Anda secara otomatis."
- ],
"iycx_A": ["Melakukan push"],
"iz1LdD": [
"Diubah di luar OK sejak terakhir kali OK menulis di sini — keadaan yang ditampilkan adalah apa yang ada di disk sekarang"
@@ -3644,6 +3646,7 @@
"jTLWxh": [
"Menyematkan halaman eksternal dalam iframe sebaris (dokumentasi, demo, Figma, CodeSandbox)."
],
+ "jTUxaN": ["Aktifkan Otomatis (hanya Pull)"],
"jWzDfC": ["Memeriksa alat AI yang Anda miliki"],
"jZ_E5M": ["Fetch gagal — periksa log server untuk detailnya."],
"j_Z6g7": ["Bawaan bersama"],
@@ -3736,13 +3739,15 @@
"Arahkan pencarian semantik ke endpoint embedding mana pun yang kompatibel dengan OpenAI — server milik sendiri atau penyedia lain. Kunci API di atas berlaku untuk endpoint mana pun yang Anda setel di sini."
],
"kSiB3X": ["Tidak dapat memindahkan ke ", ["trashNoun"]],
- "kUn-CN": ["Sinkronisasi mati"],
"kV2YZv": [
"Tidak melihat <0>Keterampilan</0>? Aktifkan dulu <1>Pengaturan <2/> Kemampuan <3/> Eksekusi kode dan pembuatan berkas</1>."
],
"kVS5tE": ["Pertahankan indeks generated di setiap folder?"],
"kVgQUA": ["Hapus obrolan ini?"],
"kVzuTI": ["Keterampilan agen yang direkomendasikan"],
+ "kXNv8P": [
+ "Otomatis (hanya Pull) tidak pernah melakukan push atau commit perubahan lokal Anda. Semuanya tetap hanya di mesin ini."
+ ],
"kYL1lH": ["Aktivitas agen"],
"k_Dqw1": [["0", "plural", { "other": ["Tidak ada masalah di ", "#", " dokumen."] }]],
"k_pade": [
@@ -3830,6 +3835,7 @@
"lM4c-I": [
"Sebuah jalur di dalam keterampilan — folder apa pun bisa (mis. references/notes.md). Folder pada jalur itu dibuatkan untuk Anda."
],
+ "lPkjpD": ["Dikirim ", ["pushed"]],
"lPzyrU": ["Semua bagian sudah diselesaikan"],
"lS83Sg": ["Papan klip tidak dapat diakses."],
"lScd1O": ["Dek Slidev hanya terbuka di aplikasi desktop OpenKnowledge."],
@@ -4145,6 +4151,7 @@
"pJ7XCo": ["Halaman ini tidak merujuk ke berkas atau gambar lokal apa pun."],
"pMPnZv": [["deleted"], " keterampilan dihapus"],
"pOo4Aa": ["Teks biasa"],
+ "pPiV8s": ["Aktifkan Otomatis (Pull dan Push)"],
"pSimwP": ["Nama baru untuk versi ", ["editor"]],
"pTPqMK": ["Menyalakan atau mematikan blok kode berpagar."],
"pTyA_t": ["tag"],
@@ -4208,6 +4215,7 @@
"qAx7xG": ["Folder tetap di akar konten"],
"qBi_YG": ["Pasang OpenKnowledge di alat AI Anda"],
"qC7PwZ": ["Gagal menghapus bidang"],
+ "qD3krc": ["Tidak ada yang berjalan sampai Anda meminta."],
"qEEfPk": ["Laporan bug ", ["0"]],
"qEIFZu": ["Kunci yang berakhiran ", ["keyHint"]],
"qEue6Q": [" atau "],
@@ -4216,6 +4224,9 @@
"qIJIrD": ["Menguji"],
"qJSo0_": ["Apa bedanya salinan dan symlink?"],
"qKMfPp": ["Sembunyikan simpul keterampilan"],
+ "qLXJTB": [
+ "Jaga proyek ini tetap sinkron dengan remote git Anda. Otomatis (hanya Pull) membawa pembaruan tanpa push; Otomatis (Pull dan Push) juga mengirim suntingan Anda. Mengaktifkan sinkronisasi otomatis memerlukan konfirmasi."
+ ],
"qNOgUu": ["Suntingan di sumbernya sampai ke sini — tanpa penyimpangan salin-tempel."],
"qQi_um": ["Tema diimpor."],
"qRZh7J": ["Biarkan Tab keluar dari penyunting sumber alih-alih menambah indentasi."],
@@ -4233,7 +4244,6 @@
"qXg5W9": ["Berkasnya tersimpan di <0>~/Downloads/openknowledge.skill</0>."],
"qXsafh": ["Terbitkan ke GitHub"],
"qZv5ZR": ["Gagal mengalihkan berbagi konfigurasi"],
- "q_9EcE": ["Aktifkan sinkronisasi otomatis git?"],
"q_Q1-i": [
[
"count",
@@ -4325,7 +4335,6 @@
["boldName"],
" — keterampilan bawaan yang disertakan bersama Open Knowledge. Ia hanya-baca."
],
- "rn7n0G": ["Lanjutkan sinkronisasi"],
"rnX-1S": ["Aktifkan plugin"],
"rnrdEX": ["utama"],
"roAe2K": ["URL tautan"],
@@ -4369,6 +4378,7 @@
"sJK6pq": ["Izin ditolak"],
"sJWhgo": ["Komponen tidak dikenal: ", ["unregisteredComponentName"]],
"sKEgGd": ["Kirim ke obrolan"],
+ "sKHiNR": [["count"], " di belakang"],
"sNeKjP": ["Gagal menyimpan token — coba lagi"],
"sOxZaS": ["Gagal memuat graf"],
"sQoLn0": ["Keluar"],
@@ -4391,6 +4401,7 @@
"scyoP9": [
"Dokumen indeks tidak membawa frontmatter, kecuali dokumen yang ada di akar basis pengetahuan Anda. Dokumen log tidak tercakup — OKF tidak membatasi frontmatter mereka."
],
+ "sdvHp3": ["Berubah di sini dan di remote"],
"se-tU0": ["Tidak dapat memperbaiki ", ["0"], " dari ", ["total"], " berkas."],
"seeS6l": ["Siapkan OpenKnowledge di folder ini?"],
"sgmRY8": ["Unduhan ", ["0"], " dilewati."],
@@ -4406,6 +4417,9 @@
"snrVQ7": ["pemeriksaan gagal"],
"sq4WQH": ["Pakai ", ["0"], " sebagai tema terang"],
"sqUrlK": ["Melamun…"],
+ "srdlOs": [
+ "Sinkronisasi otomatis dijeda: Anda tidak punya izin push ke repositori ini. Beralihlah ke Otomatis (hanya Pull) agar tetap menerima pembaruan."
+ ],
"ssk6rl": [
"Folder milik keterampilan itu sendiri (",
["path"],
@@ -4427,12 +4441,14 @@
"Baris sebaris bergaya Notion untuk berkas yang bisa diunduh. Seret-lepas juga berfungsi."
],
"t18QYR": ["Lepas sematan ", ["accessibleLabel"]],
- "t2TkQ3": ["Sinkronisasi dijeda — selesaikan konfliknya untuk melanjutkan."],
"t4sFKC": [
"Cabang baru <0>",
["trimmed"],
"</0> akan dibuat dari commit saat ini, di worktree tersendiri di bawah <1>.ok/worktrees/</1>."
],
+ "t5I7P_": [
+ "Tidak ada yang berjalan sampai Anda meminta — pull dan push dari menu sinkronisasi."
+ ],
"t6w1cq": ["Membuka tab penyunting kosong."],
"t7YoBO": ["Kirim komentar ini"],
"t9Qn8y": ["Tidak ada agen yang diaktifkan"],
@@ -4476,6 +4492,7 @@
["alreadyImported"],
" sudah ada sebelumnya)"
],
+ "tlGXxX": ["Otomatis (hanya Pull)"],
"tnG-m6": ["Sinkronisasi otomatis dijeda — masuk untuk melanjutkan."],
"toyw51": ["Kendali diagram Mermaid"],
"tqQBwN": ["Skrip apa pun ditampilkan untuk ditinjau, tidak pernah dijalankan."],
@@ -4502,6 +4519,7 @@
"u779EG": ["Gunakan origin http:// atau https://."],
"u7H-Wn": ["Tampilkan panel (", ["panelShortcutLabel"], ")"],
"u7U_Ij": ["Menautkan teks yang dipilih, atau menyunting tautan di bawah kursor."],
+ "uAQUqI": ["Status"],
"uA_jXp": ["Ganti cabang dan perbarui"],
"uBAxNB": ["Penyunting"],
"uCaIdy": [
@@ -4532,9 +4550,6 @@
"Server tidak bisa dimulai ulang — ia berjalan di bawah akun lain. Mulai ulang komputer Anda untuk membersihkannya, lalu buka lagi proyek ini."
],
"uUCrBv": ["symlink"],
- "uUiiyC": [
- "Anda tidak punya izin push ke repo ini. Ikuti tetap bisa menjaga salinan Anda mutakhir."
- ],
"uVbUP8": ["Pengaturan…"],
"uY5Z7P": ["Permainan berakhir · tekan <0>Spasi</0> untuk main lagi"],
"uYZTcW": ["URL GitHub ini tidak dapat dibagikan."],
@@ -4569,6 +4584,7 @@
"v15iQB": [
"Kontrak perhitungan yang dibuktikan. Hanya berlaku untuk dokumen yang diketik Attested Computation, dimana OKF memerlukan runtime; konsep biasa tidak terpengaruh."
],
+ "v16Pzh": ["Beralih ke Otomatis (hanya Pull)"],
"v2ZW0K": ["Aktifkan terminal"],
"v2a04T": ["Aturan markdownlint"],
"v41fCm": ["Berkas tidak ditemukan"],
@@ -4581,6 +4597,7 @@
"vF68cg": ["Bidang"],
"vGQxBT": ["Pembaruan dari sumbernya berlaku otomatis (kecuali sudah disunting secara lokal)"],
"vGeNNQ": ["Salin sebuah prompt dan tempelkan ke agen Anda untuk menyiapkan proyek Anda."],
+ "vGjmyl": ["Dihapus"],
"vHlhDc": ["Klik dua kali untuk menyunting"],
"vIxrEk": ["Sesuaikan lebar"],
"vLyv1R": ["Sembunyikan"],
@@ -4636,8 +4653,10 @@
}
]
],
+ "vp5vfW": ["1 jam"],
"vppAju": ["Tempat lampiran yang baru ditambahkan diletakkan."],
"vqJXNe": ["Pasang skill <0>open-knowledge-discovery</0>"],
+ "vsFXfP": ["Push melewati"],
"vv7kpg": ["Dibatalkan"],
"vvWZnu": ["Perbedaan tidak tersedia"],
"vwV-kH": ["Perbaikan berkas berhenti secara tidak terduga."],
@@ -4702,6 +4721,11 @@
"wdzBgi": ["Berbagi konfigurasi kini Hanya saya."],
"weP6me": ["Dokumen tidak bisa dimuat — ketik @ lagi untuk mencoba ulang"],
"wgNoIs": ["Pilih semua"],
+ "wk_v1X": [
+ "Sinkronisasi worktree ini disetel ke Otomatis (Pull dan Push), diwarisi dari ",
+ ["project"],
+ ". Ubah di Pengaturan → Sinkronisasi."
+ ],
"wlwXUk": [
"Anda memilih ~/Downloads. Berkas di sana biasanya sementara — pertimbangkan folder yang lebih tetap."
],
@@ -4741,6 +4765,7 @@
"xCdTnb": ["Tutup tab baru"],
"xDBki3": ["Saran judul"],
"xDEcka": ["Penyedianya sedang membatasi laju kunci ini. Coba lagi sebentar."],
+ "xDKOFk": ["Diabaikan"],
"xEb24l": ["Izinkan kami menindaklanjuti lewat surel"],
"xFQRu4": ["Saya sudah punya secara lokal"],
"xG4tb6": ["Koneksi ke \"", ["docName"], "\" terputus."],
@@ -4752,6 +4777,7 @@
"xOTzt5": ["baru saja"],
"xSVO3J": ["Apa yang dibuat"],
"xV5sXw": [["0"], " mgg lalu"],
+ "xW5AUw": ["Ditarik ", ["pulled"]],
"xWEvuo": ["Tanya AI"],
"xWomUD": ["Pakai versi ", ["editor"]],
"xXo8FT": ["Gagal menyimpan: ", ["error"]],
@@ -4889,6 +4915,7 @@
"zAJzIg": ["Masalah di ", ["0"]],
"zAsDLY": ["Visualisasi graf tautan antardokumen"],
"zBUqvf": ["Siapkan integrasi OpenKnowledge…"],
+ "zBiFZh": ["Suntingan Anda di-commit dan dikirim ke remote Anda secara otomatis."],
"zC5jrM": ["Akan dibuat sebagai <0>", ["effective"], "</0>"],
"zD1Nqf": [["count", "plural", { "other": ["#", " dokumen"] }]],
"zFH7iU": [
@@ -4905,6 +4932,7 @@
"zLak8b": ["Aktifkan tab baru"],
"zMmwh4": ["Pilih tema atau buat tema Anda sendiri."],
"zQBg2C": ["Menaikkan atau menurunkan blok saat ini satu posisi."],
+ "zWZBPx": ["Tipe berubah"],
"zXj1rA": ["Cari berdasarkan makna"],
"zYp8Sr": [
"Lencana <0>Diubah</0> menandai aturan yang disetel konfigurasi Anda secara eksplisit — langsung, atau diwarisi lewat <1>extends</1>. Aturan tanpa lencana tetap pada keadaan bawaannya."
@@ -4945,7 +4973,6 @@
". Pilih folder yang diklona dari ",
["expectedHost"],
"?"
- ],
- "zz_Wd_": ["Mode"]
+ ]
}
}
diff --git a/packages/app/src/locales/id/messages.po b/packages/app/src/locales/id/messages.po
index 9fef6f49d..a01910686 100644
--- a/packages/app/src/locales/id/messages.po
+++ b/packages/app/src/locales/id/messages.po
@@ -517,10 +517,6 @@ msgstr "{ahead} di depan, {behind} di belakang"
msgid "{basename} — text editor"
msgstr "{basename} — penyunting teks"
-#: src/components/SyncStatusBadge.tsx
-msgid "{behind, plural, one {# commit behind} other {# commits behind}}"
-msgstr "{behind, plural, other {# commit di belakang}}"
-
#: src/components/SyncStatusBadge.tsx
msgid "{behind} behind"
msgstr "{behind} di belakang"
@@ -616,6 +612,14 @@ msgstr "{count, plural, other {Langsung memperbaiki # masalah yang punya perbaik
msgid "{count, plural, one {matches # file} other {matches # files}}"
msgstr "{count, plural, other {cocok dengan # berkas}}"
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} ahead"
+msgstr "{count} di depan"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} behind"
+msgstr "{count} di belakang"
+
#: src/components/SkillBulkDeleteDialog.tsx
msgid "{count} skills"
msgstr "{count} keterampilan"
@@ -811,14 +815,11 @@ msgstr "{localizedMessage} pada baris {displayLine}"
msgid "{mins, plural, one {# min ago} other {# min ago}}"
msgstr "{mins, plural, other {# mnt lalu}}"
-#: src/components/SyncStatusBadge.tsx
-msgid "{minutes} min ago"
-msgstr "{minutes} mnt lalu"
-
#: src/components/acp/ThreadHistoryMenu.tsx
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "{minutes}m ago"
msgstr "{minutes} mnt lalu"
@@ -910,6 +911,10 @@ msgstr "{propertyCount, plural, other {# properti}}"
msgid "{propPanelDescriptorLabel} Properties"
msgstr "Properti {propPanelDescriptorLabel}"
+#: src/components/settings/SyncSection.tsx
+msgid "{seconds} seconds"
+msgstr "{seconds} detik"
+
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
@@ -1123,6 +1128,26 @@ msgstr "📝 atau assets/icon.png"
msgid "0/0"
msgstr "0/0"
+#: src/components/settings/SyncSection.tsx
+msgid "1 hour"
+msgstr "1 jam"
+
+#: src/components/settings/SyncSection.tsx
+msgid "1 minute"
+msgstr "1 menit"
+
+#: src/components/settings/SyncSection.tsx
+msgid "15 minutes"
+msgstr "15 menit"
+
+#: src/components/settings/SyncSection.tsx
+msgid "30 seconds"
+msgstr "30 detik"
+
+#: src/components/settings/SyncSection.tsx
+msgid "5 minutes"
+msgstr "5 menit"
+
#: src/components/ImportSkillForm.tsx
msgid "A .zip or .skill archive."
msgstr "Arsip .zip atau .skill."
@@ -1517,6 +1542,7 @@ msgstr "Tambahkan komentar Anda ke pesan ini"
#: src/components/PropertyDiffBlock.tsx
#: src/components/SkillDirectoryResult.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Added"
msgstr "Ditambahkan"
@@ -1561,11 +1587,13 @@ msgstr "Menambahkan berkas ini"
msgid "Adds these folders"
msgstr "Menambahkan folder ini"
+#: src/components/settings/SyncSection.tsx
#: src/editor/components/PropPanel.tsx
msgid "Advanced"
msgstr "Lanjutan"
#: src/components/ConsentDialogBody.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Advanced settings"
msgstr "Pengaturan lanjutan"
@@ -1975,6 +2003,24 @@ msgstr "Konten otoritatif; dicerminkan apa adanya di mana pun ia dirujuk."
msgid "Authorize in browser"
msgstr "Beri izin di peramban"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull and Push)"
+msgstr "Otomatis (Pull dan Push)"
+
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull only)"
+msgstr "Otomatis (hanya Pull)"
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
+msgstr "Otomatis (hanya Pull) mengambil pembaruan dari repositori git remote Anda dan memajukan salinan Anda secara otomatis. Suntingan lokal Anda tetap di komputer ini dan tidak pernah dikirim."
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) never pushes or commits your local changes. They stay only on this machine."
+msgstr "Otomatis (hanya Pull) tidak pernah melakukan push atau commit perubahan lokal Anda. Semuanya tetap hanya di mesin ini."
+
#: src/components/settings/TerminalSection.tsx
msgid "Auto-approve settings not yet loaded — try again in a moment"
msgstr "Pengaturan persetujuan otomatis belum dimuat — coba lagi sebentar"
@@ -2008,21 +2054,13 @@ msgstr "Perbaikan otomatis hanya berlaku untuk masalah yang punya perbaikan meka
msgid "Auto-save"
msgstr "Simpan otomatis"
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is off for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "Sinkronisasi otomatis mati untuk worktree ini, diwarisi dari {project}. Ubah di Pengaturan → Sinkronisasi."
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "Sinkronisasi otomatis aktif untuk worktree ini, diwarisi dari {project}. Ubah di Pengaturan → Sinkronisasi."
-
#: src/components/settings/SyncSection.tsx
msgid "Auto-sync is paused — sign in to resume."
msgstr "Sinkronisasi otomatis dijeda — masuk untuk melanjutkan."
#: src/components/settings/SyncSection.tsx
-msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Follow to keep receiving updates."
-msgstr "Sinkronisasi otomatis dijeda — Anda tidak punya izin push ke repo ini. Beralih ke Ikuti agar tetap menerima pembaruan."
+msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Auto (Pull only) to keep receiving updates."
+msgstr "Sinkronisasi otomatis dijeda: Anda tidak punya izin push ke repositori ini. Beralihlah ke Otomatis (hanya Pull) agar tetap menerima pembaruan."
#: src/components/AutoSyncEnableWarning.tsx
msgid "Auto-sync periodically fetches, pulls, and pushes commits to your remote git repository so your edits stay in sync across machines."
@@ -2420,9 +2458,14 @@ msgid "Change the embeddings provider?"
msgstr "Ganti penyedia embedding?"
#: src/components/PropertyDiffBlock.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Changed"
msgstr "Diubah"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Changed here and on the remote"
+msgstr "Berubah di sini dan di remote"
+
#: src/components/ChangedOutsideBadge.tsx
msgid "changed outside"
msgstr "diubah di luar"
@@ -2447,6 +2490,10 @@ msgstr "Perubahan disimpan otomatis."
msgid "Check for updates"
msgstr "Periksa pembaruan"
+#: src/components/settings/SyncSection.tsx
+msgid "Check for updates every"
+msgstr "Periksa pembaruan setiap"
+
#: src/components/AppMenubar.tsx
msgid "Check for updates…"
msgstr "Periksa pembaruan…"
@@ -2966,6 +3013,10 @@ msgstr "Beri komentar atau tanya AI tentang blok kode ini"
msgid "Comments"
msgstr "Komentar"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Commit and sync"
+msgstr "Commit dan sinkronkan"
+
#: src/components/ShareBranchSwitchDialog.tsx
msgid "Commit or stash changes to switch:"
msgstr "Lakukan commit atau stash pada perubahan untuk berpindah:"
@@ -3267,6 +3318,7 @@ msgstr "Mengubah..."
#: src/components/empty-state/CopyablePromptList.tsx
#: src/components/InstallInClaudeDesktopDialog.tsx
+#: src/components/SyncStatusBadge.tsx
#: src/editor/extensions/CodeBlockView.tsx
msgid "Copied"
msgstr "Disalin"
@@ -3882,6 +3934,10 @@ msgstr "Komentar yang menunggu dikirim tidak bisa dibaca — tidak ada yang diki
msgid "Couldn't read the comments waiting to send: {0}"
msgstr "Komentar yang menunggu dikirim tidak bisa dibaca: {0}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Couldn't read the working tree. Check the server logs."
+msgstr "Tidak bisa membaca working tree. Periksa log server."
+
#. placeholder {0}: warning.code
#: src/components/settings/SavedThemesTiles.tsx
msgid "Couldn’t read this theme ({0})"
@@ -4455,6 +4511,10 @@ msgstr "Hapus obrolan ini?"
msgid "Delete this comment"
msgstr "Hapus komentar ini"
+#: src/components/SyncStatusBadge.tsx
+msgid "Deleted"
+msgstr "Dihapus"
+
#. placeholder {0}: deletedTheme.label
#: src/components/settings/SavedThemesTiles.tsx
msgid "Deleted {0}."
@@ -4550,6 +4610,10 @@ msgstr "token deskripsi"
msgid "Design"
msgstr "Desain"
+#: src/components/SyncStatusBadge.tsx
+msgid "detached HEAD"
+msgstr "HEAD terlepas"
+
#: src/components/SyncStatusBadge.tsx
msgid "Detached HEAD — checkout a branch to resume"
msgstr "HEAD terlepas — ambil sebuah cabang untuk melanjutkan"
@@ -4922,6 +4986,10 @@ msgstr "Setiap alat AI membaca keterampilan dari foldernya sendiri. Arahkan satu
msgid "Each pack scaffolds your project with ready-made folders and templates."
msgstr "Setiap paket menyusun proyek Anda dengan folder dan templat siap pakai."
+#: src/components/settings/SyncSection.tsx
+msgid "Each push is one commit to your remote."
+msgstr "Setiap push adalah satu commit ke remote Anda."
+
#: src/components/AppMenubar.tsx
#: src/components/settings/LintingSection.tsx
#: src/components/SkillsTree.tsx
@@ -5170,25 +5238,25 @@ msgstr "Aktifkan {id}"
#: src/components/EnableSyncConfirmDialog.tsx
#: src/components/share-receive-miss-content.tsx
#: src/components/ShareFreshnessWarning.tsx
-msgid "Enable auto-sync"
-msgstr "Aktifkan sinkronisasi otomatis"
+msgid "Enable Auto (Pull and Push)"
+msgstr "Aktifkan Otomatis (Pull dan Push)"
-#: src/components/settings/LinkPreviewsSection.tsx
-msgid "Enable external link previews"
-msgstr "Aktifkan pratinjau tautan eksternal"
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Enable Auto (Pull and Push)?"
+msgstr "Aktifkan Otomatis (Pull dan Push)?"
#: src/components/AutoSyncOnboardingDialog.tsx
#: src/components/EnableSyncConfirmDialog.tsx
-msgid "Enable Follow"
-msgstr "Aktifkan Ikuti"
+msgid "Enable Auto (Pull only)"
+msgstr "Aktifkan Otomatis (hanya Pull)"
#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable Follow?"
-msgstr "Aktifkan Ikuti?"
+msgid "Enable Auto (Pull only)?"
+msgstr "Aktifkan Otomatis (hanya Pull)?"
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable git auto-sync?"
-msgstr "Aktifkan sinkronisasi otomatis git?"
+#: src/components/settings/LinkPreviewsSection.tsx
+msgid "Enable external link previews"
+msgstr "Aktifkan pratinjau tautan eksternal"
#: src/components/settings/LintingSection.tsx
msgid "Enable indexes"
@@ -5784,6 +5852,10 @@ msgstr "Gagal memperbarui penyedia embedding — {detail}"
msgid "Failed to update the project sync default — {detail}"
msgstr "Gagal memperbarui sinkronisasi bawaan proyek — {detail}"
+#: src/components/settings/SyncSection.tsx
+msgid "Failed to update the sync interval — {detail}"
+msgstr "Gagal memperbarui interval sinkronisasi — {detail}"
+
#: src/components/FileTree.tsx
msgid "Failed to upload file"
msgstr "Gagal mengunggah berkas"
@@ -6043,28 +6115,6 @@ msgstr "Tautan berbagi folder disalin."
msgid "Folder target: {linkTitle}. Click to open the overview."
msgstr "Folder tujuan: {linkTitle}. Klik untuk membuka ikhtisarnya."
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow"
-msgstr "Ikuti"
-
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow — updates flow in from your remote; your edits stay on this computer."
-msgstr "Ikuti — pembaruan mengalir masuk dari remote Anda; suntingan Anda tetap di komputer ini."
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
-msgstr "Ikuti mengambil pembaruan dari repositori git remote Anda dan memajukan salinan Anda secara otomatis. Suntingan lokal Anda tetap di komputer ini dan tidak pernah dikirim."
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Follow is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "Ikuti aktif untuk worktree ini, diwarisi dari {project}. Ubah di Pengaturan → Sinkronisasi."
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow never pushes or commits your local changes. They stay only on this machine."
-msgstr "Ikuti tidak pernah melakukan push atau commit pada perubahan lokal Anda. Semuanya hanya tinggal di komputer ini."
-
#: src/components/acp/ThreadView.tsx
msgid "Follow the agent's edits"
msgstr "Ikuti suntingan agen"
@@ -6155,11 +6205,6 @@ msgstr "Frontmatter yang mengawali setiap dokumen yang dibuat dari templat ini.
msgid "Frontmatter schemas"
msgstr "Skema frontmatter"
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Full"
-msgstr "Penuh"
-
#: src/components/InstallInClaudeDesktopDialog.tsx
msgid "Full guide"
msgstr "Panduan lengkap"
@@ -6173,14 +6218,6 @@ msgstr "Jalur lengkap"
msgid "Full Path"
msgstr "Jalur Lengkap"
-#: src/components/settings/SyncSection.tsx
-msgid "Full sync — your commits push and remote changes pull automatically."
-msgstr "Sinkronisasi penuh — commit Anda dikirim dan perubahan remote ditarik secara otomatis."
-
-#: src/components/SyncStatusBadge.tsx
-msgid "Full sync — your edits are committed and pushed to your remote automatically."
-msgstr "Sinkronisasi penuh — suntingan Anda di-commit dan dikirim ke remote Anda secara otomatis."
-
#: src/components/OkBlobRunner.tsx
msgid "Game over · press <0>Space</0> to play again"
msgstr "Permainan berakhir · tekan <0>Spasi</0> untuk main lagi"
@@ -6239,6 +6276,7 @@ msgid "Git needs a helper tool (such as git-lfs) that isn't installed or couldn'
msgstr "Git membutuhkan alat bantu (seperti git-lfs) yang belum terpasang atau tidak ditemukan. Pasang dulu, lalu coba lagi."
#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Git sync"
msgstr "Sinkronisasi git"
@@ -6616,6 +6654,10 @@ msgstr "Bagaimana cara kerja berbagi?"
msgid "How missing project-local documents, files, and images are reported in Problems, editor diagnostics, audits, and agent tools."
msgstr "Cara dokumen, file, dan gambar lokal proyek yang hilang dilaporkan di Masalah, diagnostik editor, audit, dan alat agen."
+#: src/components/settings/SyncSection.tsx
+msgid "How often this computer pulls changes from your remote."
+msgstr "Seberapa sering komputer ini menarik perubahan dari remote Anda."
+
#: src/components/ShareFreshnessWarning.tsx
msgid "How to push manually"
msgstr "Cara push manual"
@@ -6701,6 +6743,10 @@ msgstr "Pola abaikan"
msgid "Ignore patterns (raw text)"
msgstr "Pola abaikan (teks mentah)"
+#: src/components/SyncStatusBadge.tsx
+msgid "Ignored"
+msgstr "Diabaikan"
+
#: src/components/LinksPanel.tsx
msgid "Image {identity}. Go to reference."
msgstr "Gambar {identity}. Buka referensi."
@@ -7297,8 +7343,8 @@ msgid "Keep the name to 64 characters or fewer."
msgstr "Nama harus 64 karakter atau kurang."
#: src/components/settings/SyncSection.tsx
-msgid "Keep this project in sync with your git remote. Follow fetches updates without pushing; full sync pushes your commits too. Turning sync on requires confirmation."
-msgstr "Jaga proyek ini tetap selaras dengan remote git Anda. Ikuti mengambil pembaruan tanpa mengirim; sinkronisasi penuh juga mengirim commit Anda. Menyalakan sinkronisasi memerlukan konfirmasi."
+msgid "Keep this project in sync with your git remote. Auto (Pull only) brings in updates without pushing; Auto (Pull and Push) sends your edits too. Turning auto-sync on requires confirmation."
+msgstr "Jaga proyek ini tetap sinkron dengan remote git Anda. Otomatis (hanya Pull) membawa pembaruan tanpa push; Otomatis (Pull dan Push) juga mengirim suntingan Anda. Mengaktifkan sinkronisasi otomatis memerlukan konfirmasi."
#: src/lib/pack-copy.ts
msgid "Keep track of the people and companies you work with and the meetings you have with them. Good for remembering who someone is, how you know them, and what you last talked about."
@@ -7778,6 +7824,11 @@ msgstr "Pengelolaan alat AI tidak tersedia pada build ini."
msgid "Managing project AI tools is unavailable in this build."
msgstr "Pengelolaan alat AI proyek tidak tersedia pada build ini."
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Manual"
+msgstr "Manual"
+
#: src/components/empty-state/use-create-suggestions.ts
msgid "Map the architecture"
msgstr "Petakan arsitekturnya"
@@ -7916,10 +7967,6 @@ msgstr "Warna palet tidak lengkap"
msgid "Missing theme name"
msgstr "Nama tema tidak ada"
-#: src/components/SyncStatusBadge.tsx
-msgid "Mode"
-msgstr "Mode"
-
#: src/components/settings/SearchSection.tsx
msgid "Model"
msgstr "Model"
@@ -7936,6 +7983,7 @@ msgstr "Upaya bawaan model"
#: src/components/FolderOverview.tsx
#: src/components/settings/markdownlint-rule-browser.tsx
#: src/components/SkillOriginInline.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Modified"
msgstr "Diubah"
@@ -8228,10 +8276,6 @@ msgstr "Galat jaringan saat pembersihan"
msgid "Network settings not yet loaded. Try again in a moment."
msgstr "Pengaturan jaringan belum dimuat. Coba lagi sebentar."
-#: src/components/SyncStatusBadge.tsx
-msgid "never"
-msgstr "tidak pernah"
-
#: src/components/FolderOverview.tsx
#: src/editor/tag-suggestion/TagSuggestionMenu.tsx
msgid "New"
@@ -8846,10 +8890,22 @@ msgstr "tidak apa pun ({0} tidak bisa cocok dengan sebuah dokumen)"
msgid "nothing ({0} is not a valid pattern)"
msgstr "tidak apa pun ({0} bukan pola yang valid)"
+#: src/components/settings/SyncSection.tsx
+msgid "Nothing moves until you ask — pull and push from the sync menu."
+msgstr "Tidak ada yang berjalan sampai Anda meminta — pull dan push dari menu sinkronisasi."
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing moves until you ask."
+msgstr "Tidak ada yang berjalan sampai Anda meminta."
+
#: src/components/FolderPropertiesCard.tsx
msgid "Nothing set yet."
msgstr "Belum ada yang disetel."
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing to commit — working tree clean."
+msgstr "Tidak ada yang perlu di-commit: working tree bersih."
+
#: src/components/BugReportSendToast.tsx
msgid "Nothing was uploaded. The report stays on this computer until you email it to us."
msgstr "Tidak ada yang diunggah. Laporan tetap di komputer ini sampai Anda mengirimkannya kepada kami lewat email."
@@ -8883,10 +8939,6 @@ msgstr "dari {0}"
msgid "of {totalPages}"
msgstr "dari {totalPages}"
-#: src/components/settings/SyncSection.tsx
-msgid "Off"
-msgstr "Mati"
-
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Off — external links show only their URL. No requests leave this computer."
msgstr "Mati — tautan eksternal hanya menampilkan URL-nya. Tidak ada permintaan yang keluar dari komputer ini."
@@ -9641,6 +9693,10 @@ msgstr "Keluar"
msgid "Outline"
msgstr "Kerangka"
+#: src/components/SyncStatusBadge.tsx
+msgid "Outside what Open Knowledge commits."
+msgstr "Di luar cakupan commit Open Knowledge."
+
#: src/components/SkillCostValue.tsx
msgid "over the {budgetLabel} token budget"
msgstr "melebihi anggaran token {budgetLabel}"
@@ -9851,10 +9907,6 @@ msgstr "Galat sintaks pola: {message}"
msgid "Pattern warnings: {summary}"
msgstr "Peringatan pola: {summary}"
-#: src/components/SyncStatusBadge.tsx
-msgid "Pause sync"
-msgstr "Jeda sinkronisasi"
-
#: src/components/acp/ThreadView.tsx
msgid "pending"
msgstr "tertunda"
@@ -10248,10 +10300,26 @@ msgstr "Menerbitkan..."
msgid "Pull"
msgstr "Pull"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull and Push"
+msgstr "Pull dan Push"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull brings in"
+msgstr "Pull membawa"
+
#: src/components/share-receive-miss-content.tsx
msgid "Pull latest changes"
msgstr "Tarik perubahan terbaru"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled}"
+msgstr "Ditarik {pulled}"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled} · pushed {pushed}"
+msgstr "Ditarik {pulled} · dikirim {pushed}"
+
#: src/components/share-receive-miss-content.tsx
#: src/components/SyncStatusBadge.tsx
msgid "Pulling"
@@ -10277,10 +10345,26 @@ msgstr "Push cabang {branch} ke GitHub sebelum berbagi."
msgid "Push failed — check the server logs for details."
msgstr "Push gagal — periksa log server untuk detailnya."
+#: src/components/SyncStatusBadge.tsx
+msgid "Push includes"
+msgstr "Push menyertakan"
+
+#: src/components/settings/SyncSection.tsx
+msgid "Push my edits every"
+msgstr "Kirim suntingan saya setiap"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Push skips"
+msgstr "Push melewati"
+
#: src/lib/share/run-share-action.ts
msgid "Push this branch to GitHub before sharing."
msgstr "Push cabang ini ke GitHub sebelum berbagi."
+#: src/components/SyncStatusBadge.tsx
+msgid "Pushed {pushed}"
+msgstr "Dikirim {pushed}"
+
#: src/components/SyncStatusBadge.tsx
msgid "Pushing"
msgstr "Melakukan push"
@@ -10354,6 +10438,10 @@ msgstr "Salinan hanya-baca dari blok MirrorSource di dokumen lain. Sunting di su
msgid "Read-only file in the {name} skill"
msgstr "Berkas hanya-baca di keterampilan {name}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reading working tree"
+msgstr "Membaca working tree"
+
#: src/components/acp/working-status.ts
msgid "Reading…"
msgstr "Membaca…"
@@ -10407,6 +10495,10 @@ msgstr "Keterampilan agen yang direkomendasikan"
msgid "Reconnect required"
msgstr "Perlu menyambung ulang"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reconnect required to keep syncing."
+msgstr "Perlu menyambung ulang untuk melanjutkan sinkronisasi."
+
#: src/presence/use-sync-toasts.ts
msgid "Reconnected"
msgstr "Tersambung kembali"
@@ -10673,6 +10765,10 @@ msgstr "Ganti nama keterampilan"
msgid "Rename succeeded but the sidebar may be out of date — refresh to resync"
msgstr "Penggantian nama berhasil tetapi bilah sisi mungkin tidak mutakhir — segarkan untuk menyinkronkan ulang"
+#: src/components/SyncStatusBadge.tsx
+msgid "Renamed"
+msgstr "Diganti nama"
+
#. placeholder {0}: docLeaf(descriptor.from)
#. placeholder {1}: docLeaf(descriptor.to)
#: src/components/TimelinePanel.tsx
@@ -10824,7 +10920,6 @@ msgstr "Repositori yang sudah Anda kloning mungkin tetap tersinkron lewat kreden
#: src/components/CloneDialog.tsx
#: src/components/share-metadata-rows.tsx
#: src/components/SkillPreviewTab.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Repository"
msgstr "Repositori"
@@ -10907,6 +11002,10 @@ msgstr "Ubah ukuran panel Keterampilan"
msgid "Resolve conflict in your terminal"
msgstr "Selesaikan konfliknya di terminal Anda"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Resolve in terminal"
+msgstr "Selesaikan di terminal"
+
#: src/components/FileTree.tsx
msgid "Resolve the conflict on {files} before deleting."
msgstr "Selesaikan konflik pada {files} sebelum menghapus."
@@ -11022,10 +11121,6 @@ msgstr "Dipulihkan ke versi dari {0}"
msgid "Results capped — this workspace has more files than search can index. A missing file may be a cap artifact, not a typo."
msgstr "Hasil dibatasi — ruang kerja ini punya lebih banyak berkas daripada yang bisa diindeks pencarian. Berkas yang hilang bisa jadi efek batasan itu, bukan salah ketik."
-#: src/components/SyncStatusBadge.tsx
-msgid "Resume sync"
-msgstr "Lanjutkan sinkronisasi"
-
#: src/components/acp/ThreadView.tsx
msgid "Resuming the chat"
msgstr "Melanjutkan obrolan"
@@ -11097,8 +11192,8 @@ msgid "Reverting"
msgstr "Mengembalikan"
#: src/components/SyncStatusBadge.tsx
-msgid "Review conflicts"
-msgstr "Tinjau konflik"
+msgid "Review"
+msgstr "Tinjau"
#: src/components/ReportBugDialogBody.tsx
msgid "Review your report"
@@ -12244,6 +12339,10 @@ msgstr "Slidev terlalu lama saat memulai. Coba lagi."
msgid "Small section heading."
msgstr "Judul bagian kecil."
+#: src/components/SyncStatusBadge.tsx
+msgid "Some files are not listed — the working tree has too many changes."
+msgstr "Sebagian file tidak ditampilkan: working tree memiliki terlalu banyak perubahan."
+
#: src/components/settings/SavedThemesTiles.tsx
msgid "Some saved themes aren’t shown because the theme folder exceeds the scan limit."
msgstr "Beberapa tema tersimpan tidak ditampilkan karena folder tema melewati batas pemindaian."
@@ -12435,6 +12534,10 @@ msgstr "Memulai agennya…"
msgid "status"
msgstr "status"
+#: src/components/SyncStatusBadge.tsx
+msgid "Status"
+msgstr "Status"
+
#: src/components/SubscribeCard.tsx
#: src/components/SubscribeForm.tsx
msgid "Stay in the loop"
@@ -12582,8 +12685,8 @@ msgid "Switch to a branch to share."
msgstr "Beralih ke sebuah cabang untuk berbagi."
#: src/components/settings/SyncSection.tsx
-msgid "Switch to Follow"
-msgstr "Beralih ke Ikuti"
+msgid "Switch to Auto (Pull only)"
+msgstr "Beralih ke Otomatis (hanya Pull)"
#: src/components/command-palette-commands.ts
msgid "Switch worktree"
@@ -12622,7 +12725,6 @@ msgid "Symlinks the skill to {path}"
msgstr "Menautkan keterampilan secara symlink ke {path}"
#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Sync"
msgstr "Sinkronisasi"
@@ -12631,10 +12733,6 @@ msgstr "Sinkronisasi"
msgid "Sync & sharing"
msgstr "Sinkronisasi & berbagi"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync disabled"
-msgstr "Sinkronisasi dinonaktifkan"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync failed — check the server logs for details."
msgstr "Sinkronisasi gagal — periksa log server untuk detailnya."
@@ -12643,13 +12741,21 @@ msgstr "Sinkronisasi gagal — periksa log server untuk detailnya."
msgid "Sync is failing. See the sync status for details."
msgstr "Sinkronisasi sedang gagal. Lihat status sinkronisasi untuk detailnya."
-#: src/components/settings/SyncSection.tsx
-msgid "Sync is off — your edits stay on this computer until you commit and push manually."
-msgstr "Sinkronisasi mati — suntingan Anda tetap di komputer ini sampai Anda melakukan commit dan push secara manual."
+#: src/components/SyncBlockingChanges.tsx
+msgid "Sync is paused. Commit these local edits to continue, or sort them out in a terminal."
+msgstr "Sinkronisasi dijeda. Commit suntingan lokal ini untuk melanjutkan, atau selesaikan di terminal."
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync is paused. Turn it back on to resume."
-msgstr "Sinkronisasi dijeda. Nyalakan lagi untuk melanjutkan."
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull and Push) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "Sinkronisasi worktree ini disetel ke Otomatis (Pull dan Push), diwarisi dari {project}. Ubah di Pengaturan → Sinkronisasi."
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull only) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "Sinkronisasi worktree ini disetel ke Otomatis (hanya Pull), diwarisi dari {project}. Ubah di Pengaturan → Sinkronisasi."
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Manual for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "Sinkronisasi worktree ini disetel ke Manual, diwarisi dari {project}. Ubah di Pengaturan → Sinkronisasi."
#: src/components/SyncStatusBadge.tsx
msgid "Sync mode"
@@ -12660,18 +12766,10 @@ msgstr "Mode sinkronisasi"
msgid "Sync now"
msgstr "Sinkronkan sekarang"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync off"
-msgstr "Sinkronisasi mati"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync paused"
msgstr "Sinkronisasi dijeda"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync paused — resolve conflicts to resume."
-msgstr "Sinkronisasi dijeda — selesaikan konfliknya untuk melanjutkan."
-
#: src/hooks/use-no-push-permission-toast.ts
msgid "Sync paused — you don't have permission to push to this repo"
msgstr "Sinkronisasi dijeda — Anda tidak punya izin push ke repo ini"
@@ -12706,10 +12804,6 @@ msgstr "Status sinkronisasi: {syncStateLabel} — identitas git belum disetel"
msgid "Synced"
msgstr "Tersinkron"
-#: src/components/SyncStatusBadge.tsx
-msgid "Synced {lastSyncedRelative}"
-msgstr "Tersinkron {lastSyncedRelative}"
-
#: src/components/TimelinePanel.tsx
msgid "Synced from disk"
msgstr "Tersinkron dari disk"
@@ -12933,6 +13027,10 @@ msgstr "Terima kasih atas laporannya!"
msgid "That branch is already open in another worktree."
msgstr "Cabang itu sudah terbuka di worktree lain."
+#: src/components/SyncBlockingChanges.tsx
+msgid "That did not go through. Check the server logs and try again."
+msgstr "Itu tidak berhasil. Periksa log server lalu coba lagi."
+
#: src/comments/reveal-comment.ts
msgid "That document didn't open in time. Try again once it has synced."
msgstr "Dokumen itu tidak terbuka tepat waktu. Coba lagi setelah tersinkronisasi."
@@ -13968,6 +14066,10 @@ msgstr "Ketik '/' untuk melihat perintah"
msgid "Type a query, then press <0>↵</0> to search your pages by meaning."
msgstr "Ketik sebuah kueri, lalu tekan <0>↵</0> untuk mencari di halaman Anda berdasarkan makna."
+#: src/components/SyncStatusBadge.tsx
+msgid "Type changed"
+msgstr "Tipe berubah"
+
#: src/editor/components/CodePreviewEditModal.tsx
msgid "Type to edit; <0>Cmd/Ctrl+Enter</0> saves, <1>Esc</1> cancels."
msgstr "Ketik untuk menyunting; <0>Cmd/Ctrl+Enter</0> menyimpan, <1>Esc</1> membatalkan."
@@ -14096,6 +14198,10 @@ msgstr "Hapus tanda semua komentar"
msgid "Unmark every comment in {0}"
msgstr "Hapus tanda semua komentar di {0}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Unmerged"
+msgstr "Belum digabungkan"
+
#: src/editor/slash-command/items.tsx
msgid "Unordered list of items."
msgstr "Daftar item tanpa nomor."
@@ -14136,6 +14242,10 @@ msgstr "Gambar {identity} tidak dapat ditentukan. Buka referensi."
msgid "Untitled report"
msgstr "Laporan tanpa judul"
+#: src/components/SyncStatusBadge.tsx
+msgid "Untracked"
+msgstr "Tidak dilacak"
+
#: src/components/SyncStatusBadge.tsx
msgid "Up to date"
msgstr "Sudah mutakhir"
@@ -14183,8 +14293,8 @@ msgid "Updated \"{name}\" from {0}"
msgstr "\"{name}\" diperbarui dari {0}"
#: src/components/SyncStatusBadge.tsx
-msgid "Updated {lastSyncedRelative}"
-msgstr "Diperbarui {lastSyncedRelative}"
+msgid "Updated {updatedRelative}"
+msgstr "Diperbarui {updatedRelative}"
#: src/components/FolderTimelineCard.tsx
msgid "updated folder properties"
@@ -14198,6 +14308,11 @@ msgstr "Diperbarui ke Versi {version}"
msgid "Updates flow in"
msgstr "Pembaruan mengalir masuk"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Updates flow in from your remote; your edits stay on this computer."
+msgstr "Pembaruan masuk dari remote Anda; suntingan Anda tetap di komputer ini."
+
#: src/components/SkillOriginInline.tsx
msgid "Updates from the source apply automatically (unless edited locally)"
msgstr "Pembaruan dari sumbernya berlaku otomatis (kecuali sudah disunting secara lokal)"
@@ -14650,6 +14765,10 @@ msgstr "Di mana ia sebaiknya berada?"
msgid "Which skill"
msgstr "Keterampilan yang mana"
+#: src/components/settings/SyncSection.tsx
+msgid "While you're signed out, updates are checked at most every 3 minutes regardless of this setting."
+msgstr "Selama Anda keluar dari akun, pembaruan diperiksa paling cepat setiap 3 menit, terlepas dari pengaturan ini."
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "Whitespace"
msgstr "Spasi"
@@ -14826,8 +14945,8 @@ msgid "You don't have permission to push to this repo."
msgstr "Anda tidak punya izin push ke repo ini."
#: src/components/settings/SyncSection.tsx
-msgid "You don't have permission to push to this repo. Follow can still keep your copy up to date."
-msgstr "Anda tidak punya izin push ke repo ini. Ikuti tetap bisa menjaga salinan Anda mutakhir."
+msgid "You don't have permission to push to this repo. Auto (Pull only) can still keep your copy up to date."
+msgstr "Anda tidak punya izin push ke repositori ini. Otomatis (hanya Pull) tetap bisa menjaga salinan Anda mutakhir."
#: src/components/ShareFreshnessWarning.tsx
msgid "You don't have write access to this repo."
@@ -14899,6 +15018,11 @@ msgstr "Salinan cabang <0>{shareBranch}</0> milik Anda punya perubahan yang belu
msgid "Your current version is saved first, so this is reversible."
msgstr "Versi Anda saat ini disimpan lebih dulu, jadi ini bisa dikembalikan."
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Your edits are committed and pushed to your remote automatically."
+msgstr "Suntingan Anda di-commit dan dikirim ke remote Anda secara otomatis."
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "Your edits stay on this computer"
msgstr "Suntingan Anda tetap di komputer ini"
diff --git a/packages/app/src/locales/ko/messages.json b/packages/app/src/locales/ko/messages.json
index 84668e96e..d26e87406 100644
--- a/packages/app/src/locales/ko/messages.json
+++ b/packages/app/src/locales/ko/messages.json
@@ -21,11 +21,7 @@
"-YV1Uo": ["패턴 ", ["patternNumber"]],
"-bFGPF": ["다음 변경"],
"-dNlfM": [["docName"], "에서 마지막 편집을 실행 취소했습니다."],
- "-f2Ogn": [
- "이 프로젝트를 git 원격 저장소와 동기화합니다. 팔로우는 푸시하지 않고 업데이트를 가져오며, 전체 동기화는 커밋도 푸시합니다. 동기화를 켜려면 확인이 필요합니다."
- ],
"-g6KIS": ["인식할 수 없는 링크"],
- "-imiMK": ["팔로우 — 원격 변경 사항을 가져오고 편집 내용은 이 컴퓨터에 유지합니다."],
"-kKdCC": ["스킬 ", ["imported"], "개를 ", ["0"], "에서 설치했습니다"],
"-kbIAr": ["링크 및 이미지"],
"-ksoxk": [
@@ -126,7 +122,6 @@
"0wswKc": ["섹션을 나누는 가로줄입니다."],
"0xnQ_X": ["업데이트가 들어옴"],
"0xnmlQ": ["저장소 이름"],
- "0yL--g": ["충돌 검토"],
"0ySP5u": ["변경사항이 이 테마에 자동으로 저장됩니다."],
"0zAhu6": ["모든 문서"],
"1-flC9": ["로컬 서버 포트"],
@@ -162,6 +157,7 @@
"1NgrlY": ["다른 설치 방법"],
"1QfxQT": ["닫기"],
"1RluQD": ["바꾸기 표시"],
+ "1TA-aJ": [["pulled"], " 풀 · ", ["pushed"], " 푸시"],
"1TNIig": ["열기"],
"1Ta7Fd": [["basename"], " 열기"],
"1V17kO": ["두 버전 불러오는 중"],
@@ -235,6 +231,11 @@
["FULLSCREEN_HUB_LIMIT"],
"개의 결과를 표시합니다."
],
+ "2okwy4": [
+ "이 워크트리의 동기화가 자동(풀만)으로 설정되어 있습니다. ",
+ ["project"],
+ "에서 상속되었습니다. 설정 → 동기화에서 변경하세요."
+ ],
"2pR7ad": ["임베딩 API 키"],
"2q_Q7x": ["공개 범위"],
"2rLM8r": ["에이전트 스레드 시작 실패. 다시 시도하세요."],
@@ -335,7 +336,6 @@
"4A3Yzu": ["코드 블록"],
"4BITzH": ["오류:"],
"4CfgPM": ["프로젝트 폴더는 생성되었지만 git init에 실패했습니다. 다시 시도하세요."],
- "4DcimZ": ["업데이트됨 ", ["lastSyncedRelative"]],
"4E9jPa": ["첫 프로젝트 만들기"],
"4EZrJN": ["규칙"],
"4ErgAf": ["OpenKnowledge에서 스킬 설치"],
@@ -363,6 +363,7 @@
"4m-xuX": ["자동 수정, 수정할 항목이 없습니다"],
"4mDIcg": ["설치할 스킬을 선택하세요. 각 스킬은 편집 가능한 내 소유 스킬로 설치됩니다."],
"4mLBx9": ["지금은 구독을 사용할 수 없습니다."],
+ "4mbrAq": ["1분"],
"4mp6Tv": ["OpenKnowledge에서 설치된 스킬 목록 확인"],
"4niEzY": [
"샌드박스 처리된 HTML 삽입입니다. HTML을 작성하면 렌더링된 미리보기가 실시간으로 표시됩니다."
@@ -374,11 +375,6 @@
"4uNLmk": ["풀하는 중"],
"4v2Yyz": ["파일 사이드바에 포커스가 있을 때 표시되는 모든 파일 트리 행을 선택합니다."],
"4xtLTl": ["숨김 폴더 “", ["basename"], "”"],
- "4zEZS5": [
- "이 워크트리의 자동 동기화가 켜져 있습니다. ",
- ["project"],
- "에서 상속되었습니다. 설정 → 동기화에서 변경하세요."
- ],
"4zGlN_": ["이미지 URL을 붙여넣거나 업로드를 클릭하세요"],
"4z_1j2": ["렌더링됨"],
"5-FeN2": ["공유 URL"],
@@ -453,6 +449,7 @@
],
"5hFl0U": ["참조 복사"],
"5jEnaB": ["이 플랫폼에서 사용할 수 없음"],
+ "5k0NLb": ["검토"],
"5kWklo": ["(다른 규칙으로 이미 숨겨진 항목이 있을 수 있습니다)"],
"5lWFkC": ["로그인"],
"5mksg0": ["의미 기반 검색을 끄지 못했습니다: ", ["detail"]],
@@ -489,6 +486,7 @@
"이 컴퓨터에서 사용자 계정의 전체 권한으로 명령을 실행합니다. 셸을 끄려면 이 설정을 끕니다."
],
"6Aih4U": ["오프라인"],
+ "6EoD0z": ["터미널에서 해결"],
"6FCixu": ["이전 채팅 다시 열기"],
"6HCOwA": ["열지 못했습니다."],
"6KCH4m": ["숨김 파일"],
@@ -539,6 +537,11 @@
"6u9LvN": [["days", "plural", { "other": ["#", "일 전"] }]],
"6ur2Mk": ["에이전트가 어떤 프로젝트에서든 OpenKnowledge를 찾아 사용할 수 있도록 돕습니다."],
"6vEr3W": ["링크 대상"],
+ "6xPJIj": [
+ "이 워크트리의 동기화가 수동으로 설정되어 있습니다. ",
+ ["project"],
+ "에서 상속되었습니다. 설정 → 동기화에서 변경하세요."
+ ],
"6xeZX9": [
"편집 내용이 실시간으로 적용됩니다. 밝은 테마와 어두운 테마는 테마 설정을 따릅니다."
],
@@ -675,7 +678,6 @@
"8qgfac": ["MCP 서버"],
"8rZ1pk": [["id"], " 활성화"],
"8ruqQi": ["손상된 내부 링크"],
- "8sMErm": ["팔로우를 사용하시겠습니까?"],
"8t9CRE": [["agentName"], " 시작 중…"],
"8t9T3-": ["스킬을 찾지 못했습니다."],
"8tjQCz": ["탐색"],
@@ -727,6 +729,7 @@
"9Vnjc9": ["Enter"],
"9XwoPv": [["0", "plural", { "other": ["스킬 ", "#", "개 설치"] }]],
"9Y6cCI": ["페이지 불러오기 실패"],
+ "9ZxzfT": [["count"], "개 앞섬"],
"9_2oe6": [
["0"],
"을 현재 감지하는 각 스킬의 스킬별 심볼릭 링크가 있는 실제 디렉터리로 되돌립니다. 아무것도 중단되지 않으며 각 스킬 메뉴에서 관리합니다."
@@ -796,11 +799,6 @@
"AVW-K9": ["고아 페이지 불러오기 실패"],
"AWOSPo": ["확대"],
"AYoYhU": ["업데이트 실패: ", ["0"]],
- "AaaESH": [
- "이 워크트리의 자동 동기화가 꺼져 있습니다. ",
- ["project"],
- "에서 상속되었습니다. 설정 → 동기화에서 변경하세요."
- ],
"AcK_r0": ["Claude CLI"],
"AczYxH": ["사용자 지정 OpenKnowledge 항목, OpenKnowledge에서 관리하지 않음"],
"AdcGcG": ["변경사항 적용 중"],
@@ -863,6 +861,7 @@
"BVkqD9": [
"다른 Git 속성이 index.md를 제어하므로 인덱스 유지 관리가 일시 중지되었습니다. 범위가 지정된 index.md 경로가 merge=union을 사용하도록 .gitattributes를 업데이트한 후 다시 시도합니다."
],
+ "BWTzAb": ["수동"],
"BY-g4_": ["패턴 추가"],
"Ba4D2x": ["템플릿을 가져왔습니다"],
"Bdha5y": ["게시 중…"],
@@ -894,6 +893,7 @@
"C0C43b": [["warningCount", "plural", { "other": ["경고 ", "#", "개"] }]],
"C0Ciaj": ["\"", ["0"], "\"으로 가져왔습니다. 이름 \"", ["1"], "\"은 이미 사용 중입니다."],
"C0hoX6": ["항상 포함"],
+ "C2abof": ["추적 안 됨"],
"C3Zc44": ["스킬 탐색"],
"C62P6b": ["편집기 선택 영역"],
"C7PKTv": ["확인한 댓글을 채팅으로 보내기"],
@@ -920,9 +920,6 @@
"CTJLpz": ["여기에 \"", ["trimmed"], "\"이 이미 있습니다"],
"CU3AiE": ["브랜치 전환 중"],
"CUmCwI": ["아래에 행 삽입"],
- "CVRM5N": [
- "팔로우는 원격 git 저장소에서 업데이트를 가져와 사본을 자동으로 fast-forward합니다. 로컬 편집 내용은 이 컴퓨터에만 남고 절대 푸시되지 않습니다."
- ],
"CWjM1r": [["0"], "/에 있는 문서"],
"CWzc2T": [
"<0>~/.ok/bin</0> 및 <1>~/.ok/env.sh</1>는 어느 경우에도 유지됩니다. 앱이 항상 관리합니다."
@@ -959,6 +956,7 @@
"Git 프로젝트에서 Open Knowledge는 저장소 루트의 .gitattributes 파일에 범위를 지정한 규칙을 추가하여 동시에 변경한 인덱스를 결합합니다."
],
"CxVk-w": [["address"], "에 댓글 남기기"],
+ "Cz-K13": ["15분"],
"D-NlUC": ["시스템"],
"D-Oh1s": [["0"], " 설정 방법(브라우저에서 열림)"],
"D-_B7l": ["연결됨. 이 엔드포인트가 ", ["0"], "차원 벡터를 반환합니다."],
@@ -1022,7 +1020,6 @@
"DmkTrb": ["이 테마를 만들지 못했습니다. 다시 시도합니다."],
"Dnn2XG": ["자동"],
"DpjYd6": ["앵커 텍스트로 이동"],
- "DrYM2Z": ["동기화 사용 안 함"],
"DsDwR-": [["0", "plural", { "other": ["오류 ", "#", "개"] }]],
"DskIkK": ["로그인 스트림이 확인 없이 종료되었습니다. 다시 시도하세요."],
"DuCPiG": [
@@ -1205,6 +1202,7 @@
],
"Fqx38P": ["무엇이 방해했나요?"],
"Fr8JGg": ["Zip 파일"],
+ "FsEXax": ["처리되지 않았습니다. 서버 로그를 확인한 뒤 다시 시도하세요."],
"Fsx78O": ["터미널에 <0>ok</0> 명령 추가"],
"FvMSms": [
"이름을 바꾸면 디스크의 파일과 에이전트가 이 템플릿을 선택할 때 사용하는 ID가 변경됩니다."
@@ -1324,6 +1322,9 @@
"H0WlWQ": ["헤더 행이 있는 행과 열 그리드입니다."],
"H1TmTu": ["수정을 중지했습니다. 이미 수정된 파일은 그대로 유지됩니다."],
"H3oH0g": ["다시 실행"],
+ "H4doZt": [
+ "동기화가 일시 중지되었습니다. 계속하려면 이 로컬 편집 내용을 커밋하거나 터미널에서 정리하세요."
+ ],
"H86f9p": ["접기"],
"H8DVOJ": ["양쪽이 동일하며 ", ["pick"], "에서 계속 읽을 수 있습니다."],
"HAkEqR": ["최근 파일"],
@@ -1406,6 +1407,7 @@
"IWGfGF": ["GitHub 연결 확인 중"],
"IX7-sq": ["\"", ["docName"], "\"을 여는 중 문제가 발생했습니다."],
"IX_uXB": ["my-feature"],
+ "IXiG0B": ["자동(풀 및 푸시)"],
"IYciRC": ["보고서 감사합니다!"],
"IajAbS": ["스타터 팩 추가"],
"If0crP": ["AI로 ", ["targetDisplayName"], " 열기, ", ["hint"]],
@@ -1455,6 +1457,7 @@
"JLzQi_": [["accessibleLabel"], " 닫기"],
"JM_aq-": ["https:// URL을 사용합니다. http://는 localhost에만 허용됩니다."],
"JOcPqH": ["원격 리포지토리를 이 컴퓨터로 가져옵니다."],
+ "JOhCT9": ["푸시에 포함됨"],
"JWsZlx": ["편집할 프로젝트를 엽니다."],
"JZ8cO6": ["밝은 테마, 어두운 테마 또는 운영 체제 설정을 따릅니다."],
"J_jZ5z": [
@@ -1543,6 +1546,9 @@
"KjTmeO": ["이 공유를 열려면 OpenKnowledge를 업데이트하세요."],
"KkEAud": ["현재 문서 또는 폴더를 기준으로 파일을 만듭니다."],
"KkRyMI": ["병합을 분류할 수 없습니다. 다시 시도하세요."],
+ "KmVekT": [
+ "자동(풀만)은 원격 git 저장소에서 업데이트를 가져와 사본을 자동으로 최신 상태로 만듭니다. 로컬 편집 내용은 이 컴퓨터에 남으며 절대 푸시되지 않습니다."
+ ],
"KmydK6": ["굵게"],
"KnoB--": ["<0>", ["sanitized"], "</0>으로 저장됩니다."],
"KpOJFY": ["외부 링크 미리보기 사용"],
@@ -1552,6 +1558,7 @@
"KsAPaB": ["이 브랜치의 체크아웃 위치:"],
"KtACeE": ["기본값: <0>", ["0"], "</0>"],
"KujtjC": ["찾기"],
+ "KvwJv8": ["일부 파일이 표시되지 않았습니다. 작업 트리의 변경 사항이 너무 많습니다."],
"Kx881F": ["복원됨: ", ["0"], "."],
"L-rMC9": ["기본값으로 재설정"],
"L1BQTH": [["0"], " 미설치 상태입니다. 다운로드 페이지를 엽니다."],
@@ -1569,6 +1576,7 @@
"L83DKQ": ["PATH 설치 실패: ", ["summary"]],
"L8fKuc": ["터미널에서 실행"],
"L9Y9Om": ["링크가 가장 많은 페이지"],
+ "L9ox9k": ["작업 트리를 읽지 못했습니다. 서버 로그를 확인하세요."],
"LAR9ub": [["0"], "의 기존 OpenKnowledge 항목을 대체합니다"],
"LBv_TR": ["위치를 심볼릭 링크로 변환"],
"LBwUR6": [
@@ -1589,7 +1597,6 @@
["laterEdits", "plural", { "other": ["이 파일의 최신 편집 ", "#", "개를 제거합니다."] }]
],
"LKOLNn": ["설치된 AI 에이전트 없음"],
- "LNum6A": [["minutes"], "분 전"],
"LPAv9E": [["days"], "일 전"],
"LQdLio": ["새 스키마"],
"LQsCPn": ["로컬 커밋 때문에 이 사본을 업데이트할 수 없습니다."],
@@ -1664,7 +1671,6 @@
"MCjC9A": [["deleteDescriptorLabel"], " 삭제"],
"MDBJwN": ["사용하기 어려움"],
"MDZSJe": ["에이전트가 예약된 작업을 실행할 때"],
- "MGBNwj": ["동기화 일시 중지"],
"MGb89P": [
"CodeMirror 기본 키맵을 통해 소스 편집기 줄을 삽입, 삭제, 이동, 복사하고 들여씁니다."
],
@@ -1673,7 +1679,6 @@
"MIF36T": ["포크 해결 실패: ", ["0"]],
"MILoeL": ["서비스"],
"MJuO1q": ["컨텍스트 창:"],
- "MKEPCY": ["팔로우"],
"MLVPcm": [["0"], " 버전 ", ["1"]],
"MOAoFO": ["아직 에이전트 폴더 없음"],
"MPpSAg": [["selectedPackName"], "에서 새 프로젝트 만들기"],
@@ -1735,6 +1740,7 @@
],
"N5rzKJ": ["스킬 ", ["0"], "개 삭제"],
"N6j2JH": [["0"], " 편집"],
+ "N7Lau6": ["커밋하고 동기화"],
"NBdIgR": ["댓글"],
"NErvOX": ["저장 위치"],
"NEzPEh": ["새 브랜치를 만들거나 기존 브랜치를 별도 창에서 체크아웃하세요."],
@@ -1762,6 +1768,7 @@
"Nay2Yr": ["검색과 일치하는 에이전트 없음."],
"NcUznW": [["0"], ", 워크스페이스 없음"],
"NcurBF": ["아래로 이동"],
+ "NcwbBM": ["풀로 들어옴"],
"NeQ_0G": ["이 댓글 기반 작업"],
"NeY1Np": ["Slidev 시작 시간이 초과되었습니다. 다시 시도하세요."],
"NfraGd": ["Slidev를 설치하는 다른 방법"],
@@ -1804,6 +1811,7 @@
"O6yEPk": ["선택한 폴더에 새 OpenKnowledge 프로젝트를 만듭니다."],
"O7_W_a": ["AI로 열기"],
"O9oQJS": ["보고서 보내기"],
+ "OBdkpo": ["분리된 HEAD"],
"OD0FCX": ["숨김 “", ["basename"], "”"],
"ODGGlj": ["폴더 이름: ", ["detail"]],
"OEEQKT": ["좋음"],
@@ -1861,6 +1869,7 @@
"Oo_WWc": ["페이지를 찾을 수 없음"],
"Oos8fo": ["명령 복사"],
"OplnBG": ["이 빌드에서는 AI 도구를 관리할 수 없습니다."],
+ "OqqecQ": ["30초"],
"OsSaYm": ["클론 실패: ", ["title"]],
"OuQezS": ["이 대화를 다시 시작할 때 적용됩니다"],
"OuY8t9": ["현재 브랜치에서 열기"],
@@ -1895,7 +1904,9 @@
"PBwmDJ": ["의미로 검색 중"],
"PBxg_E": ["나중에"],
"PCSkw2": ["스킬"],
+ "PEGxvo": ["5분"],
"PGPGsL": ["설명 추가"],
+ "PGRnbw": ["업데이트는 원격에서 들어오고, 편집 내용은 이 컴퓨터에 남습니다."],
"PHHEuH": ["해결된 댓글 숨기기 (", ["0"], ")"],
"PIMM5l": ["구독했습니다!"],
"PKLY-1": ["여는 중…"],
@@ -1908,7 +1919,6 @@
"PRgIJh": [["subRoot"], " 업데이트 실패: ", ["0"]],
"PRnH8G": [["0"], " 중"],
"PTUuoc": ["댓글 전송 표시 해제에 실패했습니다. 아직 전송 대기 중입니다."],
- "PTb1Nx": ["동기화가 일시 중지되었습니다. 재개하려면 다시 켜세요."],
"PVSwOe": ["조정 대기 중. 현재 실행 종료 대기…"],
"PVUn_c": ["폴더 열기"],
"PVggyD": ["Frontmatter 스키마"],
@@ -1952,6 +1962,7 @@
"PrWQiT": ["터미널을 오른쪽으로 이동"],
"PrhzDE": ["위로 이동"],
"Pw5PTU": ["외부 오리진"],
+ "PxZCNM": ["Open Knowledge가 커밋하는 범위 밖입니다."],
"Q-DKvr": [["source"], "에서 설치"],
"Q1mtyd": ["사이드바 가리기"],
"Q5fqMz": ["연결 오류. 다시 시도하세요."],
@@ -1986,6 +1997,7 @@
"QYfQdv": [["displayName"], " CLI"],
"QcpeeE": [["docName"], "로 이동"],
"Qe47G0": [["componentLabel"], ", 항목 ", ["childCount", "plural", { "other": ["#", "개"] }]],
+ "QeREu8": ["이름 변경됨"],
"QfFBdJ": ["템플릿 파일 이름입니다(`.md` 제외)."],
"Qft6eW": ["스킬 ", ["0"], "개를 전역으로 이동"],
"Qj4RL5": ["완료:"],
@@ -2164,13 +2176,9 @@
"Sr9xtj": ["이 스키마를 적용할 폴더 선택"],
"SrOuyg": ["문서 패널"],
"SvBFYA": ["최근 프로젝트 없음"],
- "Sxx_Zz": [
- "이 워크트리의 팔로우가 켜져 있습니다. ",
- ["project"],
- "에서 상속되었습니다. 설정 → 동기화에서 변경하세요."
- ],
"T-654M": ["PDF를 불러오는 중"],
"T0OVm7": ["기본 브랜치가 보호되어 푸시하려면 풀 리퀘스트가 필요합니다."],
+ "T1fMJ6": ["이 컴퓨터가 원격에서 변경 사항을 가져오는 주기입니다."],
"T2fvhw": [["0"], "의 모든 댓글 전송 표시 해제"],
"T3Mld1": ["창"],
"T3j-7o": ["예: 동기화 중 프로젝트 전환"],
@@ -2218,10 +2226,10 @@
"U2pMtf": ["tag-name"],
"U3IvM5": ["전체 안내서"],
"U3RIJu": ["로컬 파일"],
- "U4nTfu": ["팔로우 사용"],
"U5Spo9": ["콘텐츠 디렉터리는 프로젝트 내부에 있어야 합니다"],
"U6Mdhd": ["설정을 시작해 볼까요."],
"U6wmNc": ["동기화 일시 중지됨"],
+ "U7Iesw": [["seconds"], "초"],
"U88xbi": ["스키마 파일을 만들지 못했습니다"],
"U8CD-l": ["전체 경로 복사, 워크스페이스 없음"],
"UBv8UK": ["영구 삭제"],
@@ -2255,9 +2263,6 @@
"URmyfc": ["세부 정보"],
"UTNVyS": ["전체 소스 문서 선택"],
"UTZ97u": ["선택 영역은 프로젝트 안에 있어야 합니다"],
- "UVDasf": [
- "동기화가 꺼져 있어 커밋하고 수동으로 푸시할 때까지 편집 내용이 이 컴퓨터에만 남습니다."
- ],
"UVLlMV": ["GitHub에 연결할 수 없습니다. 다시 시도할까요?"],
"UW2Fg3": [
"이 프로젝트에서 실행 중인 서버는 실시간 편집을 지원하지 않습니다. OpenKnowledge를 다시 시작하여 수정하세요."
@@ -2300,6 +2305,7 @@
"UhpfxY": ["왼쪽으로 이동"],
"UkQGhd": ["바꾸기 숨기기"],
"UlVARL": ["Slidev 사용"],
+ "Uo2Rj7": ["자동(풀 및 푸시)을 활성화할까요?"],
"Uobeu9": ["스킬을 ", ["rootRel"], "에 추가합니다. ", ["0"], "에서도 읽습니다."],
"Up2_7p": ["전체 경로 복사"],
"UpCz01": ["이 문서"],
@@ -2366,6 +2372,7 @@
"VdXv4D": ["GitHub에서 클론"],
"VeVIIk": ["스킬 불러오는 중"],
"Vftef5": ["일반적인 Markdown 문제, 하드 탭, 제목 단계, 목록 마커 등을 표시합니다."],
+ "Vl1H8I": ["계속 동기화하려면 다시 연결해야 합니다."],
"Vlc75q": ["파일 삭제 유지"],
"VmJT51": ["보고서 불러오는 중"],
"VmXASo": ["(심볼릭 링크)"],
@@ -2387,6 +2394,7 @@
["rootPath"],
"</0>에 OpenKnowledge 프로젝트가 이미 있습니다. 그 밖의 위치를 선택하거나 대신 해당 프로젝트를 여세요."
],
+ "W7mERj": ["자동(풀만)을 활성화할까요?"],
"W8vpBM": ["스타터 팩"],
"W9NSe0": ["링크 확인 중"],
"W9_Bub": ["로컬 변경 사항이 들어오는 동기화와 겹칩니다."],
@@ -2406,6 +2414,7 @@
"개 항목을 삭제하시겠습니까? 폴더와 내부의 모든 파일도 삭제됩니다. 이 작업은 취소할 수 없습니다."
],
"WMsoIm": ["이미 로그인했나요?"],
+ "WOfp4H": ["동기화 주기를 업데이트하지 못했습니다 — ", ["detail"]],
"WOr-hW": ["토큰"],
"WPwDin": ["디스크에서 폴더 열기"],
"WR0y2O": ["폴더 공유"],
@@ -2424,6 +2433,7 @@
"Wcv-Zi": ["이 지식 베이스를 Claude Skill로 사용할 수 있게 합니다."],
"We7h2I": ["📝 또는 assets/icon.png"],
"Weq9zb": ["일반"],
+ "WfcERq": ["커밋할 내용이 없습니다. 작업 트리가 깨끗합니다."],
"Wfy3rU": ["에이전트 설정"],
"Wgmlsw": ["가져오는 중"],
"Wh0im4": ["[[", ["realCurrentDoc"], "]] 편집 중"],
@@ -2476,7 +2486,6 @@
"XRuL0i": ["페이지 만들기"],
"XSb9HS": ["로컬 편집을 버리고 설치된 버전을 복원"],
"XT-L4j": ["AI로 만들려면 에이전트를 켜세요"],
- "XU0OXn": ["자동 동기화 사용"],
"XU5AOg": ["입력"],
"XV5sC0": ["워크트리 열기"],
"XW18jo": ["페이지 제목 응답이 성공 스키마와 일치하지 않습니다"],
@@ -2520,6 +2529,7 @@
"Xp7Kq4": ["다른 동기화 작업이 진행 중입니다. 잠시 후 다시 시도하세요."],
"Xp94R1": ["한 번 더 시도"],
"XpIZmv": ["고정폭 텍스트가 있는 펜스 코드 블록입니다."],
+ "Xs1kjx": ["업데이트 확인 주기"],
"Xs7IcT": [["displayName"], " 연결 실패. 다시 시도할까요?"],
"XszXjc": [["0"], "으로 이름 변경됨"],
"XtRoxT": [["pageNumber"], "페이지"],
@@ -2552,6 +2562,7 @@
"Lint 플러그인은 이 프로젝트 → 플러그인 아래의 별도 탭에서 구성합니다. 실행할 규칙 그룹과 규칙별 설정을 지정할 수 있습니다."
],
"YEP3X2": ["활성 표 셀 선택 영역이 표 전체를 포함하면 표를 삭제합니다."],
+ "YEzhIr": ["풀 및 푸시"],
"YGIi_c": ["재설치"],
"YGNRB5": ["제외"],
"YGt-0e": ["읽는 중…"],
@@ -2589,7 +2600,6 @@
"이 컴퓨터의 이 프로젝트에만 적용됩니다. .ok/local에 저장되며 git으로 공유되지 않습니다."
],
"Yp-Hi_": ["설정 열기"],
- "YsEYYS": [["behind", "plural", { "other": ["커밋 ", "#", "개 뒤처짐"] }]],
"YvwwqC": ["위치"],
"YwPUUP": ["이 팩은 여기에서 이미 설정되어 있습니다."],
"YxZDGh": [
@@ -2681,7 +2691,6 @@
"ZscwQ0": ["나만 보기로 전환하지 못했습니다"],
"Zt7Ktx": ["경로는 스킬 밖으로 나갈 수 없습니다 (. 또는 .. 불가)"],
"Zue_jx": ["GitHub 토큰에 필요한 범위가 없습니다. 다시 로그인하세요."],
- "Zul8Ry": ["없음"],
"ZvzbDF": ["이 프로젝트에 직접 추가합니다."],
"ZwpggY": ["OpenKnowledge에서 프로젝트 설정 조회"],
"_0JUKX": ["버그 보고에는 OpenKnowledge 데스크톱 앱이 필요합니다."],
@@ -2812,9 +2821,6 @@
"ai40UJ": ["새 기록 · <0>스페이스</0>를 눌러 다시 시작"],
"aiArms": ["이 저장소를 클론할 수 없습니다."],
"aiOceC": ["인덱스 사용"],
- "ajHi4O": [
- "자동 동기화가 일시 중지되었습니다. 이 저장소에 푸시할 권한이 없습니다. 계속 업데이트를 받으려면 팔로우로 전환합니다."
- ],
"ajz9F8": [["filePath"], "의 충돌 내용을 불러오지 못했습니다. 페이지를 다시 로드해 보세요."],
"ak4LLg": ["메뉴 지우기"],
"akOe4q": [
@@ -2831,7 +2837,6 @@
"arUUsK": ["제품 업데이트"],
"ax9kie": ["링크 미리보기 설정을 아직 불러오지 못했습니다. 잠시 후 다시 시도합니다."],
"axQ1h6": ["추가할 내용이 있나요? (선택 사항)"],
- "az8lvo": ["꺼짐"],
"b18t0_": ["Diff 닫기"],
"b1FDss": ["시작으로 스크롤"],
"b2ezG_": ["둘 다 유지됨. \"", ["0"], "\"은 이제 별도 스킬입니다"],
@@ -2913,6 +2918,7 @@
],
"cH0dkG": ["필요한 기능이 없었습니다"],
"cHhH3i": ["필수 git 도구"],
+ "cIFYZn": ["로그아웃 상태에서는 이 설정과 관계없이 업데이트를 최대 3분에 한 번만 확인합니다."],
"cIptmH": ["Claude Desktop App에서"],
"cKjLuT": ["(프로젝트 + 사용자)"],
"cLP0Lf": ["원격 스킬 소스"],
@@ -2977,6 +2983,8 @@
"ct2kv5": [["pageTarget"], "에 제목이 없습니다"],
"cuA8QW": ["사양 정리"],
"cuHhjo": ["만들기 및 편집"],
+ "cyoNqf": ["병합 안 됨"],
+ "czQDKY": ["푸시 한 번이 원격에 커밋 하나입니다."],
"d-GtJt": ["소스 Markdown에서 보기"],
"d1JjXo": [
"브랜치 <0>",
@@ -3066,6 +3074,9 @@
"eGUbmF": ["선택한 파일 또는 폴더 복사"],
"eJitUk": ["컴퓨터에서 업로드"],
"eKThTQ": ["순서 변경 실패"],
+ "eNOyTV": [
+ "이 저장소에 푸시할 권한이 없습니다. 자동(풀만)으로도 사본을 최신 상태로 유지할 수 있습니다."
+ ],
"eNQGRb": ["KaTeX로 렌더링되는 인라인 LaTeX 수식입니다."],
"eNhWUl": ["PR 리뷰어, 릴리스 노트 작성자, 배포 체크리스트…"],
"ePK91l": ["편집"],
@@ -3099,6 +3110,7 @@
"emMrXQ": ["서버에서 잘못된 중복 응답을 반환했습니다."],
"emgiet": ["기준 콘텐츠이며, 참조되는 모든 곳에 그대로 미러링됩니다."],
"enPTnx": ["줄 ", ["displayLine"]],
+ "eolhcI": ["작업 트리를 읽는 중"],
"eps54V": ["제거됨"],
"epuNYK": [
"블록을 기준 소스로 지정합니다. 편집하면 다른 곳의 미러가 실시간으로 업데이트됩니다."
@@ -3106,7 +3118,6 @@
"erenF-": ["해결되지 않은 충돌이 있는 파일은 삭제할 수 없습니다."],
"euGaS0": [["fileName"], " 읽기 실패."],
"euc6Ns": ["복제"],
- "evHlIg": ["팔로우는 로컬 변경 사항을 푸시하거나 커밋하지 않습니다. 이 컴퓨터에만 남습니다."],
"evs0iw": ["“", ["tagListQuery"], "”와 일치하는 태그"],
"ewSbS_": ["셸 세션"],
"ezUmoU": ["허용되는 요소 값 (비워 두면 모두 허용)"],
@@ -3178,7 +3189,6 @@
{ "other": ["다음 파일 또는 폴더 ", "#", "개와 그 내용을 삭제하시겠습니까?"] }
]
],
- "g2Tj8R": ["전체"],
"g3UF2V": ["수락"],
"g4WlQK": ["프로젝트 AI 도구 관리는 OpenKnowledge 데스크톱 앱에서만 사용할 수 있습니다."],
"g4XBm0": ["작은 섹션 제목입니다."],
@@ -3194,7 +3204,6 @@
["display"],
" 안에서 선택합니다. 해당 폴더는 이 폴더를 가리키는 심볼릭 링크가 되므로 그 에이전트가 여기에 있는 모든 항목을 읽습니다. 이 폴더는 실제 폴더로 유지됩니다. 충돌하는 스킬이 있으면 병합을 중단합니다."
],
- "g85bAo": ["동기화됨 ", ["lastSyncedRelative"]],
"g9Nj4l": ["// 참고"],
"gAhHu7": ["자동 수정은 기계적으로 수정할 수 있는 문제가 알려진 경우에만 적용됩니다."],
"gBbxn_": ["로그인 상태 확인 중"],
@@ -3266,6 +3275,7 @@
"gwEcOD": ["로컬 사본이 뒤처져 있습니다."],
"gwykHF": ["이 문서는 아직 GitHub와 동기화되지 않았습니다. 다음 동기화 후 링크가 작동합니다."],
"gyHDWC": ["AI로 모두 수정 (", ["count"], ")"],
+ "gyYvCN": ["내 편집 내용 푸시 주기"],
"h-AdvS": ["폴더와 템플릿이 이미 있으므로 추가할 항목이 없습니다."],
"h06R3C": ["나가는 그래프 링크가 누락된 페이지가 없습니다."],
"h16FyT": ["목록"],
@@ -3338,7 +3348,6 @@
"hwFOFD": ["설정을 불러오지 못했습니다"],
"hxBHxQ": ["각주<0><1>[1]</1></0>와 아래에 표시되는 정의가 있는 줄입니다."],
"hxEUVJ": [["selectedPackName"], " 초기화"],
- "hxYFzm": ["전체 동기화, 커밋을 푸시하고 원격 변경사항을 자동으로 가져옵니다."],
"hxnF0I": [["0"], " 속성"],
"hyCxJY": ["대신 해당 워크트리 열기"],
"hynz2K": ["다운로드 시작됨"],
@@ -3349,7 +3358,6 @@
"i09An-": ["이전 버전 (", ["0"], ")으로 복원했습니다"],
"i1flq_": ["위키 링크 제안"],
"i3f2kh": ["일치하는 명령이 없습니다."],
- "i6ng22": ["팔로우로 전환"],
"i92eAT": ["저장소를 만들고 동기화를 시작합니다. 터미널은 필요하지 않습니다."],
"i94lQe": ["OpenKnowledge에서 충돌 확인"],
"i9OyGp": ["실행 취소 또는 다시 실행"],
@@ -3434,11 +3442,11 @@
],
"iqugog": ["초기화 실패: ", ["errorDetail"]],
"irFGwu": ["템플릿 목록"],
+ "irnKr_": [["updatedRelative"], " 업데이트됨"],
"irrm_E": ["선택 영역 제거"],
"isRobC": ["새 항목"],
"iuTKci": ["아직 편집 없음."],
"iv452l": [["0"], " 문서(브라우저에서 열림)"],
- "iy64Li": ["전체 동기화. 편집 내용이 원격에 자동으로 커밋되고 푸시됩니다."],
"iycx_A": ["푸시 중"],
"iz1LdD": [
"마지막으로 OK가 여기에 쓴 후 외부에서 변경되었습니다. 표시된 상태는 현재 디스크에 있는 내용입니다"
@@ -3488,6 +3496,7 @@
"jTLWxh": [
"외부 페이지를 인라인 iframe에 삽입합니다. 문서, 데모, Figma, CodeSandbox를 지원합니다."
],
+ "jTUxaN": ["자동(풀만) 활성화"],
"jWzDfC": ["보유한 AI 도구를 확인하는 중"],
"jZ_E5M": ["가져오기 실패. 자세한 내용은 서버 로그를 확인하세요."],
"j_Z6g7": ["공유 기본값"],
@@ -3580,13 +3589,15 @@
"의미 기반 검색을 OpenAI 호환 임베딩 엔드포인트에 연결합니다. 자체 호스팅 서버나 다른 제공업체를 사용할 수 있습니다. 위의 API 키는 여기서 설정한 엔드포인트에 사용됩니다."
],
"kSiB3X": [["trashNoun"], "으로 이동하지 못했습니다"],
- "kUn-CN": ["동기화 끔"],
"kV2YZv": [
"<0>Skills</0> 미표시? 먼저 <1>설정 <2/> 기능 <3/> 코드 실행 및 파일 생성</1> 활성화."
],
"kVS5tE": ["모든 폴더에서 생성된 인덱스를 유지하시겠습니까?"],
"kVgQUA": ["채팅 삭제?"],
"kVzuTI": ["권장 에이전트 스킬"],
+ "kXNv8P": [
+ "자동(풀만)은 로컬 변경 사항을 절대 푸시하거나 커밋하지 않습니다. 이 기기에만 남습니다."
+ ],
"kYL1lH": ["에이전트 활동"],
"k_Dqw1": [["0", "plural", { "other": ["#", "개 문서 전체에 문제가 없습니다."] }]],
"k_pade": ["config 공유가 이제 공유됩니다. 팀과 공유하려면 OK 파일을 커밋합니다."],
@@ -3669,6 +3680,7 @@
"lM4c-I": [
"스킬 내부 경로입니다. 모든 폴더를 사용할 수 있습니다(예: references/notes.md). 경로의 폴더는 자동으로 생성됩니다."
],
+ "lPkjpD": [["pushed"], " 푸시"],
"lPzyrU": ["모든 변경 블록 해결됨"],
"lS83Sg": ["클립보드에 접근하지 못했습니다."],
"lScd1O": ["Slidev 덱은 OpenKnowledge 데스크톱 앱에서만 열립니다."],
@@ -3967,6 +3979,7 @@
"pJ7XCo": ["이 페이지는 로컬 파일이나 이미지를 참조하지 않습니다."],
"pMPnZv": ["스킬 ", ["deleted"], "개 삭제됨"],
"pOo4Aa": ["일반 텍스트"],
+ "pPiV8s": ["자동(풀 및 푸시) 활성화"],
"pSimwP": [["editor"], " 버전의 새 이름"],
"pTPqMK": ["펜스 코드 블록을 전환합니다."],
"pTyA_t": ["태그"],
@@ -4026,6 +4039,7 @@
"qAx7xG": ["콘텐츠 루트의 고정 폴더"],
"qBi_YG": ["AI 도구에 OpenKnowledge 설치"],
"qC7PwZ": ["필드를 제거하지 못했습니다"],
+ "qD3krc": ["요청하기 전까지는 아무것도 움직이지 않습니다."],
"qEEfPk": ["버그 보고서 ", ["0"]],
"qEIFZu": ["끝이 ", ["keyHint"], "인 키"],
"qEue6Q": [" 또는 "],
@@ -4034,6 +4048,9 @@
"qIJIrD": ["테스트"],
"qJSo0_": ["복사본과 심볼릭 링크의 차이는 무엇인가요?"],
"qKMfPp": ["스킬 노드 숨기기"],
+ "qLXJTB": [
+ "이 프로젝트를 git 원격과 동기화 상태로 유지합니다. 자동(풀만)은 푸시 없이 업데이트를 가져오고, 자동(풀 및 푸시)은 편집 내용도 보냅니다. 자동 동기화를 켜려면 확인이 필요합니다."
+ ],
"qNOgUu": [
"소스에서 편집한 내용이 여기에 반영됩니다. 복사하여 붙여넣을 때 내용이 어긋나지 않습니다."
],
@@ -4051,7 +4068,6 @@
"qXg5W9": ["파일 저장 위치: <0>~/Downloads/openknowledge.skill</0>."],
"qXsafh": ["GitHub에 게시"],
"qZv5ZR": ["config 공유를 전환하지 못했습니다"],
- "q_9EcE": ["git 자동 동기화를 사용하시겠습니까?"],
"q_Q1-i": [
["count", "plural", { "other": ["다음 폴더 ", "#", "개와 그 내용을 삭제하시겠습니까?"] }]
],
@@ -4136,7 +4152,6 @@
["boldName"],
"의 미리보기입니다. Open Knowledge에 내장된 스킬이며 읽기 전용입니다."
],
- "rn7n0G": ["동기화 재개"],
"rnX-1S": ["플러그인 활성화"],
"rnrdEX": ["기본"],
"roAe2K": ["링크 URL"],
@@ -4180,6 +4195,7 @@
"sJK6pq": ["권한 거부됨"],
"sJWhgo": ["알 수 없는 컴포넌트: ", ["unregisteredComponentName"]],
"sKEgGd": ["채팅에 보내기"],
+ "sKHiNR": [["count"], "개 뒤처짐"],
"sNeKjP": ["토큰 저장 실패. 다시 시도하세요."],
"sOxZaS": ["그래프 불러오기 실패"],
"sQoLn0": ["종료"],
@@ -4203,6 +4219,7 @@
"scyoP9": [
"인덱스 문서에는 frontmatter가 없으며, 지식 베이스 루트에 있는 문서만 예외입니다. 로그 문서에는 적용되지 않습니다. OKF는 로그 문서의 frontmatter를 제한하지 않습니다."
],
+ "sdvHp3": ["여기와 원격 모두에서 변경됨"],
"se-tU0": [["0"], "/", ["total"], "개 파일을 수정하지 못했습니다."],
"seeS6l": ["이 폴더에 OpenKnowledge를 설정하시겠습니까?"],
"sgmRY8": [["0"], " 다운로드 건너뜀."],
@@ -4218,6 +4235,9 @@
"snrVQ7": ["프로브 실패"],
"sq4WQH": ["밝은 테마로 ", ["0"], " 사용"],
"sqUrlK": ["생각 중…"],
+ "srdlOs": [
+ "자동 동기화가 일시 중지되었습니다. 이 저장소에 푸시할 권한이 없습니다. 계속 업데이트를 받으려면 자동(풀만)으로 전환하세요."
+ ],
"ssk6rl": ["스킬 자체의 폴더(", ["path"], "). 다른 위치가 복사하거나 링크하는 소스입니다"],
"ssuwjF": ["브랜치"],
"stXWnP": ["파일 관리자에서 열기"],
@@ -4235,12 +4255,14 @@
"다운로드 가능한 파일을 위한 Notion 스타일 인라인 행입니다. 드래그 앤 드롭도 사용할 수 있습니다."
],
"t18QYR": [["accessibleLabel"], " 고정 해제"],
- "t2TkQ3": ["동기화가 일시 중지되었습니다. 재개하려면 충돌을 해결하세요."],
"t4sFKC": [
"새 브랜치 <0>",
["trimmed"],
"</0>는 현재 커밋에서 생성되며 <1>.ok/worktrees/</1> 아래 자체 워크트리에 배치됩니다."
],
+ "t5I7P_": [
+ "요청하기 전까지는 아무것도 움직이지 않습니다. 동기화 메뉴에서 풀과 푸시를 실행하세요."
+ ],
"t6w1cq": ["빈 편집기 탭을 엽니다."],
"t7YoBO": ["이 댓글 보내기"],
"t9Qn8y": ["활성화된 에이전트 없음"],
@@ -4279,6 +4301,7 @@
"tjXez2": ["blog-post"],
"tjbyOy": ["프로젝트 세부 정보"],
"tkIXtS": ["스킬 ", ["imported"], "개 설치됨 (", ["alreadyImported"], "개는 이미 있음)"],
+ "tlGXxX": ["자동(풀만)"],
"tnG-m6": ["자동 동기화가 일시 중지되었습니다. 계속하려면 로그인합니다."],
"toyw51": ["Mermaid 다이어그램 컨트롤"],
"tqQBwN": ["스크립트는 검토용으로만 표시하며 실행하지 않습니다."],
@@ -4305,6 +4328,7 @@
"u779EG": ["http:// 또는 https:// 오리진을 사용하세요."],
"u7H-Wn": ["패널 보기 (", ["panelShortcutLabel"], ")"],
"u7U_Ij": ["선택한 텍스트에 링크를 추가하거나 커서 아래의 링크를 편집합니다."],
+ "uAQUqI": ["상태"],
"uA_jXp": ["브랜치 전환 및 업데이트"],
"uBAxNB": ["편집기"],
"uCaIdy": ["GitHub 로그인이 없거나 만료되었습니다. 동기화를 계속하려면 다시 연결하세요."],
@@ -4333,9 +4357,6 @@
"서버를 다시 시작하지 못했습니다. 다른 계정으로 실행 중입니다. 컴퓨터를 다시 시작하여 해결한 다음 이 프로젝트를 다시 여세요."
],
"uUCrBv": ["심볼릭 링크"],
- "uUiiyC": [
- "이 저장소에 푸시할 권한이 없습니다. 팔로우를 사용하면 복사본을 최신 상태로 유지할 수 있습니다."
- ],
"uVbUP8": ["설정…"],
"uY5Z7P": ["게임 종료 · <0>스페이스</0>를 눌러 다시 시작"],
"uYZTcW": ["이 GitHub URL은 공유할 수 없습니다."],
@@ -4366,6 +4387,7 @@
"v15iQB": [
"attested-computation 계약입니다. Attested Computation 유형 문서에만 적용되며, OKF는 런타임을 요구합니다. 일반 개념에는 영향을 주지 않습니다."
],
+ "v16Pzh": ["자동(풀만)으로 전환"],
"v2ZW0K": ["터미널 활성화"],
"v2a04T": ["markdownlint 규칙"],
"v41fCm": ["파일을 찾을 수 없음"],
@@ -4380,6 +4402,7 @@
"vF68cg": ["필드"],
"vGQxBT": ["소스 업데이트가 자동으로 적용됩니다(로컬에서 편집한 경우 제외)"],
"vGeNNQ": ["프롬프트를 복사해 에이전트에 붙여넣으면 프로젝트를 설정합니다."],
+ "vGjmyl": ["삭제됨"],
"vHlhDc": ["편집하려면 두 번 클릭"],
"vIxrEk": ["너비에 맞추기"],
"vLyv1R": ["숨기기"],
@@ -4423,8 +4446,10 @@
"vjwsDi": [
["count", "plural", { "other": ["자동 수정이 알려진 문제 ", "#", "개를 즉시 수정합니다."] }]
],
+ "vp5vfW": ["1시간"],
"vppAju": ["새로 추가한 첨부 파일의 위치"],
"vqJXNe": ["<0>open-knowledge-discovery</0> 스킬 설치"],
+ "vsFXfP": ["푸시에서 제외됨"],
"vv7kpg": ["취소됨"],
"vvWZnu": ["Diff 사용 불가"],
"vwV-kH": ["파일 수정이 예기치 않게 중지되었습니다."],
@@ -4491,6 +4516,11 @@
"wdzBgi": ["config 공유가 이제 나만 보기입니다."],
"weP6me": ["문서를 불러오지 못했습니다. 다시 시도하려면 @를 입력하세요"],
"wgNoIs": ["모두 선택"],
+ "wk_v1X": [
+ "이 워크트리의 동기화가 자동(풀 및 푸시)으로 설정되어 있습니다. ",
+ ["project"],
+ "에서 상속되었습니다. 설정 → 동기화에서 변경하세요."
+ ],
"wlwXUk": [
"~/Downloads를 선택했습니다. 여기의 파일은 대개 일시적이므로 안정적인 폴더를 대신 선택하는 것이 좋습니다."
],
@@ -4530,6 +4560,7 @@
"xCdTnb": ["새 탭 닫기"],
"xDBki3": ["제목 제안"],
"xDEcka": ["제공업체가 이 키의 요청 속도를 제한하고 있습니다. 잠시 후 다시 시도합니다."],
+ "xDKOFk": ["무시됨"],
"xEb24l": ["이메일로 후속 연락 받기"],
"xFQRu4": ["이미 로컬에 있음"],
"xG4tb6": ["\"", ["docName"], "\" 연결이 끊겼습니다."],
@@ -4541,6 +4572,7 @@
"xOTzt5": ["방금"],
"xSVO3J": ["생성되는 항목"],
"xV5sXw": [["0"], "주 전"],
+ "xW5AUw": [["pulled"], " 풀"],
"xWEvuo": ["AI에게 묻기"],
"xWomUD": [["editor"], " 버전 사용"],
"xXo8FT": ["저장 실패: ", ["error"]],
@@ -4673,6 +4705,7 @@
"zAJzIg": [["0"], "의 문제"],
"zAsDLY": ["문서 링크 그래프 시각화"],
"zBUqvf": ["OpenKnowledge 통합 설정…"],
+ "zBiFZh": ["편집 내용이 자동으로 커밋되어 원격에 푸시됩니다."],
"zC5jrM": ["<0>", ["effective"], "</0>(으)로 생성됩니다"],
"zD1Nqf": [["count", "plural", { "other": ["#", "개 문서"] }]],
"zFH7iU": ["네트워크 설정을 완전히 지우지 못했지만 노출이 꺼지고 있습니다. ", ["0"]],
@@ -4684,6 +4717,7 @@
"zLak8b": ["새 탭 활성화"],
"zMmwh4": ["테마를 선택하거나 직접 만듭니다."],
"zQBg2C": ["현재 블록을 한 위치 위 또는 아래로 이동합니다."],
+ "zWZBPx": ["유형 변경됨"],
"zXj1rA": ["의미로 검색"],
"zYp8Sr": [
"<0>수정됨</0> 배지는 config가 직접 설정했거나 <1>extends</1>를 통해 상속한 규칙을 나타냅니다. 표시가 없는 규칙은 기본 상태를 유지합니다."
@@ -4722,7 +4756,6 @@
" 클론이 아닙니다. ",
["expectedHost"],
"에서 클론한 폴더를 선택하시겠습니까?"
- ],
- "zz_Wd_": ["모드"]
+ ]
}
}
diff --git a/packages/app/src/locales/ko/messages.po b/packages/app/src/locales/ko/messages.po
index 6de85390d..627f35401 100644
--- a/packages/app/src/locales/ko/messages.po
+++ b/packages/app/src/locales/ko/messages.po
@@ -517,10 +517,6 @@ msgstr "{ahead}개 앞서 있고 {behind}개 뒤처져 있음"
msgid "{basename} — text editor"
msgstr "{basename} 텍스트 편집기"
-#: src/components/SyncStatusBadge.tsx
-msgid "{behind, plural, one {# commit behind} other {# commits behind}}"
-msgstr "{behind, plural, other {커밋 #개 뒤처짐}}"
-
#: src/components/SyncStatusBadge.tsx
msgid "{behind} behind"
msgstr "{behind}개 뒤처져 있음"
@@ -616,6 +612,14 @@ msgstr "{count, plural, other {자동 수정이 알려진 문제 #개를 즉시
msgid "{count, plural, one {matches # file} other {matches # files}}"
msgstr "{count, plural, other {파일 #개와 일치}}"
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} ahead"
+msgstr "{count}개 앞섬"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} behind"
+msgstr "{count}개 뒤처짐"
+
#: src/components/SkillBulkDeleteDialog.tsx
msgid "{count} skills"
msgstr "스킬 {count}개"
@@ -811,14 +815,11 @@ msgstr "{localizedMessage}, 줄 {displayLine}"
msgid "{mins, plural, one {# min ago} other {# min ago}}"
msgstr "{mins, plural, other {#분 전}}"
-#: src/components/SyncStatusBadge.tsx
-msgid "{minutes} min ago"
-msgstr "{minutes}분 전"
-
#: src/components/acp/ThreadHistoryMenu.tsx
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "{minutes}m ago"
msgstr "{minutes}분 전"
@@ -910,6 +911,10 @@ msgstr "{propertyCount, plural, other {속성 #개}}"
msgid "{propPanelDescriptorLabel} Properties"
msgstr "{propPanelDescriptorLabel} 속성"
+#: src/components/settings/SyncSection.tsx
+msgid "{seconds} seconds"
+msgstr "{seconds}초"
+
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
@@ -1127,6 +1132,26 @@ msgstr "📝 또는 assets/icon.png"
msgid "0/0"
msgstr "0/0"
+#: src/components/settings/SyncSection.tsx
+msgid "1 hour"
+msgstr "1시간"
+
+#: src/components/settings/SyncSection.tsx
+msgid "1 minute"
+msgstr "1분"
+
+#: src/components/settings/SyncSection.tsx
+msgid "15 minutes"
+msgstr "15분"
+
+#: src/components/settings/SyncSection.tsx
+msgid "30 seconds"
+msgstr "30초"
+
+#: src/components/settings/SyncSection.tsx
+msgid "5 minutes"
+msgstr "5분"
+
#: src/components/ImportSkillForm.tsx
msgid "A .zip or .skill archive."
msgstr ".zip 또는 .skill 아카이브입니다."
@@ -1521,6 +1546,7 @@ msgstr "이 메시지에 댓글 남기기"
#: src/components/PropertyDiffBlock.tsx
#: src/components/SkillDirectoryResult.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Added"
msgstr "추가됨"
@@ -1565,11 +1591,13 @@ msgstr "다음 파일을 추가합니다"
msgid "Adds these folders"
msgstr "다음 폴더를 추가합니다"
+#: src/components/settings/SyncSection.tsx
#: src/editor/components/PropPanel.tsx
msgid "Advanced"
msgstr "고급"
#: src/components/ConsentDialogBody.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Advanced settings"
msgstr "고급 설정"
@@ -1979,6 +2007,24 @@ msgstr "기준 콘텐츠이며, 참조되는 모든 곳에 그대로 미러링
msgid "Authorize in browser"
msgstr "브라우저에서 인증"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull and Push)"
+msgstr "자동(풀 및 푸시)"
+
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull only)"
+msgstr "자동(풀만)"
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
+msgstr "자동(풀만)은 원격 git 저장소에서 업데이트를 가져와 사본을 자동으로 최신 상태로 만듭니다. 로컬 편집 내용은 이 컴퓨터에 남으며 절대 푸시되지 않습니다."
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) never pushes or commits your local changes. They stay only on this machine."
+msgstr "자동(풀만)은 로컬 변경 사항을 절대 푸시하거나 커밋하지 않습니다. 이 기기에만 남습니다."
+
#: src/components/settings/TerminalSection.tsx
msgid "Auto-approve settings not yet loaded — try again in a moment"
msgstr "자동 승인 설정을 아직 불러오지 못했습니다. 잠시 후 다시 시도합니다."
@@ -2012,21 +2058,13 @@ msgstr "자동 수정은 기계적으로 수정할 수 있는 문제가 알려
msgid "Auto-save"
msgstr "자동 저장"
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is off for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "이 워크트리의 자동 동기화가 꺼져 있습니다. {project}에서 상속되었습니다. 설정 → 동기화에서 변경하세요."
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "이 워크트리의 자동 동기화가 켜져 있습니다. {project}에서 상속되었습니다. 설정 → 동기화에서 변경하세요."
-
#: src/components/settings/SyncSection.tsx
msgid "Auto-sync is paused — sign in to resume."
msgstr "자동 동기화가 일시 중지되었습니다. 계속하려면 로그인합니다."
#: src/components/settings/SyncSection.tsx
-msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Follow to keep receiving updates."
-msgstr "자동 동기화가 일시 중지되었습니다. 이 저장소에 푸시할 권한이 없습니다. 계속 업데이트를 받으려면 팔로우로 전환합니다."
+msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Auto (Pull only) to keep receiving updates."
+msgstr "자동 동기화가 일시 중지되었습니다. 이 저장소에 푸시할 권한이 없습니다. 계속 업데이트를 받으려면 자동(풀만)으로 전환하세요."
#: src/components/AutoSyncEnableWarning.tsx
msgid "Auto-sync periodically fetches, pulls, and pushes commits to your remote git repository so your edits stay in sync across machines."
@@ -2424,9 +2462,14 @@ msgid "Change the embeddings provider?"
msgstr "임베딩 제공업체를 변경하시겠습니까?"
#: src/components/PropertyDiffBlock.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Changed"
msgstr "변경됨"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Changed here and on the remote"
+msgstr "여기와 원격 모두에서 변경됨"
+
#: src/components/ChangedOutsideBadge.tsx
msgid "changed outside"
msgstr "외부에서 변경됨"
@@ -2451,6 +2494,10 @@ msgstr "변경사항이 자동으로 저장되었습니다."
msgid "Check for updates"
msgstr "업데이트 확인"
+#: src/components/settings/SyncSection.tsx
+msgid "Check for updates every"
+msgstr "업데이트 확인 주기"
+
#: src/components/AppMenubar.tsx
msgid "Check for updates…"
msgstr "업데이트 확인…"
@@ -2970,6 +3017,10 @@ msgstr "이 코드 블록에 댓글을 남기거나 AI에 질문"
msgid "Comments"
msgstr "댓글"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Commit and sync"
+msgstr "커밋하고 동기화"
+
#: src/components/ShareBranchSwitchDialog.tsx
msgid "Commit or stash changes to switch:"
msgstr "전환하려면 변경 사항을 커밋하거나 스태시하세요:"
@@ -3271,6 +3322,7 @@ msgstr "변환 중…"
#: src/components/empty-state/CopyablePromptList.tsx
#: src/components/InstallInClaudeDesktopDialog.tsx
+#: src/components/SyncStatusBadge.tsx
#: src/editor/extensions/CodeBlockView.tsx
msgid "Copied"
msgstr "복사됨"
@@ -3886,6 +3938,10 @@ msgstr "전송 대기 댓글을 읽지 못했습니다. 전송된 댓글 없음.
msgid "Couldn't read the comments waiting to send: {0}"
msgstr "전송 대기 댓글을 읽지 못했습니다: {0}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Couldn't read the working tree. Check the server logs."
+msgstr "작업 트리를 읽지 못했습니다. 서버 로그를 확인하세요."
+
#. placeholder {0}: warning.code
#: src/components/settings/SavedThemesTiles.tsx
msgid "Couldn’t read this theme ({0})"
@@ -4459,6 +4515,10 @@ msgstr "채팅 삭제?"
msgid "Delete this comment"
msgstr "이 댓글 삭제"
+#: src/components/SyncStatusBadge.tsx
+msgid "Deleted"
+msgstr "삭제됨"
+
#. placeholder {0}: deletedTheme.label
#: src/components/settings/SavedThemesTiles.tsx
msgid "Deleted {0}."
@@ -4554,6 +4614,10 @@ msgstr "설명 토큰"
msgid "Design"
msgstr "디자인"
+#: src/components/SyncStatusBadge.tsx
+msgid "detached HEAD"
+msgstr "분리된 HEAD"
+
#: src/components/SyncStatusBadge.tsx
msgid "Detached HEAD — checkout a branch to resume"
msgstr "HEAD가 분리되었습니다. 계속하려면 브랜치를 체크아웃하세요."
@@ -4926,6 +4990,10 @@ msgstr "각 AI 도구는 자체 폴더에서 스킬을 읽습니다. 한 폴더
msgid "Each pack scaffolds your project with ready-made folders and templates."
msgstr "각 팩은 바로 사용할 수 있는 폴더와 템플릿으로 프로젝트의 뼈대를 만듭니다."
+#: src/components/settings/SyncSection.tsx
+msgid "Each push is one commit to your remote."
+msgstr "푸시 한 번이 원격에 커밋 하나입니다."
+
#: src/components/AppMenubar.tsx
#: src/components/settings/LintingSection.tsx
#: src/components/SkillsTree.tsx
@@ -5174,25 +5242,25 @@ msgstr "{id} 활성화"
#: src/components/EnableSyncConfirmDialog.tsx
#: src/components/share-receive-miss-content.tsx
#: src/components/ShareFreshnessWarning.tsx
-msgid "Enable auto-sync"
-msgstr "자동 동기화 사용"
+msgid "Enable Auto (Pull and Push)"
+msgstr "자동(풀 및 푸시) 활성화"
-#: src/components/settings/LinkPreviewsSection.tsx
-msgid "Enable external link previews"
-msgstr "외부 링크 미리보기 사용"
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Enable Auto (Pull and Push)?"
+msgstr "자동(풀 및 푸시)을 활성화할까요?"
#: src/components/AutoSyncOnboardingDialog.tsx
#: src/components/EnableSyncConfirmDialog.tsx
-msgid "Enable Follow"
-msgstr "팔로우 사용"
+msgid "Enable Auto (Pull only)"
+msgstr "자동(풀만) 활성화"
#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable Follow?"
-msgstr "팔로우를 사용하시겠습니까?"
+msgid "Enable Auto (Pull only)?"
+msgstr "자동(풀만)을 활성화할까요?"
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable git auto-sync?"
-msgstr "git 자동 동기화를 사용하시겠습니까?"
+#: src/components/settings/LinkPreviewsSection.tsx
+msgid "Enable external link previews"
+msgstr "외부 링크 미리보기 사용"
#: src/components/settings/LintingSection.tsx
msgid "Enable indexes"
@@ -5788,6 +5856,10 @@ msgstr "임베딩 제공업체를 업데이트하지 못했습니다: {detail}"
msgid "Failed to update the project sync default — {detail}"
msgstr "프로젝트 동기화 기본값을 업데이트하지 못했습니다: {detail}"
+#: src/components/settings/SyncSection.tsx
+msgid "Failed to update the sync interval — {detail}"
+msgstr "동기화 주기를 업데이트하지 못했습니다 — {detail}"
+
#: src/components/FileTree.tsx
msgid "Failed to upload file"
msgstr "파일을 업로드하지 못했습니다"
@@ -6047,28 +6119,6 @@ msgstr "폴더 공유 링크가 복사되었습니다."
msgid "Folder target: {linkTitle}. Click to open the overview."
msgstr "폴더 대상: {linkTitle}. 클릭하여 개요를 엽니다."
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow"
-msgstr "팔로우"
-
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow — updates flow in from your remote; your edits stay on this computer."
-msgstr "팔로우 — 원격 변경 사항을 가져오고 편집 내용은 이 컴퓨터에 유지합니다."
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
-msgstr "팔로우는 원격 git 저장소에서 업데이트를 가져와 사본을 자동으로 fast-forward합니다. 로컬 편집 내용은 이 컴퓨터에만 남고 절대 푸시되지 않습니다."
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Follow is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "이 워크트리의 팔로우가 켜져 있습니다. {project}에서 상속되었습니다. 설정 → 동기화에서 변경하세요."
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow never pushes or commits your local changes. They stay only on this machine."
-msgstr "팔로우는 로컬 변경 사항을 푸시하거나 커밋하지 않습니다. 이 컴퓨터에만 남습니다."
-
#: src/components/acp/ThreadView.tsx
msgid "Follow the agent's edits"
msgstr "에이전트 변경 내용 따라가기"
@@ -6159,11 +6209,6 @@ msgstr "이 템플릿으로 만든 모든 문서는 이 frontmatter로 시작합
msgid "Frontmatter schemas"
msgstr "Frontmatter 스키마"
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Full"
-msgstr "전체"
-
#: src/components/InstallInClaudeDesktopDialog.tsx
msgid "Full guide"
msgstr "전체 안내서"
@@ -6177,14 +6222,6 @@ msgstr "전체 경로"
msgid "Full Path"
msgstr "전체 경로"
-#: src/components/settings/SyncSection.tsx
-msgid "Full sync — your commits push and remote changes pull automatically."
-msgstr "전체 동기화, 커밋을 푸시하고 원격 변경사항을 자동으로 가져옵니다."
-
-#: src/components/SyncStatusBadge.tsx
-msgid "Full sync — your edits are committed and pushed to your remote automatically."
-msgstr "전체 동기화. 편집 내용이 원격에 자동으로 커밋되고 푸시됩니다."
-
#: src/components/OkBlobRunner.tsx
msgid "Game over · press <0>Space</0> to play again"
msgstr "게임 종료 · <0>스페이스</0>를 눌러 다시 시작"
@@ -6243,6 +6280,7 @@ msgid "Git needs a helper tool (such as git-lfs) that isn't installed or couldn'
msgstr "필요한 Git 도우미 도구(예: git-lfs)를 찾을 수 없습니다. 설치한 후 다시 시도하세요."
#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Git sync"
msgstr "Git 동기화"
@@ -6620,6 +6658,10 @@ msgstr "공유는 어떻게 작동하나요?"
msgid "How missing project-local documents, files, and images are reported in Problems, editor diagnostics, audits, and agent tools."
msgstr "프로젝트 로컬 문서, 파일, 이미지의 누락을 Problems, 편집기 진단, 감사, 에이전트 도구에서 보고하는 방식을 설정합니다."
+#: src/components/settings/SyncSection.tsx
+msgid "How often this computer pulls changes from your remote."
+msgstr "이 컴퓨터가 원격에서 변경 사항을 가져오는 주기입니다."
+
#: src/components/ShareFreshnessWarning.tsx
msgid "How to push manually"
msgstr "수동으로 푸시하는 방법"
@@ -6705,6 +6747,10 @@ msgstr "무시 패턴"
msgid "Ignore patterns (raw text)"
msgstr "무시 패턴 (원문)"
+#: src/components/SyncStatusBadge.tsx
+msgid "Ignored"
+msgstr "무시됨"
+
#: src/components/LinksPanel.tsx
msgid "Image {identity}. Go to reference."
msgstr "이미지 {identity}. 참조로 이동합니다."
@@ -7301,8 +7347,8 @@ msgid "Keep the name to 64 characters or fewer."
msgstr "이름은 64자 이하로 유지하세요."
#: src/components/settings/SyncSection.tsx
-msgid "Keep this project in sync with your git remote. Follow fetches updates without pushing; full sync pushes your commits too. Turning sync on requires confirmation."
-msgstr "이 프로젝트를 git 원격 저장소와 동기화합니다. 팔로우는 푸시하지 않고 업데이트를 가져오며, 전체 동기화는 커밋도 푸시합니다. 동기화를 켜려면 확인이 필요합니다."
+msgid "Keep this project in sync with your git remote. Auto (Pull only) brings in updates without pushing; Auto (Pull and Push) sends your edits too. Turning auto-sync on requires confirmation."
+msgstr "이 프로젝트를 git 원격과 동기화 상태로 유지합니다. 자동(풀만)은 푸시 없이 업데이트를 가져오고, 자동(풀 및 푸시)은 편집 내용도 보냅니다. 자동 동기화를 켜려면 확인이 필요합니다."
#: src/lib/pack-copy.ts
msgid "Keep track of the people and companies you work with and the meetings you have with them. Good for remembering who someone is, how you know them, and what you last talked about."
@@ -7782,6 +7828,11 @@ msgstr "이 빌드에서는 AI 도구를 관리할 수 없습니다."
msgid "Managing project AI tools is unavailable in this build."
msgstr "이 빌드에서는 프로젝트 AI 도구를 관리할 수 없습니다."
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Manual"
+msgstr "수동"
+
#: src/components/empty-state/use-create-suggestions.ts
msgid "Map the architecture"
msgstr "아키텍처 매핑"
@@ -7920,10 +7971,6 @@ msgstr "팔레트 색상 누락"
msgid "Missing theme name"
msgstr "테마 이름 누락"
-#: src/components/SyncStatusBadge.tsx
-msgid "Mode"
-msgstr "모드"
-
#: src/components/settings/SearchSection.tsx
msgid "Model"
msgstr "모델"
@@ -7940,6 +7987,7 @@ msgstr "모델 기본 작업 수준"
#: src/components/FolderOverview.tsx
#: src/components/settings/markdownlint-rule-browser.tsx
#: src/components/SkillOriginInline.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Modified"
msgstr "수정됨"
@@ -8232,10 +8280,6 @@ msgstr "정리 중 네트워크 오류가 발생했습니다."
msgid "Network settings not yet loaded. Try again in a moment."
msgstr "네트워크 설정이 아직 로드되지 않았습니다. 잠시 후 다시 시도하세요."
-#: src/components/SyncStatusBadge.tsx
-msgid "never"
-msgstr "없음"
-
#: src/components/FolderOverview.tsx
#: src/editor/tag-suggestion/TagSuggestionMenu.tsx
msgid "New"
@@ -8850,10 +8894,22 @@ msgstr "없음 ({0}로는 문서와 일치하지 않음)"
msgid "nothing ({0} is not a valid pattern)"
msgstr "없음 ({0}로는 유효한 패턴이 아님)"
+#: src/components/settings/SyncSection.tsx
+msgid "Nothing moves until you ask — pull and push from the sync menu."
+msgstr "요청하기 전까지는 아무것도 움직이지 않습니다. 동기화 메뉴에서 풀과 푸시를 실행하세요."
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing moves until you ask."
+msgstr "요청하기 전까지는 아무것도 움직이지 않습니다."
+
#: src/components/FolderPropertiesCard.tsx
msgid "Nothing set yet."
msgstr "아직 설정된 항목 없음."
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing to commit — working tree clean."
+msgstr "커밋할 내용이 없습니다. 작업 트리가 깨끗합니다."
+
#: src/components/BugReportSendToast.tsx
msgid "Nothing was uploaded. The report stays on this computer until you email it to us."
msgstr "아무것도 업로드되지 않았습니다. 보고서는 이메일로 보내기 전까지 이 컴퓨터에 남아 있습니다."
@@ -8887,10 +8943,6 @@ msgstr "{0} 중"
msgid "of {totalPages}"
msgstr "{totalPages}페이지 중"
-#: src/components/settings/SyncSection.tsx
-msgid "Off"
-msgstr "꺼짐"
-
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Off — external links show only their URL. No requests leave this computer."
msgstr "꺼짐, 외부 링크에는 URL만 나타납니다. 이 컴퓨터 밖으로 요청이 전송되지 않습니다."
@@ -9645,6 +9697,10 @@ msgstr "나가는 링크"
msgid "Outline"
msgstr "개요"
+#: src/components/SyncStatusBadge.tsx
+msgid "Outside what Open Knowledge commits."
+msgstr "Open Knowledge가 커밋하는 범위 밖입니다."
+
#: src/components/SkillCostValue.tsx
msgid "over the {budgetLabel} token budget"
msgstr "{budgetLabel} 토큰 예산 초과"
@@ -9855,10 +9911,6 @@ msgstr "패턴 구문 오류: {message}"
msgid "Pattern warnings: {summary}"
msgstr "패턴 경고: {summary}"
-#: src/components/SyncStatusBadge.tsx
-msgid "Pause sync"
-msgstr "동기화 일시 중지"
-
#: src/components/acp/ThreadView.tsx
msgid "pending"
msgstr "대기 중"
@@ -10252,10 +10304,26 @@ msgstr "게시 중…"
msgid "Pull"
msgstr "풀"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull and Push"
+msgstr "풀 및 푸시"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull brings in"
+msgstr "풀로 들어옴"
+
#: src/components/share-receive-miss-content.tsx
msgid "Pull latest changes"
msgstr "최신 변경 사항 풀"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled}"
+msgstr "{pulled} 풀"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled} · pushed {pushed}"
+msgstr "{pulled} 풀 · {pushed} 푸시"
+
#: src/components/share-receive-miss-content.tsx
#: src/components/SyncStatusBadge.tsx
msgid "Pulling"
@@ -10281,10 +10349,26 @@ msgstr "공유하기 전에 {branch}를 GitHub에 푸시하세요."
msgid "Push failed — check the server logs for details."
msgstr "푸시 실패. 자세한 내용은 서버 로그를 확인하세요."
+#: src/components/SyncStatusBadge.tsx
+msgid "Push includes"
+msgstr "푸시에 포함됨"
+
+#: src/components/settings/SyncSection.tsx
+msgid "Push my edits every"
+msgstr "내 편집 내용 푸시 주기"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Push skips"
+msgstr "푸시에서 제외됨"
+
#: src/lib/share/run-share-action.ts
msgid "Push this branch to GitHub before sharing."
msgstr "공유 전에 이 브랜치를 GitHub에 푸시하세요."
+#: src/components/SyncStatusBadge.tsx
+msgid "Pushed {pushed}"
+msgstr "{pushed} 푸시"
+
#: src/components/SyncStatusBadge.tsx
msgid "Pushing"
msgstr "푸시 중"
@@ -10358,6 +10442,10 @@ msgstr "다른 문서의 MirrorSource 블록을 읽기 전용으로 복사한
msgid "Read-only file in the {name} skill"
msgstr "{name} 스킬의 읽기 전용 파일"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reading working tree"
+msgstr "작업 트리를 읽는 중"
+
#: src/components/acp/working-status.ts
msgid "Reading…"
msgstr "읽는 중…"
@@ -10411,6 +10499,10 @@ msgstr "권장 에이전트 스킬"
msgid "Reconnect required"
msgstr "다시 연결 필요"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reconnect required to keep syncing."
+msgstr "계속 동기화하려면 다시 연결해야 합니다."
+
#: src/presence/use-sync-toasts.ts
msgid "Reconnected"
msgstr "다시 연결됨"
@@ -10677,6 +10769,10 @@ msgstr "스킬 이름 변경"
msgid "Rename succeeded but the sidebar may be out of date — refresh to resync"
msgstr "이름 변경은 성공했지만 사이드바가 최신 상태가 아닐 수 있습니다. 다시 동기화하려면 새로 고침하세요."
+#: src/components/SyncStatusBadge.tsx
+msgid "Renamed"
+msgstr "이름 변경됨"
+
#. placeholder {0}: docLeaf(descriptor.from)
#. placeholder {1}: docLeaf(descriptor.to)
#: src/components/TimelinePanel.tsx
@@ -10828,7 +10924,6 @@ msgstr "이미 클론한 저장소는 연결을 해제한 후에도 git에 저
#: src/components/CloneDialog.tsx
#: src/components/share-metadata-rows.tsx
#: src/components/SkillPreviewTab.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Repository"
msgstr "저장소"
@@ -10911,6 +11006,10 @@ msgstr "스킬 패널 크기 조절"
msgid "Resolve conflict in your terminal"
msgstr "터미널에서 충돌 해결"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Resolve in terminal"
+msgstr "터미널에서 해결"
+
#: src/components/FileTree.tsx
msgid "Resolve the conflict on {files} before deleting."
msgstr "삭제하기 전에 {files}의 충돌을 해결하세요."
@@ -11026,10 +11125,6 @@ msgstr "{0} 버전으로 복원했습니다"
msgid "Results capped — this workspace has more files than search can index. A missing file may be a cap artifact, not a typo."
msgstr "결과가 제한되었습니다. 이 워크스페이스에는 검색에서 색인할 수 있는 파일보다 더 많은 파일이 있습니다. 누락된 파일은 오타가 아니라 제한으로 인해 빠진 것일 수 있습니다."
-#: src/components/SyncStatusBadge.tsx
-msgid "Resume sync"
-msgstr "동기화 재개"
-
#: src/components/acp/ThreadView.tsx
msgid "Resuming the chat"
msgstr "채팅 재개 중"
@@ -11101,8 +11196,8 @@ msgid "Reverting"
msgstr "되돌리는 중"
#: src/components/SyncStatusBadge.tsx
-msgid "Review conflicts"
-msgstr "충돌 검토"
+msgid "Review"
+msgstr "검토"
#: src/components/ReportBugDialogBody.tsx
msgid "Review your report"
@@ -12248,6 +12343,10 @@ msgstr "Slidev 시작 시간이 초과되었습니다. 다시 시도하세요."
msgid "Small section heading."
msgstr "작은 섹션 제목입니다."
+#: src/components/SyncStatusBadge.tsx
+msgid "Some files are not listed — the working tree has too many changes."
+msgstr "일부 파일이 표시되지 않았습니다. 작업 트리의 변경 사항이 너무 많습니다."
+
#: src/components/settings/SavedThemesTiles.tsx
msgid "Some saved themes aren’t shown because the theme folder exceeds the scan limit."
msgstr "테마 폴더가 스캔 한도를 초과해 일부 저장된 테마가 나타나지 않습니다."
@@ -12439,6 +12538,10 @@ msgstr "에이전트 시작 중…"
msgid "status"
msgstr "상태"
+#: src/components/SyncStatusBadge.tsx
+msgid "Status"
+msgstr "상태"
+
#: src/components/SubscribeCard.tsx
#: src/components/SubscribeForm.tsx
msgid "Stay in the loop"
@@ -12586,8 +12689,8 @@ msgid "Switch to a branch to share."
msgstr "공유하려면 브랜치로 전환하세요."
#: src/components/settings/SyncSection.tsx
-msgid "Switch to Follow"
-msgstr "팔로우로 전환"
+msgid "Switch to Auto (Pull only)"
+msgstr "자동(풀만)으로 전환"
#: src/components/command-palette-commands.ts
msgid "Switch worktree"
@@ -12626,7 +12729,6 @@ msgid "Symlinks the skill to {path}"
msgstr "{path}에 스킬을 심볼릭 링크합니다"
#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Sync"
msgstr "동기화"
@@ -12635,10 +12737,6 @@ msgstr "동기화"
msgid "Sync & sharing"
msgstr "동기화 및 공유"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync disabled"
-msgstr "동기화 사용 안 함"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync failed — check the server logs for details."
msgstr "동기화 실패. 자세한 내용은 서버 로그를 확인하세요."
@@ -12647,13 +12745,21 @@ msgstr "동기화 실패. 자세한 내용은 서버 로그를 확인하세요."
msgid "Sync is failing. See the sync status for details."
msgstr "동기화에 실패하고 있습니다. 자세한 내용은 동기화 상태를 확인하세요."
-#: src/components/settings/SyncSection.tsx
-msgid "Sync is off — your edits stay on this computer until you commit and push manually."
-msgstr "동기화가 꺼져 있어 커밋하고 수동으로 푸시할 때까지 편집 내용이 이 컴퓨터에만 남습니다."
+#: src/components/SyncBlockingChanges.tsx
+msgid "Sync is paused. Commit these local edits to continue, or sort them out in a terminal."
+msgstr "동기화가 일시 중지되었습니다. 계속하려면 이 로컬 편집 내용을 커밋하거나 터미널에서 정리하세요."
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync is paused. Turn it back on to resume."
-msgstr "동기화가 일시 중지되었습니다. 재개하려면 다시 켜세요."
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull and Push) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "이 워크트리의 동기화가 자동(풀 및 푸시)으로 설정되어 있습니다. {project}에서 상속되었습니다. 설정 → 동기화에서 변경하세요."
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull only) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "이 워크트리의 동기화가 자동(풀만)으로 설정되어 있습니다. {project}에서 상속되었습니다. 설정 → 동기화에서 변경하세요."
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Manual for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "이 워크트리의 동기화가 수동으로 설정되어 있습니다. {project}에서 상속되었습니다. 설정 → 동기화에서 변경하세요."
#: src/components/SyncStatusBadge.tsx
msgid "Sync mode"
@@ -12664,18 +12770,10 @@ msgstr "동기화 모드"
msgid "Sync now"
msgstr "지금 동기화"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync off"
-msgstr "동기화 끔"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync paused"
msgstr "동기화 일시 중지됨"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync paused — resolve conflicts to resume."
-msgstr "동기화가 일시 중지되었습니다. 재개하려면 충돌을 해결하세요."
-
#: src/hooks/use-no-push-permission-toast.ts
msgid "Sync paused — you don't have permission to push to this repo"
msgstr "동기화 일시 중지됨, 이 리포지토리에 푸시할 권한이 없습니다"
@@ -12710,10 +12808,6 @@ msgstr "동기화 상태: {syncStateLabel}. git 사용자 정보가 설정되지
msgid "Synced"
msgstr "동기화됨"
-#: src/components/SyncStatusBadge.tsx
-msgid "Synced {lastSyncedRelative}"
-msgstr "동기화됨 {lastSyncedRelative}"
-
#: src/components/TimelinePanel.tsx
msgid "Synced from disk"
msgstr "디스크에서 동기화됨"
@@ -12937,6 +13031,10 @@ msgstr "보고서 감사합니다!"
msgid "That branch is already open in another worktree."
msgstr "해당 브랜치는 다른 워크트리에서 이미 열려 있습니다."
+#: src/components/SyncBlockingChanges.tsx
+msgid "That did not go through. Check the server logs and try again."
+msgstr "처리되지 않았습니다. 서버 로그를 확인한 뒤 다시 시도하세요."
+
#: src/comments/reveal-comment.ts
msgid "That document didn't open in time. Try again once it has synced."
msgstr "문서 열기 시간 초과. 동기화 후 다시 시도합니다."
@@ -13972,6 +14070,10 @@ msgstr "명령을 사용하려면 '/' 입력"
msgid "Type a query, then press <0>↵</0> to search your pages by meaning."
msgstr "쿼리를 입력한 다음 <0>↵</0> 키를 눌러 페이지를 의미로 검색합니다."
+#: src/components/SyncStatusBadge.tsx
+msgid "Type changed"
+msgstr "유형 변경됨"
+
#: src/editor/components/CodePreviewEditModal.tsx
msgid "Type to edit; <0>Cmd/Ctrl+Enter</0> saves, <1>Esc</1> cancels."
msgstr "입력하여 편집하세요. <0>Cmd/Ctrl+Enter</0>로 저장하고 <1>Esc</1>로 취소합니다."
@@ -14100,6 +14202,10 @@ msgstr "모든 댓글 전송 표시 해제"
msgid "Unmark every comment in {0}"
msgstr "{0}의 모든 댓글 전송 표시 해제"
+#: src/components/SyncStatusBadge.tsx
+msgid "Unmerged"
+msgstr "병합 안 됨"
+
#: src/editor/slash-command/items.tsx
msgid "Unordered list of items."
msgstr "글머리 기호 목록입니다."
@@ -14140,6 +14246,10 @@ msgstr "해결할 수 없는 이미지 {identity}. 참조로 이동합니다."
msgid "Untitled report"
msgstr "제목 없는 보고서"
+#: src/components/SyncStatusBadge.tsx
+msgid "Untracked"
+msgstr "추적 안 됨"
+
#: src/components/SyncStatusBadge.tsx
msgid "Up to date"
msgstr "최신 상태"
@@ -14187,8 +14297,8 @@ msgid "Updated \"{name}\" from {0}"
msgstr "\"{name}\"을 {0}에서 업데이트했습니다"
#: src/components/SyncStatusBadge.tsx
-msgid "Updated {lastSyncedRelative}"
-msgstr "업데이트됨 {lastSyncedRelative}"
+msgid "Updated {updatedRelative}"
+msgstr "{updatedRelative} 업데이트됨"
#: src/components/FolderTimelineCard.tsx
msgid "updated folder properties"
@@ -14202,6 +14312,11 @@ msgstr "버전 {version}으로 업데이트됨"
msgid "Updates flow in"
msgstr "업데이트가 들어옴"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Updates flow in from your remote; your edits stay on this computer."
+msgstr "업데이트는 원격에서 들어오고, 편집 내용은 이 컴퓨터에 남습니다."
+
#: src/components/SkillOriginInline.tsx
msgid "Updates from the source apply automatically (unless edited locally)"
msgstr "소스 업데이트가 자동으로 적용됩니다(로컬에서 편집한 경우 제외)"
@@ -14654,6 +14769,10 @@ msgstr "어디에 둘까요?"
msgid "Which skill"
msgstr "어떤 스킬"
+#: src/components/settings/SyncSection.tsx
+msgid "While you're signed out, updates are checked at most every 3 minutes regardless of this setting."
+msgstr "로그아웃 상태에서는 이 설정과 관계없이 업데이트를 최대 3분에 한 번만 확인합니다."
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "Whitespace"
msgstr "공백"
@@ -14830,8 +14949,8 @@ msgid "You don't have permission to push to this repo."
msgstr "이 저장소에 푸시 권한이 없습니다."
#: src/components/settings/SyncSection.tsx
-msgid "You don't have permission to push to this repo. Follow can still keep your copy up to date."
-msgstr "이 저장소에 푸시할 권한이 없습니다. 팔로우를 사용하면 복사본을 최신 상태로 유지할 수 있습니다."
+msgid "You don't have permission to push to this repo. Auto (Pull only) can still keep your copy up to date."
+msgstr "이 저장소에 푸시할 권한이 없습니다. 자동(풀만)으로도 사본을 최신 상태로 유지할 수 있습니다."
#: src/components/ShareFreshnessWarning.tsx
msgid "You don't have write access to this repo."
@@ -14903,6 +15022,11 @@ msgstr "브랜치 <0>{shareBranch}</0> 사본에 GitHub에 없는 변경 사항
msgid "Your current version is saved first, so this is reversible."
msgstr "현재 버전이 먼저 저장되므로 되돌릴 수 있습니다."
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Your edits are committed and pushed to your remote automatically."
+msgstr "편집 내용이 자동으로 커밋되어 원격에 푸시됩니다."
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "Your edits stay on this computer"
msgstr "편집 내용은 이 컴퓨터에 남습니다."
diff --git a/packages/app/src/locales/pseudo/messages.json b/packages/app/src/locales/pseudo/messages.json
index 594a3ec19..c3f4e0713 100644
--- a/packages/app/src/locales/pseudo/messages.json
+++ b/packages/app/src/locales/pseudo/messages.json
@@ -27,11 +27,7 @@
"-YV1Uo": ["Ƥàţţēŕń ", ["patternNumber"]],
"-bFGPF": ["Ńēxţ ćĥàńĝē"],
"-dNlfM": ["Ũńďĩď ţĥē ĺàśţ ēďĩţ ōń ", ["docName"]],
- "-f2Ogn": [
- "Ķēēƥ ţĥĩś ƥŕōĴēćţ ĩń śŷńć ŵĩţĥ ŷōũŕ ĝĩţ ŕēḿōţē. Ƒōĺĺōŵ ƒēţćĥēś ũƥďàţēś ŵĩţĥōũţ ƥũśĥĩńĝ; ƒũĺĺ śŷńć ƥũśĥēś ŷōũŕ ćōḿḿĩţś ţōō. Ţũŕńĩńĝ śŷńć ōń ŕēǫũĩŕēś ćōńƒĩŕḿàţĩōń."
- ],
"-g6KIS": ["Ũńŕēćōĝńĩźēď ĺĩńķ"],
- "-imiMK": ["Ƒōĺĺōŵ — ũƥďàţēś ƒĺōŵ ĩń ƒŕōḿ ŷōũŕ ŕēḿōţē; ŷōũŕ ēďĩţś śţàŷ ōń ţĥĩś ćōḿƥũţēŕ."],
"-kKdCC": ["Ĩńśţàĺĺēď ", ["imported"], " śķĩĺĺś ƒŕōḿ ", ["0"]],
"-kbIAr": ["Ĺĩńķś & ĩḿàĝēś"],
"-ksoxk": [
@@ -133,7 +129,6 @@
"0wswKc": ["Ĥōŕĩźōńţàĺ ŕũĺē ţĥàţ ďĩvĩďēś śēćţĩōńś."],
"0xnQ_X": ["Ũƥďàţēś ƒĺōŵ ĩń"],
"0xnmlQ": ["Ŕēƥōśĩţōŕŷ ńàḿē"],
- "0yL--g": ["Ŕēvĩēŵ ćōńƒĺĩćţś"],
"0ySP5u": ["Ćĥàńĝēś śàvē àũţōḿàţĩćàĺĺŷ ţō ţĥĩś ţĥēḿē."],
"0zAhu6": ["ēvēŕŷ ďōć"],
"1-flC9": ["Ĺōćàĺ śēŕvēŕ ƥōŕţ"],
@@ -169,6 +164,7 @@
"1NgrlY": ["Ōţĥēŕ ŵàŷś ţō ĩńśţàĺĺ"],
"1QfxQT": ["Ďĩśḿĩśś"],
"1RluQD": ["Śĥōŵ ŕēƥĺàćē"],
+ "1TA-aJ": ["Ƥũĺĺēď ", ["pulled"], " · ƥũśĥēď ", ["pushed"]],
"1TNIig": ["Ōƥēń"],
"1Ta7Fd": ["Ōƥēń ", ["basename"]],
"1V17kO": ["Ĺōàďĩńĝ ƀōţĥ vēŕśĩōńś"],
@@ -242,6 +238,11 @@
["FULLSCREEN_HUB_LIMIT"],
" ŕēśũĺţś."
],
+ "2okwy4": [
+ "Śŷńć ĩś śēţ ţō Àũţō (Ƥũĺĺ ōńĺŷ) ƒōŕ ţĥĩś ŵōŕķţŕēē, ĩńĥēŕĩţēď ƒŕōḿ ",
+ ["project"],
+ ". Ćĥàńĝē ĩţ ĩń Śēţţĩńĝś → Śŷńć."
+ ],
"2pR7ad": ["Ēḿƀēďďĩńĝś ÀƤĨ ķēŷ"],
"2q_Q7x": ["Vĩśĩƀĩĺĩţŷ"],
"2rLM8r": ["Ćōũĺďń'ţ śţàŕţ ţĥē àĝēńţ ţĥŕēàď — ƥĺēàśē ţŕŷ àĝàĩń."],
@@ -347,7 +348,6 @@
"4A3Yzu": ["Ćōďē ƀĺōćķ"],
"4BITzH": ["Ēŕŕōŕ:"],
"4CfgPM": ["ƤŕōĴēćţ ƒōĺďēŕ ćŕēàţēď, ƀũţ ĝĩţ ĩńĩţ ƒàĩĺēď. Ţŕŷ àĝàĩń."],
- "4DcimZ": ["Ũƥďàţēď ", ["lastSyncedRelative"]],
"4E9jPa": ["Ćŕēàţē ŷōũŕ ƒĩŕśţ ƥŕōĴēćţ"],
"4EZrJN": ["Ŕũĺēś"],
"4ErgAf": ["ŌƥēńĶńōŵĺēďĝē ĩńśţàĺĺēď à śķĩĺĺ"],
@@ -375,6 +375,7 @@
"4m-xuX": ["Àũţō-ƒĩx — ńōţĥĩńĝ ţō ƒĩx"],
"4mDIcg": ["Ƥĩćķ ţĥē śķĩĺĺś ţō ĩńśţàĺĺ. Ēàćĥ ōńē ĺàńďś àś àń ēďĩţàƀĺē śķĩĺĺ ŷōũ ōŵń."],
"4mLBx9": ["Śũƀśćŕĩƥţĩōńś àŕēń'ţ àvàĩĺàƀĺē ŕĩĝĥţ ńōŵ."],
+ "4mbrAq": ["1 ḿĩńũţē"],
"4mp6Tv": ["ŌƥēńĶńōŵĺēďĝē ĺĩśţēď ţĥē ĩńśţàĺĺēď śķĩĺĺś"],
"4niEzY": ["Śàńďƀōxēď ĤŢḾĹ ēḿƀēď — ŵŕĩţē ĤŢḾĹ, śēē ţĥē ŕēńďēŕēď ƥŕēvĩēŵ ĺĩvē."],
"4nj6n8": ["/àƥĩ/ćōńƒĩĝ ŕēţũŕńēď ĤŢŢƤ ", ["code"]],
@@ -384,11 +385,6 @@
"4uNLmk": ["Ƥũĺĺĩńĝ"],
"4v2Yyz": ["Śēĺēćţ ēvēŕŷ vĩśĩƀĺē ƒĩĺē-ţŕēē ŕōŵ ŵĥēń ƒōćũś ĩś ĩń ţĥē Ƒĩĺēś śĩďēƀàŕ."],
"4xtLTl": ["Ĥĩďďēń ƒōĺďēŕ “", ["basename"], "”"],
- "4zEZS5": [
- "Àũţō-śŷńć ĩś ōń ƒōŕ ţĥĩś ŵōŕķţŕēē, ĩńĥēŕĩţēď ƒŕōḿ ",
- ["project"],
- ". Ćĥàńĝē ĩţ ĩń Śēţţĩńĝś → Śŷńć."
- ],
"4zGlN_": ["Ƥàśţē ĩḿàĝē ŨŔĹ ōŕ ćĺĩćķ ũƥĺōàď"],
"4z_1j2": ["Ŕēńďēŕēď"],
"5-FeN2": ["Śĥàŕē ŨŔĹ"],
@@ -456,6 +452,7 @@
],
"5hFl0U": ["Ćōƥŷ ŕēƒēŕēńćē"],
"5jEnaB": ["Ńōţ àvàĩĺàƀĺē ōń ţĥĩś ƥĺàţƒōŕḿ"],
+ "5k0NLb": ["Ŕēvĩēŵ"],
"5kWklo": ["(śōḿē ḿàŷ àĺŕēàďŷ ƀē ĥĩďďēń ƀŷ ōţĥēŕ ŕũĺēś)"],
"5lWFkC": ["Śĩĝń ĩń"],
"5mksg0": ["Ƒàĩĺēď ţō ďĩśàƀĺē śēḿàńţĩć śēàŕćĥ — ", ["detail"]],
@@ -490,6 +487,7 @@
"Ćōḿḿàńďś ŕũń ŵĩţĥ ţĥē ƒũĺĺ àććēśś ōƒ ŷōũŕ ũśēŕ àććōũńţ ōń ţĥĩś ḿàćĥĩńē. Ţũŕń ţĥĩś ōƒƒ ţō ďĩśàƀĺē ţĥē śĥēĺĺ."
],
"6Aih4U": ["Ōƒƒĺĩńē"],
+ "6EoD0z": ["Ŕēśōĺvē ĩń ţēŕḿĩńàĺ"],
"6FCixu": ["Ŕēōƥēń à ƥàśţ ćĥàţ"],
"6HCOwA": ["Ƒàĩĺēď ţō ōƥēń."],
"6KCH4m": ["Ĥĩďďēń ƒĩĺēś"],
@@ -547,6 +545,11 @@
"6u9LvN": [["days", "plural", { "one": ["#", " ďàŷ àĝō"], "other": ["#", " ďàŷś àĝō"] }]],
"6ur2Mk": ["Ĥēĺƥ ŷōũŕ àĝēńţś ďĩśćōvēŕ àńď ũśē ŌƥēńĶńōŵĺēďĝē ĩń àńŷ ƥŕōĴēćţ."],
"6vEr3W": ["Ĺĩńķ ţàŕĝēţ"],
+ "6xPJIj": [
+ "Śŷńć ĩś śēţ ţō Ḿàńũàĺ ƒōŕ ţĥĩś ŵōŕķţŕēē, ĩńĥēŕĩţēď ƒŕōḿ ",
+ ["project"],
+ ". Ćĥàńĝē ĩţ ĩń Śēţţĩńĝś → Śŷńć."
+ ],
"6xeZX9": ["Ēďĩţś àƥƥĺŷ ĺĩvē. Ĺĩĝĥţ ōŕ ďàŕķ ćōḿēś ƒŕōḿ ţĥē ţĥēḿē."],
"6zzhQL": ["Śēńď ŷōũŕ ŕēƥōŕţ ƀŷ ēḿàĩĺ"],
"72xhRD": ["Ďĩàĝŕàḿ vĩēŵ ḿōďē"],
@@ -689,7 +692,6 @@
"8qgfac": ["ḾĆƤ śēŕvēŕś"],
"8rZ1pk": ["Ēńàƀĺē ", ["id"]],
"8ruqQi": ["ßŕōķēń ĩńţēŕńàĺ ĺĩńķś"],
- "8sMErm": ["Ēńàƀĺē Ƒōĺĺōŵ?"],
"8t9CRE": ["Śţàŕţĩńĝ ", ["agentName"], "…"],
"8t9T3-": ["Ńō śķĩĺĺś ƒōũńď."],
"8tjQCz": ["Ēxƥĺōŕē"],
@@ -743,6 +745,7 @@
["0", "plural", { "one": ["Ĩńśţàĺĺ ", "#", " śķĩĺĺ"], "other": ["Ĩńśţàĺĺ ", "#", " śķĩĺĺś"] }]
],
"9Y6cCI": ["Ƒàĩĺēď ţō ĺōàď ƥàĝēś"],
+ "9ZxzfT": [["count"], " àĥēàď"],
"9_2oe6": [
"Ţũŕń ",
["0"],
@@ -822,11 +825,6 @@
"AVW-K9": ["Ƒàĩĺēď ţō ĺōàď ōŕƥĥàń ƥàĝēś"],
"AWOSPo": ["Źōōḿ ĩń"],
"AYoYhU": ["Ũƥďàţē ƒàĩĺēď: ", ["0"]],
- "AaaESH": [
- "Àũţō-śŷńć ĩś ōƒƒ ƒōŕ ţĥĩś ŵōŕķţŕēē, ĩńĥēŕĩţēď ƒŕōḿ ",
- ["project"],
- ". Ćĥàńĝē ĩţ ĩń Śēţţĩńĝś → Śŷńć."
- ],
"AcK_r0": ["Ćĺàũďē ĆĹĨ"],
"AczYxH": ["Ćũśţōḿ ōƥēń-ķńōŵĺēďĝē ēńţŕŷ — ńōţ ḿàńàĝēď ƀŷ ŌƥēńĶńōŵĺēďĝē"],
"AdcGcG": ["Àƥƥĺŷĩńĝ ŷōũŕ ćĥàńĝē"],
@@ -901,6 +899,7 @@
"BVkqD9": [
"Ĩńďēx ḿàĩńţēńàńćē ĩś ƥàũśēď ƀēćàũśē àńōţĥēŕ Ĝĩţ àţţŕĩƀũţē ćōńţŕōĺś ĩńďēx.ḿď. Ũƥďàţē .ĝĩţàţţŕĩƀũţēś śō ţĥē śćōƥēď ĩńďēx.ḿď ƥàţĥś ũśē ḿēŕĝē=ũńĩōń, ţĥēń ţŕŷ àĝàĩń."
],
+ "BWTzAb": ["Ḿàńũàĺ"],
"BY-g4_": ["Àďď ƥàţţēŕń"],
"Ba4D2x": ["Ţēḿƥĺàţē ĩḿƥōŕţēď"],
"Bdha5y": ["Ƥũƀĺĩśĥĩńĝ..."],
@@ -934,6 +933,7 @@
],
"C0Ciaj": ["Ĩḿƥōŕţēď àś \"", ["0"], "\" — ţĥē ńàḿē \"", ["1"], "\" ŵàś ţàķēń."],
"C0hoX6": ["Àĺŵàŷś ĩńćĺũďēď"],
+ "C2abof": ["Ũńţŕàćķēď"],
"C3Zc44": ["Ēxƥĺōŕē śķĩĺĺś"],
"C62P6b": ["Ēďĩţōŕ śēĺēćţĩōń"],
"C7PKTv": ["Śēńď ćĥēćķēď ćōḿḿēńţś ţō ćĥàţ"],
@@ -962,9 +962,6 @@
"CTJLpz": ["\"", ["trimmed"], "\" àĺŕēàďŷ ēxĩśţś ĥēŕē"],
"CU3AiE": ["Śŵĩţćĥĩńĝ ƀŕàńćĥēś"],
"CUmCwI": ["Ĩńśēŕţ ŕōŵ ƀēĺōŵ"],
- "CVRM5N": [
- "Ƒōĺĺōŵ ƒēţćĥēś ũƥďàţēś ƒŕōḿ ŷōũŕ ŕēḿōţē ĝĩţ ŕēƥōśĩţōŕŷ àńď ƒàśţ-ƒōŕŵàŕďś ŷōũŕ ćōƥŷ àũţōḿàţĩćàĺĺŷ. Ŷōũŕ ĺōćàĺ ēďĩţś śţàŷ ōń ţĥĩś ćōḿƥũţēŕ àńď àŕē ńēvēŕ ƥũśĥēď."
- ],
"CWjM1r": ["ďōćś ďĩŕēćţĺŷ ĩń ", ["0"], "/"],
"CWzc2T": [
"<0>~/.ōķ/ƀĩń</0> àńď <1>~/.ōķ/ēńv.śĥ</1> śţàŷ ēĩţĥēŕ ŵàŷ — ţĥē àƥƥ àĺŵàŷś ḿàĩńţàĩńś ţĥēḿ."
@@ -1001,6 +998,7 @@
"Ĩń Ĝĩţ ƥŕōĴēćţś, Ōƥēń Ķńōŵĺēďĝē àďďś à śćōƥēď ŕũĺē ţō ţĥē ŕēƥōśĩţōŕŷ-ŕōōţ .ĝĩţàţţŕĩƀũţēś ƒĩĺē śō ćōńćũŕŕēńţ ĩńďēx ćĥàńĝēś ćōḿƀĩńē."
],
"CxVk-w": ["Ćōḿḿēńţ ōń ", ["address"]],
+ "Cz-K13": ["15 ḿĩńũţēś"],
"D-NlUC": ["Śŷśţēḿ"],
"D-Oh1s": ["Ĥōŵ ţō śēţ ũƥ ", ["0"], " (ōƥēńś ĩń ƀŕōŵśēŕ)"],
"D-_B7l": ["Ćōńńēćţēď — ţĥĩś ēńďƥōĩńţ ŕēţũŕńś ", ["0"], "-ďĩḿēńśĩōń vēćţōŕś."],
@@ -1060,7 +1058,6 @@
"DmkTrb": ["Ćōũĺďń’ţ ćŕēàţē ţĥĩś ţĥēḿē. Ţŕŷ àĝàĩń."],
"Dnn2XG": ["Àũţōḿàţĩć"],
"DpjYd6": ["ĵũḿƥ ţō ţĥē àńćĥōŕēď ţēxţ"],
- "DrYM2Z": ["Śŷńć ďĩśàƀĺēď"],
"DsDwR-": [["0", "plural", { "one": ["#", " ēŕŕōŕ"], "other": ["#", " ēŕŕōŕś"] }]],
"DskIkK": ["Śĩĝń-ĩń śţŕēàḿ ēńďēď ŵĩţĥōũţ ćōńƒĩŕḿàţĩōń — ƥĺēàśē ţŕŷ àĝàĩń"],
"DuCPiG": [
@@ -1254,6 +1251,7 @@
"Fqr8BP": ["Ḿũĺţĩ-ƥàĝē ƤĎƑ vĩēŵēŕ ŵĩţĥ ţōōĺƀàŕ ćōńţŕōĺś (ţĥũḿƀńàĩĺś, ƥàĝē ńàv, źōōḿ)."],
"Fqx38P": ["Ŵĥàţ ĝōţ ĩń ţĥē ŵàŷ?"],
"Fr8JGg": ["Źĩƥ ƒĩĺē"],
+ "FsEXax": ["Ţĥàţ ďĩď ńōţ ĝō ţĥŕōũĝĥ. Ćĥēćķ ţĥē śēŕvēŕ ĺōĝś àńď ţŕŷ àĝàĩń."],
"Fsx78O": ["Àďď ţĥē <0>ōķ</0> ćōḿḿàńď ţō ŷōũŕ ţēŕḿĩńàĺ"],
"FvMSms": ["Ŕēńàḿĩńĝ ćĥàńĝēś ţĥē ƒĩĺē ōń ďĩśķ àńď ţĥē ĩď àĝēńţś ũśē ţō ƥĩćķ ţĥĩś ţēḿƥĺàţē."],
"Fx9aOF": ["ŌƥēńĶńōŵĺēďĝē ēďĩţēď à ďōćũḿēńţ"],
@@ -1369,6 +1367,9 @@
"H0WlWQ": ["Ĝŕĩď ōƒ ŕōŵś àńď ćōĺũḿńś ŵĩţĥ à ĥēàďēŕ ŕōŵ."],
"H1TmTu": ["Śţōƥƥēď ƒĩxĩńĝ. Ƒĩĺēś àĺŕēàďŷ ƒĩxēď śţàŷ ƒĩxēď."],
"H3oH0g": ["Ŕēďō"],
+ "H4doZt": [
+ "Śŷńć ĩś ƥàũśēď. Ćōḿḿĩţ ţĥēśē ĺōćàĺ ēďĩţś ţō ćōńţĩńũē, ōŕ śōŕţ ţĥēḿ ōũţ ĩń à ţēŕḿĩńàĺ."
+ ],
"H86f9p": ["Ćōĺĺàƥśē"],
"H8DVOJ": ["Ĩďēńţĩćàĺ ĩń ƀōţĥ — ", ["pick"], " śţĩĺĺ ŕēàďś ţĥēḿ."],
"HAkEqR": ["Ŕēćēńţ ƒĩĺēś"],
@@ -1451,6 +1452,7 @@
"IWGfGF": ["Ćĥēćķĩńĝ ŷōũŕ ĜĩţĤũƀ ćōńńēćţĩōń"],
"IX7-sq": ["Śōḿēţĥĩńĝ ŵēńţ ŵŕōńĝ ōƥēńĩńĝ \"", ["docName"], "\"."],
"IX_uXB": ["ḿŷ-ƒēàţũŕē"],
+ "IXiG0B": ["Àũţō (Ƥũĺĺ àńď Ƥũśĥ)"],
"IYciRC": ["Ţĥàńķś ƒōŕ ţĥē ŕēƥōŕţ!"],
"IajAbS": ["Àďď à śţàŕţēŕ ƥàćķ"],
"If0crP": ["Ōƥēń ŵĩţĥ ÀĨ ", ["targetDisplayName"], ", ", ["hint"]],
@@ -1501,6 +1503,7 @@
"JLzQi_": ["Ćĺōśē ", ["accessibleLabel"]],
"JM_aq-": ["Ũśē àń ĥţţƥś:// ŨŔĹ — ĥţţƥ:// ĩś ōńĺŷ àĺĺōŵēď ƒōŕ ĺōćàĺĥōśţ."],
"JOcPqH": ["ßŕĩńĝ à ŕēḿōţē ŕēƥōśĩţōŕŷ ōńţō ţĥĩś ḿàćĥĩńē."],
+ "JOhCT9": ["Ƥũśĥ ĩńćĺũďēś"],
"JWsZlx": ["Ōƥēń à ƥŕōĴēćţ ţō ēďĩţ."],
"JZ8cO6": ["Ĺĩĝĥţ, ďàŕķ, ōŕ ƒōĺĺōŵ ţĥē ŌŚ."],
"J_jZ5z": [
@@ -1590,6 +1593,9 @@
"KjTmeO": ["Ũƥďàţē ŌƥēńĶńōŵĺēďĝē ţō ōƥēń ţĥĩś śĥàŕē."],
"KkEAud": ["Ćŕēàţē à ƒĩĺē ƒŕōḿ ţĥē ćũŕŕēńţ ďōćũḿēńţ ōŕ ƒōĺďēŕ ćōńţēxţ."],
"KkRyMI": ["Ćōũĺď ńōţ ćĺàśśĩƒŷ ţĥē ḿēŕĝē — ţŕŷ àĝàĩń."],
+ "KmVekT": [
+ "Àũţō (Ƥũĺĺ ōńĺŷ) ƒēţćĥēś ũƥďàţēś ƒŕōḿ ŷōũŕ ŕēḿōţē ĝĩţ ŕēƥōśĩţōŕŷ àńď ƒàśţ-ƒōŕŵàŕďś ŷōũŕ ćōƥŷ àũţōḿàţĩćàĺĺŷ. Ŷōũŕ ĺōćàĺ ēďĩţś śţàŷ ōń ţĥĩś ćōḿƥũţēŕ àńď àŕē ńēvēŕ ƥũśĥēď."
+ ],
"KmydK6": ["ßōĺď"],
"KnoB--": ["Ŵĩĺĺ ƀē śàvēď àś <0>", ["sanitized"], "</0>."],
"KpOJFY": ["Ēńàƀĺē ēxţēŕńàĺ ĺĩńķ ƥŕēvĩēŵś"],
@@ -1597,6 +1603,7 @@
"KsAPaB": ["Ţĥĩś ƀŕàńćĥ ĩś ćĥēćķēď ōũţ ĩń:"],
"KtACeE": ["Ďēƒàũĺţ: <0>", ["0"], "</0>"],
"KujtjC": ["Ƒĩńď"],
+ "KvwJv8": ["Śōḿē ƒĩĺēś àŕē ńōţ ĺĩśţēď — ţĥē ŵōŕķĩńĝ ţŕēē ĥàś ţōō ḿàńŷ ćĥàńĝēś."],
"Kx881F": ["Ŕēśţōŕēď ", ["0"], "."],
"L-rMC9": ["Ŕēśēţ ţō ďēƒàũĺţ"],
"L1BQTH": [["0"], " ĩśń'ţ ĩńśţàĺĺēď ŷēţ — ōƥēńĩńĝ ĩţś ďōŵńĺōàď ƥàĝē."],
@@ -1614,6 +1621,7 @@
"L83DKQ": ["ƤÀŢĤ ĩńśţàĺĺ ƒàĩĺēď: ", ["summary"]],
"L8fKuc": ["Ŕũń ţĥĩś ĩń ŷōũŕ ţēŕḿĩńàĺ"],
"L9Y9Om": ["Ţōƥ ĺĩńķēď ƥàĝēś"],
+ "L9ox9k": ["Ćōũĺďń'ţ ŕēàď ţĥē ŵōŕķĩńĝ ţŕēē. Ćĥēćķ ţĥē śēŕvēŕ ĺōĝś."],
"LAR9ub": ["Ŕēƥĺàćēś ţĥē ēxĩśţĩńĝ ŌƥēńĶńōŵĺēďĝē ēńţŕŷ ĩń ", ["0"]],
"LBv_TR": ["Ćōńvēŕţ ĺōćàţĩōńś ţō śŷḿĺĩńķś"],
"LBwUR6": ["ßŕàńćĥ śŵĩţćĥ ţĩḿēď ōũţ — ţŕŷ ōƥēńĩńĝ ţĥē ", ["targetNoun"], " ḿàńũàĺĺŷ."],
@@ -1637,7 +1645,6 @@
]
],
"LKOLNn": ["Ńō ÀĨ àĝēńţś ĩńśţàĺĺēď"],
- "LNum6A": [["minutes"], " ḿĩń àĝō"],
"LPAv9E": [["days"], "ď àĝō"],
"LQdLio": ["Ńēŵ śćĥēḿà"],
"LQsCPn": ["Ĺōćàĺ ćōḿḿĩţś àŕē ķēēƥĩńĝ ţĥĩś ćōƥŷ ƒŕōḿ ũƥďàţĩńĝ"],
@@ -1724,7 +1731,6 @@
"MCjC9A": ["Ďēĺēţē ", ["deleteDescriptorLabel"]],
"MDBJwN": ["Ĥàŕď ţō ũśē"],
"MDZSJe": ["Ŵĥēń ţĥē àĝēńţ ŕũńś ĩţś śćĥēďũĺēď ŵōŕķ."],
- "MGBNwj": ["Ƥàũśē śŷńć"],
"MGb89P": [
"Ĩńśēŕţ, ďēĺēţē, ḿōvē, ćōƥŷ, àńď ĩńďēńţ śōũŕćē ēďĩţōŕ ĺĩńēś ţĥŕōũĝĥ ĆōďēḾĩŕŕōŕ'ś ďēƒàũĺţ ķēŷḿàƥ."
],
@@ -1733,7 +1739,6 @@
"MIF36T": ["Ćōũĺďń'ţ ŕēśōĺvē ţĥē ƒōŕķ: ", ["0"]],
"MILoeL": ["Śēŕvĩćēś"],
"MJuO1q": ["Ćōńţēxţ ŵĩńďōŵ:"],
- "MKEPCY": ["Ƒōĺĺōŵ"],
"MLVPcm": [["0"], " vēŕśĩōń ", ["1"]],
"MOAoFO": ["Ńō àĝēńţ ƒōĺďēŕś ŷēţ"],
"MPpSAg": ["Ćŕēàţē ńēŵ ƥŕōĴēćţ ƒŕōḿ ", ["selectedPackName"]],
@@ -1796,6 +1801,7 @@
],
"N5rzKJ": ["Ďēĺēţē ", ["0"], " śķĩĺĺś"],
"N6j2JH": ["Ēďĩţ ", ["0"]],
+ "N7Lau6": ["Ćōḿḿĩţ àńď śŷńć"],
"NBdIgR": ["Ćōḿḿēńţ"],
"NErvOX": ["Śàvēď ţō"],
"NEzPEh": ["Ćŕēàţē à ńēŵ ƀŕàńćĥ, ōŕ ćĥēćķ ōũţ àń ēxĩśţĩńĝ ōńē, ĩń ĩţś ōŵń ŵĩńďōŵ."],
@@ -1823,6 +1829,7 @@
"Nay2Yr": ["Ńō àĝēńţś ḿàţćĥ ŷōũŕ śēàŕćĥ."],
"NcUznW": [["0"], ", Ńō ŵōŕķśƥàćē"],
"NcurBF": ["Ƥàń ďōŵń"],
+ "NcwbBM": ["Ƥũĺĺ ƀŕĩńĝś ĩń"],
"NeQ_0G": ["Ŵōŕķ ţĥŕōũĝĥ ţĥēśē ćōḿḿēńţś"],
"NeY1Np": ["Śĺĩďēv ţĩḿēď ōũţ ŵĥĩĺē śţàŕţĩńĝ. Ţŕŷ àĝàĩń."],
"NfraGd": ["Ōţĥēŕ ŵàŷś ţō ĩńśţàĺĺ Śĺĩďēv"],
@@ -1866,6 +1873,7 @@
"O6yEPk": ["Ćŕēàţē à ńēŵ ŌƥēńĶńōŵĺēďĝē ƥŕōĴēćţ ĩń ţĥē ƒōĺďēŕ ōƒ ŷōũŕ ćĥōĩćē."],
"O7_W_a": ["Ōƥēń ŵĩţĥ ÀĨ"],
"O9oQJS": ["Śēńď ŕēƥōŕţ"],
+ "OBdkpo": ["ďēţàćĥēď ĤĒÀĎ"],
"OD0FCX": ["Ĥĩďďēń “", ["basename"], "”"],
"ODGGlj": ["Ƒōĺďēŕ ńàḿē: ", ["detail"]],
"OEEQKT": ["Ĝōōď"],
@@ -1923,6 +1931,7 @@
"Oo_WWc": ["Ńō ƥàĝēś ƒōũńď"],
"Oos8fo": ["Ćōƥŷ ćōḿḿàńď"],
"OplnBG": ["Ḿàńàĝĩńĝ ÀĨ ţōōĺś ĩś ũńàvàĩĺàƀĺē ĩń ţĥĩś ƀũĩĺď."],
+ "OqqecQ": ["30 śēćōńďś"],
"OsSaYm": ["Ćĺōńē ƒàĩĺēď: ", ["title"]],
"OuQezS": ["Àƥƥĺĩēś ŵĥēń ŷōũ ƥĩćķ ţĥĩś ćōńvēŕśàţĩōń ƀàćķ ũƥ"],
"OuY8t9": ["Ōƥēń ĩń ćũŕŕēńţ ƀŕàńćĥ"],
@@ -1957,7 +1966,9 @@
"PBwmDJ": ["Śēàŕćĥĩńĝ ƀŷ ḿēàńĩńĝ"],
"PBxg_E": ["Ńōţ ńōŵ"],
"PCSkw2": ["Śķĩĺĺś"],
+ "PEGxvo": ["5 ḿĩńũţēś"],
"PGPGsL": ["Àďď ďēśćŕĩƥţĩōń"],
+ "PGRnbw": ["Ũƥďàţēś ƒĺōŵ ĩń ƒŕōḿ ŷōũŕ ŕēḿōţē; ŷōũŕ ēďĩţś śţàŷ ōń ţĥĩś ćōḿƥũţēŕ."],
"PHHEuH": ["Ĥĩďē ŕēśōĺvēď ćōḿḿēńţś (", ["0"], ")"],
"PIMM5l": ["Ŷōũ'ŕē śũƀśćŕĩƀēď!"],
"PKLY-1": ["Ōƥēńĩńĝ..."],
@@ -1970,7 +1981,6 @@
"PRgIJh": ["Ćōũĺďń'ţ ũƥďàţē ", ["subRoot"], ": ", ["0"]],
"PRnH8G": ["ōƒ ", ["0"]],
"PTUuoc": ["Ćōũĺďń'ţ ũńḿàŕķ ţĥàţ ćōḿḿēńţ — ĩţ'ś śţĩĺĺ ŵàĩţĩńĝ ţō śēńď."],
- "PTb1Nx": ["Śŷńć ĩś ƥàũśēď. Ţũŕń ĩţ ƀàćķ ōń ţō ŕēśũḿē."],
"PVSwOe": ["Śţēēŕĩńĝ — ŵàĩţĩńĝ ƒōŕ ţĥē ćũŕŕēńţ ŕũń ţō śţōƥ…"],
"PVUn_c": ["Ōƥēń ƒōĺďēŕ"],
"PVggyD": ["Ƒŕōńţḿàţţēŕ śćĥēḿàś"],
@@ -2017,6 +2027,7 @@
"PrWQiT": ["Ḿōvē Ţēŕḿĩńàĺ ţō ŕĩĝĥţ"],
"PrhzDE": ["Ƥàń ũƥ"],
"Pw5PTU": ["Ēxţēŕńàĺ ōŕĩĝĩń"],
+ "PxZCNM": ["Ōũţśĩďē ŵĥàţ Ōƥēń Ķńōŵĺēďĝē ćōḿḿĩţś."],
"Q-DKvr": ["Ĩńśţàĺĺ ƒŕōḿ ", ["source"]],
"Q1mtyd": ["Ĥĩďē śĩďēƀàŕ"],
"Q5fqMz": ["Ćōńńēćţĩōń ēŕŕōŕ — ţŕŷ àĝàĩń"],
@@ -2060,6 +2071,7 @@
" ŵĩţĥ ",
["childCount", "plural", { "one": ["#", " ĩţēḿ"], "other": ["#", " ĩţēḿś"] }]
],
+ "QeREu8": ["Ŕēńàḿēď"],
"QfFBdJ": ["Ţĥē ţēḿƥĺàţē'ś ƒĩĺēńàḿē (ŵĩţĥōũţ `.ḿď`)."],
"Qft6eW": ["Ḿōvē ", ["0"], " ţō Ĝĺōƀàĺ"],
"Qj4RL5": ["Ćōḿƥĺēţēď:"],
@@ -2245,13 +2257,9 @@
"Sr9xtj": ["Ƥĩćķ ƒōĺďēŕś ţĥĩś śćĥēḿà àƥƥĺĩēś ţō"],
"SrOuyg": ["Ďōćũḿēńţ ƥàńēĺś"],
"SvBFYA": ["Ńō ŕēćēńţ ƥŕōĴēćţś"],
- "Sxx_Zz": [
- "Ƒōĺĺōŵ ĩś ōń ƒōŕ ţĥĩś ŵōŕķţŕēē, ĩńĥēŕĩţēď ƒŕōḿ ",
- ["project"],
- ". Ćĥàńĝē ĩţ ĩń Śēţţĩńĝś → Śŷńć."
- ],
"T-654M": ["Ĺōàďĩńĝ ƤĎƑ"],
"T0OVm7": ["Ţĥē ďēƒàũĺţ ƀŕàńćĥ ĩś ƥŕōţēćţēď — ƥũśĥēś ńēēď à ƥũĺĺ ŕēǫũēśţ."],
+ "T1fMJ6": ["Ĥōŵ ōƒţēń ţĥĩś ćōḿƥũţēŕ ƥũĺĺś ćĥàńĝēś ƒŕōḿ ŷōũŕ ŕēḿōţē."],
"T2fvhw": ["Ũńḿàŕķ ēvēŕŷ ćōḿḿēńţ ĩń ", ["0"]],
"T3Mld1": ["Ŵĩńďōŵ"],
"T3j-7o": ["ē.ĝ. Śŵĩţćĥĩńĝ ƥŕōĴēćţś ŵĥĩĺē à śŷńć ŵàś ŕũńńĩńĝ"],
@@ -2299,10 +2307,10 @@
"U2pMtf": ["ţàĝ-ńàḿē"],
"U3IvM5": ["Ƒũĺĺ ĝũĩďē"],
"U3RIJu": ["Ĺōćàĺ ƒĩĺēś"],
- "U4nTfu": ["Ēńàƀĺē Ƒōĺĺōŵ"],
"U5Spo9": ["Ćōńţēńţ ďĩŕēćţōŕŷ ḿũśţ ƀē ĩńśĩďē ţĥē ƥŕōĴēćţ"],
"U6Mdhd": ["Ĺēţ'ś ĝēţ śēţ ũƥ."],
"U6wmNc": ["Śŷńć ƥàũśēď"],
+ "U7Iesw": [["seconds"], " śēćōńďś"],
"U88xbi": ["Ƒàĩĺēď ţō ćŕēàţē ţĥē śćĥēḿà ƒĩĺē"],
"U8CD-l": ["Ćōƥŷ ƒũĺĺ ƥàţĥ, Ńō ŵōŕķśƥàćē"],
"UBv8UK": ["Ďēĺēţē Ƥēŕḿàńēńţĺŷ"],
@@ -2338,9 +2346,6 @@
"URmyfc": ["Ďēţàĩĺś"],
"UTNVyS": ["Śēĺēćţ ţĥē ƒũĺĺ śōũŕćē ďōćũḿēńţ."],
"UTZ97u": ["Śēĺēćţĩōń ḿũśţ ƀē ĩńśĩďē ţĥē ƥŕōĴēćţ"],
- "UVDasf": [
- "Śŷńć ĩś ōƒƒ — ŷōũŕ ēďĩţś śţàŷ ōń ţĥĩś ćōḿƥũţēŕ ũńţĩĺ ŷōũ ćōḿḿĩţ àńď ƥũśĥ ḿàńũàĺĺŷ."
- ],
"UVLlMV": ["Ćōũĺďń'ţ ŕēàćĥ ĜĩţĤũƀ. Ţŕŷ àĝàĩń?"],
"UW2Fg3": [
"Ţĥĩś ƥŕōĴēćţ'ś ŕũńńĩńĝ śēŕvēŕ ďōēśń'ţ śũƥƥōŕţ ĺĩvē ēďĩţĩńĝ. Ŕēśţàŕţ ŌƥēńĶńōŵĺēďĝē ţō ƒĩx."
@@ -2381,6 +2386,7 @@
"UhpfxY": ["Ƥàń ĺēƒţ"],
"UkQGhd": ["Ĥĩďē ŕēƥĺàćē"],
"UlVARL": ["Ēńàƀĺē Śĺĩďēv"],
+ "Uo2Rj7": ["Ēńàƀĺē Àũţō (Ƥũĺĺ àńď Ƥũśĥ)?"],
"Uobeu9": ["Àďďś ţĥē śķĩĺĺ ţō ", ["rootRel"], " — àĺśō ŕēàď ƀŷ ", ["0"]],
"Up2_7p": ["Ćōƥŷ ƒũĺĺ ƥàţĥ"],
"UpCz01": ["Ţĥĩś ďōć"],
@@ -2448,6 +2454,7 @@
"VdXv4D": ["Ćĺōńē ƒŕōḿ ĜĩţĤũƀ"],
"VeVIIk": ["Ĺōàďĩńĝ śķĩĺĺś"],
"Vftef5": ["Ćōḿḿōń ḿàŕķďōŵń ĩśśũēś — ĥàŕď ţàƀś, ĥēàďĩńĝ ĩńćŕēḿēńţś, ĺĩśţ ḿàŕķēŕś, àńď ḿōŕē."],
+ "Vl1H8I": ["Ŕēćōńńēćţ ŕēǫũĩŕēď ţō ķēēƥ śŷńćĩńĝ."],
"Vlc75q": ["Ķēēƥ ƒĩĺē ďēĺēţēď"],
"VmJT51": ["Ĺōàďĩńĝ ŷōũŕ ŕēƥōŕţś"],
"VmXASo": ["(śŷḿĺĩńķ)"],
@@ -2469,6 +2476,7 @@
["rootPath"],
"</0>. Ćĥōōśē à ĺōćàţĩōń ōũţśĩďē ĩţ, ōŕ ōƥēń ţĥàţ ƥŕōĴēćţ ĩńśţēàď."
],
+ "W7mERj": ["Ēńàƀĺē Àũţō (Ƥũĺĺ ōńĺŷ)?"],
"W8vpBM": ["śţàŕţēŕ ƥàćķ"],
"W9NSe0": ["Ćĥēćķĩńĝ ĺĩńķś"],
"W9_Bub": ["Ĺōćàĺ ćĥàńĝēś ōvēŕĺàƥ ŵĩţĥ ĩńćōḿĩńĝ śŷńć"],
@@ -2486,6 +2494,7 @@
" śēĺēćţēď ĩţēḿś? Ƒōĺďēŕś àńď àĺĺ ƒĩĺēś ĩńśĩďē ţĥēḿ ŵĩĺĺ ƀē ďēĺēţēď. Ţĥĩś àćţĩōń ćàńńōţ ƀē ũńďōńē."
],
"WMsoIm": ["Àĺŕēàďŷ śĩĝńēď ĩń?"],
+ "WOfp4H": ["Ƒàĩĺēď ţō ũƥďàţē ţĥē śŷńć ĩńţēŕvàĺ — ", ["detail"]],
"WOr-hW": ["ţōķēńś"],
"WPwDin": ["Ōƥēń ƒōĺďēŕ ōń ďĩśķ"],
"WR0y2O": ["Śĥàŕē ƒōĺďēŕ"],
@@ -2504,6 +2513,7 @@
"Wcv-Zi": ["Ḿàķē ţĥĩś ķńōŵĺēďĝē ƀàśē àvàĩĺàƀĺē àś à Ćĺàũďē Śķĩĺĺ."],
"We7h2I": ["📝 ōŕ àśśēţś/ĩćōń.ƥńĝ"],
"Weq9zb": ["Ĝēńēŕàĺ"],
+ "WfcERq": ["Ńōţĥĩńĝ ţō ćōḿḿĩţ — ŵōŕķĩńĝ ţŕēē ćĺēàń."],
"Wfy3rU": ["Àĝēńţ śēţţĩńĝś"],
"Wgmlsw": ["Ƒēţćĥĩńĝ"],
"Wh0im4": ["ēďĩţĩńĝ [[", ["realCurrentDoc"], "]]"],
@@ -2557,7 +2567,6 @@
"XRuL0i": ["Ćŕēàţē ƥàĝē"],
"XSb9HS": ["Ďĩśćàŕď ĺōćàĺ ēďĩţś, ŕēśţōŕē ţĥē ĩńśţàĺĺēď vēŕśĩōń"],
"XT-L4j": ["Ţũŕń ōń àń àĝēńţ ţō ćŕēàţē ŵĩţĥ ÀĨ"],
- "XU0OXn": ["Ēńàƀĺē àũţō-śŷńć"],
"XU5AOg": ["Ĩńƥũţ"],
"XV5sC0": ["Ōƥēń ŵōŕķţŕēē"],
"XW18jo": ["Ƥàĝē ĥēàďĩńĝś ŕēśƥōńśē ďĩď ńōţ ḿàţćĥ śũććēśś śćĥēḿà"],
@@ -2606,6 +2615,7 @@
"Xp7Kq4": ["Àńōţĥēŕ śŷńć ōƥēŕàţĩōń ĩś ĩń ƥŕōĝŕēśś. Ţŕŷ àĝàĩń ĩń à ḿōḿēńţ."],
"Xp94R1": ["Ţŕŷ ōńē ḿōŕē ţĩḿē"],
"XpIZmv": ["Ƒēńćēď ćōďē ƀĺōćķ ŵĩţĥ ḿōńōśƥàćē ţēxţ."],
+ "Xs1kjx": ["Ćĥēćķ ƒōŕ ũƥďàţēś ēvēŕŷ"],
"Xs7IcT": ["Ćōũĺďń'ţ ŕēàćĥ ", ["displayName"], " — ţŕŷ àĝàĩń?"],
"XszXjc": ["Ŕēńàḿēď ţō ", ["0"]],
"XtRoxT": ["Ƥàĝē ", ["pageNumber"]],
@@ -2638,6 +2648,7 @@
"Ĺĩńţ ƥĺũĝĩńś — ŵĥĩćĥ ŕũĺē ƒàḿĩĺĩēś ŕũń àńď ţĥēĩŕ ƥēŕ-ŕũĺē śēţţĩńĝś — àŕē ćōńƒĩĝũŕēď ōń ţĥēĩŕ ōŵń ţàƀ ũńďēŕ Ţĥĩś ƥŕōĴēćţ → Ƥĺũĝĩńś."
],
"YEP3X2": ["Ďēĺēţē à ţàƀĺē ŵĥēń ţĥē àćţĩvē ţàƀĺē ćēĺĺ śēĺēćţĩōń ćōvēŕś ţĥē ƒũĺĺ ţàƀĺē."],
+ "YEzhIr": ["Ƥũĺĺ àńď Ƥũśĥ"],
"YGIi_c": ["Ŕēĩńśţàĺĺ"],
"YGNRB5": ["— ēxćēƥţ"],
"YGt-0e": ["Ŕēàďĩńĝ…"],
@@ -2675,9 +2686,6 @@
"Àƥƥĺĩēś ţō ţĥĩś ƥŕōĴēćţ ōń ţĥĩś ćōḿƥũţēŕ ōńĺŷ. Śţōŕēď ĩń .ōķ/ĺōćàĺ, ńōţ śĥàŕēď vĩà ĝĩţ."
],
"Yp-Hi_": ["Ōƥēń śēţţĩńĝś"],
- "YsEYYS": [
- ["behind", "plural", { "one": ["#", " ćōḿḿĩţ ƀēĥĩńď"], "other": ["#", " ćōḿḿĩţś ƀēĥĩńď"] }]
- ],
"YvwwqC": ["Ŵĥēŕē"],
"YwPUUP": ["Ţĥĩś ƥàćķ ĩś àĺŕēàďŷ śēţ ũƥ ĥēŕē."],
"YxZDGh": [
@@ -2779,7 +2787,6 @@
"ZscwQ0": ["Ćōũĺďń'ţ śŵĩţćĥ ţō Ōńĺŷ ḿē"],
"Zt7Ktx": ["Ţĥē ƥàţĥ ćàń'ţ ĺēàvē ţĥē śķĩĺĺ (ńō . ōŕ ..)"],
"Zue_jx": ["Ŷōũŕ ĜĩţĤũƀ ţōķēń ĩś ḿĩśśĩńĝ ŕēǫũĩŕēď śćōƥēś. Ţŕŷ śĩĝńĩńĝ ĩń àĝàĩń."],
- "Zul8Ry": ["ńēvēŕ"],
"ZvzbDF": ["Àďď ĩţ ďĩŕēćţĺŷ ţō ţĥĩś ƥŕōĴēćţ."],
"ZwpggY": ["ŌƥēńĶńōŵĺēďĝē ŕēàď ţĥē ƥŕōĴēćţ śēţţĩńĝś"],
"_0JUKX": ["ßũĝ ŕēƥōŕţĩńĝ ńēēďś ţĥē ŌƥēńĶńōŵĺēďĝē ďēśķţōƥ àƥƥ."],
@@ -2908,9 +2915,6 @@
"ai40UJ": ["Ńēŵ ƀēśţ · ƥŕēśś <0>Śƥàćē</0> ţō ƥĺàŷ àĝàĩń"],
"aiArms": ["Ŵē ćōũĺďń'ţ ćĺōńē ţĥĩś ŕēƥōśĩţōŕŷ."],
"aiOceC": ["Ēńàƀĺē ĩńďēxēś"],
- "ajHi4O": [
- "Àũţō-śŷńć ĩś ƥàũśēď — ŷōũ ďōń'ţ ĥàvē ƥēŕḿĩśśĩōń ţō ƥũśĥ ţō ţĥĩś ŕēƥō. Śŵĩţćĥ ţō Ƒōĺĺōŵ ţō ķēēƥ ŕēćēĩvĩńĝ ũƥďàţēś."
- ],
"ajz9F8": ["Ćōũĺďń'ţ ĺōàď ćōńƒĺĩćţ ćōńţēńţ ƒōŕ ", ["filePath"], ". Ţŕŷ ŕēĺōàďĩńĝ ţĥē ƥàĝē."],
"ak4LLg": ["Ćĺēàŕ ḿēńũ"],
"akOe4q": [
@@ -2927,7 +2931,6 @@
"arUUsK": ["Ƥŕōďũćţ ũƥďàţēś"],
"ax9kie": ["Ĺĩńķ ƥŕēvĩēŵ śēţţĩńĝś ńōţ ŷēţ ĺōàďēď — ţŕŷ àĝàĩń ĩń à ḿōḿēńţ"],
"axQ1h6": ["Àńŷţĥĩńĝ ŷōũ'ď ĺĩķē ţō àďď? (ōƥţĩōńàĺ)"],
- "az8lvo": ["Ōƒƒ"],
"b18t0_": ["Ćĺōśē ďĩƒƒ"],
"b1FDss": ["Śćŕōĺĺ ţō śţàŕţ"],
"b2ezG_": ["Ķēƥţ ƀōţĥ — \"", ["0"], "\" ĩś ĩţś ōŵń śķĩĺĺ ńōŵ"],
@@ -3011,6 +3014,9 @@
],
"cH0dkG": ["Ĩţ ŵàś ḿĩśśĩńĝ à ƒēàţũŕē Ĩ ńēēďēď"],
"cHhH3i": ["à ŕēǫũĩŕēď ĝĩţ ţōōĺ"],
+ "cIFYZn": [
+ "Ŵĥĩĺē ŷōũ'ŕē śĩĝńēď ōũţ, ũƥďàţēś àŕē ćĥēćķēď àţ ḿōśţ ēvēŕŷ 3 ḿĩńũţēś ŕēĝàŕďĺēśś ōƒ ţĥĩś śēţţĩńĝ."
+ ],
"cIptmH": ["Ĩń ţĥē Ćĺàũďē Ďēśķţōƥ Àƥƥ"],
"cKjLuT": ["(ƥŕōĴēćţ + ũśēŕ)"],
"cLP0Lf": ["Ŕēḿōţē śķĩĺĺ śōũŕćē"],
@@ -3080,6 +3086,8 @@
"ct2kv5": ["Ńō ĥēàďĩńĝś ĩń ", ["pageTarget"]],
"cuA8QW": ["Ōŕĝàńĩźē śƥēćś"],
"cuHhjo": ["Ćŕēàţē & ēďĩţ"],
+ "cyoNqf": ["Ũńḿēŕĝēď"],
+ "czQDKY": ["Ēàćĥ ƥũśĥ ĩś ōńē ćōḿḿĩţ ţō ŷōũŕ ŕēḿōţē."],
"d-GtJt": ["Vĩēŵ ĩń Śōũŕćē Ḿàŕķďōŵń"],
"d1JjXo": [
"Ŷōũŕ ĺōćàĺ ćōƥŷ ōƒ ƀŕàńćĥ <0>",
@@ -3173,6 +3181,9 @@
"eGUbmF": ["Ćōƥŷ śēĺēćţēď ƒĩĺē ōŕ ƒōĺďēŕ"],
"eJitUk": ["Ũƥĺōàď ƒŕōḿ ćōḿƥũţēŕ"],
"eKThTQ": ["Ƒàĩĺēď ţō ŕēōŕďēŕ"],
+ "eNOyTV": [
+ "Ŷōũ ďōń'ţ ĥàvē ƥēŕḿĩśśĩōń ţō ƥũśĥ ţō ţĥĩś ŕēƥō. Àũţō (Ƥũĺĺ ōńĺŷ) ćàń śţĩĺĺ ķēēƥ ŷōũŕ ćōƥŷ ũƥ ţō ďàţē."
+ ],
"eNQGRb": ["Ĩńĺĩńē ĹàŢēX ḿàţĥ ŕēńďēŕēď ŵĩţĥ ĶàŢēX."],
"eNhWUl": ["À ƤŔ ŕēvĩēŵēŕ, à ŕēĺēàśē-ńōţēś ŵŕĩţēŕ, à ďēƥĺōŷ ćĥēćķĺĩśţ..."],
"ePK91l": ["Ēďĩţ"],
@@ -3202,6 +3213,7 @@
"emMrXQ": ["Śēŕvēŕ ŕēţũŕńēď à ḿàĺƒōŕḿēď ďũƥĺĩćàţē ŕēśƥōńśē."],
"emgiet": ["Àũţĥōŕĩţàţĩvē ćōńţēńţ; ḿĩŕŕōŕēď vēŕƀàţĩḿ ēvēŕŷŵĥēŕē ĩţ'ś ŕēƒēŕēńćēď."],
"enPTnx": ["ĺĩńē ", ["displayLine"]],
+ "eolhcI": ["Ŕēàďĩńĝ ŵōŕķĩńĝ ţŕēē"],
"eps54V": ["Ŕēḿōvēď"],
"epuNYK": [
"Ḿàŕķ à ƀĺōćķ àś ţĥē śōũŕćē ōƒ ţŕũţĥ. Ḿĩŕŕōŕś ēĺśēŵĥēŕē ũƥďàţē ĺĩvē àś ŷōũ ēďĩţ ĩţ."
@@ -3209,9 +3221,6 @@
"erenF-": ["Ćàńńōţ ďēĺēţē ƒĩĺēś ŵĩţĥ ũńŕēśōĺvēď ćōńƒĺĩćţś"],
"euGaS0": ["Ćōũĺďń'ţ ŕēàď ", ["fileName"], "."],
"euc6Ns": ["Ďũƥĺĩćàţē"],
- "evHlIg": [
- "Ƒōĺĺōŵ ńēvēŕ ƥũśĥēś ōŕ ćōḿḿĩţś ŷōũŕ ĺōćàĺ ćĥàńĝēś. Ţĥēŷ śţàŷ ōńĺŷ ōń ţĥĩś ḿàćĥĩńē."
- ],
"evs0iw": ["Ţàĝś ḿàţćĥĩńĝ \"", ["tagListQuery"], "\""],
"ewSbS_": ["Śĥēĺĺ śēśśĩōń"],
"ezUmoU": ["Àĺĺōŵēď ēĺēḿēńţ vàĺũēś (ēḿƥţŷ = àńŷ)"],
@@ -3292,7 +3301,6 @@
}
]
],
- "g2Tj8R": ["Ƒũĺĺ"],
"g3UF2V": ["Àććēƥţ"],
"g4WlQK": ["ƤŕōĴēćţ ÀĨ ţōōĺ ḿàńàĝēḿēńţ ĩś ōńĺŷ àvàĩĺàƀĺē ĩń ţĥē ŌƥēńĶńōŵĺēďĝē ďēśķţōƥ àƥƥ."],
"g4XBm0": ["Śḿàĺĺ śēćţĩōń ĥēàďĩńĝ."],
@@ -3308,7 +3316,6 @@
["display"],
". Ţĥàţ ƒōĺďēŕ ƀēćōḿēś à śŷḿĺĩńķ ţō ţĥĩś ōńē, śō ĩţś àĝēńţ ŕēàďś ēvēŕŷţĥĩńĝ ƥĺàćēď ĥēŕē. Ţĥĩś ƒōĺďēŕ śţàŷś ŕēàĺ. Ćōńƒĺĩćţĩńĝ śķĩĺĺś àƀōŕţ ţĥē ḿēŕĝē."
],
- "g85bAo": ["Śŷńćēď ", ["lastSyncedRelative"]],
"g9Nj4l": ["// ńōţē"],
"gAhHu7": ["Àũţō-ƒĩx àƥƥĺĩēś ōńĺŷ ţō ƥŕōƀĺēḿś ŵĩţĥ à ķńōŵń ḿēćĥàńĩćàĺ ƒĩx."],
"gBbxn_": ["Ćĥēćķĩńĝ śĩĝń-ĩń śţàţũś"],
@@ -3380,6 +3387,7 @@
"gwEcOD": ["Ŷōũŕ ĺōćàĺ ćōƥŷ ĩś ƀēĥĩńď."],
"gwykHF": ["Ţĥĩś ďōć ĥàśń'ţ śŷńćēď ţō ĜĩţĤũƀ ŷēţ. Ţĥē ĺĩńķ ŵĩĺĺ ŵōŕķ àƒţēŕ ţĥē ńēxţ śŷńć."],
"gyHDWC": ["Ƒĩx àĺĺ ŵĩţĥ ÀĨ (", ["count"], ")"],
+ "gyYvCN": ["Ƥũśĥ ḿŷ ēďĩţś ēvēŕŷ"],
"h-AdvS": ["Ţĥē ƒōĺďēŕś àńď ţēḿƥĺàţēś àŕē àĺŕēàďŷ ĥēŕē, śō ţĥēŕē'ś ńōţĥĩńĝ ţō àďď."],
"h06R3C": ["Ńō ƥàĝēś àŕē ḿĩśśĩńĝ ōũţĝōĩńĝ ĝŕàƥĥ ĺĩńķś."],
"h16FyT": ["Ĺĩśţś"],
@@ -3455,7 +3463,6 @@
"hwFOFD": ["Śēţţĩńĝś ƒàĩĺēď ţō ĺōàď"],
"hxBHxQ": ["À ĺĩńē ŵĩţĥ à ƒōōţńōţē<0><1>[1]</1></0> àńď à ďēƒĩńĩţĩōń śĥōŵń ƀēĺōŵ."],
"hxEUVJ": ["Ĩńĩţĩàĺĩźē ", ["selectedPackName"]],
- "hxYFzm": ["Ƒũĺĺ śŷńć — ŷōũŕ ćōḿḿĩţś ƥũśĥ àńď ŕēḿōţē ćĥàńĝēś ƥũĺĺ àũţōḿàţĩćàĺĺŷ."],
"hxnF0I": [["0"], " Ƥŕōƥēŕţĩēś"],
"hyCxJY": ["Ōƥēń ţĥàţ ŵōŕķţŕēē ĩńśţēàď"],
"hynz2K": ["Ďōŵńĺōàď śţàŕţēď"],
@@ -3466,7 +3473,6 @@
"i09An-": ["Ŕēśţōŕēď àń ēàŕĺĩēŕ vēŕśĩōń (", ["0"], ")"],
"i1flq_": ["Ŵĩķĩ ĺĩńķ śũĝĝēśţĩōńś"],
"i3f2kh": ["Ńō ḿàţćĥĩńĝ ćōḿḿàńďś."],
- "i6ng22": ["Śŵĩţćĥ ţō Ƒōĺĺōŵ"],
"i92eAT": ["Ŵē'ĺĺ ćŕēàţē à ŕēƥōśĩţōŕŷ àńď śţàŕţ śŷńćĩńĝ — ńō ţēŕḿĩńàĺ ńēēďēď."],
"i94lQe": ["ŌƥēńĶńōŵĺēďĝē ćĥēćķēď ƒōŕ ćōńƒĺĩćţś"],
"i9OyGp": ["Ũńďō ōŕ ŕēďō"],
@@ -3554,11 +3560,11 @@
],
"iqugog": ["Ĩńĩţĩàĺĩźē ƒàĩĺēď: ", ["errorDetail"]],
"irFGwu": ["Ţēḿƥĺàţē ĺĩśţ"],
+ "irnKr_": ["Ũƥďàţēď ", ["updatedRelative"]],
"irrm_E": ["Ŕēḿōvē śēĺēćţĩōń"],
"isRobC": ["Ńēŵ"],
"iuTKci": ["Ńō ēďĩţś ŷēţ."],
"iv452l": ["Ďōćũḿēńţàţĩōń ƒōŕ ", ["0"], " (ōƥēńś ĩń ƀŕōŵśēŕ)"],
- "iy64Li": ["Ƒũĺĺ śŷńć — ŷōũŕ ēďĩţś àŕē ćōḿḿĩţţēď àńď ƥũśĥēď ţō ŷōũŕ ŕēḿōţē àũţōḿàţĩćàĺĺŷ."],
"iycx_A": ["Ƥũśĥĩńĝ"],
"iz1LdD": [
"Ćĥàńĝēď ōũţśĩďē ŌĶ śĩńćē ĩţ ĺàśţ ŵŕōţē ĥēŕē — ţĥē śţàţē śĥōŵń ĩś ŵĥàţ'ś ōń ďĩśķ ńōŵ"
@@ -3606,6 +3612,7 @@
"jSO1X5": ["Ĩńĥēŕĩţēď ţēḿƥĺàţēś ćàń'ţ ƀē ŕēńàḿēď ĥēŕē — ŕēńàḿē ĩţ ĩń ţĥē ƒōĺďēŕ ţĥàţ ōŵńś ĩţ."],
"jSY41h": ["\"", ["docName"], "\" ţōōķ ţōō ĺōńĝ. Ćĥēćķ ŷōũŕ ćōńńēćţĩōń."],
"jTLWxh": ["Ēḿƀēď àń ēxţēŕńàĺ ƥàĝē ĩń àń ĩńĺĩńē ĩƒŕàḿē (ďōćś, ďēḿōś, Ƒĩĝḿà, ĆōďēŚàńďƀōx)."],
+ "jTUxaN": ["Ēńàƀĺē Àũţō (Ƥũĺĺ ōńĺŷ)"],
"jWzDfC": ["Ćĥēćķĩńĝ ŵĥĩćĥ ÀĨ ţōōĺś ŷōũ ĥàvē"],
"jZ_E5M": ["Ƒēţćĥ ƒàĩĺēď — ćĥēćķ ţĥē śēŕvēŕ ĺōĝś ƒōŕ ďēţàĩĺś."],
"j_Z6g7": ["Śĥàŕēď ďēƒàũĺţ"],
@@ -3698,13 +3705,15 @@
"Ƥōĩńţ śēḿàńţĩć śēàŕćĥ àţ àńŷ ŌƥēńÀĨ-ćōḿƥàţĩƀĺē ēḿƀēďďĩńĝś ēńďƥōĩńţ — à śēĺƒ-ĥōśţēď śēŕvēŕ ōŕ àńōţĥēŕ ƥŕōvĩďēŕ. Ţĥē ÀƤĨ ķēŷ àƀōvē ĩś ƒōŕ ŵĥĩćĥēvēŕ ēńďƥōĩńţ ŷōũ śēţ ĥēŕē."
],
"kSiB3X": ["Ćōũĺďń'ţ ḿōvē ţō ", ["trashNoun"]],
- "kUn-CN": ["Śŷńć ōƒƒ"],
"kV2YZv": [
"Ďōń'ţ śēē <0>Śķĩĺĺś</0>? Ēńàƀĺē <1>Śēţţĩńĝś <2/> Ćàƥàƀĩĺĩţĩēś <3/> Ćōďē ēxēćũţĩōń àńď ƒĩĺē ćŕēàţĩōń</1> ƒĩŕśţ."
],
"kVS5tE": ["Ḿàĩńţàĩń ĝēńēŕàţēď ĩńďēxēś ĩń ēvēŕŷ ƒōĺďēŕ?"],
"kVgQUA": ["Ďēĺēţē ţĥĩś ćĥàţ?"],
"kVzuTI": ["Ŕēćōḿḿēńďēď àĝēńţ śķĩĺĺ"],
+ "kXNv8P": [
+ "Àũţō (Ƥũĺĺ ōńĺŷ) ńēvēŕ ƥũśĥēś ōŕ ćōḿḿĩţś ŷōũŕ ĺōćàĺ ćĥàńĝēś. Ţĥēŷ śţàŷ ōńĺŷ ōń ţĥĩś ḿàćĥĩńē."
+ ],
"kYL1lH": ["Àĝēńţ àćţĩvĩţŷ"],
"k_Dqw1": [
[
@@ -3794,6 +3803,7 @@
"lM4c-I": [
"À ƥàţĥ ĩńśĩďē ţĥē śķĩĺĺ — àńŷ ƒōĺďēŕ ŵōŕķś (ē.ĝ. ŕēƒēŕēńćēś/ńōţēś.ḿď). Ƒōĺďēŕś ĩń ţĥē ƥàţĥ àŕē ćŕēàţēď ƒōŕ ŷōũ."
],
+ "lPkjpD": ["Ƥũśĥēď ", ["pushed"]],
"lPzyrU": ["Àĺĺ ĥũńķś ŕēśōĺvēď"],
"lS83Sg": ["Ćōũĺďń’ţ ŕēàćĥ ţĥē ćĺĩƥƀōàŕď."],
"lScd1O": ["Śĺĩďēv ďēćķś ōƥēń ĩń ţĥē ŌƥēńĶńōŵĺēďĝē ďēśķţōƥ àƥƥ ōńĺŷ."],
@@ -4116,6 +4126,7 @@
"pJ7XCo": ["Ţĥĩś ƥàĝē ŕēƒēŕēńćēś ńō ĺōćàĺ ƒĩĺēś ōŕ ĩḿàĝēś."],
"pMPnZv": ["Ďēĺēţēď ", ["deleted"], " śķĩĺĺś"],
"pOo4Aa": ["Ƥĺàĩń ţēxţ"],
+ "pPiV8s": ["Ēńàƀĺē Àũţō (Ƥũĺĺ àńď Ƥũśĥ)"],
"pSimwP": ["Ńēŵ ńàḿē ƒōŕ ţĥē ", ["editor"], " vēŕśĩōń"],
"pTPqMK": ["Ţōĝĝĺē à ƒēńćēď ćōďē ƀĺōćķ."],
"pTyA_t": ["ţàĝś"],
@@ -4181,6 +4192,7 @@
"qAx7xG": ["Ƒĩxēď ƒōĺďēŕ ĩń ćōńţēńţ ŕōōţ"],
"qBi_YG": ["Ĩńśţàĺĺ ŌƥēńĶńōŵĺēďĝē ĩń ŷōũŕ ÀĨ ţōōĺś"],
"qC7PwZ": ["Ƒàĩĺēď ţō ŕēḿōvē ţĥē ƒĩēĺď"],
+ "qD3krc": ["Ńōţĥĩńĝ ḿōvēś ũńţĩĺ ŷōũ àśķ."],
"qEEfPk": ["ßũĝ ŕēƥōŕţ ", ["0"]],
"qEIFZu": ["Ķēŷ ēńďĩńĝ ĩń ", ["keyHint"]],
"qEue6Q": [" ōŕ "],
@@ -4189,6 +4201,9 @@
"qIJIrD": ["Ţēśţĩńĝ"],
"qJSo0_": ["Ŵĥàţ ĩś ţĥē ďĩƒƒēŕēńćē ƀēţŵēēń ćōƥĩēś àńď śŷḿĺĩńķś?"],
"qKMfPp": ["Ĥĩďē śķĩĺĺ ńōďēś"],
+ "qLXJTB": [
+ "Ķēēƥ ţĥĩś ƥŕōĴēćţ ĩń śŷńć ŵĩţĥ ŷōũŕ ĝĩţ ŕēḿōţē. Àũţō (Ƥũĺĺ ōńĺŷ) ƀŕĩńĝś ĩń ũƥďàţēś ŵĩţĥōũţ ƥũśĥĩńĝ; Àũţō (Ƥũĺĺ àńď Ƥũśĥ) śēńďś ŷōũŕ ēďĩţś ţōō. Ţũŕńĩńĝ àũţō-śŷńć ōń ŕēǫũĩŕēś ćōńƒĩŕḿàţĩōń."
+ ],
"qNOgUu": ["Ēďĩţś àţ ţĥē śōũŕćē ĺàńď ĥēŕē — ńō ćōƥŷ-ƥàśţē ďŕĩƒţ."],
"qQi_um": ["Ţĥēḿē ĩḿƥōŕţēď."],
"qRZh7J": ["Ĺēţ Ţàƀ ĺēàvē ţĥē śōũŕćē ēďĩţōŕ ĩńśţēàď ōƒ ĩńďēńţĩńĝ."],
@@ -4204,7 +4219,6 @@
"qXg5W9": ["Ƒĩĺē śàvēś ţō <0>~/Ďōŵńĺōàďś/ōƥēńķńōŵĺēďĝē.śķĩĺĺ</0>."],
"qXsafh": ["Ƥũƀĺĩśĥ ţō ĜĩţĤũƀ"],
"qZv5ZR": ["Ćōńƒĩĝ śĥàŕĩńĝ ţōĝĝĺē ƒàĩĺēď"],
- "q_9EcE": ["Ēńàƀĺē ĝĩţ àũţō-śŷńć?"],
"q_Q1-i": [
[
"count",
@@ -4305,7 +4319,6 @@
["boldName"],
" — à ƀũĩĺţ-ĩń śķĩĺĺ śĥĩƥƥēď ŵĩţĥ Ōƥēń Ķńōŵĺēďĝē. Ĩţ'ś ŕēàď-ōńĺŷ."
],
- "rn7n0G": ["Ŕēśũḿē śŷńć"],
"rnX-1S": ["Ēńàƀĺē ƥĺũĝĩńś"],
"rnrdEX": ["ƥŕĩḿàŕŷ"],
"roAe2K": ["Ĺĩńķ ŨŔĹ"],
@@ -4349,6 +4362,7 @@
"sJK6pq": ["Ƥēŕḿĩśśĩōń ďēńĩēď"],
"sJWhgo": ["Ũńķńōŵń ćōḿƥōńēńţ: ", ["unregisteredComponentName"]],
"sKEgGd": ["Śēńď ţō ćĥàţ"],
+ "sKHiNR": [["count"], " ƀēĥĩńď"],
"sNeKjP": ["Ƒàĩĺēď ţō śţōŕē ţĥē ţōķēń — ţŕŷ àĝàĩń"],
"sOxZaS": ["Ƒàĩĺēď ţō ĺōàď ĝŕàƥĥ"],
"sQoLn0": ["Ǫũĩţ"],
@@ -4372,6 +4386,7 @@
"scyoP9": [
"Ĩńďēx ďōćũḿēńţś ćàŕŕŷ ńō ƒŕōńţḿàţţēŕ, ēxćēƥţ ţĥē ōńē àţ ŷōũŕ ķńōŵĺēďĝē ƀàśē'ś ŕōōţ. Ĺōĝ ďōćũḿēńţś àŕē ńōţ ćōvēŕēď — ŌĶƑ ďōēś ńōţ ćōńśţŕàĩń ţĥēĩŕ ƒŕōńţḿàţţēŕ."
],
+ "sdvHp3": ["Ćĥàńĝēď ĥēŕē àńď ōń ţĥē ŕēḿōţē"],
"se-tU0": ["Ćōũĺď ńōţ ƒĩx ", ["0"], " ōƒ ", ["total"], " ƒĩĺēś."],
"seeS6l": ["Śēţũƥ ŌƥēńĶńōŵĺēďĝē ĩń ţĥĩś ƒōĺďēŕ?"],
"sgmRY8": ["Śķĩƥƥēď ďōŵńĺōàďĩńĝ ", ["0"], "."],
@@ -4387,6 +4402,9 @@
"snrVQ7": ["ƥŕōƀē ƒàĩĺēď"],
"sq4WQH": ["Ũśē ", ["0"], " àś ţĥē ĺĩĝĥţ ţĥēḿē"],
"sqUrlK": ["Ḿũśĩńĝ…"],
+ "srdlOs": [
+ "Àũţō-śŷńć ĩś ƥàũśēď — ŷōũ ďōń'ţ ĥàvē ƥēŕḿĩśśĩōń ţō ƥũśĥ ţō ţĥĩś ŕēƥō. Śŵĩţćĥ ţō Àũţō (Ƥũĺĺ ōńĺŷ) ţō ķēēƥ ŕēćēĩvĩńĝ ũƥďàţēś."
+ ],
"ssk6rl": [
"Ţĥē śķĩĺĺ'ś ōŵń ƒōĺďēŕ (",
["path"],
@@ -4406,12 +4424,12 @@
"szy9BS": ["Ũśē ĺōŵēŕćàśē ĺēţţēŕś, ńũḿƀēŕś, àńď ĥŷƥĥēńś ōńĺŷ"],
"t-JXbf": ["Ńōţĩōń-śţŷĺē ĩńĺĩńē ŕōŵ ƒōŕ à ďōŵńĺōàďàƀĺē ƒĩĺē. Ďŕàĝ-ďŕōƥ àĺśō ŵōŕķś."],
"t18QYR": ["Ũńƥĩń ", ["accessibleLabel"]],
- "t2TkQ3": ["Śŷńć ƥàũśēď — ŕēśōĺvē ćōńƒĺĩćţś ţō ŕēśũḿē."],
"t4sFKC": [
"Ńēŵ ƀŕàńćĥ <0>",
["trimmed"],
"</0> ŵĩĺĺ ƀē ćŕēàţēď ƒŕōḿ ţĥē ćũŕŕēńţ ćōḿḿĩţ, ĩń ĩţś ōŵń ŵōŕķţŕēē ũńďēŕ <1>.ōķ/ŵōŕķţŕēēś/</1>."
],
+ "t5I7P_": ["Ńōţĥĩńĝ ḿōvēś ũńţĩĺ ŷōũ àśķ — ƥũĺĺ àńď ƥũśĥ ƒŕōḿ ţĥē śŷńć ḿēńũ."],
"t6w1cq": ["Ōƥēń à ƀĺàńķ ēďĩţōŕ ţàƀ."],
"t7YoBO": ["Śēńď ţĥĩś ćōḿḿēńţ"],
"t9Qn8y": ["Ńō àĝēńţś ēńàƀĺēď"],
@@ -4456,6 +4474,7 @@
["alreadyImported"],
" ŵēŕē àĺŕēàďŷ ƥŕēśēńţ)"
],
+ "tlGXxX": ["Àũţō (Ƥũĺĺ ōńĺŷ)"],
"tnG-m6": ["Àũţō-śŷńć ĩś ƥàũśēď — śĩĝń ĩń ţō ŕēśũḿē."],
"toyw51": ["Ḿēŕḿàĩď ďĩàĝŕàḿ ćōńţŕōĺś"],
"tqQBwN": ["Àńŷ śćŕĩƥţś àŕē śĥōŵń ƒōŕ ŕēvĩēŵ, ńēvēŕ ŕũń."],
@@ -4482,6 +4501,7 @@
"u779EG": ["Ũśē àń ĥţţƥ:// ōŕ ĥţţƥś:// ōŕĩĝĩń."],
"u7H-Wn": ["Śĥōŵ ƥàńēĺ (", ["panelShortcutLabel"], ")"],
"u7U_Ij": ["Ĺĩńķ ţĥē śēĺēćţēď ţēxţ, ōŕ ēďĩţ ţĥē ĺĩńķ ũńďēŕ ţĥē ćàŕēţ."],
+ "uAQUqI": ["Śţàţũś"],
"uA_jXp": ["Śŵĩţćĥ àńď ũƥďàţē ƀŕàńćĥ"],
"uBAxNB": ["Ēďĩţōŕ"],
"uCaIdy": ["ĜĩţĤũƀ śĩĝń-ĩń ĩś ḿĩśśĩńĝ ōŕ ēxƥĩŕēď. Ŕēćōńńēćţ ţō ŕēśũḿē śŷńćĩńĝ."],
@@ -4510,9 +4530,6 @@
"Ćōũĺďń'ţ ŕēśţàŕţ ţĥē śēŕvēŕ — ĩţ'ś ŕũńńĩńĝ ũńďēŕ à ďĩƒƒēŕēńţ àććōũńţ. Ŕēśţàŕţ ŷōũŕ ćōḿƥũţēŕ ţō ćĺēàŕ ĩţ, ţĥēń ŕēōƥēń ţĥĩś ƥŕōĴēćţ."
],
"uUCrBv": ["śŷḿĺĩńķ"],
- "uUiiyC": [
- "Ŷōũ ďōń'ţ ĥàvē ƥēŕḿĩśśĩōń ţō ƥũśĥ ţō ţĥĩś ŕēƥō. Ƒōĺĺōŵ ćàń śţĩĺĺ ķēēƥ ŷōũŕ ćōƥŷ ũƥ ţō ďàţē."
- ],
"uVbUP8": ["Śēţţĩńĝś…"],
"uY5Z7P": ["Ĝàḿē ōvēŕ · ƥŕēśś <0>Śƥàćē</0> ţō ƥĺàŷ àĝàĩń"],
"uYZTcW": ["Ţĥĩś ĜĩţĤũƀ ŨŔĹ ćàń'ţ ƀē śĥàŕēď."],
@@ -4558,6 +4575,7 @@
"v15iQB": [
"Ţĥē àţţēśţēď-ćōḿƥũţàţĩōń ćōńţŕàćţ. Ōńĺŷ àƥƥĺĩēś ţō ďōćũḿēńţś ţŷƥēď Àţţēśţēď Ćōḿƥũţàţĩōń, ŵĥēŕē ŌĶƑ ŕēǫũĩŕēś à ŕũńţĩḿē; ōŕďĩńàŕŷ ćōńćēƥţś àŕē ũńàƒƒēćţēď."
],
+ "v16Pzh": ["Śŵĩţćĥ ţō Àũţō (Ƥũĺĺ ōńĺŷ)"],
"v2ZW0K": ["Ēńàƀĺē ţēŕḿĩńàĺ"],
"v2a04T": ["ḿàŕķďōŵńĺĩńţ ŕũĺēś"],
"v41fCm": ["Ƒĩĺē ńōţ ƒōũńď"],
@@ -4576,6 +4594,7 @@
"vF68cg": ["Ƒĩēĺďś"],
"vGQxBT": ["Ũƥďàţēś ƒŕōḿ ţĥē śōũŕćē àƥƥĺŷ àũţōḿàţĩćàĺĺŷ (ũńĺēśś ēďĩţēď ĺōćàĺĺŷ)"],
"vGeNNQ": ["Ćōƥŷ à ƥŕōḿƥţ àńď ƥàśţē ĩţ ĩńţō ŷōũŕ àĝēńţ ţō śēţ ũƥ ŷōũŕ ƥŕōĴēćţ."],
+ "vGjmyl": ["Ďēĺēţēď"],
"vHlhDc": ["Ďōũƀĺē-ćĺĩćķ ţō ēďĩţ"],
"vIxrEk": ["Ƒĩţ ŵĩďţĥ"],
"vLyv1R": ["Ĥĩďē"],
@@ -4626,8 +4645,10 @@
}
]
],
+ "vp5vfW": ["1 ĥōũŕ"],
"vppAju": ["Ŵĥēŕē ńēŵĺŷ àďďēď àţţàćĥḿēńţś àŕē ƥĺàćēď."],
"vqJXNe": ["Ĩńśţàĺĺ ţĥē <0>ōƥēń-ķńōŵĺēďĝē-ďĩśćōvēŕŷ</0> śķĩĺĺ"],
+ "vsFXfP": ["Ƥũśĥ śķĩƥś"],
"vv7kpg": ["Ćàńćēĺĺēď"],
"vvWZnu": ["Ďĩƒƒ ũńàvàĩĺàƀĺē"],
"vwV-kH": ["Ƒĩxĩńĝ ƒĩĺēś śţōƥƥēď ũńēxƥēćţēďĺŷ."],
@@ -4692,6 +4713,11 @@
"wdzBgi": ["Ćōńƒĩĝ śĥàŕĩńĝ ĩś ńōŵ Ōńĺŷ ḿē."],
"weP6me": ["Ćōũĺďń'ţ ĺōàď ďōćś — ţŷƥē @ àĝàĩń ţō ŕēţŕŷ"],
"wgNoIs": ["Śēĺēćţ àĺĺ"],
+ "wk_v1X": [
+ "Śŷńć ĩś śēţ ţō Àũţō (Ƥũĺĺ àńď Ƥũśĥ) ƒōŕ ţĥĩś ŵōŕķţŕēē, ĩńĥēŕĩţēď ƒŕōḿ ",
+ ["project"],
+ ". Ćĥàńĝē ĩţ ĩń Śēţţĩńĝś → Śŷńć."
+ ],
"wlwXUk": [
"Ŷōũ ƥĩćķēď ~/Ďōŵńĺōàďś. Ƒĩĺēś ţĥēŕē àŕē ũśũàĺĺŷ ţŕàńśĩēńţ — ćōńśĩďēŕ à śţàƀĺē ƒōĺďēŕ ĩńśţēàď."
],
@@ -4733,6 +4759,7 @@
"xCdTnb": ["Ćĺōśē ńēŵ ţàƀ"],
"xDBki3": ["Ĥēàďĩńĝ śũĝĝēśţĩōńś"],
"xDEcka": ["Ţĥē ƥŕōvĩďēŕ ĩś ŕàţē-ĺĩḿĩţĩńĝ ţĥĩś ķēŷ. Ţŕŷ àĝàĩń ĩń à ḿōḿēńţ."],
+ "xDKOFk": ["Ĩĝńōŕēď"],
"xEb24l": ["Ĺēţ ũś ƒōĺĺōŵ ũƥ ƀŷ ēḿàĩĺ"],
"xFQRu4": ["Ĩ àĺŕēàďŷ ĥàvē ĩţ ĺōćàĺĺŷ"],
"xG4tb6": ["Ĺōśţ ćōńńēćţĩōń ţō \"", ["docName"], "\"."],
@@ -4744,6 +4771,7 @@
"xOTzt5": ["Ĵũśţ ńōŵ"],
"xSVO3J": ["Ŵĥàţ ĝēţś ćŕēàţēď"],
"xV5sXw": [["0"], "ŵ àĝō"],
+ "xW5AUw": ["Ƥũĺĺēď ", ["pulled"]],
"xWEvuo": ["Àśķ ÀĨ"],
"xWomUD": ["Ũśē ", ["editor"], " vēŕśĩōń"],
"xXo8FT": ["Śàvē ƒàĩĺēď: ", ["error"]],
@@ -4881,6 +4909,7 @@
"zAJzIg": ["Ƥŕōƀĺēḿś ĩń ", ["0"]],
"zAsDLY": ["Ĝŕàƥĥ vĩśũàĺĩźàţĩōń ōƒ ďōćũḿēńţ ĺĩńķś"],
"zBUqvf": ["Śēţ ũƥ ŌƥēńĶńōŵĺēďĝē ĩńţēĝŕàţĩōńś…"],
+ "zBiFZh": ["Ŷōũŕ ēďĩţś àŕē ćōḿḿĩţţēď àńď ƥũśĥēď ţō ŷōũŕ ŕēḿōţē àũţōḿàţĩćàĺĺŷ."],
"zC5jrM": ["Ŵĩĺĺ ƀē ćŕēàţēď àś <0>", ["effective"], "</0>"],
"zD1Nqf": [["count", "plural", { "one": ["#", " ďōć"], "other": ["#", " ďōćś"] }]],
"zFH7iU": ["Ćōũĺďń'ţ ƒũĺĺŷ ćĺēàŕ ńēţŵōŕķ śēţţĩńĝś, ƀũţ ēxƥōśũŕē ĩś ţũŕńĩńĝ ōƒƒ. ", ["0"]],
@@ -4892,6 +4921,7 @@
"zLak8b": ["Àćţĩvàţē ńēŵ ţàƀ"],
"zMmwh4": ["Ƥĩćķ à ţĥēḿē ōŕ ćŕēàţē ŷōũŕ ōŵń."],
"zQBg2C": ["Ḿōvē ţĥē ćũŕŕēńţ ƀĺōćķ ũƥ ōŕ ďōŵń ōńē ƥōśĩţĩōń."],
+ "zWZBPx": ["Ţŷƥē ćĥàńĝēď"],
"zXj1rA": ["Śēàŕćĥ ƀŷ ḿēàńĩńĝ"],
"zYp8Sr": [
"À <0>Ḿōďĩƒĩēď</0> ƀàďĝē ḿàŕķś ŕũĺēś ŷōũŕ ćōńƒĩĝ śēţś ēxƥĺĩćĩţĺŷ — ďĩŕēćţĺŷ, ōŕ ĩńĥēŕĩţēď ţĥŕōũĝĥ <1>ēxţēńďś</1>. Ũńḿàŕķēď ŕũĺēś ķēēƥ ţĥēĩŕ ďēƒàũĺţ śţàţē."
@@ -4932,7 +4962,6 @@
". Ƥĩćķ à ƒōĺďēŕ ćĺōńēď ƒŕōḿ ",
["expectedHost"],
"?"
- ],
- "zz_Wd_": ["Ḿōďē"]
+ ]
}
}
diff --git a/packages/app/src/locales/pseudo/messages.po b/packages/app/src/locales/pseudo/messages.po
index d23ed4bec..548e9eb43 100644
--- a/packages/app/src/locales/pseudo/messages.po
+++ b/packages/app/src/locales/pseudo/messages.po
@@ -517,10 +517,6 @@ msgstr ""
msgid "{basename} — text editor"
msgstr ""
-#: src/components/SyncStatusBadge.tsx
-msgid "{behind, plural, one {# commit behind} other {# commits behind}}"
-msgstr ""
-
#: src/components/SyncStatusBadge.tsx
msgid "{behind} behind"
msgstr ""
@@ -616,6 +612,14 @@ msgstr ""
msgid "{count, plural, one {matches # file} other {matches # files}}"
msgstr ""
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} ahead"
+msgstr ""
+
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} behind"
+msgstr ""
+
#: src/components/SkillBulkDeleteDialog.tsx
msgid "{count} skills"
msgstr ""
@@ -811,14 +815,11 @@ msgstr ""
msgid "{mins, plural, one {# min ago} other {# min ago}}"
msgstr ""
-#: src/components/SyncStatusBadge.tsx
-msgid "{minutes} min ago"
-msgstr ""
-
#: src/components/acp/ThreadHistoryMenu.tsx
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "{minutes}m ago"
msgstr ""
@@ -910,6 +911,10 @@ msgstr ""
msgid "{propPanelDescriptorLabel} Properties"
msgstr ""
+#: src/components/settings/SyncSection.tsx
+msgid "{seconds} seconds"
+msgstr ""
+
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
@@ -1123,6 +1128,26 @@ msgstr ""
msgid "0/0"
msgstr ""
+#: src/components/settings/SyncSection.tsx
+msgid "1 hour"
+msgstr ""
+
+#: src/components/settings/SyncSection.tsx
+msgid "1 minute"
+msgstr ""
+
+#: src/components/settings/SyncSection.tsx
+msgid "15 minutes"
+msgstr ""
+
+#: src/components/settings/SyncSection.tsx
+msgid "30 seconds"
+msgstr ""
+
+#: src/components/settings/SyncSection.tsx
+msgid "5 minutes"
+msgstr ""
+
#: src/components/ImportSkillForm.tsx
msgid "A .zip or .skill archive."
msgstr ""
@@ -1517,6 +1542,7 @@ msgstr ""
#: src/components/PropertyDiffBlock.tsx
#: src/components/SkillDirectoryResult.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Added"
msgstr ""
@@ -1561,11 +1587,13 @@ msgstr ""
msgid "Adds these folders"
msgstr ""
+#: src/components/settings/SyncSection.tsx
#: src/editor/components/PropPanel.tsx
msgid "Advanced"
msgstr ""
#: src/components/ConsentDialogBody.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Advanced settings"
msgstr ""
@@ -1975,6 +2003,24 @@ msgstr ""
msgid "Authorize in browser"
msgstr ""
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull and Push)"
+msgstr ""
+
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull only)"
+msgstr ""
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
+msgstr ""
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) never pushes or commits your local changes. They stay only on this machine."
+msgstr ""
+
#: src/components/settings/TerminalSection.tsx
msgid "Auto-approve settings not yet loaded — try again in a moment"
msgstr ""
@@ -2008,20 +2054,12 @@ msgstr ""
msgid "Auto-save"
msgstr ""
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is off for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr ""
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr ""
-
#: src/components/settings/SyncSection.tsx
msgid "Auto-sync is paused — sign in to resume."
msgstr ""
#: src/components/settings/SyncSection.tsx
-msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Follow to keep receiving updates."
+msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Auto (Pull only) to keep receiving updates."
msgstr ""
#: src/components/AutoSyncEnableWarning.tsx
@@ -2420,9 +2458,14 @@ msgid "Change the embeddings provider?"
msgstr ""
#: src/components/PropertyDiffBlock.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Changed"
msgstr ""
+#: src/components/SyncBlockingChanges.tsx
+msgid "Changed here and on the remote"
+msgstr ""
+
#: src/components/ChangedOutsideBadge.tsx
msgid "changed outside"
msgstr ""
@@ -2447,6 +2490,10 @@ msgstr ""
msgid "Check for updates"
msgstr ""
+#: src/components/settings/SyncSection.tsx
+msgid "Check for updates every"
+msgstr ""
+
#: src/components/AppMenubar.tsx
msgid "Check for updates…"
msgstr ""
@@ -2966,6 +3013,10 @@ msgstr ""
msgid "Comments"
msgstr ""
+#: src/components/SyncBlockingChanges.tsx
+msgid "Commit and sync"
+msgstr ""
+
#: src/components/ShareBranchSwitchDialog.tsx
msgid "Commit or stash changes to switch:"
msgstr ""
@@ -3267,6 +3318,7 @@ msgstr ""
#: src/components/empty-state/CopyablePromptList.tsx
#: src/components/InstallInClaudeDesktopDialog.tsx
+#: src/components/SyncStatusBadge.tsx
#: src/editor/extensions/CodeBlockView.tsx
msgid "Copied"
msgstr ""
@@ -3882,6 +3934,10 @@ msgstr ""
msgid "Couldn't read the comments waiting to send: {0}"
msgstr ""
+#: src/components/SyncStatusBadge.tsx
+msgid "Couldn't read the working tree. Check the server logs."
+msgstr ""
+
#. placeholder {0}: warning.code
#: src/components/settings/SavedThemesTiles.tsx
msgid "Couldn’t read this theme ({0})"
@@ -4455,6 +4511,10 @@ msgstr ""
msgid "Delete this comment"
msgstr ""
+#: src/components/SyncStatusBadge.tsx
+msgid "Deleted"
+msgstr ""
+
#. placeholder {0}: deletedTheme.label
#: src/components/settings/SavedThemesTiles.tsx
msgid "Deleted {0}."
@@ -4550,6 +4610,10 @@ msgstr ""
msgid "Design"
msgstr ""
+#: src/components/SyncStatusBadge.tsx
+msgid "detached HEAD"
+msgstr ""
+
#: src/components/SyncStatusBadge.tsx
msgid "Detached HEAD — checkout a branch to resume"
msgstr ""
@@ -4922,6 +4986,10 @@ msgstr ""
msgid "Each pack scaffolds your project with ready-made folders and templates."
msgstr ""
+#: src/components/settings/SyncSection.tsx
+msgid "Each push is one commit to your remote."
+msgstr ""
+
#: src/components/AppMenubar.tsx
#: src/components/settings/LintingSection.tsx
#: src/components/SkillsTree.tsx
@@ -5170,24 +5238,24 @@ msgstr ""
#: src/components/EnableSyncConfirmDialog.tsx
#: src/components/share-receive-miss-content.tsx
#: src/components/ShareFreshnessWarning.tsx
-msgid "Enable auto-sync"
+msgid "Enable Auto (Pull and Push)"
msgstr ""
-#: src/components/settings/LinkPreviewsSection.tsx
-msgid "Enable external link previews"
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Enable Auto (Pull and Push)?"
msgstr ""
#: src/components/AutoSyncOnboardingDialog.tsx
#: src/components/EnableSyncConfirmDialog.tsx
-msgid "Enable Follow"
+msgid "Enable Auto (Pull only)"
msgstr ""
#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable Follow?"
+msgid "Enable Auto (Pull only)?"
msgstr ""
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable git auto-sync?"
+#: src/components/settings/LinkPreviewsSection.tsx
+msgid "Enable external link previews"
msgstr ""
#: src/components/settings/LintingSection.tsx
@@ -5784,6 +5852,10 @@ msgstr ""
msgid "Failed to update the project sync default — {detail}"
msgstr ""
+#: src/components/settings/SyncSection.tsx
+msgid "Failed to update the sync interval — {detail}"
+msgstr ""
+
#: src/components/FileTree.tsx
msgid "Failed to upload file"
msgstr ""
@@ -6043,28 +6115,6 @@ msgstr ""
msgid "Folder target: {linkTitle}. Click to open the overview."
msgstr ""
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow"
-msgstr ""
-
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow — updates flow in from your remote; your edits stay on this computer."
-msgstr ""
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
-msgstr ""
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Follow is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr ""
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow never pushes or commits your local changes. They stay only on this machine."
-msgstr ""
-
#: src/components/acp/ThreadView.tsx
msgid "Follow the agent's edits"
msgstr ""
@@ -6155,11 +6205,6 @@ msgstr ""
msgid "Frontmatter schemas"
msgstr ""
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Full"
-msgstr ""
-
#: src/components/InstallInClaudeDesktopDialog.tsx
msgid "Full guide"
msgstr ""
@@ -6173,14 +6218,6 @@ msgstr ""
msgid "Full Path"
msgstr ""
-#: src/components/settings/SyncSection.tsx
-msgid "Full sync — your commits push and remote changes pull automatically."
-msgstr ""
-
-#: src/components/SyncStatusBadge.tsx
-msgid "Full sync — your edits are committed and pushed to your remote automatically."
-msgstr ""
-
#: src/components/OkBlobRunner.tsx
msgid "Game over · press <0>Space</0> to play again"
msgstr ""
@@ -6239,6 +6276,7 @@ msgid "Git needs a helper tool (such as git-lfs) that isn't installed or couldn'
msgstr ""
#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Git sync"
msgstr ""
@@ -6616,6 +6654,10 @@ msgstr ""
msgid "How missing project-local documents, files, and images are reported in Problems, editor diagnostics, audits, and agent tools."
msgstr ""
+#: src/components/settings/SyncSection.tsx
+msgid "How often this computer pulls changes from your remote."
+msgstr ""
+
#: src/components/ShareFreshnessWarning.tsx
msgid "How to push manually"
msgstr ""
@@ -6701,6 +6743,10 @@ msgstr ""
msgid "Ignore patterns (raw text)"
msgstr ""
+#: src/components/SyncStatusBadge.tsx
+msgid "Ignored"
+msgstr ""
+
#: src/components/LinksPanel.tsx
msgid "Image {identity}. Go to reference."
msgstr ""
@@ -7297,7 +7343,7 @@ msgid "Keep the name to 64 characters or fewer."
msgstr ""
#: src/components/settings/SyncSection.tsx
-msgid "Keep this project in sync with your git remote. Follow fetches updates without pushing; full sync pushes your commits too. Turning sync on requires confirmation."
+msgid "Keep this project in sync with your git remote. Auto (Pull only) brings in updates without pushing; Auto (Pull and Push) sends your edits too. Turning auto-sync on requires confirmation."
msgstr ""
#: src/lib/pack-copy.ts
@@ -7778,6 +7824,11 @@ msgstr ""
msgid "Managing project AI tools is unavailable in this build."
msgstr ""
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Manual"
+msgstr ""
+
#: src/components/empty-state/use-create-suggestions.ts
msgid "Map the architecture"
msgstr ""
@@ -7916,10 +7967,6 @@ msgstr ""
msgid "Missing theme name"
msgstr ""
-#: src/components/SyncStatusBadge.tsx
-msgid "Mode"
-msgstr ""
-
#: src/components/settings/SearchSection.tsx
msgid "Model"
msgstr ""
@@ -7936,6 +7983,7 @@ msgstr ""
#: src/components/FolderOverview.tsx
#: src/components/settings/markdownlint-rule-browser.tsx
#: src/components/SkillOriginInline.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Modified"
msgstr ""
@@ -8228,10 +8276,6 @@ msgstr ""
msgid "Network settings not yet loaded. Try again in a moment."
msgstr ""
-#: src/components/SyncStatusBadge.tsx
-msgid "never"
-msgstr ""
-
#: src/components/FolderOverview.tsx
#: src/editor/tag-suggestion/TagSuggestionMenu.tsx
msgid "New"
@@ -8846,10 +8890,22 @@ msgstr ""
msgid "nothing ({0} is not a valid pattern)"
msgstr ""
+#: src/components/settings/SyncSection.tsx
+msgid "Nothing moves until you ask — pull and push from the sync menu."
+msgstr ""
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing moves until you ask."
+msgstr ""
+
#: src/components/FolderPropertiesCard.tsx
msgid "Nothing set yet."
msgstr ""
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing to commit — working tree clean."
+msgstr ""
+
#: src/components/BugReportSendToast.tsx
msgid "Nothing was uploaded. The report stays on this computer until you email it to us."
msgstr ""
@@ -8883,10 +8939,6 @@ msgstr ""
msgid "of {totalPages}"
msgstr ""
-#: src/components/settings/SyncSection.tsx
-msgid "Off"
-msgstr ""
-
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Off — external links show only their URL. No requests leave this computer."
msgstr ""
@@ -9641,6 +9693,10 @@ msgstr ""
msgid "Outline"
msgstr ""
+#: src/components/SyncStatusBadge.tsx
+msgid "Outside what Open Knowledge commits."
+msgstr ""
+
#: src/components/SkillCostValue.tsx
msgid "over the {budgetLabel} token budget"
msgstr ""
@@ -9851,10 +9907,6 @@ msgstr ""
msgid "Pattern warnings: {summary}"
msgstr ""
-#: src/components/SyncStatusBadge.tsx
-msgid "Pause sync"
-msgstr ""
-
#: src/components/acp/ThreadView.tsx
msgid "pending"
msgstr ""
@@ -10248,10 +10300,26 @@ msgstr ""
msgid "Pull"
msgstr ""
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull and Push"
+msgstr ""
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull brings in"
+msgstr ""
+
#: src/components/share-receive-miss-content.tsx
msgid "Pull latest changes"
msgstr ""
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled}"
+msgstr ""
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled} · pushed {pushed}"
+msgstr ""
+
#: src/components/share-receive-miss-content.tsx
#: src/components/SyncStatusBadge.tsx
msgid "Pulling"
@@ -10277,10 +10345,26 @@ msgstr ""
msgid "Push failed — check the server logs for details."
msgstr ""
+#: src/components/SyncStatusBadge.tsx
+msgid "Push includes"
+msgstr ""
+
+#: src/components/settings/SyncSection.tsx
+msgid "Push my edits every"
+msgstr ""
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Push skips"
+msgstr ""
+
#: src/lib/share/run-share-action.ts
msgid "Push this branch to GitHub before sharing."
msgstr ""
+#: src/components/SyncStatusBadge.tsx
+msgid "Pushed {pushed}"
+msgstr ""
+
#: src/components/SyncStatusBadge.tsx
msgid "Pushing"
msgstr ""
@@ -10354,6 +10438,10 @@ msgstr ""
msgid "Read-only file in the {name} skill"
msgstr ""
+#: src/components/SyncStatusBadge.tsx
+msgid "Reading working tree"
+msgstr ""
+
#: src/components/acp/working-status.ts
msgid "Reading…"
msgstr ""
@@ -10407,6 +10495,10 @@ msgstr ""
msgid "Reconnect required"
msgstr ""
+#: src/components/SyncStatusBadge.tsx
+msgid "Reconnect required to keep syncing."
+msgstr ""
+
#: src/presence/use-sync-toasts.ts
msgid "Reconnected"
msgstr ""
@@ -10673,6 +10765,10 @@ msgstr ""
msgid "Rename succeeded but the sidebar may be out of date — refresh to resync"
msgstr ""
+#: src/components/SyncStatusBadge.tsx
+msgid "Renamed"
+msgstr ""
+
#. placeholder {0}: docLeaf(descriptor.from)
#. placeholder {1}: docLeaf(descriptor.to)
#: src/components/TimelinePanel.tsx
@@ -10824,7 +10920,6 @@ msgstr ""
#: src/components/CloneDialog.tsx
#: src/components/share-metadata-rows.tsx
#: src/components/SkillPreviewTab.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Repository"
msgstr ""
@@ -10907,6 +11002,10 @@ msgstr ""
msgid "Resolve conflict in your terminal"
msgstr ""
+#: src/components/SyncBlockingChanges.tsx
+msgid "Resolve in terminal"
+msgstr ""
+
#: src/components/FileTree.tsx
msgid "Resolve the conflict on {files} before deleting."
msgstr ""
@@ -11022,10 +11121,6 @@ msgstr ""
msgid "Results capped — this workspace has more files than search can index. A missing file may be a cap artifact, not a typo."
msgstr ""
-#: src/components/SyncStatusBadge.tsx
-msgid "Resume sync"
-msgstr ""
-
#: src/components/acp/ThreadView.tsx
msgid "Resuming the chat"
msgstr ""
@@ -11097,7 +11192,7 @@ msgid "Reverting"
msgstr ""
#: src/components/SyncStatusBadge.tsx
-msgid "Review conflicts"
+msgid "Review"
msgstr ""
#: src/components/ReportBugDialogBody.tsx
@@ -12244,6 +12339,10 @@ msgstr ""
msgid "Small section heading."
msgstr ""
+#: src/components/SyncStatusBadge.tsx
+msgid "Some files are not listed — the working tree has too many changes."
+msgstr ""
+
#: src/components/settings/SavedThemesTiles.tsx
msgid "Some saved themes aren’t shown because the theme folder exceeds the scan limit."
msgstr ""
@@ -12435,6 +12534,10 @@ msgstr ""
msgid "status"
msgstr ""
+#: src/components/SyncStatusBadge.tsx
+msgid "Status"
+msgstr ""
+
#: src/components/SubscribeCard.tsx
#: src/components/SubscribeForm.tsx
msgid "Stay in the loop"
@@ -12582,7 +12685,7 @@ msgid "Switch to a branch to share."
msgstr ""
#: src/components/settings/SyncSection.tsx
-msgid "Switch to Follow"
+msgid "Switch to Auto (Pull only)"
msgstr ""
#: src/components/command-palette-commands.ts
@@ -12622,7 +12725,6 @@ msgid "Symlinks the skill to {path}"
msgstr ""
#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Sync"
msgstr ""
@@ -12631,10 +12733,6 @@ msgstr ""
msgid "Sync & sharing"
msgstr ""
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync disabled"
-msgstr ""
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync failed — check the server logs for details."
msgstr ""
@@ -12643,12 +12741,20 @@ msgstr ""
msgid "Sync is failing. See the sync status for details."
msgstr ""
-#: src/components/settings/SyncSection.tsx
-msgid "Sync is off — your edits stay on this computer until you commit and push manually."
+#: src/components/SyncBlockingChanges.tsx
+msgid "Sync is paused. Commit these local edits to continue, or sort them out in a terminal."
msgstr ""
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync is paused. Turn it back on to resume."
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull and Push) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr ""
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull only) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr ""
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Manual for this worktree, inherited from {project}. Change it in Settings → Sync."
msgstr ""
#: src/components/SyncStatusBadge.tsx
@@ -12660,18 +12766,10 @@ msgstr ""
msgid "Sync now"
msgstr ""
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync off"
-msgstr ""
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync paused"
msgstr ""
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync paused — resolve conflicts to resume."
-msgstr ""
-
#: src/hooks/use-no-push-permission-toast.ts
msgid "Sync paused — you don't have permission to push to this repo"
msgstr ""
@@ -12706,10 +12804,6 @@ msgstr ""
msgid "Synced"
msgstr ""
-#: src/components/SyncStatusBadge.tsx
-msgid "Synced {lastSyncedRelative}"
-msgstr ""
-
#: src/components/TimelinePanel.tsx
msgid "Synced from disk"
msgstr ""
@@ -12933,6 +13027,10 @@ msgstr ""
msgid "That branch is already open in another worktree."
msgstr ""
+#: src/components/SyncBlockingChanges.tsx
+msgid "That did not go through. Check the server logs and try again."
+msgstr ""
+
#: src/comments/reveal-comment.ts
msgid "That document didn't open in time. Try again once it has synced."
msgstr ""
@@ -13968,6 +14066,10 @@ msgstr ""
msgid "Type a query, then press <0>↵</0> to search your pages by meaning."
msgstr ""
+#: src/components/SyncStatusBadge.tsx
+msgid "Type changed"
+msgstr ""
+
#: src/editor/components/CodePreviewEditModal.tsx
msgid "Type to edit; <0>Cmd/Ctrl+Enter</0> saves, <1>Esc</1> cancels."
msgstr ""
@@ -14096,6 +14198,10 @@ msgstr ""
msgid "Unmark every comment in {0}"
msgstr ""
+#: src/components/SyncStatusBadge.tsx
+msgid "Unmerged"
+msgstr ""
+
#: src/editor/slash-command/items.tsx
msgid "Unordered list of items."
msgstr ""
@@ -14136,6 +14242,10 @@ msgstr ""
msgid "Untitled report"
msgstr ""
+#: src/components/SyncStatusBadge.tsx
+msgid "Untracked"
+msgstr ""
+
#: src/components/SyncStatusBadge.tsx
msgid "Up to date"
msgstr ""
@@ -14183,7 +14293,7 @@ msgid "Updated \"{name}\" from {0}"
msgstr ""
#: src/components/SyncStatusBadge.tsx
-msgid "Updated {lastSyncedRelative}"
+msgid "Updated {updatedRelative}"
msgstr ""
#: src/components/FolderTimelineCard.tsx
@@ -14198,6 +14308,11 @@ msgstr ""
msgid "Updates flow in"
msgstr ""
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Updates flow in from your remote; your edits stay on this computer."
+msgstr ""
+
#: src/components/SkillOriginInline.tsx
msgid "Updates from the source apply automatically (unless edited locally)"
msgstr ""
@@ -14650,6 +14765,10 @@ msgstr ""
msgid "Which skill"
msgstr ""
+#: src/components/settings/SyncSection.tsx
+msgid "While you're signed out, updates are checked at most every 3 minutes regardless of this setting."
+msgstr ""
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "Whitespace"
msgstr ""
@@ -14826,7 +14945,7 @@ msgid "You don't have permission to push to this repo."
msgstr ""
#: src/components/settings/SyncSection.tsx
-msgid "You don't have permission to push to this repo. Follow can still keep your copy up to date."
+msgid "You don't have permission to push to this repo. Auto (Pull only) can still keep your copy up to date."
msgstr ""
#: src/components/ShareFreshnessWarning.tsx
@@ -14899,6 +15018,11 @@ msgstr ""
msgid "Your current version is saved first, so this is reversible."
msgstr ""
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Your edits are committed and pushed to your remote automatically."
+msgstr ""
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "Your edits stay on this computer"
msgstr ""
diff --git a/packages/app/src/locales/pt-BR/messages.json b/packages/app/src/locales/pt-BR/messages.json
index 88659f750..27b4f70cd 100644
--- a/packages/app/src/locales/pt-BR/messages.json
+++ b/packages/app/src/locales/pt-BR/messages.json
@@ -37,13 +37,7 @@
"-YV1Uo": ["Padrão ", ["patternNumber"]],
"-bFGPF": ["Próxima alteração"],
"-dNlfM": ["A última edição em ", ["docName"], " foi desfeita"],
- "-f2Ogn": [
- "Mantenha este projeto em sincronia com seu remoto do git. Acompanhar busca atualizações sem enviar; a sincronização completa também envia seus commits. Ligar a sincronização exige confirmação."
- ],
"-g6KIS": ["Link não reconhecido"],
- "-imiMK": [
- "Acompanhar — as atualizações chegam do seu remoto; suas edições ficam neste computador."
- ],
"-kKdCC": [["imported"], " habilidades instaladas a partir de ", ["0"]],
"-kbIAr": ["Links e imagens"],
"-ksoxk": [
@@ -149,7 +143,6 @@
"0wswKc": ["Linha horizontal que separa seções."],
"0xnQ_X": ["As atualizações chegam sozinhas"],
"0xnmlQ": ["Nome do repositório"],
- "0yL--g": ["Revisar os conflitos"],
"0ySP5u": ["As alterações são salvas automaticamente neste tema."],
"0zAhu6": ["todos os documentos"],
"1-flC9": ["Porta do servidor local"],
@@ -189,6 +182,7 @@
"1NgrlY": ["Outras formas de instalar"],
"1QfxQT": ["Dispensar"],
"1RluQD": ["Mostrar substituir"],
+ "1TA-aJ": ["Baixado ", ["pulled"], " · enviado ", ["pushed"]],
"1TNIig": ["Abrir"],
"1Ta7Fd": ["Abrir ", ["basename"]],
"1V17kO": ["Carregando as duas versões"],
@@ -266,6 +260,11 @@
["FULLSCREEN_HUB_LIMIT"],
" resultados."
],
+ "2okwy4": [
+ "A sincronização deste worktree está em Automático (somente Pull), herdada de ",
+ ["project"],
+ ". Altere em Configurações → Sincronização."
+ ],
"2pR7ad": ["Chave de API de embeddings"],
"2q_Q7x": ["Visibilidade"],
"2rLM8r": ["Não deu para iniciar a conversa com o agente — tente de novo."],
@@ -398,7 +397,6 @@
"4A3Yzu": ["Bloco de código"],
"4BITzH": ["Erro:"],
"4CfgPM": ["A pasta do projeto foi criada, mas o git init falhou. Tente de novo."],
- "4DcimZ": ["Atualizado ", ["lastSyncedRelative"]],
"4E9jPa": ["Crie seu primeiro projeto"],
"4EZrJN": ["Regras"],
"4ErgAf": ["OpenKnowledge instalou uma habilidade"],
@@ -430,6 +428,7 @@
"Escolha as habilidades a instalar. Cada uma chega como uma habilidade editável que é sua."
],
"4mLBx9": ["As assinaturas não estão disponíveis agora."],
+ "4mbrAq": ["1 minuto"],
"4mp6Tv": ["OpenKnowledge listou as habilidades instaladas"],
"4niEzY": [
"HTML incorporado em modo isolado — escreva HTML e veja a pré-visualização renderizada ao vivo."
@@ -447,11 +446,6 @@
"Seleciona todas as linhas visíveis da árvore de arquivos quando o foco está na barra lateral Arquivos."
],
"4xtLTl": ["Pasta “", ["basename"], "” oculta"],
- "4zEZS5": [
- "A sincronização automática está ligada neste worktree, herdada de ",
- ["project"],
- ". Altere em Configurações → Sincronização."
- ],
"4zGlN_": ["Cole a URL da imagem ou clique em enviar"],
"4z_1j2": ["Renderizado"],
"5-FeN2": ["URL de compartilhamento"],
@@ -537,6 +531,7 @@
],
"5hFl0U": ["Copiar referência"],
"5jEnaB": ["Indisponível nesta plataforma"],
+ "5k0NLb": ["Revisar"],
"5kWklo": ["(outras regras podem já ocultar alguns)"],
"5lWFkC": ["Entrar"],
"5mksg0": ["Falha ao desativar a busca semântica — ", ["detail"]],
@@ -575,6 +570,7 @@
"Os comandos rodam com todo o acesso da sua conta de usuário nesta máquina. Desative isto para desabilitar o shell."
],
"6Aih4U": ["Offline"],
+ "6EoD0z": ["Resolver no terminal"],
"6FCixu": ["Reabrir um chat anterior"],
"6HCOwA": ["Falha ao abrir."],
"6KCH4m": ["Arquivos ocultos"],
@@ -645,6 +641,11 @@
],
"6ur2Mk": ["Ajude seus agentes a descobrir e usar o OpenKnowledge em qualquer projeto."],
"6vEr3W": ["Destino do link"],
+ "6xPJIj": [
+ "A sincronização deste worktree está em Manual, herdada de ",
+ ["project"],
+ ". Altere em Configurações → Sincronização."
+ ],
"6xeZX9": [
"As alterações são aplicadas imediatamente. O tema define se o modo é claro ou escuro."
],
@@ -797,7 +798,6 @@
"8qgfac": ["Servidores MCP"],
"8rZ1pk": ["Habilitar ", ["id"]],
"8ruqQi": ["Links internos quebrados"],
- "8sMErm": ["Ativar Acompanhar?"],
"8t9CRE": ["Iniciando ", ["agentName"], "…"],
"8t9T3-": ["Nenhuma habilidade encontrada."],
"8tjQCz": ["Explorar"],
@@ -863,6 +863,7 @@
]
],
"9Y6cCI": ["Falha ao carregar as páginas"],
+ "9ZxzfT": [["count"], " à frente"],
"9_2oe6": [
"Transforma ",
["0"],
@@ -953,11 +954,6 @@
"AVW-K9": ["Falha ao carregar as páginas órfãs"],
"AWOSPo": ["Aproximar"],
"AYoYhU": ["Falha na atualização: ", ["0"]],
- "AaaESH": [
- "A sincronização automática está desligada neste worktree, herdada de ",
- ["project"],
- ". Altere em Configurações → Sincronização."
- ],
"AcK_r0": ["Claude CLI"],
"AczYxH": ["Entrada open-knowledge personalizada — não gerenciada pelo OpenKnowledge"],
"AdcGcG": ["Aplicando sua alteração"],
@@ -1042,6 +1038,7 @@
"BVkqD9": [
"A manutenção do índice está pausada porque outro atributo Git controla index.md. Atualize .gitattributes para que os caminhos index.md com escopo usem merge=union e tente novamente."
],
+ "BWTzAb": ["Manual"],
"BY-g4_": ["Adicionar padrão"],
"Ba4D2x": ["Modelo importado"],
"Bdha5y": ["Publicando..."],
@@ -1081,6 +1078,7 @@
],
"C0Ciaj": ["Importado como \"", ["0"], "\" — o nome \"", ["1"], "\" já estava em uso."],
"C0hoX6": ["Sempre incluído"],
+ "C2abof": ["Não rastreado"],
"C3Zc44": ["Explorar habilidades"],
"C62P6b": ["Seleção do editor"],
"C7PKTv": ["Enviar os comentários marcados para o chat"],
@@ -1115,9 +1113,6 @@
"CTJLpz": ["\"", ["trimmed"], "\" já existe aqui"],
"CU3AiE": ["Trocando de ramo"],
"CUmCwI": ["Inserir linha abaixo"],
- "CVRM5N": [
- "Acompanhar busca atualizações do seu repositório git remoto e avança sua cópia automaticamente. Suas edições locais ficam neste computador e nunca são enviadas."
- ],
"CWjM1r": ["documentos diretamente em ", ["0"], "/"],
"CWzc2T": [
"<0>~/.ok/bin</0> e <1>~/.ok/env.sh</1> permanecem de qualquer forma — o app sempre os mantém."
@@ -1156,6 +1151,7 @@
"Em projetos Git, o Open Knowledge adiciona uma regra com escopo ao arquivo .gitattributes na raiz do repositório para combinar alterações simultâneas nos índices."
],
"CxVk-w": ["Comentar em ", ["address"]],
+ "Cz-K13": ["15 minutos"],
"D-NlUC": ["Sistema"],
"D-Oh1s": ["Como configurar ", ["0"], " (abre no navegador)"],
"D-_B7l": ["Conectado — este endpoint devolve vetores de ", ["0"], " dimensões."],
@@ -1227,7 +1223,6 @@
"DmkTrb": ["Não foi possível criar este tema. Tente novamente."],
"Dnn2XG": ["Automático"],
"DpjYd6": ["Ir para o texto ancorado"],
- "DrYM2Z": ["Sincronização desativada"],
"DsDwR-": [
["0", "plural", { "one": ["#", " erro"], "many": ["#", " erros"], "other": ["#", " erros"] }]
],
@@ -1431,6 +1426,7 @@
],
"Fqx38P": ["O que atrapalhou?"],
"Fr8JGg": ["Arquivo zip"],
+ "FsEXax": ["Isso não foi concluído. Verifique os logs do servidor e tente de novo."],
"Fsx78O": ["Adicione o comando <0>ok</0> ao seu terminal"],
"FvMSms": [
"Renomear muda o arquivo no disco e o id que os agentes usam para escolher este modelo."
@@ -1570,6 +1566,9 @@
"H0WlWQ": ["Grade de linhas e colunas com uma linha de cabeçalho."],
"H1TmTu": ["A correção parou. Os arquivos já corrigidos continuam corrigidos."],
"H3oH0g": ["Refazer"],
+ "H4doZt": [
+ "A sincronização está pausada. Faça commit destas edições locais para continuar, ou resolva-as em um terminal."
+ ],
"H86f9p": ["Recolher"],
"H8DVOJ": ["Idênticas nas duas: ", ["pick"], " continua lendo."],
"HAkEqR": ["Arquivos recentes"],
@@ -1672,6 +1671,7 @@
"IWGfGF": ["Verificando sua conexão com o GitHub"],
"IX7-sq": ["Algo deu errado ao abrir \"", ["docName"], "\"."],
"IX_uXB": ["meu-recurso"],
+ "IXiG0B": ["Automático (Pull e Push)"],
"IYciRC": ["Obrigado pelo relatório!"],
"IajAbS": ["Adicionar um pacote inicial"],
"If0crP": ["Abrir com a IA ", ["targetDisplayName"], ", ", ["hint"]],
@@ -1736,6 +1736,7 @@
"JLzQi_": ["Fechar ", ["accessibleLabel"]],
"JM_aq-": ["Use uma URL https:// — http:// só é aceito para localhost."],
"JOcPqH": ["Traga um repositório remoto para este computador."],
+ "JOhCT9": ["O Push inclui"],
"JWsZlx": ["Abra um projeto para editar."],
"JZ8cO6": ["Claro, escuro ou seguir o sistema."],
"J_jZ5z": [
@@ -1829,6 +1830,9 @@
"KjTmeO": ["Atualize o OpenKnowledge para abrir este compartilhamento."],
"KkEAud": ["Cria um arquivo a partir do documento ou da pasta atual."],
"KkRyMI": ["Não foi possível classificar a mesclagem. Tente novamente."],
+ "KmVekT": [
+ "Automático (somente Pull) busca atualizações do seu repositório git remoto e avança sua cópia automaticamente. Suas edições locais ficam neste computador e nunca são enviadas."
+ ],
"KmydK6": ["Negrito"],
"KnoB--": ["Será salvo como <0>", ["sanitized"], "</0>."],
"KpOJFY": ["Ativar a pré-visualização de links externos"],
@@ -1838,6 +1842,7 @@
"KsAPaB": ["Este ramo está extraído em:"],
"KtACeE": ["Padrão: <0>", ["0"], "</0>"],
"KujtjC": ["Buscar"],
+ "KvwJv8": ["Alguns arquivos não estão listados: a árvore de trabalho tem alterações demais."],
"Kx881F": [["0"], " foi restaurado."],
"L-rMC9": ["Redefinir para o padrão"],
"L1BQTH": [["0"], " ainda não está instalado — abrindo sua página de download."],
@@ -1855,6 +1860,7 @@
"L83DKQ": ["A instalação no PATH falhou: ", ["summary"]],
"L8fKuc": ["Rode isto no seu terminal"],
"L9Y9Om": ["Páginas mais ligadas"],
+ "L9ox9k": ["Não foi possível ler a árvore de trabalho. Verifique os logs do servidor."],
"LAR9ub": ["Substitui a entrada existente do OpenKnowledge em ", ["0"]],
"LBv_TR": ["Converter os locais em links simbólicos"],
"LBwUR6": ["A troca de ramo expirou — tente abrir ", ["targetNoun"], " manualmente."],
@@ -1879,7 +1885,6 @@
]
],
"LKOLNn": ["Nenhum agente de IA instalado"],
- "LNum6A": ["há ", ["minutes"], " min"],
"LPAv9E": ["há ", ["days"], " d"],
"LQdLio": ["Novo esquema"],
"LQsCPn": ["Commits locais estão impedindo esta cópia de atualizar"],
@@ -1986,7 +1991,6 @@
"MCjC9A": ["Excluir ", ["deleteDescriptorLabel"]],
"MDBJwN": ["Difícil de usar"],
"MDZSJe": ["Quando o agente roda o trabalho agendado dele."],
- "MGBNwj": ["Pausar a sincronização"],
"MGb89P": [
"Insere, exclui, move, copia e recua linhas do editor de código pelo mapa de teclas padrão do CodeMirror."
],
@@ -1995,7 +1999,6 @@
"MIF36T": ["Não deu para resolver a bifurcação: ", ["0"]],
"MILoeL": ["Serviços"],
"MJuO1q": ["Janela de contexto:"],
- "MKEPCY": ["Acompanhar"],
"MLVPcm": [["0"], " versão ", ["1"]],
"MOAoFO": ["Ainda não há pastas de agentes"],
"MPpSAg": ["Criar novo projeto a partir de ", ["selectedPackName"]],
@@ -2060,6 +2063,7 @@
],
"N5rzKJ": ["Excluir ", ["0"], " habilidades"],
"N6j2JH": ["Editar ", ["0"]],
+ "N7Lau6": ["Fazer commit e sincronizar"],
"NBdIgR": ["Comentar"],
"NErvOX": ["Salvo em"],
"NEzPEh": ["Crie um novo ramo, ou extraia um existente, em uma janela própria."],
@@ -2089,6 +2093,7 @@
"Nay2Yr": ["Nenhum agente corresponde à sua busca."],
"NcUznW": [["0"], ", sem espaço de trabalho"],
"NcurBF": ["Deslocar para baixo"],
+ "NcwbBM": ["O Pull traz"],
"NeQ_0G": ["Trabalhe sobre estes comentários"],
"NeY1Np": ["O Slidev demorou demais para iniciar. Tente novamente."],
"NfraGd": ["Outras formas de instalar o Slidev"],
@@ -2134,6 +2139,7 @@
"O6yEPk": ["Cria um novo projeto do OpenKnowledge na pasta que você escolher."],
"O7_W_a": ["Abrir com IA"],
"O9oQJS": ["Enviar o relatório"],
+ "OBdkpo": ["HEAD desanexado"],
"OD0FCX": ["“", ["basename"], "” oculto"],
"ODGGlj": ["Nome da pasta: ", ["detail"]],
"OEEQKT": ["Bom"],
@@ -2193,6 +2199,7 @@
"Oo_WWc": ["Nenhuma página encontrada"],
"Oos8fo": ["Copiar comando"],
"OplnBG": ["O gerenciamento de ferramentas de IA não está disponível nesta compilação."],
+ "OqqecQ": ["30 segundos"],
"OsSaYm": ["Falha ao clonar: ", ["title"]],
"OuQezS": ["Aplica-se quando você retomar esta conversa"],
"OuY8t9": ["Abrir no ramo atual"],
@@ -2227,7 +2234,9 @@
"PBwmDJ": ["Buscando por significado"],
"PBxg_E": ["Agora não"],
"PCSkw2": ["Habilidades"],
+ "PEGxvo": ["5 minutos"],
"PGPGsL": ["Adicionar descrição"],
+ "PGRnbw": ["As atualizações chegam do seu remoto; suas edições ficam neste computador."],
"PHHEuH": ["Ocultar comentários resolvidos (", ["0"], ")"],
"PIMM5l": ["Assinatura confirmada!"],
"PKLY-1": ["Abrindo..."],
@@ -2240,7 +2249,6 @@
"PRgIJh": ["Não deu para atualizar ", ["subRoot"], ": ", ["0"]],
"PRnH8G": ["de ", ["0"]],
"PTUuoc": ["Não deu para desmarcar esse comentário — ele continua aguardando envio."],
- "PTb1Nx": ["A sincronização está pausada. Ligue de novo para retomar."],
"PVSwOe": ["Redirecionando — aguardando a execução atual parar…"],
"PVUn_c": ["Abrir pasta"],
"PVggyD": ["Esquemas de frontmatter"],
@@ -2294,6 +2302,7 @@
"PrWQiT": ["Mover o Terminal para a direita"],
"PrhzDE": ["Deslocar para cima"],
"Pw5PTU": ["Origem externa"],
+ "PxZCNM": ["Fora do que o Open Knowledge faz commit."],
"Q-DKvr": ["Instalar a partir de ", ["source"]],
"Q1mtyd": ["Ocultar a barra lateral"],
"Q5fqMz": ["Erro de conexão — tente de novo"],
@@ -2347,6 +2356,7 @@
{ "one": ["#", " item"], "many": ["#", " itens"], "other": ["#", " itens"] }
]
],
+ "QeREu8": ["Renomeado"],
"QfFBdJ": ["O nome do arquivo do modelo (sem `.md`)."],
"Qft6eW": ["Mover ", ["0"], " para Global"],
"Qj4RL5": ["Concluído:"],
@@ -2556,13 +2566,9 @@
"Sr9xtj": ["Escolher as pastas a que este esquema se aplica"],
"SrOuyg": ["Painéis do documento"],
"SvBFYA": ["Nenhum projeto recente"],
- "Sxx_Zz": [
- "Acompanhar está ligado neste worktree, herdado de ",
- ["project"],
- ". Altere em Configurações → Sincronização."
- ],
"T-654M": ["Carregando o PDF"],
"T0OVm7": ["O ramo padrão é protegido — os envios exigem um pull request."],
+ "T1fMJ6": ["Com que frequência este computador traz alterações do seu remoto."],
"T2fvhw": ["Desmarcar todos os comentários de ", ["0"]],
"T3Mld1": ["Janela"],
"T3j-7o": ["ex.: Trocar de projeto enquanto uma sincronização rodava"],
@@ -2620,10 +2626,10 @@
"U2pMtf": ["nome-da-tag"],
"U3IvM5": ["Guia completo"],
"U3RIJu": ["Arquivos locais"],
- "U4nTfu": ["Ativar Acompanhar"],
"U5Spo9": ["O diretório de conteúdo precisa ficar dentro do projeto"],
"U6Mdhd": ["Vamos configurar."],
"U6wmNc": ["Sincronização pausada"],
+ "U7Iesw": [["seconds"], " segundos"],
"U88xbi": ["Falha ao criar o arquivo de esquema"],
"U8CD-l": ["Copiar caminho completo, sem espaço de trabalho"],
"UBv8UK": ["Excluir definitivamente"],
@@ -2667,9 +2673,6 @@
"URmyfc": ["Detalhes"],
"UTNVyS": ["Seleciona o documento de código inteiro."],
"UTZ97u": ["A seleção precisa estar dentro do projeto"],
- "UVDasf": [
- "A sincronização está desligada — suas edições ficam neste computador até você fazer commit e push manualmente."
- ],
"UVLlMV": ["Não deu para contatar o GitHub. Tentar de novo?"],
"UW2Fg3": [
"O servidor em execução deste projeto não suporta edição ao vivo. Reinicie o OpenKnowledge para corrigir."
@@ -2712,6 +2715,7 @@
"UhpfxY": ["Deslocar para a esquerda"],
"UkQGhd": ["Ocultar substituir"],
"UlVARL": ["Ativar Slidev"],
+ "Uo2Rj7": ["Ativar Automático (Pull e Push)?"],
"Uobeu9": ["Adiciona a habilidade a ", ["rootRel"], " — também lida por ", ["0"]],
"Up2_7p": ["Copiar caminho completo"],
"UpCz01": ["Este documento"],
@@ -2809,6 +2813,7 @@
"Vftef5": [
"Problemas comuns de markdown — tabulações, saltos de nível nos títulos, marcadores de lista e mais."
],
+ "Vl1H8I": ["É necessário reconectar para continuar sincronizando."],
"Vlc75q": ["Manter o arquivo excluído"],
"VmJT51": ["Carregando seus relatórios"],
"VmXASo": ["(link simbólico)"],
@@ -2842,6 +2847,7 @@
["rootPath"],
"</0>. Escolha um local fora dele ou abra aquele projeto."
],
+ "W7mERj": ["Ativar Automático (somente Pull)?"],
"W8vpBM": ["pacote inicial"],
"W9NSe0": ["Verificando links"],
"W9_Bub": ["As alterações locais se sobrepõem à sincronização que está chegando"],
@@ -2861,6 +2867,7 @@
" itens selecionados? As pastas e todos os arquivos dentro delas serão excluídos. Esta ação não pode ser desfeita."
],
"WMsoIm": ["Já fez login?"],
+ "WOfp4H": ["Falha ao atualizar o intervalo de sincronização — ", ["detail"]],
"WOr-hW": ["tokens"],
"WPwDin": ["Abrir a pasta no disco"],
"WR0y2O": ["Compartilhar a pasta"],
@@ -2879,6 +2886,7 @@
"Wcv-Zi": ["Deixe esta base de conhecimento disponível como uma habilidade do Claude."],
"We7h2I": ["📝 ou assets/icon.png"],
"Weq9zb": ["Geral"],
+ "WfcERq": ["Nada para commitar: a árvore de trabalho está limpa."],
"Wfy3rU": ["Configurações do agente"],
"Wgmlsw": ["Buscando"],
"Wh0im4": ["editando [[", ["realCurrentDoc"], "]]"],
@@ -2932,7 +2940,6 @@
"XRuL0i": ["Criar página"],
"XSb9HS": ["Descartar as edições locais e restaurar a versão instalada"],
"XT-L4j": ["Ligue um agente para criar com IA"],
- "XU0OXn": ["Ativar a sincronização automática"],
"XU5AOg": ["Entrada"],
"XV5sC0": ["Abrir o worktree"],
"XW18jo": ["A resposta dos títulos da página não corresponde ao esquema de sucesso"],
@@ -2992,6 +2999,7 @@
"Xp7Kq4": ["Outra operação de sincronização está em andamento. Tente de novo em instantes."],
"Xp94R1": ["Tentar mais uma vez"],
"XpIZmv": ["Bloco de código delimitado com texto monoespaçado."],
+ "Xs1kjx": ["Verificar atualizações a cada"],
"Xs7IcT": ["Não foi possível acessar ", ["displayName"], ". Tentar de novo?"],
"XszXjc": ["Renomeado para ", ["0"]],
"XtRoxT": ["Página ", ["pageNumber"]],
@@ -3024,6 +3032,7 @@
"Os plugins de análise — quais famílias de regras rodam e as configurações de cada regra — ficam na aba própria deles, em Este projeto → Plugins."
],
"YEP3X2": ["Exclui uma tabela quando a seleção de células ativa cobre a tabela inteira."],
+ "YEzhIr": ["Pull e Push"],
"YGIi_c": ["Reinstalar"],
"YGNRB5": ["— exceto"],
"YGt-0e": ["Lendo…"],
@@ -3063,17 +3072,6 @@
"Aplica-se a este projeto somente neste computador. Guardado em .ok/local, não compartilhado pelo git."
],
"Yp-Hi_": ["Abrir as configurações"],
- "YsEYYS": [
- [
- "behind",
- "plural",
- {
- "one": ["#", " commit atrás"],
- "many": ["#", " commits atrás"],
- "other": ["#", " commits atrás"]
- }
- ]
- ],
"YvwwqC": ["Onde"],
"YwPUUP": ["Este pacote já está configurado aqui."],
"YxZDGh": [
@@ -3180,7 +3178,6 @@
"ZscwQ0": ["Não deu para mudar para Somente eu"],
"Zt7Ktx": ["O caminho não pode sair da habilidade (sem . ou ..)"],
"Zue_jx": ["Faltam escopos obrigatórios no seu token do GitHub. Tente entrar de novo."],
- "Zul8Ry": ["nunca"],
"ZvzbDF": ["Adicione-o diretamente a este projeto."],
"ZwpggY": ["OpenKnowledge leu as configurações do projeto"],
"_0JUKX": ["Relatar erros exige o app de desktop do OpenKnowledge."],
@@ -3313,9 +3310,6 @@
"ai40UJ": ["Novo recorde · pressione <0>Espaço</0> para jogar de novo"],
"aiArms": ["Não foi possível clonar este repositório."],
"aiOceC": ["Habilitar índices"],
- "ajHi4O": [
- "A sincronização automática está pausada — você não tem permissão para enviar a este repositório. Mude para Acompanhar e continue recebendo atualizações."
- ],
"ajz9F8": [
"Não deu para carregar o conteúdo do conflito de ",
["filePath"],
@@ -3338,7 +3332,6 @@
"As configurações de pré-visualização de links ainda não carregaram — tente de novo em instantes"
],
"axQ1h6": ["Quer acrescentar alguma coisa? (opcional)"],
- "az8lvo": ["Desligado"],
"b18t0_": ["Fechar diferenças"],
"b1FDss": ["Rolar até o início"],
"b2ezG_": ["Os dois foram mantidos — \"", ["0"], "\" agora é uma habilidade própria"],
@@ -3439,6 +3432,9 @@
],
"cH0dkG": ["Faltava um recurso de que eu precisava"],
"cHhH3i": ["uma ferramenta git necessária"],
+ "cIFYZn": [
+ "Enquanto você estiver desconectado, as atualizações são verificadas no máximo a cada 3 minutos, independentemente desta configuração."
+ ],
"cIptmH": ["No app Claude Desktop"],
"cKjLuT": ["(projeto + usuário)"],
"cLP0Lf": ["Fonte remota de habilidades"],
@@ -3517,6 +3513,8 @@
"ct2kv5": ["Nenhum título em ", ["pageTarget"]],
"cuA8QW": ["Organizar as especificações"],
"cuHhjo": ["Criar e editar"],
+ "cyoNqf": ["Sem merge"],
+ "czQDKY": ["Cada push é um commit no seu remoto."],
"d-GtJt": ["Ver no Markdown de origem"],
"d1JjXo": [
"Sua cópia local do ramo <0>",
@@ -3631,6 +3629,9 @@
"eGUbmF": ["Copiar o arquivo ou a pasta selecionados"],
"eJitUk": ["Enviar do computador"],
"eKThTQ": ["Falha ao reordenar"],
+ "eNOyTV": [
+ "Você não tem permissão para fazer push neste repositório. Automático (somente Pull) ainda pode manter sua cópia atualizada."
+ ],
"eNQGRb": ["Fórmula LaTeX em linha renderizada com KaTeX."],
"eNhWUl": [
"Um revisor de PR, um redator de notas de versão, uma lista de verificação de publicação..."
@@ -3674,6 +3675,7 @@
"Conteúdo autoritativo; espelhado literalmente em todo lugar onde for referenciado."
],
"enPTnx": ["linha ", ["displayLine"]],
+ "eolhcI": ["Lendo a árvore de trabalho"],
"eps54V": ["Removido"],
"epuNYK": [
"Marca um bloco como fonte da verdade. Os espelhos em outros lugares se atualizam ao vivo enquanto você o edita."
@@ -3681,9 +3683,6 @@
"erenF-": ["Não é possível excluir arquivos com conflitos não resolvidos"],
"euGaS0": ["Não foi possível ler ", ["fileName"], "."],
"euc6Ns": ["Duplicar"],
- "evHlIg": [
- "Acompanhar nunca envia nem faz commit das suas alterações locais. Elas ficam só neste computador."
- ],
"evs0iw": ["Tags que correspondem a \"", ["tagListQuery"], "\""],
"ewSbS_": ["Sessão de shell"],
"ezUmoU": ["Valores de elemento permitidos (vazio = qualquer)"],
@@ -3781,7 +3780,6 @@
}
]
],
- "g2Tj8R": ["Completo"],
"g3UF2V": ["Aceitar"],
"g4WlQK": [
"O gerenciamento das ferramentas de IA do projeto só está disponível no app de desktop do OpenKnowledge."
@@ -3799,7 +3797,6 @@
["display"],
". Aquela pasta vira um link simbólico para esta, então o agente dela lê tudo o que for colocado aqui. Esta pasta continua real. Habilidades em conflito cancelam a mesclagem."
],
- "g85bAo": ["Sincronizado ", ["lastSyncedRelative"]],
"g9Nj4l": ["// nota"],
"gAhHu7": ["A correção automática só vale para problemas com uma correção mecânica conhecida."],
"gBbxn_": ["Verificando o estado da sessão"],
@@ -3873,6 +3870,7 @@
"Este documento ainda não sincronizou com o GitHub. O link vai funcionar depois da próxima sincronização."
],
"gyHDWC": ["Corrigir tudo com IA (", ["count"], ")"],
+ "gyYvCN": ["Enviar minhas edições a cada"],
"h-AdvS": ["As pastas e os modelos já estão aqui, então não há nada a acrescentar."],
"h06R3C": ["Nenhuma página está sem links de saída no grafo."],
"h16FyT": ["Listas"],
@@ -3952,9 +3950,6 @@
"Uma linha com uma nota de rodapé<0><1>[1]</1></0> e uma definição mostrada abaixo."
],
"hxEUVJ": ["Inicializar ", ["selectedPackName"]],
- "hxYFzm": [
- "Sincronização completa — seus commits são enviados e as alterações remotas são baixadas automaticamente."
- ],
"hxnF0I": ["Propriedades de ", ["0"]],
"hyCxJY": ["Abrir aquele worktree em vez disso"],
"hynz2K": ["Download iniciado"],
@@ -3969,7 +3964,6 @@
"i09An-": ["Uma versão anterior foi restaurada (", ["0"], ")"],
"i1flq_": ["Sugestões de link wiki"],
"i3f2kh": ["Nenhum comando corresponde."],
- "i6ng22": ["Mudar para Acompanhar"],
"i92eAT": ["Vamos criar um repositório e começar a sincronizar — sem precisar de terminal."],
"i94lQe": ["OpenKnowledge verificou se há conflitos"],
"i9OyGp": ["Desfazer ou refazer"],
@@ -4063,13 +4057,11 @@
],
"iqugog": ["Falha na inicialização: ", ["errorDetail"]],
"irFGwu": ["Lista de modelos"],
+ "irnKr_": ["Atualizado ", ["updatedRelative"]],
"irrm_E": ["Remover a seleção"],
"isRobC": ["Novo"],
"iuTKci": ["Ainda não há edições."],
"iv452l": ["Documentação de ", ["0"], " (abre no navegador)"],
- "iy64Li": [
- "Sincronização completa — suas edições recebem commit e são enviadas ao seu remoto automaticamente."
- ],
"iycx_A": ["Fazendo push"],
"iz1LdD": [
"Alterado fora do OK desde a última vez que ele escreveu aqui — o estado exibido é o que está no disco agora"
@@ -4121,6 +4113,7 @@
"jTLWxh": [
"Incorpora uma página externa em um iframe embutido (documentação, demos, Figma, CodeSandbox)."
],
+ "jTUxaN": ["Ativar Automático (somente Pull)"],
"jWzDfC": ["Verificando quais ferramentas de IA você tem"],
"jZ_E5M": ["Falha ao buscar — veja os logs do servidor para os detalhes."],
"j_Z6g7": ["Padrão compartilhado"],
@@ -4213,13 +4206,15 @@
"Aponte a busca semântica para qualquer endpoint de embeddings compatível com a OpenAI — um servidor próprio ou outro provedor. A chave de API acima vale para o endpoint que você definir aqui."
],
"kSiB3X": ["Não foi possível mover para ", ["trashNoun"]],
- "kUn-CN": ["Sincronização desligada"],
"kV2YZv": [
"Não vê <0>Habilidades</0>? Ative antes <1>Configurações <2/> Recursos <3/> Execução de código e criação de arquivos</1>."
],
"kVS5tE": ["Manter índices generated em todas as pastas?"],
"kVgQUA": ["Excluir este chat?"],
"kVzuTI": ["Habilidade recomendada do agente"],
+ "kXNv8P": [
+ "Automático (somente Pull) nunca faz push nem commit das suas alterações locais. Elas ficam somente nesta máquina."
+ ],
"kYL1lH": ["Atividade do agente"],
"k_Dqw1": [
[
@@ -4318,6 +4313,7 @@
"lM4c-I": [
"Um caminho dentro da habilidade — qualquer pasta serve (ex.: references/notes.md). As pastas do caminho são criadas para você."
],
+ "lPkjpD": ["Enviado ", ["pushed"]],
"lPzyrU": ["Todos os trechos resolvidos"],
"lS83Sg": ["Não foi possível acessar a área de transferência."],
"lScd1O": ["Os slides do Slidev abrem apenas no aplicativo de desktop do OpenKnowledge."],
@@ -4667,6 +4663,7 @@
"pJ7XCo": ["Esta página não faz referência a nenhum arquivo ou imagem local."],
"pMPnZv": [["deleted"], " habilidades excluídas"],
"pOo4Aa": ["Texto simples"],
+ "pPiV8s": ["Ativar Automático (Pull e Push)"],
"pSimwP": ["Novo nome para a versão do ", ["editor"]],
"pTPqMK": ["Liga ou desliga um bloco de código delimitado."],
"pTyA_t": ["tags"],
@@ -4742,6 +4739,7 @@
"qAx7xG": ["Pasta fixa na raiz do conteúdo"],
"qBi_YG": ["Instalar o OpenKnowledge nas suas ferramentas de IA"],
"qC7PwZ": ["Falha ao remover o campo"],
+ "qD3krc": ["Nada se move até você pedir."],
"qEEfPk": ["Relatório de erro ", ["0"]],
"qEIFZu": ["Chave terminada em ", ["keyHint"]],
"qEue6Q": [" ou "],
@@ -4750,6 +4748,9 @@
"qIJIrD": ["Testando"],
"qJSo0_": ["Qual é a diferença entre cópias e links simbólicos?"],
"qKMfPp": ["Ocultar os nós de habilidades"],
+ "qLXJTB": [
+ "Mantenha este projeto sincronizado com o seu remoto git. Automático (somente Pull) traz atualizações sem fazer push; Automático (Pull e Push) também envia suas edições. Ativar a sincronização automática exige confirmação."
+ ],
"qNOgUu": ["As edições feitas na fonte chegam aqui — sem desvio por copiar e colar."],
"qQi_um": ["Tema importado."],
"qRZh7J": ["Deixar o Tab sair do editor de código em vez de recuar."],
@@ -4767,7 +4768,6 @@
"qXg5W9": ["O arquivo é salvo em <0>~/Downloads/openknowledge.skill</0>."],
"qXsafh": ["Publicar no GitHub"],
"qZv5ZR": ["Falha ao alternar o compartilhamento de configuração"],
- "q_9EcE": ["Ativar a sincronização automática do git?"],
"q_Q1-i": [
[
"count",
@@ -4877,7 +4877,6 @@
["boldName"],
" — uma habilidade integrada que vem com o Open Knowledge. Ela é somente leitura."
],
- "rn7n0G": ["Retomar a sincronização"],
"rnX-1S": ["Ativar os plugins"],
"rnrdEX": ["principal"],
"roAe2K": ["URL do link"],
@@ -4927,6 +4926,7 @@
"sJK6pq": ["Permissão negada"],
"sJWhgo": ["Componente desconhecido: ", ["unregisteredComponentName"]],
"sKEgGd": ["Enviar para o chat"],
+ "sKHiNR": [["count"], " atrás"],
"sNeKjP": ["Falha ao guardar o token — tente de novo"],
"sOxZaS": ["Falha ao carregar o grafo"],
"sQoLn0": ["Sair"],
@@ -4950,6 +4950,7 @@
"scyoP9": [
"Os documentos de índice não carregam frontmatter, exceto aquele na raiz da sua base de conhecimento. Os documentos de log não são cobertos — OKF não restringe seu frontmatter."
],
+ "sdvHp3": ["Alterados aqui e no remoto"],
"se-tU0": ["Não foi possível corrigir ", ["0"], " de ", ["total"], " arquivos."],
"seeS6l": ["Configurar o OpenKnowledge nesta pasta?"],
"sgmRY8": ["O download de ", ["0"], " foi pulado."],
@@ -4973,6 +4974,9 @@
"snrVQ7": ["a verificação falhou"],
"sq4WQH": ["Usar ", ["0"], " como tema claro"],
"sqUrlK": ["Divagando…"],
+ "srdlOs": [
+ "A sincronização automática está pausada: você não tem permissão para fazer push neste repositório. Mude para Automático (somente Pull) para continuar recebendo atualizações."
+ ],
"ssk6rl": [
"A pasta própria da habilidade (",
["path"],
@@ -4994,12 +4998,12 @@
"Linha embutida no estilo Notion para um arquivo baixável. Arrastar e soltar também funciona."
],
"t18QYR": ["Desafixar ", ["accessibleLabel"]],
- "t2TkQ3": ["Sincronização pausada — resolva os conflitos para retomar."],
"t4sFKC": [
"O novo ramo <0>",
["trimmed"],
"</0> será criado a partir do commit atual, em um worktree próprio dentro de <1>.ok/worktrees/</1>."
],
+ "t5I7P_": ["Nada se move até você pedir: use Pull e Push no menu de sincronização."],
"t6w1cq": ["Abre uma aba de editor em branco."],
"t7YoBO": ["Enviar este comentário"],
"t9Qn8y": ["Nenhum agente ativado"],
@@ -5043,6 +5047,7 @@
["alreadyImported"],
" já estavam presentes)"
],
+ "tlGXxX": ["Automático (somente Pull)"],
"tnG-m6": ["A sincronização automática está pausada — entre na sua conta para retomar."],
"toyw51": ["Controles do diagrama do Mermaid"],
"tqQBwN": ["Os scripts são exibidos para revisão, nunca executados."],
@@ -5075,6 +5080,7 @@
"u779EG": ["Use uma origem http:// ou https://."],
"u7H-Wn": ["Mostrar o painel (", ["panelShortcutLabel"], ")"],
"u7U_Ij": ["Cria um link no texto selecionado ou edita o link sob o cursor."],
+ "uAQUqI": ["Status"],
"uA_jXp": ["Trocar de ramo e atualizar"],
"uBAxNB": ["Editor"],
"uCaIdy": [
@@ -5105,9 +5111,6 @@
"Não deu para reiniciar o servidor — ele está rodando em outra conta. Reinicie o computador para liberá-lo e abra este projeto de novo."
],
"uUCrBv": ["link simbólico"],
- "uUiiyC": [
- "Você não tem permissão para enviar a este repositório. Acompanhar ainda consegue manter sua cópia atualizada."
- ],
"uVbUP8": ["Configurações…"],
"uY5Z7P": ["Fim de jogo · pressione <0>Espaço</0> para jogar de novo"],
"uYZTcW": ["Não é possível compartilhar esta URL do GitHub."],
@@ -5158,6 +5161,7 @@
"v15iQB": [
"O contrato de computação atestada. Aplica-se apenas a documentos digitados Attested Computation, onde OKF requer um runtime; conceitos comuns não são afetados."
],
+ "v16Pzh": ["Mudar para Automático (somente Pull)"],
"v2ZW0K": ["Ativar o terminal"],
"v2a04T": ["Regras do markdownlint"],
"v41fCm": ["Arquivo não encontrado"],
@@ -5182,6 +5186,7 @@
"As atualizações da fonte se aplicam automaticamente (a menos que tenha sido editado localmente)"
],
"vGeNNQ": ["Copie um prompt e cole no seu agente para configurar seu projeto."],
+ "vGjmyl": ["Excluído"],
"vHlhDc": ["Clique duas vezes para editar"],
"vIxrEk": ["Ajustar à largura"],
"vLyv1R": ["Ocultar"],
@@ -5243,8 +5248,10 @@
}
]
],
+ "vp5vfW": ["1 hora"],
"vppAju": ["Onde os anexos recém-adicionados são colocados."],
"vqJXNe": ["Instalar a habilidade <0>open-knowledge-discovery</0>"],
+ "vsFXfP": ["O Push ignora"],
"vv7kpg": ["Cancelado"],
"vvWZnu": ["Diferenças indisponíveis"],
"vwV-kH": ["A correção de arquivos parou inesperadamente."],
@@ -5311,6 +5318,11 @@
"wdzBgi": ["O compartilhamento de configuração agora é Somente eu."],
"weP6me": ["Não deu para carregar os documentos — digite @ de novo para tentar outra vez"],
"wgNoIs": ["Selecionar tudo"],
+ "wk_v1X": [
+ "A sincronização deste worktree está em Automático (Pull e Push), herdada de ",
+ ["project"],
+ ". Altere em Configurações → Sincronização."
+ ],
"wlwXUk": [
"Você escolheu ~/Downloads. Os arquivos de lá costumam ser passageiros — pense em uma pasta mais estável."
],
@@ -5354,6 +5366,7 @@
"xCdTnb": ["Fechar nova aba"],
"xDBki3": ["Sugestões de títulos"],
"xDEcka": ["O provedor está limitando a frequência desta chave. Tente de novo em instantes."],
+ "xDKOFk": ["Ignorado"],
"xEb24l": ["Deixe a gente responder por e-mail"],
"xFQRu4": ["Já tenho isso localmente"],
"xG4tb6": ["A conexão com \"", ["docName"], "\" foi perdida."],
@@ -5365,6 +5378,7 @@
"xOTzt5": ["agora mesmo"],
"xSVO3J": ["O que é criado"],
"xV5sXw": ["há ", ["0"], " sem"],
+ "xW5AUw": ["Baixado ", ["pulled"]],
"xWEvuo": ["Perguntar à IA"],
"xWomUD": ["Usar a versão do ", ["editor"]],
"xXo8FT": ["Falha ao salvar: ", ["error"]],
@@ -5514,6 +5528,7 @@
"zAJzIg": ["Problemas em ", ["0"]],
"zAsDLY": ["Visualização em grafo dos links entre documentos"],
"zBUqvf": ["Configurar as integrações do OpenKnowledge…"],
+ "zBiFZh": ["Suas edições recebem commit e são enviadas ao seu remoto automaticamente."],
"zC5jrM": ["Será criado como <0>", ["effective"], "</0>"],
"zD1Nqf": [
[
@@ -5536,6 +5551,7 @@
"zLak8b": ["Ativar nova aba"],
"zMmwh4": ["Escolha um tema ou crie o seu."],
"zQBg2C": ["Sobe ou desce o bloco atual uma posição."],
+ "zWZBPx": ["Tipo alterado"],
"zXj1rA": ["Buscar por significado"],
"zYp8Sr": [
"O selo <0>Modificada</0> marca as regras que sua configuração define explicitamente — diretamente ou herdadas por <1>extends</1>. As regras sem selo mantêm o estado padrão."
@@ -5578,7 +5594,6 @@
". Escolher uma pasta clonada de ",
["expectedHost"],
"?"
- ],
- "zz_Wd_": ["Modo"]
+ ]
}
}
diff --git a/packages/app/src/locales/pt-BR/messages.po b/packages/app/src/locales/pt-BR/messages.po
index a75fb0dbd..1488b68dd 100644
--- a/packages/app/src/locales/pt-BR/messages.po
+++ b/packages/app/src/locales/pt-BR/messages.po
@@ -517,10 +517,6 @@ msgstr "{ahead} à frente, {behind} atrás"
msgid "{basename} — text editor"
msgstr "{basename} — editor de texto"
-#: src/components/SyncStatusBadge.tsx
-msgid "{behind, plural, one {# commit behind} other {# commits behind}}"
-msgstr "{behind, plural, one {# commit atrás} many {# commits atrás} other {# commits atrás}}"
-
#: src/components/SyncStatusBadge.tsx
msgid "{behind} behind"
msgstr "{behind} atrás"
@@ -616,6 +612,14 @@ msgstr "{count, plural, one {Corrige na hora o # problema que tem correção aut
msgid "{count, plural, one {matches # file} other {matches # files}}"
msgstr "{count, plural, one {corresponde a # arquivo} many {corresponde a # arquivos} other {corresponde a # arquivos}}"
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} ahead"
+msgstr "{count} à frente"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} behind"
+msgstr "{count} atrás"
+
#: src/components/SkillBulkDeleteDialog.tsx
msgid "{count} skills"
msgstr "{count} habilidades"
@@ -811,14 +815,11 @@ msgstr "{localizedMessage} na linha {displayLine}"
msgid "{mins, plural, one {# min ago} other {# min ago}}"
msgstr "{mins, plural, one {há # min} many {há # min} other {há # min}}"
-#: src/components/SyncStatusBadge.tsx
-msgid "{minutes} min ago"
-msgstr "há {minutes} min"
-
#: src/components/acp/ThreadHistoryMenu.tsx
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "{minutes}m ago"
msgstr "há {minutes} min"
@@ -910,6 +911,10 @@ msgstr "{propertyCount, plural, one {# propriedade} many {# propriedades} other
msgid "{propPanelDescriptorLabel} Properties"
msgstr "Propriedades de {propPanelDescriptorLabel}"
+#: src/components/settings/SyncSection.tsx
+msgid "{seconds} seconds"
+msgstr "{seconds} segundos"
+
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
@@ -1123,6 +1128,26 @@ msgstr "📝 ou assets/icon.png"
msgid "0/0"
msgstr "0/0"
+#: src/components/settings/SyncSection.tsx
+msgid "1 hour"
+msgstr "1 hora"
+
+#: src/components/settings/SyncSection.tsx
+msgid "1 minute"
+msgstr "1 minuto"
+
+#: src/components/settings/SyncSection.tsx
+msgid "15 minutes"
+msgstr "15 minutos"
+
+#: src/components/settings/SyncSection.tsx
+msgid "30 seconds"
+msgstr "30 segundos"
+
+#: src/components/settings/SyncSection.tsx
+msgid "5 minutes"
+msgstr "5 minutos"
+
#: src/components/ImportSkillForm.tsx
msgid "A .zip or .skill archive."
msgstr "Um arquivo .zip ou .skill."
@@ -1517,6 +1542,7 @@ msgstr "Adicione seus comentários a esta mensagem"
#: src/components/PropertyDiffBlock.tsx
#: src/components/SkillDirectoryResult.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Added"
msgstr "Adicionado"
@@ -1561,11 +1587,13 @@ msgstr "Adiciona estes arquivos"
msgid "Adds these folders"
msgstr "Adiciona estas pastas"
+#: src/components/settings/SyncSection.tsx
#: src/editor/components/PropPanel.tsx
msgid "Advanced"
msgstr "Avançado"
#: src/components/ConsentDialogBody.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Advanced settings"
msgstr "Configurações avançadas"
@@ -1975,6 +2003,24 @@ msgstr "Conteúdo autoritativo; espelhado literalmente em todo lugar onde for re
msgid "Authorize in browser"
msgstr "Autorizar no navegador"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull and Push)"
+msgstr "Automático (Pull e Push)"
+
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull only)"
+msgstr "Automático (somente Pull)"
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
+msgstr "Automático (somente Pull) busca atualizações do seu repositório git remoto e avança sua cópia automaticamente. Suas edições locais ficam neste computador e nunca são enviadas."
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) never pushes or commits your local changes. They stay only on this machine."
+msgstr "Automático (somente Pull) nunca faz push nem commit das suas alterações locais. Elas ficam somente nesta máquina."
+
#: src/components/settings/TerminalSection.tsx
msgid "Auto-approve settings not yet loaded — try again in a moment"
msgstr "As configurações de aprovação automática ainda não carregaram — tente de novo em instantes"
@@ -2008,21 +2054,13 @@ msgstr "A correção automática só vale para problemas com uma correção mec
msgid "Auto-save"
msgstr "Salvamento automático"
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is off for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "A sincronização automática está desligada neste worktree, herdada de {project}. Altere em Configurações → Sincronização."
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "A sincronização automática está ligada neste worktree, herdada de {project}. Altere em Configurações → Sincronização."
-
#: src/components/settings/SyncSection.tsx
msgid "Auto-sync is paused — sign in to resume."
msgstr "A sincronização automática está pausada — entre na sua conta para retomar."
#: src/components/settings/SyncSection.tsx
-msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Follow to keep receiving updates."
-msgstr "A sincronização automática está pausada — você não tem permissão para enviar a este repositório. Mude para Acompanhar e continue recebendo atualizações."
+msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Auto (Pull only) to keep receiving updates."
+msgstr "A sincronização automática está pausada: você não tem permissão para fazer push neste repositório. Mude para Automático (somente Pull) para continuar recebendo atualizações."
#: src/components/AutoSyncEnableWarning.tsx
msgid "Auto-sync periodically fetches, pulls, and pushes commits to your remote git repository so your edits stay in sync across machines."
@@ -2420,9 +2458,14 @@ msgid "Change the embeddings provider?"
msgstr "Trocar o provedor de embeddings?"
#: src/components/PropertyDiffBlock.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Changed"
msgstr "Alterado"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Changed here and on the remote"
+msgstr "Alterados aqui e no remoto"
+
#: src/components/ChangedOutsideBadge.tsx
msgid "changed outside"
msgstr "alterado fora"
@@ -2447,6 +2490,10 @@ msgstr "Alterações salvas automaticamente."
msgid "Check for updates"
msgstr "Buscar atualizações"
+#: src/components/settings/SyncSection.tsx
+msgid "Check for updates every"
+msgstr "Verificar atualizações a cada"
+
#: src/components/AppMenubar.tsx
msgid "Check for updates…"
msgstr "Buscar atualizações…"
@@ -2966,6 +3013,10 @@ msgstr "Comente ou pergunte à IA sobre este bloco de código"
msgid "Comments"
msgstr "Comentários"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Commit and sync"
+msgstr "Fazer commit e sincronizar"
+
#: src/components/ShareBranchSwitchDialog.tsx
msgid "Commit or stash changes to switch:"
msgstr "Faça commit ou stash das alterações para trocar:"
@@ -3267,6 +3318,7 @@ msgstr "Convertendo..."
#: src/components/empty-state/CopyablePromptList.tsx
#: src/components/InstallInClaudeDesktopDialog.tsx
+#: src/components/SyncStatusBadge.tsx
#: src/editor/extensions/CodeBlockView.tsx
msgid "Copied"
msgstr "Copiado"
@@ -3882,6 +3934,10 @@ msgstr "Não deu para ler os comentários que aguardam envio — nada foi enviad
msgid "Couldn't read the comments waiting to send: {0}"
msgstr "Não deu para ler os comentários que aguardam envio: {0}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Couldn't read the working tree. Check the server logs."
+msgstr "Não foi possível ler a árvore de trabalho. Verifique os logs do servidor."
+
#. placeholder {0}: warning.code
#: src/components/settings/SavedThemesTiles.tsx
msgid "Couldn’t read this theme ({0})"
@@ -4455,6 +4511,10 @@ msgstr "Excluir este chat?"
msgid "Delete this comment"
msgstr "Excluir este comentário"
+#: src/components/SyncStatusBadge.tsx
+msgid "Deleted"
+msgstr "Excluído"
+
#. placeholder {0}: deletedTheme.label
#: src/components/settings/SavedThemesTiles.tsx
msgid "Deleted {0}."
@@ -4550,6 +4610,10 @@ msgstr "tokens de descrição"
msgid "Design"
msgstr "Design"
+#: src/components/SyncStatusBadge.tsx
+msgid "detached HEAD"
+msgstr "HEAD desanexado"
+
#: src/components/SyncStatusBadge.tsx
msgid "Detached HEAD — checkout a branch to resume"
msgstr "HEAD desanexado — extraia um ramo para continuar"
@@ -4922,6 +4986,10 @@ msgstr "Cada ferramenta de IA lê as habilidades da sua própria pasta. Aponte u
msgid "Each pack scaffolds your project with ready-made folders and templates."
msgstr "Cada pacote prepara seu projeto com pastas e modelos prontos."
+#: src/components/settings/SyncSection.tsx
+msgid "Each push is one commit to your remote."
+msgstr "Cada push é um commit no seu remoto."
+
#: src/components/AppMenubar.tsx
#: src/components/settings/LintingSection.tsx
#: src/components/SkillsTree.tsx
@@ -5170,25 +5238,25 @@ msgstr "Habilitar {id}"
#: src/components/EnableSyncConfirmDialog.tsx
#: src/components/share-receive-miss-content.tsx
#: src/components/ShareFreshnessWarning.tsx
-msgid "Enable auto-sync"
-msgstr "Ativar a sincronização automática"
+msgid "Enable Auto (Pull and Push)"
+msgstr "Ativar Automático (Pull e Push)"
-#: src/components/settings/LinkPreviewsSection.tsx
-msgid "Enable external link previews"
-msgstr "Ativar a pré-visualização de links externos"
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Enable Auto (Pull and Push)?"
+msgstr "Ativar Automático (Pull e Push)?"
#: src/components/AutoSyncOnboardingDialog.tsx
#: src/components/EnableSyncConfirmDialog.tsx
-msgid "Enable Follow"
-msgstr "Ativar Acompanhar"
+msgid "Enable Auto (Pull only)"
+msgstr "Ativar Automático (somente Pull)"
#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable Follow?"
-msgstr "Ativar Acompanhar?"
+msgid "Enable Auto (Pull only)?"
+msgstr "Ativar Automático (somente Pull)?"
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable git auto-sync?"
-msgstr "Ativar a sincronização automática do git?"
+#: src/components/settings/LinkPreviewsSection.tsx
+msgid "Enable external link previews"
+msgstr "Ativar a pré-visualização de links externos"
#: src/components/settings/LintingSection.tsx
msgid "Enable indexes"
@@ -5784,6 +5852,10 @@ msgstr "Falha ao atualizar o provedor de embeddings — {detail}"
msgid "Failed to update the project sync default — {detail}"
msgstr "Falha ao atualizar a sincronização padrão do projeto — {detail}"
+#: src/components/settings/SyncSection.tsx
+msgid "Failed to update the sync interval — {detail}"
+msgstr "Falha ao atualizar o intervalo de sincronização — {detail}"
+
#: src/components/FileTree.tsx
msgid "Failed to upload file"
msgstr "Falha ao enviar o arquivo"
@@ -6043,28 +6115,6 @@ msgstr "Link de compartilhamento da pasta copiado."
msgid "Folder target: {linkTitle}. Click to open the overview."
msgstr "Pasta de destino: {linkTitle}. Clique para abrir a visão geral."
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow"
-msgstr "Acompanhar"
-
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow — updates flow in from your remote; your edits stay on this computer."
-msgstr "Acompanhar — as atualizações chegam do seu remoto; suas edições ficam neste computador."
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
-msgstr "Acompanhar busca atualizações do seu repositório git remoto e avança sua cópia automaticamente. Suas edições locais ficam neste computador e nunca são enviadas."
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Follow is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "Acompanhar está ligado neste worktree, herdado de {project}. Altere em Configurações → Sincronização."
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow never pushes or commits your local changes. They stay only on this machine."
-msgstr "Acompanhar nunca envia nem faz commit das suas alterações locais. Elas ficam só neste computador."
-
#: src/components/acp/ThreadView.tsx
msgid "Follow the agent's edits"
msgstr "Acompanhar as edições do agente"
@@ -6155,11 +6205,6 @@ msgstr "O frontmatter com que começa cada documento criado a partir deste model
msgid "Frontmatter schemas"
msgstr "Esquemas de frontmatter"
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Full"
-msgstr "Completo"
-
#: src/components/InstallInClaudeDesktopDialog.tsx
msgid "Full guide"
msgstr "Guia completo"
@@ -6173,14 +6218,6 @@ msgstr "Caminho completo"
msgid "Full Path"
msgstr "Caminho completo"
-#: src/components/settings/SyncSection.tsx
-msgid "Full sync — your commits push and remote changes pull automatically."
-msgstr "Sincronização completa — seus commits são enviados e as alterações remotas são baixadas automaticamente."
-
-#: src/components/SyncStatusBadge.tsx
-msgid "Full sync — your edits are committed and pushed to your remote automatically."
-msgstr "Sincronização completa — suas edições recebem commit e são enviadas ao seu remoto automaticamente."
-
#: src/components/OkBlobRunner.tsx
msgid "Game over · press <0>Space</0> to play again"
msgstr "Fim de jogo · pressione <0>Espaço</0> para jogar de novo"
@@ -6239,6 +6276,7 @@ msgid "Git needs a helper tool (such as git-lfs) that isn't installed or couldn'
msgstr "O git precisa de uma ferramenta auxiliar (como o git-lfs) que não está instalada nem foi encontrada. Instale-a e tente de novo."
#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Git sync"
msgstr "Sincronização com git"
@@ -6616,6 +6654,10 @@ msgstr "Como funciona o compartilhamento?"
msgid "How missing project-local documents, files, and images are reported in Problems, editor diagnostics, audits, and agent tools."
msgstr "Como documentos, arquivos e imagens locais do projeto ausentes são informados em Problemas, diagnósticos do editor, auditorias e ferramentas de agente."
+#: src/components/settings/SyncSection.tsx
+msgid "How often this computer pulls changes from your remote."
+msgstr "Com que frequência este computador traz alterações do seu remoto."
+
#: src/components/ShareFreshnessWarning.tsx
msgid "How to push manually"
msgstr "Como enviar manualmente"
@@ -6701,6 +6743,10 @@ msgstr "Padrões de exclusão"
msgid "Ignore patterns (raw text)"
msgstr "Padrões de exclusão (texto puro)"
+#: src/components/SyncStatusBadge.tsx
+msgid "Ignored"
+msgstr "Ignorado"
+
#: src/components/LinksPanel.tsx
msgid "Image {identity}. Go to reference."
msgstr "Imagem {identity}. Ir para a referência."
@@ -7297,8 +7343,8 @@ msgid "Keep the name to 64 characters or fewer."
msgstr "O nome deve ter 64 caracteres ou menos."
#: src/components/settings/SyncSection.tsx
-msgid "Keep this project in sync with your git remote. Follow fetches updates without pushing; full sync pushes your commits too. Turning sync on requires confirmation."
-msgstr "Mantenha este projeto em sincronia com seu remoto do git. Acompanhar busca atualizações sem enviar; a sincronização completa também envia seus commits. Ligar a sincronização exige confirmação."
+msgid "Keep this project in sync with your git remote. Auto (Pull only) brings in updates without pushing; Auto (Pull and Push) sends your edits too. Turning auto-sync on requires confirmation."
+msgstr "Mantenha este projeto sincronizado com o seu remoto git. Automático (somente Pull) traz atualizações sem fazer push; Automático (Pull e Push) também envia suas edições. Ativar a sincronização automática exige confirmação."
#: src/lib/pack-copy.ts
msgid "Keep track of the people and companies you work with and the meetings you have with them. Good for remembering who someone is, how you know them, and what you last talked about."
@@ -7778,6 +7824,11 @@ msgstr "O gerenciamento de ferramentas de IA não está disponível nesta compil
msgid "Managing project AI tools is unavailable in this build."
msgstr "O gerenciamento das ferramentas de IA do projeto não está disponível nesta compilação."
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Manual"
+msgstr "Manual"
+
#: src/components/empty-state/use-create-suggestions.ts
msgid "Map the architecture"
msgstr "Mapear a arquitetura"
@@ -7916,10 +7967,6 @@ msgstr "Faltam cores na paleta"
msgid "Missing theme name"
msgstr "Nome do tema ausente"
-#: src/components/SyncStatusBadge.tsx
-msgid "Mode"
-msgstr "Modo"
-
#: src/components/settings/SearchSection.tsx
msgid "Model"
msgstr "Modelo"
@@ -7936,6 +7983,7 @@ msgstr "Esforço padrão do modelo"
#: src/components/FolderOverview.tsx
#: src/components/settings/markdownlint-rule-browser.tsx
#: src/components/SkillOriginInline.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Modified"
msgstr "Modificado"
@@ -8228,10 +8276,6 @@ msgstr "Erro de rede durante a limpeza"
msgid "Network settings not yet loaded. Try again in a moment."
msgstr "As configurações de rede ainda não foram carregadas. Tente novamente em instantes."
-#: src/components/SyncStatusBadge.tsx
-msgid "never"
-msgstr "nunca"
-
#: src/components/FolderOverview.tsx
#: src/editor/tag-suggestion/TagSuggestionMenu.tsx
msgid "New"
@@ -8846,10 +8890,22 @@ msgstr "nada ({0} não pode corresponder a um documento)"
msgid "nothing ({0} is not a valid pattern)"
msgstr "nada ({0} não é um padrão válido)"
+#: src/components/settings/SyncSection.tsx
+msgid "Nothing moves until you ask — pull and push from the sync menu."
+msgstr "Nada se move até você pedir: use Pull e Push no menu de sincronização."
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing moves until you ask."
+msgstr "Nada se move até você pedir."
+
#: src/components/FolderPropertiesCard.tsx
msgid "Nothing set yet."
msgstr "Ainda não há nada definido."
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing to commit — working tree clean."
+msgstr "Nada para commitar: a árvore de trabalho está limpa."
+
#: src/components/BugReportSendToast.tsx
msgid "Nothing was uploaded. The report stays on this computer until you email it to us."
msgstr "Nada foi enviado. O relatório fica neste computador até você nos enviar por e-mail."
@@ -8883,10 +8939,6 @@ msgstr "de {0}"
msgid "of {totalPages}"
msgstr "de {totalPages}"
-#: src/components/settings/SyncSection.tsx
-msgid "Off"
-msgstr "Desligado"
-
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Off — external links show only their URL. No requests leave this computer."
msgstr "Desligado — os links externos mostram só a URL. Nenhuma requisição sai deste computador."
@@ -9641,6 +9693,10 @@ msgstr "Saída"
msgid "Outline"
msgstr "Estrutura"
+#: src/components/SyncStatusBadge.tsx
+msgid "Outside what Open Knowledge commits."
+msgstr "Fora do que o Open Knowledge faz commit."
+
#: src/components/SkillCostValue.tsx
msgid "over the {budgetLabel} token budget"
msgstr "acima do orçamento de tokens de {budgetLabel}"
@@ -9851,10 +9907,6 @@ msgstr "Erro de sintaxe no padrão: {message}"
msgid "Pattern warnings: {summary}"
msgstr "Avisos do padrão: {summary}"
-#: src/components/SyncStatusBadge.tsx
-msgid "Pause sync"
-msgstr "Pausar a sincronização"
-
#: src/components/acp/ThreadView.tsx
msgid "pending"
msgstr "pendente"
@@ -10248,10 +10300,26 @@ msgstr "Publicando..."
msgid "Pull"
msgstr "Pull"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull and Push"
+msgstr "Pull e Push"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull brings in"
+msgstr "O Pull traz"
+
#: src/components/share-receive-miss-content.tsx
msgid "Pull latest changes"
msgstr "Trazer as últimas alterações"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled}"
+msgstr "Baixado {pulled}"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled} · pushed {pushed}"
+msgstr "Baixado {pulled} · enviado {pushed}"
+
#: src/components/share-receive-miss-content.tsx
#: src/components/SyncStatusBadge.tsx
msgid "Pulling"
@@ -10277,10 +10345,26 @@ msgstr "Envie o ramo {branch} para o GitHub antes de compartilhar."
msgid "Push failed — check the server logs for details."
msgstr "Falha no push — veja os logs do servidor para os detalhes."
+#: src/components/SyncStatusBadge.tsx
+msgid "Push includes"
+msgstr "O Push inclui"
+
+#: src/components/settings/SyncSection.tsx
+msgid "Push my edits every"
+msgstr "Enviar minhas edições a cada"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Push skips"
+msgstr "O Push ignora"
+
#: src/lib/share/run-share-action.ts
msgid "Push this branch to GitHub before sharing."
msgstr "Envie este ramo para o GitHub antes de compartilhar."
+#: src/components/SyncStatusBadge.tsx
+msgid "Pushed {pushed}"
+msgstr "Enviado {pushed}"
+
#: src/components/SyncStatusBadge.tsx
msgid "Pushing"
msgstr "Fazendo push"
@@ -10354,6 +10438,10 @@ msgstr "Cópia somente leitura de um bloco MirrorSource de outro documento. Edit
msgid "Read-only file in the {name} skill"
msgstr "Arquivo somente leitura na habilidade {name}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reading working tree"
+msgstr "Lendo a árvore de trabalho"
+
#: src/components/acp/working-status.ts
msgid "Reading…"
msgstr "Lendo…"
@@ -10407,6 +10495,10 @@ msgstr "Habilidade recomendada do agente"
msgid "Reconnect required"
msgstr "É preciso reconectar"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reconnect required to keep syncing."
+msgstr "É necessário reconectar para continuar sincronizando."
+
#: src/presence/use-sync-toasts.ts
msgid "Reconnected"
msgstr "Reconectado"
@@ -10673,6 +10765,10 @@ msgstr "Renomear a habilidade"
msgid "Rename succeeded but the sidebar may be out of date — refresh to resync"
msgstr "A renomeação deu certo, mas a barra lateral pode estar desatualizada — atualize para ressincronizar"
+#: src/components/SyncStatusBadge.tsx
+msgid "Renamed"
+msgstr "Renomeado"
+
#. placeholder {0}: docLeaf(descriptor.from)
#. placeholder {1}: docLeaf(descriptor.to)
#: src/components/TimelinePanel.tsx
@@ -10824,7 +10920,6 @@ msgstr "Os repositórios que você já clonou podem continuar sincronizando pela
#: src/components/CloneDialog.tsx
#: src/components/share-metadata-rows.tsx
#: src/components/SkillPreviewTab.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Repository"
msgstr "Repositório"
@@ -10907,6 +11002,10 @@ msgstr "Redimensionar o painel de Habilidades"
msgid "Resolve conflict in your terminal"
msgstr "Resolva o conflito no seu terminal"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Resolve in terminal"
+msgstr "Resolver no terminal"
+
#: src/components/FileTree.tsx
msgid "Resolve the conflict on {files} before deleting."
msgstr "Resolva o conflito em {files} antes de excluir."
@@ -11022,10 +11121,6 @@ msgstr "A versão de {0} foi restaurada"
msgid "Results capped — this workspace has more files than search can index. A missing file may be a cap artifact, not a typo."
msgstr "Resultados limitados — este espaço de trabalho tem mais arquivos do que a busca consegue indexar. Um arquivo que falte pode ser efeito do limite, não um erro de digitação."
-#: src/components/SyncStatusBadge.tsx
-msgid "Resume sync"
-msgstr "Retomar a sincronização"
-
#: src/components/acp/ThreadView.tsx
msgid "Resuming the chat"
msgstr "Retomando o chat"
@@ -11097,8 +11192,8 @@ msgid "Reverting"
msgstr "Revertendo"
#: src/components/SyncStatusBadge.tsx
-msgid "Review conflicts"
-msgstr "Revisar os conflitos"
+msgid "Review"
+msgstr "Revisar"
#: src/components/ReportBugDialogBody.tsx
msgid "Review your report"
@@ -12244,6 +12339,10 @@ msgstr "O Slidev demorou demais para iniciar. Tente novamente."
msgid "Small section heading."
msgstr "Título de seção pequeno."
+#: src/components/SyncStatusBadge.tsx
+msgid "Some files are not listed — the working tree has too many changes."
+msgstr "Alguns arquivos não estão listados: a árvore de trabalho tem alterações demais."
+
#: src/components/settings/SavedThemesTiles.tsx
msgid "Some saved themes aren’t shown because the theme folder exceeds the scan limit."
msgstr "Alguns temas salvos não são exibidos porque a pasta de temas excede o limite de verificação."
@@ -12435,6 +12534,10 @@ msgstr "Iniciando o agente…"
msgid "status"
msgstr "status"
+#: src/components/SyncStatusBadge.tsx
+msgid "Status"
+msgstr "Status"
+
#: src/components/SubscribeCard.tsx
#: src/components/SubscribeForm.tsx
msgid "Stay in the loop"
@@ -12582,8 +12685,8 @@ msgid "Switch to a branch to share."
msgstr "Mude para um ramo para compartilhar."
#: src/components/settings/SyncSection.tsx
-msgid "Switch to Follow"
-msgstr "Mudar para Acompanhar"
+msgid "Switch to Auto (Pull only)"
+msgstr "Mudar para Automático (somente Pull)"
#: src/components/command-palette-commands.ts
msgid "Switch worktree"
@@ -12622,7 +12725,6 @@ msgid "Symlinks the skill to {path}"
msgstr "Cria um link simbólico da habilidade para {path}"
#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Sync"
msgstr "Sincronização"
@@ -12631,10 +12733,6 @@ msgstr "Sincronização"
msgid "Sync & sharing"
msgstr "Sincronização e compartilhamento"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync disabled"
-msgstr "Sincronização desativada"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync failed — check the server logs for details."
msgstr "Falha na sincronização — veja os logs do servidor para os detalhes."
@@ -12643,13 +12741,21 @@ msgstr "Falha na sincronização — veja os logs do servidor para os detalhes."
msgid "Sync is failing. See the sync status for details."
msgstr "A sincronização está falhando. Veja o status de sincronização para os detalhes."
-#: src/components/settings/SyncSection.tsx
-msgid "Sync is off — your edits stay on this computer until you commit and push manually."
-msgstr "A sincronização está desligada — suas edições ficam neste computador até você fazer commit e push manualmente."
+#: src/components/SyncBlockingChanges.tsx
+msgid "Sync is paused. Commit these local edits to continue, or sort them out in a terminal."
+msgstr "A sincronização está pausada. Faça commit destas edições locais para continuar, ou resolva-as em um terminal."
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync is paused. Turn it back on to resume."
-msgstr "A sincronização está pausada. Ligue de novo para retomar."
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull and Push) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "A sincronização deste worktree está em Automático (Pull e Push), herdada de {project}. Altere em Configurações → Sincronização."
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull only) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "A sincronização deste worktree está em Automático (somente Pull), herdada de {project}. Altere em Configurações → Sincronização."
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Manual for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "A sincronização deste worktree está em Manual, herdada de {project}. Altere em Configurações → Sincronização."
#: src/components/SyncStatusBadge.tsx
msgid "Sync mode"
@@ -12660,18 +12766,10 @@ msgstr "Modo de sincronização"
msgid "Sync now"
msgstr "Sincronizar agora"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync off"
-msgstr "Sincronização desligada"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync paused"
msgstr "Sincronização pausada"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync paused — resolve conflicts to resume."
-msgstr "Sincronização pausada — resolva os conflitos para retomar."
-
#: src/hooks/use-no-push-permission-toast.ts
msgid "Sync paused — you don't have permission to push to this repo"
msgstr "Sincronização pausada — você não tem permissão para enviar a este repositório"
@@ -12706,10 +12804,6 @@ msgstr "Status da sincronização: {syncStateLabel} — identidade do git não d
msgid "Synced"
msgstr "Sincronizado"
-#: src/components/SyncStatusBadge.tsx
-msgid "Synced {lastSyncedRelative}"
-msgstr "Sincronizado {lastSyncedRelative}"
-
#: src/components/TimelinePanel.tsx
msgid "Synced from disk"
msgstr "Sincronizado a partir do disco"
@@ -12933,6 +13027,10 @@ msgstr "Obrigado pelo relatório!"
msgid "That branch is already open in another worktree."
msgstr "Esse ramo já está aberto em outro worktree."
+#: src/components/SyncBlockingChanges.tsx
+msgid "That did not go through. Check the server logs and try again."
+msgstr "Isso não foi concluído. Verifique os logs do servidor e tente de novo."
+
#: src/comments/reveal-comment.ts
msgid "That document didn't open in time. Try again once it has synced."
msgstr "Esse documento não abriu a tempo. Tente novamente quando ele estiver sincronizado."
@@ -13968,6 +14066,10 @@ msgstr "Digite '/' para ver os comandos"
msgid "Type a query, then press <0>↵</0> to search your pages by meaning."
msgstr "Digite uma consulta e pressione <0>↵</0> para buscar nas suas páginas por significado."
+#: src/components/SyncStatusBadge.tsx
+msgid "Type changed"
+msgstr "Tipo alterado"
+
#: src/editor/components/CodePreviewEditModal.tsx
msgid "Type to edit; <0>Cmd/Ctrl+Enter</0> saves, <1>Esc</1> cancels."
msgstr "Digite para editar; <0>Cmd/Ctrl+Enter</0> salva, <1>Esc</1> cancela."
@@ -14096,6 +14198,10 @@ msgstr "Desmarcar todos os comentários"
msgid "Unmark every comment in {0}"
msgstr "Desmarcar todos os comentários de {0}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Unmerged"
+msgstr "Sem merge"
+
#: src/editor/slash-command/items.tsx
msgid "Unordered list of items."
msgstr "Lista de itens sem numeração."
@@ -14136,6 +14242,10 @@ msgstr "Não foi possível resolver a imagem {identity}. Ir para a referência."
msgid "Untitled report"
msgstr "Relatório sem título"
+#: src/components/SyncStatusBadge.tsx
+msgid "Untracked"
+msgstr "Não rastreado"
+
#: src/components/SyncStatusBadge.tsx
msgid "Up to date"
msgstr "Atualizado"
@@ -14183,8 +14293,8 @@ msgid "Updated \"{name}\" from {0}"
msgstr "\"{name}\" atualizado a partir de {0}"
#: src/components/SyncStatusBadge.tsx
-msgid "Updated {lastSyncedRelative}"
-msgstr "Atualizado {lastSyncedRelative}"
+msgid "Updated {updatedRelative}"
+msgstr "Atualizado {updatedRelative}"
#: src/components/FolderTimelineCard.tsx
msgid "updated folder properties"
@@ -14198,6 +14308,11 @@ msgstr "Atualizado para a versão {version}"
msgid "Updates flow in"
msgstr "As atualizações chegam sozinhas"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Updates flow in from your remote; your edits stay on this computer."
+msgstr "As atualizações chegam do seu remoto; suas edições ficam neste computador."
+
#: src/components/SkillOriginInline.tsx
msgid "Updates from the source apply automatically (unless edited locally)"
msgstr "As atualizações da fonte se aplicam automaticamente (a menos que tenha sido editado localmente)"
@@ -14650,6 +14765,10 @@ msgstr "Onde ela deve ficar?"
msgid "Which skill"
msgstr "Qual habilidade"
+#: src/components/settings/SyncSection.tsx
+msgid "While you're signed out, updates are checked at most every 3 minutes regardless of this setting."
+msgstr "Enquanto você estiver desconectado, as atualizações são verificadas no máximo a cada 3 minutos, independentemente desta configuração."
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "Whitespace"
msgstr "Espaços em branco"
@@ -14826,8 +14945,8 @@ msgid "You don't have permission to push to this repo."
msgstr "Você não tem permissão para enviar a este repositório."
#: src/components/settings/SyncSection.tsx
-msgid "You don't have permission to push to this repo. Follow can still keep your copy up to date."
-msgstr "Você não tem permissão para enviar a este repositório. Acompanhar ainda consegue manter sua cópia atualizada."
+msgid "You don't have permission to push to this repo. Auto (Pull only) can still keep your copy up to date."
+msgstr "Você não tem permissão para fazer push neste repositório. Automático (somente Pull) ainda pode manter sua cópia atualizada."
#: src/components/ShareFreshnessWarning.tsx
msgid "You don't have write access to this repo."
@@ -14899,6 +15018,11 @@ msgstr "Sua cópia do ramo <0>{shareBranch}</0> tem alterações que não estão
msgid "Your current version is saved first, so this is reversible."
msgstr "Sua versão atual é salva antes, então isto é reversível."
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Your edits are committed and pushed to your remote automatically."
+msgstr "Suas edições recebem commit e são enviadas ao seu remoto automaticamente."
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "Your edits stay on this computer"
msgstr "Suas edições ficam neste computador"
diff --git a/packages/app/src/locales/ur/messages.json b/packages/app/src/locales/ur/messages.json
index ee8aa513f..c98e1db9d 100644
--- a/packages/app/src/locales/ur/messages.json
+++ b/packages/app/src/locales/ur/messages.json
@@ -23,13 +23,7 @@
"-YV1Uo": ["پیٹرن ", ["patternNumber"]],
"-bFGPF": ["اگلی تبدیلی"],
"-dNlfM": [["docName"], " پر آخری ترمیم واپس لے لی گئی"],
- "-f2Ogn": [
- "اس پروجیکٹ کو اپنے git ریموٹ کے ساتھ ہم آہنگ رکھیں۔ پیروی بغیر پُش کیے اپ ڈیٹس لاتی ہے؛ مکمل مطابقت پذیری آپ کے کمٹس بھی پُش کرتی ہے۔ مطابقت پذیری فعال کرنے کے لیے تصدیق درکار ہے۔"
- ],
"-g6KIS": ["ناقابلِ شناخت لنک"],
- "-imiMK": [
- "پیروی — اپ ڈیٹس آپ کے ریموٹ سے آتی رہتی ہیں؛ آپ کی ترامیم اسی کمپیوٹر پر رہتی ہیں۔"
- ],
"-kKdCC": [["0"], " سے ", ["imported"], " مہارتیں نصب ہو گئیں"],
"-kbIAr": ["لنکس اور تصاویر"],
"-ksoxk": [
@@ -133,7 +127,6 @@
"0wswKc": ["افقی لکیر جو سیکشنز کو الگ کرتی ہے۔"],
"0xnQ_X": ["اپ ڈیٹس آتی رہتی ہیں"],
"0xnmlQ": ["ریپازٹری کا نام"],
- "0yL--g": ["تصادمات کا جائزہ لیں"],
"0ySP5u": ["تبدیلیاں خودکار طور پر اس تھیم میں محفوظ ہو جاتی ہیں۔"],
"0zAhu6": ["ہر دستاویز"],
"1-flC9": ["مقامی سرور پورٹ"],
@@ -169,6 +162,7 @@
"1NgrlY": ["انسٹال کرنے کے دیگر طریقے"],
"1QfxQT": ["برخاست کریں"],
"1RluQD": ["تبدیلی دکھائیں"],
+ "1TA-aJ": [["pulled"], " کھینچا · ", ["pushed"], " بھیجا"],
"1TNIig": ["کھولیں"],
"1Ta7Fd": [["basename"], " کھولیں"],
"1V17kO": ["دونوں ورژن لوڈ ہو رہے ہیں"],
@@ -244,6 +238,11 @@
["FULLSCREEN_HUB_LIMIT"],
" نتائج۔"
],
+ "2okwy4": [
+ "اس ورک ٹری کی مطابقت پذیری «خودکار (صرف کھینچیں)» پر سیٹ ہے، جو ",
+ ["project"],
+ " سے وراثت میں ملی۔ اسے ترتیبات ← مطابقت پذیری میں بدلیں۔"
+ ],
"2pR7ad": ["ایمبیڈنگز API کلید"],
"2q_Q7x": ["ظاہری حیثیت"],
"2rLM8r": ["ایجنٹ کا تھریڈ شروع نہیں ہو سکا — براہِ کرم دوبارہ کوشش کریں۔"],
@@ -350,7 +349,6 @@
"4A3Yzu": ["کوڈ بلاک"],
"4BITzH": ["خرابی:"],
"4CfgPM": ["پروجیکٹ کا فولڈر بن گیا، مگر git init ناکام رہا۔ دوبارہ کوشش کریں۔"],
- "4DcimZ": [["lastSyncedRelative"], " تازہ ہوا"],
"4E9jPa": ["اپنا پہلا پروجیکٹ بنائیں"],
"4EZrJN": ["قواعد"],
"4ErgAf": ["OpenKnowledge نے ایک اسکل انسٹال کی"],
@@ -380,6 +378,7 @@
"نصب کرنے کے لیے مہارتیں منتخب کریں۔ ہر ایک آپ کی اپنی قابلِ ترمیم مہارت بن کر آتی ہے۔"
],
"4mLBx9": ["رکنیتیں ابھی دستیاب نہیں۔"],
+ "4mbrAq": ["1 منٹ"],
"4mp6Tv": ["OpenKnowledge نے انسٹال شدہ اسکلز کی فہرست دی"],
"4niEzY": ["سینڈ باکسڈ HTML ایمبیڈ — HTML لکھیں، رینڈر شدہ پیش منظر براہِ راست دیکھیں۔"],
"4nj6n8": ["/api/config نے HTTP ", ["code"], " لوٹایا"],
@@ -395,11 +394,6 @@
"جب فوکس فائلوں کے سائیڈ بار میں ہو تو فائل ٹری کی ہر نظر آنے والی قطار منتخب کریں۔"
],
"4xtLTl": ["چھپا ہوا فولڈر “", ["basename"], "”"],
- "4zEZS5": [
- "اس ورک ٹری کے لیے خودکار مطابقت پذیری فعال ہے، جو ",
- ["project"],
- " سے وراثت میں ملی۔ اسے ترتیبات ← مطابقت پذیری میں بدلیں۔"
- ],
"4zGlN_": ["تصویر کا URL چسپاں کریں یا اپ لوڈ پر کلک کریں"],
"4z_1j2": ["رینڈر شدہ"],
"5-FeN2": ["شیئر URL"],
@@ -476,6 +470,7 @@
],
"5hFl0U": ["حوالہ کاپی کریں"],
"5jEnaB": ["اس پلیٹ فارم پر دستیاب نہیں"],
+ "5k0NLb": ["جائزہ لیں"],
"5kWklo": ["(کچھ پہلے ہی دوسرے قواعد سے چھپے ہو سکتے ہیں)"],
"5lWFkC": ["سائن اِن کریں"],
"5mksg0": ["معنوی تلاش بند نہیں ہو سکی — ", ["detail"]],
@@ -512,6 +507,7 @@
"کمانڈز اس مشین پر آپ کے صارف اکاؤنٹ کی مکمل رسائی کے ساتھ چلتی ہیں۔ شیل بند کرنے کے لیے اسے آف کریں۔"
],
"6Aih4U": ["آف لائن"],
+ "6EoD0z": ["ٹرمینل میں حل کریں"],
"6FCixu": ["پچھلی چیٹ دوبارہ کھولیں"],
"6HCOwA": ["نہیں کھل سکا۔"],
"6KCH4m": ["چھپی ہوئی فائلیں"],
@@ -571,6 +567,11 @@
"اپنے ایجنٹس کو کسی بھی پروجیکٹ میں OpenKnowledge دریافت کرنے اور استعمال کرنے میں مدد دیں۔"
],
"6vEr3W": ["لنک کا ہدف"],
+ "6xPJIj": [
+ "اس ورک ٹری کی مطابقت پذیری «دستی» پر سیٹ ہے، جو ",
+ ["project"],
+ " سے وراثت میں ملی۔ اسے ترتیبات ← مطابقت پذیری میں بدلیں۔"
+ ],
"6xeZX9": ["ترامیم فوراً لاگو ہوتی ہیں۔ روشن یا تاریک تھیم سے طے ہوتا ہے۔"],
"6zzhQL": ["اپنی رپورٹ ای میل سے بھیجیں"],
"72xhRD": ["خاکے کا منظر موڈ"],
@@ -711,7 +712,6 @@
"8qgfac": ["MCP سرورز"],
"8rZ1pk": [["id"], " کو فعال کریں"],
"8ruqQi": ["ٹوٹے ہوئے داخلی لنکس"],
- "8sMErm": ["پیروی فعال کریں؟"],
"8t9CRE": [["agentName"], " شروع کیا جا رہا ہے…"],
"8t9T3-": ["کوئی مہارت نہیں ملی۔"],
"8tjQCz": ["دریافت کریں"],
@@ -765,6 +765,7 @@
["0", "plural", { "one": ["#", " مہارت نصب کریں"], "other": ["#", " مہارتیں نصب کریں"] }]
],
"9Y6cCI": ["صفحات لوڈ نہیں ہو سکے"],
+ "9ZxzfT": [["count"], " آگے"],
"9_2oe6": [
["0"],
" کو دوبارہ ایک حقیقی ڈائریکٹری بنا دیں جس میں اس وقت نظر آنے والی ہر مہارت کے لیے الگ سِم لنک ہو — کچھ بھی کام کرنا بند نہیں کرتا، اور وہاں سے ہر مہارت کا مینو اسے سنبھالتا ہے۔"
@@ -840,11 +841,6 @@
"AVW-K9": ["یتیم صفحات لوڈ نہیں ہو سکے"],
"AWOSPo": ["بڑا کریں"],
"AYoYhU": ["اپ ڈیٹ ناکام: ", ["0"]],
- "AaaESH": [
- "اس ورک ٹری کے لیے خودکار مطابقت پذیری بند ہے، جو ",
- ["project"],
- " سے وراثت میں ملی۔ اسے ترتیبات ← مطابقت پذیری میں بدلیں۔"
- ],
"AcK_r0": ["Claude CLI"],
"AczYxH": ["حسبِ ضرورت open-knowledge اندراج — OpenKnowledge کے زیرِ انتظام نہیں"],
"AdcGcG": ["آپ کی تبدیلی لاگو کی جا رہی ہے"],
@@ -915,6 +911,7 @@
"BVkqD9": [
"انڈیکس کی دیکھ بھال موقوف ہے کیونکہ ایک اور Git وصف کنٹرول کرتا ہے index.md۔ .gitattributes کو اپ ڈیٹ کریں تاکہ دائرہ کار والے index.md راستے merge=union استعمال کریں، پھر دوبارہ کوشش کریں۔"
],
+ "BWTzAb": ["دستی"],
"BY-g4_": ["پیٹرن شامل کریں"],
"Ba4D2x": ["ٹیمپلیٹ درآمد ہو گیا"],
"Bdha5y": ["شائع کیا جا رہا ہے..."],
@@ -950,6 +947,7 @@
],
"C0Ciaj": ["«", ["0"], "» کے نام سے درآمد ہوا — نام «", ["1"], "» پہلے سے لیا ہوا تھا۔"],
"C0hoX6": ["ہمیشہ شامل"],
+ "C2abof": ["غیر ٹریک شدہ"],
"C3Zc44": ["مہارتیں دریافت کریں"],
"C62P6b": ["ایڈیٹر کا انتخاب"],
"C7PKTv": ["منتخب تبصرے چیٹ میں بھیجیں"],
@@ -978,9 +976,6 @@
"CTJLpz": ["«", ["trimmed"], "» یہاں پہلے سے موجود ہے"],
"CU3AiE": ["برانچیں بدلی جا رہی ہیں"],
"CUmCwI": ["نیچے قطار داخل کریں"],
- "CVRM5N": [
- "پیروی آپ کی ریموٹ git ریپازٹری سے اپ ڈیٹس لاتی ہے اور آپ کی نقل کو خودکار طور پر آگے بڑھا دیتی ہے۔ آپ کی مقامی ترامیم اسی کمپیوٹر پر رہتی ہیں اور کبھی پُش نہیں ہوتیں۔"
- ],
"CWjM1r": ["براہِ راست ", ["0"], "/ میں موجود دستاویزات"],
"CWzc2T": [
"<0>~/.ok/bin</0> اور <1>~/.ok/env.sh</1> دونوں صورتوں میں رہتے ہیں — ایپ ہمیشہ ان کی دیکھ بھال کرتی ہے۔"
@@ -1017,6 +1012,7 @@
"Git پروجیکٹس میں، Open Knowledge ریپوزٹری کی روٹ .gitattributes فائل میں محدود دائرۂ کار کا اصول شامل کرتا ہے تاکہ بیک وقت انڈیکس کی تبدیلیاں یکجا ہو سکیں۔"
],
"CxVk-w": [["address"], " پر تبصرہ"],
+ "Cz-K13": ["15 منٹ"],
"D-NlUC": ["سسٹم"],
"D-Oh1s": [["0"], " کیسے ترتیب دیں (براؤزر میں کھلتا ہے)"],
"D-_B7l": ["منسلک — یہ اینڈ پوائنٹ ", ["0"], " ابعاد والے ویکٹرز لوٹاتا ہے۔"],
@@ -1082,7 +1078,6 @@
"DmkTrb": ["یہ تھیم بنائی نہیں جا سکی۔ دوبارہ کوشش کریں۔"],
"Dnn2XG": ["خودکار"],
"DpjYd6": ["لنگر انداز متن پر جائیں"],
- "DrYM2Z": ["مطابقت پذیری بند"],
"DsDwR-": [["0", "plural", { "one": ["#", " خرابی"], "other": ["#", " خرابیاں"] }]],
"DskIkK": ["سائن اِن کی سٹریم تصدیق کے بغیر ختم ہو گئی — براہِ کرم دوبارہ کوشش کریں"],
"DuCPiG": [
@@ -1280,6 +1275,7 @@
],
"Fqx38P": ["کیا رکاوٹ بنا؟"],
"Fr8JGg": ["Zip فائل"],
+ "FsEXax": ["یہ مکمل نہیں ہوا۔ سرور لاگ دیکھیں اور دوبارہ کوشش کریں۔"],
"Fsx78O": ["اپنے ٹرمینل میں <0>ok</0> کمانڈ شامل کریں"],
"FvMSms": [
"نام بدلنے سے ڈسک پر فائل اور وہ شناخت بدل جاتی ہے جو ایجنٹس یہ ٹیمپلیٹ منتخب کرنے کے لیے استعمال کرتے ہیں۔"
@@ -1397,6 +1393,9 @@
"H0WlWQ": ["سرخی کی قطار کے ساتھ قطاروں اور کالموں کی جالی۔"],
"H1TmTu": ["ٹھیک کرنا رک گیا۔ جو فائلیں پہلے ہی ٹھیک ہو چکی ہیں وہ ٹھیک ہی رہیں گی۔"],
"H3oH0g": ["دوبارہ کریں"],
+ "H4doZt": [
+ "مطابقت پذیری روکی گئی ہے۔ جاری رکھنے کے لیے ان مقامی ترامیم کو کمٹ کریں، یا انہیں ٹرمینل میں حل کریں۔"
+ ],
"H86f9p": ["سکیڑیں"],
"H8DVOJ": ["دونوں میں ایک جیسی ہیں — ", ["pick"], " پھر بھی انہیں پڑھتا رہے گا۔"],
"HAkEqR": ["حالیہ فائلیں"],
@@ -1485,6 +1484,7 @@
"IWGfGF": ["آپ کا GitHub کنکشن جانچا جا رہا ہے"],
"IX7-sq": ["«", ["docName"], "» کھولتے ہوئے کچھ غلط ہو گیا۔"],
"IX_uXB": ["my-feature"],
+ "IXiG0B": ["خودکار (کھینچیں اور پُش)"],
"IYciRC": ["رپورٹ کا شکریہ!"],
"IajAbS": ["ابتدائی پیک شامل کریں"],
"If0crP": ["AI ", ["targetDisplayName"], " کے ساتھ کھولیں، ", ["hint"]],
@@ -1537,6 +1537,7 @@
"JLzQi_": [["accessibleLabel"], " بند کریں"],
"JM_aq-": ["https:// والا URL استعمال کریں — http:// کی اجازت صرف localhost کے لیے ہے۔"],
"JOcPqH": ["کسی ریموٹ ریپازٹری کو اس مشین پر لائیں۔"],
+ "JOhCT9": ["پُش میں شامل"],
"JWsZlx": ["ترمیم کے لیے کوئی پروجیکٹ کھولیں۔"],
"JZ8cO6": ["روشن، تاریک، یا OS کی پیروی۔"],
"J_jZ5z": [
@@ -1631,6 +1632,9 @@
"KjTmeO": ["اس شیئر کو کھولنے کے لیے OpenKnowledge اپ ڈیٹ کریں۔"],
"KkEAud": ["موجودہ دستاویز یا فولڈر کے سیاق سے فائل بنائیں۔"],
"KkRyMI": ["ضم کی درجہ بندی نہیں ہو سکی — دوبارہ کوشش کریں۔"],
+ "KmVekT": [
+ "خودکار (صرف کھینچیں) آپ کی ریموٹ git ریپازٹری سے اپ ڈیٹس لاتا ہے اور آپ کی کاپی خودبخود آگے بڑھاتا ہے۔ آپ کی مقامی ترامیم اسی کمپیوٹر پر رہتی ہیں اور کبھی پُش نہیں ہوتیں۔"
+ ],
"KmydK6": ["جلی"],
"KnoB--": ["<0>", ["sanitized"], "</0> کے نام سے محفوظ ہو گا۔"],
"KpOJFY": ["بیرونی لنکس کے پیش منظر فعال کریں"],
@@ -1640,6 +1644,7 @@
"KsAPaB": ["یہ برانچ یہاں چیک آؤٹ ہے:"],
"KtACeE": ["طے شدہ: <0>", ["0"], "</0>"],
"KujtjC": ["تلاش"],
+ "KvwJv8": ["کچھ فائلیں فہرست میں نہیں ہیں: ورکنگ ٹری میں بہت زیادہ تبدیلیاں ہیں۔"],
"Kx881F": [["0"], " بحال کر دیا گیا۔"],
"L-rMC9": ["طے شدہ پر واپس کریں"],
"L1BQTH": [["0"], " ابھی نصب نہیں ہے — اس کا ڈاؤن لوڈ صفحہ کھولا جا رہا ہے۔"],
@@ -1657,6 +1662,7 @@
"L83DKQ": ["PATH انسٹال ناکام رہا: ", ["summary"]],
"L8fKuc": ["یہ اپنے ٹرمینل میں چلائیں"],
"L9Y9Om": ["سب سے زیادہ لنک شدہ صفحات"],
+ "L9ox9k": ["ورکنگ ٹری نہیں پڑھا جا سکا۔ سرور لاگز دیکھیں۔"],
"LAR9ub": [["0"], " میں موجودہ OpenKnowledge اندراج کو بدل دے گا"],
"LBv_TR": ["مقامات کو سِم لنکس میں بدلیں"],
"LBwUR6": [
@@ -1684,7 +1690,6 @@
]
],
"LKOLNn": ["کوئی AI ایجنٹ نصب نہیں"],
- "LNum6A": [["minutes"], " منٹ پہلے"],
"LPAv9E": [["days"], " دن پہلے"],
"LQdLio": ["نیا اسکیما"],
"LQsCPn": ["مقامی کمٹس اس نقل کو تازہ ہونے سے روک رہے ہیں"],
@@ -1769,7 +1774,6 @@
"MCjC9A": [["deleteDescriptorLabel"], " حذف کریں"],
"MDBJwN": ["استعمال میں مشکل"],
"MDZSJe": ["ایجنٹ اپنا طے شدہ کام کب چلاتا ہے۔"],
- "MGBNwj": ["مطابقت پذیری روکیں"],
"MGb89P": [
"CodeMirror کے طے شدہ کی میپ کے ذریعے سورس ایڈیٹر کی سطریں داخل کریں، حذف کریں، منتقل کریں، نقل کریں اور کھسکائیں۔"
],
@@ -1778,7 +1782,6 @@
"MIF36T": ["فورک حل نہیں ہو سکا: ", ["0"]],
"MILoeL": ["خدمات"],
"MJuO1q": ["سیاق کی ونڈو:"],
- "MKEPCY": ["پیروی"],
"MLVPcm": [["0"], " ورژن ", ["1"]],
"MOAoFO": ["ابھی تک کوئی ایجنٹ فولڈر نہیں"],
"MPpSAg": [["selectedPackName"], " سے نیا پروجیکٹ بنائیں"],
@@ -1841,6 +1844,7 @@
],
"N5rzKJ": [["0"], " مہارتیں حذف کریں"],
"N6j2JH": [["0"], " میں ترمیم کریں"],
+ "N7Lau6": ["کمٹ کریں اور مطابق کریں"],
"NBdIgR": ["تبصرہ"],
"NErvOX": ["یہاں محفوظ ہوا"],
"NEzPEh": ["نئی برانچ بنائیں، یا موجودہ کو چیک آؤٹ کریں، اس کی اپنی ونڈو میں۔"],
@@ -1868,6 +1872,7 @@
"Nay2Yr": ["آپ کی تلاش سے کوئی ایجنٹ مماثل نہیں۔"],
"NcUznW": [["0"], "، کوئی ورک اسپیس نہیں"],
"NcurBF": ["نیچے کھسکائیں"],
+ "NcwbBM": ["کھینچنے سے آئے گا"],
"NeQ_0G": ["ان تبصروں پر کام کریں"],
"NeY1Np": ["Slidev شروع ہوتے ہوئے وقت ختم ہو گیا۔ دوبارہ کوشش کریں۔"],
"NfraGd": ["Slidev انسٹال کرنے کے دیگر طریقے"],
@@ -1911,6 +1916,7 @@
"O6yEPk": ["اپنی پسند کے فولڈر میں نیا OpenKnowledge پروجیکٹ بنائیں۔"],
"O7_W_a": ["AI کے ساتھ کھولیں"],
"O9oQJS": ["رپورٹ بھیجیں"],
+ "OBdkpo": ["علیحدہ HEAD"],
"OD0FCX": ["چھپا ہوا “", ["basename"], "”"],
"ODGGlj": ["فولڈر کا نام: ", ["detail"]],
"OEEQKT": ["اچھا"],
@@ -1970,6 +1976,7 @@
"Oo_WWc": ["کوئی صفحہ نہیں ملا"],
"Oos8fo": ["کمانڈ نقل کریں"],
"OplnBG": ["اس بلڈ میں AI ٹولز کا انتظام دستیاب نہیں۔"],
+ "OqqecQ": ["30 سیکنڈ"],
"OsSaYm": ["کلون ناکام: ", ["title"]],
"OuQezS": ["جب آپ یہ گفتگو دوبارہ شروع کریں گے تو لاگو ہوگا"],
"OuY8t9": ["موجودہ برانچ میں کھولیں"],
@@ -2004,7 +2011,9 @@
"PBwmDJ": ["معنی کے لحاظ سے تلاش جاری ہے"],
"PBxg_E": ["ابھی نہیں"],
"PCSkw2": ["مہارتیں"],
+ "PEGxvo": ["5 منٹ"],
"PGPGsL": ["تفصیل شامل کریں"],
+ "PGRnbw": ["اپ ڈیٹس آپ کے ریموٹ سے آتی ہیں؛ آپ کی ترامیم اسی کمپیوٹر پر رہتی ہیں۔"],
"PHHEuH": ["حل شدہ تبصرے چھپائیں (", ["0"], ")"],
"PIMM5l": ["آپ رکن بن گئے!"],
"PKLY-1": ["کھولا جا رہا ہے..."],
@@ -2017,7 +2026,6 @@
"PRgIJh": [["subRoot"], " تازہ نہیں ہو سکا: ", ["0"]],
"PRnH8G": [["0"], " میں سے"],
"PTUuoc": ["اس تبصرے کا نشان نہیں ہٹایا جا سکا — یہ اب بھی بھیجنے کا منتظر ہے۔"],
- "PTb1Nx": ["مطابقت پذیری روکی ہوئی ہے۔ جاری رکھنے کے لیے اسے دوبارہ فعال کریں۔"],
"PVSwOe": ["رخ بدلا جا رہا ہے — موجودہ عمل کے رکنے کا انتظار…"],
"PVUn_c": ["فولڈر کھولیں"],
"PVggyD": ["Frontmatter اسکیماز"],
@@ -2066,6 +2074,7 @@
"PrWQiT": ["Terminal کو دائیں منتقل کریں"],
"PrhzDE": ["اوپر کھسکائیں"],
"Pw5PTU": ["بیرونی اوریجن"],
+ "PxZCNM": ["اس دائرے سے باہر جسے Open Knowledge کمٹ کرتا ہے۔"],
"Q-DKvr": [["source"], " سے نصب کریں"],
"Q1mtyd": ["سائیڈ بار چھپائیں"],
"Q5fqMz": ["کنکشن کی خرابی — دوبارہ کوشش کریں"],
@@ -2111,6 +2120,7 @@
["childCount", "plural", { "one": ["#", " آئٹم"], "other": ["#", " آئٹمز"] }],
" ہیں"
],
+ "QeREu8": ["نام تبدیل شدہ"],
"QfFBdJ": ["ٹیمپلیٹ کی فائل کا نام (`.md` کے بغیر)۔"],
"Qft6eW": [["0"], " مہارتیں گلوبل میں منتقل کریں"],
"Qj4RL5": ["مکمل:"],
@@ -2305,13 +2315,9 @@
"Sr9xtj": ["وہ فولڈر منتخب کریں جن پر یہ اسکیما لاگو ہوتا ہے"],
"SrOuyg": ["دستاویز کے پینلز"],
"SvBFYA": ["کوئی حالیہ پروجیکٹ نہیں"],
- "Sxx_Zz": [
- "اس ورک ٹری کے لیے پیروی فعال ہے، جو ",
- ["project"],
- " سے وراثت میں ملی۔ اسے ترتیبات ← مطابقت پذیری میں بدلیں۔"
- ],
"T-654M": ["PDF لوڈ ہو رہی ہے"],
"T0OVm7": ["طے شدہ برانچ محفوظ ہے — پُش کے لیے پُل ریکویسٹ درکار ہے۔"],
+ "T1fMJ6": ["یہ کمپیوٹر آپ کے ریموٹ سے کتنی بار تبدیلیاں کھینچتا ہے۔"],
"T2fvhw": [["0"], " کے تمام تبصروں کا نشان ہٹائیں"],
"T3Mld1": ["ونڈو"],
"T3j-7o": ["مثلاً مطابقت پذیری کے دوران پروجیکٹ بدلنا"],
@@ -2361,10 +2367,10 @@
"U2pMtf": ["tag-name"],
"U3IvM5": ["مکمل رہنما"],
"U3RIJu": ["مقامی فائلیں"],
- "U4nTfu": ["پیروی فعال کریں"],
"U5Spo9": ["مواد کی ڈائریکٹری پروجیکٹ کے اندر ہونی چاہیے"],
"U6Mdhd": ["آئیے سیٹ اپ کرتے ہیں۔"],
"U6wmNc": ["مطابقت پذیری روکی ہوئی"],
+ "U7Iesw": [["seconds"], " سیکنڈ"],
"U88xbi": ["اسکیما فائل نہیں بن سکی"],
"U8CD-l": ["مکمل راستہ نقل کریں، کوئی ورک اسپیس نہیں"],
"UBv8UK": ["مستقل طور پر حذف کریں"],
@@ -2400,9 +2406,6 @@
"URmyfc": ["تفصیلات"],
"UTNVyS": ["پورا سورس دستاویز منتخب کریں۔"],
"UTZ97u": ["انتخاب پروجیکٹ کے اندر ہونا چاہیے"],
- "UVDasf": [
- "مطابقت پذیری بند ہے — آپ کی ترامیم اسی کمپیوٹر پر رہتی ہیں جب تک آپ دستی طور پر کمٹ اور پُش نہ کریں۔"
- ],
"UVLlMV": ["GitHub تک رسائی نہیں ہو سکی۔ دوبارہ کوشش کریں؟"],
"UW2Fg3": [
"اس پروجیکٹ کا چلتا ہوا سرور براہِ راست ترمیم کی حمایت نہیں کرتا۔ ٹھیک کرنے کے لیے OpenKnowledge دوبارہ چلائیں۔"
@@ -2441,6 +2444,7 @@
"UhpfxY": ["بائیں کھسکائیں"],
"UkQGhd": ["تبدیلی چھپائیں"],
"UlVARL": ["Slidev فعال کریں"],
+ "Uo2Rj7": ["خودکار (کھینچیں اور پُش) فعال کریں؟"],
"Uobeu9": ["مہارت کو ", ["rootRel"], " میں شامل کرتا ہے — اسے ", ["0"], " بھی پڑھتا ہے"],
"Up2_7p": ["مکمل راستہ نقل کریں"],
"UpCz01": ["یہ دستاویز"],
@@ -2512,6 +2516,7 @@
"Vftef5": [
"Markdown کے عام مسائل — ہارڈ ٹیبز، عنوانات کی سطحوں کا اضافہ، فہرست کے نشانات، اور مزید۔"
],
+ "Vl1H8I": ["مطابقت پذیری جاری رکھنے کے لیے دوبارہ منسلک ہونا ضروری ہے۔"],
"Vlc75q": ["فائل حذف ہی رکھیں"],
"VmJT51": ["آپ کی رپورٹس لوڈ ہو رہی ہیں"],
"VmXASo": ["(سِم لنک)"],
@@ -2537,6 +2542,7 @@
["rootPath"],
"</0> پر پہلے سے ایک OpenKnowledge پروجیکٹ موجود ہے۔ اس سے باہر کوئی مقام منتخب کریں، یا اس کے بجائے وہی پروجیکٹ کھولیں۔"
],
+ "W7mERj": ["خودکار (صرف کھینچیں) فعال کریں؟"],
"W8vpBM": ["ابتدائی پیک"],
"W9NSe0": ["لنکس کی جانچ ہو رہی ہے"],
"W9_Bub": ["مقامی تبدیلیاں آنے والی مطابقت پذیری سے ٹکراتی ہیں"],
@@ -2556,6 +2562,7 @@
" منتخب آئٹمز حذف کرنا چاہتے ہیں؟ فولڈرز اور ان کے اندر کی تمام فائلیں حذف ہو جائیں گی۔ یہ عمل واپس نہیں لیا جا سکتا۔"
],
"WMsoIm": ["پہلے سے سائن اِن ہیں؟"],
+ "WOfp4H": ["مطابقت پذیری کا وقفہ اپ ڈیٹ نہیں ہو سکا — ", ["detail"]],
"WOr-hW": ["ٹوکنز"],
"WPwDin": ["ڈسک پر فولڈر کھولیں"],
"WR0y2O": ["فولڈر شیئر کریں"],
@@ -2574,6 +2581,7 @@
"Wcv-Zi": ["اس نالج بیس کو Claude مہارت کے طور پر دستیاب کریں۔"],
"We7h2I": ["📝 یا assets/icon.png"],
"Weq9zb": ["عمومی"],
+ "WfcERq": ["کمٹ کرنے کو کچھ نہیں: ورکنگ ٹری صاف ہے۔"],
"Wfy3rU": ["ایجنٹ کی ترتیبات"],
"Wgmlsw": ["لایا جا رہا ہے"],
"Wh0im4": ["[[", ["realCurrentDoc"], "]] میں ترمیم کر رہا ہے"],
@@ -2627,7 +2635,6 @@
"XRuL0i": ["صفحہ بنائیں"],
"XSb9HS": ["مقامی ترامیم رد کریں، نصب شدہ ورژن بحال کریں"],
"XT-L4j": ["AI سے بنانے کے لیے کوئی ایجنٹ فعال کریں"],
- "XU0OXn": ["خودکار مطابقت پذیری فعال کریں"],
"XU5AOg": ["اِن پٹ"],
"XV5sC0": ["ورک ٹری کھولیں"],
"XW18jo": ["صفحے کے عنوانات کا جواب کامیابی کے اسکیما سے میل نہیں کھایا"],
@@ -2676,6 +2683,7 @@
"Xp7Kq4": ["ایک اور مطابقت پذیری جاری ہے۔ تھوڑی دیر بعد دوبارہ کوشش کریں۔"],
"Xp94R1": ["ایک بار اور کوشش کریں"],
"XpIZmv": ["یکساں چوڑائی والے متن کے ساتھ باڑ والا کوڈ بلاک۔"],
+ "Xs1kjx": ["اپ ڈیٹس دیکھنے کا وقفہ"],
"Xs7IcT": [["displayName"], " تک رسائی نہیں ہو سکی۔ دوبارہ کوشش کریں؟"],
"XszXjc": ["نام بدل کر ", ["0"], " کر دیا گیا"],
"XtRoxT": ["صفحہ ", ["pageNumber"]],
@@ -2708,6 +2716,7 @@
"لِنٹ پلگ اِنز — کون سے قاعدے کے خاندان چلتے ہیں اور ہر قاعدے کی ترتیبات — «یہ پروجیکٹ ← پلگ اِنز» کے تحت اپنے الگ ٹیب میں ترتیب دیے جاتے ہیں۔"
],
"YEP3X2": ["جب فعال ٹیبل سیل کا انتخاب پورے ٹیبل پر محیط ہو تو ٹیبل حذف کریں۔"],
+ "YEzhIr": ["کھینچیں اور پُش کریں"],
"YGIi_c": ["دوبارہ نصب کریں"],
"YGNRB5": ["— سوائے"],
"YGt-0e": ["پڑھا جا رہا ہے…"],
@@ -2747,7 +2756,6 @@
"صرف اسی کمپیوٹر پر اس پروجیکٹ پر لاگو ہوتا ہے۔ ‎.ok/local میں محفوظ، git کے ذریعے مشترک نہیں۔"
],
"Yp-Hi_": ["ترتیبات کھولیں"],
- "YsEYYS": [["behind", "plural", { "one": ["#", " کمٹ پیچھے"], "other": ["#", " کمٹس پیچھے"] }]],
"YvwwqC": ["کہاں"],
"YwPUUP": ["یہ پیک یہاں پہلے سے ترتیب دیا جا چکا ہے۔"],
"YxZDGh": [
@@ -2850,7 +2858,6 @@
"ZscwQ0": ["«صرف میں» پر تبدیل نہیں ہو سکا"],
"Zt7Ktx": ["پاتھ اسکل سے باہر نہیں جا سکتا (. یا .. نہیں)"],
"Zue_jx": ["آپ کے GitHub ٹوکن میں مطلوبہ دائرہ کار غائب ہیں۔ دوبارہ سائن اِن کر کے دیکھیں۔"],
- "Zul8Ry": ["کبھی نہیں"],
"ZvzbDF": ["اسے براہِ راست اس پروجیکٹ میں شامل کریں۔"],
"ZwpggY": ["OpenKnowledge نے پروجیکٹ کی ترتیبات پڑھیں"],
"_0JUKX": ["بگ رپورٹنگ کے لیے OpenKnowledge ڈیسک ٹاپ ایپ درکار ہے۔"],
@@ -2979,9 +2986,6 @@
"ai40UJ": ["نیا ریکارڈ · دوبارہ کھیلنے کے لیے <0>اسپیس</0> دبائیں"],
"aiArms": ["ہم یہ ریپازٹری کلون نہیں کر سکے۔"],
"aiOceC": ["اشاریہ جات کو فعال کریں۔"],
- "ajHi4O": [
- "خودکار مطابقت پذیری روکی گئی ہے — آپ کو اس ریپو میں پُش کرنے کی اجازت نہیں۔ اپ ڈیٹس ملتی رہیں اس کے لیے «پیروی» پر جائیں۔"
- ],
"ajz9F8": [
["filePath"],
" کے تصادم کا مواد لوڈ نہیں ہو سکا۔ صفحہ دوبارہ لوڈ کرنے کی کوشش کریں۔"
@@ -3001,7 +3005,6 @@
"arUUsK": ["مصنوعات کی اپ ڈیٹس"],
"ax9kie": ["لنک کے پیش منظر کی ترتیبات ابھی لوڈ نہیں ہوئیں — تھوڑی دیر بعد دوبارہ کوشش کریں"],
"axQ1h6": ["کچھ اور شامل کرنا چاہیں گے؟ (اختیاری)"],
- "az8lvo": ["بند"],
"b18t0_": ["فرق بند کریں"],
"b1FDss": ["شروع تک سکرول کریں"],
"b2ezG_": ["دونوں رکھ لیے گئے — «", ["0"], "» اب اپنی الگ مہارت ہے"],
@@ -3098,6 +3101,9 @@
],
"cH0dkG": ["اس میں وہ خصوصیت نہیں تھی جو مجھے درکار تھی"],
"cHhH3i": ["ایک مطلوبہ git ٹول"],
+ "cIFYZn": [
+ "جب تک آپ سائن آؤٹ ہیں، اس ترتیب سے قطع نظر اپ ڈیٹس زیادہ سے زیادہ ہر 3 منٹ بعد دیکھی جاتی ہیں۔"
+ ],
"cIptmH": ["Claude Desktop App میں"],
"cKjLuT": ["(پروجیکٹ + صارف)"],
"cLP0Lf": ["ریموٹ مہارت کا ماخذ"],
@@ -3165,6 +3171,8 @@
"ct2kv5": [["pageTarget"], " میں کوئی عنوان نہیں"],
"cuA8QW": ["اسپیکس منظم کریں"],
"cuHhjo": ["بنائیں اور ترمیم کریں"],
+ "cyoNqf": ["ضم نہیں ہوا"],
+ "czQDKY": ["ہر پُش آپ کے ریموٹ پر ایک کمٹ ہے۔"],
"d-GtJt": ["ماخذ Markdown میں دیکھیں"],
"d1JjXo": [
"برانچ <0>",
@@ -3258,6 +3266,9 @@
"eGUbmF": ["منتخب فائل یا فولڈر نقل کریں"],
"eJitUk": ["کمپیوٹر سے اپ لوڈ کریں"],
"eKThTQ": ["ترتیب نہیں بدلی جا سکی"],
+ "eNOyTV": [
+ "آپ کو اس ریپازٹری میں پُش کرنے کی اجازت نہیں۔ خودکار (صرف کھینچیں) پھر بھی آپ کی کاپی تازہ رکھ سکتا ہے۔"
+ ],
"eNQGRb": ["KaTeX سے رینڈر کی گئی اِن لائن LaTeX ریاضی۔"],
"eNhWUl": ["ایک PR جائزہ کار، ریلیز نوٹس لکھنے والا، تعیناتی کی چیک لسٹ..."],
"ePK91l": ["ترمیم"],
@@ -3287,6 +3298,7 @@
"emMrXQ": ["سرور نے بگڑا ہوا ڈپلیکیٹ جواب لوٹایا۔"],
"emgiet": ["مستند مواد؛ جہاں بھی اس کا حوالہ ہو وہاں لفظ بہ لفظ منعکس ہوتا ہے۔"],
"enPTnx": ["سطر ", ["displayLine"]],
+ "eolhcI": ["ورکنگ ٹری پڑھی جا رہی ہے"],
"eps54V": ["ہٹا دیا گیا"],
"epuNYK": [
"کسی بلاک کو سچائی کا ماخذ نشان زد کریں۔ اس میں ترمیم کرتے ہی دوسری جگہوں کے مررز براہِ راست تازہ ہو جاتے ہیں۔"
@@ -3294,7 +3306,6 @@
"erenF-": ["ایسی فائلیں حذف نہیں کی جا سکتیں جن کے تنازعات حل نہیں ہوئے"],
"euGaS0": [["fileName"], " پڑھا نہیں جا سکا۔"],
"euc6Ns": ["نقل بنائیں"],
- "evHlIg": ["پیروی آپ کی مقامی تبدیلیاں کبھی پُش یا کمٹ نہیں کرتی۔ وہ صرف اسی مشین پر رہتی ہیں۔"],
"evs0iw": ["«", ["tagListQuery"], "» سے مماثل ٹیگز"],
"ewSbS_": ["Shell سیشن"],
"ezUmoU": ["اجازت شدہ عنصری اقدار (خالی = کوئی بھی)"],
@@ -3373,7 +3384,6 @@
}
]
],
- "g2Tj8R": ["مکمل"],
"g3UF2V": ["قبول کریں"],
"g4WlQK": ["پروجیکٹ کے AI ٹولز کا انتظام صرف OpenKnowledge ڈیسک ٹاپ ایپ میں دستیاب ہے۔"],
"g4XBm0": ["چھوٹا سیکشن عنوان۔"],
@@ -3388,7 +3398,6 @@
["display"],
" میں ضم کرنے کے لیے کوئی فولڈر منتخب کریں۔ وہ فولڈر اس کا سِم لنک بن جاتا ہے، اس لیے اس کا ایجنٹ یہاں رکھی ہر چیز پڑھتا ہے۔ یہ فولڈر حقیقی رہتا ہے۔ متصادم مہارتیں ضم کرنے کا عمل روک دیتی ہیں۔"
],
- "g85bAo": [["lastSyncedRelative"], " مطابق ہوا"],
"g9Nj4l": ["// نوٹ"],
"gAhHu7": ["خودکار اصلاح صرف ان مسائل پر لاگو ہوتی ہے جن کا معلوم میکانکی حل موجود ہو۔"],
"gBbxn_": ["سائن اِن کی حالت جانچی جا رہی ہے"],
@@ -3460,6 +3469,7 @@
"یہ دستاویز ابھی GitHub سے مطابق نہیں ہوئی۔ لنک اگلی مطابقت پذیری کے بعد کام کرے گا۔"
],
"gyHDWC": ["AI سے سب ٹھیک کریں (", ["count"], ")"],
+ "gyYvCN": ["میری ترامیم بھیجنے کا وقفہ"],
"h-AdvS": ["فولڈرز اور ٹیمپلیٹس یہاں پہلے سے موجود ہیں، اس لیے شامل کرنے کو کچھ نہیں۔"],
"h06R3C": ["کسی صفحے میں جانے والے گراف لنکس کی کمی نہیں۔"],
"h16FyT": ["فہرستیں"],
@@ -3534,9 +3544,6 @@
"hwFOFD": ["ترتیبات لوڈ نہیں ہو سکیں"],
"hxBHxQ": ["ایک سطر جس میں فٹ نوٹ<0><1>[1]</1></0> اور نیچے دکھائی گئی تعریف ہے۔"],
"hxEUVJ": [["selectedPackName"], " کا ابتدائیہ کریں"],
- "hxYFzm": [
- "مکمل مطابقت پذیری — آپ کے کمٹس پُش اور ریموٹ تبدیلیاں خودکار طور پر کھینچی جاتی ہیں۔"
- ],
"hxnF0I": [["0"], " کی خصوصیات"],
"hyCxJY": ["اس کے بجائے وہ ورک ٹری کھولیں"],
"hynz2K": ["ڈاؤن لوڈ شروع ہو گیا"],
@@ -3550,7 +3557,6 @@
"i09An-": ["ایک پرانا ورژن بحال کر دیا گیا (", ["0"], ")"],
"i1flq_": ["وکی لنک کی تجاویز"],
"i3f2kh": ["کوئی مماثل کمانڈ نہیں۔"],
- "i6ng22": ["«پیروی» پر بدلیں"],
"i92eAT": ["ہم ایک ریپازٹری بنا کر مطابقت پذیری شروع کر دیں گے — کسی ٹرمینل کی ضرورت نہیں۔"],
"i94lQe": ["OpenKnowledge نے تنازعات کی جانچ کی"],
"i9OyGp": ["واپسی یا دوبارہ"],
@@ -3636,13 +3642,11 @@
],
"iqugog": ["ابتدائیہ ناکام: ", ["errorDetail"]],
"irFGwu": ["ٹیمپلیٹس کی فہرست"],
+ "irnKr_": [["updatedRelative"], " اپ ڈیٹ ہوا"],
"irrm_E": ["انتخاب ہٹائیں"],
"isRobC": ["نیا"],
"iuTKci": ["ابھی کوئی ترمیم نہیں۔"],
"iv452l": [["0"], " کی دستاویزات (براؤزر میں کھلتی ہیں)"],
- "iy64Li": [
- "مکمل مطابقت پذیری — آپ کی ترامیم خودکار طور پر کمٹ اور آپ کے ریموٹ پر پُش ہوتی ہیں۔"
- ],
"iycx_A": ["پُش کیا جا رہا ہے"],
"iz1LdD": [
"آخری بار یہاں لکھنے کے بعد OK سے باہر تبدیل ہوا — دکھائی گئی حالت وہی ہے جو اب ڈسک پر ہے"
@@ -3696,6 +3700,7 @@
"jTLWxh": [
"کوئی بیرونی صفحہ اِن لائن iframe میں شامل کریں (دستاویزات، ڈیمو، Figma، CodeSandbox)۔"
],
+ "jTUxaN": ["خودکار (صرف کھینچیں) فعال کریں"],
"jWzDfC": ["دیکھا جا رہا ہے کہ آپ کے پاس کون سے AI ٹولز ہیں"],
"jZ_E5M": ["لانا ناکام رہا — تفصیلات کے لیے سرور کے لاگز دیکھیں۔"],
"j_Z6g7": ["مشترکہ طے شدہ"],
@@ -3788,13 +3793,15 @@
"معنوی تلاش کو OpenAI سے ہم آہنگ کسی بھی ایمبیڈنگز اینڈ پوائنٹ کی طرف موڑیں — خود میزبان سرور یا کوئی دوسرا فراہم کنندہ۔ اوپر دی گئی API کلید اسی اینڈ پوائنٹ کے لیے ہے جو آپ یہاں مقرر کریں۔"
],
"kSiB3X": [["trashNoun"], " میں منتقل نہیں ہو سکا"],
- "kUn-CN": ["مطابقت پذیری بند"],
"kV2YZv": [
"<0>مہارتیں</0> نظر نہیں آ رہیں؟ پہلے <1>ترتیبات <2/> صلاحیتیں <3/> کوڈ کا اجرا اور فائل سازی</1> فعال کریں۔"
],
"kVS5tE": ["ہر فولڈر میں generated اشاریہ جات کو برقرار رکھیں؟"],
"kVgQUA": ["یہ چیٹ حذف کریں؟"],
"kVzuTI": ["تجویز کردہ ایجنٹ کی مہارت"],
+ "kXNv8P": [
+ "خودکار (صرف کھینچیں) آپ کی مقامی تبدیلیاں کبھی پُش یا کمٹ نہیں کرتا۔ وہ صرف اسی مشین پر رہتی ہیں۔"
+ ],
"kYL1lH": ["ایجنٹ کی سرگرمی"],
"k_Dqw1": [
[
@@ -3888,6 +3895,7 @@
"lM4c-I": [
"مہارت کے اندر کا راستہ — کوئی بھی فولڈر چلتا ہے (مثلاً references/notes.md)۔ راستے میں شامل فولڈرز آپ کے لیے بنا دیے جاتے ہیں۔"
],
+ "lPkjpD": [["pushed"], " بھیجا گیا"],
"lPzyrU": ["تمام حصے حل ہو گئے"],
"lS83Sg": ["کلپ بورڈ تک رسائی نہیں ہو سکی۔"],
"lScd1O": ["Slidev ڈیک صرف OpenKnowledge ڈیسک ٹاپ ایپ میں کھلتے ہیں۔"],
@@ -4215,6 +4223,7 @@
"pJ7XCo": ["یہ صفحہ کسی مقامی فائل یا تصویر کا حوالہ نہیں دیتا۔"],
"pMPnZv": [["deleted"], " مہارتیں حذف ہو گئیں"],
"pOo4Aa": ["سادہ متن"],
+ "pPiV8s": ["خودکار (کھینچیں اور پُش) فعال کریں"],
"pSimwP": [["editor"], " ورژن کے لیے نیا نام"],
"pTPqMK": ["باڑ والا کوڈ بلاک بدلیں۔"],
"pTyA_t": ["ٹیگز"],
@@ -4279,6 +4288,7 @@
"qAx7xG": ["مواد کی جڑ میں مقررہ فولڈر"],
"qBi_YG": ["اپنے AI ٹولز میں OpenKnowledge انسٹال کریں"],
"qC7PwZ": ["فیلڈ ہٹایا نہیں جا سکا"],
+ "qD3krc": ["جب تک آپ نہ کہیں، کچھ نہیں چلے گا۔"],
"qEEfPk": ["بگ رپورٹ ", ["0"]],
"qEIFZu": [["keyHint"], " پر ختم ہونے والی کلید"],
"qEue6Q": [" یا "],
@@ -4287,6 +4297,9 @@
"qIJIrD": ["جانچا جا رہا ہے"],
"qJSo0_": ["نقول اور سِم لنکس میں کیا فرق ہے؟"],
"qKMfPp": ["مہارت نوڈز چھپائیں"],
+ "qLXJTB": [
+ "اس پروجیکٹ کو اپنے git ریموٹ کے ساتھ مطابقت میں رکھیں۔ خودکار (صرف کھینچیں) پُش کیے بغیر اپ ڈیٹس لاتا ہے؛ خودکار (کھینچیں اور پُش) آپ کی ترامیم بھی بھیجتا ہے۔ خودکار مطابقت پذیری آن کرنے کے لیے تصدیق درکار ہے۔"
+ ],
"qNOgUu": ["ماخذ پر ہونے والی ترامیم یہاں پہنچتی ہیں — نقل و چسپاں کا کوئی فرق نہیں۔"],
"qQi_um": ["تھیم درآمد ہو گئی۔"],
"qRZh7J": ["Tab کو سورس ایڈیٹر سے باہر نکلنے دیں، اندروں کھسکانے کے بجائے۔"],
@@ -4302,7 +4315,6 @@
"qXg5W9": ["فائل <0>~/Downloads/openknowledge.skill</0> میں محفوظ ہوتی ہے۔"],
"qXsafh": ["GitHub پر شائع کریں"],
"qZv5ZR": ["کنفیگ اشتراک کی تبدیلی ناکام رہی"],
- "q_9EcE": ["git کی خودکار مطابقت پذیری فعال کریں؟"],
"q_Q1-i": [
[
"count",
@@ -4388,7 +4400,6 @@
["boldName"],
" کا پیش منظر ہے — ایک بلٹ اِن مہارت جو Open Knowledge کے ساتھ آتی ہے۔ یہ صرف پڑھنے کے لیے ہے۔"
],
- "rn7n0G": ["مطابقت پذیری جاری رکھیں"],
"rnX-1S": ["پلگ اِنز فعال کریں"],
"rnrdEX": ["بنیادی"],
"roAe2K": ["لنک کا URL"],
@@ -4432,6 +4443,7 @@
"sJK6pq": ["اجازت نہیں"],
"sJWhgo": ["نامعلوم جزو: ", ["unregisteredComponentName"]],
"sKEgGd": ["چیٹ میں بھیجیں"],
+ "sKHiNR": [["count"], " پیچھے"],
"sNeKjP": ["ٹوکن محفوظ نہیں ہو سکا — دوبارہ کوشش کریں"],
"sOxZaS": ["گراف لوڈ نہیں ہو سکا"],
"sQoLn0": ["باہر نکلیں"],
@@ -4455,6 +4467,7 @@
"scyoP9": [
"انڈیکس دستاویزات میں کوئی frontmatter نہیں ہے، سوائے آپ کے علم کی بنیاد پر موجود دستاویز کے۔ لاگ دستاویزات کا احاطہ نہیں کیا گیا ہے — OKF ان کے frontmatter کو محدود نہیں کرتا ہے۔"
],
+ "sdvHp3": ["یہاں اور ریموٹ دونوں پر تبدیل ہوئیں"],
"se-tU0": [["total"], " میں سے ", ["0"], " فائلیں درست نہیں کی جا سکیں۔"],
"seeS6l": ["اس فولڈر میں OpenKnowledge ترتیب دیں؟"],
"sgmRY8": [["0"], " کا ڈاؤن لوڈ چھوڑ دیا گیا۔"],
@@ -4470,6 +4483,9 @@
"snrVQ7": ["جانچ ناکام"],
"sq4WQH": [["0"], " کو روشن تھیم کے طور پر استعمال کریں"],
"sqUrlK": ["غور و فکر جاری ہے…"],
+ "srdlOs": [
+ "خودکار مطابقت پذیری روکی گئی ہے: آپ کو اس ریپازٹری میں پُش کرنے کی اجازت نہیں۔ اپ ڈیٹس ملتے رہنے کے لیے خودکار (صرف کھینچیں) پر جائیں۔"
+ ],
"ssk6rl": [
"مہارت کا اپنا فولڈر (",
["path"],
@@ -4491,12 +4507,12 @@
"قابلِ ڈاؤن لوڈ فائل کے لیے Notion طرز کی اِن لائن قطار۔ کھینچ کر چھوڑنا بھی کام کرتا ہے۔"
],
"t18QYR": [["accessibleLabel"], " کی پن ہٹائیں"],
- "t2TkQ3": ["مطابقت پذیری روکی ہوئی — جاری رکھنے کے لیے تصادمات حل کریں۔"],
"t4sFKC": [
"نئی برانچ <0>",
["trimmed"],
"</0> موجودہ کمٹ سے بنے گی، <1>.ok/worktrees/</1> کے تحت اپنے الگ ورک ٹری میں۔"
],
+ "t5I7P_": ["جب تک آپ نہ کہیں، کچھ نہیں چلے گا — مطابقت پذیری کے مینو سے کھینچیں اور پُش کریں۔"],
"t6w1cq": ["خالی ایڈیٹر ٹیب کھولیں۔"],
"t7YoBO": ["یہ تبصرہ بھیجیں"],
"t9Qn8y": ["کوئی ایجنٹ فعال نہیں"],
@@ -4535,6 +4551,7 @@
"tjXez2": ["blog-post"],
"tjbyOy": ["پروجیکٹ کی تفصیلات"],
"tkIXtS": [["imported"], " مہارتیں نصب ہو گئیں (", ["alreadyImported"], " پہلے سے موجود تھیں)"],
+ "tlGXxX": ["خودکار (صرف کھینچیں)"],
"tnG-m6": ["خودکار مطابقت پذیری روکی گئی ہے — جاری رکھنے کے لیے سائن اِن کریں۔"],
"toyw51": ["Mermaid خاکے کے کنٹرولز"],
"tqQBwN": ["کوئی بھی اسکرپٹ جائزے کے لیے دکھائی جاتی ہے، کبھی چلائی نہیں جاتی۔"],
@@ -4561,6 +4578,7 @@
"u779EG": ["http:// یا https:// اوریجن استعمال کریں۔"],
"u7H-Wn": ["پینل دکھائیں (", ["panelShortcutLabel"], ")"],
"u7U_Ij": ["منتخب متن کو لنک کریں، یا کرسر کے نیچے موجود لنک میں ترمیم کریں۔"],
+ "uAQUqI": ["حالت"],
"uA_jXp": ["برانچ بدلیں اور تازہ کریں"],
"uBAxNB": ["ایڈیٹر"],
"uCaIdy": [
@@ -4591,9 +4609,6 @@
"سرور دوبارہ نہیں چل سکا — یہ کسی مختلف اکاؤنٹ کے تحت چل رہا ہے۔ اسے صاف کرنے کے لیے اپنا کمپیوٹر دوبارہ چالو کریں، پھر یہ پروجیکٹ دوبارہ کھولیں۔"
],
"uUCrBv": ["سِم لنک"],
- "uUiiyC": [
- "آپ کو اس ریپو میں پُش کرنے کی اجازت نہیں۔ «پیروی» پھر بھی آپ کی نقل تازہ رکھ سکتی ہے۔"
- ],
"uVbUP8": ["ترتیبات…"],
"uY5Z7P": ["کھیل ختم · دوبارہ کھیلنے کے لیے <0>اسپیس</0> دبائیں"],
"uYZTcW": ["اس GitHub URL کا اشتراک نہیں کیا جا سکتا۔"],
@@ -4635,6 +4650,7 @@
"v15iQB": [
"تصدیق شدہ حساب کا معاہدہ۔ صرف Attested Computation ٹائپ شدہ دستاویزات پر لاگو ہوتا ہے، جہاں OKF کو runtime کی ضرورت ہوتی ہے؛ عام تصورات متاثر نہیں ہوتے ہیں۔"
],
+ "v16Pzh": ["خودکار (صرف کھینچیں) پر جائیں"],
"v2ZW0K": ["ٹرمینل فعال کریں"],
"v2a04T": ["markdownlint کے قواعد"],
"v41fCm": ["فائل نہیں ملی"],
@@ -4658,6 +4674,7 @@
"vGeNNQ": [
"ایک پرامپٹ نقل کریں اور اپنے پروجیکٹ کی ترتیب کے لیے اسے اپنے ایجنٹ میں چسپاں کریں۔"
],
+ "vGjmyl": ["حذف شدہ"],
"vHlhDc": ["ترمیم کے لیے ڈبل کلک کریں"],
"vIxrEk": ["چوڑائی کے مطابق"],
"vLyv1R": ["چھپائیں"],
@@ -4710,8 +4727,10 @@
}
]
],
+ "vp5vfW": ["1 گھنٹہ"],
"vppAju": ["نئے شامل ہونے والے منسلکات کہاں رکھے جاتے ہیں۔"],
"vqJXNe": ["<0>open-knowledge-discovery</0> اسکل انسٹال کریں"],
+ "vsFXfP": ["پُش نظرانداز کرتا ہے"],
"vv7kpg": ["منسوخ شدہ"],
"vvWZnu": ["فرق دستیاب نہیں"],
"vwV-kH": ["فائلیں درست کرنے کا عمل غیر متوقع طور پر رک گیا۔"],
@@ -4778,6 +4797,11 @@
"wdzBgi": ["کنفیگ کا اشتراک اب صرف آپ تک محدود ہے۔"],
"weP6me": ["دستاویزات لوڈ نہیں ہو سکیں — دوبارہ کوشش کے لیے @ دوبارہ لکھیں"],
"wgNoIs": ["سب منتخب کریں"],
+ "wk_v1X": [
+ "اس ورک ٹری کی مطابقت پذیری «خودکار (کھینچیں اور پُش)» پر سیٹ ہے، جو ",
+ ["project"],
+ " سے وراثت میں ملی۔ اسے ترتیبات ← مطابقت پذیری میں بدلیں۔"
+ ],
"wlwXUk": [
"آپ نے ~/Downloads منتخب کیا۔ وہاں فائلیں عموماً عارضی ہوتی ہیں — اس کے بجائے کسی مستقل فولڈر پر غور کریں۔"
],
@@ -4817,6 +4841,7 @@
"xCdTnb": ["نیا ٹیب بند کریں"],
"xDBki3": ["عنوانات کی تجاویز"],
"xDEcka": ["فراہم کنندہ اس کلید کی شرح محدود کر رہا ہے۔ تھوڑی دیر بعد دوبارہ کوشش کریں۔"],
+ "xDKOFk": ["نظر انداز شدہ"],
"xEb24l": ["ہمیں ای میل کے ذریعے رابطہ کرنے دیں"],
"xFQRu4": ["یہ میرے پاس پہلے سے مقامی طور پر موجود ہے"],
"xG4tb6": ["«", ["docName"], "» سے رابطہ ختم ہو گیا۔"],
@@ -4828,6 +4853,7 @@
"xOTzt5": ["ابھی ابھی"],
"xSVO3J": ["کیا بنتا ہے"],
"xV5sXw": [["0"], " ہفتے پہلے"],
+ "xW5AUw": [["pulled"], " کھینچا گیا"],
"xWEvuo": ["AI سے پوچھیں"],
"xWomUD": [["editor"], " والا ورژن استعمال کریں"],
"xXo8FT": ["محفوظ کرنا ناکام: ", ["error"]],
@@ -4963,6 +4989,7 @@
"zAJzIg": [["0"], " میں مسائل"],
"zAsDLY": ["دستاویزات کے لنکس کی گرافی نمائش"],
"zBUqvf": ["OpenKnowledge کے انضمامات ترتیب دیں…"],
+ "zBiFZh": ["آپ کی ترامیم خودکار طور پر کمٹ ہو کر آپ کے ریموٹ پر بھیج دی جاتی ہیں۔"],
"zC5jrM": ["<0>", ["effective"], "</0> کے طور پر بنایا جائے گا"],
"zD1Nqf": [["count", "plural", { "one": ["#", " دستاویز"], "other": ["#", " دستاویزات"] }]],
"zFH7iU": [
@@ -4977,6 +5004,7 @@
"zLak8b": ["نیا ٹیب فعال کریں"],
"zMmwh4": ["ایک تھیم منتخب کریں یا اپنی تھیم بنائیں۔"],
"zQBg2C": ["موجودہ بلاک کو ایک درجہ اوپر یا نیچے لے جائیں۔"],
+ "zWZBPx": ["قسم تبدیل ہوئی"],
"zXj1rA": ["معنی کے لحاظ سے تلاش کریں"],
"zYp8Sr": [
"<0>ترمیم شدہ</0> کا نشان ان قواعد کو ظاہر کرتا ہے جو آپ کی کنفیگ واضح طور پر مقرر کرتی ہے — براہِ راست، یا <1>extends</1> کے ذریعے وراثت میں۔ بغیر نشان والے قواعد اپنی طے شدہ حالت پر رہتے ہیں۔"
@@ -5019,7 +5047,6 @@
" کا نہیں۔ ",
["expectedHost"],
" سے کلون کیا گیا کوئی فولڈر منتخب کریں؟"
- ],
- "zz_Wd_": ["موڈ"]
+ ]
}
}
diff --git a/packages/app/src/locales/ur/messages.po b/packages/app/src/locales/ur/messages.po
index 0bc1e487e..6c7ac84ad 100644
--- a/packages/app/src/locales/ur/messages.po
+++ b/packages/app/src/locales/ur/messages.po
@@ -517,10 +517,6 @@ msgstr "{ahead} آگے، {behind} پیچھے"
msgid "{basename} — text editor"
msgstr "{basename} — ٹیکسٹ ایڈیٹر"
-#: src/components/SyncStatusBadge.tsx
-msgid "{behind, plural, one {# commit behind} other {# commits behind}}"
-msgstr "{behind, plural, one {# کمٹ پیچھے} other {# کمٹس پیچھے}}"
-
#: src/components/SyncStatusBadge.tsx
msgid "{behind} behind"
msgstr "{behind} پیچھے"
@@ -616,6 +612,14 @@ msgstr "{count, plural, one {فوری طور پر وہ # مسئلہ حل کرت
msgid "{count, plural, one {matches # file} other {matches # files}}"
msgstr "{count, plural, one {# فائل سے مماثل} other {# فائلوں سے مماثل}}"
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} ahead"
+msgstr "{count} آگے"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} behind"
+msgstr "{count} پیچھے"
+
#: src/components/SkillBulkDeleteDialog.tsx
msgid "{count} skills"
msgstr "{count} مہارتیں"
@@ -811,14 +815,11 @@ msgstr "سطر {displayLine} پر {localizedMessage}"
msgid "{mins, plural, one {# min ago} other {# min ago}}"
msgstr "{mins, plural, one {# منٹ پہلے} other {# منٹ پہلے}}"
-#: src/components/SyncStatusBadge.tsx
-msgid "{minutes} min ago"
-msgstr "{minutes} منٹ پہلے"
-
#: src/components/acp/ThreadHistoryMenu.tsx
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "{minutes}m ago"
msgstr "{minutes} منٹ پہلے"
@@ -910,6 +911,10 @@ msgstr "{propertyCount, plural, one {# خصوصیت} other {# خصوصیات}}"
msgid "{propPanelDescriptorLabel} Properties"
msgstr "{propPanelDescriptorLabel} کی خصوصیات"
+#: src/components/settings/SyncSection.tsx
+msgid "{seconds} seconds"
+msgstr "{seconds} سیکنڈ"
+
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
@@ -1127,6 +1132,26 @@ msgstr "📝 یا assets/icon.png"
msgid "0/0"
msgstr "0/0"
+#: src/components/settings/SyncSection.tsx
+msgid "1 hour"
+msgstr "1 گھنٹہ"
+
+#: src/components/settings/SyncSection.tsx
+msgid "1 minute"
+msgstr "1 منٹ"
+
+#: src/components/settings/SyncSection.tsx
+msgid "15 minutes"
+msgstr "15 منٹ"
+
+#: src/components/settings/SyncSection.tsx
+msgid "30 seconds"
+msgstr "30 سیکنڈ"
+
+#: src/components/settings/SyncSection.tsx
+msgid "5 minutes"
+msgstr "5 منٹ"
+
#: src/components/ImportSkillForm.tsx
msgid "A .zip or .skill archive."
msgstr "ایک .zip یا .skill آرکائیو۔"
@@ -1521,6 +1546,7 @@ msgstr "اس پیغام میں اپنے تبصرے شامل کریں"
#: src/components/PropertyDiffBlock.tsx
#: src/components/SkillDirectoryResult.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Added"
msgstr "شامل کر دیا گیا"
@@ -1565,11 +1591,13 @@ msgstr "یہ فائلیں شامل کرتا ہے"
msgid "Adds these folders"
msgstr "یہ فولڈرز شامل کرتا ہے"
+#: src/components/settings/SyncSection.tsx
#: src/editor/components/PropPanel.tsx
msgid "Advanced"
msgstr "اعلیٰ"
#: src/components/ConsentDialogBody.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Advanced settings"
msgstr "اعلیٰ ترتیبات"
@@ -1979,6 +2007,24 @@ msgstr "مستند مواد؛ جہاں بھی اس کا حوالہ ہو وہاں
msgid "Authorize in browser"
msgstr "براؤزر میں اجازت دیں"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull and Push)"
+msgstr "خودکار (کھینچیں اور پُش)"
+
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull only)"
+msgstr "خودکار (صرف کھینچیں)"
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
+msgstr "خودکار (صرف کھینچیں) آپ کی ریموٹ git ریپازٹری سے اپ ڈیٹس لاتا ہے اور آپ کی کاپی خودبخود آگے بڑھاتا ہے۔ آپ کی مقامی ترامیم اسی کمپیوٹر پر رہتی ہیں اور کبھی پُش نہیں ہوتیں۔"
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) never pushes or commits your local changes. They stay only on this machine."
+msgstr "خودکار (صرف کھینچیں) آپ کی مقامی تبدیلیاں کبھی پُش یا کمٹ نہیں کرتا۔ وہ صرف اسی مشین پر رہتی ہیں۔"
+
#: src/components/settings/TerminalSection.tsx
msgid "Auto-approve settings not yet loaded — try again in a moment"
msgstr "خودکار منظوری کی ترتیبات ابھی لوڈ نہیں ہوئیں — تھوڑی دیر بعد دوبارہ کوشش کریں"
@@ -2012,21 +2058,13 @@ msgstr "خودکار اصلاح صرف ان مسائل پر لاگو ہوتی ہ
msgid "Auto-save"
msgstr "خودکار محفوظ"
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is off for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "اس ورک ٹری کے لیے خودکار مطابقت پذیری بند ہے، جو {project} سے وراثت میں ملی۔ اسے ترتیبات ← مطابقت پذیری میں بدلیں۔"
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "اس ورک ٹری کے لیے خودکار مطابقت پذیری فعال ہے، جو {project} سے وراثت میں ملی۔ اسے ترتیبات ← مطابقت پذیری میں بدلیں۔"
-
#: src/components/settings/SyncSection.tsx
msgid "Auto-sync is paused — sign in to resume."
msgstr "خودکار مطابقت پذیری روکی گئی ہے — جاری رکھنے کے لیے سائن اِن کریں۔"
#: src/components/settings/SyncSection.tsx
-msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Follow to keep receiving updates."
-msgstr "خودکار مطابقت پذیری روکی گئی ہے — آپ کو اس ریپو میں پُش کرنے کی اجازت نہیں۔ اپ ڈیٹس ملتی رہیں اس کے لیے «پیروی» پر جائیں۔"
+msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Auto (Pull only) to keep receiving updates."
+msgstr "خودکار مطابقت پذیری روکی گئی ہے: آپ کو اس ریپازٹری میں پُش کرنے کی اجازت نہیں۔ اپ ڈیٹس ملتے رہنے کے لیے خودکار (صرف کھینچیں) پر جائیں۔"
#: src/components/AutoSyncEnableWarning.tsx
msgid "Auto-sync periodically fetches, pulls, and pushes commits to your remote git repository so your edits stay in sync across machines."
@@ -2424,9 +2462,14 @@ msgid "Change the embeddings provider?"
msgstr "ایمبیڈنگز فراہم کنندہ بدلیں؟"
#: src/components/PropertyDiffBlock.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Changed"
msgstr "تبدیل شدہ"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Changed here and on the remote"
+msgstr "یہاں اور ریموٹ دونوں پر تبدیل ہوئیں"
+
#: src/components/ChangedOutsideBadge.tsx
msgid "changed outside"
msgstr "باہر تبدیل ہوا"
@@ -2451,6 +2494,10 @@ msgstr "تبدیلیاں خودکار طور پر محفوظ ہو گئیں۔"
msgid "Check for updates"
msgstr "اپ ڈیٹس دیکھیں"
+#: src/components/settings/SyncSection.tsx
+msgid "Check for updates every"
+msgstr "اپ ڈیٹس دیکھنے کا وقفہ"
+
#: src/components/AppMenubar.tsx
msgid "Check for updates…"
msgstr "اپ ڈیٹس دیکھیں…"
@@ -2970,6 +3017,10 @@ msgstr "اس کوڈ بلاک پر تبصرہ کریں یا AI سے پوچھیں"
msgid "Comments"
msgstr "تبصرے"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Commit and sync"
+msgstr "کمٹ کریں اور مطابق کریں"
+
#: src/components/ShareBranchSwitchDialog.tsx
msgid "Commit or stash changes to switch:"
msgstr "تبدیل کرنے کے لیے تبدیلیاں کمٹ کریں یا اسٹیش کریں:"
@@ -3271,6 +3322,7 @@ msgstr "تبدیل کیا جا رہا ہے..."
#: src/components/empty-state/CopyablePromptList.tsx
#: src/components/InstallInClaudeDesktopDialog.tsx
+#: src/components/SyncStatusBadge.tsx
#: src/editor/extensions/CodeBlockView.tsx
msgid "Copied"
msgstr "نقل ہو گیا"
@@ -3886,6 +3938,10 @@ msgstr "بھیجنے کے منتظر تبصرے پڑھے نہیں جا سکے
msgid "Couldn't read the comments waiting to send: {0}"
msgstr "بھیجنے کے منتظر تبصرے پڑھے نہیں جا سکے: {0}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Couldn't read the working tree. Check the server logs."
+msgstr "ورکنگ ٹری نہیں پڑھا جا سکا۔ سرور لاگز دیکھیں۔"
+
#. placeholder {0}: warning.code
#: src/components/settings/SavedThemesTiles.tsx
msgid "Couldn’t read this theme ({0})"
@@ -4459,6 +4515,10 @@ msgstr "یہ چیٹ حذف کریں؟"
msgid "Delete this comment"
msgstr "یہ تبصرہ حذف کریں"
+#: src/components/SyncStatusBadge.tsx
+msgid "Deleted"
+msgstr "حذف شدہ"
+
#. placeholder {0}: deletedTheme.label
#: src/components/settings/SavedThemesTiles.tsx
msgid "Deleted {0}."
@@ -4554,6 +4614,10 @@ msgstr "تفصیل کے ٹوکنز"
msgid "Design"
msgstr "ڈیزائن"
+#: src/components/SyncStatusBadge.tsx
+msgid "detached HEAD"
+msgstr "علیحدہ HEAD"
+
#: src/components/SyncStatusBadge.tsx
msgid "Detached HEAD — checkout a branch to resume"
msgstr "منقطع HEAD — جاری رکھنے کے لیے کوئی برانچ چیک آؤٹ کریں"
@@ -4926,6 +4990,10 @@ msgstr "ہر AI ٹول مہارتیں اپنے فولڈر سے پڑھتا ہے۔
msgid "Each pack scaffolds your project with ready-made folders and templates."
msgstr "ہر پیک آپ کے پروجیکٹ کا ڈھانچہ تیار شدہ فولڈرز اور ٹیمپلیٹس سے بناتا ہے۔"
+#: src/components/settings/SyncSection.tsx
+msgid "Each push is one commit to your remote."
+msgstr "ہر پُش آپ کے ریموٹ پر ایک کمٹ ہے۔"
+
#: src/components/AppMenubar.tsx
#: src/components/settings/LintingSection.tsx
#: src/components/SkillsTree.tsx
@@ -5174,25 +5242,25 @@ msgstr "{id} کو فعال کریں"
#: src/components/EnableSyncConfirmDialog.tsx
#: src/components/share-receive-miss-content.tsx
#: src/components/ShareFreshnessWarning.tsx
-msgid "Enable auto-sync"
-msgstr "خودکار مطابقت پذیری فعال کریں"
+msgid "Enable Auto (Pull and Push)"
+msgstr "خودکار (کھینچیں اور پُش) فعال کریں"
-#: src/components/settings/LinkPreviewsSection.tsx
-msgid "Enable external link previews"
-msgstr "بیرونی لنکس کے پیش منظر فعال کریں"
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Enable Auto (Pull and Push)?"
+msgstr "خودکار (کھینچیں اور پُش) فعال کریں؟"
#: src/components/AutoSyncOnboardingDialog.tsx
#: src/components/EnableSyncConfirmDialog.tsx
-msgid "Enable Follow"
-msgstr "پیروی فعال کریں"
+msgid "Enable Auto (Pull only)"
+msgstr "خودکار (صرف کھینچیں) فعال کریں"
#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable Follow?"
-msgstr "پیروی فعال کریں؟"
+msgid "Enable Auto (Pull only)?"
+msgstr "خودکار (صرف کھینچیں) فعال کریں؟"
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable git auto-sync?"
-msgstr "git کی خودکار مطابقت پذیری فعال کریں؟"
+#: src/components/settings/LinkPreviewsSection.tsx
+msgid "Enable external link previews"
+msgstr "بیرونی لنکس کے پیش منظر فعال کریں"
#: src/components/settings/LintingSection.tsx
msgid "Enable indexes"
@@ -5788,6 +5856,10 @@ msgstr "ایمبیڈنگز فراہم کنندہ تازہ نہیں ہو سکا
msgid "Failed to update the project sync default — {detail}"
msgstr "پروجیکٹ کی طے شدہ مطابقت پذیری تازہ نہیں ہو سکی — {detail}"
+#: src/components/settings/SyncSection.tsx
+msgid "Failed to update the sync interval — {detail}"
+msgstr "مطابقت پذیری کا وقفہ اپ ڈیٹ نہیں ہو سکا — {detail}"
+
#: src/components/FileTree.tsx
msgid "Failed to upload file"
msgstr "فائل اپ لوڈ نہیں ہو سکی"
@@ -6047,28 +6119,6 @@ msgstr "فولڈر شیئر لنک کاپی ہو گیا۔"
msgid "Folder target: {linkTitle}. Click to open the overview."
msgstr "فولڈر کا ہدف: {linkTitle}۔ جائزہ کھولنے کے لیے کلک کریں۔"
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow"
-msgstr "پیروی"
-
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow — updates flow in from your remote; your edits stay on this computer."
-msgstr "پیروی — اپ ڈیٹس آپ کے ریموٹ سے آتی رہتی ہیں؛ آپ کی ترامیم اسی کمپیوٹر پر رہتی ہیں۔"
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
-msgstr "پیروی آپ کی ریموٹ git ریپازٹری سے اپ ڈیٹس لاتی ہے اور آپ کی نقل کو خودکار طور پر آگے بڑھا دیتی ہے۔ آپ کی مقامی ترامیم اسی کمپیوٹر پر رہتی ہیں اور کبھی پُش نہیں ہوتیں۔"
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Follow is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "اس ورک ٹری کے لیے پیروی فعال ہے، جو {project} سے وراثت میں ملی۔ اسے ترتیبات ← مطابقت پذیری میں بدلیں۔"
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow never pushes or commits your local changes. They stay only on this machine."
-msgstr "پیروی آپ کی مقامی تبدیلیاں کبھی پُش یا کمٹ نہیں کرتی۔ وہ صرف اسی مشین پر رہتی ہیں۔"
-
#: src/components/acp/ThreadView.tsx
msgid "Follow the agent's edits"
msgstr "ایجنٹ کی ترامیم کی پیروی کریں"
@@ -6159,11 +6209,6 @@ msgstr "وہ frontmatter جس سے اس ٹیمپلیٹ سے بننے والی ہ
msgid "Frontmatter schemas"
msgstr "Frontmatter اسکیماز"
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Full"
-msgstr "مکمل"
-
#: src/components/InstallInClaudeDesktopDialog.tsx
msgid "Full guide"
msgstr "مکمل رہنما"
@@ -6177,14 +6222,6 @@ msgstr "مکمل راستہ"
msgid "Full Path"
msgstr "مکمل راستہ"
-#: src/components/settings/SyncSection.tsx
-msgid "Full sync — your commits push and remote changes pull automatically."
-msgstr "مکمل مطابقت پذیری — آپ کے کمٹس پُش اور ریموٹ تبدیلیاں خودکار طور پر کھینچی جاتی ہیں۔"
-
-#: src/components/SyncStatusBadge.tsx
-msgid "Full sync — your edits are committed and pushed to your remote automatically."
-msgstr "مکمل مطابقت پذیری — آپ کی ترامیم خودکار طور پر کمٹ اور آپ کے ریموٹ پر پُش ہوتی ہیں۔"
-
#: src/components/OkBlobRunner.tsx
msgid "Game over · press <0>Space</0> to play again"
msgstr "کھیل ختم · دوبارہ کھیلنے کے لیے <0>اسپیس</0> دبائیں"
@@ -6243,6 +6280,7 @@ msgid "Git needs a helper tool (such as git-lfs) that isn't installed or couldn'
msgstr "Git کو ایک معاون ٹول (جیسے git-lfs) درکار ہے جو نصب نہیں ہے یا نہیں مل سکا۔ اسے نصب کریں، پھر دوبارہ کوشش کریں۔"
#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Git sync"
msgstr "Git مطابقت پذیری"
@@ -6620,6 +6658,10 @@ msgstr "اشتراک کیسے کام کرتا ہے؟"
msgid "How missing project-local documents, files, and images are reported in Problems, editor diagnostics, audits, and agent tools."
msgstr "گم شدہ پروجیکٹ-لوکل دستاویزات، فائلوں اور تصاویر کو مسائل، ایڈیٹر تشخیصات، آڈٹس اور ایجنٹ ٹولز میں کیسے رپورٹ کیا جاتا ہے۔"
+#: src/components/settings/SyncSection.tsx
+msgid "How often this computer pulls changes from your remote."
+msgstr "یہ کمپیوٹر آپ کے ریموٹ سے کتنی بار تبدیلیاں کھینچتا ہے۔"
+
#: src/components/ShareFreshnessWarning.tsx
msgid "How to push manually"
msgstr "دستی طور پر پُش کیسے کریں"
@@ -6705,6 +6747,10 @@ msgstr "نظر انداز کرنے کے پیٹرنز"
msgid "Ignore patterns (raw text)"
msgstr "نظر انداز کرنے کے پیٹرنز (خام متن)"
+#: src/components/SyncStatusBadge.tsx
+msgid "Ignored"
+msgstr "نظر انداز شدہ"
+
#: src/components/LinksPanel.tsx
msgid "Image {identity}. Go to reference."
msgstr "تصویر {identity}۔ حوالہ پر جائیں۔"
@@ -7301,8 +7347,8 @@ msgid "Keep the name to 64 characters or fewer."
msgstr "نام کو 64 حروف یا اس سے کم رکھیں۔"
#: src/components/settings/SyncSection.tsx
-msgid "Keep this project in sync with your git remote. Follow fetches updates without pushing; full sync pushes your commits too. Turning sync on requires confirmation."
-msgstr "اس پروجیکٹ کو اپنے git ریموٹ کے ساتھ ہم آہنگ رکھیں۔ پیروی بغیر پُش کیے اپ ڈیٹس لاتی ہے؛ مکمل مطابقت پذیری آپ کے کمٹس بھی پُش کرتی ہے۔ مطابقت پذیری فعال کرنے کے لیے تصدیق درکار ہے۔"
+msgid "Keep this project in sync with your git remote. Auto (Pull only) brings in updates without pushing; Auto (Pull and Push) sends your edits too. Turning auto-sync on requires confirmation."
+msgstr "اس پروجیکٹ کو اپنے git ریموٹ کے ساتھ مطابقت میں رکھیں۔ خودکار (صرف کھینچیں) پُش کیے بغیر اپ ڈیٹس لاتا ہے؛ خودکار (کھینچیں اور پُش) آپ کی ترامیم بھی بھیجتا ہے۔ خودکار مطابقت پذیری آن کرنے کے لیے تصدیق درکار ہے۔"
#: src/lib/pack-copy.ts
msgid "Keep track of the people and companies you work with and the meetings you have with them. Good for remembering who someone is, how you know them, and what you last talked about."
@@ -7782,6 +7828,11 @@ msgstr "اس بلڈ میں AI ٹولز کا انتظام دستیاب نہیں۔
msgid "Managing project AI tools is unavailable in this build."
msgstr "اس بلڈ میں پروجیکٹ کے AI ٹولز کا انتظام دستیاب نہیں۔"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Manual"
+msgstr "دستی"
+
#: src/components/empty-state/use-create-suggestions.ts
msgid "Map the architecture"
msgstr "ڈھانچے کا نقشہ بنائیں"
@@ -7920,10 +7971,6 @@ msgstr "پیلیٹ کے رنگ غائب ہیں"
msgid "Missing theme name"
msgstr "تھیم کا نام غائب ہے"
-#: src/components/SyncStatusBadge.tsx
-msgid "Mode"
-msgstr "موڈ"
-
#: src/components/settings/SearchSection.tsx
msgid "Model"
msgstr "ماڈل"
@@ -7940,6 +7987,7 @@ msgstr "ماڈل کی ڈیفالٹ کوشش"
#: src/components/FolderOverview.tsx
#: src/components/settings/markdownlint-rule-browser.tsx
#: src/components/SkillOriginInline.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Modified"
msgstr "ترمیم شدہ"
@@ -8232,10 +8280,6 @@ msgstr "صفائی کے دوران نیٹ ورک کی خرابی"
msgid "Network settings not yet loaded. Try again in a moment."
msgstr "نیٹ ورک کی ترتیبات ابھی لوڈ نہیں ہوئیں۔ ایک لمحے بعد دوبارہ کوشش کریں۔"
-#: src/components/SyncStatusBadge.tsx
-msgid "never"
-msgstr "کبھی نہیں"
-
#: src/components/FolderOverview.tsx
#: src/editor/tag-suggestion/TagSuggestionMenu.tsx
msgid "New"
@@ -8850,10 +8894,22 @@ msgstr "کچھ نہیں ({0} کسی دستاویز سے مماثل نہیں ہو
msgid "nothing ({0} is not a valid pattern)"
msgstr "کچھ نہیں ({0} درست پیٹرن نہیں ہے)"
+#: src/components/settings/SyncSection.tsx
+msgid "Nothing moves until you ask — pull and push from the sync menu."
+msgstr "جب تک آپ نہ کہیں، کچھ نہیں چلے گا — مطابقت پذیری کے مینو سے کھینچیں اور پُش کریں۔"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing moves until you ask."
+msgstr "جب تک آپ نہ کہیں، کچھ نہیں چلے گا۔"
+
#: src/components/FolderPropertiesCard.tsx
msgid "Nothing set yet."
msgstr "ابھی کچھ مقرر نہیں۔"
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing to commit — working tree clean."
+msgstr "کمٹ کرنے کو کچھ نہیں: ورکنگ ٹری صاف ہے۔"
+
#: src/components/BugReportSendToast.tsx
msgid "Nothing was uploaded. The report stays on this computer until you email it to us."
msgstr "کچھ بھی اپ لوڈ نہیں ہوا۔ جب تک آپ ہمیں ای میل نہیں کرتے، رپورٹ اسی کمپیوٹر پر رہتی ہے۔"
@@ -8887,10 +8943,6 @@ msgstr "{0} میں سے"
msgid "of {totalPages}"
msgstr "{totalPages} میں سے"
-#: src/components/settings/SyncSection.tsx
-msgid "Off"
-msgstr "بند"
-
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Off — external links show only their URL. No requests leave this computer."
msgstr "بند — بیرونی لنکس صرف اپنا URL دکھاتے ہیں۔ کوئی درخواست اس کمپیوٹر سے باہر نہیں جاتی۔"
@@ -9645,6 +9697,10 @@ msgstr "جانے والے"
msgid "Outline"
msgstr "خاکہ"
+#: src/components/SyncStatusBadge.tsx
+msgid "Outside what Open Knowledge commits."
+msgstr "اس دائرے سے باہر جسے Open Knowledge کمٹ کرتا ہے۔"
+
#: src/components/SkillCostValue.tsx
msgid "over the {budgetLabel} token budget"
msgstr "{budgetLabel} ٹوکن بجٹ سے زیادہ"
@@ -9855,10 +9911,6 @@ msgstr "پیٹرن کی ساخت میں خرابی: {message}"
msgid "Pattern warnings: {summary}"
msgstr "پیٹرن کے انتباہات: {summary}"
-#: src/components/SyncStatusBadge.tsx
-msgid "Pause sync"
-msgstr "مطابقت پذیری روکیں"
-
#: src/components/acp/ThreadView.tsx
msgid "pending"
msgstr "زیرِ التوا"
@@ -10252,10 +10304,26 @@ msgstr "شائع کیا جا رہا ہے..."
msgid "Pull"
msgstr "کھینچیں"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull and Push"
+msgstr "کھینچیں اور پُش کریں"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull brings in"
+msgstr "کھینچنے سے آئے گا"
+
#: src/components/share-receive-miss-content.tsx
msgid "Pull latest changes"
msgstr "تازہ ترین تبدیلیاں کھینچیں"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled}"
+msgstr "{pulled} کھینچا گیا"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled} · pushed {pushed}"
+msgstr "{pulled} کھینچا · {pushed} بھیجا"
+
#: src/components/share-receive-miss-content.tsx
#: src/components/SyncStatusBadge.tsx
msgid "Pulling"
@@ -10281,10 +10349,26 @@ msgstr "شیئر کرنے سے پہلے برانچ {branch} کو GitHub پر پ
msgid "Push failed — check the server logs for details."
msgstr "پُش ناکام رہا — تفصیلات کے لیے سرور کے لاگز دیکھیں۔"
+#: src/components/SyncStatusBadge.tsx
+msgid "Push includes"
+msgstr "پُش میں شامل"
+
+#: src/components/settings/SyncSection.tsx
+msgid "Push my edits every"
+msgstr "میری ترامیم بھیجنے کا وقفہ"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Push skips"
+msgstr "پُش نظرانداز کرتا ہے"
+
#: src/lib/share/run-share-action.ts
msgid "Push this branch to GitHub before sharing."
msgstr "شیئر کرنے سے پہلے اس برانچ کو GitHub پر پش کریں۔"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pushed {pushed}"
+msgstr "{pushed} بھیجا گیا"
+
#: src/components/SyncStatusBadge.tsx
msgid "Pushing"
msgstr "پُش کیا جا رہا ہے"
@@ -10358,6 +10442,10 @@ msgstr "کسی دوسری دستاویز کے MirrorSource بلاک کی صرف
msgid "Read-only file in the {name} skill"
msgstr "{name} مہارت میں صرف پڑھنے والی فائل"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reading working tree"
+msgstr "ورکنگ ٹری پڑھی جا رہی ہے"
+
#: src/components/acp/working-status.ts
msgid "Reading…"
msgstr "پڑھا جا رہا ہے…"
@@ -10411,6 +10499,10 @@ msgstr "تجویز کردہ ایجنٹ کی مہارت"
msgid "Reconnect required"
msgstr "دوبارہ منسلک ہونا ضروری ہے"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reconnect required to keep syncing."
+msgstr "مطابقت پذیری جاری رکھنے کے لیے دوبارہ منسلک ہونا ضروری ہے۔"
+
#: src/presence/use-sync-toasts.ts
msgid "Reconnected"
msgstr "دوبارہ منسلک ہو گیا"
@@ -10677,6 +10769,10 @@ msgstr "مہارت کا نام بدلیں"
msgid "Rename succeeded but the sidebar may be out of date — refresh to resync"
msgstr "نام بدل گیا مگر سائیڈ بار پرانا ہو سکتا ہے — دوبارہ مطابقت کے لیے تازہ کریں"
+#: src/components/SyncStatusBadge.tsx
+msgid "Renamed"
+msgstr "نام تبدیل شدہ"
+
#. placeholder {0}: docLeaf(descriptor.from)
#. placeholder {1}: docLeaf(descriptor.to)
#: src/components/TimelinePanel.tsx
@@ -10828,7 +10924,6 @@ msgstr "جو ریپازٹریز آپ پہلے ہی کلون کر چکے ہیں
#: src/components/CloneDialog.tsx
#: src/components/share-metadata-rows.tsx
#: src/components/SkillPreviewTab.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Repository"
msgstr "ریپازٹری"
@@ -10911,6 +11006,10 @@ msgstr "مہارتوں کے پینل کا سائز تبدیل کریں"
msgid "Resolve conflict in your terminal"
msgstr "اپنے ٹرمینل میں تصادم حل کریں"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Resolve in terminal"
+msgstr "ٹرمینل میں حل کریں"
+
#: src/components/FileTree.tsx
msgid "Resolve the conflict on {files} before deleting."
msgstr "حذف کرنے سے پہلے {files} کا تنازع حل کریں۔"
@@ -11026,10 +11125,6 @@ msgstr "{0} کے ورژن پر بحال کر دیا گیا"
msgid "Results capped — this workspace has more files than search can index. A missing file may be a cap artifact, not a typo."
msgstr "نتائج محدود — اس ورک اسپیس میں اتنی فائلیں ہیں جتنی تلاش اشاریہ بند نہیں کر سکتی۔ کوئی غائب فائل اس حد کا نتیجہ ہو سکتی ہے، املا کی غلطی نہیں۔"
-#: src/components/SyncStatusBadge.tsx
-msgid "Resume sync"
-msgstr "مطابقت پذیری جاری رکھیں"
-
#: src/components/acp/ThreadView.tsx
msgid "Resuming the chat"
msgstr "چیٹ دوبارہ شروع ہو رہی ہے"
@@ -11101,8 +11196,8 @@ msgid "Reverting"
msgstr "واپس پلٹا جا رہا ہے"
#: src/components/SyncStatusBadge.tsx
-msgid "Review conflicts"
-msgstr "تصادمات کا جائزہ لیں"
+msgid "Review"
+msgstr "جائزہ لیں"
#: src/components/ReportBugDialogBody.tsx
msgid "Review your report"
@@ -12248,6 +12343,10 @@ msgstr "Slidev شروع ہوتے ہوئے وقت ختم ہو گیا۔ دوبار
msgid "Small section heading."
msgstr "چھوٹا سیکشن عنوان۔"
+#: src/components/SyncStatusBadge.tsx
+msgid "Some files are not listed — the working tree has too many changes."
+msgstr "کچھ فائلیں فہرست میں نہیں ہیں: ورکنگ ٹری میں بہت زیادہ تبدیلیاں ہیں۔"
+
#: src/components/settings/SavedThemesTiles.tsx
msgid "Some saved themes aren’t shown because the theme folder exceeds the scan limit."
msgstr "تھیم فولڈر اسکین کی حد سے بڑا ہونے کی وجہ سے کچھ محفوظ شدہ تھیمز نہیں دکھائی جا رہیں۔"
@@ -12439,6 +12538,10 @@ msgstr "ایجنٹ شروع کیا جا رہا ہے…"
msgid "status"
msgstr "حالت"
+#: src/components/SyncStatusBadge.tsx
+msgid "Status"
+msgstr "حالت"
+
#: src/components/SubscribeCard.tsx
#: src/components/SubscribeForm.tsx
msgid "Stay in the loop"
@@ -12586,8 +12689,8 @@ msgid "Switch to a branch to share."
msgstr "شیئر کرنے کے لیے کسی برانچ پر جائیں۔"
#: src/components/settings/SyncSection.tsx
-msgid "Switch to Follow"
-msgstr "«پیروی» پر بدلیں"
+msgid "Switch to Auto (Pull only)"
+msgstr "خودکار (صرف کھینچیں) پر جائیں"
#: src/components/command-palette-commands.ts
msgid "Switch worktree"
@@ -12626,7 +12729,6 @@ msgid "Symlinks the skill to {path}"
msgstr "مہارت کو {path} سے سِم لنک کرتا ہے"
#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Sync"
msgstr "مطابقت پذیری"
@@ -12635,10 +12737,6 @@ msgstr "مطابقت پذیری"
msgid "Sync & sharing"
msgstr "مطابقت پذیری اور اشتراک"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync disabled"
-msgstr "مطابقت پذیری بند"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync failed — check the server logs for details."
msgstr "مطابقت پذیری ناکام رہی — تفصیلات کے لیے سرور کے لاگز دیکھیں۔"
@@ -12647,13 +12745,21 @@ msgstr "مطابقت پذیری ناکام رہی — تفصیلات کے لیے
msgid "Sync is failing. See the sync status for details."
msgstr "مطابقت پذیری ناکام ہو رہی ہے۔ تفصیلات کے لیے مطابقت پذیری کی حالت دیکھیں۔"
-#: src/components/settings/SyncSection.tsx
-msgid "Sync is off — your edits stay on this computer until you commit and push manually."
-msgstr "مطابقت پذیری بند ہے — آپ کی ترامیم اسی کمپیوٹر پر رہتی ہیں جب تک آپ دستی طور پر کمٹ اور پُش نہ کریں۔"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Sync is paused. Commit these local edits to continue, or sort them out in a terminal."
+msgstr "مطابقت پذیری روکی گئی ہے۔ جاری رکھنے کے لیے ان مقامی ترامیم کو کمٹ کریں، یا انہیں ٹرمینل میں حل کریں۔"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync is paused. Turn it back on to resume."
-msgstr "مطابقت پذیری روکی ہوئی ہے۔ جاری رکھنے کے لیے اسے دوبارہ فعال کریں۔"
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull and Push) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "اس ورک ٹری کی مطابقت پذیری «خودکار (کھینچیں اور پُش)» پر سیٹ ہے، جو {project} سے وراثت میں ملی۔ اسے ترتیبات ← مطابقت پذیری میں بدلیں۔"
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull only) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "اس ورک ٹری کی مطابقت پذیری «خودکار (صرف کھینچیں)» پر سیٹ ہے، جو {project} سے وراثت میں ملی۔ اسے ترتیبات ← مطابقت پذیری میں بدلیں۔"
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Manual for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "اس ورک ٹری کی مطابقت پذیری «دستی» پر سیٹ ہے، جو {project} سے وراثت میں ملی۔ اسے ترتیبات ← مطابقت پذیری میں بدلیں۔"
#: src/components/SyncStatusBadge.tsx
msgid "Sync mode"
@@ -12664,18 +12770,10 @@ msgstr "مطابقت پذیری کا موڈ"
msgid "Sync now"
msgstr "ابھی مطابق کریں"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync off"
-msgstr "مطابقت پذیری بند"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync paused"
msgstr "مطابقت پذیری روکی ہوئی"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync paused — resolve conflicts to resume."
-msgstr "مطابقت پذیری روکی ہوئی — جاری رکھنے کے لیے تصادمات حل کریں۔"
-
#: src/hooks/use-no-push-permission-toast.ts
msgid "Sync paused — you don't have permission to push to this repo"
msgstr "مطابقت پذیری روکی ہوئی — آپ کو اس ریپو میں پُش کرنے کی اجازت نہیں"
@@ -12710,10 +12808,6 @@ msgstr "مطابقت پذیری کی حالت: {syncStateLabel} — git کی ش
msgid "Synced"
msgstr "مطابق ہو گیا"
-#: src/components/SyncStatusBadge.tsx
-msgid "Synced {lastSyncedRelative}"
-msgstr "{lastSyncedRelative} مطابق ہوا"
-
#: src/components/TimelinePanel.tsx
msgid "Synced from disk"
msgstr "ڈسک سے مطابق"
@@ -12937,6 +13031,10 @@ msgstr "رپورٹ کا شکریہ!"
msgid "That branch is already open in another worktree."
msgstr "وہ برانچ پہلے سے کسی اور ورک ٹری میں کھلی ہے۔"
+#: src/components/SyncBlockingChanges.tsx
+msgid "That did not go through. Check the server logs and try again."
+msgstr "یہ مکمل نہیں ہوا۔ سرور لاگ دیکھیں اور دوبارہ کوشش کریں۔"
+
#: src/comments/reveal-comment.ts
msgid "That document didn't open in time. Try again once it has synced."
msgstr "وہ دستاویز وقت پر نہیں کھلی۔ ہم آہنگ ہونے کے بعد دوبارہ کوشش کریں۔"
@@ -13972,6 +14070,10 @@ msgstr "کمانڈز دیکھنے کے لیے '/' ٹائپ کریں"
msgid "Type a query, then press <0>↵</0> to search your pages by meaning."
msgstr "کوئی استفسار لکھیں، پھر اپنے صفحات کو معنی کے لحاظ سے تلاش کرنے کے لیے <0>↵</0> دبائیں۔"
+#: src/components/SyncStatusBadge.tsx
+msgid "Type changed"
+msgstr "قسم تبدیل ہوئی"
+
#: src/editor/components/CodePreviewEditModal.tsx
msgid "Type to edit; <0>Cmd/Ctrl+Enter</0> saves, <1>Esc</1> cancels."
msgstr "ترمیم کے لیے لکھیں؛ <0>Cmd/Ctrl+Enter</0> محفوظ کرتا ہے، <1>Esc</1> منسوخ کرتا ہے۔"
@@ -14100,6 +14202,10 @@ msgstr "تمام تبصروں کا انتخاب ہٹائیں"
msgid "Unmark every comment in {0}"
msgstr "{0} کے تمام تبصروں کا نشان ہٹائیں"
+#: src/components/SyncStatusBadge.tsx
+msgid "Unmerged"
+msgstr "ضم نہیں ہوا"
+
#: src/editor/slash-command/items.tsx
msgid "Unordered list of items."
msgstr "آئٹمز کی غیر مرتب فہرست۔"
@@ -14140,6 +14246,10 @@ msgstr "ناقابلِ حل تصویر {identity}۔ حوالہ پر جائیں۔
msgid "Untitled report"
msgstr "بلا عنوان رپورٹ"
+#: src/components/SyncStatusBadge.tsx
+msgid "Untracked"
+msgstr "غیر ٹریک شدہ"
+
#: src/components/SyncStatusBadge.tsx
msgid "Up to date"
msgstr "تازہ ترین"
@@ -14187,8 +14297,8 @@ msgid "Updated \"{name}\" from {0}"
msgstr "«{name}» {0} سے تازہ ہوا"
#: src/components/SyncStatusBadge.tsx
-msgid "Updated {lastSyncedRelative}"
-msgstr "{lastSyncedRelative} تازہ ہوا"
+msgid "Updated {updatedRelative}"
+msgstr "{updatedRelative} اپ ڈیٹ ہوا"
#: src/components/FolderTimelineCard.tsx
msgid "updated folder properties"
@@ -14202,6 +14312,11 @@ msgstr "ورژن {version} پر تازہ ہو گیا"
msgid "Updates flow in"
msgstr "اپ ڈیٹس آتی رہتی ہیں"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Updates flow in from your remote; your edits stay on this computer."
+msgstr "اپ ڈیٹس آپ کے ریموٹ سے آتی ہیں؛ آپ کی ترامیم اسی کمپیوٹر پر رہتی ہیں۔"
+
#: src/components/SkillOriginInline.tsx
msgid "Updates from the source apply automatically (unless edited locally)"
msgstr "ماخذ کی اپ ڈیٹس خودکار طور پر لاگو ہوتی ہیں (جب تک مقامی طور پر ترمیم نہ ہوئی ہو)"
@@ -14654,6 +14769,10 @@ msgstr "یہ کہاں رہنا چاہیے؟"
msgid "Which skill"
msgstr "کون سی مہارت"
+#: src/components/settings/SyncSection.tsx
+msgid "While you're signed out, updates are checked at most every 3 minutes regardless of this setting."
+msgstr "جب تک آپ سائن آؤٹ ہیں، اس ترتیب سے قطع نظر اپ ڈیٹس زیادہ سے زیادہ ہر 3 منٹ بعد دیکھی جاتی ہیں۔"
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "Whitespace"
msgstr "خالی جگہ"
@@ -14830,8 +14949,8 @@ msgid "You don't have permission to push to this repo."
msgstr "آپ کو اس ریپو میں پُش کرنے کی اجازت نہیں۔"
#: src/components/settings/SyncSection.tsx
-msgid "You don't have permission to push to this repo. Follow can still keep your copy up to date."
-msgstr "آپ کو اس ریپو میں پُش کرنے کی اجازت نہیں۔ «پیروی» پھر بھی آپ کی نقل تازہ رکھ سکتی ہے۔"
+msgid "You don't have permission to push to this repo. Auto (Pull only) can still keep your copy up to date."
+msgstr "آپ کو اس ریپازٹری میں پُش کرنے کی اجازت نہیں۔ خودکار (صرف کھینچیں) پھر بھی آپ کی کاپی تازہ رکھ سکتا ہے۔"
#: src/components/ShareFreshnessWarning.tsx
msgid "You don't have write access to this repo."
@@ -14903,6 +15022,11 @@ msgstr "برانچ <0>{shareBranch}</0> کی آپ کی نقل میں ایسی ت
msgid "Your current version is saved first, so this is reversible."
msgstr "آپ کا موجودہ ورژن پہلے محفوظ ہو جاتا ہے، اس لیے یہ واپس لیا جا سکتا ہے۔"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Your edits are committed and pushed to your remote automatically."
+msgstr "آپ کی ترامیم خودکار طور پر کمٹ ہو کر آپ کے ریموٹ پر بھیج دی جاتی ہیں۔"
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "Your edits stay on this computer"
msgstr "آپ کی ترامیم اسی کمپیوٹر پر رہتی ہیں"
diff --git a/packages/app/src/locales/zh-Hans/messages.json b/packages/app/src/locales/zh-Hans/messages.json
index eb1cb5df6..702023778 100644
--- a/packages/app/src/locales/zh-Hans/messages.json
+++ b/packages/app/src/locales/zh-Hans/messages.json
@@ -21,11 +21,7 @@
"-YV1Uo": ["模式 ", ["patternNumber"]],
"-bFGPF": ["下一处改动"],
"-dNlfM": ["已撤销 ", ["docName"], " 上的最后一次编辑"],
- "-f2Ogn": [
- "让这个项目与你的 git 远程保持同步。「跟随」只获取更新而不推送;完全同步也会推送你的提交。开启同步需要确认。"
- ],
"-g6KIS": ["无法识别的链接"],
- "-imiMK": ["跟随——更新从你的远程流入;你的编辑留在这台电脑上。"],
"-kKdCC": ["已从 ", ["0"], " 安装 ", ["imported"], " 个技能"],
"-kbIAr": ["链接与图片"],
"-ksoxk": [
@@ -124,7 +120,6 @@
"0wswKc": ["用于分隔章节的水平分割线。"],
"0xnQ_X": ["更新会自动流入"],
"0xnmlQ": ["仓库名"],
- "0yL--g": ["查看冲突"],
"0ySP5u": ["更改会自动保存到此主题。"],
"0zAhu6": ["所有文档"],
"1-flC9": ["本地服务器端口"],
@@ -154,6 +149,7 @@
"1NgrlY": ["其他安装方式"],
"1QfxQT": ["忽略"],
"1RluQD": ["显示替换"],
+ "1TA-aJ": [["pulled"], "拉取 · ", ["pushed"], "推送"],
"1TNIig": ["打开"],
"1Ta7Fd": ["打开 ", ["basename"]],
"1V17kO": ["正在加载两个版本"],
@@ -219,6 +215,11 @@
"2m_bmh": [["label"], "(", ["0"], ")"],
"2myNzt": ["我们已经把它提交给团队,并附上了你的日志。"],
"2n3oDU": ["按入链数量排序的项目级页面,最多 ", ["FULLSCREEN_HUB_LIMIT"], " 条结果。"],
+ "2okwy4": [
+ "这个 worktree 的同步已设为「自动(仅拉取)」,继承自 ",
+ ["project"],
+ "。可在「设置 → 同步」中更改。"
+ ],
"2pR7ad": ["嵌入服务 API 密钥"],
"2q_Q7x": ["可见性"],
"2rLM8r": ["无法启动智能体线程——请重试。"],
@@ -317,7 +318,6 @@
"4A3Yzu": ["代码块"],
"4BITzH": ["错误:"],
"4CfgPM": ["项目文件夹已创建,但 git init 失败。请重试。"],
- "4DcimZ": [["lastSyncedRelative"], "更新"],
"4E9jPa": ["创建你的第一个项目"],
"4EZrJN": ["规则"],
"4ErgAf": ["OpenKnowledge 安装了一个技能"],
@@ -345,6 +345,7 @@
"4m-xuX": ["自动修复——没有需要修复的内容"],
"4mDIcg": ["选择要安装的技能。每个都会成为归你所有、可编辑的技能。"],
"4mLBx9": ["订阅功能暂时不可用。"],
+ "4mbrAq": ["1 分钟"],
"4mp6Tv": ["OpenKnowledge 列出了已安装的技能"],
"4niEzY": ["沙箱化的 HTML 嵌入——写下 HTML,实时查看渲染效果。"],
"4nj6n8": ["/api/config 返回了 HTTP ", ["code"]],
@@ -354,11 +355,6 @@
"4uNLmk": ["正在拉取"],
"4v2Yyz": ["当焦点在「文件」侧边栏时,选中文件树中所有可见的行。"],
"4xtLTl": ["已隐藏文件夹“", ["basename"], "”"],
- "4zEZS5": [
- "这个 worktree 的自动同步已开启,继承自 ",
- ["project"],
- "。可在「设置 → 同步」中更改。"
- ],
"4zGlN_": ["粘贴图片 URL,或点击上传"],
"4z_1j2": ["已渲染"],
"5-FeN2": ["共享 URL"],
@@ -426,6 +422,7 @@
],
"5hFl0U": ["复制编号"],
"5jEnaB": ["这个平台不支持"],
+ "5k0NLb": ["查看"],
"5kWklo": ["(其中一些可能已被其他规则隐藏)"],
"5lWFkC": ["登录"],
"5mksg0": ["关闭语义搜索失败——", ["detail"]],
@@ -454,6 +451,7 @@
"69KLIV": ["Esc"],
"6ASTuj": ["命令将以你在本机用户账户的完整权限运行。关闭此项可禁用 shell。"],
"6Aih4U": ["离线"],
+ "6EoD0z": ["在终端中解决"],
"6FCixu": ["重新打开之前的对话"],
"6HCOwA": ["打开失败。"],
"6KCH4m": ["隐藏文件"],
@@ -502,6 +500,11 @@
"6u9LvN": [["days", "plural", { "other": ["#", " 天前"] }]],
"6ur2Mk": ["帮助你的智能体在任意项目中发现并使用 OpenKnowledge。"],
"6vEr3W": ["链接目标"],
+ "6xPJIj": [
+ "这个 worktree 的同步已设为「手动」,继承自 ",
+ ["project"],
+ "。可在「设置 → 同步」中更改。"
+ ],
"6xeZX9": ["编辑会实时生效。浅色或深色由主题决定。"],
"6zzhQL": ["通过邮件发送你的报告"],
"72xhRD": ["图示查看模式"],
@@ -621,7 +624,6 @@
"8qgfac": ["MCP 服务器"],
"8rZ1pk": ["启用 ", ["id"]],
"8ruqQi": ["失效的内部链接"],
- "8sMErm": ["要启用「跟随」吗?"],
"8t9CRE": ["正在启动 ", ["agentName"], "…"],
"8t9T3-": ["没有找到技能。"],
"8tjQCz": ["探索"],
@@ -671,6 +673,7 @@
"9Vnjc9": ["Enter"],
"9XwoPv": [["0", "plural", { "other": ["安装 ", "#", " 个技能"] }]],
"9Y6cCI": ["加载页面失败"],
+ "9ZxzfT": ["领先 ", ["count"], " 个提交"],
"9_2oe6": [
"把 ",
["0"],
@@ -737,11 +740,6 @@
"AVW-K9": ["加载孤立页面失败"],
"AWOSPo": ["放大"],
"AYoYhU": ["更新失败:", ["0"]],
- "AaaESH": [
- "这个 worktree 的自动同步已关闭,继承自 ",
- ["project"],
- "。可在「设置 → 同步」中更改。"
- ],
"AcK_r0": ["Claude CLI"],
"AczYxH": ["自定义 open-knowledge 条目——不由 OpenKnowledge 管理"],
"AdcGcG": ["正在应用你的更改"],
@@ -798,6 +796,7 @@
"BVkqD9": [
"索引维护已暂停,因为另一个 Git 属性控制 index.md。更新 .gitattributes 以便作用域 index.md 路径使用 merge=union,然后重试。"
],
+ "BWTzAb": ["手动"],
"BY-g4_": ["添加模式"],
"Ba4D2x": ["模板已导入"],
"Bdha5y": ["正在发布…"],
@@ -827,6 +826,7 @@
"C0C43b": [["warningCount", "plural", { "other": ["#", " 个警告"] }]],
"C0Ciaj": ["已作为“", ["0"], "”导入——名称“", ["1"], "”已被占用。"],
"C0hoX6": ["始终包含"],
+ "C2abof": ["未跟踪"],
"C3Zc44": ["探索技能"],
"C62P6b": ["编辑器选区"],
"C7PKTv": ["把勾选的评论发送到对话"],
@@ -849,9 +849,6 @@
"CTJLpz": ["“", ["trimmed"], "”在这里已存在"],
"CU3AiE": ["正在切换分支"],
"CUmCwI": ["在下方插入行"],
- "CVRM5N": [
- "「跟随」会从你的远程 git 仓库获取更新,并自动快进你的副本。你的本地编辑留在这台电脑上,永远不会被推送。"
- ],
"CWjM1r": ["直接位于 ", ["0"], "/ 中的文档"],
"CWzc2T": ["无论如何 <0>~/.ok/bin</0> 和 <1>~/.ok/env.sh</1> 都会保留——应用始终会维护它们。"],
"CXDYfm": ["无法读取本项目的技能是否已安装。"],
@@ -886,6 +883,7 @@
"在 Git 项目中,Open Knowledge 会在仓库根目录的 .gitattributes 文件中添加一条限定范围的规则,以便合并并发的索引更改。"
],
"CxVk-w": ["对 ", ["address"], " 发表评论"],
+ "Cz-K13": ["15 分钟"],
"D-NlUC": ["跟随系统"],
"D-Oh1s": ["如何设置 ", ["0"], "(在浏览器中打开)"],
"D-_B7l": ["已连接——该端点返回 ", ["0"], " 维向量。"],
@@ -945,7 +943,6 @@
"DmkTrb": ["无法创建此主题。请重试。"],
"Dnn2XG": ["自动"],
"DpjYd6": ["跳到锚定的文本"],
- "DrYM2Z": ["同步已禁用"],
"DsDwR-": [["0", "plural", { "other": ["#", " 个错误"] }]],
"DskIkK": ["登录流程未确认就结束了——请重试"],
"DuCPiG": ["自动模式会在每次启动时选择一个空闲端口。选择固定端口可在重启后保持相同地址。"],
@@ -1111,6 +1108,7 @@
"Fqr8BP": ["多页 PDF 查看器,带工具栏控件(缩略图、翻页、缩放)。"],
"Fqx38P": ["是什么妨碍了你?"],
"Fr8JGg": ["zip 文件"],
+ "FsEXax": ["操作没有成功。请查看服务器日志后重试。"],
"Fsx78O": ["把 <0>ok</0> 命令添加到你的终端"],
"FvMSms": ["重命名会改变磁盘上的文件,以及智能体选择这个模板时使用的 id。"],
"Fx9aOF": ["OpenKnowledge 编辑了一个文档"],
@@ -1203,6 +1201,7 @@
"H0WlWQ": ["由行和列组成的表格,带一行表头。"],
"H1TmTu": ["已停止修复。已修复的文件保持已修复状态。"],
"H3oH0g": ["重做"],
+ "H4doZt": ["同步已暂停。提交这些本地编辑以继续,或在终端中处理它们。"],
"H86f9p": ["折叠"],
"H8DVOJ": ["两边完全相同,", ["pick"], " 仍会读取它们。"],
"HAkEqR": ["最近的文件"],
@@ -1273,6 +1272,7 @@
"IWGfGF": ["正在检查你的 GitHub 连接"],
"IX7-sq": ["打开“", ["docName"], "”时出了点问题。"],
"IX_uXB": ["my-feature"],
+ "IXiG0B": ["自动(拉取和推送)"],
"IYciRC": ["感谢你的报告!"],
"IajAbS": ["添加入门包"],
"If0crP": ["用 AI ", ["targetDisplayName"], " 打开,", ["hint"]],
@@ -1318,6 +1318,7 @@
"JLzQi_": ["关闭 ", ["accessibleLabel"]],
"JM_aq-": ["请使用 https:// 的 URL——http:// 只允许用于 localhost。"],
"JOcPqH": ["把一个远程仓库取到这台电脑上。"],
+ "JOhCT9": ["推送包含"],
"JWsZlx": ["请打开一个项目以进行编辑。"],
"JZ8cO6": ["浅色、深色,或跟随系统。"],
"J_jZ5z": [
@@ -1399,6 +1400,9 @@
"KjTmeO": ["请更新 OpenKnowledge 以打开此共享内容。"],
"KkEAud": ["基于当前文档或文件夹创建一个文件。"],
"KkRyMI": ["无法对合并进行分类,请重试。"],
+ "KmVekT": [
+ "自动(仅拉取)从你的 git 远程仓库获取更新并自动快进你的副本。你的本地编辑只保留在这台电脑上,永远不会被推送。"
+ ],
"KmydK6": ["粗体"],
"KnoB--": ["将保存为 <0>", ["sanitized"], "</0>。"],
"KpOJFY": ["开启外部链接预览"],
@@ -1406,6 +1410,7 @@
"KsAPaB": ["这个分支已在以下位置检出:"],
"KtACeE": ["默认:<0>", ["0"], "</0>"],
"KujtjC": ["查找"],
+ "KvwJv8": ["部分文件未列出:工作区的更改过多。"],
"Kx881F": ["已恢复 ", ["0"], "。"],
"L-rMC9": ["重置为默认值"],
"L1BQTH": [["0"], " 尚未安装——正在打开它的下载页面。"],
@@ -1423,6 +1428,7 @@
"L83DKQ": ["PATH 安装失败:", ["summary"]],
"L8fKuc": ["在你的终端中运行这个"],
"L9Y9Om": ["被链接最多的页面"],
+ "L9ox9k": ["无法读取工作区。请查看服务器日志。"],
"LAR9ub": ["将替换 ", ["0"], " 中已有的 OpenKnowledge 条目"],
"LBv_TR": ["把这些位置改为符号链接"],
"LBwUR6": ["切换分支超时——请尝试手动打开", ["targetNoun"], "。"],
@@ -1439,7 +1445,6 @@
["laterEdits", "plural", { "other": ["会移除这个文件上 ", "#", " 处较新的编辑。"] }]
],
"LKOLNn": ["未安装任何 AI 智能体"],
- "LNum6A": [["minutes"], " 分钟前"],
"LPAv9E": [["days"], " 天前"],
"LQdLio": ["新建架构"],
"LQsCPn": ["本地提交使这份副本无法更新"],
@@ -1504,14 +1509,12 @@
"MCjC9A": ["删除 ", ["deleteDescriptorLabel"]],
"MDBJwN": ["不好用"],
"MDZSJe": ["智能体执行定时任务的时间。"],
- "MGBNwj": ["暂停同步"],
"MGb89P": ["通过 CodeMirror 的默认按键映射,在源码编辑器中插入、删除、移动、复制和缩进行。"],
"MHrjPM": ["标题"],
"MI6Z0f": ["选择一个表情符号插入到光标处。"],
"MIF36T": ["无法解决该分叉:", ["0"]],
"MILoeL": ["服务"],
"MJuO1q": ["上下文窗口:"],
- "MKEPCY": ["跟随"],
"MLVPcm": [["0"], " 版本 ", ["1"]],
"MOAoFO": ["尚无智能体文件夹"],
"MPpSAg": ["从 ", ["selectedPackName"], " 新建项目"],
@@ -1572,6 +1575,7 @@
],
"N5rzKJ": ["删除 ", ["0"], " 个技能"],
"N6j2JH": ["编辑 ", ["0"]],
+ "N7Lau6": ["提交并同步"],
"NBdIgR": ["评论"],
"NErvOX": ["保存到"],
"NEzPEh": ["新建一个分支,或检出一个已有分支,各自在独立窗口中打开。"],
@@ -1599,6 +1603,7 @@
"Nay2Yr": ["没有智能体匹配你的搜索。"],
"NcUznW": [["0"], ",无工作区"],
"NcurBF": ["向下平移"],
+ "NcwbBM": ["拉取带来"],
"NeQ_0G": ["处理这些评论"],
"NeY1Np": ["Slidev 启动超时。请重试。"],
"NfraGd": ["安装 Slidev 的其他方式"],
@@ -1638,6 +1643,7 @@
"O6yEPk": ["在你选择的文件夹中创建一个新的 OpenKnowledge 项目。"],
"O7_W_a": ["用 AI 打开"],
"O9oQJS": ["发送报告"],
+ "OBdkpo": ["分离的 HEAD"],
"OD0FCX": ["已隐藏“", ["basename"], "”"],
"ODGGlj": ["文件夹名:", ["detail"]],
"OEEQKT": ["良好"],
@@ -1693,6 +1699,7 @@
"Oo_WWc": ["没有找到页面"],
"Oos8fo": ["复制命令"],
"OplnBG": ["这个版本不支持管理 AI 工具。"],
+ "OqqecQ": ["30 秒"],
"OsSaYm": ["克隆失败:", ["title"]],
"OuQezS": ["继续此对话时生效"],
"OuY8t9": ["在当前分支中打开"],
@@ -1721,7 +1728,9 @@
"PBwmDJ": ["正在按语义搜索"],
"PBxg_E": ["暂时不用"],
"PCSkw2": ["技能"],
+ "PEGxvo": ["5 分钟"],
"PGPGsL": ["添加描述"],
+ "PGRnbw": ["更新会从远程仓库流入;你的编辑只保留在这台电脑上。"],
"PHHEuH": ["隐藏已解决的评论(", ["0"], ")"],
"PIMM5l": ["订阅成功!"],
"PKLY-1": ["正在打开…"],
@@ -1734,7 +1743,6 @@
"PRgIJh": ["无法更新 ", ["subRoot"], ":", ["0"]],
"PRnH8G": ["共 ", ["0"]],
"PTUuoc": ["无法取消标记那条评论——它仍在等待发送。"],
- "PTb1Nx": ["同步已暂停。重新开启即可继续。"],
"PVSwOe": ["正在改向——等待当前运行停止…"],
"PVUn_c": ["打开文件夹"],
"PVggyD": ["frontmatter 架构"],
@@ -1772,6 +1780,7 @@
"PrWQiT": ["将 Terminal 移到右侧"],
"PrhzDE": ["向上平移"],
"Pw5PTU": ["外部来源"],
+ "PxZCNM": ["不在 Open Knowledge 的提交范围内。"],
"Q-DKvr": ["从 ", ["source"], " 安装"],
"Q1mtyd": ["隐藏侧边栏"],
"Q5fqMz": ["连接出错——请重试"],
@@ -1810,6 +1819,7 @@
",包含 ",
["childCount", "plural", { "other": ["#", " 个项目"] }]
],
+ "QeREu8": ["已重命名"],
"QfFBdJ": ["模板的文件名(不含 `.md`)。"],
"Qft6eW": ["将 ", ["0"], " 个技能移至全局"],
"Qj4RL5": ["已完成:"],
@@ -1967,13 +1977,9 @@
"Sr9xtj": ["选择这个架构适用的文件夹"],
"SrOuyg": ["文档面板"],
"SvBFYA": ["没有最近的项目"],
- "Sxx_Zz": [
- "这个 worktree 的「跟随」已开启,继承自 ",
- ["project"],
- "。可在「设置 → 同步」中更改。"
- ],
"T-654M": ["正在加载 PDF"],
"T0OVm7": ["默认分支受保护——推送需要通过 pull request。"],
+ "T1fMJ6": ["这台电脑从你的远程仓库拉取更改的频率。"],
"T2fvhw": ["取消勾选 ", ["0"], " 中的所有评论"],
"T3Mld1": ["窗口"],
"T3j-7o": ["例如:同步过程中切换了项目"],
@@ -2017,10 +2023,10 @@
"U2pMtf": ["tag-name"],
"U3IvM5": ["完整指南"],
"U3RIJu": ["本地文件"],
- "U4nTfu": ["启用「跟随」"],
"U5Spo9": ["内容目录必须位于项目内部"],
"U6Mdhd": ["开始设置吧。"],
"U6wmNc": ["同步已暂停"],
+ "U7Iesw": [["seconds"], " 秒"],
"U88xbi": ["创建架构文件失败"],
"U8CD-l": ["复制完整路径,不含工作区"],
"UBv8UK": ["永久删除"],
@@ -2054,7 +2060,6 @@
"URmyfc": ["详情"],
"UTNVyS": ["选中整个源码文档。"],
"UTZ97u": ["选择的内容必须在项目内部"],
- "UVDasf": ["同步已关闭——在你手动提交并推送之前,你的编辑只留在这台电脑上。"],
"UVLlMV": ["无法连接到 GitHub。要重试吗?"],
"UW2Fg3": ["这个项目正在运行的服务器不支持实时编辑。重启 OpenKnowledge 即可修复。"],
"UW93oq": ["替换密钥"],
@@ -2089,6 +2094,7 @@
"UhpfxY": ["向左平移"],
"UkQGhd": ["隐藏替换"],
"UlVARL": ["启用 Slidev"],
+ "Uo2Rj7": ["启用自动(拉取和推送)?"],
"Uobeu9": ["把技能添加到 ", ["rootRel"], "——", ["0"], " 也会读取该处"],
"Up2_7p": ["复制完整路径"],
"UpCz01": ["这个文档"],
@@ -2152,6 +2158,7 @@
"VdXv4D": ["从 GitHub 克隆"],
"VeVIIk": ["正在加载技能"],
"Vftef5": ["常见的 markdown 问题——硬制表符、标题层级跳跃、列表标记等等。"],
+ "Vl1H8I": ["需要重新连接才能继续同步。"],
"Vlc75q": ["保持文件为已删除状态"],
"VmJT51": ["正在加载你的报告"],
"VmXASo": ["(符号链接)"],
@@ -2173,6 +2180,7 @@
["rootPath"],
"</0> 处已存在一个 OpenKnowledge 项目。请选择它之外的位置,或者直接打开那个项目。"
],
+ "W7mERj": ["启用自动(仅拉取)?"],
"W8vpBM": ["入门包"],
"W9NSe0": ["正在检查链接"],
"W9_Bub": ["本地改动与传入的同步内容重叠"],
@@ -2190,6 +2198,7 @@
" 个项目吗?文件夹及其中的所有文件都会被删除。此操作无法撤销。"
],
"WMsoIm": ["已经登录了?"],
+ "WOfp4H": ["更新同步间隔失败 — ", ["detail"]],
"WOr-hW": ["token"],
"WPwDin": ["在磁盘上打开文件夹"],
"WR0y2O": ["共享文件夹"],
@@ -2208,6 +2217,7 @@
"Wcv-Zi": ["把这个知识库作为 Claude 技能提供出去。"],
"We7h2I": ["📝 或 assets/icon.png"],
"Weq9zb": ["通用"],
+ "WfcERq": ["没有需要提交的内容:工作区是干净的。"],
"Wfy3rU": ["智能体设置"],
"Wgmlsw": ["正在获取"],
"Wh0im4": ["正在编辑 [[", ["realCurrentDoc"], "]]"],
@@ -2259,7 +2269,6 @@
"XRuL0i": ["创建页面"],
"XSb9HS": ["丢弃本地编辑,恢复已安装的版本"],
"XT-L4j": ["开启一个智能体,用 AI 来创作"],
- "XU0OXn": ["启用自动同步"],
"XU5AOg": ["输入"],
"XV5sC0": ["打开 worktree"],
"XW18jo": ["页面标题响应不符合成功时的架构"],
@@ -2295,6 +2304,7 @@
"Xp7Kq4": ["另一个同步操作正在进行中。请稍后再试。"],
"Xp94R1": ["再试一次"],
"XpIZmv": ["使用等宽字体的围栏代码块。"],
+ "Xs1kjx": ["检查更新的频率"],
"Xs7IcT": ["无法连接 ", ["displayName"], "。要重试吗?"],
"XszXjc": ["已重命名为 ", ["0"]],
"XtRoxT": ["第 ", ["pageNumber"], " 页"],
@@ -2327,6 +2337,7 @@
"检查插件——运行哪些规则族及其逐条规则的设置——在「本项目 → 插件」下的独立标签页中配置。"
],
"YEP3X2": ["当活动的表格单元格选区覆盖整张表时,删除该表格。"],
+ "YEzhIr": ["拉取并推送"],
"YGIi_c": ["重新安装"],
"YGNRB5": ["— 除了"],
"YGt-0e": ["正在阅读…"],
@@ -2360,7 +2371,6 @@
"YlDuro": ["适应高度"],
"YlwI5F": ["仅在这台电脑上对本项目生效。保存在 .ok/local 中,不通过 git 共享。"],
"Yp-Hi_": ["打开设置"],
- "YsEYYS": [["behind", "plural", { "other": ["落后 ", "#", " 个提交"] }]],
"YvwwqC": ["位置"],
"YwPUUP": ["这个包在这里已经设置好了。"],
"YxZDGh": [
@@ -2445,7 +2455,6 @@
"ZscwQ0": ["无法切换到「仅自己」"],
"Zt7Ktx": ["路径不能离开技能(不允许 . 或 ..)"],
"Zue_jx": ["你的 GitHub 令牌缺少必需的权限范围。请尝试重新登录。"],
- "Zul8Ry": ["从不"],
"ZvzbDF": ["直接把它添加到这个项目。"],
"ZwpggY": ["OpenKnowledge 读取了项目设置"],
"_0JUKX": ["报告错误需要 OpenKnowledge 桌面应用。"],
@@ -2566,7 +2575,6 @@
"ai40UJ": ["新纪录 · 按<0>空格</0>再玩一次"],
"aiArms": ["我们无法克隆这个仓库。"],
"aiOceC": ["启用索引"],
- "ajHi4O": ["自动同步已暂停——你没有推送到这个仓库的权限。切换到「跟随」以继续接收更新。"],
"ajz9F8": ["无法加载 ", ["filePath"], " 的冲突内容。请尝试重新加载页面。"],
"ak4LLg": ["清空菜单"],
"akOe4q": ["你的 Git 凭据配置中指定了 ", ["declaredLogin"], ",但无法使用该账户的凭据。"],
@@ -2579,7 +2587,6 @@
"arUUsK": ["产品动态"],
"ax9kie": ["链接预览设置尚未加载——请稍后再试"],
"axQ1h6": ["还有什么想补充的吗?(可选)"],
- "az8lvo": ["关闭"],
"b18t0_": ["关闭差异视图"],
"b1FDss": ["滚动到开头"],
"b2ezG_": ["两个都保留了——“", ["0"], "”现在是一个独立的技能"],
@@ -2659,6 +2666,7 @@
"cFSbbh": ["仅限这台设备。对你在这里打开的每个项目都生效,而且绝不会分享给协作者。"],
"cH0dkG": ["它缺少我需要的功能"],
"cHhH3i": ["一个必需的 git 工具"],
+ "cIFYZn": ["在你退出登录期间,无论此设置如何,更新最多每 3 分钟检查一次。"],
"cIptmH": ["在 Claude 桌面应用中"],
"cKjLuT": ["(项目 + 用户)"],
"cLP0Lf": ["远程技能来源"],
@@ -2717,6 +2725,8 @@
"ct2kv5": [["pageTarget"], " 中没有标题"],
"cuA8QW": ["整理规格"],
"cuHhjo": ["创建并编辑"],
+ "cyoNqf": ["未合并"],
+ "czQDKY": ["每次推送就是向你的远程仓库提交一次。"],
"d-GtJt": ["在 Markdown 源码中查看"],
"d1JjXo": [
"你本地的 <0>",
@@ -2799,6 +2809,7 @@
"eGUbmF": ["复制选中的文件或文件夹"],
"eJitUk": ["从电脑上传"],
"eKThTQ": ["重新排序失败"],
+ "eNOyTV": ["你没有向此仓库推送的权限。自动(仅拉取)仍可让你的副本保持最新。"],
"eNQGRb": ["由 KaTeX 渲染的行内 LaTeX 公式。"],
"eNhWUl": ["一位 PR 评审者、一位发布说明撰稿人、一份部署检查清单……"],
"ePK91l": ["编辑"],
@@ -2826,12 +2837,12 @@
"emMrXQ": ["服务器返回的副本响应格式错误。"],
"emgiet": ["权威内容;在所有被引用的地方逐字镜像。"],
"enPTnx": ["第 ", ["displayLine"], " 行"],
+ "eolhcI": ["正在读取工作区"],
"eps54V": ["已移除"],
"epuNYK": ["把某个块标记为事实来源。你编辑它时,别处的镜像会实时更新。"],
"erenF-": ["无法删除存在未解决冲突的文件"],
"euGaS0": ["无法读取 ", ["fileName"], "。"],
"euc6Ns": ["创建副本"],
- "evHlIg": ["「跟随」从不推送或提交你的本地改动。它们只留在这台电脑上。"],
"evs0iw": ["匹配 \"", ["tagListQuery"], "\" 的标签"],
"ewSbS_": ["Shell 会话"],
"ezUmoU": ["允许的元素值(留空 = 任意)"],
@@ -2897,7 +2908,6 @@
"g1ZTh_": [
["count", "plural", { "other": ["确定要删除以下 ", "#", " 个文件/文件夹及其内容吗?"] }]
],
- "g2Tj8R": ["完整"],
"g3UF2V": ["接受"],
"g4WlQK": ["项目的 AI 工具管理仅在 OpenKnowledge 桌面应用中可用。"],
"g4XBm0": ["小号章节标题。"],
@@ -2913,7 +2923,6 @@
["display"],
"。那个文件夹会变成指向这个文件夹的符号链接,因此它的智能体会读取放在这里的一切。这个文件夹仍然是真实文件夹。如果技能冲突,合并会中止。"
],
- "g85bAo": [["lastSyncedRelative"], "同步"],
"g9Nj4l": ["// 注释"],
"gAhHu7": ["自动修复只作用于有已知机械修复方案的问题。"],
"gBbxn_": ["正在检查登录状态"],
@@ -2973,6 +2982,7 @@
"gwEcOD": ["你的本地副本落后了。"],
"gwykHF": ["这个文档还没有同步到 GitHub。下次同步后链接就会生效。"],
"gyHDWC": ["用 AI 全部修复(", ["count"], ")"],
+ "gyYvCN": ["推送我的编辑的频率"],
"h-AdvS": ["文件夹和模板都已经在这里了,没有需要添加的内容。"],
"h06R3C": ["没有页面缺少出链。"],
"h16FyT": ["列表"],
@@ -3044,7 +3054,6 @@
"hwFOFD": ["设置加载失败"],
"hxBHxQ": ["一行带脚注<0><1>[1]</1></0>的文字,定义显示在下方。"],
"hxEUVJ": ["初始化 ", ["selectedPackName"]],
- "hxYFzm": ["完全同步——你的提交会自动推送,远程改动会自动拉取。"],
"hxnF0I": [["0"], " 属性"],
"hyCxJY": ["改为打开那个 worktree"],
"hynz2K": ["下载已开始"],
@@ -3055,7 +3064,6 @@
"i09An-": ["已恢复到较早的版本(", ["0"], ")"],
"i1flq_": ["维基链接建议"],
"i3f2kh": ["没有匹配的命令。"],
- "i6ng22": ["切换到「跟随」"],
"i92eAT": ["我们会创建一个仓库并开始同步——不需要用终端。"],
"i94lQe": ["OpenKnowledge 检查了冲突"],
"i9OyGp": ["撤销或重做"],
@@ -3133,11 +3141,11 @@
"iqr14Z": ["如何在“问题”、编辑器诊断、审计和代理工具中报告缺失的项目本地文档、文件和图像。"],
"iqugog": ["初始化失败:", ["errorDetail"]],
"irFGwu": ["模板列表"],
+ "irnKr_": ["更新于 ", ["updatedRelative"]],
"irrm_E": ["移除选区"],
"isRobC": ["新建"],
"iuTKci": ["还没有编辑。"],
"iv452l": [["0"], " 的文档(在浏览器中打开)"],
- "iy64Li": ["完全同步——你的编辑会自动提交并推送到你的远程仓库。"],
"iycx_A": ["正在推送"],
"iz1LdD": ["自上次在这里写入后,它在 OK 之外被改动过——显示的是磁盘上现在的状态"],
"j-o6Z2": ["由于无法保存项目设置,索引维护已停止。检查项目文件权限,然后重试。"],
@@ -3177,6 +3185,7 @@
"jSO1X5": ["继承来的模板无法在这里重命名——请到拥有它的那个文件夹中重命名。"],
"jSY41h": ["“", ["docName"], "”耗时过长。请检查你的网络连接。"],
"jTLWxh": ["用内联 iframe 嵌入外部页面(文档、演示、Figma、CodeSandbox)。"],
+ "jTUxaN": ["启用自动(仅拉取)"],
"jWzDfC": ["正在检查你安装了哪些 AI 工具"],
"jZ_E5M": ["获取失败——详情请查看服务器日志。"],
"j_Z6g7": ["共享的默认值"],
@@ -3265,11 +3274,11 @@
"把语义搜索指向任何兼容 OpenAI 的嵌入端点——自建服务器或其他提供方均可。上方的 API 密钥用于你在这里设置的端点。"
],
"kSiB3X": ["无法移到", ["trashNoun"]],
- "kUn-CN": ["同步已关闭"],
"kV2YZv": ["没看到<0>技能</0>?请先启用<1>设置 <2/> 功能 <3/> 代码执行与文件创建</1>。"],
"kVS5tE": ["在每个文件夹中维护 generated 索引?"],
"kVgQUA": ["删除此对话?"],
"kVzuTI": ["推荐代理技能"],
+ "kXNv8P": ["自动(仅拉取)永远不会推送或提交你的本地更改。它们只保留在这台机器上。"],
"kYL1lH": ["智能体活动"],
"k_Dqw1": [["0", "plural", { "other": ["#", " 个文档均无问题。"] }]],
"k_pade": ["配置现在已共享。提交这些 OK 文件即可分享给你的团队。"],
@@ -3350,6 +3359,7 @@
"lM4c-I": [
"技能内部的一个路径——任何文件夹都可以(例如 references/notes.md)。路径中的文件夹会自动创建。"
],
+ "lPkjpD": [["pushed"], "推送"],
"lPzyrU": ["所有差异块均已解决"],
"lS83Sg": ["无法访问剪贴板。"],
"lScd1O": ["Slidev 幻灯片仅在 OpenKnowledge 桌面应用中打开。"],
@@ -3614,6 +3624,7 @@
"pJ7XCo": ["此页面未引用任何本地文件或图片。"],
"pMPnZv": ["已删除 ", ["deleted"], " 个技能"],
"pOo4Aa": ["纯文本"],
+ "pPiV8s": ["启用自动(拉取和推送)"],
"pSimwP": [["editor"], " 版本的新名称"],
"pTPqMK": ["切换围栏代码块。"],
"pTyA_t": ["标签"],
@@ -3675,6 +3686,7 @@
"qAx7xG": ["内容根目录中的固定文件夹"],
"qBi_YG": ["在你的 AI 工具中安装 OpenKnowledge"],
"qC7PwZ": ["移除字段失败"],
+ "qD3krc": ["在你发起操作之前不会有任何变动。"],
"qEEfPk": ["错误报告 ", ["0"]],
"qEIFZu": ["以 ", ["keyHint"], " 结尾的密钥"],
"qEue6Q": [" 或 "],
@@ -3683,6 +3695,9 @@
"qIJIrD": ["正在测试"],
"qJSo0_": ["副本和符号链接有什么区别?"],
"qKMfPp": ["隐藏技能节点"],
+ "qLXJTB": [
+ "让此项目与你的 git 远程仓库保持同步。自动(仅拉取)只带来更新而不推送;自动(拉取和推送)还会发送你的编辑。开启自动同步需要确认。"
+ ],
"qNOgUu": ["在来源处的编辑会同步到这里——不会因复制粘贴而产生偏差。"],
"qQi_um": ["主题已导入。"],
"qRZh7J": ["让 Tab 键离开源码编辑器,而不是缩进。"],
@@ -3698,7 +3713,6 @@
"qXg5W9": ["文件保存到 <0>~/Downloads/openknowledge.skill</0>。"],
"qXsafh": ["发布到 GitHub"],
"qZv5ZR": ["切换配置共享失败"],
- "q_9EcE": ["要启用 git 自动同步吗?"],
"q_Q1-i": [["count", "plural", { "other": ["确定要删除以下 ", "#", " 个文件夹及其内容吗?"] }]],
"q_z77Z": ["标题层级"],
"qaHyRJ": [["linkCount", "plural", { "other": ["#", " 个链接"] }]],
@@ -3774,7 +3788,6 @@
["boldName"],
" 的预览——一个随 Open Knowledge 一起提供的内置技能。它是只读的。"
],
- "rn7n0G": ["恢复同步"],
"rnX-1S": ["启用插件"],
"rnrdEX": ["主要"],
"roAe2K": ["链接 URL"],
@@ -3814,6 +3827,7 @@
"sJK6pq": ["权限不足"],
"sJWhgo": ["未知组件:", ["unregisteredComponentName"]],
"sKEgGd": ["发送到对话"],
+ "sKHiNR": ["落后 ", ["count"], " 个提交"],
"sNeKjP": ["保存令牌失败——请重试"],
"sOxZaS": ["加载关系图失败"],
"sQoLn0": ["退出"],
@@ -3837,6 +3851,7 @@
"scyoP9": [
"索引文档不包含 frontmatter,除了知识库根目录中的 frontmatter 。日志文档不被覆盖——OKF不限制它们的frontmatter。"
],
+ "sdvHp3": ["本地和远程都有改动"],
"se-tU0": ["无法修复 ", ["total"], " 个文件中的 ", ["0"], " 个。"],
"seeS6l": ["要在这个文件夹中设置 OpenKnowledge 吗?"],
"sgmRY8": ["已跳过下载 ", ["0"], "。"],
@@ -3852,6 +3867,7 @@
"snrVQ7": ["探测失败"],
"sq4WQH": ["把 ", ["0"], " 用作浅色主题"],
"sqUrlK": ["正在沉思…"],
+ "srdlOs": ["自动同步已暂停:你没有向此仓库推送的权限。切换到自动(仅拉取)以继续接收更新。"],
"ssk6rl": ["技能自己的文件夹(", ["path"], ")——其他位置从这里复制或链接"],
"ssuwjF": ["分支"],
"stXWnP": ["在文件管理器中打开"],
@@ -3867,12 +3883,12 @@
"szy9BS": ["只能使用小写字母、数字和连字符"],
"t-JXbf": ["Notion 风格的行内一行,用于展示可下载文件。也支持拖放。"],
"t18QYR": ["取消固定 ", ["accessibleLabel"]],
- "t2TkQ3": ["同步已暂停——解决冲突后即可继续。"],
"t4sFKC": [
"新分支 <0>",
["trimmed"],
"</0> 将基于当前提交创建,位于 <1>.ok/worktrees/</1> 下自己的 worktree 中。"
],
+ "t5I7P_": ["在你发起操作之前不会有任何变动——请在同步菜单中拉取和推送。"],
"t6w1cq": ["打开一个空白的编辑器标签页。"],
"t7YoBO": ["发送这条评论"],
"t9Qn8y": ["没有启用任何智能体"],
@@ -3909,6 +3925,7 @@
"tjXez2": ["blog-post"],
"tjbyOy": ["项目详情"],
"tkIXtS": ["已安装 ", ["imported"], " 个技能(其中 ", ["alreadyImported"], " 个原本就有)"],
+ "tlGXxX": ["自动(仅拉取)"],
"tnG-m6": ["自动同步已暂停——请登录以继续。"],
"toyw51": ["Mermaid 图示控件"],
"tqQBwN": ["任何脚本都只会展示以供查看,绝不会运行。"],
@@ -3929,6 +3946,7 @@
"u779EG": ["请使用 http:// 或 https:// 来源。"],
"u7H-Wn": ["显示面板(", ["panelShortcutLabel"], ")"],
"u7U_Ij": ["为选中的文本加链接,或编辑光标处的链接。"],
+ "uAQUqI": ["状态"],
"uA_jXp": ["切换并更新分支"],
"uBAxNB": ["编辑器"],
"uCaIdy": ["GitHub 登录缺失或已过期。请重新连接以继续同步。"],
@@ -3953,7 +3971,6 @@
"uQNW00": ["HEAD 处于游离状态——请检出一个分支以继续"],
"uQewpR": ["无法重启服务器——它正以另一个账户运行。请重启电脑清除后再打开这个项目。"],
"uUCrBv": ["符号链接"],
- "uUiiyC": ["你没有推送到这个仓库的权限。「跟随」仍然可以让你的副本保持最新。"],
"uVbUP8": ["设置…"],
"uY5Z7P": ["游戏结束 · 按<0>空格</0>再玩一次"],
"uYZTcW": ["无法分享此 GitHub URL。"],
@@ -3984,6 +4001,7 @@
"v15iQB": [
"经证明的计算合约。仅适用于类型为 Attested Computation 的文档,其中 OKF 需要 runtime;普通概念不受影响。"
],
+ "v16Pzh": ["切换到自动(仅拉取)"],
"v2ZW0K": ["启用终端"],
"v2a04T": ["markdownlint 规则"],
"v41fCm": ["找不到文件"],
@@ -3996,6 +4014,7 @@
"vF68cg": ["字段"],
"vGQxBT": ["来源的更新会自动应用(除非在本地编辑过)"],
"vGeNNQ": ["复制一段提示词,粘贴给你的智能体来配置项目。"],
+ "vGjmyl": ["已删除"],
"vHlhDc": ["双击进行编辑"],
"vIxrEk": ["适应宽度"],
"vLyv1R": ["隐藏"],
@@ -4031,8 +4050,10 @@
"vjwsDi": [
["count", "plural", { "other": ["立即修复有已知自动修复方案的 ", "#", " 个问题。"] }]
],
+ "vp5vfW": ["1 小时"],
"vppAju": ["新添加的附件放在哪里。"],
"vqJXNe": ["安装 <0>open-knowledge-discovery</0> 技能"],
+ "vsFXfP": ["推送跳过"],
"vv7kpg": ["已取消"],
"vvWZnu": ["无法显示差异"],
"vwV-kH": ["修复文件的过程意外中止。"],
@@ -4089,6 +4110,11 @@
"wdzBgi": ["配置共享现在为「仅自己」。"],
"weP6me": ["无法加载文档——再输入一次 @ 重试"],
"wgNoIs": ["全选"],
+ "wk_v1X": [
+ "这个 worktree 的同步已设为「自动(拉取和推送)」,继承自 ",
+ ["project"],
+ "。可在「设置 → 同步」中更改。"
+ ],
"wlwXUk": ["你选择了 ~/Downloads。那里的文件通常是临时的——建议改用一个稳定的文件夹。"],
"wndeIl": ["既无入链又无出链的项目级页面。"],
"wqD3pI": [["0"], " 条评论中有 ", ["failed"], " 条无法更新。"],
@@ -4124,6 +4150,7 @@
"xCdTnb": ["关闭新标签页"],
"xDBki3": ["标题建议"],
"xDEcka": ["服务提供方正在对这个密钥限流。请稍后再试。"],
+ "xDKOFk": ["已忽略"],
"xEb24l": ["允许我们通过邮件跟进"],
"xFQRu4": ["我本地已经有了"],
"xG4tb6": ["与“", ["docName"], "”的连接已断开。"],
@@ -4135,6 +4162,7 @@
"xOTzt5": ["刚刚"],
"xSVO3J": ["会创建什么"],
"xV5sXw": [["0"], " 周前"],
+ "xW5AUw": [["pulled"], "拉取"],
"xWEvuo": ["问 AI"],
"xWomUD": ["使用 ", ["editor"], " 的版本"],
"xXo8FT": ["保存失败:", ["error"]],
@@ -4256,6 +4284,7 @@
"zAJzIg": [["0"], " 中的问题"],
"zAsDLY": ["文档链接的图形可视化。"],
"zBUqvf": ["设置 OpenKnowledge 集成…"],
+ "zBiFZh": ["你的编辑会自动提交并推送到远程仓库。"],
"zC5jrM": ["将创建为 <0>", ["effective"], "</0>"],
"zD1Nqf": [["count", "plural", { "other": ["#", " 个文档"] }]],
"zFH7iU": ["无法完全清除网络设置,但正在关闭公开访问。", ["0"]],
@@ -4267,6 +4296,7 @@
"zLak8b": ["激活新标签页"],
"zMmwh4": ["选择一个主题或创建自己的主题。"],
"zQBg2C": ["把当前块上移或下移一个位置。"],
+ "zWZBPx": ["类型已更改"],
"zXj1rA": ["按语义搜索"],
"zYp8Sr": [
"<0>已修改</0>标记表示你的配置显式设置过的规则——直接设置,或通过 <1>extends</1> 继承而来。未标记的规则保持默认状态。"
@@ -4305,7 +4335,6 @@
"。要换一个从 ",
["expectedHost"],
" 克隆的文件夹吗?"
- ],
- "zz_Wd_": ["模式"]
+ ]
}
}
diff --git a/packages/app/src/locales/zh-Hans/messages.po b/packages/app/src/locales/zh-Hans/messages.po
index bee98cc4e..94d2b9ba7 100644
--- a/packages/app/src/locales/zh-Hans/messages.po
+++ b/packages/app/src/locales/zh-Hans/messages.po
@@ -517,10 +517,6 @@ msgstr "领先 {ahead} 个,落后 {behind} 个"
msgid "{basename} — text editor"
msgstr "{basename} — 文本编辑器"
-#: src/components/SyncStatusBadge.tsx
-msgid "{behind, plural, one {# commit behind} other {# commits behind}}"
-msgstr "{behind, plural, other {落后 # 个提交}}"
-
#: src/components/SyncStatusBadge.tsx
msgid "{behind} behind"
msgstr "落后 {behind} 个"
@@ -616,6 +612,14 @@ msgstr "{count, plural, other {立即修复有已知自动修复方案的 # 个
msgid "{count, plural, one {matches # file} other {matches # files}}"
msgstr "{count, plural, other {匹配 # 个文件}}"
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} ahead"
+msgstr "领先 {count} 个提交"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} behind"
+msgstr "落后 {count} 个提交"
+
#: src/components/SkillBulkDeleteDialog.tsx
msgid "{count} skills"
msgstr "{count} 个技能"
@@ -811,14 +815,11 @@ msgstr "第 {displayLine} 行:{localizedMessage}"
msgid "{mins, plural, one {# min ago} other {# min ago}}"
msgstr "{mins, plural, other {# 分钟前}}"
-#: src/components/SyncStatusBadge.tsx
-msgid "{minutes} min ago"
-msgstr "{minutes} 分钟前"
-
#: src/components/acp/ThreadHistoryMenu.tsx
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "{minutes}m ago"
msgstr "{minutes} 分钟前"
@@ -910,6 +911,10 @@ msgstr "{propertyCount, plural, other {# 项属性}}"
msgid "{propPanelDescriptorLabel} Properties"
msgstr "{propPanelDescriptorLabel} 属性"
+#: src/components/settings/SyncSection.tsx
+msgid "{seconds} seconds"
+msgstr "{seconds} 秒"
+
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
@@ -1127,6 +1132,26 @@ msgstr "📝 或 assets/icon.png"
msgid "0/0"
msgstr "0/0"
+#: src/components/settings/SyncSection.tsx
+msgid "1 hour"
+msgstr "1 小时"
+
+#: src/components/settings/SyncSection.tsx
+msgid "1 minute"
+msgstr "1 分钟"
+
+#: src/components/settings/SyncSection.tsx
+msgid "15 minutes"
+msgstr "15 分钟"
+
+#: src/components/settings/SyncSection.tsx
+msgid "30 seconds"
+msgstr "30 秒"
+
+#: src/components/settings/SyncSection.tsx
+msgid "5 minutes"
+msgstr "5 分钟"
+
#: src/components/ImportSkillForm.tsx
msgid "A .zip or .skill archive."
msgstr "一个 .zip 或 .skill 压缩包。"
@@ -1521,6 +1546,7 @@ msgstr "把你的评论写在这条消息里"
#: src/components/PropertyDiffBlock.tsx
#: src/components/SkillDirectoryResult.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Added"
msgstr "已添加"
@@ -1565,11 +1591,13 @@ msgstr "添加这些文件"
msgid "Adds these folders"
msgstr "添加这些文件夹"
+#: src/components/settings/SyncSection.tsx
#: src/editor/components/PropPanel.tsx
msgid "Advanced"
msgstr "高级"
#: src/components/ConsentDialogBody.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Advanced settings"
msgstr "高级设置"
@@ -1979,6 +2007,24 @@ msgstr "权威内容;在所有被引用的地方逐字镜像。"
msgid "Authorize in browser"
msgstr "在浏览器中授权"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull and Push)"
+msgstr "自动(拉取和推送)"
+
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull only)"
+msgstr "自动(仅拉取)"
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
+msgstr "自动(仅拉取)从你的 git 远程仓库获取更新并自动快进你的副本。你的本地编辑只保留在这台电脑上,永远不会被推送。"
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) never pushes or commits your local changes. They stay only on this machine."
+msgstr "自动(仅拉取)永远不会推送或提交你的本地更改。它们只保留在这台机器上。"
+
#: src/components/settings/TerminalSection.tsx
msgid "Auto-approve settings not yet loaded — try again in a moment"
msgstr "自动批准设置尚未加载——请稍后再试"
@@ -2012,21 +2058,13 @@ msgstr "自动修复只作用于有已知机械修复方案的问题。"
msgid "Auto-save"
msgstr "自动保存"
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is off for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "这个 worktree 的自动同步已关闭,继承自 {project}。可在「设置 → 同步」中更改。"
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "这个 worktree 的自动同步已开启,继承自 {project}。可在「设置 → 同步」中更改。"
-
#: src/components/settings/SyncSection.tsx
msgid "Auto-sync is paused — sign in to resume."
msgstr "自动同步已暂停——请登录以继续。"
#: src/components/settings/SyncSection.tsx
-msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Follow to keep receiving updates."
-msgstr "自动同步已暂停——你没有推送到这个仓库的权限。切换到「跟随」以继续接收更新。"
+msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Auto (Pull only) to keep receiving updates."
+msgstr "自动同步已暂停:你没有向此仓库推送的权限。切换到自动(仅拉取)以继续接收更新。"
#: src/components/AutoSyncEnableWarning.tsx
msgid "Auto-sync periodically fetches, pulls, and pushes commits to your remote git repository so your edits stay in sync across machines."
@@ -2424,9 +2462,14 @@ msgid "Change the embeddings provider?"
msgstr "要更换嵌入服务提供方吗?"
#: src/components/PropertyDiffBlock.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Changed"
msgstr "已修改"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Changed here and on the remote"
+msgstr "本地和远程都有改动"
+
#: src/components/ChangedOutsideBadge.tsx
msgid "changed outside"
msgstr "在外部被修改"
@@ -2451,6 +2494,10 @@ msgstr "更改已自动保存。"
msgid "Check for updates"
msgstr "检查更新"
+#: src/components/settings/SyncSection.tsx
+msgid "Check for updates every"
+msgstr "检查更新的频率"
+
#: src/components/AppMenubar.tsx
msgid "Check for updates…"
msgstr "检查更新…"
@@ -2970,6 +3017,10 @@ msgstr "对此代码块发表评论或询问 AI"
msgid "Comments"
msgstr "评论"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Commit and sync"
+msgstr "提交并同步"
+
#: src/components/ShareBranchSwitchDialog.tsx
msgid "Commit or stash changes to switch:"
msgstr "提交或暂存改动后才能切换:"
@@ -3271,6 +3322,7 @@ msgstr "正在转换…"
#: src/components/empty-state/CopyablePromptList.tsx
#: src/components/InstallInClaudeDesktopDialog.tsx
+#: src/components/SyncStatusBadge.tsx
#: src/editor/extensions/CodeBlockView.tsx
msgid "Copied"
msgstr "已复制"
@@ -3886,6 +3938,10 @@ msgstr "无法读取等待发送的评论——什么都没有发送。"
msgid "Couldn't read the comments waiting to send: {0}"
msgstr "无法读取等待发送的评论:{0}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Couldn't read the working tree. Check the server logs."
+msgstr "无法读取工作区。请查看服务器日志。"
+
#. placeholder {0}: warning.code
#: src/components/settings/SavedThemesTiles.tsx
msgid "Couldn’t read this theme ({0})"
@@ -4459,6 +4515,10 @@ msgstr "删除此对话?"
msgid "Delete this comment"
msgstr "删除这条评论"
+#: src/components/SyncStatusBadge.tsx
+msgid "Deleted"
+msgstr "已删除"
+
#. placeholder {0}: deletedTheme.label
#: src/components/settings/SavedThemesTiles.tsx
msgid "Deleted {0}."
@@ -4554,6 +4614,10 @@ msgstr "描述 token"
msgid "Design"
msgstr "设计"
+#: src/components/SyncStatusBadge.tsx
+msgid "detached HEAD"
+msgstr "分离的 HEAD"
+
#: src/components/SyncStatusBadge.tsx
msgid "Detached HEAD — checkout a branch to resume"
msgstr "HEAD 处于游离状态——请检出一个分支以继续"
@@ -4926,6 +4990,10 @@ msgstr "每个 AI 工具都从各自的文件夹读取技能。将一个文件
msgid "Each pack scaffolds your project with ready-made folders and templates."
msgstr "每个包都会用现成的文件夹和模板为你的项目搭好骨架。"
+#: src/components/settings/SyncSection.tsx
+msgid "Each push is one commit to your remote."
+msgstr "每次推送就是向你的远程仓库提交一次。"
+
#: src/components/AppMenubar.tsx
#: src/components/settings/LintingSection.tsx
#: src/components/SkillsTree.tsx
@@ -5174,25 +5242,25 @@ msgstr "启用 {id}"
#: src/components/EnableSyncConfirmDialog.tsx
#: src/components/share-receive-miss-content.tsx
#: src/components/ShareFreshnessWarning.tsx
-msgid "Enable auto-sync"
-msgstr "启用自动同步"
+msgid "Enable Auto (Pull and Push)"
+msgstr "启用自动(拉取和推送)"
-#: src/components/settings/LinkPreviewsSection.tsx
-msgid "Enable external link previews"
-msgstr "开启外部链接预览"
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Enable Auto (Pull and Push)?"
+msgstr "启用自动(拉取和推送)?"
#: src/components/AutoSyncOnboardingDialog.tsx
#: src/components/EnableSyncConfirmDialog.tsx
-msgid "Enable Follow"
-msgstr "启用「跟随」"
+msgid "Enable Auto (Pull only)"
+msgstr "启用自动(仅拉取)"
#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable Follow?"
-msgstr "要启用「跟随」吗?"
+msgid "Enable Auto (Pull only)?"
+msgstr "启用自动(仅拉取)?"
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable git auto-sync?"
-msgstr "要启用 git 自动同步吗?"
+#: src/components/settings/LinkPreviewsSection.tsx
+msgid "Enable external link previews"
+msgstr "开启外部链接预览"
#: src/components/settings/LintingSection.tsx
msgid "Enable indexes"
@@ -5788,6 +5856,10 @@ msgstr "更新嵌入服务提供方失败——{detail}"
msgid "Failed to update the project sync default — {detail}"
msgstr "更新项目同步默认值失败——{detail}"
+#: src/components/settings/SyncSection.tsx
+msgid "Failed to update the sync interval — {detail}"
+msgstr "更新同步间隔失败 — {detail}"
+
#: src/components/FileTree.tsx
msgid "Failed to upload file"
msgstr "上传文件失败"
@@ -6047,28 +6119,6 @@ msgstr "已复制文件夹共享链接。"
msgid "Folder target: {linkTitle}. Click to open the overview."
msgstr "目标文件夹:{linkTitle}。点击可打开总览。"
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow"
-msgstr "跟随"
-
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow — updates flow in from your remote; your edits stay on this computer."
-msgstr "跟随——更新从你的远程流入;你的编辑留在这台电脑上。"
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
-msgstr "「跟随」会从你的远程 git 仓库获取更新,并自动快进你的副本。你的本地编辑留在这台电脑上,永远不会被推送。"
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Follow is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "这个 worktree 的「跟随」已开启,继承自 {project}。可在「设置 → 同步」中更改。"
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow never pushes or commits your local changes. They stay only on this machine."
-msgstr "「跟随」从不推送或提交你的本地改动。它们只留在这台电脑上。"
-
#: src/components/acp/ThreadView.tsx
msgid "Follow the agent's edits"
msgstr "跟随智能体的编辑"
@@ -6159,11 +6209,6 @@ msgstr "用这个模板创建的每个文档都以这段 frontmatter 开头。
msgid "Frontmatter schemas"
msgstr "frontmatter 架构"
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Full"
-msgstr "完整"
-
#: src/components/InstallInClaudeDesktopDialog.tsx
msgid "Full guide"
msgstr "完整指南"
@@ -6177,14 +6222,6 @@ msgstr "完整路径"
msgid "Full Path"
msgstr "完整路径"
-#: src/components/settings/SyncSection.tsx
-msgid "Full sync — your commits push and remote changes pull automatically."
-msgstr "完全同步——你的提交会自动推送,远程改动会自动拉取。"
-
-#: src/components/SyncStatusBadge.tsx
-msgid "Full sync — your edits are committed and pushed to your remote automatically."
-msgstr "完全同步——你的编辑会自动提交并推送到你的远程仓库。"
-
#: src/components/OkBlobRunner.tsx
msgid "Game over · press <0>Space</0> to play again"
msgstr "游戏结束 · 按<0>空格</0>再玩一次"
@@ -6243,6 +6280,7 @@ msgid "Git needs a helper tool (such as git-lfs) that isn't installed or couldn'
msgstr "Git 需要一个辅助工具(例如 git-lfs),但它未安装或找不到。请先安装再重试。"
#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Git sync"
msgstr "Git 同步"
@@ -6620,6 +6658,10 @@ msgstr "共享是怎么运作的?"
msgid "How missing project-local documents, files, and images are reported in Problems, editor diagnostics, audits, and agent tools."
msgstr "如何在“问题”、编辑器诊断、审计和代理工具中报告缺失的项目本地文档、文件和图像。"
+#: src/components/settings/SyncSection.tsx
+msgid "How often this computer pulls changes from your remote."
+msgstr "这台电脑从你的远程仓库拉取更改的频率。"
+
#: src/components/ShareFreshnessWarning.tsx
msgid "How to push manually"
msgstr "如何手动推送"
@@ -6705,6 +6747,10 @@ msgstr "忽略模式"
msgid "Ignore patterns (raw text)"
msgstr "忽略模式(纯文本)"
+#: src/components/SyncStatusBadge.tsx
+msgid "Ignored"
+msgstr "已忽略"
+
#: src/components/LinksPanel.tsx
msgid "Image {identity}. Go to reference."
msgstr "图片 {identity}。转到引用位置。"
@@ -7301,8 +7347,8 @@ msgid "Keep the name to 64 characters or fewer."
msgstr "名称请控制在 64 个字符以内。"
#: src/components/settings/SyncSection.tsx
-msgid "Keep this project in sync with your git remote. Follow fetches updates without pushing; full sync pushes your commits too. Turning sync on requires confirmation."
-msgstr "让这个项目与你的 git 远程保持同步。「跟随」只获取更新而不推送;完全同步也会推送你的提交。开启同步需要确认。"
+msgid "Keep this project in sync with your git remote. Auto (Pull only) brings in updates without pushing; Auto (Pull and Push) sends your edits too. Turning auto-sync on requires confirmation."
+msgstr "让此项目与你的 git 远程仓库保持同步。自动(仅拉取)只带来更新而不推送;自动(拉取和推送)还会发送你的编辑。开启自动同步需要确认。"
#: src/lib/pack-copy.ts
msgid "Keep track of the people and companies you work with and the meetings you have with them. Good for remembering who someone is, how you know them, and what you last talked about."
@@ -7782,6 +7828,11 @@ msgstr "这个版本不支持管理 AI 工具。"
msgid "Managing project AI tools is unavailable in this build."
msgstr "这个版本不支持管理项目的 AI 工具。"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Manual"
+msgstr "手动"
+
#: src/components/empty-state/use-create-suggestions.ts
msgid "Map the architecture"
msgstr "梳理架构"
@@ -7920,10 +7971,6 @@ msgstr "缺少调色板颜色"
msgid "Missing theme name"
msgstr "缺少主题名称"
-#: src/components/SyncStatusBadge.tsx
-msgid "Mode"
-msgstr "模式"
-
#: src/components/settings/SearchSection.tsx
msgid "Model"
msgstr "模型"
@@ -7940,6 +7987,7 @@ msgstr "模型默认的推理强度"
#: src/components/FolderOverview.tsx
#: src/components/settings/markdownlint-rule-browser.tsx
#: src/components/SkillOriginInline.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Modified"
msgstr "已修改"
@@ -8232,10 +8280,6 @@ msgstr "清理过程中出现网络错误"
msgid "Network settings not yet loaded. Try again in a moment."
msgstr "网络设置尚未加载。请稍后重试。"
-#: src/components/SyncStatusBadge.tsx
-msgid "never"
-msgstr "从不"
-
#: src/components/FolderOverview.tsx
#: src/editor/tag-suggestion/TagSuggestionMenu.tsx
msgid "New"
@@ -8850,10 +8894,22 @@ msgstr "无({0} 无法匹配任何文档)"
msgid "nothing ({0} is not a valid pattern)"
msgstr "无({0} 不是有效的模式)"
+#: src/components/settings/SyncSection.tsx
+msgid "Nothing moves until you ask — pull and push from the sync menu."
+msgstr "在你发起操作之前不会有任何变动——请在同步菜单中拉取和推送。"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing moves until you ask."
+msgstr "在你发起操作之前不会有任何变动。"
+
#: src/components/FolderPropertiesCard.tsx
msgid "Nothing set yet."
msgstr "还没有设置任何内容。"
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing to commit — working tree clean."
+msgstr "没有需要提交的内容:工作区是干净的。"
+
#: src/components/BugReportSendToast.tsx
msgid "Nothing was uploaded. The report stays on this computer until you email it to us."
msgstr "未上传任何内容。在你通过电子邮件发送给我们之前,报告会保留在这台电脑上。"
@@ -8887,10 +8943,6 @@ msgstr "共 {0}"
msgid "of {totalPages}"
msgstr "共 {totalPages}"
-#: src/components/settings/SyncSection.tsx
-msgid "Off"
-msgstr "关闭"
-
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Off — external links show only their URL. No requests leave this computer."
msgstr "关闭——外部链接只显示 URL。不会有任何请求离开这台电脑。"
@@ -9645,6 +9697,10 @@ msgstr "出链"
msgid "Outline"
msgstr "大纲"
+#: src/components/SyncStatusBadge.tsx
+msgid "Outside what Open Knowledge commits."
+msgstr "不在 Open Knowledge 的提交范围内。"
+
#: src/components/SkillCostValue.tsx
msgid "over the {budgetLabel} token budget"
msgstr "超出 {budgetLabel} token 预算"
@@ -9855,10 +9911,6 @@ msgstr "模式语法错误:{message}"
msgid "Pattern warnings: {summary}"
msgstr "模式警告:{summary}"
-#: src/components/SyncStatusBadge.tsx
-msgid "Pause sync"
-msgstr "暂停同步"
-
#: src/components/acp/ThreadView.tsx
msgid "pending"
msgstr "待处理"
@@ -10252,10 +10304,26 @@ msgstr "正在发布…"
msgid "Pull"
msgstr "拉取"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull and Push"
+msgstr "拉取并推送"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull brings in"
+msgstr "拉取带来"
+
#: src/components/share-receive-miss-content.tsx
msgid "Pull latest changes"
msgstr "拉取最新改动"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled}"
+msgstr "{pulled}拉取"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled} · pushed {pushed}"
+msgstr "{pulled}拉取 · {pushed}推送"
+
#: src/components/share-receive-miss-content.tsx
#: src/components/SyncStatusBadge.tsx
msgid "Pulling"
@@ -10281,10 +10349,26 @@ msgstr "共享前请先将分支 {branch} 推送到 GitHub。"
msgid "Push failed — check the server logs for details."
msgstr "推送失败——详情请查看服务器日志。"
+#: src/components/SyncStatusBadge.tsx
+msgid "Push includes"
+msgstr "推送包含"
+
+#: src/components/settings/SyncSection.tsx
+msgid "Push my edits every"
+msgstr "推送我的编辑的频率"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Push skips"
+msgstr "推送跳过"
+
#: src/lib/share/run-share-action.ts
msgid "Push this branch to GitHub before sharing."
msgstr "共享前请先将此分支推送到 GitHub。"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pushed {pushed}"
+msgstr "{pushed}推送"
+
#: src/components/SyncStatusBadge.tsx
msgid "Pushing"
msgstr "正在推送"
@@ -10358,6 +10442,10 @@ msgstr "来自另一个文档的 MirrorSource 块的只读副本。在来源处
msgid "Read-only file in the {name} skill"
msgstr "{name} 技能中的只读文件"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reading working tree"
+msgstr "正在读取工作区"
+
#: src/components/acp/working-status.ts
msgid "Reading…"
msgstr "正在阅读…"
@@ -10411,6 +10499,10 @@ msgstr "推荐代理技能"
msgid "Reconnect required"
msgstr "需要重新连接"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reconnect required to keep syncing."
+msgstr "需要重新连接才能继续同步。"
+
#: src/presence/use-sync-toasts.ts
msgid "Reconnected"
msgstr "已重新连接"
@@ -10677,6 +10769,10 @@ msgstr "重命名技能"
msgid "Rename succeeded but the sidebar may be out of date — refresh to resync"
msgstr "重命名成功,但侧边栏可能不是最新的——请刷新以重新同步"
+#: src/components/SyncStatusBadge.tsx
+msgid "Renamed"
+msgstr "已重命名"
+
#. placeholder {0}: docLeaf(descriptor.from)
#. placeholder {1}: docLeaf(descriptor.to)
#: src/components/TimelinePanel.tsx
@@ -10828,7 +10924,6 @@ msgstr "即使你断开连接,你已经克隆的仓库也可能继续通过 gi
#: src/components/CloneDialog.tsx
#: src/components/share-metadata-rows.tsx
#: src/components/SkillPreviewTab.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Repository"
msgstr "仓库"
@@ -10911,6 +11006,10 @@ msgstr "调整「技能」面板大小"
msgid "Resolve conflict in your terminal"
msgstr "在你的终端中解决冲突"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Resolve in terminal"
+msgstr "在终端中解决"
+
#: src/components/FileTree.tsx
msgid "Resolve the conflict on {files} before deleting."
msgstr "删除前请先解决 {files} 上的冲突。"
@@ -11026,10 +11125,6 @@ msgstr "已恢复到 {0} 的版本"
msgid "Results capped — this workspace has more files than search can index. A missing file may be a cap artifact, not a typo."
msgstr "结果已被截断——这个工作区的文件数超出了搜索可索引的上限。找不到某个文件可能是上限造成的,而不是拼写错误。"
-#: src/components/SyncStatusBadge.tsx
-msgid "Resume sync"
-msgstr "恢复同步"
-
#: src/components/acp/ThreadView.tsx
msgid "Resuming the chat"
msgstr "正在恢复对话"
@@ -11101,8 +11196,8 @@ msgid "Reverting"
msgstr "正在还原"
#: src/components/SyncStatusBadge.tsx
-msgid "Review conflicts"
-msgstr "查看冲突"
+msgid "Review"
+msgstr "查看"
#: src/components/ReportBugDialogBody.tsx
msgid "Review your report"
@@ -12248,6 +12343,10 @@ msgstr "Slidev 启动超时。请重试。"
msgid "Small section heading."
msgstr "小号章节标题。"
+#: src/components/SyncStatusBadge.tsx
+msgid "Some files are not listed — the working tree has too many changes."
+msgstr "部分文件未列出:工作区的更改过多。"
+
#: src/components/settings/SavedThemesTiles.tsx
msgid "Some saved themes aren’t shown because the theme folder exceeds the scan limit."
msgstr "因为主题文件夹超出扫描限制,部分已保存的主题未显示。"
@@ -12439,6 +12538,10 @@ msgstr "正在启动智能体…"
msgid "status"
msgstr "状态"
+#: src/components/SyncStatusBadge.tsx
+msgid "Status"
+msgstr "状态"
+
#: src/components/SubscribeCard.tsx
#: src/components/SubscribeForm.tsx
msgid "Stay in the loop"
@@ -12586,8 +12689,8 @@ msgid "Switch to a branch to share."
msgstr "请切换到某个分支后再共享。"
#: src/components/settings/SyncSection.tsx
-msgid "Switch to Follow"
-msgstr "切换到「跟随」"
+msgid "Switch to Auto (Pull only)"
+msgstr "切换到自动(仅拉取)"
#: src/components/command-palette-commands.ts
msgid "Switch worktree"
@@ -12626,7 +12729,6 @@ msgid "Symlinks the skill to {path}"
msgstr "把技能符号链接到 {path}"
#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Sync"
msgstr "同步"
@@ -12635,10 +12737,6 @@ msgstr "同步"
msgid "Sync & sharing"
msgstr "同步与共享"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync disabled"
-msgstr "同步已禁用"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync failed — check the server logs for details."
msgstr "同步失败——详情请查看服务器日志。"
@@ -12647,13 +12745,21 @@ msgstr "同步失败——详情请查看服务器日志。"
msgid "Sync is failing. See the sync status for details."
msgstr "同步正在失败。详情请查看同步状态。"
-#: src/components/settings/SyncSection.tsx
-msgid "Sync is off — your edits stay on this computer until you commit and push manually."
-msgstr "同步已关闭——在你手动提交并推送之前,你的编辑只留在这台电脑上。"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Sync is paused. Commit these local edits to continue, or sort them out in a terminal."
+msgstr "同步已暂停。提交这些本地编辑以继续,或在终端中处理它们。"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync is paused. Turn it back on to resume."
-msgstr "同步已暂停。重新开启即可继续。"
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull and Push) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "这个 worktree 的同步已设为「自动(拉取和推送)」,继承自 {project}。可在「设置 → 同步」中更改。"
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull only) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "这个 worktree 的同步已设为「自动(仅拉取)」,继承自 {project}。可在「设置 → 同步」中更改。"
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Manual for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "这个 worktree 的同步已设为「手动」,继承自 {project}。可在「设置 → 同步」中更改。"
#: src/components/SyncStatusBadge.tsx
msgid "Sync mode"
@@ -12664,18 +12770,10 @@ msgstr "同步模式"
msgid "Sync now"
msgstr "立即同步"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync off"
-msgstr "同步已关闭"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync paused"
msgstr "同步已暂停"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync paused — resolve conflicts to resume."
-msgstr "同步已暂停——解决冲突后即可继续。"
-
#: src/hooks/use-no-push-permission-toast.ts
msgid "Sync paused — you don't have permission to push to this repo"
msgstr "同步已暂停——你没有推送到这个仓库的权限"
@@ -12710,10 +12808,6 @@ msgstr "同步状态:{syncStateLabel} —— 未设置 git 身份"
msgid "Synced"
msgstr "已同步"
-#: src/components/SyncStatusBadge.tsx
-msgid "Synced {lastSyncedRelative}"
-msgstr "{lastSyncedRelative}同步"
-
#: src/components/TimelinePanel.tsx
msgid "Synced from disk"
msgstr "已从磁盘同步"
@@ -12937,6 +13031,10 @@ msgstr "感谢你的报告!"
msgid "That branch is already open in another worktree."
msgstr "那个分支已经在另一个 worktree 中打开了。"
+#: src/components/SyncBlockingChanges.tsx
+msgid "That did not go through. Check the server logs and try again."
+msgstr "操作没有成功。请查看服务器日志后重试。"
+
#: src/comments/reveal-comment.ts
msgid "That document didn't open in time. Try again once it has synced."
msgstr "该文档未能及时打开。请在同步完成后重试。"
@@ -13972,6 +14070,10 @@ msgstr "输入“/”打开命令"
msgid "Type a query, then press <0>↵</0> to search your pages by meaning."
msgstr "输入查询内容,然后按 <0>↵</0> 按语义搜索你的页面。"
+#: src/components/SyncStatusBadge.tsx
+msgid "Type changed"
+msgstr "类型已更改"
+
#: src/editor/components/CodePreviewEditModal.tsx
msgid "Type to edit; <0>Cmd/Ctrl+Enter</0> saves, <1>Esc</1> cancels."
msgstr "输入即可编辑;<0>Cmd/Ctrl+Enter</0> 保存,<1>Esc</1> 取消。"
@@ -14100,6 +14202,10 @@ msgstr "取消勾选全部评论"
msgid "Unmark every comment in {0}"
msgstr "取消勾选 {0} 中的所有评论"
+#: src/components/SyncStatusBadge.tsx
+msgid "Unmerged"
+msgstr "未合并"
+
#: src/editor/slash-command/items.tsx
msgid "Unordered list of items."
msgstr "不带编号的项目列表。"
@@ -14140,6 +14246,10 @@ msgstr "无法解析图片 {identity}。转到引用位置。"
msgid "Untitled report"
msgstr "未命名报告"
+#: src/components/SyncStatusBadge.tsx
+msgid "Untracked"
+msgstr "未跟踪"
+
#: src/components/SyncStatusBadge.tsx
msgid "Up to date"
msgstr "已是最新"
@@ -14187,8 +14297,8 @@ msgid "Updated \"{name}\" from {0}"
msgstr "已从 {0} 更新“{name}”"
#: src/components/SyncStatusBadge.tsx
-msgid "Updated {lastSyncedRelative}"
-msgstr "{lastSyncedRelative}更新"
+msgid "Updated {updatedRelative}"
+msgstr "更新于 {updatedRelative}"
#: src/components/FolderTimelineCard.tsx
msgid "updated folder properties"
@@ -14202,6 +14312,11 @@ msgstr "已更新到版本 {version}"
msgid "Updates flow in"
msgstr "更新会自动流入"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Updates flow in from your remote; your edits stay on this computer."
+msgstr "更新会从远程仓库流入;你的编辑只保留在这台电脑上。"
+
#: src/components/SkillOriginInline.tsx
msgid "Updates from the source apply automatically (unless edited locally)"
msgstr "来源的更新会自动应用(除非在本地编辑过)"
@@ -14654,6 +14769,10 @@ msgstr "它应该保存在哪里?"
msgid "Which skill"
msgstr "哪个技能"
+#: src/components/settings/SyncSection.tsx
+msgid "While you're signed out, updates are checked at most every 3 minutes regardless of this setting."
+msgstr "在你退出登录期间,无论此设置如何,更新最多每 3 分钟检查一次。"
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "Whitespace"
msgstr "空白字符"
@@ -14830,8 +14949,8 @@ msgid "You don't have permission to push to this repo."
msgstr "你没有推送到这个仓库的权限。"
#: src/components/settings/SyncSection.tsx
-msgid "You don't have permission to push to this repo. Follow can still keep your copy up to date."
-msgstr "你没有推送到这个仓库的权限。「跟随」仍然可以让你的副本保持最新。"
+msgid "You don't have permission to push to this repo. Auto (Pull only) can still keep your copy up to date."
+msgstr "你没有向此仓库推送的权限。自动(仅拉取)仍可让你的副本保持最新。"
#: src/components/ShareFreshnessWarning.tsx
msgid "You don't have write access to this repo."
@@ -14903,6 +15022,11 @@ msgstr "你本地的 <0>{shareBranch}</0> 分支副本有改动尚未推送到 G
msgid "Your current version is saved first, so this is reversible."
msgstr "你当前的版本会先被保存,因此这一步可以撤销。"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Your edits are committed and pushed to your remote automatically."
+msgstr "你的编辑会自动提交并推送到远程仓库。"
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "Your edits stay on this computer"
msgstr "你的编辑留在这台电脑上"
diff --git a/packages/app/src/locales/zh-Hant/messages.json b/packages/app/src/locales/zh-Hant/messages.json
index 2feb45bfc..b89c9b8c3 100644
--- a/packages/app/src/locales/zh-Hant/messages.json
+++ b/packages/app/src/locales/zh-Hant/messages.json
@@ -21,11 +21,7 @@
"-YV1Uo": ["模式 ", ["patternNumber"]],
"-bFGPF": ["下一處變更"],
"-dNlfM": ["已復原 ", ["docName"], " 上的最後一次編輯"],
- "-f2Ogn": [
- "讓這個專案和你的 git 遠端保持同步。「跟隨」只取得更新而不推送;完全同步也會推送你的提交。開啟同步需要確認。"
- ],
"-g6KIS": ["無法辨識的連結"],
- "-imiMK": ["跟隨——更新從你的遠端流入;你的編輯留在這台電腦上。"],
"-kKdCC": ["已從 ", ["0"], " 安裝 ", ["imported"], " 個技能"],
"-kbIAr": ["連結與圖片"],
"-ksoxk": [
@@ -124,7 +120,6 @@
"0wswKc": ["用來分隔章節的水平分隔線。"],
"0xnQ_X": ["更新會自動流入"],
"0xnmlQ": ["儲存庫名稱"],
- "0yL--g": ["檢視衝突"],
"0ySP5u": ["變更會自動儲存到這個主題。"],
"0zAhu6": ["所有文件"],
"1-flC9": ["本機伺服器連接埠"],
@@ -156,6 +151,7 @@
"1NgrlY": ["其他安裝方式"],
"1QfxQT": ["關閉"],
"1RluQD": ["顯示取代"],
+ "1TA-aJ": [["pulled"], "拉取 · ", ["pushed"], "推送"],
"1TNIig": ["開啟"],
"1Ta7Fd": ["開啟 ", ["basename"]],
"1V17kO": ["正在載入兩個版本"],
@@ -223,6 +219,11 @@
"2m_bmh": [["label"], "(", ["0"], ")"],
"2myNzt": ["我們已經把它交給團隊,並附上了你的記錄。"],
"2n3oDU": ["依連入連結數量排序的專案層級頁面,最多 ", ["FULLSCREEN_HUB_LIMIT"], " 筆結果。"],
+ "2okwy4": [
+ "這個 worktree 的同步已設為「自動(僅拉取)」,繼承自 ",
+ ["project"],
+ "。可在「設定 → 同步」中變更。"
+ ],
"2pR7ad": ["嵌入服務 API 金鑰"],
"2q_Q7x": ["可見度"],
"2rLM8r": ["無法啟動代理執行緒——請再試一次。"],
@@ -321,7 +322,6 @@
"4A3Yzu": ["程式碼區塊"],
"4BITzH": ["錯誤:"],
"4CfgPM": ["專案資料夾已建立,但 git init 失敗。請再試一次。"],
- "4DcimZ": [["lastSyncedRelative"], "更新"],
"4E9jPa": ["建立你的第一個專案"],
"4EZrJN": ["規則"],
"4ErgAf": ["OpenKnowledge 安裝了一個技能"],
@@ -349,6 +349,7 @@
"4m-xuX": ["自動修正——沒有需要修正的內容"],
"4mDIcg": ["挑要安裝的技能。每一個都會變成歸你所有、可以編輯的技能。"],
"4mLBx9": ["訂閱功能目前無法使用。"],
+ "4mbrAq": ["1 分鐘"],
"4mp6Tv": ["OpenKnowledge 列出了已安裝的技能"],
"4niEzY": ["沙箱化的 HTML 嵌入——寫下 HTML,即時看到顯示結果。"],
"4nj6n8": ["/api/config 傳回了 HTTP ", ["code"]],
@@ -358,11 +359,6 @@
"4uNLmk": ["正在拉取"],
"4v2Yyz": ["當焦點在「檔案」側邊欄時,選取檔案樹中所有看得到的列。"],
"4xtLTl": ["已隱藏資料夾「", ["basename"], "」"],
- "4zEZS5": [
- "這個 worktree 的自動同步已開啟,繼承自 ",
- ["project"],
- "。可在「設定 → 同步」中變更。"
- ],
"4zGlN_": ["貼上圖片 URL,或點一下上傳"],
"4z_1j2": ["已顯示"],
"5-FeN2": ["分享 URL"],
@@ -430,6 +426,7 @@
],
"5hFl0U": ["複製編號"],
"5jEnaB": ["這個平台不支援"],
+ "5k0NLb": ["檢視"],
"5kWklo": ["(其中有些可能已被其他規則隱藏)"],
"5lWFkC": ["登入"],
"5mksg0": ["關閉語意搜尋失敗——", ["detail"]],
@@ -458,6 +455,7 @@
"69KLIV": ["Esc"],
"6ASTuj": ["命令會以你在這台電腦上使用者帳戶的完整權限執行。關閉此項可停用 shell。"],
"6Aih4U": ["離線"],
+ "6EoD0z": ["在終端機中解決"],
"6FCixu": ["重新開啟先前的對話"],
"6HCOwA": ["開啟失敗。"],
"6KCH4m": ["隱藏檔案"],
@@ -506,6 +504,11 @@
"6u9LvN": [["days", "plural", { "other": ["#", " 天前"] }]],
"6ur2Mk": ["協助你的智慧代理在任何專案中探索並使用 OpenKnowledge。"],
"6vEr3W": ["連結目標"],
+ "6xPJIj": [
+ "這個 worktree 的同步已設為「手動」,繼承自 ",
+ ["project"],
+ "。可在「設定 → 同步」中變更。"
+ ],
"6xeZX9": ["編輯會即時套用。淺色或深色由主題決定。"],
"6zzhQL": ["用電子郵件寄出你的回報"],
"72xhRD": ["圖表檢視模式"],
@@ -625,7 +628,6 @@
"8qgfac": ["MCP 伺服器"],
"8rZ1pk": ["啟用 ", ["id"]],
"8ruqQi": ["失效的內部連結"],
- "8sMErm": ["要啟用「跟隨」嗎?"],
"8t9CRE": ["正在啟動 ", ["agentName"], "…"],
"8t9T3-": ["找不到技能。"],
"8tjQCz": ["探索"],
@@ -675,6 +677,7 @@
"9Vnjc9": ["Enter"],
"9XwoPv": [["0", "plural", { "other": ["安裝 ", "#", " 個技能"] }]],
"9Y6cCI": ["載入頁面失敗"],
+ "9ZxzfT": ["領先 ", ["count"], " 個提交"],
"9_2oe6": [
"把 ",
["0"],
@@ -741,11 +744,6 @@
"AVW-K9": ["載入孤立頁面失敗"],
"AWOSPo": ["放大"],
"AYoYhU": ["更新失敗:", ["0"]],
- "AaaESH": [
- "這個 worktree 的自動同步已關閉,繼承自 ",
- ["project"],
- "。可在「設定 → 同步」中變更。"
- ],
"AcK_r0": ["Claude CLI"],
"AczYxH": ["自訂的 open-knowledge 項目——不由 OpenKnowledge 管理"],
"AdcGcG": ["正在套用你的變更"],
@@ -802,6 +800,7 @@
"BVkqD9": [
"索引維護已暫停,因為另一個 Git 屬性控制 index.md。更新 .gitattributes 以便作用域 index.md 路徑使用 merge=union,然後重試。"
],
+ "BWTzAb": ["手動"],
"BY-g4_": ["新增模式"],
"Ba4D2x": ["範本已匯入"],
"Bdha5y": ["正在發布…"],
@@ -831,6 +830,7 @@
"C0C43b": [["warningCount", "plural", { "other": ["#", " 個警告"] }]],
"C0Ciaj": ["已用「", ["0"], "」這個名稱匯入——名稱「", ["1"], "」已被占用。"],
"C0hoX6": ["一律包含"],
+ "C2abof": ["未追蹤"],
"C3Zc44": ["探索技能"],
"C62P6b": ["編輯器選取範圍"],
"C7PKTv": ["將勾選的註解傳送到對話"],
@@ -853,9 +853,6 @@
"CTJLpz": ["「", ["trimmed"], "」在這裡已存在"],
"CU3AiE": ["正在切換分支"],
"CUmCwI": ["在下方插入列"],
- "CVRM5N": [
- "「跟隨」會從你的遠端 git 儲存庫取得更新,並自動快轉你的副本。你的本機編輯留在這台電腦上,永遠不會被推送。"
- ],
"CWjM1r": ["直接放在 ", ["0"], "/ 裡的文件"],
"CWzc2T": [
"無論如何 <0>~/.ok/bin</0> 和 <1>~/.ok/env.sh</1> 都會保留——應用程式一律會維護它們。"
@@ -892,6 +889,7 @@
"在 Git 專案中,Open Knowledge 會在儲存庫根目錄的 .gitattributes 檔案中新增一條限定範圍的規則,以便合併並行的索引變更。"
],
"CxVk-w": ["對 ", ["address"], " 加上註解"],
+ "Cz-K13": ["15 分鐘"],
"D-NlUC": ["跟隨系統"],
"D-Oh1s": ["如何設定 ", ["0"], "(在瀏覽器中開啟)"],
"D-_B7l": ["已連線——這個端點傳回 ", ["0"], " 維向量。"],
@@ -951,7 +949,6 @@
"DmkTrb": ["無法建立這個主題。請再試一次。"],
"Dnn2XG": ["自動"],
"DpjYd6": ["跳到錨定的文字"],
- "DrYM2Z": ["同步已停用"],
"DsDwR-": [["0", "plural", { "other": ["#", " 個錯誤"] }]],
"DskIkK": ["登入流程還沒確認就結束了——請再試一次"],
"DuCPiG": [
@@ -1121,6 +1118,7 @@
"Fqr8BP": ["多頁 PDF 檢視器,附工具列控制項(縮圖、翻頁、縮放)。"],
"Fqx38P": ["是什麼卡住了你?"],
"Fr8JGg": ["zip 檔案"],
+ "FsEXax": ["操作沒有成功。請查看伺服器記錄後再試一次。"],
"Fsx78O": ["把 <0>ok</0> 指令加到你的終端機"],
"FvMSms": ["重新命名會改變磁碟上的檔案,以及代理挑選這個範本時使用的 id。"],
"Fx9aOF": ["OpenKnowledge 編輯了一個文件"],
@@ -1217,6 +1215,7 @@
"H0WlWQ": ["由列和欄組成的表格,含一列標頭。"],
"H1TmTu": ["已停止修正。已經修正好的檔案會維持原狀。"],
"H3oH0g": ["重做"],
+ "H4doZt": ["同步已暫停。提交這些本地編輯以繼續,或在終端機中處理它們。"],
"H86f9p": ["摺疊"],
"H8DVOJ": ["兩邊完全相同,", ["pick"], " 仍會讀到它們。"],
"HAkEqR": ["最近的檔案"],
@@ -1287,6 +1286,7 @@
"IWGfGF": ["正在檢查你的 GitHub 連線"],
"IX7-sq": ["開啟「", ["docName"], "」時出了點問題。"],
"IX_uXB": ["my-feature"],
+ "IXiG0B": ["自動(拉取與推送)"],
"IYciRC": ["謝謝你的回報!"],
"IajAbS": ["加入入門套件"],
"If0crP": ["用 AI ", ["targetDisplayName"], " 開啟,", ["hint"]],
@@ -1332,6 +1332,7 @@
"JLzQi_": ["關閉 ", ["accessibleLabel"]],
"JM_aq-": ["請使用 https:// 的 URL——http:// 只允許用在 localhost。"],
"JOcPqH": ["把遠端儲存庫取到這台電腦上。"],
+ "JOhCT9": ["推送包含"],
"JWsZlx": ["請開啟一個專案才能編輯。"],
"JZ8cO6": ["淺色、深色,或跟隨系統。"],
"J_jZ5z": [
@@ -1417,6 +1418,9 @@
"KjTmeO": ["請更新 OpenKnowledge 以開啟這個分享內容。"],
"KkEAud": ["依目前的文件或資料夾情境建立一個檔案。"],
"KkRyMI": ["無法對合併進行分類,請再試一次。"],
+ "KmVekT": [
+ "自動(僅拉取)從你的 git 遠端儲存庫取得更新並自動快轉你的副本。你的本機編輯只保留在這台電腦上,永遠不會被推送。"
+ ],
"KmydK6": ["粗體"],
"KnoB--": ["會儲存成 <0>", ["sanitized"], "</0>。"],
"KpOJFY": ["開啟外部連結預覽"],
@@ -1424,6 +1428,7 @@
"KsAPaB": ["這個分支已在以下位置簽出:"],
"KtACeE": ["預設:<0>", ["0"], "</0>"],
"KujtjC": ["尋找"],
+ "KvwJv8": ["部分檔案未列出:工作區的變更過多。"],
"Kx881F": ["已還原 ", ["0"], "。"],
"L-rMC9": ["重設為預設值"],
"L1BQTH": [["0"], " 尚未安裝——正在開啟它的下載頁面。"],
@@ -1441,6 +1446,7 @@
"L83DKQ": ["PATH 安裝失敗:", ["summary"]],
"L8fKuc": ["在你的終端機中執行這個"],
"L9Y9Om": ["被連結最多的頁面"],
+ "L9ox9k": ["無法讀取工作區。請查看伺服器日誌。"],
"LAR9ub": ["將取代 ", ["0"], " 中既有的 OpenKnowledge 項目"],
"LBv_TR": ["把這些位置改成符號連結"],
"LBwUR6": ["切換分支逾時——請試著手動開啟", ["targetNoun"], "。"],
@@ -1457,7 +1463,6 @@
["laterEdits", "plural", { "other": ["會移除這個檔案上 ", "#", " 處較新的編輯。"] }]
],
"LKOLNn": ["沒有安裝任何 AI 代理"],
- "LNum6A": [["minutes"], " 分鐘前"],
"LPAv9E": [["days"], " 天前"],
"LQdLio": ["新增結構描述"],
"LQsCPn": ["本機的提交讓這份副本無法更新"],
@@ -1528,14 +1533,12 @@
"MCjC9A": ["刪除 ", ["deleteDescriptorLabel"]],
"MDBJwN": ["不好用"],
"MDZSJe": ["代理執行排程工作的時間。"],
- "MGBNwj": ["暫停同步"],
"MGb89P": ["透過 CodeMirror 的預設按鍵對應,在原始碼編輯器中插入、刪除、移動、複製和縮排行。"],
"MHrjPM": ["標題"],
"MI6Z0f": ["挑一個表情符號插入到游標處。"],
"MIF36T": ["無法解決這個分岔:", ["0"]],
"MILoeL": ["服務"],
"MJuO1q": ["脈絡視窗:"],
- "MKEPCY": ["跟隨"],
"MLVPcm": [["0"], " 版本 ", ["1"]],
"MOAoFO": ["尚無智慧代理資料夾"],
"MPpSAg": ["從 ", ["selectedPackName"], " 建立新專案"],
@@ -1596,6 +1599,7 @@
],
"N5rzKJ": ["刪除 ", ["0"], " 個技能"],
"N6j2JH": ["編輯 ", ["0"]],
+ "N7Lau6": ["提交並同步"],
"NBdIgR": ["註解"],
"NErvOX": ["儲存到"],
"NEzPEh": ["建立新分支,或簽出既有分支,各自在獨立視窗中開啟。"],
@@ -1623,6 +1627,7 @@
"Nay2Yr": ["沒有代理符合你的搜尋。"],
"NcUznW": [["0"], ",無工作區"],
"NcurBF": ["向下平移"],
+ "NcwbBM": ["拉取帶來"],
"NeQ_0G": ["處理這些註解"],
"NeY1Np": ["Slidev 啟動逾時。請再試一次。"],
"NfraGd": ["安裝 Slidev 的其他方式"],
@@ -1662,6 +1667,7 @@
"O6yEPk": ["在你選的資料夾中建立一個新的 OpenKnowledge 專案。"],
"O7_W_a": ["用 AI 開啟"],
"O9oQJS": ["傳送回報"],
+ "OBdkpo": ["分離的 HEAD"],
"OD0FCX": ["已隱藏「", ["basename"], "」"],
"ODGGlj": ["資料夾名稱:", ["detail"]],
"OEEQKT": ["良好"],
@@ -1717,6 +1723,7 @@
"Oo_WWc": ["找不到頁面"],
"Oos8fo": ["複製指令"],
"OplnBG": ["這個版本無法管理 AI 工具。"],
+ "OqqecQ": ["30 秒"],
"OsSaYm": ["複製失敗:", ["title"]],
"OuQezS": ["繼續此對話時生效"],
"OuY8t9": ["在目前的分支中開啟"],
@@ -1747,7 +1754,9 @@
"PBwmDJ": ["正在按語意搜尋"],
"PBxg_E": ["現在不用"],
"PCSkw2": ["技能"],
+ "PEGxvo": ["5 分鐘"],
"PGPGsL": ["新增描述"],
+ "PGRnbw": ["更新會從遠端儲存庫流入;你的編輯只保留在這台電腦上。"],
"PHHEuH": ["隱藏已解決的註解(", ["0"], ")"],
"PIMM5l": ["訂閱成功!"],
"PKLY-1": ["正在開啟…"],
@@ -1760,7 +1769,6 @@
"PRgIJh": ["無法更新 ", ["subRoot"], ":", ["0"]],
"PRnH8G": ["共 ", ["0"]],
"PTUuoc": ["無法取消標記那則註解——它仍在等著傳送。"],
- "PTb1Nx": ["同步已暫停。重新開啟就會繼續。"],
"PVSwOe": ["正在改向——等待目前執行停止…"],
"PVUn_c": ["開啟資料夾"],
"PVggyD": ["frontmatter 結構描述"],
@@ -1798,6 +1806,7 @@
"PrWQiT": ["將 Terminal 移到右側"],
"PrhzDE": ["向上平移"],
"Pw5PTU": ["外部來源"],
+ "PxZCNM": ["不在 Open Knowledge 的提交範圍內。"],
"Q-DKvr": ["從 ", ["source"], " 安裝"],
"Q1mtyd": ["隱藏側邊欄"],
"Q5fqMz": ["連線出錯——請再試一次"],
@@ -1836,6 +1845,7 @@
",包含 ",
["childCount", "plural", { "other": ["#", " 個項目"] }]
],
+ "QeREu8": ["已重新命名"],
"QfFBdJ": ["範本的檔案名稱(不含 `.md`)。"],
"Qft6eW": ["將 ", ["0"], " 個技能移至全域"],
"Qj4RL5": ["已完成:"],
@@ -1993,13 +2003,9 @@
"Sr9xtj": ["選擇這個結構描述適用的資料夾"],
"SrOuyg": ["文件面板"],
"SvBFYA": ["沒有最近的專案"],
- "Sxx_Zz": [
- "這個 worktree 的「跟隨」已開啟,繼承自 ",
- ["project"],
- "。可在「設定 → 同步」中變更。"
- ],
"T-654M": ["正在載入 PDF"],
"T0OVm7": ["預設分支受保護——推送需要透過 pull request。"],
+ "T1fMJ6": ["這台電腦從你的遠端儲存庫拉取變更的頻率。"],
"T2fvhw": ["取消勾選 ", ["0"], " 中的所有註解"],
"T3Mld1": ["視窗"],
"T3j-7o": ["例如:同步進行到一半時切換了專案"],
@@ -2043,10 +2049,10 @@
"U2pMtf": ["tag-name"],
"U3IvM5": ["完整指南"],
"U3RIJu": ["本機檔案"],
- "U4nTfu": ["啟用「跟隨」"],
"U5Spo9": ["內容目錄必須在專案裡面"],
"U6Mdhd": ["開始設定吧。"],
"U6wmNc": ["同步已暫停"],
+ "U7Iesw": [["seconds"], " 秒"],
"U88xbi": ["建立結構描述檔案失敗"],
"U8CD-l": ["複製完整路徑,不含工作區"],
"UBv8UK": ["永久刪除"],
@@ -2080,7 +2086,6 @@
"URmyfc": ["詳細資料"],
"UTNVyS": ["選取整份原始碼文件。"],
"UTZ97u": ["選取的內容必須在專案裡面"],
- "UVDasf": ["同步已關閉——在你手動提交並推送之前,你的編輯只會留在這台電腦上。"],
"UVLlMV": ["無法連上 GitHub。要再試一次嗎?"],
"UW2Fg3": ["這個專案正在執行的伺服器不支援即時編輯。重新啟動 OpenKnowledge 即可修正。"],
"UW93oq": ["更換金鑰"],
@@ -2115,6 +2120,7 @@
"UhpfxY": ["向左平移"],
"UkQGhd": ["隱藏取代"],
"UlVARL": ["啟用 Slidev"],
+ "Uo2Rj7": ["啟用自動(拉取與推送)?"],
"Uobeu9": ["把技能加到 ", ["rootRel"], "——", ["0"], " 也會讀取該處"],
"Up2_7p": ["複製完整路徑"],
"UpCz01": ["這份文件"],
@@ -2180,6 +2186,7 @@
"VdXv4D": ["從 GitHub 複製"],
"VeVIIk": ["正在載入技能"],
"Vftef5": ["常見的 markdown 問題——硬定位字元、標題層級跳躍、清單標記等等。"],
+ "Vl1H8I": ["需要重新連線才能繼續同步。"],
"Vlc75q": ["讓檔案維持已刪除的狀態"],
"VmJT51": ["正在載入你的回報"],
"VmXASo": ["(符號連結)"],
@@ -2201,6 +2208,7 @@
["rootPath"],
"</0> 已經有一個 OpenKnowledge 專案了。請選它以外的位置,或者直接開啟那個專案。"
],
+ "W7mERj": ["啟用自動(僅拉取)?"],
"W8vpBM": ["入門套件"],
"W9NSe0": ["正在檢查連結"],
"W9_Bub": ["本機變更和傳入的同步內容重疊"],
@@ -2218,6 +2226,7 @@
" 個項目嗎?資料夾以及裡面的所有檔案都會被刪除。這個動作無法復原。"
],
"WMsoIm": ["已經登入了?"],
+ "WOfp4H": ["更新同步間隔失敗 — ", ["detail"]],
"WOr-hW": ["token"],
"WPwDin": ["在磁碟上開啟資料夾"],
"WR0y2O": ["分享資料夾"],
@@ -2236,6 +2245,7 @@
"Wcv-Zi": ["把這個知識庫當成 Claude 技能提供出去。"],
"We7h2I": ["📝 或 assets/icon.png"],
"Weq9zb": ["一般"],
+ "WfcERq": ["沒有需要提交的內容:工作區是乾淨的。"],
"Wfy3rU": ["代理設定"],
"Wgmlsw": ["正在取得"],
"Wh0im4": ["正在編輯 [[", ["realCurrentDoc"], "]]"],
@@ -2287,7 +2297,6 @@
"XRuL0i": ["建立頁面"],
"XSb9HS": ["捨棄本機編輯,還原成已安裝的版本"],
"XT-L4j": ["開啟一個代理,用 AI 來創作"],
- "XU0OXn": ["啟用自動同步"],
"XU5AOg": ["輸入"],
"XV5sC0": ["開啟 worktree"],
"XW18jo": ["頁面標題回應不符合成功時的結構描述"],
@@ -2323,6 +2332,7 @@
"Xp7Kq4": ["另一個同步作業正在進行中。請稍候再試。"],
"Xp94R1": ["再試一次"],
"XpIZmv": ["使用等寬字體的圍欄程式碼區塊。"],
+ "Xs1kjx": ["檢查更新的頻率"],
"Xs7IcT": ["無法連線到 ", ["displayName"], "。要再試一次嗎?"],
"XszXjc": ["已重新命名為 ", ["0"]],
"XtRoxT": ["第 ", ["pageNumber"], " 頁"],
@@ -2355,6 +2365,7 @@
"檢查外掛——要執行哪些規則家族,以及各條規則的設定——在「這個專案 → 外掛」底下的獨立分頁中設定。"
],
"YEP3X2": ["當作用中的表格儲存格選取範圍涵蓋整張表時,刪除該表格。"],
+ "YEzhIr": ["拉取並推送"],
"YGIi_c": ["重新安裝"],
"YGNRB5": ["— 除了"],
"YGt-0e": ["閱讀中…"],
@@ -2388,7 +2399,6 @@
"YlDuro": ["符合高度"],
"YlwI5F": ["只在這台電腦上對這個專案生效。存在 .ok/local 中,不會透過 git 分享。"],
"Yp-Hi_": ["開啟設定"],
- "YsEYYS": [["behind", "plural", { "other": ["落後 ", "#", " 個提交"] }]],
"YvwwqC": ["位置"],
"YwPUUP": ["這個套件在這裡已經設定好了。"],
"YxZDGh": ["無法讀取 ", ["fileName"], "。它可能已被移動、刪除,或還沒下載完。請試著重新加入。"],
@@ -2471,7 +2481,6 @@
"ZscwQ0": ["無法切換到「僅自己」"],
"Zt7Ktx": ["路徑不能離開技能(不允許 . 或 ..)"],
"Zue_jx": ["你的 GitHub 權杖缺少必要的權限範圍。請試著重新登入。"],
- "Zul8Ry": ["從不"],
"ZvzbDF": ["直接把它加到這個專案。"],
"ZwpggY": ["OpenKnowledge 讀取了專案設定"],
"_0JUKX": ["回報錯誤需要 OpenKnowledge 桌面應用程式。"],
@@ -2592,7 +2601,6 @@
"ai40UJ": ["新紀錄 · 按<0>空白鍵</0>再玩一次"],
"aiArms": ["我們無法複製這個儲存庫。"],
"aiOceC": ["啟用索引"],
- "ajHi4O": ["自動同步已暫停——你沒有推送到這個儲存庫的權限。切換到「跟隨」以繼續接收更新。"],
"ajz9F8": ["無法載入 ", ["filePath"], " 的衝突內容。請試著重新載入頁面。"],
"ak4LLg": ["清除選單"],
"akOe4q": ["你的 Git 憑證設定中指定了 ", ["declaredLogin"], ",但無法使用該帳戶的憑證。"],
@@ -2605,7 +2613,6 @@
"arUUsK": ["產品動態"],
"ax9kie": ["連結預覽設定尚未載入——請稍候再試"],
"axQ1h6": ["還有什麼想補充的嗎?(選填)"],
- "az8lvo": ["關閉"],
"b18t0_": ["關閉差異檢視"],
"b1FDss": ["捲動到開頭"],
"b2ezG_": ["兩個都保留了——「", ["0"], "」現在是一個獨立的技能"],
@@ -2685,6 +2692,7 @@
"cFSbbh": ["只限這台裝置。對你在這裡打開的每個專案都生效,而且絕不會分享給協作者。"],
"cH0dkG": ["它缺少我需要的功能"],
"cHhH3i": ["一個必要的 git 工具"],
+ "cIFYZn": ["在你登出期間,無論此設定為何,更新最多每 3 分鐘檢查一次。"],
"cIptmH": ["在 Claude Desktop App 中"],
"cKjLuT": ["(專案 + 使用者)"],
"cLP0Lf": ["遠端技能來源"],
@@ -2743,6 +2751,8 @@
"ct2kv5": [["pageTarget"], " 中沒有標題"],
"cuA8QW": ["整理規格"],
"cuHhjo": ["建立並編輯"],
+ "cyoNqf": ["未合併"],
+ "czQDKY": ["每次推送就是向你的遠端儲存庫提交一次。"],
"d-GtJt": ["在 Markdown 原始碼中檢視"],
"d1JjXo": [
"你本機的 <0>",
@@ -2825,6 +2835,7 @@
"eGUbmF": ["複製選取的檔案或資料夾"],
"eJitUk": ["從電腦上傳"],
"eKThTQ": ["重新排序失敗"],
+ "eNOyTV": ["你沒有向此儲存庫推送的權限。自動(僅拉取)仍可讓你的副本保持最新。"],
"eNQGRb": ["由 KaTeX 顯示的行內 LaTeX 公式。"],
"eNhWUl": ["一位 PR 審查者、一位發行說明撰稿人、一份部署檢查清單……"],
"ePK91l": ["編輯"],
@@ -2852,12 +2863,12 @@
"emMrXQ": ["伺服器回傳的複本回應格式錯誤。"],
"emgiet": ["權威內容;在所有被參照的地方逐字鏡像。"],
"enPTnx": ["第 ", ["displayLine"], " 行"],
+ "eolhcI": ["正在讀取工作區"],
"eps54V": ["已移除"],
"epuNYK": ["把某個區塊標記為事實來源。你編輯它的時候,別處的鏡像會即時更新。"],
"erenF-": ["無法刪除仍有未解決衝突的檔案"],
"euGaS0": ["無法讀取 ", ["fileName"], "。"],
"euc6Ns": ["建立副本"],
- "evHlIg": ["「跟隨」不會推送或提交你的本機變更。它們只會留在這台電腦上。"],
"evs0iw": ["符合「", ["tagListQuery"], "」的標籤"],
"ewSbS_": ["Shell 工作階段"],
"ezUmoU": ["允許的元素值(留空 = 任意)"],
@@ -2923,7 +2934,6 @@
"g1ZTh_": [
["count", "plural", { "other": ["確定要刪除以下 ", "#", " 個檔案/資料夾及其內容嗎?"] }]
],
- "g2Tj8R": ["完整"],
"g3UF2V": ["接受"],
"g4WlQK": ["專案的 AI 工具管理只在 OpenKnowledge 桌面應用程式中提供。"],
"g4XBm0": ["小型章節標題。"],
@@ -2939,7 +2949,6 @@
["display"],
"。那個資料夾會變成指向這個資料夾的符號連結,所以它的代理會讀到放在這裡的所有東西。這個資料夾仍然是真實的資料夾。如果技能有衝突,合併會中止。"
],
- "g85bAo": [["lastSyncedRelative"], "同步"],
"g9Nj4l": ["// 註解"],
"gAhHu7": ["自動修正只作用於有已知機械式修正方式的問題。"],
"gBbxn_": ["正在檢查登入狀態"],
@@ -3003,6 +3012,7 @@
"gwEcOD": ["你的本機副本落後了。"],
"gwykHF": ["這份文件還沒有同步到 GitHub。下次同步之後連結就會生效。"],
"gyHDWC": ["用 AI 全部修正(", ["count"], ")"],
+ "gyYvCN": ["推送我的編輯的頻率"],
"h-AdvS": ["資料夾和範本都已經在這裡了,沒有東西要加。"],
"h06R3C": ["沒有頁面缺少連出的關係圖連結。"],
"h16FyT": ["清單"],
@@ -3070,7 +3080,6 @@
"hwFOFD": ["設定載入失敗"],
"hxBHxQ": ["一行帶註腳<0><1>[1]</1></0>的文字,定義顯示在下方。"],
"hxEUVJ": ["初始化 ", ["selectedPackName"]],
- "hxYFzm": ["完全同步——你的提交會自動推送,遠端的變更會自動拉取。"],
"hxnF0I": [["0"], " 屬性"],
"hyCxJY": ["改為開啟那個 worktree"],
"hynz2K": ["下載已開始"],
@@ -3081,7 +3090,6 @@
"i09An-": ["已還原到較早的版本(", ["0"], ")"],
"i1flq_": ["維基連結建議"],
"i3f2kh": ["沒有相符的指令。"],
- "i6ng22": ["切換到「跟隨」"],
"i92eAT": ["我們會建立一個儲存庫並開始同步——不必用終端機。"],
"i94lQe": ["OpenKnowledge 檢查了衝突"],
"i9OyGp": ["復原或重做"],
@@ -3159,11 +3167,11 @@
"iqr14Z": ["如何在「問題」、編輯器診斷、稽核和代理工具中報告缺少的專案本機文件、檔案和影像。"],
"iqugog": ["初始化失敗:", ["errorDetail"]],
"irFGwu": ["範本清單"],
+ "irnKr_": ["更新於 ", ["updatedRelative"]],
"irrm_E": ["移除選取範圍"],
"isRobC": ["新增"],
"iuTKci": ["還沒有任何編輯。"],
"iv452l": [["0"], " 的說明文件(在瀏覽器中開啟)"],
- "iy64Li": ["完全同步——你的編輯會自動提交並推送到你的遠端。"],
"iycx_A": ["正在推送"],
"iz1LdD": ["自從它上次寫入這裡之後,在 OK 之外被改動過——顯示的是磁碟上現在的狀態"],
"j-o6Z2": ["由於無法保存項目設置,索引維護已停止。檢查專案檔案權限,然後重試。"],
@@ -3203,6 +3211,7 @@
"jSO1X5": ["繼承來的範本無法在這裡重新命名——請到擁有它的那個資料夾中重新命名。"],
"jSY41h": ["「", ["docName"], "」耗時過久。請檢查你的網路連線。"],
"jTLWxh": ["用行內 iframe 嵌入外部頁面(說明文件、示範、Figma、CodeSandbox)。"],
+ "jTUxaN": ["啟用自動(僅拉取)"],
"jWzDfC": ["正在檢查你安裝了哪些 AI 工具"],
"jZ_E5M": ["取得失敗——詳情請看伺服器記錄。"],
"j_Z6g7": ["分享的預設值"],
@@ -3291,11 +3300,11 @@
"把語意搜尋指向任何相容 OpenAI 的嵌入端點——自架的伺服器或別家供應商都行。上面的 API 金鑰是給你在這裡設定的端點用的。"
],
"kSiB3X": ["無法移到", ["trashNoun"]],
- "kUn-CN": ["同步已關閉"],
"kV2YZv": ["沒看到<0>技能</0>嗎?請先啟用<1>設定 <2/> 功能 <3/> 程式碼執行與檔案建立</1>。"],
"kVS5tE": ["在每個資料夾中維護 generated 索引?"],
"kVgQUA": ["刪除此對話?"],
"kVzuTI": ["推薦代理技能"],
+ "kXNv8P": ["自動(僅拉取)永遠不會推送或提交你的本機變更。它們只保留在這台機器上。"],
"kYL1lH": ["代理活動"],
"k_Dqw1": [["0", "plural", { "other": ["#", " 份文件都沒有問題。"] }]],
"k_pade": ["設定現在已分享。提交這些 OK 檔案就能分享給你的團隊。"],
@@ -3376,6 +3385,7 @@
"lM4c-I": [
"技能內部的一個路徑——任何資料夾都可以(例如 references/notes.md)。路徑中的資料夾會自動建立。"
],
+ "lPkjpD": [["pushed"], "推送"],
"lPzyrU": ["所有差異區塊都已解決"],
"lS83Sg": ["無法存取剪貼簿。"],
"lScd1O": ["Slidev 簡報僅能在 OpenKnowledge 桌面應用程式中開啟。"],
@@ -3642,6 +3652,7 @@
"pJ7XCo": ["此頁面未引用任何本機檔案或圖片。"],
"pMPnZv": ["已刪除 ", ["deleted"], " 個技能"],
"pOo4Aa": ["純文字"],
+ "pPiV8s": ["啟用自動(拉取與推送)"],
"pSimwP": [["editor"], " 版本的新名稱"],
"pTPqMK": ["切換圍欄程式碼區塊。"],
"pTyA_t": ["標籤"],
@@ -3703,6 +3714,7 @@
"qAx7xG": ["內容根目錄中的固定資料夾"],
"qBi_YG": ["在你的 AI 工具中安裝 OpenKnowledge"],
"qC7PwZ": ["移除欄位失敗"],
+ "qD3krc": ["在你發起操作之前不會有任何變動。"],
"qEEfPk": ["錯誤回報 ", ["0"]],
"qEIFZu": ["以 ", ["keyHint"], " 結尾的金鑰"],
"qEue6Q": [" 或 "],
@@ -3711,6 +3723,9 @@
"qIJIrD": ["正在測試"],
"qJSo0_": ["副本和符號連結有什麼差別?"],
"qKMfPp": ["隱藏技能節點"],
+ "qLXJTB": [
+ "讓此專案與你的 git 遠端儲存庫保持同步。自動(僅拉取)只帶來更新而不推送;自動(拉取與推送)還會傳送你的編輯。開啟自動同步需要確認。"
+ ],
"qNOgUu": ["在來源處的編輯會同步到這裡——不會因為複製貼上而產生偏差。"],
"qQi_um": ["主題已匯入。"],
"qRZh7J": ["讓 Tab 鍵離開原始碼編輯器,而不是縮排。"],
@@ -3726,7 +3741,6 @@
"qXg5W9": ["檔案會存到 <0>~/Downloads/openknowledge.skill</0>。"],
"qXsafh": ["發布到 GitHub"],
"qZv5ZR": ["切換設定分享失敗"],
- "q_9EcE": ["要啟用 git 自動同步嗎?"],
"q_Q1-i": [["count", "plural", { "other": ["確定要刪除以下 ", "#", " 個資料夾及其內容嗎?"] }]],
"q_z77Z": ["標題層級"],
"qaHyRJ": [["linkCount", "plural", { "other": ["#", " 個連結"] }]],
@@ -3802,7 +3816,6 @@
["boldName"],
" 的預覽——一個隨 Open Knowledge 一起提供的內建技能。它是唯讀的。"
],
- "rn7n0G": ["恢復同步"],
"rnX-1S": ["啟用外掛"],
"rnrdEX": ["主要"],
"roAe2K": ["連結 URL"],
@@ -3842,6 +3855,7 @@
"sJK6pq": ["權限不足"],
"sJWhgo": ["未知的元件:", ["unregisteredComponentName"]],
"sKEgGd": ["傳送到對話"],
+ "sKHiNR": ["落後 ", ["count"], " 個提交"],
"sNeKjP": ["儲存權杖失敗——請再試一次"],
"sOxZaS": ["載入關係圖失敗"],
"sQoLn0": ["結束"],
@@ -3865,6 +3879,7 @@
"scyoP9": [
"索引文件不包含 frontmatter,除了知識庫根目錄中的 frontmatter 。日誌文件不被覆蓋-OKF不限制它們的frontmatter。"
],
+ "sdvHp3": ["本機和遠端都有變更"],
"se-tU0": ["無法修復 ", ["total"], " 個檔案中的 ", ["0"], " 個。"],
"seeS6l": ["要在這個資料夾中設定 OpenKnowledge 嗎?"],
"sgmRY8": ["已略過下載 ", ["0"], "。"],
@@ -3880,6 +3895,7 @@
"snrVQ7": ["偵測失敗"],
"sq4WQH": ["把 ", ["0"], " 用作淺色主題"],
"sqUrlK": ["沉思中…"],
+ "srdlOs": ["自動同步已暫停:你沒有向此儲存庫推送的權限。切換到自動(僅拉取)以繼續接收更新。"],
"ssk6rl": ["技能自己的資料夾(", ["path"], ")——其他位置從這裡複製或連結"],
"ssuwjF": ["分支"],
"stXWnP": ["在檔案管理程式中打開"],
@@ -3895,12 +3911,12 @@
"szy9BS": ["只能用小寫字母、數字和連字號"],
"t-JXbf": ["Notion 風格的行內列,用來呈現可下載的檔案。也可以拖放。"],
"t18QYR": ["取消釘選 ", ["accessibleLabel"]],
- "t2TkQ3": ["同步已暫停——解決衝突後就會繼續。"],
"t4sFKC": [
"新分支 <0>",
["trimmed"],
"</0> 會從目前的提交建立,放在 <1>.ok/worktrees/</1> 底下自己的 worktree 中。"
],
+ "t5I7P_": ["在你發起操作之前不會有任何變動——請在同步選單中拉取與推送。"],
"t6w1cq": ["開啟一個空白的編輯器分頁。"],
"t7YoBO": ["傳送這則註解"],
"t9Qn8y": ["沒有啟用任何代理"],
@@ -3937,6 +3953,7 @@
"tjXez2": ["blog-post"],
"tjbyOy": ["專案詳細資料"],
"tkIXtS": ["已安裝 ", ["imported"], " 個技能(其中 ", ["alreadyImported"], " 個本來就有)"],
+ "tlGXxX": ["自動(僅拉取)"],
"tnG-m6": ["自動同步已暫停——請登入以繼續。"],
"toyw51": ["Mermaid 圖表控制項"],
"tqQBwN": ["任何指令碼都只會顯示出來供你檢查,絕不會執行。"],
@@ -3957,6 +3974,7 @@
"u779EG": ["請使用 http:// 或 https:// 來源。"],
"u7H-Wn": ["顯示面板(", ["panelShortcutLabel"], ")"],
"u7U_Ij": ["為選取的文字加上連結,或編輯游標處的連結。"],
+ "uAQUqI": ["狀態"],
"uA_jXp": ["切換並更新分支"],
"uBAxNB": ["編輯器"],
"uCaIdy": ["GitHub 登入不存在或已過期。請重新連接以繼續同步。"],
@@ -3983,7 +4001,6 @@
"無法重新啟動伺服器——它正以另一個帳戶執行。請重新啟動電腦來清除,再重新開啟這個專案。"
],
"uUCrBv": ["符號連結"],
- "uUiiyC": ["你沒有推送到這個儲存庫的權限。「跟隨」仍然可以讓你的副本保持最新。"],
"uVbUP8": ["設定…"],
"uY5Z7P": ["遊戲結束 · 按<0>空白鍵</0>再玩一次"],
"uYZTcW": ["無法分享此 GitHub URL。"],
@@ -4014,6 +4031,7 @@
"v15iQB": [
"經證明的計算合約。僅適用於類型為 Attested Computation 的文檔,其中 OKF 需要 runtime;普通概念不受影響。"
],
+ "v16Pzh": ["切換到自動(僅拉取)"],
"v2ZW0K": ["啟用終端機"],
"v2a04T": ["markdownlint 規則"],
"v41fCm": ["找不到檔案"],
@@ -4026,6 +4044,7 @@
"vF68cg": ["欄位"],
"vGQxBT": ["來源的更新會自動套用(除非在本機編輯過)"],
"vGeNNQ": ["複製一段提示,貼給你的代理來設定專案。"],
+ "vGjmyl": ["已刪除"],
"vHlhDc": ["按兩下即可編輯"],
"vIxrEk": ["符合寬度"],
"vLyv1R": ["隱藏"],
@@ -4061,8 +4080,10 @@
"vjwsDi": [
["count", "plural", { "other": ["立即修正有已知自動修正方式的 ", "#", " 個問題。"] }]
],
+ "vp5vfW": ["1 小時"],
"vppAju": ["新加入的附件要放在哪裡。"],
"vqJXNe": ["安裝 <0>open-knowledge-discovery</0> 技能"],
+ "vsFXfP": ["推送略過"],
"vv7kpg": ["已取消"],
"vvWZnu": ["無法顯示差異"],
"vwV-kH": ["修復檔案的過程意外中止。"],
@@ -4119,6 +4140,11 @@
"wdzBgi": ["設定分享現在是「僅自己」。"],
"weP6me": ["無法載入文件——再輸入一次 @ 重試"],
"wgNoIs": ["全選"],
+ "wk_v1X": [
+ "這個 worktree 的同步已設為「自動(拉取與推送)」,繼承自 ",
+ ["project"],
+ "。可在「設定 → 同步」中變更。"
+ ],
"wlwXUk": ["你選了 ~/Downloads。那裡的檔案通常是暫時的——建議改用一個穩定的資料夾。"],
"wndeIl": ["既沒有連入也沒有連出關係圖邊的專案層級頁面。"],
"wqD3pI": [["0"], " 則註解中有 ", ["failed"], " 則無法更新。"],
@@ -4154,6 +4180,7 @@
"xCdTnb": ["關閉新分頁"],
"xDBki3": ["標題建議"],
"xDEcka": ["供應商正在對這把金鑰限流。請稍候再試。"],
+ "xDKOFk": ["已忽略"],
"xEb24l": ["允許我們用電子郵件跟進"],
"xFQRu4": ["我本機已經有了"],
"xG4tb6": ["與「", ["docName"], "」的連線已中斷。"],
@@ -4165,6 +4192,7 @@
"xOTzt5": ["剛剛"],
"xSVO3J": ["會建立什麼"],
"xV5sXw": [["0"], " 週前"],
+ "xW5AUw": [["pulled"], "拉取"],
"xWEvuo": ["問 AI"],
"xWomUD": ["使用 ", ["editor"], " 的版本"],
"xXo8FT": ["儲存失敗:", ["error"]],
@@ -4288,6 +4316,7 @@
"zAJzIg": [["0"], " 中的問題"],
"zAsDLY": ["文件連結的圖形檢視。"],
"zBUqvf": ["設定 OpenKnowledge 整合…"],
+ "zBiFZh": ["你的編輯會自動提交並推送到遠端儲存庫。"],
"zC5jrM": ["將建立為 <0>", ["effective"], "</0>"],
"zD1Nqf": [["count", "plural", { "other": ["#", " 個文件"] }]],
"zFH7iU": ["無法完全清除網路設定,但正在關閉公開存取。", ["0"]],
@@ -4299,6 +4328,7 @@
"zLak8b": ["切換到新分頁"],
"zMmwh4": ["選擇主題或建立自己的主題。"],
"zQBg2C": ["把目前的區塊往上或往下移一個位置。"],
+ "zWZBPx": ["類型已變更"],
"zXj1rA": ["按語意搜尋"],
"zYp8Sr": [
"<0>已修改</0>標記代表你的設定明確設過的規則——直接設定,或透過 <1>extends</1> 繼承而來。未標記的規則維持預設狀態。"
@@ -4337,7 +4367,6 @@
"。要換一個從 ",
["expectedHost"],
" 複製的資料夾嗎?"
- ],
- "zz_Wd_": ["模式"]
+ ]
}
}
diff --git a/packages/app/src/locales/zh-Hant/messages.po b/packages/app/src/locales/zh-Hant/messages.po
index 1fb3356da..4d57039be 100644
--- a/packages/app/src/locales/zh-Hant/messages.po
+++ b/packages/app/src/locales/zh-Hant/messages.po
@@ -517,10 +517,6 @@ msgstr "領先 {ahead} 個,落後 {behind} 個"
msgid "{basename} — text editor"
msgstr "{basename} — 文字編輯器"
-#: src/components/SyncStatusBadge.tsx
-msgid "{behind, plural, one {# commit behind} other {# commits behind}}"
-msgstr "{behind, plural, other {落後 # 個提交}}"
-
#: src/components/SyncStatusBadge.tsx
msgid "{behind} behind"
msgstr "落後 {behind} 個"
@@ -616,6 +612,14 @@ msgstr "{count, plural, other {立即修正有已知自動修正方式的 # 個
msgid "{count, plural, one {matches # file} other {matches # files}}"
msgstr "{count, plural, other {符合 # 個檔案}}"
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} ahead"
+msgstr "領先 {count} 個提交"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "{count} behind"
+msgstr "落後 {count} 個提交"
+
#: src/components/SkillBulkDeleteDialog.tsx
msgid "{count} skills"
msgstr "{count} 個技能"
@@ -811,14 +815,11 @@ msgstr "第 {displayLine} 行:{localizedMessage}"
msgid "{mins, plural, one {# min ago} other {# min ago}}"
msgstr "{mins, plural, other {# 分鐘前}}"
-#: src/components/SyncStatusBadge.tsx
-msgid "{minutes} min ago"
-msgstr "{minutes} 分鐘前"
-
#: src/components/acp/ThreadHistoryMenu.tsx
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "{minutes}m ago"
msgstr "{minutes} 分鐘前"
@@ -910,6 +911,10 @@ msgstr "{propertyCount, plural, other {# 項屬性}}"
msgid "{propPanelDescriptorLabel} Properties"
msgstr "{propPanelDescriptorLabel} 屬性"
+#: src/components/settings/SyncSection.tsx
+msgid "{seconds} seconds"
+msgstr "{seconds} 秒"
+
#: src/components/ActivityModeContent.tsx
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/ActivityPanelFileRow.tsx
@@ -1127,6 +1132,26 @@ msgstr "📝 或 assets/icon.png"
msgid "0/0"
msgstr "0/0"
+#: src/components/settings/SyncSection.tsx
+msgid "1 hour"
+msgstr "1 小時"
+
+#: src/components/settings/SyncSection.tsx
+msgid "1 minute"
+msgstr "1 分鐘"
+
+#: src/components/settings/SyncSection.tsx
+msgid "15 minutes"
+msgstr "15 分鐘"
+
+#: src/components/settings/SyncSection.tsx
+msgid "30 seconds"
+msgstr "30 秒"
+
+#: src/components/settings/SyncSection.tsx
+msgid "5 minutes"
+msgstr "5 分鐘"
+
#: src/components/ImportSkillForm.tsx
msgid "A .zip or .skill archive."
msgstr "一個 .zip 或 .skill 封存檔。"
@@ -1521,6 +1546,7 @@ msgstr "把你的註解寫在這則訊息裡"
#: src/components/PropertyDiffBlock.tsx
#: src/components/SkillDirectoryResult.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Added"
msgstr "已新增"
@@ -1565,11 +1591,13 @@ msgstr "新增這些檔案"
msgid "Adds these folders"
msgstr "新增這些資料夾"
+#: src/components/settings/SyncSection.tsx
#: src/editor/components/PropPanel.tsx
msgid "Advanced"
msgstr "進階"
#: src/components/ConsentDialogBody.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Advanced settings"
msgstr "進階設定"
@@ -1979,6 +2007,24 @@ msgstr "權威內容;在所有被參照的地方逐字鏡像。"
msgid "Authorize in browser"
msgstr "在瀏覽器中授權"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull and Push)"
+msgstr "自動(拉取與推送)"
+
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Auto (Pull only)"
+msgstr "自動(僅拉取)"
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
+msgstr "自動(僅拉取)從你的 git 遠端儲存庫取得更新並自動快轉你的副本。你的本機編輯只保留在這台電腦上,永遠不會被推送。"
+
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Auto (Pull only) never pushes or commits your local changes. They stay only on this machine."
+msgstr "自動(僅拉取)永遠不會推送或提交你的本機變更。它們只保留在這台機器上。"
+
#: src/components/settings/TerminalSection.tsx
msgid "Auto-approve settings not yet loaded — try again in a moment"
msgstr "自動核准設定尚未載入——請稍候再試"
@@ -2012,21 +2058,13 @@ msgstr "自動修正只作用於有已知機械式修正方式的問題。"
msgid "Auto-save"
msgstr "自動儲存"
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is off for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "這個 worktree 的自動同步已關閉,繼承自 {project}。可在「設定 → 同步」中變更。"
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Auto-sync is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "這個 worktree 的自動同步已開啟,繼承自 {project}。可在「設定 → 同步」中變更。"
-
#: src/components/settings/SyncSection.tsx
msgid "Auto-sync is paused — sign in to resume."
msgstr "自動同步已暫停——請登入以繼續。"
#: src/components/settings/SyncSection.tsx
-msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Follow to keep receiving updates."
-msgstr "自動同步已暫停——你沒有推送到這個儲存庫的權限。切換到「跟隨」以繼續接收更新。"
+msgid "Auto-sync is paused — you don't have permission to push to this repo. Switch to Auto (Pull only) to keep receiving updates."
+msgstr "自動同步已暫停:你沒有向此儲存庫推送的權限。切換到自動(僅拉取)以繼續接收更新。"
#: src/components/AutoSyncEnableWarning.tsx
msgid "Auto-sync periodically fetches, pulls, and pushes commits to your remote git repository so your edits stay in sync across machines."
@@ -2424,9 +2462,14 @@ msgid "Change the embeddings provider?"
msgstr "要更換嵌入服務供應商嗎?"
#: src/components/PropertyDiffBlock.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Changed"
msgstr "已修改"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Changed here and on the remote"
+msgstr "本機和遠端都有變更"
+
#: src/components/ChangedOutsideBadge.tsx
msgid "changed outside"
msgstr "在外部被改動"
@@ -2451,6 +2494,10 @@ msgstr "變更已自動儲存。"
msgid "Check for updates"
msgstr "檢查更新"
+#: src/components/settings/SyncSection.tsx
+msgid "Check for updates every"
+msgstr "檢查更新的頻率"
+
#: src/components/AppMenubar.tsx
msgid "Check for updates…"
msgstr "檢查更新…"
@@ -2970,6 +3017,10 @@ msgstr "對此程式碼區塊發表評論或詢問 AI"
msgid "Comments"
msgstr "註解"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Commit and sync"
+msgstr "提交並同步"
+
#: src/components/ShareBranchSwitchDialog.tsx
msgid "Commit or stash changes to switch:"
msgstr "先提交或暫存變更才能切換:"
@@ -3271,6 +3322,7 @@ msgstr "正在轉換…"
#: src/components/empty-state/CopyablePromptList.tsx
#: src/components/InstallInClaudeDesktopDialog.tsx
+#: src/components/SyncStatusBadge.tsx
#: src/editor/extensions/CodeBlockView.tsx
msgid "Copied"
msgstr "已複製"
@@ -3886,6 +3938,10 @@ msgstr "無法讀取等著傳送的註解——什麼都沒有送出。"
msgid "Couldn't read the comments waiting to send: {0}"
msgstr "無法讀取等著傳送的註解:{0}"
+#: src/components/SyncStatusBadge.tsx
+msgid "Couldn't read the working tree. Check the server logs."
+msgstr "無法讀取工作區。請查看伺服器日誌。"
+
#. placeholder {0}: warning.code
#: src/components/settings/SavedThemesTiles.tsx
msgid "Couldn’t read this theme ({0})"
@@ -4459,6 +4515,10 @@ msgstr "刪除此對話?"
msgid "Delete this comment"
msgstr "刪除這則註解"
+#: src/components/SyncStatusBadge.tsx
+msgid "Deleted"
+msgstr "已刪除"
+
#. placeholder {0}: deletedTheme.label
#: src/components/settings/SavedThemesTiles.tsx
msgid "Deleted {0}."
@@ -4554,6 +4614,10 @@ msgstr "描述 token"
msgid "Design"
msgstr "設計"
+#: src/components/SyncStatusBadge.tsx
+msgid "detached HEAD"
+msgstr "分離的 HEAD"
+
#: src/components/SyncStatusBadge.tsx
msgid "Detached HEAD — checkout a branch to resume"
msgstr "HEAD 處於分離狀態——請簽出一個分支再繼續"
@@ -4926,6 +4990,10 @@ msgstr "每個 AI 工具都從各自的資料夾讀取技能。將一個資料
msgid "Each pack scaffolds your project with ready-made folders and templates."
msgstr "每個套件都會用現成的資料夾和範本幫你的專案搭好骨架。"
+#: src/components/settings/SyncSection.tsx
+msgid "Each push is one commit to your remote."
+msgstr "每次推送就是向你的遠端儲存庫提交一次。"
+
#: src/components/AppMenubar.tsx
#: src/components/settings/LintingSection.tsx
#: src/components/SkillsTree.tsx
@@ -5174,25 +5242,25 @@ msgstr "啟用 {id}"
#: src/components/EnableSyncConfirmDialog.tsx
#: src/components/share-receive-miss-content.tsx
#: src/components/ShareFreshnessWarning.tsx
-msgid "Enable auto-sync"
-msgstr "啟用自動同步"
+msgid "Enable Auto (Pull and Push)"
+msgstr "啟用自動(拉取與推送)"
-#: src/components/settings/LinkPreviewsSection.tsx
-msgid "Enable external link previews"
-msgstr "開啟外部連結預覽"
+#: src/components/AutoSyncEnableWarning.tsx
+msgid "Enable Auto (Pull and Push)?"
+msgstr "啟用自動(拉取與推送)?"
#: src/components/AutoSyncOnboardingDialog.tsx
#: src/components/EnableSyncConfirmDialog.tsx
-msgid "Enable Follow"
-msgstr "啟用「跟隨」"
+msgid "Enable Auto (Pull only)"
+msgstr "啟用自動(僅拉取)"
#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable Follow?"
-msgstr "要啟用「跟隨」嗎?"
+msgid "Enable Auto (Pull only)?"
+msgstr "啟用自動(僅拉取)?"
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Enable git auto-sync?"
-msgstr "要啟用 git 自動同步嗎?"
+#: src/components/settings/LinkPreviewsSection.tsx
+msgid "Enable external link previews"
+msgstr "開啟外部連結預覽"
#: src/components/settings/LintingSection.tsx
msgid "Enable indexes"
@@ -5788,6 +5856,10 @@ msgstr "更新嵌入服務供應商失敗——{detail}"
msgid "Failed to update the project sync default — {detail}"
msgstr "更新專案同步預設值失敗——{detail}"
+#: src/components/settings/SyncSection.tsx
+msgid "Failed to update the sync interval — {detail}"
+msgstr "更新同步間隔失敗 — {detail}"
+
#: src/components/FileTree.tsx
msgid "Failed to upload file"
msgstr "上傳檔案失敗"
@@ -6047,28 +6119,6 @@ msgstr "已複製資料夾分享連結。"
msgid "Folder target: {linkTitle}. Click to open the overview."
msgstr "目標資料夾:{linkTitle}。點一下可開啟總覽。"
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow"
-msgstr "跟隨"
-
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Follow — updates flow in from your remote; your edits stay on this computer."
-msgstr "跟隨——更新從你的遠端流入;你的編輯留在這台電腦上。"
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow fetches updates from your remote git repository and fast-forwards your copy automatically. Your local edits stay on this computer and are never pushed."
-msgstr "「跟隨」會從你的遠端 git 儲存庫取得更新,並自動快轉你的副本。你的本機編輯留在這台電腦上,永遠不會被推送。"
-
-#: src/hooks/use-worktree-autosync-notice.tsx
-msgid "Follow is on for this worktree, inherited from {project}. Change it in Settings → Sync."
-msgstr "這個 worktree 的「跟隨」已開啟,繼承自 {project}。可在「設定 → 同步」中變更。"
-
-#: src/components/AutoSyncEnableWarning.tsx
-msgid "Follow never pushes or commits your local changes. They stay only on this machine."
-msgstr "「跟隨」不會推送或提交你的本機變更。它們只會留在這台電腦上。"
-
#: src/components/acp/ThreadView.tsx
msgid "Follow the agent's edits"
msgstr "跟著代理的編輯走"
@@ -6159,11 +6209,6 @@ msgstr "用這個範本建立的每份文件都會以這段 frontmatter 開頭
msgid "Frontmatter schemas"
msgstr "frontmatter 結構描述"
-#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
-msgid "Full"
-msgstr "完整"
-
#: src/components/InstallInClaudeDesktopDialog.tsx
msgid "Full guide"
msgstr "完整指南"
@@ -6177,14 +6222,6 @@ msgstr "完整路徑"
msgid "Full Path"
msgstr "完整路徑"
-#: src/components/settings/SyncSection.tsx
-msgid "Full sync — your commits push and remote changes pull automatically."
-msgstr "完全同步——你的提交會自動推送,遠端的變更會自動拉取。"
-
-#: src/components/SyncStatusBadge.tsx
-msgid "Full sync — your edits are committed and pushed to your remote automatically."
-msgstr "完全同步——你的編輯會自動提交並推送到你的遠端。"
-
#: src/components/OkBlobRunner.tsx
msgid "Game over · press <0>Space</0> to play again"
msgstr "遊戲結束 · 按<0>空白鍵</0>再玩一次"
@@ -6243,6 +6280,7 @@ msgid "Git needs a helper tool (such as git-lfs) that isn't installed or couldn'
msgstr "Git 需要一個輔助工具(例如 git-lfs),但它沒有安裝或找不到。請先安裝再試一次。"
#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Git sync"
msgstr "Git 同步"
@@ -6620,6 +6658,10 @@ msgstr "分享是怎麼運作的?"
msgid "How missing project-local documents, files, and images are reported in Problems, editor diagnostics, audits, and agent tools."
msgstr "如何在「問題」、編輯器診斷、稽核和代理工具中報告缺少的專案本機文件、檔案和影像。"
+#: src/components/settings/SyncSection.tsx
+msgid "How often this computer pulls changes from your remote."
+msgstr "這台電腦從你的遠端儲存庫拉取變更的頻率。"
+
#: src/components/ShareFreshnessWarning.tsx
msgid "How to push manually"
msgstr "如何手動推送"
@@ -6705,6 +6747,10 @@ msgstr "忽略模式"
msgid "Ignore patterns (raw text)"
msgstr "忽略模式(純文字)"
+#: src/components/SyncStatusBadge.tsx
+msgid "Ignored"
+msgstr "已忽略"
+
#: src/components/LinksPanel.tsx
msgid "Image {identity}. Go to reference."
msgstr "圖片 {identity}。前往引用位置。"
@@ -7301,8 +7347,8 @@ msgid "Keep the name to 64 characters or fewer."
msgstr "名稱請控制在 64 個字元以內。"
#: src/components/settings/SyncSection.tsx
-msgid "Keep this project in sync with your git remote. Follow fetches updates without pushing; full sync pushes your commits too. Turning sync on requires confirmation."
-msgstr "讓這個專案和你的 git 遠端保持同步。「跟隨」只取得更新而不推送;完全同步也會推送你的提交。開啟同步需要確認。"
+msgid "Keep this project in sync with your git remote. Auto (Pull only) brings in updates without pushing; Auto (Pull and Push) sends your edits too. Turning auto-sync on requires confirmation."
+msgstr "讓此專案與你的 git 遠端儲存庫保持同步。自動(僅拉取)只帶來更新而不推送;自動(拉取與推送)還會傳送你的編輯。開啟自動同步需要確認。"
#: src/lib/pack-copy.ts
msgid "Keep track of the people and companies you work with and the meetings you have with them. Good for remembering who someone is, how you know them, and what you last talked about."
@@ -7782,6 +7828,11 @@ msgstr "這個版本無法管理 AI 工具。"
msgid "Managing project AI tools is unavailable in this build."
msgstr "這個版本無法管理專案的 AI 工具。"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Manual"
+msgstr "手動"
+
#: src/components/empty-state/use-create-suggestions.ts
msgid "Map the architecture"
msgstr "梳理架構"
@@ -7920,10 +7971,6 @@ msgstr "缺少色盤色彩"
msgid "Missing theme name"
msgstr "缺少主題名稱"
-#: src/components/SyncStatusBadge.tsx
-msgid "Mode"
-msgstr "模式"
-
#: src/components/settings/SearchSection.tsx
msgid "Model"
msgstr "模型"
@@ -7940,6 +7987,7 @@ msgstr "模型預設的推理強度"
#: src/components/FolderOverview.tsx
#: src/components/settings/markdownlint-rule-browser.tsx
#: src/components/SkillOriginInline.tsx
+#: src/components/SyncStatusBadge.tsx
msgid "Modified"
msgstr "已修改"
@@ -8232,10 +8280,6 @@ msgstr "清理過程中發生網路錯誤"
msgid "Network settings not yet loaded. Try again in a moment."
msgstr "網路設定尚未載入。請稍後重試。"
-#: src/components/SyncStatusBadge.tsx
-msgid "never"
-msgstr "從不"
-
#: src/components/FolderOverview.tsx
#: src/editor/tag-suggestion/TagSuggestionMenu.tsx
msgid "New"
@@ -8850,10 +8894,22 @@ msgstr "無({0} 無法比對到任何文件)"
msgid "nothing ({0} is not a valid pattern)"
msgstr "無({0} 不是有效的模式)"
+#: src/components/settings/SyncSection.tsx
+msgid "Nothing moves until you ask — pull and push from the sync menu."
+msgstr "在你發起操作之前不會有任何變動——請在同步選單中拉取與推送。"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing moves until you ask."
+msgstr "在你發起操作之前不會有任何變動。"
+
#: src/components/FolderPropertiesCard.tsx
msgid "Nothing set yet."
msgstr "還沒有設定任何東西。"
+#: src/components/SyncStatusBadge.tsx
+msgid "Nothing to commit — working tree clean."
+msgstr "沒有需要提交的內容:工作區是乾淨的。"
+
#: src/components/BugReportSendToast.tsx
msgid "Nothing was uploaded. The report stays on this computer until you email it to us."
msgstr "未上傳任何內容。在你以電子郵件寄給我們之前,報告會保留在這台電腦上。"
@@ -8887,10 +8943,6 @@ msgstr "共 {0}"
msgid "of {totalPages}"
msgstr "共 {totalPages}"
-#: src/components/settings/SyncSection.tsx
-msgid "Off"
-msgstr "關閉"
-
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Off — external links show only their URL. No requests leave this computer."
msgstr "關閉——外部連結只顯示 URL。不會有任何要求離開這台電腦。"
@@ -9645,6 +9697,10 @@ msgstr "連出"
msgid "Outline"
msgstr "大綱"
+#: src/components/SyncStatusBadge.tsx
+msgid "Outside what Open Knowledge commits."
+msgstr "不在 Open Knowledge 的提交範圍內。"
+
#: src/components/SkillCostValue.tsx
msgid "over the {budgetLabel} token budget"
msgstr "超出 {budgetLabel} token 預算"
@@ -9855,10 +9911,6 @@ msgstr "模式語法錯誤:{message}"
msgid "Pattern warnings: {summary}"
msgstr "模式警告:{summary}"
-#: src/components/SyncStatusBadge.tsx
-msgid "Pause sync"
-msgstr "暫停同步"
-
#: src/components/acp/ThreadView.tsx
msgid "pending"
msgstr "待處理"
@@ -10252,10 +10304,26 @@ msgstr "正在發布…"
msgid "Pull"
msgstr "拉取"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull and Push"
+msgstr "拉取並推送"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pull brings in"
+msgstr "拉取帶來"
+
#: src/components/share-receive-miss-content.tsx
msgid "Pull latest changes"
msgstr "拉取最新的變更"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled}"
+msgstr "{pulled}拉取"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Pulled {pulled} · pushed {pushed}"
+msgstr "{pulled}拉取 · {pushed}推送"
+
#: src/components/share-receive-miss-content.tsx
#: src/components/SyncStatusBadge.tsx
msgid "Pulling"
@@ -10281,10 +10349,26 @@ msgstr "分享前請先將分支 {branch} 推送到 GitHub。"
msgid "Push failed — check the server logs for details."
msgstr "推送失敗——詳情請看伺服器記錄。"
+#: src/components/SyncStatusBadge.tsx
+msgid "Push includes"
+msgstr "推送包含"
+
+#: src/components/settings/SyncSection.tsx
+msgid "Push my edits every"
+msgstr "推送我的編輯的頻率"
+
+#: src/components/SyncStatusBadge.tsx
+msgid "Push skips"
+msgstr "推送略過"
+
#: src/lib/share/run-share-action.ts
msgid "Push this branch to GitHub before sharing."
msgstr "分享前請先將這個分支推送到 GitHub。"
+#: src/components/SyncStatusBadge.tsx
+msgid "Pushed {pushed}"
+msgstr "{pushed}推送"
+
#: src/components/SyncStatusBadge.tsx
msgid "Pushing"
msgstr "正在推送"
@@ -10358,6 +10442,10 @@ msgstr "來自另一份文件的 MirrorSource 區塊的唯讀副本。在來源
msgid "Read-only file in the {name} skill"
msgstr "{name} 技能中的唯讀檔案"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reading working tree"
+msgstr "正在讀取工作區"
+
#: src/components/acp/working-status.ts
msgid "Reading…"
msgstr "閱讀中…"
@@ -10411,6 +10499,10 @@ msgstr "推薦代理技能"
msgid "Reconnect required"
msgstr "需要重新連接"
+#: src/components/SyncStatusBadge.tsx
+msgid "Reconnect required to keep syncing."
+msgstr "需要重新連線才能繼續同步。"
+
#: src/presence/use-sync-toasts.ts
msgid "Reconnected"
msgstr "已重新連線"
@@ -10677,6 +10769,10 @@ msgstr "重新命名技能"
msgid "Rename succeeded but the sidebar may be out of date — refresh to resync"
msgstr "重新命名成功,但側邊欄可能不是最新的——請重新整理以重新同步"
+#: src/components/SyncStatusBadge.tsx
+msgid "Renamed"
+msgstr "已重新命名"
+
#. placeholder {0}: docLeaf(descriptor.from)
#. placeholder {1}: docLeaf(descriptor.to)
#: src/components/TimelinePanel.tsx
@@ -10828,7 +10924,6 @@ msgstr "即使你中斷連接,你已經複製下來的儲存庫也可能透過
#: src/components/CloneDialog.tsx
#: src/components/share-metadata-rows.tsx
#: src/components/SkillPreviewTab.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Repository"
msgstr "儲存庫"
@@ -10911,6 +11006,10 @@ msgstr "調整「技能」面板大小"
msgid "Resolve conflict in your terminal"
msgstr "在你的終端機中解決衝突"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Resolve in terminal"
+msgstr "在終端機中解決"
+
#: src/components/FileTree.tsx
msgid "Resolve the conflict on {files} before deleting."
msgstr "刪除前請先解決 {files} 上的衝突。"
@@ -11026,10 +11125,6 @@ msgstr "已還原到 {0} 的版本"
msgid "Results capped — this workspace has more files than search can index. A missing file may be a cap artifact, not a typo."
msgstr "結果已被截斷——這個工作區的檔案數超過搜尋能索引的上限。找不到某個檔案可能是上限造成的,不是打錯字。"
-#: src/components/SyncStatusBadge.tsx
-msgid "Resume sync"
-msgstr "恢復同步"
-
#: src/components/acp/ThreadView.tsx
msgid "Resuming the chat"
msgstr "正在恢復對話"
@@ -11101,8 +11196,8 @@ msgid "Reverting"
msgstr "正在回復"
#: src/components/SyncStatusBadge.tsx
-msgid "Review conflicts"
-msgstr "檢視衝突"
+msgid "Review"
+msgstr "檢視"
#: src/components/ReportBugDialogBody.tsx
msgid "Review your report"
@@ -12248,6 +12343,10 @@ msgstr "Slidev 啟動逾時。請再試一次。"
msgid "Small section heading."
msgstr "小型章節標題。"
+#: src/components/SyncStatusBadge.tsx
+msgid "Some files are not listed — the working tree has too many changes."
+msgstr "部分檔案未列出:工作區的變更過多。"
+
#: src/components/settings/SavedThemesTiles.tsx
msgid "Some saved themes aren’t shown because the theme folder exceeds the scan limit."
msgstr "因為主題資料夾超出掃描限制,部分已儲存的主題未顯示。"
@@ -12439,6 +12538,10 @@ msgstr "正在啟動代理…"
msgid "status"
msgstr "狀態"
+#: src/components/SyncStatusBadge.tsx
+msgid "Status"
+msgstr "狀態"
+
#: src/components/SubscribeCard.tsx
#: src/components/SubscribeForm.tsx
msgid "Stay in the loop"
@@ -12586,8 +12689,8 @@ msgid "Switch to a branch to share."
msgstr "請切換到某個分支後再分享。"
#: src/components/settings/SyncSection.tsx
-msgid "Switch to Follow"
-msgstr "切換到「跟隨」"
+msgid "Switch to Auto (Pull only)"
+msgstr "切換到自動(僅拉取)"
#: src/components/command-palette-commands.ts
msgid "Switch worktree"
@@ -12626,7 +12729,6 @@ msgid "Symlinks the skill to {path}"
msgstr "把技能符號連結到 {path}"
#: src/components/settings/SyncSection.tsx
-#: src/components/SyncStatusBadge.tsx
msgid "Sync"
msgstr "同步"
@@ -12635,10 +12737,6 @@ msgstr "同步"
msgid "Sync & sharing"
msgstr "同步與分享"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync disabled"
-msgstr "同步已停用"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync failed — check the server logs for details."
msgstr "同步失敗——詳情請看伺服器記錄。"
@@ -12647,13 +12745,21 @@ msgstr "同步失敗——詳情請看伺服器記錄。"
msgid "Sync is failing. See the sync status for details."
msgstr "同步一直失敗。詳情請看同步狀態。"
-#: src/components/settings/SyncSection.tsx
-msgid "Sync is off — your edits stay on this computer until you commit and push manually."
-msgstr "同步已關閉——在你手動提交並推送之前,你的編輯只會留在這台電腦上。"
+#: src/components/SyncBlockingChanges.tsx
+msgid "Sync is paused. Commit these local edits to continue, or sort them out in a terminal."
+msgstr "同步已暫停。提交這些本地編輯以繼續,或在終端機中處理它們。"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync is paused. Turn it back on to resume."
-msgstr "同步已暫停。重新開啟就會繼續。"
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull and Push) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "這個 worktree 的同步已設為「自動(拉取與推送)」,繼承自 {project}。可在「設定 → 同步」中變更。"
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Auto (Pull only) for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "這個 worktree 的同步已設為「自動(僅拉取)」,繼承自 {project}。可在「設定 → 同步」中變更。"
+
+#: src/hooks/use-worktree-autosync-notice.tsx
+msgid "Sync is set to Manual for this worktree, inherited from {project}. Change it in Settings → Sync."
+msgstr "這個 worktree 的同步已設為「手動」,繼承自 {project}。可在「設定 → 同步」中變更。"
#: src/components/SyncStatusBadge.tsx
msgid "Sync mode"
@@ -12664,18 +12770,10 @@ msgstr "同步模式"
msgid "Sync now"
msgstr "立即同步"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync off"
-msgstr "同步已關閉"
-
#: src/components/SyncStatusBadge.tsx
msgid "Sync paused"
msgstr "同步已暫停"
-#: src/components/SyncStatusBadge.tsx
-msgid "Sync paused — resolve conflicts to resume."
-msgstr "同步已暫停——解決衝突後就會繼續。"
-
#: src/hooks/use-no-push-permission-toast.ts
msgid "Sync paused — you don't have permission to push to this repo"
msgstr "同步已暫停——你沒有推送到這個儲存庫的權限"
@@ -12710,10 +12808,6 @@ msgstr "同步狀態:{syncStateLabel} —— 未設定 git 身分"
msgid "Synced"
msgstr "已同步"
-#: src/components/SyncStatusBadge.tsx
-msgid "Synced {lastSyncedRelative}"
-msgstr "{lastSyncedRelative}同步"
-
#: src/components/TimelinePanel.tsx
msgid "Synced from disk"
msgstr "已從磁碟同步"
@@ -12937,6 +13031,10 @@ msgstr "謝謝你的回報!"
msgid "That branch is already open in another worktree."
msgstr "那個分支已經在另一個 worktree 中開啟了。"
+#: src/components/SyncBlockingChanges.tsx
+msgid "That did not go through. Check the server logs and try again."
+msgstr "操作沒有成功。請查看伺服器記錄後再試一次。"
+
#: src/comments/reveal-comment.ts
msgid "That document didn't open in time. Try again once it has synced."
msgstr "該文件未能及時開啟。請在同步完成後重試。"
@@ -13972,6 +14070,10 @@ msgstr "輸入「/」開啟命令"
msgid "Type a query, then press <0>↵</0> to search your pages by meaning."
msgstr "輸入查詢內容,然後按 <0>↵</0> 就能按語意搜尋你的頁面。"
+#: src/components/SyncStatusBadge.tsx
+msgid "Type changed"
+msgstr "類型已變更"
+
#: src/editor/components/CodePreviewEditModal.tsx
msgid "Type to edit; <0>Cmd/Ctrl+Enter</0> saves, <1>Esc</1> cancels."
msgstr "輸入即可編輯;<0>Cmd/Ctrl+Enter</0> 儲存,<1>Esc</1> 取消。"
@@ -14100,6 +14202,10 @@ msgstr "取消勾選全部註解"
msgid "Unmark every comment in {0}"
msgstr "取消勾選 {0} 中的所有註解"
+#: src/components/SyncStatusBadge.tsx
+msgid "Unmerged"
+msgstr "未合併"
+
#: src/editor/slash-command/items.tsx
msgid "Unordered list of items."
msgstr "沒有編號的項目清單。"
@@ -14140,6 +14246,10 @@ msgstr "無法解析圖片 {identity}。前往引用位置。"
msgid "Untitled report"
msgstr "未命名回報"
+#: src/components/SyncStatusBadge.tsx
+msgid "Untracked"
+msgstr "未追蹤"
+
#: src/components/SyncStatusBadge.tsx
msgid "Up to date"
msgstr "已是最新"
@@ -14187,8 +14297,8 @@ msgid "Updated \"{name}\" from {0}"
msgstr "已從 {0} 更新「{name}」"
#: src/components/SyncStatusBadge.tsx
-msgid "Updated {lastSyncedRelative}"
-msgstr "{lastSyncedRelative}更新"
+msgid "Updated {updatedRelative}"
+msgstr "更新於 {updatedRelative}"
#: src/components/FolderTimelineCard.tsx
msgid "updated folder properties"
@@ -14202,6 +14312,11 @@ msgstr "已更新到版本 {version}"
msgid "Updates flow in"
msgstr "更新會自動流入"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Updates flow in from your remote; your edits stay on this computer."
+msgstr "更新會從遠端儲存庫流入;你的編輯只保留在這台電腦上。"
+
#: src/components/SkillOriginInline.tsx
msgid "Updates from the source apply automatically (unless edited locally)"
msgstr "來源的更新會自動套用(除非在本機編輯過)"
@@ -14654,6 +14769,10 @@ msgstr "它應該放在哪裡?"
msgid "Which skill"
msgstr "哪一個技能"
+#: src/components/settings/SyncSection.tsx
+msgid "While you're signed out, updates are checked at most every 3 minutes regardless of this setting."
+msgstr "在你登出期間,無論此設定為何,更新最多每 3 分鐘檢查一次。"
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "Whitespace"
msgstr "空白字元"
@@ -14830,8 +14949,8 @@ msgid "You don't have permission to push to this repo."
msgstr "你沒有推送到這個儲存庫的權限。"
#: src/components/settings/SyncSection.tsx
-msgid "You don't have permission to push to this repo. Follow can still keep your copy up to date."
-msgstr "你沒有推送到這個儲存庫的權限。「跟隨」仍然可以讓你的副本保持最新。"
+msgid "You don't have permission to push to this repo. Auto (Pull only) can still keep your copy up to date."
+msgstr "你沒有向此儲存庫推送的權限。自動(僅拉取)仍可讓你的副本保持最新。"
#: src/components/ShareFreshnessWarning.tsx
msgid "You don't have write access to this repo."
@@ -14903,6 +15022,11 @@ msgstr "你本機的 <0>{shareBranch}</0> 分支副本有變更還沒推到 GitH
msgid "Your current version is saved first, so this is reversible."
msgstr "你目前的版本會先存起來,所以這一步可以回復。"
+#: src/components/settings/SyncSection.tsx
+#: src/components/SyncStatusBadge.tsx
+msgid "Your edits are committed and pushed to your remote automatically."
+msgstr "你的編輯會自動提交並推送到遠端儲存庫。"
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "Your edits stay on this computer"
msgstr "你的編輯會留在這台電腦上"
diff --git a/packages/app/tests/dom/jsdom-preload.ts b/packages/app/tests/dom/jsdom-preload.ts
index e9fce868e..0afe76ec2 100644
--- a/packages/app/tests/dom/jsdom-preload.ts
+++ b/packages/app/tests/dom/jsdom-preload.ts
@@ -83,6 +83,18 @@ if (domWindow?.HTMLElement) {
domWindow.HTMLElement.prototype.scrollIntoView ||= () => {};
}
+// jsdom implements no part of the Pointer Capture API. Radix's Select calls
+// `hasPointerCapture` on the trigger while deciding whether a pointerdown
+// opened the listbox; the resulting TypeError is swallowed by React's event
+// delegation, so the menu simply never opens and the test failure reads as
+// "unable to find role=option" with no hint at the cause. Stub the trio so any
+// Radix menu built on pointer capture is drivable under jsdom.
+if (domWindow?.HTMLElement) {
+ domWindow.HTMLElement.prototype.hasPointerCapture ||= () => false;
+ domWindow.HTMLElement.prototype.setPointerCapture ||= () => {};
+ domWindow.HTMLElement.prototype.releasePointerCapture ||= () => {};
+}
+
// jsdom has no layout, so the geometry pair ProseMirror needs to place a
// selection is missing on some node types. `singleRect` calls
// `target.getClientRects()` and falls back to `target.getBoundingClientRect()`,
diff --git a/packages/app/tests/integration/attribution-sweep-coverage.test.ts b/packages/app/tests/integration/attribution-sweep-coverage.test.ts
index 7d1efa7c8..014edbf68 100644
--- a/packages/app/tests/integration/attribution-sweep-coverage.test.ts
+++ b/packages/app/tests/integration/attribution-sweep-coverage.test.ts
@@ -443,12 +443,22 @@ const EXEMPT_HANDLERS = new Set([
// No CRDT mutation, no agent-authored content; same rationale as
// `handleSyncStatus` / `handleServerInfo`.
'handleBranchInfo',
+ // `/api/git/worktree-status` — GET-only working-tree listing (porcelain
+ // status, tracking refs, incoming diff). No mutation, no agent-authored
+ // content; same rationale as `handleSyncStatus` / `handleBranchInfo`.
+ 'handleGitWorktreeStatus',
// `/api/git/checkout` — git-level operation, no CRDT mutation. Wrapped
// in `withParentLock` to serialize against the sync-engine's parent-git
// writes; the HEAD watcher handles the CRDT transition asynchronously.
// Identity is still extracted at entry for observability, but the
// operation never touches Y.Docs so identity threading is exempt.
'handleCheckout',
+ // `/api/sync/resolve-blocking` — git-level commit of the paths
+ // blocking a merge. No CRDT mutation and no agent-authored content: the
+ // commit carries the project's resolved git identity via the engine's own
+ // `applyCommitIdentity`, the same author every engine commit gets. Same
+ // rationale as `handleCheckout`.
+ 'handleSyncResolveBlocking',
// `/api/share/target-status` — receive-side git verdict (targeted fetch +
// `cat-file -e` / removal-commit lookup / rename detection). Updates only
// remote-tracking refs, no CRDT mutation, no agent-authored content; same
diff --git a/packages/app/tests/integration/conflict-gate-coverage.test.ts b/packages/app/tests/integration/conflict-gate-coverage.test.ts
index a2cf969b5..1ee0ba50a 100644
--- a/packages/app/tests/integration/conflict-gate-coverage.test.ts
+++ b/packages/app/tests/integration/conflict-gate-coverage.test.ts
@@ -317,7 +317,19 @@ const EXEMPT_HANDLERS = new Set([
// `withParentLock` (serialized with sync-engine writes); `handleBranchInfo`
// is a read endpoint with no lock per the lock-free-reads contract.
'handleBranchInfo',
+ // `/api/git/worktree-status` — read-only `git status` view for the sync
+ // popover (porcelain + tracking refs + incoming diff). Parent-git reads
+ // only, never Y.Doc content; lock-free-reads contract, same posture as
+ // `handleBranchInfo`.
+ 'handleGitWorktreeStatus',
'handleCheckout',
+ // `/api/sync/resolve-blocking` — commits the tracked paths whose
+ // local edits overlap an incoming merge, then resumes sync. Parent-git only
+ // (`add`/`commit`/`restore` under `withParentLock`); the paths it touches are
+ // by definition NOT Y.Doc content in conflict, since a content conflict
+ // routes to the ConflictStore instead of pausing the merge. Same posture as
+ // `handleCheckout`.
+ 'handleSyncResolveBlocking',
// `/api/share/target-status` — receive-side git verdict (fetch + rename
// detection). Updates only remote-tracking refs, never Y.Doc content, so the
// per-doc conflict gate does not apply. Same posture as `handleBranchInfo`.
diff --git a/packages/app/tests/integration/sync-resolve-blocking-http.test.ts b/packages/app/tests/integration/sync-resolve-blocking-http.test.ts
new file mode 100644
index 000000000..0043def84
--- /dev/null
+++ b/packages/app/tests/integration/sync-resolve-blocking-http.test.ts
@@ -0,0 +1,150 @@
+/**
+ * HTTP contract for `POST /api/sync/resolve-blocking` — the button behind
+ * "Changed here and on the remote", which commits exactly the tracked files
+ * whose local edits overlap an incoming merge and then resumes sync.
+ *
+ * The handler has four distinct response paths and the schema deliberately
+ * admits only one action. Each is covered here because this is the one route
+ * in the sync surface that writes a git commit on the user's behalf: a wrong
+ * 200 commits files the user did not choose, and a wrong 409 leaves them stuck
+ * behind a pause with no in-app way out.
+ */
+
+import { execFile } from 'node:child_process';
+import { writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { promisify } from 'node:util';
+import { afterEach, describe, expect, test } from 'vitest';
+import { HARNESS_BOOT_TIMEOUT_MS } from './harness-boot-timeout';
+import { createSyncWiredTestServer, type SyncWiredTestServer } from './test-harness';
+
+const execFileAsync = promisify(execFile);
+
+async function git(dir: string, args: string[]): Promise<string> {
+ const { stdout } = await execFileAsync('git', args, { cwd: dir });
+ return stdout.trim();
+}
+
+interface ErrorBody {
+ type?: string;
+ title?: string;
+}
+
+describe('POST /api/sync/resolve-blocking', () => {
+ const servers: SyncWiredTestServer[] = [];
+
+ afterEach(async () => {
+ for (const server of servers.splice(0)) {
+ await server.cleanup().catch(() => {});
+ }
+ });
+
+ async function post(port: number): Promise<Response> {
+ return fetch(`http://127.0.0.1:${port}/api/sync/resolve-blocking`, {
+ method: 'POST',
+ headers: { 'content-type': 'application/json' },
+ body: JSON.stringify({ action: 'commit' }),
+ });
+ }
+
+ test(
+ 'refuses with 409 when nothing is blocking a merge',
+ async () => {
+ // The pause is what authorizes the commit. Without one there is no
+ // engine-owned path set, and committing whatever happens to be dirty
+ // would sweep up unrelated work the user never saw named in the panel.
+ const server = await createSyncWiredTestServer({ mode: 'full' });
+ servers.push(server);
+
+ const res = await post(server.port);
+
+ expect(res.status).toBe(409);
+ const body = (await res.json()) as ErrorBody;
+ expect(body.type).toBe('urn:ok:error:no-blocking-changes');
+ },
+ HARNESS_BOOT_TIMEOUT_MS,
+ );
+
+ test(
+ 'commits exactly the blocking paths and reports them back',
+ async () => {
+ // The pause fires on the CLASSIC pull path (verb `sync`), for tracked
+ // files OUTSIDE the content scope that the incoming merge also touches.
+ // Content-scoped markdown never reaches it: that path commits dirty
+ // docs itself, and the explicit-Pull verb routes to B1, which records a
+ // ledger conflict instead. `data.json` is the shape that actually blocks.
+ const server = await createSyncWiredTestServer({
+ mode: 'full',
+ originSeed: {
+ '.claude/settings.json': '{"v":1}\n',
+ 'notes.md': '# Notes\n\nbase\n',
+ },
+ });
+ servers.push(server);
+ const { sync } = server;
+ const contentDir = server.contentDir;
+
+ // A teammate changes the same non-content file...
+ await sync.pushToOrigin({ '.claude/settings.json': '{"v":2}\n' }, 'remote bump');
+ // ...while this machine has an uncommitted local edit to it, plus an
+ // unrelated dirty non-content file the merge does NOT touch, which must
+ // stay out of the commit.
+ writeFileSync(join(contentDir, '.claude/settings.json'), '{"v":"local"}\n', 'utf-8');
+ writeFileSync(join(contentDir, 'notes.md'), '# Notes\n\nlocal\n', 'utf-8');
+
+ await sync.engine.trigger('sync');
+
+ const blocking = sync.engine.getBlockingPaths();
+ expect(blocking).toEqual(['.claude/settings.json']);
+ expect(sync.engine.getStatus().pausedReason).toBe('external-changes-pending');
+
+ const res = await post(server.port);
+ expect(res.status).toBe(200);
+ const body = (await res.json()) as {
+ action: string;
+ paths: string[];
+ commitSha?: string;
+ };
+ expect(body.action).toBe('commit');
+ expect(body.paths).toEqual(['.claude/settings.json']);
+
+ // The commit landed and touched only the blocking file.
+ const committed = await git(contentDir, ['show', '--name-only', '--format=', 'HEAD']);
+ expect(committed.split('\n').filter(Boolean)).toEqual(['.claude/settings.json']);
+ },
+ HARNESS_BOOT_TIMEOUT_MS,
+ );
+
+ test(
+ 'rejects an unknown action before reaching the engine',
+ async () => {
+ // `discard` was deliberately not shipped — reverting uncommitted work is
+ // unrecoverable. The schema is what keeps a future client (or a typo)
+ // from reaching a branch that does not exist.
+ const server = await createSyncWiredTestServer({ mode: 'full' });
+ servers.push(server);
+
+ const res = await fetch(`http://127.0.0.1:${server.port}/api/sync/resolve-blocking`, {
+ method: 'POST',
+ headers: { 'content-type': 'application/json' },
+ body: JSON.stringify({ action: 'discard' }),
+ });
+
+ expect(res.status).toBe(400);
+ },
+ HARNESS_BOOT_TIMEOUT_MS,
+ );
+
+ test(
+ 'rejects a non-POST method',
+ async () => {
+ const server = await createSyncWiredTestServer({ mode: 'full' });
+ servers.push(server);
+
+ const res = await fetch(`http://127.0.0.1:${server.port}/api/sync/resolve-blocking`);
+
+ expect(res.status).toBe(405);
+ },
+ HARNESS_BOOT_TIMEOUT_MS,
+ );
+});
diff --git a/packages/app/tests/meta/showok-caller-coverage.test.ts b/packages/app/tests/meta/showok-caller-coverage.test.ts
index fb432ba50..661fda153 100644
--- a/packages/app/tests/meta/showok-caller-coverage.test.ts
+++ b/packages/app/tests/meta/showok-caller-coverage.test.ts
@@ -86,11 +86,29 @@ describe('showOk caller coverage', () => {
'export interface StreamShowAllOpts',
/export async function walkContentDirForShowAll/,
);
+ // Region A2: `toOpenTarget`, the sync popover's open-target resolver.
+ //
+ // A second AUTHORIZED consumer, not a leak. It enumerates nothing — the
+ // rows come from `git status`, which never consults ContentFilter — and
+ // decides only whether an already-listed row carries a clickable link.
+ // `bypassFilters` + `showOk` reduce the filter to its floors alone, which
+ // is the set the sidebar itself refuses under Show All Files; without
+ // `showOk` a changed `.ok/config.yml` would render unclickable while the
+ // sidebar opens it. `.ok/worktrees` and `.ok/local` stay floored
+ // unconditionally (OK_ALWAYS_SKIP_CHILDREN), so per-machine state cannot
+ // reach the wire through this path either way.
+ // Starts at the docblock, which states the contract and names the flag.
+ const [openTargetStart, openTargetEnd] = sliceRegion(
+ source,
+ ' * Where a project-relative working-tree path opens',
+ /\n {2}\/\*\*/,
+ );
const outside: string[] = [];
for (const match of source.matchAll(/\bshowOk\b/g)) {
const offset = match.index ?? 0;
const inWalk = offset >= walkStart && offset < walkEnd;
- if (!inWalk) {
+ const inOpenTarget = offset >= openTargetStart && offset < openTargetEnd;
+ if (!inWalk && !inOpenTarget) {
const line = source.slice(0, offset).split('\n').length;
outside.push(
`api-extension.ts:${line} — showOk outside the walk-opts region. ` +
diff --git a/packages/core/src/config/auto-sync-mode.test.ts b/packages/core/src/config/auto-sync-mode.test.ts
index fd8dbc953..4dbdf6c9f 100644
--- a/packages/core/src/config/auto-sync-mode.test.ts
+++ b/packages/core/src/config/auto-sync-mode.test.ts
@@ -1,10 +1,16 @@
import { describe, expect, test } from 'vitest';
import {
+ DEFAULT_PULL_INTERVAL_SECONDS,
+ DEFAULT_PUSH_INTERVAL_SECONDS,
isSyncMode,
+ MAX_SYNC_INTERVAL_SECONDS,
+ MIN_SYNC_INTERVAL_SECONDS,
modeFromCommittedDefault,
modeFromLegacyEnabled,
+ resolveAutoSyncIntervals,
resolveEffectiveAutoSyncMode,
resolveLocalAutoSyncMode,
+ SYNC_INTERVAL_PRESET_SECONDS,
SYNC_MODE_CHANGE_SOURCES,
SYNC_MODES,
} from './auto-sync-mode.ts';
@@ -122,3 +128,94 @@ describe('resolveEffectiveAutoSyncMode', () => {
expect(resolveEffectiveAutoSyncMode({ local: {}, committedDefault: true })).toBe('full');
});
});
+
+describe('resolveAutoSyncIntervals', () => {
+ test('absent leaves resolve to the shipped defaults', () => {
+ // A config written before these keys existed must keep today's cadence
+ // rather than dropping to zero or NaN.
+ for (const absent of [undefined, {}, { pullIntervalSeconds: null }]) {
+ expect(resolveAutoSyncIntervals(absent)).toEqual({
+ pullIntervalSeconds: DEFAULT_PULL_INTERVAL_SECONDS,
+ pushIntervalSeconds: DEFAULT_PUSH_INTERVAL_SECONDS,
+ });
+ }
+ });
+
+ test('pull and push resolve independently', () => {
+ // The whole point of two leaves: setting one must not disturb the other.
+ expect(resolveAutoSyncIntervals({ pushIntervalSeconds: 900 })).toEqual({
+ pullIntervalSeconds: DEFAULT_PULL_INTERVAL_SECONDS,
+ pushIntervalSeconds: 900,
+ });
+ expect(resolveAutoSyncIntervals({ pullIntervalSeconds: 300 })).toEqual({
+ pullIntervalSeconds: 300,
+ pushIntervalSeconds: DEFAULT_PUSH_INTERVAL_SECONDS,
+ });
+ });
+
+ test('a hand-edited out-of-range value clamps instead of failing the read', () => {
+ // The schema would reject these, which fails the WHOLE config read. Sync
+ // must survive one bad cadence, so the resolver clamps defensively.
+ expect(resolveAutoSyncIntervals({ pullIntervalSeconds: 1 }).pullIntervalSeconds).toBe(
+ MIN_SYNC_INTERVAL_SECONDS,
+ );
+ expect(resolveAutoSyncIntervals({ pushIntervalSeconds: 999_999 }).pushIntervalSeconds).toBe(
+ MAX_SYNC_INTERVAL_SECONDS,
+ );
+ });
+
+ test('a non-finite or non-numeric value falls back rather than propagating NaN', () => {
+ // NaN would flow into setTimeout and fire immediately — a hot loop against
+ // the remote, the exact failure the floor exists to prevent.
+ for (const bad of [Number.NaN, Number.POSITIVE_INFINITY, 'soon', {}, true]) {
+ expect(
+ resolveAutoSyncIntervals({ pullIntervalSeconds: bad as never }).pullIntervalSeconds,
+ ).toBe(DEFAULT_PULL_INTERVAL_SECONDS);
+ }
+ });
+
+ test('every offered preset survives resolution unchanged', () => {
+ // A preset that clamped would render as one value and persist as another.
+ for (const seconds of SYNC_INTERVAL_PRESET_SECONDS) {
+ expect(resolveAutoSyncIntervals({ pullIntervalSeconds: seconds }).pullIntervalSeconds).toBe(
+ seconds,
+ );
+ }
+ });
+
+ test('the defaults are themselves offered as presets', () => {
+ // Otherwise the control opens on a value absent from its own list, which
+ // renders as an empty trigger.
+ expect(SYNC_INTERVAL_PRESET_SECONDS).toContain(DEFAULT_PULL_INTERVAL_SECONDS);
+ expect(SYNC_INTERVAL_PRESET_SECONDS).toContain(DEFAULT_PUSH_INTERVAL_SECONDS);
+ });
+});
+
+describe('interval leaves degrade to the leaf, not the layer', () => {
+ test('a hand-edited out-of-range interval keeps the rest of the project-local layer', async () => {
+ // Regression: the leaves were plain .min()/.max(), so an out-of-range value
+ // was a hard schema rejection — and readConfigSafely degrades the WHOLE
+ // layer to defaults on any failure. `autoSync.mode` lives in that layer, so
+ // `pullIntervalSeconds: 15` silently dropped an explicit Manual choice and
+ // fell through to the committed default. On a project committing `full`
+ // that converts "never push for me" into automated commits.
+ const { ConfigSchema } = await import('./schema.ts');
+
+ const parsed = ConfigSchema.safeParse({
+ autoSync: { mode: 'off', pullIntervalSeconds: 15 },
+ });
+
+ expect(parsed.success).toBe(true);
+ if (!parsed.success) return;
+ expect(resolveLocalAutoSyncMode(parsed.data.autoSync)).toBe('off');
+ // The bad leaf falls to absent, and the resolver supplies the default.
+ expect(resolveAutoSyncIntervals(parsed.data.autoSync).pullIntervalSeconds).toBe(
+ DEFAULT_PULL_INTERVAL_SECONDS,
+ );
+ });
+
+ test('an in-range interval still parses through untouched', () => {
+ // The catch must not swallow legitimate values.
+ expect(resolveAutoSyncIntervals({ pullIntervalSeconds: 300 }).pullIntervalSeconds).toBe(300);
+ });
+});
diff --git a/packages/core/src/config/auto-sync-mode.ts b/packages/core/src/config/auto-sync-mode.ts
index 02e9d853c..2d63f8888 100644
--- a/packages/core/src/config/auto-sync-mode.ts
+++ b/packages/core/src/config/auto-sync-mode.ts
@@ -2,11 +2,13 @@
* Sync-mode vocabulary and the rules that turn stored config into an effective
* mode.
*
- * `autoSync.mode` is the canonical per-project sync knob: `off` (no sync),
- * `follow` (one-directional — fetch and fast-forward, never push), `full`
- * (bidirectional). It is the single source of truth for "should this project
- * push?" — only `full` pushes — so no reader can misread a follow-only
- * project's consent as push permission.
+ * `autoSync.mode` is the canonical per-project sync knob for what runs ON A
+ * SCHEDULE: `off` (Manual — nothing scheduled), `follow` (Auto, pull only —
+ * scheduled fetch and fast-forward, never a scheduled push), `full` (Auto,
+ * pull and push — bidirectional). It is the single source of truth for
+ * "should this project push ON ITS OWN INITIATIVE?" — only `full` schedules
+ * pushes. The manual verbs are mode-independent: an explicit user-pressed
+ * Push runs in every mode, including `follow` and `off`.
*
* The follow mode was briefly stored as `'pull'` (after the git operation it
* runs). That value is accepted as a permanent alias for `'follow'` — see
@@ -54,54 +56,6 @@ export type StoredSyncMode = (typeof STORED_SYNC_MODES)[number];
/** A stored active-mode value, including the legacy `'pull'` alias. */
export type StoredSyncActiveMode = (typeof STORED_SYNC_ACTIVE_MODES)[number];
-/** The autoSync shape the pause/resume helpers read (per-machine layer). */
-type LocalAutoSync = {
- mode?: StoredSyncMode | null;
- enabled?: boolean | null;
- resumeMode?: StoredSyncActiveMode | null;
-};
-
-/**
- * The mode a paused project resumes into. `resumeMode` is per-machine UI memory
- * written only when sync is paused (mode `off`) after having been enabled, so an
- * older app that predates the key still reads `mode: 'off'` and never syncs or
- * pushes. It is meaningful only while `mode` is `off`; ignored otherwise.
- */
-export function resumeModeOf(autoSync: LocalAutoSync | undefined): SyncActiveMode | null {
- const resume = autoSync?.resumeMode;
- if (resume === LEGACY_FOLLOW_MODE) return 'follow';
- return isSyncActiveMode(resume) ? resume : null;
-}
-
-/**
- * True when this machine turned sync off after having enabled it — the "paused"
- * state (distinct from a never-answered or explicitly-off project). Signalled by
- * `mode: 'off'` together with a remembered `resumeMode`.
- */
-export function isSyncPaused(autoSync: LocalAutoSync | undefined): boolean {
- return resolveLocalAutoSyncMode(autoSync) === 'off' && resumeModeOf(autoSync) !== null;
-}
-
-/**
- * True when this machine has ever enabled sync for this project — either sync is
- * currently active, or it is paused (was enabled, now off). Drives whether the
- * manual "Sync" action is offered.
- */
-export function hasEverEnabledSync(autoSync: LocalAutoSync | undefined): boolean {
- const mode = resolveLocalAutoSyncMode(autoSync);
- return mode === 'follow' || mode === 'full' || isSyncPaused(autoSync);
-}
-
-/**
- * The active-mode value a Full/Follow control should display: the live mode when
- * sync is active, otherwise the remembered resume mode (defaulting to `full`).
- */
-export function displayActiveMode(autoSync: LocalAutoSync | undefined): SyncActiveMode {
- const mode = resolveLocalAutoSyncMode(autoSync);
- if (isSyncActiveMode(mode)) return mode;
- return resumeModeOf(autoSync) ?? 'full';
-}
-
/**
* Translate the legacy `autoSync.enabled` boolean into a mode: `true` was
* bidirectional sync, `false` was off. `null`/absent stays the "never asked"
@@ -174,3 +128,72 @@ export const SYNC_MODE_CHANGE_SOURCES = [
'worktree-inherit',
] as const;
export type SyncModeChangeSource = (typeof SYNC_MODE_CHANGE_SOURCES)[number];
+
+/**
+ * Scheduled-cycle cadence, in seconds.
+ *
+ * Pull and push are deliberately decoupled and default to different values: a
+ * pull is a read, so polling faster only buys freshness, while a push AUTHORS A
+ * COMMIT in shared history, so polling faster buys noise. Keeping one knob for
+ * both would force a user who wants prompt updates to also accept a cluttered
+ * history.
+ *
+ * The defaults below are the shipped cadence; the config leaves only let a user
+ * move off them.
+ */
+export const DEFAULT_PULL_INTERVAL_SECONDS = 30;
+export const DEFAULT_PUSH_INTERVAL_SECONDS = 60;
+
+/**
+ * Bounds on a stored interval. The floor keeps a hand-edited config from
+ * turning a follower into a hot loop against the remote; the ceiling keeps a
+ * typo'd value from silently parking sync for a day.
+ *
+ * These bound what a user may CHOOSE. They do not override
+ * `ANONYMOUS_PULL_MIN_SECONDS`, which floors an unauthenticated follower's pull
+ * cadence independently — an anonymous follower who picks 30 s still polls at
+ * the anonymous floor.
+ */
+export const MIN_SYNC_INTERVAL_SECONDS = 30;
+export const MAX_SYNC_INTERVAL_SECONDS = 3600;
+
+/**
+ * Cadences offered as presets in Settings. A bounded list rather than a free
+ * number input: the useful range spans two orders of magnitude, and every
+ * interesting value is a round one.
+ */
+export const SYNC_INTERVAL_PRESET_SECONDS = [30, 60, 300, 900, 3600] as const;
+
+/** Clamp one stored interval into range, falling back when absent or unusable. */
+function resolveInterval(value: number | null | undefined, fallback: number): number {
+ if (typeof value !== 'number' || !Number.isFinite(value)) return fallback;
+ return Math.min(
+ MAX_SYNC_INTERVAL_SECONDS,
+ Math.max(MIN_SYNC_INTERVAL_SECONDS, Math.round(value)),
+ );
+}
+
+/**
+ * Per-machine cadence for one project. Absent leaves resolve to the shipped
+ * defaults, so a config written before these keys existed keeps today's timing.
+ *
+ * The clamp is the live default path, not a redundant second gate: the schema
+ * leaves carry `.catch(undefined)`, so an out-of-range or non-numeric value
+ * drops to absent rather than failing the whole layer, and lands here.
+ */
+export function resolveAutoSyncIntervals(
+ autoSync:
+ | { pullIntervalSeconds?: number | null; pushIntervalSeconds?: number | null }
+ | undefined,
+): { pullIntervalSeconds: number; pushIntervalSeconds: number } {
+ return {
+ pullIntervalSeconds: resolveInterval(
+ autoSync?.pullIntervalSeconds,
+ DEFAULT_PULL_INTERVAL_SECONDS,
+ ),
+ pushIntervalSeconds: resolveInterval(
+ autoSync?.pushIntervalSeconds,
+ DEFAULT_PUSH_INTERVAL_SECONDS,
+ ),
+ };
+}
diff --git a/packages/core/src/config/field-registry.test.ts b/packages/core/src/config/field-registry.test.ts
index f2622bea0..000581e5f 100644
--- a/packages/core/src/config/field-registry.test.ts
+++ b/packages/core/src/config/field-registry.test.ts
@@ -313,6 +313,8 @@ describe('ConfigSchema coverage (NR3 — every leaf has fieldRegistry metadata)'
'appearance.sidebar.showSkillsSection',
'autoSync.enabled',
'autoSync.mode',
+ 'autoSync.pullIntervalSeconds',
+ 'autoSync.pushIntervalSeconds',
'autoSync.resumeMode',
'linkPreviews.enabled',
'search.semantic.baseUrl',
diff --git a/packages/core/src/config/schema.ts b/packages/core/src/config/schema.ts
index 525aa6810..5c0753615 100644
--- a/packages/core/src/config/schema.ts
+++ b/packages/core/src/config/schema.ts
@@ -4,7 +4,12 @@ import { SUPPORTED_LOCALES } from '../i18n/locales.ts';
import { DEFAULT_LINKS_VALIDATION, LINKS_VALIDATION_SETTINGS } from '../markdown/lint/types.ts';
import { BASE16_SLOT_ROLES, BASE16_SLOTS } from '../theme/base16.ts';
import { THEME_ID_PATTERN, THEME_PLUGIN_IDS } from '../theme/theme-plugins.ts';
-import { STORED_SYNC_ACTIVE_MODES, STORED_SYNC_MODES } from './auto-sync-mode.ts';
+import {
+ MAX_SYNC_INTERVAL_SECONDS,
+ MIN_SYNC_INTERVAL_SECONDS,
+ STORED_SYNC_ACTIVE_MODES,
+ STORED_SYNC_MODES,
+} from './auto-sync-mode.ts';
import { fieldRegistry } from './field-registry.ts';
/**
@@ -615,9 +620,13 @@ export const ConfigSchema = z.looseObject({
// popover, and the AutoSyncOnboardingDialog all write here via the
// project-local binding — no special HTTP endpoint.
//
- // `mode` is the single knob the engine reads to decide whether to push: only
- // `'full'` pushes, so a `'pull'` follower can never be mistaken for a pusher.
- // It supersedes the legacy `enabled` boolean, which stays readable for configs
+ // `mode` is the single knob the engine reads to decide whether to push ON A
+ // SCHEDULE: only `'full'` schedules pushes, so a follower's machine never
+ // publishes commits the user did not ask it to. It is NOT a capability gate —
+ // the explicit Push action runs in every mode, including `'off'`, because a
+ // button the user pressed is itself the consent this key exists to secure.
+ // Read the field `description` below as the user-facing contract; the two must
+ // not drift. It supersedes the legacy `enabled` boolean, which stays readable for configs
// written before `mode` existed — `resolveLocalAutoSyncMode` derives a mode
// from `enabled` when no `mode` key is present, so the two shapes coexist with
// no migration.
@@ -636,7 +645,7 @@ export const ConfigSchema = z.looseObject({
reload: 'live',
defaultScope: 'project-local',
description:
- "How this machine syncs this project with its git remote: 'off' (no sync), 'follow' (one-directional — pull remote changes, never push your own; 'pull' is accepted as a legacy alias), or 'full' (bidirectional pull and push). null = not chosen yet (onboarding asks). Per-machine (project-local) — not shared. Supersedes the legacy autoSync.enabled boolean.",
+ "What this machine syncs on a schedule for this project: 'off' (Manual — nothing scheduled; the manual pull/push actions still work), 'follow' (Auto, pull only — scheduled pulls, never a scheduled push; 'pull' is accepted as a legacy alias), or 'full' (Auto, pull and push — bidirectional). Explicit user-triggered pushes work in every mode. null = not chosen yet (onboarding asks). Per-machine (project-local) — not shared. Supersedes the legacy autoSync.enabled boolean.",
})
.nullable()
.default(null),
@@ -672,6 +681,59 @@ export const ConfigSchema = z.looseObject({
"When sync is paused (autoSync.mode 'off') after having been enabled, the active mode to resume into ('follow' | 'full'). Per-machine UI memory; ignored while a mode is active. Not shared.",
})
.optional(),
+ // `autoSync.{pull,push}IntervalSeconds` are the per-machine cadence for
+ // the scheduled cycles. Project-local for the same reason `mode` is: how
+ // hard THIS machine polls is a property of this machine's network and
+ // this person's tolerance for commit noise, not something to push at
+ // teammates through git.
+ //
+ // Absent means "use the shipped default" rather than carrying the number
+ // in every config, so the defaults stay changeable in one place.
+ //
+ // `.catch(undefined)` is load-bearing, not decoration. `readConfigSafely`
+ // degrades the ENTIRE layer to schema defaults on any parse failure, and
+ // `autoSync.mode` lives in this same layer — so a hand-edited
+ // `pullIntervalSeconds: 15` would drop the user's `mode: 'off'` and fall
+ // through to the committed `autoSync.default`. On a project whose
+ // maintainer committed `full`, that silently converts an explicit Manual
+ // choice into automated commits. It would also reject every later
+ // project-local Settings write, since the bad value stays in the merged
+ // doc. Per-leaf catch keeps the blast radius on the leaf, and
+ // `resolveAutoSyncIntervals` supplies the default.
+ //
+ // Pull and push are separate knobs because their costs differ in kind: a
+ // pull is a read (polling faster only buys freshness) while a push
+ // authors a commit in shared history (polling faster buys noise).
+ pullIntervalSeconds: z
+ .number()
+ .int()
+ .min(MIN_SYNC_INTERVAL_SECONDS)
+ .max(MAX_SYNC_INTERVAL_SECONDS)
+ .register(fieldRegistry, {
+ scope: 'project-local',
+ agentSettable: false,
+ reload: 'live',
+ defaultScope: 'project-local',
+ description:
+ 'Seconds between scheduled pulls while autoSync.mode is follow or full (default 30). An unauthenticated follower is additionally floored to the anonymous poll minimum, so a lower value there has no effect. Per-machine (project-local) — not shared.',
+ })
+ .optional()
+ .catch(undefined),
+ pushIntervalSeconds: z
+ .number()
+ .int()
+ .min(MIN_SYNC_INTERVAL_SECONDS)
+ .max(MAX_SYNC_INTERVAL_SECONDS)
+ .register(fieldRegistry, {
+ scope: 'project-local',
+ agentSettable: false,
+ reload: 'live',
+ defaultScope: 'project-local',
+ description:
+ "Seconds between scheduled pushes while autoSync.mode is full (default 60). Ignored in every other mode, which never pushes on a schedule. Each cycle with pending edits authors a commit, so a shorter interval means more, smaller commits in the repo's shared history. Per-machine (project-local) — not shared.",
+ })
+ .optional()
+ .catch(undefined),
// `autoSync.default` is the COMMITTED (project-scope) seed for a machine's
// sync mode on first open. It travels with the repo via git so a
// maintainer can pre-answer the prompt for everyone who clones the
diff --git a/packages/core/src/handoff/urn-ipc-registry.ts b/packages/core/src/handoff/urn-ipc-registry.ts
index be59a1c11..23a415ec4 100644
--- a/packages/core/src/handoff/urn-ipc-registry.ts
+++ b/packages/core/src/handoff/urn-ipc-registry.ts
@@ -244,6 +244,11 @@ export const URN_HTTP_ONLY: ReadonlySet<ProblemType> = new Set<ProblemType>([
// doesn't track the requested file. HTTP-only (same surface as the rest
// of /api/sync/*).
'urn:ok:error:no-conflict-tracked',
+ // 409 from handleSyncResolveBlocking when the engine is no longer paused on a
+ // pre-merge overlap — a stale panel, or a second click after the first
+ // cleared it. HTTP-only (same surface as the rest of /api/sync/*; there is no
+ // desktop IPC counterpart for resolve-blocking).
+ 'urn:ok:error:no-blocking-changes',
// Cluster B — pages CRUD (HTTP-only; desktop binds CRUD via Hocuspocus, not IPC)
'urn:ok:error:doc-not-found',
'urn:ok:error:doc-already-exists',
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 287e8faa1..41f333783 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -134,22 +134,24 @@ export {
} from './comments/passage-match.ts';
// Sync-mode vocabulary + resolution rules (off/follow/full). Browser+node compatible.
export {
- displayActiveMode,
- hasEverEnabledSync,
+ DEFAULT_PULL_INTERVAL_SECONDS,
+ DEFAULT_PUSH_INTERVAL_SECONDS,
isSyncActiveMode,
isSyncMode,
- isSyncPaused,
+ MAX_SYNC_INTERVAL_SECONDS,
+ MIN_SYNC_INTERVAL_SECONDS,
modeFromCommittedDefault,
modeFromLegacyEnabled,
normalizeStoredMode,
+ resolveAutoSyncIntervals,
resolveEffectiveAutoSyncMode,
resolveLocalAutoSyncMode,
- resumeModeOf,
STORED_SYNC_ACTIVE_MODES,
STORED_SYNC_MODES,
type StoredSyncActiveMode,
type StoredSyncMode,
SYNC_ACTIVE_MODES,
+ SYNC_INTERVAL_PRESET_SECONDS,
SYNC_MODE_CHANGE_SOURCES,
SYNC_MODES,
type SyncActiveMode,
@@ -1014,7 +1016,14 @@ export {
FrontmatterPatchRequestSchema,
type FrontmatterPatchSuccess,
FrontmatterPatchSuccessSchema,
+ GIT_STATUS_CODES,
type GitAuthFailureSubclass,
+ type GitStatusCode,
+ type GitWorktreeEntry,
+ GitWorktreeEntrySchema,
+ type GitWorktreeOpenTarget,
+ type GitWorktreeStatusSuccess,
+ GitWorktreeStatusSuccessSchema,
type HeadingEntry as PageHeadingEntry,
HeadingEntrySchema as PageHeadingEntrySchema,
type HistoryEntry,
@@ -1376,6 +1385,10 @@ export {
type SyncModeWire,
SyncRemoteSchema,
type SyncRemoteWire,
+ type SyncResolveBlockingRequest,
+ SyncResolveBlockingRequestSchema,
+ type SyncResolveBlockingSuccess,
+ SyncResolveBlockingSuccessSchema,
type SyncResolveConflictRequest,
SyncResolveConflictRequestSchema,
type SyncResolveConflictSuccess,
diff --git a/packages/core/src/schemas/api/_envelope.ts b/packages/core/src/schemas/api/_envelope.ts
index f534e1e27..7c796a093 100644
--- a/packages/core/src/schemas/api/_envelope.ts
+++ b/packages/core/src/schemas/api/_envelope.ts
@@ -316,6 +316,13 @@ export const ProblemTypeSchema = z.enum([
// both flag "I have no conflict record for this file" distinctly from
// generic 4xx so MCP clients can branch on the URN.
'urn:ok:error:no-conflict-tracked',
+ // `no-blocking-changes` is the 409 from handleSyncResolveBlocking when the
+ // commit action arrives against an engine that is no longer paused on
+ // a pre-merge overlap — a stale panel, or a second click after the first
+ // already cleared it. Distinct from a generic 409 so the UI can refresh its
+ // status and drop the panel rather than surfacing a failure the user caused
+ // by resolving the same thing twice.
+ 'urn:ok:error:no-blocking-changes',
// Cluster H: sync + seed handlers. `sync-not-active` flags the
// service-unavailable state when the sync engine isn't constructed yet
// (no remote, or sync subsystem disabled). `project-repo-not-configured`
diff --git a/packages/core/src/schemas/api/git-worktree-status.ts b/packages/core/src/schemas/api/git-worktree-status.ts
new file mode 100644
index 000000000..dc3b0d625
--- /dev/null
+++ b/packages/core/src/schemas/api/git-worktree-status.ts
@@ -0,0 +1,143 @@
+/**
+ * Wire contract for `GET /api/git/worktree-status` — the working-tree view the
+ * sync popover renders as a `git status` equivalent.
+ *
+ * Distinct from `SyncStatusSchema` (`sync-seed.ts`), which reports the *engine's*
+ * state machine. This reports the *repository's* state: which files are staged,
+ * modified, or untracked right now. The two are refreshed on different cadences
+ * (the engine pushes over CC1 `sync-status`; this is polled on popover open), so
+ * they stay separate payloads rather than one fat status object.
+ *
+ * `ahead`/`behind` deliberately do NOT appear here — the engine already owns
+ * them and streams them over CC1. Duplicating them would give the popover two
+ * sources for one number that could disagree mid-fetch.
+ */
+import type { StandardSchemaV1 } from '@standard-schema/spec';
+import { z } from 'zod';
+
+/**
+ * Porcelain status letters a single column can carry. Mirrors
+ * `git status --porcelain` v1: ` MADRCU?!`. Kept as a bounded enum rather than
+ * a free string so the UI's letter→label mapping is total and a future git
+ * version cannot smuggle an unrendered glyph into the popover.
+ */
+export const GIT_STATUS_CODES = ['M', 'A', 'D', 'R', 'C', 'U', 'T', '?', '!', ' '] as const;
+export type GitStatusCode = (typeof GIT_STATUS_CODES)[number];
+
+/**
+ * One changed path in the working tree.
+ *
+ * `code` is the single porcelain letter for the column this entry was filed
+ * under — the index letter (X) for a staged entry, the worktree letter (Y) for
+ * an unstaged one, `'?'` for untracked. A path modified both in the index and
+ * in the worktree appears in BOTH lists with its respective letter, which is
+ * exactly what `git status` shows.
+ *
+ * `syncScoped` is the load-bearing field: false means Open Knowledge will never
+ * commit this path, no matter how many times the user presses Push. The listing
+ * shows out-of-scope paths (they are the usual cause of a blocked merge) but
+ * must mark them, or Push silently ignoring a visible file reads as a bug.
+ *
+ * `open` is orthogonal to `syncScoped`: a gitignored note is openable but never
+ * pushed, and `opencode.json` is pushed and opens as an asset, not a doc.
+ */
+export const GitWorktreeEntrySchema = z
+ .object({
+ /**
+ * Project-relative POSIX path, reported faithfully — including names the
+ * document and search surfaces suppress as secret-bearing (`.env`,
+ * `id_ed25519`, `*.pem`).
+ *
+ * Deliberate, and the asymmetry with `open` below is deliberate too: this
+ * is a `git status` view, and an untracked secret file is a real merge
+ * blocker (git refuses a merge that would overwrite it), so suppressing the
+ * row produces a paused sync with no visible cause — the failure this
+ * listing exists to prevent. The row is still marked out-of-scope and stays
+ * unclickable; only the name ships.
+ *
+ * The exposure is narrower than it looks: the caller never passes
+ * `--ignored`, so a gitignored secret never reaches this surface at all.
+ * The only window is a secret file created but not yet added to
+ * `.gitignore` — which is exactly the case that can block a merge.
+ */
+ path: z.string().min(1),
+ code: z.enum(GIT_STATUS_CODES),
+ /** Rename/copy origin path; present only when `code` is `R` or `C`. */
+ origPath: z.string().min(1).optional(),
+ /** True when this path is inside Open Knowledge's commit scope. */
+ syncScoped: z.boolean(),
+ /**
+ * Where clicking this row lands, or absent when it lands nowhere.
+ *
+ * The two arms are the two routes the Files sidebar itself uses, so a row
+ * opens exactly what double-clicking the same file in the tree opens:
+ * `doc` for a document the editor owns, `asset` for everything else — the
+ * read-only viewer, which falls back to a "view as text / open file" pane
+ * for extensions it has no renderer for. Absent for a path outside the
+ * content dir, a file that no longer exists (a deletion, or an incoming
+ * file that has not landed yet), and for the floors the sidebar itself
+ * never shows: secret-bearing files, `.git`, `node_modules`, `.ok/local`.
+ *
+ * Note the deliberate split with `path` above: the floors gate what a row
+ * LINKS to, not whether the row is listed. See `path` for why.
+ */
+ open: z
+ .discriminatedUnion('kind', [
+ z.object({ kind: z.literal('doc'), docName: z.string().min(1) }),
+ z.object({ kind: z.literal('asset'), path: z.string().min(1) }),
+ ])
+ .optional(),
+ })
+ .loose() satisfies StandardSchemaV1;
+export type GitWorktreeEntry = z.infer<typeof GitWorktreeEntrySchema>;
+/** Where a working-tree row navigates when clicked. */
+export type GitWorktreeOpenTarget = NonNullable<GitWorktreeEntry['open']>;
+
+/**
+ * Success body for `GET /api/git/worktree-status`.
+ *
+ * `truncated` is set when the working tree carried more changed paths than the
+ * response cap. A repository mid-rebase or with a stale build directory can
+ * produce tens of thousands of porcelain records; the popover renders a bounded
+ * list and says so rather than shipping an unbounded payload to the renderer.
+ */
+export const GitWorktreeStatusSuccessSchema = z
+ .object({
+ /** Current branch, or null when HEAD is detached or unborn. */
+ branch: z.string().nullable(),
+ detached: z.boolean(),
+ /** Upstream tracking ref (e.g. `origin/main`), or null when unset. */
+ upstream: z.string().nullable(),
+ staged: z.array(GitWorktreeEntrySchema),
+ notStaged: z.array(GitWorktreeEntrySchema),
+ untracked: z.array(GitWorktreeEntrySchema),
+ /**
+ * Files a pull would bring in: the diff from HEAD to the tracking ref.
+ *
+ * Only as fresh as the last fetch — this is a local ref-to-ref diff, never
+ * a network call. Empty when the branch has no upstream, when HEAD is
+ * unborn, or when nothing is incoming.
+ *
+ * `syncScoped` is meaningless here and is always true: it answers "would
+ * Push send this", and a pull is unscoped — git merges whatever the remote
+ * carries, including paths Open Knowledge would never have pushed.
+ */
+ incoming: z.array(GitWorktreeEntrySchema),
+ truncated: z.boolean(),
+ /**
+ * Whether the working-tree read actually succeeded.
+ *
+ * Without this a failed `git status` was indistinguishable on the wire from
+ * a genuinely clean tree — all lists empty — and the UI stated "Nothing to
+ * commit, working tree clean", which is a false claim about the user's data
+ * at the moment they are deciding whether to reset or switch machines. The
+ * reachable causes are exactly the ones worth surfacing: a corrupt index, an
+ * interrupted rebase, EACCES, a lock held by another process.
+ *
+ * Defaults to `true` so a server that predates the field does not read as
+ * permanently unreadable to a newer client.
+ */
+ readable: z.boolean().default(true),
+ })
+ .loose() satisfies StandardSchemaV1;
+export type GitWorktreeStatusSuccess = z.infer<typeof GitWorktreeStatusSuccessSchema>;
diff --git a/packages/core/src/schemas/api/index.ts b/packages/core/src/schemas/api/index.ts
index 241c66b47..0fe58736a 100644
--- a/packages/core/src/schemas/api/index.ts
+++ b/packages/core/src/schemas/api/index.ts
@@ -25,6 +25,7 @@ export * from './client-logs.ts';
export * from './comments.ts';
export * from './document-read.ts';
export * from './embed-detect.ts';
+export * from './git-worktree-status.ts';
export * from './history.ts';
export * from './link-preview.ts';
export * from './links-orphans.ts';
diff --git a/packages/core/src/schemas/api/sync-seed.ts b/packages/core/src/schemas/api/sync-seed.ts
index 32f21b52f..d717a41e7 100644
--- a/packages/core/src/schemas/api/sync-seed.ts
+++ b/packages/core/src/schemas/api/sync-seed.ts
@@ -177,6 +177,29 @@ export const SyncStatusSchema = z
.object({
state: SyncStateSchema,
lastSyncUtc: z.string().nullable(),
+ /**
+ * When a sync operation last completed successfully — a push or a pull that
+ * REACHED THE REMOTE, scheduled or user-pressed, whether or not content
+ * moved. Explicitly NOT the panel-open fetch: that fires whenever the user
+ * looks, so counting it would pin this to "just now" permanently.
+ * `lastSyncUtc` by contrast only advances when content actually changed,
+ * which reads as a dead button after a no-op pull.
+ * Optional for version-skew safety.
+ */
+ lastRunUtc: z.string().nullable().optional(),
+ /**
+ * The same successful-run signal split by direction, so a consumer can say
+ * WHICH leg ran rather than collapsing both into one stamp. These are the
+ * primary source for the popover's freshness line; `lastRunUtc` is the
+ * single-value fallback for a server that predates them.
+ *
+ * Declared rather than left to `.loose()`: the success envelope serializes
+ * the VALIDATED object, so an undeclared field only reaches the client by
+ * the object being loose. Tightening this schema would silently blank the
+ * freshness line with no compile error.
+ */
+ lastPullOkUtc: z.string().nullable().optional(),
+ lastPushOkUtc: z.string().nullable().optional(),
lastFetchUtc: z.string().nullable(),
lastPushedSha: z.string().nullable(),
ahead: z.number().int().min(0),
@@ -201,6 +224,15 @@ export const SyncStatusSchema = z
pullError: z.string().optional(),
pullErrorCode: SyncErrorCodeSchema.optional(),
pausedReason: z.string().optional(),
+ /**
+ * The tracked paths whose local edits overlap the incoming merge, when
+ * `pausedReason` is `external-changes-pending`. These are what the user has
+ * to commit (or resolve in a terminal) before sync can continue, so the UI lists them and
+ * offers the actions rather than naming three of them in a sentence and
+ * leaving the user to find the rest. Capped server-side; absent (not empty)
+ * whenever nothing is blocking, so a consumer branches on presence.
+ */
+ blockingPaths: z.array(z.string().min(1)).optional(),
/** Push-permission probe outcome. Absent when no probe has resolved yet. */
pushPermission: PushPermissionSchema.optional(),
/**
@@ -224,15 +256,50 @@ export const SyncStatusSchema = z
.loose() satisfies StandardSchemaV1;
export type SyncStatusWire = z.infer<typeof SyncStatusSchema>;
+/**
+ * Success body for `POST /api/sync/resolve-blocking` — the action that
+ * clear a pre-merge overlap pause.
+ *
+ * `paths` is what the server actually acted on, read from the engine's own
+ * blocking set rather than the request: the client names the ACTION, never the
+ * files. `commitSha` is present only for `commit` and only when the commit
+ * produced one (an overlap already staged and committed by another surface
+ * leaves nothing to do, which is a success with no SHA).
+ */
+export const SyncResolveBlockingSuccessSchema = z
+ .object({
+ action: z.enum(['commit']),
+ paths: z.array(z.string().min(1)),
+ commitSha: z.string().optional(),
+ })
+ .loose() satisfies StandardSchemaV1;
+export type SyncResolveBlockingSuccess = z.infer<typeof SyncResolveBlockingSuccessSchema>;
+
+/**
+ * Request body for `POST /api/sync/resolve-blocking`. Deliberately carries no
+ * path list — see the success schema.
+ */
+export const SyncResolveBlockingRequestSchema = z
+ .object({
+ action: z.enum(['commit']),
+ })
+ .loose() satisfies StandardSchemaV1;
+export type SyncResolveBlockingRequest = z.infer<typeof SyncResolveBlockingRequestSchema>;
+
/**
* Request body for `POST /api/sync/trigger`. `op` is optional — server defaults
- * to `'sync'` when omitted. Pre-validation, the legacy handler accepted any
+ * to `'sync'` when omitted.
+ *
+ * `'fetch'` is the read-only member of the set: it refreshes remote-tracking
+ * refs and the ahead/behind counts and never merges, commits, or touches the
+ * working tree. It is what a passive surface (opening the sync panel) may call;
+ * everything else moves files and belongs behind an explicit user action. Pre-validation, the legacy handler accepted any
* unknown shape and silently fell through to `'sync'`; the schema-validated
* form rejects unknown `op` values explicitly with `urn:ok:error:invalid-request`.
*/
export const SyncTriggerRequestSchema = z
.object({
- op: z.enum(['sync', 'push', 'pull']).optional(),
+ op: z.enum(['sync', 'push', 'pull', 'fetch']).optional(),
})
.loose() satisfies StandardSchemaV1;
export type SyncTriggerRequest = z.infer<typeof SyncTriggerRequestSchema>;
@@ -243,7 +310,7 @@ export type SyncTriggerRequest = z.infer<typeof SyncTriggerRequestSchema>;
*/
export const SyncTriggerSuccessSchema = z
.object({
- op: z.enum(['sync', 'push', 'pull']),
+ op: z.enum(['sync', 'push', 'pull', 'fetch']),
})
.loose() satisfies StandardSchemaV1;
export type SyncTriggerSuccess = z.infer<typeof SyncTriggerSuccessSchema>;
diff --git a/packages/server/src/api-extension.ts b/packages/server/src/api-extension.ts
index 4936ff171..023c3495f 100644
--- a/packages/server/src/api-extension.ts
+++ b/packages/server/src/api-extension.ts
@@ -92,6 +92,8 @@ import {
FrontmatterPatchSuccessSchema,
FrontmatterSchemasListSuccessSchema,
FrontmatterSchemaWriteRequestSchema,
+ type GitWorktreeOpenTarget,
+ GitWorktreeStatusSuccessSchema,
type HeadingEntry,
HistorySuccessSchema,
HistoryVersionSuccessSchema,
@@ -237,6 +239,8 @@ import {
SYSTEM_DOC_NAME,
SyncConflictContentSuccessSchema,
SyncConflictsSuccessSchema,
+ SyncResolveBlockingRequestSchema,
+ SyncResolveBlockingSuccessSchema,
SyncResolveConflictRequestSchema,
SyncResolveConflictSuccessSchema,
SyncStatusSchema,
@@ -558,6 +562,7 @@ import {
listManagedDocNamesUnderFolder,
} from './content/managed-doc-enum.ts';
import type { ContentFilter } from './content-filter.ts';
+import { isShareableOkArtifact } from './content-filter.ts';
import { safeContentPath } from './content-path.ts';
import {
type DerivedDocumentIndexApiPort,
@@ -613,6 +618,7 @@ import {
import { CHECKOUT_HANDLER_TAG, runCheckoutFlow } from './git-checkout.ts';
import { buildSyncCredentialConfig, withParentLock } from './git-handle.ts';
import { writeGitIdentity } from './git-identity.ts';
+import { readWorktreeStatus } from './git-worktree-status.ts';
import { type ApiRouteTable, createApiRequestPipeline } from './http/api-pipeline.ts';
import { catchErrors } from './http/catch-errors.ts';
import { createDocumentRoutes } from './http/document-routes.ts';
@@ -11796,6 +11802,76 @@ export function createApiExtension(
}
}
+ /**
+ * Where a project-relative working-tree path opens, or undefined when it
+ * opens nowhere. Resolves to the same two routes the Files sidebar uses, so
+ * a row in the sync popover behaves like the same file in the tree.
+ *
+ * Order is the whole design. File-index membership decides `doc` — the index
+ * holds exactly what the editor owns, so a gitignored `.md` falls through to
+ * the asset viewer rather than opening an editable surface it is not indexed
+ * for. Everything else that survives the filter's FLOORS is an `asset`: the
+ * text-view endpoint has no extension gate, so `.gitignore`, `opencode.json`
+ * and `.ok/config.yml` all render, and the viewer's own fallback pane covers
+ * whatever it cannot draw. `bypassFilters` + `showOk` reduce the filter to
+ * exactly those floors — secret-bearing files, `.git`, `node_modules`,
+ * `.ok/local`, reserved synthetic names — which is the same set the sidebar
+ * refuses to show under Show All Files. Without a content filter there is no
+ * floor to enforce, so nothing is offered.
+ */
+ function toOpenTarget(projectRelPath: string): GitWorktreeOpenTarget | undefined {
+ const absPath = join(projectDir ?? contentDir, projectRelPath);
+ const contentRelPath = toPosix(relative(contentDir, absPath));
+ if (!contentRelPath || contentRelPath.startsWith('..')) return undefined;
+ const docName = stripDocExtension(contentRelPath);
+ if (getFileIndex().has(docName)) return { kind: 'doc', docName };
+ if (!contentFilter) return undefined;
+ if (contentFilter.isExcluded(contentRelPath, { bypassFilters: true, showOk: true })) {
+ return undefined;
+ }
+ // A deletion, or an incoming file that has not landed yet: the viewer would
+ // open on nothing. Docs skip this check — index membership implies the file.
+ if (!existsSync(absPath)) return undefined;
+ return { kind: 'asset', path: contentRelPath };
+ }
+
+ /**
+ * `GET /api/git/worktree-status` — the `git status` view the sync popover
+ * renders under its action buttons.
+ *
+ * Kept off the `sync-status` payload deliberately: that one is pushed over
+ * CC1 on every engine transition, and a working-tree listing does not belong
+ * on a hot broadcast channel. This is polled by the popover while it is open.
+ */
+ async function handleGitWorktreeStatus(req: IncomingMessage, res: ServerResponse): Promise<void> {
+ if (!checkLocalOpSecurity(req, res, { handler: 'git-worktree-status' })) return;
+ if (req.method !== 'GET') {
+ errorResponse(res, 405, 'urn:ok:error:method-not-allowed', 'Method not allowed.', {
+ handler: 'git-worktree-status',
+ extraHeaders: { Allow: 'GET' },
+ });
+ return;
+ }
+ try {
+ const engine = getSyncEngine?.();
+ // Without an engine there is no admission predicate to mark scope with.
+ // Report every path as out-of-scope rather than guessing in-scope: an
+ // unmarked path the user then watches Push ignore is the worse failure.
+ const isSyncScoped = engine
+ ? (relPath: string) => engine.isSyncScopedPath(relPath)
+ : () => false;
+ const status = await readWorktreeStatus(projectDir ?? contentDir, isSyncScoped, toOpenTarget);
+ successResponse(res, 200, GitWorktreeStatusSuccessSchema, status, {
+ handler: 'git-worktree-status',
+ });
+ } catch (e) {
+ errorResponse(res, 500, 'urn:ok:error:internal-server-error', 'Internal server error.', {
+ handler: 'git-worktree-status',
+ cause: e,
+ });
+ }
+ }
+
const handleSyncTrigger = withValidation(
SyncTriggerRequestSchema,
async (_req, res, body) => {
@@ -11812,7 +11888,11 @@ export function createApiExtension(
const op = body.op ?? 'sync';
// Fire-and-return: 202 Accepted immediately, trigger runs in background.
successResponse(res, 202, SyncTriggerSuccessSchema, { op }, { handler: 'sync-trigger' });
- void engine.trigger(op);
+ // `.catch` is mandatory on every fire-and-forget trigger: the response has
+ // already been sent, so a rejection has nowhere to go but the process.
+ void engine.trigger(op).catch((err) => {
+ log.error({ err, op }, '[sync] fire-and-forget trigger failed');
+ });
},
{
handler: 'sync-trigger',
@@ -11831,6 +11911,81 @@ export function createApiExtension(
},
);
+ /**
+ * `POST /api/sync/resolve-blocking` — clear a pre-merge overlap pause by
+ * committing the local edits that caused it, then resume.
+ *
+ * The body names an ACTION and nothing else. The paths come from the
+ * engine's blocking set, so this cannot be aimed: a body-supplied path list
+ * would make `discard` a general-purpose "throw away this file's edits"
+ * endpoint reachable from any page the user's browser has open. Empty set →
+ * 409 rather than a silent success, because a UI offering these buttons
+ * against a pause that already cleared is showing the user stale state.
+ *
+ * The follow-up trigger is the point of the button: `commit` runs a full
+ * sync, because the commit it just authored is now outgoing work.
+ *
+ * `commit` is the only action the schema admits. A `discard` verb is
+ * deliberately withheld until a recoverable snapshot exists behind it —
+ * restoring the blocking paths leaves no reflog entry to recover from.
+ */
+ const handleSyncResolveBlocking = withValidation(
+ SyncResolveBlockingRequestSchema,
+ // `body` is unread: the schema admits exactly one action, and the paths come
+ // from engine state rather than the request (see the docblock above).
+ async (_req, res, _body) => {
+ const engine = getSyncEngine?.();
+ if (!engine) {
+ errorResponse(res, 503, 'urn:ok:error:sync-not-active', 'Sync engine not active.', {
+ handler: 'sync-resolve-blocking',
+ });
+ return;
+ }
+ if (engine.getBlockingPaths().length === 0) {
+ errorResponse(
+ res,
+ 409,
+ 'urn:ok:error:no-blocking-changes',
+ 'No local changes are blocking a merge.',
+ {
+ handler: 'sync-resolve-blocking',
+ },
+ );
+ return;
+ }
+ try {
+ // `commit` is the only action. A `discard` verb was deliberately not
+ // shipped: reverting uncommitted work is unrecoverable (git keeps no
+ // reflog for it), and the destructive verb waits on a recoverable
+ // snapshot landing first. The schema rejects anything else before this
+ // point, so there is no second branch to fall through to.
+ const paths = engine.getBlockingPaths();
+ const commitSha = await engine.commitBlockingPaths();
+ successResponse(
+ res,
+ 200,
+ SyncResolveBlockingSuccessSchema,
+ { action: 'commit', paths, ...(commitSha !== null ? { commitSha } : {}) },
+ { handler: 'sync-resolve-blocking' },
+ );
+ void engine.trigger('sync').catch((err) => {
+ log.error({ err }, '[sync] resolve-blocking follow-up sync failed');
+ });
+ } catch (e) {
+ errorResponse(res, 500, 'urn:ok:error:internal-server-error', 'Internal server error.', {
+ handler: 'sync-resolve-blocking',
+ cause: e,
+ });
+ }
+ },
+ {
+ handler: 'sync-resolve-blocking',
+ method: 'POST',
+ preBodyGate: (req, res) =>
+ checkLocalOpSecurity(req, res, { handler: 'sync-resolve-blocking' }),
+ },
+ );
+
async function handleSyncConflicts(req: IncomingMessage, res: ServerResponse): Promise<void> {
if (!checkLocalOpSecurity(req, res, { handler: 'sync-conflicts' })) return;
if (req.method !== 'GET') {
@@ -12062,7 +12217,15 @@ export function createApiExtension(
// disclosing a foreign file. A SymlinkEscapeError propagates to the
// outer catch → 500; the inner catch still handles the benign ENOENT
// of a genuine delete overlay.
- assertRealpathWithinDir(join(projectDir, file), projectDir);
+ // `allowShareableOkArtifact` matches the write sites in conflict-storage.
+ // Without it a root-`.ok` conflict (now pinnable — `.ok/templates/*` is a
+ // shareable artifact) throws SymlinkEscapeError here and surfaces as a
+ // 500, wedging the project: the push gate holds while conflicts exist and
+ // the conflict cannot be inspected to resolve it. `docs/.ok/...` was
+ // unaffected, so a nested fixture would not have caught it.
+ assertRealpathWithinDir(join(projectDir, file), projectDir, {
+ allowShareableOkArtifact: isShareableOkArtifact,
+ });
try {
ours = readFileSync(join(projectDir, file), 'utf-8');
oursPresent = true;
@@ -23002,6 +23165,7 @@ export function createApiExtension(
'/api/share/construct-url': handleShareConstructUrl,
'/api/share/target-status': handleShareTargetStatus,
'/api/git/branch-info': handleBranchInfo,
+ '/api/git/worktree-status': handleGitWorktreeStatus,
'/api/git/checkout': handleCheckout,
'/api/share/publish/owners': handleSharePublishOwners,
'/api/share/publish/name-check': handleSharePublishNameCheck,
@@ -23014,6 +23178,7 @@ export function createApiExtension(
'/api/sync/conflicts': handleSyncConflicts,
'/api/sync/conflict-content': handleSyncConflictContent,
'/api/sync/resolve-conflict': handleSyncResolveConflict,
+ '/api/sync/resolve-blocking': handleSyncResolveBlocking,
'/api/local-op/clone': handleLocalOpClone,
'/api/local-op/ok-init': handleLocalOpOkInit,
'/api/local-op/auth/login': handleLocalOpAuthLogin,
@@ -23076,6 +23241,7 @@ export function createApiExtension(
'/api/rollback',
'/api/sync/trigger',
'/api/sync/resolve-conflict',
+ '/api/sync/resolve-blocking',
'/api/git/checkout',
'/api/test-reset',
'/api/test-flush-git',
diff --git a/packages/server/src/conflict-storage.ts b/packages/server/src/conflict-storage.ts
index e11e76a72..e9e736aec 100644
--- a/packages/server/src/conflict-storage.ts
+++ b/packages/server/src/conflict-storage.ts
@@ -13,6 +13,7 @@
import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
import { dirname, join, resolve } from 'node:path';
import { getLocalDir } from './config/paths.ts';
+import { isShareableOkArtifact } from './content-filter.ts';
import { tracedUnlinkSync, tracedWriteFileSync } from './fs-traced.ts';
import { listNames } from './git-paths.ts';
import { getLogger } from './logger.ts';
@@ -247,7 +248,9 @@ export class ConflictStore {
// the conflicted path escape the tree on write; the working-tree path
// already realpath-guards, so mirror it here and route through the
// traced fs wrapper like every other server-side disk write.
- assertRealpathWithinDir(absPath, projectRoot);
+ assertRealpathWithinDir(absPath, projectRoot, {
+ allowShareableOkArtifact: isShareableOkArtifact,
+ });
tracedWriteFileSync(absPath, content, 'utf-8');
await handle.git.raw(['add', '--', file]);
break;
@@ -362,7 +365,9 @@ export class ConflictStore {
// Lexical containment is not enough: an untrusted origin can ship a symlink
// at a tracked content path, and `writeFileSync`/`unlinkSync` would follow
// it out of the working tree. Refuse when the realpath escapes.
- assertRealpathWithinDir(absPath, projectRoot);
+ assertRealpathWithinDir(absPath, projectRoot, {
+ allowShareableOkArtifact: isShareableOkArtifact,
+ });
switch (strategy) {
case 'mine':
@@ -383,7 +388,9 @@ export class ConflictStore {
// event loop; a concurrent pull cycle could have materialized a symlink
// at absPath in that gap. Re-check immediately before the write, matching
// applyOverlayPlan's per-write containment.
- assertRealpathWithinDir(absPath, projectRoot);
+ assertRealpathWithinDir(absPath, projectRoot, {
+ allowShareableOkArtifact: isShareableOkArtifact,
+ });
tracedWriteFileSync(absPath, theirsBytes, 'utf-8');
break;
}
diff --git a/packages/server/src/content-filter.test.ts b/packages/server/src/content-filter.test.ts
index d5432817c..82886ba82 100644
--- a/packages/server/src/content-filter.test.ts
+++ b/packages/server/src/content-filter.test.ts
@@ -56,6 +56,48 @@ describe('ContentFilter', () => {
await rm(xdgDir, { recursive: true, force: true });
});
+ describe('sync-popover open-target admission', () => {
+ // The sync popover offers a row to the asset viewer when the filter admits
+ // it under `bypassFilters` + `showOk` — the reduction to FLOORS ONLY. The
+ // text-view endpoint has no extension or ignore gate of its own, so this
+ // predicate is the whole guard on what one click can read.
+ const openable = (filter: ContentFilter, relPath: string): boolean =>
+ !filter.isExcluded(relPath, { bypassFilters: true, showOk: true });
+
+ test('admits the config and dotfiles the sidebar shows', () => {
+ writeFileSync(join(projectDir, '.gitignore'), 'ignored-note.md\n');
+ const filter = createContentFilter({ projectDir, contentDir: projectDir });
+
+ expect(openable(filter, 'opencode.json')).toBe(true);
+ expect(openable(filter, '.gitignore')).toBe(true);
+ expect(openable(filter, '.ok/config.yml')).toBe(true);
+ // Skill docs are the exception: the reserved-doc gate holds them out of
+ // the user tree under every bypass, because their surface is the Skills
+ // section, not the asset viewer. A projected SKILL.md row therefore stays
+ // plain text in the popover.
+ expect(openable(filter, '.claude/skills/reviewer/SKILL.md')).toBe(false);
+ // Gitignored is not hidden here: the user can already see it under Show
+ // All Files, and it is their own note.
+ expect(openable(filter, 'ignored-note.md')).toBe(true);
+ });
+
+ test('refuses the floors — secrets first', () => {
+ const filter = createContentFilter({ projectDir, contentDir: projectDir });
+
+ // A dirty `.env` shows up in a git listing by name; one click must not
+ // turn that listing into a reader for its contents.
+ expect(openable(filter, '.env')).toBe(false);
+ expect(openable(filter, '.env.local')).toBe(false);
+ expect(openable(filter, 'deploy/prod.pem')).toBe(false);
+ expect(openable(filter, '.ssh/id_rsa')).toBe(false);
+ expect(openable(filter, '.aws/credentials')).toBe(false);
+ // Machine-local OK state and VCS/dependency internals stay closed too.
+ expect(openable(filter, '.ok/local/server.lock')).toBe(false);
+ expect(openable(filter, '.git/config')).toBe(false);
+ expect(openable(filter, 'node_modules/pkg/index.js')).toBe(false);
+ });
+ });
+
describe('gitignore filtering', () => {
test('excludes files matching .gitignore patterns', () => {
writeFileSync(join(projectDir, '.gitignore'), 'dist/\ntmp/\n');
diff --git a/packages/server/src/content-filter.ts b/packages/server/src/content-filter.ts
index 201414c4a..fc5462b20 100644
--- a/packages/server/src/content-filter.ts
+++ b/packages/server/src/content-filter.ts
@@ -508,6 +508,10 @@ function isTemplateContentAncestorDir(relativePath: string): boolean {
* - `<folder>/.ok/frontmatter.yml` at any depth — root included, because
* the project root's own folder metadata lives at `.ok/frontmatter.yml`
*
+ * Exported because the symlink guard's `.ok` write exemption must consult
+ * THIS predicate on the resolved path (precedent #55: one predicate for
+ * "is this in sync scope", never a parallel copy that can drift).
+ *
* The folder-scoped shapes inherit the templates family's skip-dir bound:
* these predicates are consulted on flat full paths (head listings, raw
* watcher events), not only via the top-down walk that prunes skip-dir roots
@@ -515,7 +519,7 @@ function isTemplateContentAncestorDir(relativePath: string): boolean {
* `.ok/worktrees/<wt>/…`, whose prefix contains the skip-dir `.ok` — must
* not leak in.
*/
-function isShareableOkArtifact(relativePath: string): boolean {
+export function isShareableOkArtifact(relativePath: string): boolean {
const segments = relativePath.split('/');
const n = segments.length;
if (segments[0] === OK_DIR) {
diff --git a/packages/server/src/git-paths.test.ts b/packages/server/src/git-paths.test.ts
index 96d61e332..063b51961 100644
--- a/packages/server/src/git-paths.test.ts
+++ b/packages/server/src/git-paths.test.ts
@@ -10,6 +10,7 @@ import {
listPorcelainPaths,
listTreeLongEntries,
parseNameStatusZ,
+ parsePorcelainEntries,
parsePorcelainPaths,
parseTreeLongEntriesZ,
splitNulSeparatedPaths,
@@ -60,6 +61,28 @@ describe('parsePorcelainPaths', () => {
});
});
+describe('parsePorcelainEntries — rename origin in either column', () => {
+ // `diff.renames` defaults to true, so git reports a WORKTREE rename in the Y
+ // column (` R`). Consuming the origin record only on the X column left it to
+ // be re-parsed as a status record, inventing a file that does not exist.
+ test('a worktree rename yields one entry carrying its origin, and no phantom', () => {
+ const entries = parsePorcelainEntries(' R bravo.md\0alpha.md\0');
+
+ expect(entries).toEqual([{ x: ' ', y: 'R', path: 'bravo.md', origPath: 'alpha.md' }]);
+ });
+
+ test('a staged-then-worktree rename consumes both origins', () => {
+ // Two entries, each with its own origin record. Mis-parsing the second
+ // origin produced a second phantom (`vo.md`) on top of the first.
+ const entries = parsePorcelainEntries('R bravo.md\0alpha.md\0 R charlie.md\0bravo.md\0');
+
+ expect(entries).toEqual([
+ { x: 'R', y: ' ', path: 'bravo.md', origPath: 'alpha.md' },
+ { x: ' ', y: 'R', path: 'charlie.md', origPath: 'bravo.md' },
+ ]);
+ });
+});
+
describe('parseNameStatusZ', () => {
test('non-rename row: from and to are the single path', () => {
expect(parseNameStatusZ('D\0a.md\0')).toEqual([{ status: 'D', from: 'a.md', to: 'a.md' }]);
@@ -123,6 +146,24 @@ describe('path-listing wrappers (real git)', () => {
return execSync(cmd, { cwd: projectDir, encoding: 'utf8' });
}
+ test('a real worktree rename parses without inventing a file', () => {
+ // Pins the PREMISE, not just the parser: git reports worktree renames by
+ // default (`status.renames` inherits `diff.renames`), which is what the
+ // index-column-only skip got wrong. If that default ever changed, this is
+ // the test that says so.
+ writeFileSync(join(projectDir, 'alpha.md'), 'x\n');
+ run('git add -A');
+ run('git commit -q -m seed');
+ run('git mv alpha.md bravo.md');
+ run('git reset -q');
+ run('git add -N bravo.md');
+
+ const entries = parsePorcelainEntries(run('git status --porcelain -z'));
+
+ expect(entries.map((e) => e.path)).toContain('bravo.md');
+ expect(entries.map((e) => e.path)).not.toContain('ha.md');
+ });
+
beforeEach(() => {
projectDir = mkdtempSync(join(tmpdir(), 'ok-git-paths-test-'));
run('git init -q -b main');
diff --git a/packages/server/src/git-paths.ts b/packages/server/src/git-paths.ts
index 3a227ef13..ececfa5a8 100644
--- a/packages/server/src/git-paths.ts
+++ b/packages/server/src/git-paths.ts
@@ -15,6 +15,7 @@
* a single "split on NUL" helper is not enough:
* - `--name-only -z` flat `path\0path\0…` -> splitNulSeparatedPaths
* - `status --porcelain -z` `XY path\0`, R/C add an origin record -> parsePorcelainPaths
+ * (XY-preserving variant) -> parsePorcelainEntries
* - `--name-status -z` `status\0path\0` or R/C `status\0from\0to\0` -> parseNameStatusZ
* - `ls-tree --long -z` `mode type object size\tpath\0` -> parseTreeLongEntriesZ
*
@@ -37,10 +38,11 @@ export function splitNulSeparatedPaths(out: string): string[] {
* `git status --porcelain -z`: NUL-separated `XY<space>PATH` records. A
* rename/copy emits the ORIGIN path as a separate following record with no
* status prefix, so skip that record — otherwise the old name reads as a
- * distinct entry. Git detects renames only in the index (X) column under its
- * defaults (worktree renames surface as delete+add), so the skip keys off
- * `record[0]`; broaden to `record[1]` if a caller ever enables worktree-rename
- * detection.
+ * distinct entry. Rename detection is on by default (`status.renames` inherits
+ * `diff.renames`, which defaults to true) and reports in EITHER column: a staged
+ * rename as `R `, a worktree rename as ` R`. Both are skipped — keying off the
+ * index column alone re-parses the origin record as a status record and invents
+ * a file that does not exist.
*/
export function parsePorcelainPaths(porcelain: string): string[] {
const paths: string[] = [];
@@ -49,11 +51,65 @@ export function parsePorcelainPaths(porcelain: string): string[] {
const record = records[i] ?? '';
if (record.length < 4) continue;
paths.push(record.slice(3));
- if (record[0] === 'R' || record[0] === 'C') i++;
+ if (record[0] === 'R' || record[0] === 'C' || record[1] === 'R' || record[1] === 'C') i++;
}
return paths;
}
+/**
+ * One `git status --porcelain -z` record with both status columns preserved.
+ * `x` is the index (staged) column, `y` the worktree (unstaged) column; either
+ * may be a space meaning "unchanged in that column". `origPath` carries the
+ * rename/copy source when `x` is `R` or `C`.
+ */
+export interface PorcelainEntry {
+ x: string;
+ y: string;
+ path: string;
+ origPath?: string;
+}
+
+/**
+ * `git status --porcelain -z`, keeping the XY columns that
+ * {@link parsePorcelainPaths} discards.
+ *
+ * Same record grammar, so the two share the rename-origin skip: git emits the
+ * ORIGIN path as a bare following record with no status prefix, which must be
+ * consumed as this entry's `origPath` rather than read as a distinct path.
+ * Callers that only need the path set should keep using `parsePorcelainPaths` —
+ * this exists for the working-tree status surface, which has to tell a staged
+ * modification from an unstaged one.
+ */
+export function parsePorcelainEntries(porcelain: string): PorcelainEntry[] {
+ const entries: PorcelainEntry[] = [];
+ const records = porcelain.split('\0');
+ for (let i = 0; i < records.length; i++) {
+ const record = records[i] ?? '';
+ // `XY<space>PATH` — a shorter record cannot carry a path, and the trailing
+ // empty field after the final NUL lands here too.
+ if (record.length < 4) continue;
+ const x = record[0] ?? ' ';
+ const y = record[1] ?? ' ';
+ const entry: PorcelainEntry = { x, y, path: record.slice(3) };
+ if (x === 'R' || x === 'C' || y === 'R' || y === 'C') {
+ // Git emits `XY<space>NEW\0OLD\0` for a rename: the record above holds the
+ // destination, the next bare record the source.
+ //
+ // BOTH columns, not just the index one: `diff.renames` defaults to true,
+ // so a worktree rename (`git add -N` on the destination, `git add -p` on a
+ // new file) reports as ` R` — origin in the Y column. Consuming only on X
+ // left the origin record to be re-parsed as a status record on the next
+ // iteration, inventing a file that does not exist (` R bravo.md\0alpha.md`
+ // yielded a phantom `ha.md` in both staged and notStaged).
+ const origin = records[i + 1];
+ if (origin !== undefined && origin.length > 0) entry.origPath = origin;
+ i++;
+ }
+ entries.push(entry);
+ }
+ return entries;
+}
+
/** One `--name-status` change. `from`/`to` are equal for non-rename statuses. */
export interface NameStatusRow {
status: string;
@@ -153,6 +209,17 @@ export async function listPorcelainPaths(
return parsePorcelainPaths(await rawZ(git, args));
}
+/**
+ * Run `git status --porcelain` with `-z` and return entries with both status
+ * columns intact. The XY-preserving counterpart to {@link listPorcelainPaths}.
+ */
+export async function listPorcelainEntries(
+ git: SimpleGit,
+ args: string[] = ['status', '--porcelain'],
+): Promise<PorcelainEntry[]> {
+ return parsePorcelainEntries(await rawZ(git, args));
+}
+
/**
* Run a `--name-status` command (`diff`, `diff-tree`) with `-z` and return the
* parsed rows with real-UTF-8 `from`/`to` paths.
diff --git a/packages/server/src/git-worktree-status.test.ts b/packages/server/src/git-worktree-status.test.ts
new file mode 100644
index 000000000..7fbba6201
--- /dev/null
+++ b/packages/server/src/git-worktree-status.test.ts
@@ -0,0 +1,334 @@
+/**
+ * Partition rules for `git status --porcelain -z` records.
+ *
+ * Pure given parsed records, so these pin the rules without spawning git; the
+ * real-git path is exercised through the API-level suites.
+ */
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import type { GitWorktreeOpenTarget } from '@inkeep/open-knowledge-core';
+import simpleGit from 'simple-git';
+import { afterEach, beforeEach, describe, expect, test } from 'vitest';
+import type { PorcelainEntry } from './git-paths.ts';
+import { parsePorcelainEntries } from './git-paths.ts';
+import {
+ partitionPorcelainEntries,
+ readIncomingEntries,
+ readWorktreeStatus,
+ WORKTREE_STATUS_LIST_CAP,
+} from './git-worktree-status.ts';
+
+const allScoped = () => true;
+
+function partition(entries: PorcelainEntry[], scoped: (p: string) => boolean = allScoped) {
+ return partitionPorcelainEntries(entries, scoped);
+}
+
+describe('parsePorcelainEntries', () => {
+ test('keeps both status columns, which parsePorcelainPaths discards', () => {
+ const out = parsePorcelainEntries('M a.md\0 M b.md\0MM c.md\0');
+ expect(out).toEqual([
+ { x: 'M', y: ' ', path: 'a.md' },
+ { x: ' ', y: 'M', path: 'b.md' },
+ { x: 'M', y: 'M', path: 'c.md' },
+ ]);
+ });
+
+ test('consumes a rename origin as origPath rather than a separate entry', () => {
+ // `XY<space>NEW\0OLD\0` — reading the origin as its own record would
+ // surface the pre-rename name as a phantom changed path.
+ const out = parsePorcelainEntries('R new.md\0old.md\0M other.md\0');
+ expect(out).toEqual([
+ { x: 'R', y: ' ', path: 'new.md', origPath: 'old.md' },
+ { x: 'M', y: ' ', path: 'other.md' },
+ ]);
+ });
+
+ test('preserves non-ASCII path bytes', () => {
+ // The whole point of `-z`: git would C-quote this in its default output.
+ const out = parsePorcelainEntries('M hyvää yötä.md\0');
+ expect(out[0]?.path).toBe('hyvää yötä.md');
+ });
+
+ test('drops the trailing empty field after the final NUL', () => {
+ expect(parsePorcelainEntries('')).toEqual([]);
+ expect(parsePorcelainEntries('\0')).toEqual([]);
+ });
+});
+
+describe('partitionPorcelainEntries', () => {
+ test('files a path under the column that changed', () => {
+ const out = partition(parsePorcelainEntries('M staged.md\0 D unstaged.md\0'));
+ expect(out.staged).toEqual([{ path: 'staged.md', code: 'M', syncScoped: true }]);
+ expect(out.notStaged).toEqual([{ path: 'unstaged.md', code: 'D', syncScoped: true }]);
+ expect(out.untracked).toEqual([]);
+ });
+
+ test('a path dirty in both columns appears in both lists, as git shows it', () => {
+ const out = partition(parsePorcelainEntries('MM both.md\0'));
+ expect(out.staged).toEqual([{ path: 'both.md', code: 'M', syncScoped: true }]);
+ expect(out.notStaged).toEqual([{ path: 'both.md', code: 'M', syncScoped: true }]);
+ });
+
+ test('untracked lands in its own list under a single code', () => {
+ const out = partition(parsePorcelainEntries('?? new.md\0'));
+ expect(out.untracked).toEqual([{ path: 'new.md', code: '?', syncScoped: true }]);
+ expect(out.staged).toEqual([]);
+ expect(out.notStaged).toEqual([]);
+ });
+
+ test('ignored entries are dropped — this surface never passes --ignored', () => {
+ const out = partition(parsePorcelainEntries('!! dist/bundle.js\0'));
+ expect(out.staged).toEqual([]);
+ expect(out.notStaged).toEqual([]);
+ expect(out.untracked).toEqual([]);
+ });
+
+ test('carries the rename origin onto the staged entry', () => {
+ const out = partition(parsePorcelainEntries('R new.md\0old.md\0'));
+ expect(out.staged).toEqual([
+ { path: 'new.md', code: 'R', syncScoped: true, origPath: 'old.md' },
+ ]);
+ });
+
+ test('marks each entry with the caller-supplied sync scope', () => {
+ // The predicate is the sync engine's own admission check — the UI dims what
+ // Push would skip, so a wrong answer here is a file the user watches not move.
+ const out = partition(parsePorcelainEntries('M docs/a.md\0 M src/main.ts\0'), (p) =>
+ p.startsWith('docs/'),
+ );
+ expect(out.staged[0]).toMatchObject({ path: 'docs/a.md', syncScoped: true });
+ expect(out.notStaged[0]).toMatchObject({ path: 'src/main.ts', syncScoped: false });
+ });
+
+ test('caps each list independently and reports the truncation', () => {
+ // Per-list so a huge untracked set cannot crowd out the staged entries the
+ // user actually acted on.
+ const many = Array.from({ length: WORKTREE_STATUS_LIST_CAP + 5 }, (_, i) => ({
+ x: '?',
+ y: '?',
+ path: `f${i}.md`,
+ }));
+ const out = partition([...many, { x: 'M', y: ' ', path: 'staged.md' }]);
+ expect(out.untracked).toHaveLength(WORKTREE_STATUS_LIST_CAP);
+ expect(out.staged).toHaveLength(1);
+ expect(out.truncated).toBe(true);
+ });
+
+ test('a listing within the cap is not marked truncated', () => {
+ const out = partition(parsePorcelainEntries('M a.md\0'));
+ expect(out.truncated).toBe(false);
+ });
+
+ test('an unrecognized status letter degrades to M rather than escaping the enum', () => {
+ // The wire enum is bounded so the UI letter to label map stays total.
+ const out = partition([{ x: 'X', y: ' ', path: 'weird.md' }]);
+ expect(out.staged[0]?.code).toBe('M');
+ });
+});
+
+describe('readIncomingEntries', () => {
+ let dir: string;
+
+ beforeEach(() => {
+ dir = mkdtempSync(join(tmpdir(), 'ok-incoming-'));
+ });
+ afterEach(() => {
+ rmSync(dir, { recursive: true, force: true });
+ });
+
+ /** A project tracking a bare origin that a sister has already advanced. */
+ async function projectBehindOrigin() {
+ const bare = join(dir, 'bare.git');
+ await simpleGit().init(true, [bare]);
+ await simpleGit(bare).raw('symbolic-ref', 'HEAD', 'refs/heads/main');
+
+ const project = join(dir, 'project');
+ const git = simpleGit();
+ await git.clone(bare, project);
+ const pg = simpleGit(project);
+ await pg.raw('config', 'user.name', 'Test');
+ await pg.raw('config', 'user.email', '[email protected]');
+ writeFileSync(join(project, 'kept.md'), 'v1\n');
+ await pg.add('.');
+ await pg.commit('seed');
+ await pg.push(['--set-upstream', 'origin', 'main']);
+
+ const sister = join(dir, 'sister');
+ await simpleGit().clone(bare, sister);
+ const sg = simpleGit(sister);
+ await sg.raw('config', 'user.name', 'Sister');
+ await sg.raw('config', 'user.email', '[email protected]');
+ return { pg, sg, sister };
+ }
+
+ test('a branch that is only AHEAD has nothing incoming', async () => {
+ // Regression: two-dot (`HEAD..@{upstream}`) is a symmetric tree diff, so a
+ // local-only commit rendered as an incoming DELETION — a file you just
+ // added showed under "Pull brings in" with a destructive "Deleted" badge,
+ // for a pull that would touch nothing. It also poisoned `clean`, so
+ // "working tree clean" could never render while ahead. Being ahead is the
+ // steady state for a follower and after any failed push, so this was not a
+ // corner case. Three-dot asks merge-base..upstream, which is the real set.
+ const { pg } = await projectBehindOrigin();
+ writeFileSync(join(await pg.revparse('--show-toplevel'), 'mine.md'), 'local\n');
+ await pg.add('.');
+ await pg.commit('local-only');
+
+ expect(await readIncomingEntries(pg)).toEqual([]);
+ });
+
+ test('lists what a pull would bring in, by change kind', async () => {
+ const { pg, sg, sister } = await projectBehindOrigin();
+ writeFileSync(join(sister, 'kept.md'), 'v1\nv2\n');
+ writeFileSync(join(sister, 'added.md'), 'new\n');
+ await sg.add('.');
+ await sg.commit('sister changes');
+ await sg.push();
+ await pg.fetch('origin');
+
+ const incoming = await readIncomingEntries(pg);
+ const byPath = Object.fromEntries(incoming.map((e) => [e.path, e.code]));
+ expect(byPath).toEqual({ 'kept.md': 'M', 'added.md': 'A' });
+ // Pull is unscoped — git merges whatever the remote carries — so the
+ // "would Push send this" flag is meaningless and never marks a row skipped.
+ expect(incoming.every((e) => e.syncScoped)).toBe(true);
+ });
+
+ test('reports the post-merge path for a rename, keeping the origin', async () => {
+ const { pg, sg } = await projectBehindOrigin();
+ await sg.mv('kept.md', 'renamed.md');
+ await sg.commit('sister renames');
+ await sg.push();
+ await pg.fetch('origin');
+
+ const incoming = await readIncomingEntries(pg);
+ const rename = incoming.find((e) => e.code === 'R');
+ expect(rename?.path).toBe('renamed.md');
+ expect(rename?.origPath).toBe('kept.md');
+ });
+
+ test('is empty when the branch is already up to date', async () => {
+ const { pg } = await projectBehindOrigin();
+ await pg.fetch('origin');
+ expect(await readIncomingEntries(pg)).toEqual([]);
+ });
+
+ test('returns empty rather than throwing when there is no upstream', async () => {
+ // A local-only branch is a normal state, not an error the panel should show.
+ const solo = join(dir, 'solo');
+ const git = simpleGit();
+ await git.init(false, [solo]);
+ const sg = simpleGit(solo);
+ await sg.raw('config', 'user.name', 'Test');
+ await sg.raw('config', 'user.email', '[email protected]');
+ writeFileSync(join(solo, 'a.md'), 'x\n');
+ await sg.add('.');
+ await sg.commit('seed');
+
+ expect(await readIncomingEntries(sg)).toEqual([]);
+ });
+});
+
+describe('readWorktreeStatus open-target stamping', () => {
+ let dir: string;
+
+ beforeEach(() => {
+ dir = mkdtempSync(join(tmpdir(), 'ok-worktree-doc-'));
+ });
+ afterEach(() => {
+ rmSync(dir, { recursive: true, force: true });
+ });
+
+ /**
+ * Stand-in for the real resolver: markdown under `notes/` is a doc, any other
+ * json is an asset, everything else opens nowhere.
+ */
+ const notesAndJson = (projectRelPath: string): GitWorktreeOpenTarget | undefined => {
+ if (projectRelPath.startsWith('notes/') && projectRelPath.endsWith('.md')) {
+ return { kind: 'doc', docName: projectRelPath.slice(0, -'.md'.length) };
+ }
+ return projectRelPath.endsWith('.json') ? { kind: 'asset', path: projectRelPath } : undefined;
+ };
+
+ test('stamps each row with the target the mapper resolves, doc or asset', async () => {
+ const project = join(dir, 'project');
+ const git = simpleGit();
+ await git.init(false, [project]);
+ const pg = simpleGit(project);
+ await pg.raw('config', 'user.name', 'Test');
+ await pg.raw('config', 'user.email', '[email protected]');
+ writeFileSync(join(project, 'opencode.json'), '{}\n');
+ mkdirSync(join(project, 'notes'), { recursive: true });
+ writeFileSync(join(project, 'notes/cadence.md'), 'draft\n');
+ await pg.add('.');
+ await pg.commit('seed');
+
+ writeFileSync(join(project, 'opencode.json'), '{"mcp":{}}\n');
+ writeFileSync(join(project, 'notes/cadence.md'), 'draft\nmore\n');
+
+ const status = await readWorktreeStatus(project, () => true, notesAndJson);
+
+ const note = status.notStaged.find((e) => e.path === 'notes/cadence.md');
+ const config = status.notStaged.find((e) => e.path === 'opencode.json');
+ expect(note?.open).toEqual({ kind: 'doc', docName: 'notes/cadence' });
+ // A config file is not a document, but the asset viewer still renders it —
+ // the same thing clicking it in the Files sidebar does.
+ expect(config?.open).toEqual({ kind: 'asset', path: 'opencode.json' });
+ });
+
+ test('omits every open target when no mapper is supplied', async () => {
+ const project = join(dir, 'project');
+ await simpleGit().init(false, [project]);
+ const pg = simpleGit(project);
+ await pg.raw('config', 'user.name', 'Test');
+ await pg.raw('config', 'user.email', '[email protected]');
+ mkdirSync(join(project, 'notes'), { recursive: true });
+ writeFileSync(join(project, 'notes/cadence.md'), 'draft\n');
+ await pg.add('.');
+ await pg.commit('seed');
+ writeFileSync(join(project, 'notes/cadence.md'), 'draft\nmore\n');
+
+ const status = await readWorktreeStatus(project, () => true);
+
+ expect(status.notStaged.map((e) => e.open)).toEqual([undefined]);
+ });
+});
+
+describe('readWorktreeStatus — an unreadable tree is representable', () => {
+ let dir: string;
+ beforeEach(() => {
+ dir = mkdtempSync(join(tmpdir(), 'ok-unreadable-'));
+ });
+ afterEach(() => {
+ rmSync(dir, { recursive: true, force: true });
+ });
+
+ test('a directory that is not a git repo reports readable: false, not a clean tree', async () => {
+ // Regression: the rejected branch returned all-empty lists, which is
+ // byte-identical on the wire to a genuinely clean tree — so the popover
+ // stated "Nothing to commit, working tree clean" about a tree it could not
+ // read. The lists being empty is NOT the signal; `readable` is.
+ const status = await readWorktreeStatus(dir, () => true);
+
+ expect(status.readable).toBe(false);
+ expect(status.staged).toEqual([]);
+ expect(status.untracked).toEqual([]);
+ });
+
+ test('a real repo reports readable: true', async () => {
+ // The control: without it the assertion above passes on a function that
+ // always returns false.
+ const g = simpleGit(dir);
+ await g.init(['--initial-branch=main']);
+ await g.raw('config', 'user.email', '[email protected]');
+ await g.raw('config', 'user.name', 'T');
+ writeFileSync(join(dir, 'a.md'), 'x\n');
+
+ const status = await readWorktreeStatus(dir, () => true);
+
+ expect(status.readable).toBe(true);
+ expect(status.untracked.map((e) => e.path)).toContain('a.md');
+ });
+});
diff --git a/packages/server/src/git-worktree-status.ts b/packages/server/src/git-worktree-status.ts
new file mode 100644
index 000000000..a36832269
--- /dev/null
+++ b/packages/server/src/git-worktree-status.ts
@@ -0,0 +1,243 @@
+/**
+ * Working-tree status for `GET /api/git/worktree-status` — the `git status`
+ * equivalent the sync popover renders.
+ *
+ * Read-only, so no `withParentLock`: every probe here is a `status` /
+ * `rev-parse` / `for-each-ref` read. Running it under the parent mutex would
+ * make a popover open block behind an in-flight push cycle, which is exactly
+ * the moment the user most wants to see what is happening.
+ *
+ * Local-only by construction — nothing here contacts a remote. `upstream` reads
+ * the configured tracking ref from local refs; it never fetches.
+ */
+
+import type {
+ GitStatusCode,
+ GitWorktreeEntry,
+ GitWorktreeOpenTarget,
+} from '@inkeep/open-knowledge-core';
+import { GIT_STATUS_CODES } from '@inkeep/open-knowledge-core';
+import type { SimpleGit } from 'simple-git';
+import { createGitInstance } from './git-handle.ts';
+import { listNameStatus, listPorcelainEntries, type PorcelainEntry } from './git-paths.ts';
+import { getLogger } from './logger.ts';
+
+const log = getLogger('git-worktree-status');
+
+/**
+ * Per-list cap. A repo with a stale `node_modules` or an unignored build
+ * directory can emit tens of thousands of untracked records; the popover shows
+ * a bounded list and a "+N more" line rather than shipping all of them to the
+ * renderer. Applied per list so a huge untracked set cannot crowd out the
+ * staged entries the user actually acted on.
+ */
+export const WORKTREE_STATUS_LIST_CAP = 100;
+
+export interface WorktreeStatus {
+ /** False when the porcelain read failed — see the schema's `readable`. */
+ readable: boolean;
+ branch: string | null;
+ detached: boolean;
+ upstream: string | null;
+ staged: GitWorktreeEntry[];
+ notStaged: GitWorktreeEntry[];
+ untracked: GitWorktreeEntry[];
+ incoming: GitWorktreeEntry[];
+ truncated: boolean;
+}
+
+/** Narrow a raw porcelain column to the bounded wire enum, defaulting to `M`. */
+function toStatusCode(raw: string): GitStatusCode {
+ return (GIT_STATUS_CODES as readonly string[]).includes(raw) ? (raw as GitStatusCode) : 'M';
+}
+
+/**
+ * Partition porcelain entries into the three lists `git status` prints.
+ *
+ * A path can legitimately land in both `staged` and `notStaged` — that is the
+ * "Changes to be committed" / "Changes not staged for commit" split git itself
+ * shows for a file modified, staged, then modified again. Untracked (`??`) and
+ * ignored (`!!`) are single-column states; ignored never reaches the UI because
+ * the caller does not pass `--ignored`.
+ *
+ * Exported for unit tests: the partition rules are pure given the parsed
+ * records, so they are pinned without spawning git.
+ */
+export function partitionPorcelainEntries(
+ entries: PorcelainEntry[],
+ isSyncScoped: (projectRelPath: string) => boolean,
+): Omit<WorktreeStatus, 'branch' | 'detached' | 'upstream' | 'incoming' | 'readable'> {
+ const staged: GitWorktreeEntry[] = [];
+ const notStaged: GitWorktreeEntry[] = [];
+ const untracked: GitWorktreeEntry[] = [];
+
+ for (const entry of entries) {
+ const syncScoped = isSyncScoped(entry.path);
+ if (entry.x === '?' || entry.y === '?') {
+ untracked.push({ path: entry.path, code: '?', syncScoped });
+ continue;
+ }
+ // `!!` only appears with `--ignored`, which this surface never passes.
+ if (entry.x === '!' || entry.y === '!') continue;
+ if (entry.x !== ' ' && entry.x !== '') {
+ staged.push({
+ path: entry.path,
+ code: toStatusCode(entry.x),
+ syncScoped,
+ ...(entry.origPath !== undefined ? { origPath: entry.origPath } : {}),
+ });
+ }
+ if (entry.y !== ' ' && entry.y !== '') {
+ // `origPath` rides both branches: a worktree rename reports in the Y
+ // column, so spreading it onto `staged` only dropped the origin for
+ // exactly the rename shape the parser fix below now admits.
+ notStaged.push({
+ path: entry.path,
+ code: toStatusCode(entry.y),
+ syncScoped,
+ ...(entry.origPath !== undefined ? { origPath: entry.origPath } : {}),
+ });
+ }
+ }
+
+ const truncated =
+ staged.length > WORKTREE_STATUS_LIST_CAP ||
+ notStaged.length > WORKTREE_STATUS_LIST_CAP ||
+ untracked.length > WORKTREE_STATUS_LIST_CAP;
+
+ return {
+ staged: staged.slice(0, WORKTREE_STATUS_LIST_CAP),
+ notStaged: notStaged.slice(0, WORKTREE_STATUS_LIST_CAP),
+ untracked: untracked.slice(0, WORKTREE_STATUS_LIST_CAP),
+ truncated,
+ };
+}
+
+/**
+ * Files a pull would bring in — the diff from HEAD to the tracking ref.
+ *
+ * Three-dot (`HEAD...@{upstream}`), i.e. merge-base..upstream — the set a merge
+ * would actually bring in. Two-dot is a symmetric tree-to-tree diff, so on a
+ * branch that is AHEAD it reports every local-only commit inverted: a file you
+ * added locally renders as an incoming "Deleted" with a destructive badge, for a
+ * pull that would touch nothing. Being ahead is the steady state for a follower
+ * and for any branch whose last push failed, so that was not a corner case.
+ *
+ * Local-only: this compares two refs already on disk, so it is exactly as fresh
+ * as the last fetch and costs no network. Returns `[]` for a branch with no
+ * upstream, which is a normal state and not an error.
+ *
+ * Exported for tests.
+ */
+export async function readIncomingEntries(git: SimpleGit): Promise<GitWorktreeEntry[]> {
+ let rows: Awaited<ReturnType<typeof listNameStatus>>;
+ try {
+ rows = await listNameStatus(git, ['diff', '--name-status', 'HEAD...@{upstream}']);
+ } catch {
+ // No upstream configured, unborn HEAD, or an unreadable ref. Nothing
+ // incoming is the honest answer; the counts alongside carry the same story.
+ return [];
+ }
+ return rows.map((row) => ({
+ // A rename's `to` is the path that will exist after the merge.
+ path: row.to,
+ code: toStatusCode(row.status.charAt(0)),
+ // Pull is unscoped — git merges everything the remote carries — so the
+ // "would Push send this" flag has no meaning on an inbound row.
+ syncScoped: true,
+ ...(row.status.charAt(0) === 'R' || row.status.charAt(0) === 'C' ? { origPath: row.from } : {}),
+ }));
+}
+
+/**
+ * Read the working tree's status.
+ *
+ * `toOpenTarget` maps a project-relative path to where clicking it navigates,
+ * or undefined when it navigates nowhere. Threaded in for the same reason as
+ * `isSyncScoped`: the answer belongs to the server's live file index and
+ * content filter, and a path this surface guessed at would render as a link
+ * to a 404.
+ *
+ * `isSyncScoped` decides whether Open Knowledge would ever commit a given
+ * project-relative path. It is threaded in rather than recomputed here so the
+ * answer comes from the sync engine's own admission predicate — the same one
+ * the staging walk consults (precedent #55). A UI that marked a path in-scope
+ * that Push then skipped would be worse than showing nothing.
+ *
+ * Never throws: a repository that is unborn, mid-rebase, or not a git dir at
+ * all yields an empty status rather than failing the popover. The engine's own
+ * `sync-status` payload is what reports sync health; this surface is
+ * supplementary detail.
+ */
+export async function readWorktreeStatus(
+ projectDir: string,
+ isSyncScoped: (projectRelPath: string) => boolean,
+ toOpenTarget?: (projectRelPath: string) => GitWorktreeOpenTarget | undefined,
+): Promise<WorktreeStatus> {
+ const empty: WorktreeStatus = {
+ readable: true,
+ branch: null,
+ detached: false,
+ upstream: null,
+ staged: [],
+ notStaged: [],
+ untracked: [],
+ incoming: [],
+ truncated: false,
+ };
+
+ // Local-only: status and ref reads never reach a remote, so no credentials.
+ const { git } = createGitInstance(projectDir, { credentialConfig: [] });
+
+ const [entriesResult, branchResult, upstreamResult, incomingResult] = await Promise.allSettled([
+ listPorcelainEntries(git),
+ // `--symbolic-full-name HEAD` prints `HEAD` verbatim when detached, which is
+ // how the detached case is detected without a second probe.
+ git.raw(['rev-parse', '--symbolic-full-name', '--abbrev-ref', 'HEAD']),
+ git.raw(['rev-parse', '--symbolic-full-name', '--abbrev-ref', '@{upstream}']),
+ readIncomingEntries(git),
+ ]);
+
+ if (entriesResult.status === 'rejected') {
+ // `warn`, not `debug`: debug sits below the default console level AND below
+ // the bug-report file sink, so the only diagnostic for a false-clean reached
+ // neither the terminal nor a support bundle.
+ log.warn({ err: entriesResult.reason }, '[git-status] porcelain read failed');
+ return { ...empty, readable: false };
+ }
+
+ const headRef = branchResult.status === 'fulfilled' ? branchResult.value.trim() : '';
+ const detached = headRef === 'HEAD';
+ // An unborn HEAD makes rev-parse fail entirely; both branches then read null.
+ const branch = detached || headRef === '' ? null : headRef;
+ // A branch with no configured tracking ref rejects `@{upstream}` — that is a
+ // normal state (a local-only branch), not an error worth logging.
+ const upstream =
+ upstreamResult.status === 'fulfilled' ? upstreamResult.value.trim() || null : null;
+
+ const incomingAll = incomingResult.status === 'fulfilled' ? incomingResult.value : [];
+ const partitioned = partitionPorcelainEntries(entriesResult.value, isSyncScoped);
+
+ // Stamped after the per-list caps so the resolution runs once per RENDERED
+ // row, not once per porcelain record — a stale `node_modules` can emit tens
+ // of thousands of those, and the rows past the cap are never sent.
+ const withOpenTargets = (entries: GitWorktreeEntry[]): GitWorktreeEntry[] => {
+ if (!toOpenTarget) return entries;
+ return entries.map((entry) => {
+ const open = toOpenTarget(entry.path);
+ return open === undefined ? entry : { ...entry, open };
+ });
+ };
+
+ return {
+ readable: true,
+ branch,
+ detached,
+ upstream,
+ staged: withOpenTargets(partitioned.staged),
+ notStaged: withOpenTargets(partitioned.notStaged),
+ untracked: withOpenTargets(partitioned.untracked),
+ truncated: partitioned.truncated || incomingAll.length > WORKTREE_STATUS_LIST_CAP,
+ incoming: withOpenTargets(incomingAll.slice(0, WORKTREE_STATUS_LIST_CAP)),
+ };
+}
diff --git a/packages/server/src/server-factory.ts b/packages/server/src/server-factory.ts
index d75b21797..4b2a87779 100644
--- a/packages/server/src/server-factory.ts
+++ b/packages/server/src/server-factory.ts
@@ -36,6 +36,7 @@ import {
type Principal,
parseGlobalSkillBundleDoc,
parseManagedArtifactName,
+ resolveAutoSyncIntervals,
resolveLocalAutoSyncMode,
type SyncMode,
type SyncModeChangeSource,
@@ -852,6 +853,27 @@ export function createServer(options: ServerOptions): ServerInstance {
};
}
+ /**
+ * Per-machine scheduled-cycle cadence for this project. Project-local only:
+ * unlike `mode`, there is no committed seed — how hard one machine polls is
+ * not something a maintainer sets for everyone through git.
+ *
+ * An unreadable config falls back to the shipped defaults rather than
+ * throwing. `resolveAutoSyncIntervals` clamps, so a hand-edited out-of-range
+ * value degrades to the nearest legal cadence instead of taking sync down.
+ */
+ function readProjectAutoSyncIntervals(): {
+ pullIntervalSeconds: number;
+ pushIntervalSeconds: number;
+ } {
+ const local = readConfigSafely({
+ absPath: resolveConfigPath('project-local', projectDir),
+ sideline: false,
+ warn: (message) => log.warn({ message }, '[config] could not read project-local config'),
+ });
+ return resolveAutoSyncIntervals(local.value.autoSync);
+ }
+
// Project-scope base linter config, read FRESH per request so a config edit
// (project `.ok/config.yml` → contentRules.*) takes effect without a restart.
function readLinterBaseConfig(): LinterConfig {
@@ -997,6 +1019,15 @@ export function createServer(options: ServerOptions): ServerInstance {
'[sync] failed to apply autoSync mode from config',
);
});
+ // Cadence rides the same persist. `setMode` is not awaited and awaits a
+ // remote probe before it arms anything, so this lands FIRST on a mode
+ // flip — which is harmless: it only stores the new interval fields, and
+ // setMode's own schedule calls then read them. On a cadence-only edit the
+ // timers are already armed and this re-arms them. Idempotent, so the
+ // producer-notify + watcher-echo double-fire this function documents is
+ // safe.
+ const intervals = readProjectAutoSyncIntervals();
+ syncEngine?.setIntervals(intervals.pullIntervalSeconds, intervals.pushIntervalSeconds);
}
// Re-evaluate semantic search on every config-doc store. `readSemanticSearchConfig`
// resolves the project-local layer only, so only a project-local `search.semantic.*`
@@ -5580,6 +5611,7 @@ export function createServer(options: ServerOptions): ServerInstance {
resetAmbient: resetAmbientCredentials,
});
const bootAutoSyncMode = readProjectAutoSyncMode();
+ const bootAutoSyncIntervals = readProjectAutoSyncIntervals();
if (bootAutoSyncMode.mode !== 'off') {
// A never-asked machine booting into a committed-default mode is the main
// way pull-only activates silently; log it (with the resolution source) so
@@ -5597,8 +5629,13 @@ export function createServer(options: ServerOptions): ServerInstance {
contentRoot,
mcpTomlEditor: options.mcpTomlEditor,
mode: bootAutoSyncMode.mode,
- pullIntervalSeconds: options.pullIntervalSeconds,
- pushIntervalSeconds: options.pushIntervalSeconds,
+ // The explicit option stays the test DI seam (the harness passes a huge
+ // value so no background timer races a scenario); production leaves it
+ // undefined and picks up the user's configured cadence.
+ pullIntervalSeconds:
+ options.pullIntervalSeconds ?? bootAutoSyncIntervals.pullIntervalSeconds,
+ pushIntervalSeconds:
+ options.pushIntervalSeconds ?? bootAutoSyncIntervals.pushIntervalSeconds,
credentialConfig: syncCredentialConfig,
cc1Broadcaster,
// Push-permission probe auth seam — production callers (CLI `ok start`)
diff --git a/packages/server/src/symlink-guard.test.ts b/packages/server/src/symlink-guard.test.ts
index eab83b50b..08662dca1 100644
--- a/packages/server/src/symlink-guard.test.ts
+++ b/packages/server/src/symlink-guard.test.ts
@@ -3,6 +3,7 @@ import { tmpdir } from 'node:os';
import { join, resolve } from 'node:path';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { SymlinkEscapeError } from './apply-managed-rename.ts';
+import { isShareableOkArtifact } from './content-filter.ts';
import { assertRealpathWithinDir } from './symlink-guard.ts';
describe('assertRealpathWithinDir', () => {
@@ -78,3 +79,136 @@ describe('assertRealpathWithinDir', () => {
);
});
});
+
+describe('assertRealpathWithinDir — shareable .ok exemption', () => {
+ let root: string;
+ // The real predicate, not a stand-in: the exemption's whole contract is that
+ // it consults the SAME allow-list as the staging walk (precedent #55).
+ const opts = { allowShareableOkArtifact: isShareableOkArtifact };
+
+ beforeEach(() => {
+ root = mkdtempSync(join(tmpdir(), 'symlink-guard-ok-'));
+ mkdirSync(join(root, '.git', 'hooks'), { recursive: true });
+ writeFileSync(join(root, '.git', 'config'), '[core]\n');
+ mkdirSync(join(root, '.ok', 'local'), { recursive: true });
+ writeFileSync(join(root, '.ok', 'local', 'config.yml'), 'autoSync:\n mode: full\n');
+ mkdirSync(join(root, '.ok', 'templates'), { recursive: true });
+ mkdirSync(join(root, 'notes'), { recursive: true });
+ });
+
+ afterEach(() => {
+ rmSync(root, { recursive: true, force: true });
+ });
+
+ it('allows an existing shareable artifact', () => {
+ writeFileSync(join(root, '.ok', 'config.yml'), 'shared: base\n');
+ expect(() =>
+ assertRealpathWithinDir(join(root, '.ok', 'config.yml'), root, opts),
+ ).not.toThrow();
+ });
+
+ it('allows a shareable artifact that does not exist yet', () => {
+ // The leaf is judged by its full intended path, not its .ok ancestor —
+ // the pull overlay legitimately (re)creates these files.
+ expect(() =>
+ assertRealpathWithinDir(join(root, '.ok', 'templates', 'project.md'), root, opts),
+ ).not.toThrow();
+ });
+
+ it('refuses a symlink NAMED like a shareable artifact that resolves to private .ok state', () => {
+ // The config-hijack the guard exists to stop: the logical name is on the
+ // allow-list, the resolved target is not. The decision must follow the
+ // resolved path.
+ symlinkSync('./local/config.yml', join(root, '.ok', 'config.yml'));
+ expect(() => assertRealpathWithinDir(join(root, '.ok', 'config.yml'), root, opts)).toThrow(
+ SymlinkEscapeError,
+ );
+ });
+
+ it('refuses a DANGLING shareable-named symlink into private .ok state', () => {
+ // Target absent: the write would CREATE it. Same verdict as the live link.
+ symlinkSync('./local/not-yet-created.yml', join(root, '.ok', 'config.yml'));
+ expect(() => assertRealpathWithinDir(join(root, '.ok', 'config.yml'), root, opts)).toThrow(
+ SymlinkEscapeError,
+ );
+ });
+
+ it('refuses a shareable-named symlink into .git even with a permissive predicate', () => {
+ // .git is not exemptable, period — a predicate bug must not open it.
+ symlinkSync('../.git/hooks/post-checkout', join(root, '.ok', 'config.yml'));
+ expect(() =>
+ assertRealpathWithinDir(join(root, '.ok', 'config.yml'), root, {
+ allowShareableOkArtifact: () => true,
+ }),
+ ).toThrow(SymlinkEscapeError);
+ });
+
+ it('refuses a content-named symlink resolving to private .ok state', () => {
+ // The exemption never rescues a resolved NON-shareable target, whatever
+ // the logical name was.
+ symlinkSync('../.ok/local/config.yml', join(root, 'notes', 'innocent.md'));
+ expect(() => assertRealpathWithinDir(join(root, 'notes', 'innocent.md'), root, opts)).toThrow(
+ SymlinkEscapeError,
+ );
+ });
+
+ it('still refuses every .ok path when no predicate is passed', () => {
+ // Callers that do not opt in keep the blanket refusal unchanged.
+ writeFileSync(join(root, '.ok', 'config.yml'), 'shared: base\n');
+ expect(() => assertRealpathWithinDir(join(root, '.ok', 'config.yml'), root)).toThrow(
+ SymlinkEscapeError,
+ );
+ });
+
+ it('still refuses escapes outside the root regardless of the predicate', () => {
+ symlinkSync(join(tmpdir(), 'outside.yml'), join(root, '.ok', 'config.yml'));
+ expect(() =>
+ assertRealpathWithinDir(join(root, '.ok', 'config.yml'), root, {
+ allowShareableOkArtifact: () => true,
+ }),
+ ).toThrow(SymlinkEscapeError);
+ });
+});
+
+describe('assertRealpathWithinDir — case-folded state-dir refusal', () => {
+ let root: string;
+
+ beforeEach(() => {
+ root = mkdtempSync(join(tmpdir(), 'symlink-guard-case-'));
+ mkdirSync(join(root, '.git', 'hooks'), { recursive: true });
+ mkdirSync(join(root, 'notes'), { recursive: true });
+ // Deliberately NO `.ok` dir: the uppercase leaf then has no existing
+ // ancestor to true-case through, which is exactly the hole — the
+ // pending-suffix climb preserves literal casing, and on a
+ // case-insensitive filesystem `.OK/…` IS the state tree.
+ });
+
+ afterEach(() => {
+ rmSync(root, { recursive: true, force: true });
+ });
+
+ it('refuses an uppercase .OK leaf with no existing ancestor', () => {
+ expect(() => assertRealpathWithinDir(join(root, '.OK', 'local', 'evil.yml'), root)).toThrow(
+ SymlinkEscapeError,
+ );
+ });
+
+ it('refuses an uppercase .GIT leaf regardless of filesystem case behavior', () => {
+ // On APFS realpath true-cases through the existing `.git`; on a
+ // case-sensitive filesystem the suffix keeps `.GIT` and only the fold
+ // catches it. Either way: refused.
+ expect(() =>
+ assertRealpathWithinDir(join(root, '.GIT', 'hooks', 'post-checkout'), root),
+ ).toThrow(SymlinkEscapeError);
+ });
+
+ it('never case-folds into the shareable EXEMPTION', () => {
+ // The fold widens the refusal, not the exemption: `.OK/config.yml` is not
+ // a path the staging walk admits, so the predicate must not rescue it.
+ expect(() =>
+ assertRealpathWithinDir(join(root, '.OK', 'config.yml'), root, {
+ allowShareableOkArtifact: isShareableOkArtifact,
+ }),
+ ).toThrow(SymlinkEscapeError);
+ });
+});
diff --git a/packages/server/src/symlink-guard.ts b/packages/server/src/symlink-guard.ts
index a264c1f1d..09d131d73 100644
--- a/packages/server/src/symlink-guard.ts
+++ b/packages/server/src/symlink-guard.ts
@@ -27,7 +27,7 @@
*/
import { lstatSync, readlinkSync, realpathSync } from 'node:fs';
-import { dirname, relative, resolve } from 'node:path';
+import { basename, dirname, relative, resolve } from 'node:path';
import { SymlinkEscapeError } from './apply-managed-rename.ts';
import { isWithinDir, toPosix } from './path-utils.ts';
@@ -40,7 +40,34 @@ import { isWithinDir, toPosix } from './path-utils.ts';
* intended target) and checks that instead, so a brand-new file under a
* legitimate directory passes.
*/
-export function assertRealpathWithinDir(targetAbsPath: string, rootDir: string): void {
+export interface RealpathGuardOptions {
+ /**
+ * Exemption for the `.ok` half of the state-dir refusal: when the RESOLVED
+ * write target lands under the root `.ok` tree, this predicate is asked
+ * whether that resolved project-relative path is a shareable artifact the
+ * sync layer legitimately writes (pass `isShareableOkArtifact` — precedent
+ * #55: the same predicate the staging walk consults, never a copy).
+ *
+ * Two properties are load-bearing:
+ * - It is evaluated on the POST-resolution path (symlinks followed, plus
+ * the not-yet-created suffix). A symlink NAMED `.ok/config.yml` that
+ * resolves to `.ok/local/config.yml` is judged as `.ok/local/config.yml`
+ * and refused — the config-hijack this guard exists to stop.
+ * - It can never exempt `.git`: the refusal there is unconditional.
+ *
+ * Granting a write to a resolved shareable path yields the attacker nothing
+ * they lack: a hostile origin already controls the committed CONTENT of
+ * every shareable artifact; only the non-shared `.ok` state and `.git` are
+ * privilege boundaries, and both stay closed.
+ */
+ allowShareableOkArtifact?: (projectRelPosixPath: string) => boolean;
+}
+
+export function assertRealpathWithinDir(
+ targetAbsPath: string,
+ rootDir: string,
+ opts: RealpathGuardOptions = {},
+): void {
const resolvedRoot = resolve(rootDir);
let canonicalRoot: string;
try {
@@ -52,6 +79,12 @@ export function assertRealpathWithinDir(targetAbsPath: string, rootDir: string):
}
let cur = resolve(targetAbsPath);
+ // Leaf segments not yet resolved because they do not exist on disk. The
+ // effective write target is canonical(nearest existing ancestor) + this
+ // suffix; judging only the ancestor would misclassify a brand-new
+ // `.ok/config.yml` as its `.ok` parent and lose the leaf the exemption
+ // predicate needs.
+ const pendingSuffix: string[] = [];
// Each pass either climbs one lexical parent (path shrinks) or follows one
// symlink; the counter is a fail-closed backstop against a pathological
// dangling-symlink chain that neither resolves nor climbs to root.
@@ -62,8 +95,26 @@ export function assertRealpathWithinDir(targetAbsPath: string, rootDir: string):
if (!isWithinDir(canonical, canonicalRoot)) {
throw new SymlinkEscapeError(`path resolves outside ${rootDir}`);
}
- if (resolvesIntoInternalStateDir(canonical, canonicalRoot)) {
- throw new SymlinkEscapeError('path resolves into the .git/.ok state tree');
+ const canonicalRel = toPosix(relative(canonicalRoot, canonical));
+ const effectiveRel =
+ pendingSuffix.length === 0
+ ? canonicalRel
+ : [canonicalRel, ...pendingSuffix].filter((seg) => seg !== '').join('/');
+ if (resolvesIntoInternalStateDir(effectiveRel)) {
+ // `.git` is refused unconditionally. `.ok` may be exempted, but only
+ // for the RESOLVED effective path — the logical name the caller used
+ // plays no part in this decision.
+ // Exact-case `.ok` only: an uppercase spelling folds into the refusal
+ // above but must never fold into the EXEMPTION — the shareable
+ // predicate matches literal `.ok` paths, and widening the gate to
+ // case-variants would exempt names the staging walk never admits.
+ const exemptable =
+ effectiveRel.split('/')[0] === '.ok' &&
+ opts.allowShareableOkArtifact !== undefined &&
+ opts.allowShareableOkArtifact(effectiveRel);
+ if (!exemptable) {
+ throw new SymlinkEscapeError('path resolves into the .git/.ok state tree');
+ }
}
return;
} catch (err) {
@@ -91,6 +142,7 @@ export function assertRealpathWithinDir(targetAbsPath: string, rootDir: string):
}
const parent = dirname(cur);
if (parent === cur) throw err;
+ pendingSuffix.unshift(basename(cur));
// Never climb above the root while chasing a missing leaf — a target that
// would resolve above `rootDir` is itself an escape.
if (parent !== resolvedRoot && !isWithinDir(parent, resolvedRoot)) {
@@ -102,14 +154,19 @@ export function assertRealpathWithinDir(targetAbsPath: string, rootDir: string):
}
/**
- * True when `canonical` (already confirmed within `canonicalRoot`) sits inside
- * the root-level `.git` (git internals) or `.ok` (per-machine state) tree. Only
- * the two ROOT-level trees are matched — a nested `<folder>/.ok/` holding folder
+ * True when the effective project-relative path sits inside the root-level
+ * `.git` (git internals) or `.ok` (per-machine state) tree. Only the two
+ * ROOT-level trees are matched — a nested `<folder>/.ok/` holding folder
* metadata is legitimate content-adjacent state and is intentionally allowed.
*/
-function resolvesIntoInternalStateDir(canonical: string, canonicalRoot: string): boolean {
- const rel = toPosix(relative(canonicalRoot, canonical));
- if (rel === '' || rel.startsWith('..')) return false;
- const first = rel.split('/')[0];
+function resolvesIntoInternalStateDir(effectiveRel: string): boolean {
+ if (effectiveRel === '' || effectiveRel.startsWith('..')) return false;
+ // Case-folded: on a case-insensitive filesystem (APFS default, NTFS) a
+ // not-yet-created `.GIT/…` or `.OK/…` leaf names the SAME directory as the
+ // state tree, but the pending-suffix climb preserves the literal casing —
+ // realpath only true-cases segments that already exist. A case-sensitive
+ // comparison would wave the uppercase spelling through and the write would
+ // land inside the protected tree.
+ const first = (effectiveRel.split('/')[0] ?? '').toLowerCase();
return first === '.git' || first === '.ok';
}
diff --git a/packages/server/src/sync-engine.test.ts b/packages/server/src/sync-engine.test.ts
index 45ea0e845..15171f082 100644
--- a/packages/server/src/sync-engine.test.ts
+++ b/packages/server/src/sync-engine.test.ts
@@ -99,7 +99,11 @@ beforeEach(() => {
});
afterEach(() => {
- rmSync(tmpDir, { recursive: true, force: true });
+ // A just-destroyed engine's git subprocess can still hold a file while the
+ // sweep runs, which surfaces as ENOTEMPTY on macOS and fails the test in
+ // teardown after every assertion passed. Node's built-in retry absorbs the
+ // handful of milliseconds the process needs to exit.
+ rmSync(tmpDir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
});
function makeEngine(
@@ -662,7 +666,9 @@ describe('SyncEngine ConflictStore admission (content-only)', () => {
const engine = makeEngineForConflict();
try {
await engine.start();
- await engine.trigger('pull');
+ // The classic merge machinery belongs to the Sync verb now (the Pull
+ // verb never commits, so it refuses diverged history outright).
+ await engine.pullOnce('sync');
const status = engine.getStatus();
// Partition fix: `.mcp.json` (not .md/.mdx) takes the non-content
@@ -701,7 +707,9 @@ describe('SyncEngine ConflictStore admission (content-only)', () => {
const engine = makeEngineForConflict();
try {
await engine.start();
- const outcome = await engine.pullOnce();
+ // Sync verb — the only pull flavor that commits (and can thus hit a
+ // commit failure).
+ const outcome = await engine.pullOnce('sync');
// The commit was rejected and the merge aborted: the outcome must be the
// error class (not 'succeeded'), pullError must surface it, and no
@@ -723,7 +731,7 @@ describe('SyncEngine ConflictStore admission (content-only)', () => {
const engine = makeEngineForConflict();
try {
await engine.start();
- await engine.trigger('pull');
+ await engine.pullOnce('sync');
const status = engine.getStatus();
// Partition routes `.mcp.json` to non-content auto-resolve;
@@ -761,14 +769,16 @@ describe('SyncEngine ConflictStore admission (content-only)', () => {
const engine = makeEngineForConflict();
try {
await engine.start();
- await engine.trigger('pull');
+ await engine.pullOnce('sync');
expect(engine.getStatus().pausedReason).toBe('non-content-merge-failure');
const projectGit = simpleGit(projectDir);
await projectGit.rm('.mcp.json');
await projectGit.commit('resolve modify/delete locally');
- await engine.trigger('pull');
+ // trigger() clears the transient reason regardless of op; the Sync verb
+ // is the one whose retry re-attempts the merge.
+ await engine.trigger('sync');
const status = engine.getStatus();
expect(status.pausedReason).toBeUndefined();
expect(status.conflictCount).toBe(0);
@@ -840,7 +850,7 @@ describe('SyncEngine tracked MCP overlap preparation', () => {
}
});
- test('full sync keeps a locally newer launcher without stash conflicts', async () => {
+ test('full sync keeps a locally newer launcher reconciled as overlay (no interim commit)', async () => {
const bareDir = join(tmpDir, 'mcp-newer-overlap.git');
const sisterDir = join(tmpDir, 'mcp-newer-overlap-sister');
mkdirSync(bareDir, { recursive: true });
@@ -896,12 +906,16 @@ describe('SyncEngine tracked MCP overlap preparation', () => {
const project = simpleGit(projectDir);
const raw = readFileSync(join(projectDir, '.mcp.json'), 'utf8');
expect(raw).not.toContain('<<<<<<<');
+ // The reconciled OUTCOME is unchanged from the merge-path era: the newer
+ // local launcher entry survives, the unowned shell (theme) takes theirs.
+ // What changed is the mechanism — the result now lives as working-tree
+ // overlay instead of an engine-authored commit; the next push cycle is
+ // what commits it. Asserting a commit here would pin the mechanism this
+ // change removes (pull never commits).
expect(JSON.parse(raw)).toEqual(JSON.parse(config('# ok-mcp-v99', 'incoming')));
expect((await project.raw(['diff', '--name-only', '--diff-filter=U'])).trim()).toBe('');
- expect((await project.status()).isClean()).toBe(true);
- expect((await project.log({ maxCount: 1 })).latest?.message).toBe(
- 'Update OpenKnowledge MCP launcher',
- );
+ // Fast-forwarded to origin's tip; no local commit was authored.
+ expect((await project.log({ maxCount: 1 })).latest?.message).toBe('incoming launcher');
expect((await project.raw(['stash', 'list'])).trim()).toBe('');
} finally {
await engine.destroy();
@@ -1285,6 +1299,527 @@ describe('SyncEngine getStatus()', () => {
});
});
+// ─── pushOnce() — the manual-mode push primitive ──────────────────────────────
+//
+// Manual mode (`off`) has no push loop, so a user-pressed Push runs a one-shot
+// cycle instead. The consent guarantee moves with it: `follow` must never reach
+// the push subprocess on ANY path, scheduled or manual, because its user chose
+// one-directional sync. `off` is not that choice — it means "nothing moves
+// until I ask", and pressing Push is the asking.
+
+describe('SyncEngine push gating — scheduled vs explicit', () => {
+ /**
+ * A project wired to a LOCAL bare origin, so a push either lands or fails for
+ * a real reason — never on network timing. Returns the project handle, the
+ * unpushed local HEAD, and origin's tip before the push.
+ */
+ async function projectWithUnpushedCommit() {
+ const bareDir = join(tmpDir, 'bare.git');
+ mkdirSync(bareDir, { recursive: true });
+ await simpleGit(bareDir).init(true);
+ await simpleGit(bareDir).raw('symbolic-ref', 'HEAD', 'refs/heads/main');
+
+ const git = simpleGit(projectDir);
+ await git.init(['--initial-branch=main']);
+ await git.raw('config', 'user.name', 'Test');
+ await git.raw('config', 'user.email', '[email protected]');
+ writeFileSync(join(projectDir, 'README.md'), '# seed\n');
+ await git.add('.');
+ await git.commit('seed');
+ await git.addRemote('origin', bareDir);
+ await git.push(['--set-upstream', 'origin', 'main']);
+ const originBefore = (await git.revparse(['origin/main'])).trim();
+
+ writeFileSync(join(projectDir, 'README.md'), '# seed\n\nlocal edit\n');
+ await git.add('.');
+ await git.commit('local commit not pushed');
+ const localHead = (await git.revparse(['HEAD'])).trim();
+
+ return { git, localHead, originBefore };
+ }
+
+ test.each([
+ 'off',
+ 'follow',
+ ] as const)("%s never pushes on the engine's own initiative", async (mode) => {
+ // The scheduled gate. Anything reaching the push subprocess without a
+ // user asking is Open Knowledge pushing for someone who did not choose it.
+ const { git, originBefore } = await projectWithUnpushedCommit();
+ const engine = makeEngine({ mode });
+ await engine.refreshRemote();
+ try {
+ // `runPushCycle` is the scheduled loop's body and is private; reaching
+ // it by cast pins the gate at its real call site rather than widening
+ // the production surface with a test-only entry point.
+ await (engine as unknown as { runPushCycle: () => Promise<void> }).runPushCycle();
+
+ expect((await git.revparse(['origin/main'])).trim()).toBe(originBefore);
+ expect(engine.getStatus().lastPushedSha).toBeNull();
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test.each([
+ 'off',
+ 'follow',
+ ] as const)('%s pushes when the user explicitly asks, without arming a loop', async (mode) => {
+ // The mode selector governs the automation. A button press is the user
+ // acting for themselves, and both non-full modes must honor it.
+ const { git, localHead } = await projectWithUnpushedCommit();
+ const engine = makeEngine({ mode });
+ await engine.refreshRemote();
+ try {
+ await engine.pushOnce();
+
+ expect((await git.revparse(['origin/main'])).trim()).toBe(localHead);
+ expect(engine.getStatus().lastPushedSha).toBe(localHead);
+ // The mode is what arms the scheduled loop, so an unchanged mode is the
+ // observable proof no background push was started.
+ expect(engine.getStatus().syncMode).toBe(mode);
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test('refuses when there is no remote to push to', async () => {
+ const engine = makeEngine({ mode: 'off' });
+ const states: SyncState[] = [];
+ engine.onStateChange = (s) => states.push(s);
+
+ await engine.pushOnce();
+
+ expect(states).not.toContain('pushing');
+ });
+});
+
+describe('SyncEngine lastRunUtc — "Updated N ago"', () => {
+ /** Project tracking a local bare origin, already current with it. */
+ async function currentProject() {
+ const bare = join(tmpDir, 'bare.git');
+ mkdirSync(bare, { recursive: true });
+ await simpleGit(bare).init(true);
+ await simpleGit(bare).raw('symbolic-ref', 'HEAD', 'refs/heads/main');
+
+ const git = simpleGit(projectDir);
+ await git.init(['--initial-branch=main']);
+ await git.raw('config', 'user.name', 'Test');
+ await git.raw('config', 'user.email', '[email protected]');
+ writeFileSync(join(projectDir, 'doc.md'), 'v1\n');
+ await git.add('.');
+ await git.commit('seed');
+ await git.addRemote('origin', bare);
+ await git.push(['--set-upstream', 'origin', 'main']);
+ return git;
+ }
+
+ test('a pull that finds nothing new still counts as a run', async () => {
+ // The exact case that made the panel read "18h ago" right after a working
+ // Pull: nothing changed, so `lastSyncUtc` stays put — but the op DID run.
+ await currentProject();
+ const engine = makeEngine({ mode: 'off' });
+ await engine.refreshRemote();
+ try {
+ const before = engine.getStatus();
+ expect(before.lastRunUtc).toBeNull();
+
+ await engine.pullOnce();
+
+ const after = engine.getStatus();
+ expect(after.lastRunUtc).not.toBeNull();
+ // Content did not move, so the change-time is untouched — the two fields
+ // are answering different questions and must not be conflated.
+ expect(after.lastSyncUtc).toBe(before.lastSyncUtc);
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test('an explicit push counts as a run', async () => {
+ await currentProject();
+ const engine = makeEngine({ mode: 'off' });
+ await engine.refreshRemote();
+ try {
+ await engine.pushOnce();
+ expect(engine.getStatus().lastRunUtc).not.toBeNull();
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test('the panel-open fetch does NOT count as a run', async () => {
+ // It fires whenever the user opens the popover, so counting it would pin
+ // "Updated" to "just now" forever. The fetch still refreshes the counts.
+ await currentProject();
+ const engine = makeEngine({ mode: 'off' });
+ await engine.refreshRemote();
+ try {
+ expect(await engine.fetchOnly()).toBe(true);
+ expect(engine.getStatus().lastRunUtc).toBeNull();
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test('a push cycle that exits without landing does not stamp a run', async () => {
+ // The retry-exhausted non-fast-forward path exits WITHOUT recording an
+ // error (it defers to the next pull cycle), so success must never be
+ // inferred from error-absence — only the explicit landed flag stamps.
+ // Simulated at the seam: a cycle body that neither errors nor lands.
+ await currentProject();
+ const engine = makeEngine({ mode: 'off' });
+ await engine.refreshRemote();
+ try {
+ (engine as unknown as { doPushCycle: () => Promise<void> }).doPushCycle = async () => {
+ // exhausted-retry shape: no error recorded, no landed flag set
+ };
+ await engine.pushOnce();
+ expect(engine.getStatus().lastRunUtc).toBeNull();
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test('a failed op does not stamp a run', async () => {
+ // "Updated just now" sitting above a red error line is a contradiction.
+ const git = simpleGit(projectDir);
+ await git.init(['--initial-branch=main']);
+ await git.raw('config', 'user.name', 'Test');
+ await git.raw('config', 'user.email', '[email protected]');
+ writeFileSync(join(projectDir, 'doc.md'), 'v1\n');
+ await git.add('.');
+ await git.commit('seed');
+ await git.addRemote('origin', join(tmpDir, 'nope.git'));
+
+ const engine = makeEngine({ mode: 'off' });
+ await engine.refreshRemote();
+ try {
+ await engine.fetchOnly();
+ expect(engine.getStatus().lastRunUtc).toBeNull();
+ } finally {
+ await engine.destroy();
+ }
+ });
+});
+
+describe('SyncEngine unified pull — B1 in every mode', () => {
+ /** Project on a local bare origin; sister advances it. Returns handles. */
+ async function projectWithSister() {
+ const bare = join(tmpDir, 'bare.git');
+ mkdirSync(bare, { recursive: true });
+ await simpleGit(bare).init(true);
+ await simpleGit(bare).raw('symbolic-ref', 'HEAD', 'refs/heads/main');
+
+ const git = simpleGit(projectDir);
+ await git.init(['--initial-branch=main']);
+ await git.raw('config', 'user.name', 'Test');
+ await git.raw('config', 'user.email', '[email protected]');
+ writeFileSync(
+ join(projectDir, 'doc.md'),
+ 'TOP\n\n\n\n\n\n\n\n\n\nMIDDLE\n\n\n\n\n\n\n\n\n\nBOTTOM\n',
+ );
+ await git.add('.');
+ await git.commit('seed');
+ await git.addRemote('origin', bare);
+ await git.push(['--set-upstream', 'origin', 'main']);
+
+ const sisterDir = join(tmpDir, 'sister');
+ await simpleGit(tmpDir).clone(bare, sisterDir);
+ const sister = simpleGit(sisterDir);
+ await sister.raw('config', 'user.name', 'Sister');
+ await sister.raw('config', 'user.email', '[email protected]');
+ return { git, sister, sisterDir };
+ }
+
+ /**
+ * Engine whose contentDir IS the project root, so `doc.md` classifies as a
+ * content doc (the harness-level `contentDir` is a sibling directory, which
+ * would classify every fixture file as non-content and silently exercise the
+ * keep-mine-verbatim branch instead of the combine/conflict ones).
+ */
+ function makeRootContentEngine(mode: SyncMode) {
+ return new SyncEngine({
+ projectDir,
+ contentDir: projectDir,
+ contentFilter: stubContentFilter,
+ mode,
+ });
+ }
+
+ test('a full-mode pull never authors a commit from the dirty tree (FR-1)', async () => {
+ const { git, sister, sisterDir } = await projectWithSister();
+ writeFileSync(join(sisterDir, 'other.md'), 'teammate\n');
+ await sister.add('.');
+ await sister.commit('teammate adds other.md');
+ await sister.push();
+
+ // Dirty local doc — the exact input the old path committed as
+ // "Auto-save: interim before merge".
+ writeFileSync(join(projectDir, 'doc.md'), 'TOP-mine\n');
+
+ const engine = makeRootContentEngine('full');
+ await engine.refreshRemote();
+ try {
+ expect(await engine.pullOnce()).toBe('succeeded');
+
+ const log = await git.log();
+ expect(log.all.some((c) => c.message === 'Auto-save: interim before merge')).toBe(false);
+ expect(log.latest?.message).toBe('teammate adds other.md');
+ // The dirty edit survives as overlay; the incoming file landed.
+ expect(readFileSync(join(projectDir, 'doc.md'), 'utf-8')).toBe('TOP-mine\n');
+ expect(readFileSync(join(projectDir, 'other.md'), 'utf-8')).toBe('teammate\n');
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test('full-mode separated edits to one file auto-combine without a conflict (FR-2)', async () => {
+ const { sister, sisterDir } = await projectWithSister();
+ const seeded = readFileSync(join(sisterDir, 'doc.md'), 'utf-8');
+ writeFileSync(join(sisterDir, 'doc.md'), seeded.replace('TOP', 'TOP-THEIRS'));
+ await sister.add('.');
+ await sister.commit('teammate edits top');
+ await sister.push();
+
+ const local = readFileSync(join(projectDir, 'doc.md'), 'utf-8');
+ writeFileSync(join(projectDir, 'doc.md'), local.replace('BOTTOM', 'BOTTOM-MINE'));
+
+ const engine = makeRootContentEngine('full');
+ await engine.refreshRemote();
+ try {
+ expect(await engine.pullOnce()).toBe('succeeded');
+
+ const merged = readFileSync(join(projectDir, 'doc.md'), 'utf-8');
+ expect(merged).toContain('TOP-THEIRS');
+ expect(merged).toContain('BOTTOM-MINE');
+ expect(engine.getStatus().conflictCount).toBe(0);
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test.each([
+ 'off',
+ 'follow',
+ 'full',
+ ] as const)('diverged committed history: Pull refuses, Pull-and-Push merges — mode %s (FR-5)', async (mode) => {
+ // Buttons are verbs, mode-independent. Reconciling diverged COMMITTED
+ // history requires authoring a merge commit: Pull never authors commits,
+ // so it refuses identically everywhere; the Sync verb merges identically
+ // everywhere.
+ const { git, sister, sisterDir } = await projectWithSister();
+ writeFileSync(join(sisterDir, 'theirs.md'), 'theirs\n');
+ await sister.add('.');
+ await sister.commit('teammate commit');
+ await sister.push();
+
+ writeFileSync(join(projectDir, 'mine.md'), 'mine\n');
+ await git.add('.');
+ await git.commit('local commit');
+
+ const engine = makeRootContentEngine(mode);
+ await engine.refreshRemote();
+ try {
+ expect(await engine.pullOnce()).toBe('refused');
+ // Uniform in every mode — including Manual, whose resting-posture
+ // restore deliberately spares this reason: it is the visible answer to
+ // the click the user just made.
+ expect(engine.getStatus().pausedReason).toBe('diverged-local-commits');
+
+ await engine.pullOnce('sync');
+
+ expect(engine.getStatus().pausedReason).toBeUndefined();
+ expect(existsSync(join(projectDir, 'theirs.md'))).toBe(true);
+ expect(existsSync(join(projectDir, 'mine.md'))).toBe(true);
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test.each([
+ 'off',
+ 'follow',
+ 'full',
+ ] as const)('the Sync verb keeps the classic commit+merge machinery — mode %s', async (mode) => {
+ // The Pull-and-Push button's pull leg (and full mode's scheduled loop):
+ // catches dirt, commits it first (the interim commit is in-contract for
+ // syncing), merges. Identical in every mode — the button is a verb.
+ const { git, sister, sisterDir } = await projectWithSister();
+ const seeded = readFileSync(join(sisterDir, 'doc.md'), 'utf-8');
+ writeFileSync(join(sisterDir, 'doc.md'), seeded.replace('TOP', 'TOP-THEIRS'));
+ await sister.add('.');
+ await sister.commit('teammate edits top');
+ await sister.push();
+
+ const local = readFileSync(join(projectDir, 'doc.md'), 'utf-8');
+ writeFileSync(join(projectDir, 'doc.md'), local.replace('BOTTOM', 'BOTTOM-MINE'));
+
+ const engine = makeRootContentEngine(mode);
+ await engine.refreshRemote();
+ try {
+ expect(await engine.pullOnce('sync')).toBe('succeeded');
+
+ const merged = readFileSync(join(projectDir, 'doc.md'), 'utf-8');
+ expect(merged).toContain('TOP-THEIRS');
+ expect(merged).toContain('BOTTOM-MINE');
+ // The interim commit exists here — this is the machinery the explicit
+ // Pull path must never reach (its never-commits pin is the sibling test
+ // above).
+ const log = await git.log();
+ expect(log.all.some((c) => c.message === 'Auto-save: interim before merge')).toBe(true);
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test('follow mode keeps a local artifact edit that origin also changed (the phantom-offline fix)', async () => {
+ // Both halves of the mode-dependent disposition are contracts: full takes
+ // theirs (auto-push would broadcast a kept tweak team-wide); follow keeps
+ // mine (nothing leaves the machine). This fixture is also the exact shape
+ // that used to die in the symlink guard and surface as a fake "offline".
+ const { sister, sisterDir } = await projectWithSister();
+ mkdirSync(join(sisterDir, '.ok'), { recursive: true });
+ writeFileSync(join(sisterDir, '.ok', 'config.yml'), 'shared: remote\n');
+ await sister.add(['.ok/config.yml']);
+ await sister.commit('teammate edits config');
+ await sister.push();
+
+ mkdirSync(join(projectDir, '.ok'), { recursive: true });
+ writeFileSync(join(projectDir, '.ok', 'config.yml'), 'shared: local\n');
+
+ const engine = makeRootContentEngine('follow');
+ try {
+ await engine.start();
+ // start() arms follow's scheduled loop, whose boot pull can be mid-flight
+ // when an explicit trigger lands (the one-shot then declines on the
+ // single-flight guard). Poll for the settled outcome instead of racing.
+ await vi.waitFor(
+ () => {
+ expect(engine.getStatus().behind).toBe(0);
+ },
+ { timeout: 10_000, interval: 100 },
+ );
+
+ const status = engine.getStatus();
+ expect(status.state).not.toBe('offline');
+ expect(status.pullError).toBeUndefined();
+ expect(readFileSync(join(projectDir, '.ok', 'config.yml'), 'utf-8')).toBe('shared: local\n');
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test('pending ledger conflicts gate the push cycle', async () => {
+ // B1 keeps the engine idle while conflicts wait, so the old
+ // state==='conflict' push gate never fires — the ledger gate must hold
+ // instead: unresolved keep-mine bytes are the resolver's call, never the
+ // push loop's.
+ const { sister, sisterDir } = await projectWithSister();
+ const seeded = readFileSync(join(sisterDir, 'doc.md'), 'utf-8');
+ writeFileSync(join(sisterDir, 'doc.md'), seeded.replace('MIDDLE', 'MIDDLE-THEIRS'));
+ await sister.add('.');
+ await sister.commit('teammate edits middle');
+ await sister.push();
+
+ const local = readFileSync(join(projectDir, 'doc.md'), 'utf-8');
+ writeFileSync(join(projectDir, 'doc.md'), local.replace('MIDDLE', 'MIDDLE-MINE'));
+
+ const engine = makeRootContentEngine('full');
+ await engine.refreshRemote();
+ try {
+ await engine.pullOnce();
+ expect(engine.getStatus().conflictCount).toBe(1);
+
+ const states: SyncState[] = [];
+ engine.onStateChange = (st) => states.push(st);
+ await engine.pushOnce();
+ expect(states).not.toContain('pushing');
+ } finally {
+ await engine.destroy();
+ }
+ });
+});
+
+describe('SyncEngine fetchOnly() — the read-only op', () => {
+ test('refreshes tracking refs and counts without touching the working tree', async () => {
+ const bareDir = join(tmpDir, 'bare.git');
+ mkdirSync(bareDir, { recursive: true });
+ await simpleGit(bareDir).init(true);
+ await simpleGit(bareDir).raw('symbolic-ref', 'HEAD', 'refs/heads/main');
+
+ const git = simpleGit(projectDir);
+ await git.init(['--initial-branch=main']);
+ await git.raw('config', 'user.name', 'Test');
+ await git.raw('config', 'user.email', '[email protected]');
+ writeFileSync(join(projectDir, 'doc.md'), 'v1\n');
+ await git.add('.');
+ await git.commit('seed');
+ await git.addRemote('origin', bareDir);
+ await git.push(['--set-upstream', 'origin', 'main']);
+ const localHead = (await git.revparse(['HEAD'])).trim();
+
+ // A sister advances origin, leaving this project one commit behind.
+ const sisterDir = join(tmpDir, 'sister');
+ mkdirSync(sisterDir, { recursive: true });
+ const sister = simpleGit(sisterDir);
+ await sister.clone(bareDir, sisterDir);
+ await sister.raw('config', 'user.name', 'Sister');
+ await sister.raw('config', 'user.email', '[email protected]');
+ writeFileSync(join(sisterDir, 'doc.md'), 'v1\nv2\n');
+ await sister.add('.');
+ await sister.commit('sister edit');
+ await sister.push();
+
+ const engine = makeEngine({ mode: 'off' });
+ await engine.refreshRemote();
+ try {
+ expect(await engine.fetchOnly()).toBe(true);
+
+ // The counts caught up...
+ expect(engine.getStatus().behind).toBe(1);
+ // ...and nothing moved: HEAD, the working tree, and the index are as they
+ // were. This is what makes it safe on a passive panel open.
+ expect((await git.revparse(['HEAD'])).trim()).toBe(localHead);
+ expect(readFileSync(join(projectDir, 'doc.md'), 'utf-8')).toBe('v1\n');
+ expect(existsSync(join(projectDir, '.git', 'MERGE_HEAD'))).toBe(false);
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test('a failed fetch stays quiet — no error surfaced, no pause', async () => {
+ // An unreachable origin is the offline case. The user opened a panel; they
+ // did not ask to sync, so this must not become a red error state.
+ const git = simpleGit(projectDir);
+ await git.init(['--initial-branch=main']);
+ await git.raw('config', 'user.name', 'Test');
+ await git.raw('config', 'user.email', '[email protected]');
+ writeFileSync(join(projectDir, 'doc.md'), 'v1\n');
+ await git.add('.');
+ await git.commit('seed');
+ await git.addRemote('origin', join(tmpDir, 'does-not-exist.git'));
+
+ const engine = makeEngine({ mode: 'off' });
+ await engine.refreshRemote();
+ try {
+ expect(await engine.fetchOnly()).toBe(false);
+
+ const status = engine.getStatus();
+ expect(status.pullError).toBeUndefined();
+ expect(status.pullErrorCode).toBeUndefined();
+ expect(status.pausedReason).toBeUndefined();
+ expect(status.state).not.toBe('auth-error');
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test('declines without a remote rather than shelling out', async () => {
+ const engine = makeEngine({ mode: 'off' });
+ expect(await engine.fetchOnly()).toBe(false);
+ });
+});
+
// ─── No-remote detection ──────────────────────────────────────────────────────
describe('SyncEngine no-remote detection', () => {
@@ -1524,83 +2059,536 @@ describe('SyncEngine pull-only cadence (auth-conditional)', () => {
const AUTHENTICATED_BAND = { min: 30 * 0.85 * 1000, max: 30 * 1.15 * 1000 };
const ANONYMOUS_BAND = { min: 180 * 0.85 * 1000, max: 180 * 1.15 * 1000 };
- type CadenceInternals = {
- refreshAuthTier(): Promise<void>;
+ type CadenceInternals = {
+ refreshAuthTier(): Promise<void>;
+ effectivePullDelayMs(): number;
+ };
+
+ function makeCadenceEngine(opts: {
+ mode: SyncMode;
+ detectGh?: DetectGhFn;
+ tokenStore?: ProbeTokenStore | null;
+ }) {
+ return new SyncEngine({
+ projectDir,
+ contentDir,
+ contentFilter: stubContentFilter,
+ mode: opts.mode,
+ pullIntervalSeconds: 30,
+ pushIntervalSeconds: 99999,
+ detectGh: opts.detectGh,
+ tokenStore: opts.tokenStore,
+ });
+ }
+
+ /** Resolve the auth tier, then read the delay the engine would schedule. */
+ async function scheduledPullDelayMs(engine: SyncEngine): Promise<number> {
+ const internals = engine as unknown as CadenceInternals;
+ await internals.refreshAuthTier();
+ return internals.effectivePullDelayMs();
+ }
+
+ test('an anonymous follower schedules pulls at the gentle cadence', async () => {
+ const engine = makeCadenceEngine({ mode: 'follow' }); // no gh, no token store
+ const delayMs = await scheduledPullDelayMs(engine);
+ expect(delayMs).toBeGreaterThanOrEqual(ANONYMOUS_BAND.min);
+ expect(delayMs).toBeLessThanOrEqual(ANONYMOUS_BAND.max);
+ });
+
+ test('a gh-authenticated follower keeps the responsive cadence', async () => {
+ const engine = makeCadenceEngine({
+ mode: 'follow',
+ detectGh: () => ({ available: true, token: 'gh-token' }),
+ });
+ const delayMs = await scheduledPullDelayMs(engine);
+ expect(delayMs).toBeGreaterThanOrEqual(AUTHENTICATED_BAND.min);
+ expect(delayMs).toBeLessThanOrEqual(AUTHENTICATED_BAND.max);
+ });
+
+ test('a follower authenticated only through the token store keeps the responsive cadence', async () => {
+ const engine = makeCadenceEngine({
+ mode: 'follow',
+ tokenStore: { get: async () => ({ token: 'store-token' }) },
+ });
+ const delayMs = await scheduledPullDelayMs(engine);
+ expect(delayMs).toBeGreaterThanOrEqual(AUTHENTICATED_BAND.min);
+ expect(delayMs).toBeLessThanOrEqual(AUTHENTICATED_BAND.max);
+ });
+
+ test('a token-store read failure degrades to the gentle cadence', async () => {
+ const engine = makeCadenceEngine({
+ mode: 'follow',
+ tokenStore: {
+ get: async () => {
+ throw new Error('EACCES');
+ },
+ },
+ });
+ const delayMs = await scheduledPullDelayMs(engine);
+ expect(delayMs).toBeGreaterThanOrEqual(ANONYMOUS_BAND.min);
+ expect(delayMs).toBeLessThanOrEqual(ANONYMOUS_BAND.max);
+ });
+
+ test('full-sync cadence is untouched even with no credentials', async () => {
+ // A credential-less full-sync engine must still schedule at the base
+ // interval: the anonymous floor applies only to pull-only followers.
+ const engine = makeCadenceEngine({ mode: 'full' });
+ const delayMs = await scheduledPullDelayMs(engine);
+ expect(delayMs).toBeGreaterThanOrEqual(AUTHENTICATED_BAND.min);
+ expect(delayMs).toBeLessThanOrEqual(AUTHENTICATED_BAND.max);
+ });
+});
+
+describe('SyncEngine lastRunUtc survives a restart', () => {
+ test('a restored engine reports the run stamp its legs restored', async () => {
+ // Regression: `lastRunUtc` was a third stored field that saveStateNow never
+ // persisted, so after a restart the two per-direction legs came back while
+ // the combined stamp read null. Deriving it makes that unrepresentable.
+ const engine = new SyncEngine({
+ projectDir,
+ contentDir,
+ contentFilter: stubContentFilter,
+ mode: 'full',
+ pullIntervalSeconds: 30,
+ pushIntervalSeconds: 60,
+ });
+ const internals = engine as unknown as {
+ lastPullOkUtc: string | null;
+ lastPushOkUtc: string | null;
+ saveStateNow(): void;
+ };
+ try {
+ internals.lastPullOkUtc = '2026-08-24T10:00:00.000Z';
+ internals.lastPushOkUtc = '2026-08-24T09:00:00.000Z';
+ // Later of the two legs, not whichever was written last.
+ expect(engine.getStatus().lastRunUtc).toBe('2026-08-24T10:00:00.000Z');
+ internals.saveStateNow();
+ } finally {
+ await engine.destroy();
+ }
+
+ const restored = new SyncEngine({
+ projectDir,
+ contentDir,
+ contentFilter: stubContentFilter,
+ mode: 'full',
+ });
+ try {
+ // loadState runs inside start(), which is what a real restart does.
+ await restored.start();
+ const status = restored.getStatus();
+ expect(status.lastPullOkUtc).toBe('2026-08-24T10:00:00.000Z');
+ expect(status.lastRunUtc).toBe('2026-08-24T10:00:00.000Z');
+ } finally {
+ await restored.destroy();
+ }
+ });
+});
+
+describe('SyncEngine unborn-HEAD guard', () => {
+ // A repo created but never committed to has a HEAD pointing at a branch ref
+ // that does not exist. Both one-shot paths refuse there: `git merge` and
+ // `git push` against an unborn branch fail with messages that would surface
+ // as generic sync errors and park the badge, when the honest answer is
+ // simply that there is nothing to sync yet.
+ async function initRepoWithOrigin(withCommit: boolean) {
+ const git = simpleGit(projectDir);
+ await git.init(['--initial-branch=main']);
+ await git.raw('config', 'user.name', 'Test');
+ await git.raw('config', 'user.email', '[email protected]');
+ // A LOCAL bare remote, not a github.com URL: once the guard lets a
+ // committed repo through, the cycle runs `git fetch origin` for real. A
+ // real URL would reach the network from a suite that is otherwise fully
+ // hermetic — passing on a runner with internet, hanging or failing wherever
+ // egress is restricted.
+ const bareDir = join(tmpDir, 'unborn-bare.git');
+ mkdirSync(bareDir, { recursive: true });
+ await simpleGit(bareDir).init(true);
+ await simpleGit(bareDir).raw('symbolic-ref', 'HEAD', 'refs/heads/main');
+ await git.addRemote('origin', bareDir);
+ if (withCommit) {
+ writeFileSync(join(projectDir, 'README.md'), 'seed\n', 'utf-8');
+ await git.add('.');
+ await git.commit('seed');
+ }
+ }
+
+ function makeEngine() {
+ const engine = new SyncEngine({
+ projectDir,
+ contentDir,
+ contentFilter: stubContentFilter,
+ mode: 'off',
+ });
+ // `hasRemote` is only computed inside `start()`, which would reach the
+ // network. Setting it directly is what isolates the unborn check — left at
+ // its `false` default, BOTH cases below would refuse on the sibling
+ // `!hasRemote` guard and the pair would prove nothing.
+ (engine as unknown as { hasRemote: boolean }).hasRemote = true;
+ return engine;
+ }
+
+ test('pullOnce refuses on an unborn HEAD even with a remote configured', async () => {
+ await initRepoWithOrigin(false);
+ const engine = makeEngine();
+ try {
+ expect(await engine.pullOnce()).toBe('refused');
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test('a repo with one commit is no longer unborn and gets past the guard', async () => {
+ // Control: without it the refusal above could come from any sibling guard.
+ await initRepoWithOrigin(true);
+ const engine = makeEngine();
+ try {
+ // The bare remote is empty, so the cycle finds nothing to pull — the
+ // point is only that it RAN instead of being refused by the guard.
+ expect(await engine.pullOnce()).not.toBe('refused');
+ } finally {
+ await engine.destroy();
+ }
+ });
+});
+
+describe('SyncEngine one-shot push guards', () => {
+ // These guards are what stop an EXPLICIT push (new in this changeset for
+ // `off`/`follow`) from racing a background cycle, pushing over an unresolved
+ // B1 conflict, or pushing while parked on an auth error. They are written
+ // independently of `runPushCycle`'s, so the full-mode tests do not cover them.
+ type PushInternals = {
+ pushInFlight: boolean;
+ pullInFlight: boolean;
+ conflictCount: number;
+ state: string;
+ hasRemote: boolean;
+ doPushCycle(retriesLeft?: number): Promise<void>;
+ runOneShotPush(): Promise<void>;
+ };
+
+ function makeOneShotEngine(mode: SyncMode = 'follow') {
+ const engine = new SyncEngine({
+ projectDir,
+ contentDir,
+ contentFilter: stubContentFilter,
+ mode,
+ });
+ const internals = engine as unknown as PushInternals;
+ // Past the remote/unborn guard so each test isolates the guard it names.
+ internals.hasRemote = true;
+ internals.state = 'idle';
+ const cycles: number[] = [];
+ internals.doPushCycle = async (retriesLeft = 0) => {
+ cycles.push(retriesLeft);
+ };
+ return { engine, internals, cycles };
+ }
+
+ test('refuses while a pull is in flight rather than racing it', async () => {
+ const { engine, internals, cycles } = makeOneShotEngine();
+ try {
+ internals.pullInFlight = true;
+ await engine.pushOnce();
+ expect(cycles).toEqual([]);
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test('refuses while conflicts hold the tree', async () => {
+ // The resolver owns keep-mine bytes until the user resolves; pushing here
+ // would send them over a teammate's version.
+ const { engine, internals, cycles } = makeOneShotEngine();
+ try {
+ internals.conflictCount = 1;
+ await engine.pushOnce();
+ expect(cycles).toEqual([]);
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test('refuses while parked on an auth error', async () => {
+ const { engine, internals, cycles } = makeOneShotEngine();
+ try {
+ internals.state = 'auth-error';
+ await engine.pushOnce();
+ expect(cycles).toEqual([]);
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test('pushes when nothing blocks it — the control', async () => {
+ // Without this the three assertions above pass on a method that never runs.
+ const { engine, cycles } = makeOneShotEngine();
+ try {
+ await engine.pushOnce();
+ expect(cycles).toHaveLength(1);
+ } finally {
+ await engine.destroy();
+ }
+ });
+});
+
+describe('SyncEngine push chain survives a B1 conflict', () => {
+ type ChainInternals = {
+ schedulePush(overrideDelayMs?: number): void;
+ pushTimer: ReturnType<typeof setTimeout> | null;
+ conflictCount: number;
+ runPushCycle(): Promise<void>;
+ };
+
+ test('a push tick with ledger conflicts re-arms the chain instead of ending it', async () => {
+ // Regression: the `conflictCount > 0` guard returned before the try/finally
+ // that owns the only schedulePush() chain call, and the fired timer was
+ // already cleared — so one B1 conflict killed auto-push for the process
+ // lifetime. Every visible signal stayed green (mode `full`, state `idle`,
+ // no error) while commits accumulated locally and never reached the remote.
+ const engine = new SyncEngine({
+ projectDir,
+ contentDir,
+ contentFilter: stubContentFilter,
+ mode: 'full',
+ pullIntervalSeconds: 30,
+ pushIntervalSeconds: 60,
+ detectGh: () => ({ available: true, token: 'gh-token' }),
+ });
+ const internals = engine as unknown as ChainInternals;
+ const rearms: Array<number | undefined> = [];
+ internals.schedulePush = (d?: number) => {
+ rearms.push(d);
+ };
+ // B1's shape: conflicts recorded in the ledger while the engine sits idle.
+ // A fresh engine starts `dormant`, which returns at an earlier guard.
+ (internals as unknown as { state: string }).state = 'idle';
+ internals.conflictCount = 1;
+
+ await internals.runPushCycle();
+
+ expect(rearms).toHaveLength(1);
+ });
+
+ test('an emptied ledger restarts both legs even though B1 left the state idle', async () => {
+ // The resolver's re-arm used to require `state === 'conflict'`, which B1
+ // never sets — so resolving the conflict did not revive the loop either.
+ const engine = new SyncEngine({
+ projectDir,
+ contentDir,
+ contentFilter: stubContentFilter,
+ mode: 'full',
+ pullIntervalSeconds: 30,
+ pushIntervalSeconds: 60,
+ });
+ const internals = engine as unknown as ChainInternals & {
+ state: string;
+ conflictStore: {
+ list(): Array<{ file: string; variant: string }>;
+ removeConflict(file: string): void;
+ count(): number;
+ };
+ schedulePull(overrideDelayMs?: number): void;
+ reconcileConflictsFromGit(): Promise<void>;
+ };
+ const pushRearms: Array<number | undefined> = [];
+ const pullRearms: Array<number | undefined> = [];
+ internals.schedulePush = (d?: number) => {
+ pushRearms.push(d);
+ };
+ internals.schedulePull = (d?: number) => {
+ pullRearms.push(d);
+ };
+ internals.state = 'idle';
+ internals.conflictCount = 2;
+ // One merge-native entry, and the fixture has no MERGE_HEAD — so the
+ // no-merge-in-progress branch clears it without needing a git probe.
+ internals.conflictStore = {
+ list: () => [{ file: 'a.md', variant: 'merge' }],
+ removeConflict: () => {},
+ count: () => 0,
+ };
+
+ await internals.reconcileConflictsFromGit();
+
+ expect(pushRearms).toHaveLength(1);
+ expect(pullRearms).toHaveLength(1);
+ });
+});
+
+describe('SyncEngine enable schedules both legs immediately', () => {
+ type EnableInternals = {
+ schedulePull(overrideDelayMs?: number): void;
+ schedulePush(overrideDelayMs?: number): void;
+ probeRemote(): Promise<boolean>;
+ probePushPermissionInternal(reason: string): Promise<void>;
+ };
+
+ test('enabling full sync schedules the push at 0, not a full interval out', async () => {
+ // Regression: the pull was scheduled at 0 while the push waited a FULL
+ // interval, so enabling Auto pulled at once, stamped the freshness line, and
+ // left pending edits local for the whole interval. Harmless at the old
+ // hardcoded 60 s; up to an hour once the cadence became configurable.
+ const engine = new SyncEngine({
+ projectDir,
+ contentDir,
+ contentFilter: stubContentFilter,
+ mode: 'off',
+ pullIntervalSeconds: 30,
+ pushIntervalSeconds: 3600,
+ detectGh: () => ({ available: true, token: 'gh-token' }),
+ });
+ const internals = engine as unknown as EnableInternals;
+ // Force the enable path past its remote probe; the fixture repo has none, and
+ // a dormant demote would skip scheduling entirely and pass vacuously.
+ internals.probeRemote = async () => true;
+ internals.probePushPermissionInternal = async () => {};
+ const pullDelays: Array<number | undefined> = [];
+ const pushDelays: Array<number | undefined> = [];
+ internals.schedulePull = (d?: number) => {
+ pullDelays.push(d);
+ };
+ internals.schedulePush = (d?: number) => {
+ pushDelays.push(d);
+ };
+
+ await engine.setMode('full');
+
+ expect(pullDelays).toEqual([0]);
+ expect(pushDelays).toEqual([0]);
+ });
+});
+
+describe('SyncEngine setIntervals()', () => {
+ type IntervalInternals = {
effectivePullDelayMs(): number;
+ pullIntervalSeconds: number;
+ pushIntervalSeconds: number;
+ pullTimer: ReturnType<typeof setTimeout> | null;
+ pushTimer: ReturnType<typeof setTimeout> | null;
+ schedulePull(overrideDelayMs?: number): void;
};
- function makeCadenceEngine(opts: {
- mode: SyncMode;
- detectGh?: DetectGhFn;
- tokenStore?: ProbeTokenStore | null;
- }) {
+ /** ±15% jitter, so assert on the band around a base interval. */
+ function band(seconds: number) {
+ return { min: seconds * 0.85 * 1000, max: seconds * 1.15 * 1000 };
+ }
+
+ function makeIntervalEngine(mode: SyncMode) {
return new SyncEngine({
projectDir,
contentDir,
contentFilter: stubContentFilter,
- mode: opts.mode,
+ mode,
pullIntervalSeconds: 30,
- pushIntervalSeconds: 99999,
- detectGh: opts.detectGh,
- tokenStore: opts.tokenStore,
+ pushIntervalSeconds: 60,
+ detectGh: () => ({ available: true, token: 'gh-token' }),
});
}
- /** Resolve the auth tier, then read the delay the engine would schedule. */
- async function scheduledPullDelayMs(engine: SyncEngine): Promise<number> {
- const internals = engine as unknown as CadenceInternals;
- await internals.refreshAuthTier();
- return internals.effectivePullDelayMs();
- }
+ test('a new pull interval changes the delay the engine would schedule', async () => {
+ const engine = makeIntervalEngine('follow');
+ const internals = engine as unknown as IntervalInternals;
+ engine.setIntervals(900, 60);
+ const delayMs = internals.effectivePullDelayMs();
+ expect(delayMs).toBeGreaterThanOrEqual(band(900).min);
+ expect(delayMs).toBeLessThanOrEqual(band(900).max);
+ });
+
+ test('pull and push move independently', () => {
+ const engine = makeIntervalEngine('full');
+ const internals = engine as unknown as IntervalInternals;
+ engine.setIntervals(30, 3600);
+ expect(internals.pullIntervalSeconds).toBe(30);
+ expect(internals.pushIntervalSeconds).toBe(3600);
+ });
+
+ test('a same-value call does not re-arm the timers', () => {
+ // The config re-apply path fires twice for one change (producer notify +
+ // watcher echo). A non-idempotent setter would cancel and restart the
+ // timers on the echo, indefinitely deferring the cycle under a stream of
+ // unrelated config writes. Armed directly rather than via start(), which
+ // parks a remote-less fixture in `dormant` with nothing scheduled.
+ const engine = makeIntervalEngine('follow');
+ const internals = engine as unknown as IntervalInternals;
+ internals.schedulePull();
+ try {
+ const pullTimerBefore = internals.pullTimer;
+ expect(pullTimerBefore).not.toBeNull();
+ engine.setIntervals(30, 60);
+ expect(internals.pullTimer).toBe(pullTimerBefore);
+ } finally {
+ engine.stop();
+ }
+ });
- test('an anonymous follower schedules pulls at the gentle cadence', async () => {
- const engine = makeCadenceEngine({ mode: 'follow' }); // no gh, no token store
- const delayMs = await scheduledPullDelayMs(engine);
- expect(delayMs).toBeGreaterThanOrEqual(ANONYMOUS_BAND.min);
- expect(delayMs).toBeLessThanOrEqual(ANONYMOUS_BAND.max);
+ test('a changed interval re-arms an armed timer rather than waiting it out', () => {
+ // A user moving 1 hour → 30 s expects the next pull in 30 s, not up to an
+ // hour later.
+ const engine = makeIntervalEngine('follow');
+ const internals = engine as unknown as IntervalInternals;
+ internals.schedulePull();
+ try {
+ const pullTimerBefore = internals.pullTimer;
+ engine.setIntervals(3600, 60);
+ expect(internals.pullTimer).not.toBe(pullTimerBefore);
+ expect(internals.pullTimer).not.toBeNull();
+ } finally {
+ engine.stop();
+ }
});
- test('a gh-authenticated follower keeps the responsive cadence', async () => {
- const engine = makeCadenceEngine({
- mode: 'follow',
- detectGh: () => ({ available: true, token: 'gh-token' }),
- });
- const delayMs = await scheduledPullDelayMs(engine);
- expect(delayMs).toBeGreaterThanOrEqual(AUTHENTICATED_BAND.min);
- expect(delayMs).toBeLessThanOrEqual(AUTHENTICATED_BAND.max);
+ test('an unarmed timer stays unarmed — a cadence change must not start a loop', () => {
+ // `off` never schedules. If the setter armed unconditionally it would start
+ // a pull loop for a project the user put in Manual, from nothing more than
+ // a config write.
+ const engine = makeIntervalEngine('off');
+ const internals = engine as unknown as IntervalInternals;
+ expect(internals.pullTimer).toBeNull();
+ engine.setIntervals(300, 300);
+ expect(internals.pullTimer).toBeNull();
+ expect(internals.pushTimer).toBeNull();
});
- test('a follower authenticated only through the token store keeps the responsive cadence', async () => {
- const engine = makeCadenceEngine({
+ test('the anonymous floor still outranks a shorter configured pull interval', async () => {
+ // The floor protects the remote from aggregate anonymous read pressure, so
+ // a per-machine preference must not be able to undercut it.
+ const engine = new SyncEngine({
+ projectDir,
+ contentDir,
+ contentFilter: stubContentFilter,
mode: 'follow',
- tokenStore: { get: async () => ({ token: 'store-token' }) },
- });
- const delayMs = await scheduledPullDelayMs(engine);
- expect(delayMs).toBeGreaterThanOrEqual(AUTHENTICATED_BAND.min);
- expect(delayMs).toBeLessThanOrEqual(AUTHENTICATED_BAND.max);
+ pullIntervalSeconds: 30,
+ pushIntervalSeconds: 60,
+ }); // no gh, no token store → anonymous
+ const internals = engine as unknown as IntervalInternals & {
+ refreshAuthTier(): Promise<void>;
+ };
+ engine.setIntervals(30, 60);
+ await internals.refreshAuthTier();
+ const delayMs = internals.effectivePullDelayMs();
+ expect(delayMs).toBeGreaterThanOrEqual(band(180).min);
+ expect(delayMs).toBeLessThanOrEqual(band(180).max);
});
- test('a token-store read failure degrades to the gentle cadence', async () => {
- const engine = makeCadenceEngine({
+ test('a longer configured interval is honored for an anonymous follower', async () => {
+ // The floor is a minimum, not a fixed cadence — choosing gentler must work.
+ const engine = new SyncEngine({
+ projectDir,
+ contentDir,
+ contentFilter: stubContentFilter,
mode: 'follow',
- tokenStore: {
- get: async () => {
- throw new Error('EACCES');
- },
- },
+ pullIntervalSeconds: 30,
+ pushIntervalSeconds: 60,
});
- const delayMs = await scheduledPullDelayMs(engine);
- expect(delayMs).toBeGreaterThanOrEqual(ANONYMOUS_BAND.min);
- expect(delayMs).toBeLessThanOrEqual(ANONYMOUS_BAND.max);
- });
-
- test('full-sync cadence is untouched even with no credentials', async () => {
- // A credential-less full-sync engine must still schedule at the base
- // interval: the anonymous floor applies only to pull-only followers.
- const engine = makeCadenceEngine({ mode: 'full' });
- const delayMs = await scheduledPullDelayMs(engine);
- expect(delayMs).toBeGreaterThanOrEqual(AUTHENTICATED_BAND.min);
- expect(delayMs).toBeLessThanOrEqual(AUTHENTICATED_BAND.max);
+ const internals = engine as unknown as IntervalInternals & {
+ refreshAuthTier(): Promise<void>;
+ };
+ engine.setIntervals(3600, 60);
+ await internals.refreshAuthTier();
+ const delayMs = internals.effectivePullDelayMs();
+ expect(delayMs).toBeGreaterThanOrEqual(band(3600).min);
+ expect(delayMs).toBeLessThanOrEqual(band(3600).max);
});
});
@@ -2288,6 +3276,67 @@ describe('SyncEngine push cycle stages shareable .ok artifacts (sync scope)', ()
}
});
+ test.runIf(process.getuid?.() !== 0)(
+ 'a one-shot push reports a staging failure instead of rejecting',
+ async () => {
+ // Covers the NEW surface — `pushOnce()` in a mode that never pushes on a
+ // schedule — against a diverged remote. `pushOnce` resolves rather than
+ // rejecting, which matters because every caller in `api-extension.ts`
+ // invokes it as `void engine.trigger(...)`, where a rejection is an
+ // unhandled one.
+ //
+ // SCOPE: the staging error here is raised by doPushCycle's own
+ // `gatherContentFilesSync()` and handled by its OUTER catch. The inner
+ // catch's `ShareableOkEnumerationError` branch (the one the crash fix
+ // touched) is NOT reached by this test, nor by the sibling below —
+ // verified by instrumenting that branch and observing zero hits from
+ // either. Reaching it needs the RETRY's `commitDirtyContentFilesToHead`
+ // to enumerate and fail, and the outer push has already committed the
+ // tree by then. That branch is currently uncovered; do not read this
+ // test as guarding it.
+ const { bareDir } = await initSharedRepoWithBareRemote();
+
+ mkdirSync(join(projectDir, '.ok', 'schemas'), { recursive: true });
+ writeFileSync(join(projectDir, '.ok', 'schemas', 'frontmatter.json'), '{}\n');
+
+ const engine = makeShareableEngine('off');
+ const internal = engine as unknown as {
+ commitDirtyContentFilesToHead: (handle: unknown) => Promise<void>;
+ };
+ const commitDirty = internal.commitDirtyContentFilesToHead.bind(engine);
+ internal.commitDirtyContentFilesToHead = async (handle) => {
+ chmodSync(join(projectDir, '.ok', 'schemas'), 0o311);
+ await commitDirty(handle);
+ };
+
+ try {
+ // Start FIRST: attach reconciles against origin, so a teammate who
+ // pushed before this point would already be merged in and the push
+ // would fast-forward cleanly.
+ await engine.start();
+
+ const { sister, sisterDir } = await cloneAsTeammate(bareDir);
+ writeFileSync(join(sisterDir, 'remote.md'), '# Remote\n');
+ await sister.add(['remote.md']);
+ await sister.commit('advance remote');
+ await sister.push(['origin', 'main']);
+ writeFileSync(join(projectDir, 'local.md'), '# Local\n');
+
+ await expect(engine.pushOnce()).resolves.toBeUndefined();
+
+ const status = engine.getStatus();
+ // A staging failure is the push leg failing to assemble what it would
+ // send, so it belongs on `pushError`. Landing it on `pullError` would
+ // put it on the wrong half of the popover and leave Push looking fine.
+ expect(status.pushError).toContain('Shareable .ok subtree ".ok/schemas"');
+ expect(status.pullError).toBeUndefined();
+ } finally {
+ chmodSync(join(projectDir, '.ok', 'schemas'), 0o755);
+ await engine.destroy();
+ }
+ },
+ );
+
test.runIf(process.getuid?.() !== 0)(
'reports retry staging failures as push errors',
async () => {
@@ -2441,9 +3490,10 @@ describe('SyncEngine push cycle stages shareable .ok artifacts (sync scope)', ()
}
});
- test('pull with locally edited shareable artifacts commits them before merging', async () => {
- // Exercises the second staging path: the pre-merge dirty-content commit,
- // not the push cycle, is what stages the artifact here.
+ test('pull keeps local shareable-artifact edits as overlay without committing them', async () => {
+ // The dirty artifact does not overlap the incoming change, so it rides
+ // through the B1 overlay untouched — and a pull must not author a commit
+ // from it on the user's behalf.
const { git, bareDir } = await initSharedRepoWithBareRemote();
const { sister, sisterDir } = await cloneAsTeammate(bareDir);
writeFileSync(join(sisterDir, 'from-teammate.md'), '# Teammate\n');
@@ -2464,16 +3514,20 @@ describe('SyncEngine push cycle stages shareable .ok artifacts (sync scope)', ()
expect(status.state).toBe('idle');
expect(existsSync(join(projectDir, 'from-teammate.md'))).toBe(true);
- const headPaths = await listNames(git, ['ls-tree', '-r', '--name-only', 'HEAD']);
- expect(headPaths).toContain('.ok/config.yml');
- const blob = await git.raw(['show', 'HEAD:.ok/config.yml']);
- expect(blob).toBe('sync:\n mode: full\n');
+ // The local edit survives on disk as overlay; nothing committed it.
+ expect(readFileSync(join(projectDir, '.ok', 'config.yml'), 'utf-8')).toBe(
+ 'sync:\n mode: full\n',
+ );
+ const lastMessage = (await git.log({ maxCount: 1 })).latest?.message;
+ expect(lastMessage).toBe('teammate note');
+ const log = await git.log();
+ expect(log.all.some((c) => c.message === 'Auto-save: interim before merge')).toBe(false);
} finally {
await engine.destroy();
}
});
- test('auto-resolves non-document artifacts but preserves template content conflicts', async () => {
+ test('keeps local artifact edits and pins template conflicts without merging', async () => {
const { git, bareDir } = await initSharedRepoWithBareRemote();
mkdirSync(join(projectDir, '.ok', 'schemas'), { recursive: true });
mkdirSync(join(projectDir, '.ok', 'templates'), { recursive: true });
@@ -2516,48 +3570,44 @@ describe('SyncEngine push cycle stages shareable .ok artifacts (sync scope)', ()
await engine.start();
await engine.trigger('pull');
- // Non-document artifacts take theirs, while templates keep the ordinary
- // content-conflict lifecycle because users can resolve them in the editor.
+ // The Pull VERB's disposition, identical in every mode: keep mine.
+ // Nothing is committed, nothing is silently overwritten — the teammate's
+ // versions stay in history, and the Sync verb (whose classic path
+ // resolves non-document artifacts to theirs, warn-logged) is pinned by
+ // the .mcp.json merge-machinery tests. Templates keep the resolvable
+ // lifecycle as ledger entries rather than a MERGE_HEAD, so the repo
+ // keeps flowing while they wait (the push gate holds until resolved).
const status = engine.getStatus();
- expect(status.state).toBe('conflict');
+ expect(status.state).toBe('idle');
expect(status.pausedReason).toBeUndefined();
expect(status.conflictCount).toBe(2);
- expect(
- engine
- .getConflicts()
- .map((conflict) => conflict.file)
- .sort(),
- ).toEqual(['.ok/templates/project.md', 'docs/.ok/templates/folder.md']);
- expect(existsSync(join(projectDir, '.git', 'MERGE_HEAD'))).toBe(true);
- expect(readFileSync(join(projectDir, '.ok', 'config.yml'), 'utf-8')).toBe('shared: remote\n');
- expect(readFileSync(join(projectDir, '.ok', 'schemas', 'lint.json'), 'utf-8')).toBe(
- '{"a":99}\n',
- );
-
- const unmerged = await git.raw(['diff', '--name-only', '--diff-filter=U']);
- expect(unmerged.trim().split('\n').sort()).toEqual([
+ const conflicts = engine.getConflicts();
+ expect(conflicts.map((conflict) => conflict.file).sort()).toEqual([
'.ok/templates/project.md',
'docs/.ok/templates/folder.md',
]);
+ // Ledger conflicts pin theirs for the resolver; no merge is in progress.
+ expect(conflicts.every((c) => c.theirsSha)).toBe(true);
+ expect(existsSync(join(projectDir, '.git', 'MERGE_HEAD'))).toBe(false);
- const configResolves = cap.entries.filter(
- (e) => e.msg.includes('auto-resolved') && e.data.file === '.ok/config.yml',
+ // Keep-mine on every dirty artifact — the Pull verb never destroys work.
+ expect(readFileSync(join(projectDir, '.ok', 'config.yml'), 'utf-8')).toBe('shared: local\n');
+ expect(readFileSync(join(projectDir, '.ok', 'schemas', 'lint.json'), 'utf-8')).toBe(
+ '{"a":2}\n',
);
- expect(configResolves).toHaveLength(1);
- expect(configResolves[0]?.level).toBe('warn');
- expect(configResolves[0]?.msg).toContain('local project config edits were overwritten');
-
- const schemaResolves = cap.entries.filter(
- (e) => e.msg.includes('auto-resolved') && e.data.file === '.ok/schemas/lint.json',
+ expect(readFileSync(join(projectDir, '.ok', 'templates', 'project.md'), 'utf-8')).toBe(
+ '# Local project\n',
);
- expect(schemaResolves).toHaveLength(1);
- expect(schemaResolves[0]?.level).toBe('info');
- expect(schemaResolves[0]?.msg).toBe('[sync] auto-resolved non-content conflict with theirs');
- const templateResolves = cap.entries.filter(
- (e) => e.msg.includes('auto-resolved') && String(e.data.file).includes('/templates/'),
+ // The repo itself fast-forwarded — conflicts never stall the tip.
+ expect((await git.log({ maxCount: 1 })).latest?.message).toBe(
+ 'teammate edits config and schema',
);
- expect(templateResolves).toEqual([]);
+ // Nothing overwritten, so no overwrite breadcrumb fires on this verb.
+ const overwriteWarnings = cap.entries.filter((e) =>
+ e.msg.includes('local project config edits were overwritten'),
+ );
+ expect(overwriteWarnings).toEqual([]);
} finally {
cap.restore();
await engine.destroy();
@@ -4298,7 +5348,7 @@ describe('SyncEngine pull-only mode', () => {
}
});
- test('never pushes local commits (push cycle is gated off)', async () => {
+ test('never pushes local commits on its own, but honors an explicit push', async () => {
const git = simpleGit(projectDir);
await git.init(['--initial-branch=main']);
await git.raw('config', 'user.name', 'Test');
@@ -4312,12 +5362,12 @@ describe('SyncEngine pull-only mode', () => {
await git.push(['--set-upstream', 'origin', 'main']);
const originBefore = (await git.revparse(['origin/main'])).trim();
- // A local commit the project has not pushed. Full sync would push it; a
- // pull-only project must leave it local.
+ // A local commit the project has not pushed.
writeFileSync(join(projectDir, 'README.md'), '# seed\n\nlocal edit\n');
await git.add('.');
await git.commit('local commit not pushed');
- expect((await git.revparse(['HEAD'])).trim()).not.toBe(originBefore);
+ const localHead = (await git.revparse(['HEAD'])).trim();
+ expect(localHead).not.toBe(originBefore);
const engine = new SyncEngine({
projectDir,
@@ -4327,17 +5377,20 @@ describe('SyncEngine pull-only mode', () => {
});
try {
await engine.start();
- // Both a direct push trigger and a full sync (push-then-pull) must leave
- // origin untouched — the push gate makes the push cycle a no-op.
- await engine.trigger('push');
- await engine.trigger('sync');
+ // Starting the engine arms the pull loop and nothing else: pull-only
+ // never sends the local commit on the product's own initiative.
expect((await git.revparse(['origin/main'])).trim()).toBe(originBefore);
- const status = engine.getStatus();
- expect(status.lastPushedSha).toBeNull();
- // protected-branch is a push-rejection pause; with the push cycle gated
- // off it can never be classified, so it is structurally unreachable here.
- expect(status.pausedReason).not.toBe('protected-branch');
+ expect(engine.getStatus().lastPushedSha).toBeNull();
+
+ // An explicit press is the user acting for themselves, and it lands. The
+ // mode governs what runs on a timer, not what the user may do.
+ await engine.trigger('push');
+
+ expect((await git.revparse(['origin/main'])).trim()).toBe(localHead);
+ expect(engine.getStatus().lastPushedSha).toBe(localHead);
+ // Still pull-only afterwards — an explicit push must not arm a push loop.
+ expect(engine.getStatus().syncMode).toBe('follow');
} finally {
await engine.destroy();
}
@@ -5980,3 +7033,262 @@ describe('SyncEngine telemetry', () => {
}
});
});
+
+describe('SyncEngine blocking-change resolution', () => {
+ /**
+ * A real overlap: the remote advanced a tracked file that is ALSO dirty
+ * locally and uncommitted. That is exactly what `prepareForMerge` refuses to
+ * merge over, and the state the popover's Commit button acts on.
+ */
+ async function setupOverlap(): Promise<void> {
+ const bareDir = join(tmpDir, 'bare.git');
+ mkdirSync(bareDir, { recursive: true });
+ const bare = simpleGit(bareDir);
+ await bare.init(true);
+ await bare.raw('symbolic-ref', 'HEAD', 'refs/heads/main');
+
+ const sisterDir = join(tmpDir, 'sister');
+ mkdirSync(sisterDir, { recursive: true });
+ const sister = simpleGit(sisterDir);
+ await sister.init(['--initial-branch=main']);
+ await sister.raw('config', 'user.name', 'Sister');
+ await sister.raw('config', 'user.email', '[email protected]');
+ writeFileSync(join(sisterDir, 'settings.json'), '{"a":1}\n', 'utf-8');
+ // A second out-of-scope tracked file the remote never touches — the
+ // "unrelated dirt" the commit action must leave alone.
+ writeFileSync(join(sisterDir, 'keep.json'), '{"keep":1}\n', 'utf-8');
+ writeFileSync(join(sisterDir, 'foo.md'), 'base\n', 'utf-8');
+ await sister.add('.');
+ await sister.commit('base');
+ await sister.addRemote('origin', bareDir);
+ await sister.push('origin', 'main');
+
+ rmSync(projectDir, { recursive: true, force: true });
+ await simpleGit(tmpDir).clone(bareDir, projectDir);
+ mkdirSync(okDir, { recursive: true });
+ const project = simpleGit(projectDir);
+ await project.raw('config', 'user.name', 'Project');
+ await project.raw('config', 'user.email', '[email protected]');
+
+ writeFileSync(join(sisterDir, 'settings.json'), '{"a":99}\n', 'utf-8');
+ await sister.add('settings.json');
+ await sister.commit('remote edit');
+ await sister.push('origin', 'main');
+
+ // Dirty and UNCOMMITTED locally — the overlap the pre-merge gate catches.
+ writeFileSync(join(projectDir, 'settings.json'), '{"a":2}\n', 'utf-8');
+ }
+
+ /**
+ * Markdown-only content scope, which is what makes the overlap reachable at
+ * all: the push leg commits content-scoped dirt BEFORE the merge, so a file
+ * the filter admits never survives to block anything. The paths that do block
+ * are the out-of-scope ones — editor and tool config, exactly the set in the
+ * bug report (`.claude/launch.json`, `.codex/config.toml`, …).
+ */
+ const markdownOnlyFilter = {
+ isExcluded: (path: string) => !path.endsWith('.md'),
+ isDirExcluded: (_path: string) => false,
+ };
+
+ function makeOverlapEngine(mode: SyncMode = 'full') {
+ return new SyncEngine({
+ projectDir,
+ contentDir: projectDir,
+ contentFilter: markdownOnlyFilter,
+ mode,
+ });
+ }
+
+ test('Manual mode publishes the blocking paths too, not just full', async () => {
+ // Regression: `runOneShotPull`'s finally restored the resting pause when
+ // the mode is `off`, discarding the one the cycle had just raised. The
+ // panel gates on `external-changes-pending` surviving, so in Manual — the
+ // DEFAULT resting mode, and the one whose primary affordance is this very
+ // button — the blocked-changes panel never rendered at all. Silent: no log,
+ // no error, just the pre-feature single sentence.
+ //
+ // Drives `trigger`, not `pullOnce`, so the pre-clear at the top of trigger()
+ // is in the path exactly as a button press has it.
+ await setupOverlap();
+ const engine = makeOverlapEngine('off');
+ try {
+ await engine.start();
+ await engine.trigger('sync');
+
+ expect(engine.getStatus().pausedReason).toBe('external-changes-pending');
+ expect(engine.getStatus().blockingPaths).toEqual(['settings.json']);
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test('a pause resolved outside the app is retracted by the next successful pull', async () => {
+ // Regression: no success path cleared the pause, so a user who resolved the
+ // overlap in a terminal — which the panel's own handoff tells them to do —
+ // left a fully-synced, idle engine advertising a resolved pause and a stale
+ // file list indefinitely.
+ await setupOverlap();
+ const engine = makeOverlapEngine();
+ try {
+ await engine.start();
+ await engine.pullOnce('sync');
+ expect(engine.getStatus().blockingPaths).toEqual(['settings.json']);
+
+ // The user unblocks it themselves in a terminal — reverting the local
+ // edit, which is one of the two things the panel's handoff sends them to
+ // do — so the next pull merges cleanly.
+ await simpleGit(projectDir).checkout(['--', 'settings.json']);
+ await engine.pullOnce('sync');
+
+ expect(engine.getStatus().pausedReason).toBeUndefined();
+ expect(engine.getStatus().blockingPaths).toBeUndefined();
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test('a restored pause does not outlive the paths it needs', async () => {
+ // `blockingPaths` is memory-only. A persisted `external-changes-pending`
+ // therefore came back advertising a pause the panel cannot render and the
+ // resolve endpoint 409s on — a dead-end the user cannot clear from the UI.
+ await setupOverlap();
+ const engine = makeOverlapEngine();
+ try {
+ await engine.start();
+ await engine.pullOnce('sync');
+ expect(engine.getStatus().pausedReason).toBe('external-changes-pending');
+ await engine.destroy();
+
+ const restored = makeOverlapEngine();
+ try {
+ await restored.start();
+ expect(restored.getStatus().pausedReason).not.toBe('external-changes-pending');
+ } finally {
+ await restored.destroy();
+ }
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test('pausing on an overlap publishes the blocking paths, and resuming retracts them', async () => {
+ await setupOverlap();
+ const engine = makeOverlapEngine();
+ try {
+ await engine.start();
+ await engine.pullOnce('sync');
+
+ expect(engine.getStatus().pausedReason).toBe('external-changes-pending');
+ expect(engine.getStatus().blockingPaths).toEqual(['settings.json']);
+ expect(engine.getBlockingPaths()).toEqual(['settings.json']);
+
+ // The paths are readable only while the pause that produced them holds:
+ // a resumed engine advertising a stale set would arm two destructive
+ // buttons against files that are no longer blocking anything.
+ await engine.commitBlockingPaths();
+ expect(engine.getStatus().blockingPaths).toBeUndefined();
+ expect(engine.getBlockingPaths()).toEqual([]);
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test('commit takes exactly the blocking paths and leaves the rest of the tree dirty', async () => {
+ await setupOverlap();
+ // An unrelated dirty file: "Commit and sync" named the blocking files, so
+ // sweeping this one into the same commit would be a different action.
+ writeFileSync(join(projectDir, 'keep.json'), '{"keep":2}\n', 'utf-8');
+
+ const engine = makeOverlapEngine();
+ try {
+ await engine.start();
+ await engine.pullOnce('sync');
+ expect(engine.getBlockingPaths()).toEqual(['settings.json']);
+
+ const sha = await engine.commitBlockingPaths();
+ expect(sha).toMatch(/^[0-9a-f]{40}$/);
+
+ const git = simpleGit(projectDir);
+ const committed = await git.raw(['show', '--name-only', '--format=', 'HEAD']);
+ expect(committed.trim()).toBe('settings.json');
+ const status = await git.status();
+ expect(status.modified).toContain('keep.json');
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test('the engine exposes no way to discard the blocking paths', async () => {
+ // Guards the deliberate omission. A `discardBlockingPaths` sibling would
+ // restore the paths to HEAD, destroying uncommitted work with no reflog and
+ // no stash object — the verb waits on a recoverable snapshot. A future
+ // re-add that skips the snapshot fails here.
+ const engine = makeOverlapEngine();
+ try {
+ expect((engine as unknown as Record<string, unknown>).discardBlockingPaths).toBeUndefined();
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test('a scoped probe is not fooled by content the user staged by hand', async () => {
+ // Regression: the emptiness probe was `git diff --cached` with NO pathspec,
+ // so unrelated pre-staged content made it pass even when the add staged
+ // nothing for the blocking paths — and `git commit -- <paths>` then failed,
+ // surfacing as a generic 500 while the user's staging was silently altered.
+ await setupOverlap();
+ const engine = makeOverlapEngine();
+ try {
+ await engine.start();
+ await engine.pullOnce('sync');
+ expect(engine.getBlockingPaths()).toEqual(['settings.json']);
+
+ const pg = simpleGit(projectDir);
+ // The user resolves the overlap by hand (nothing left to stage for the
+ // blocking path) but has OTHER work staged.
+ await pg.checkout(['--', 'settings.json']);
+ writeFileSync(join(projectDir, 'keep.json'), '{"staged":"by hand"}\n', 'utf-8');
+ await pg.add('keep.json');
+
+ expect(await engine.commitBlockingPaths()).toBeNull();
+ // Their staging survives untouched.
+ const staged = await pg.raw(['diff', '--cached', '--name-only']);
+ expect(staged.trim()).toBe('keep.json');
+ } finally {
+ await engine.destroy();
+ }
+ });
+
+ test('the display cap does not leak into the action or hide the true set size', () => {
+ // Regression: the stored set was pre-capped at 50, so one Commit press
+ // cleared only the first 50 overlaps, re-paused on the remainder with a
+ // different file list, and read as a product bug. The cap bounds the CC1
+ // status payload only.
+ const engine = makeOverlapEngine();
+ const internals = engine as unknown as {
+ blockingPaths: string[];
+ pausedReason?: string;
+ };
+ internals.pausedReason = 'external-changes-pending';
+ internals.blockingPaths = Array.from({ length: 60 }, (_, i) => `file-${i}.json`);
+
+ expect(engine.getBlockingPaths()).toHaveLength(60);
+ expect(engine.getStatus().blockingPaths).toHaveLength(50);
+ });
+
+ test('commit declines when nothing is blocking', async () => {
+ // The endpoint's authority is this guard: it acts on engine state, never on
+ // a caller-supplied path list, so an unpaused engine must do nothing at all.
+ await setupOverlap();
+ const engine = makeOverlapEngine();
+ try {
+ await engine.start();
+ expect(engine.getBlockingPaths()).toEqual([]);
+ expect(await engine.commitBlockingPaths()).toBeNull();
+ expect(readFileSync(join(projectDir, 'settings.json'), 'utf-8')).toBe('{"a":2}\n');
+ } finally {
+ await engine.destroy();
+ }
+ });
+});
diff --git a/packages/server/src/sync-engine.ts b/packages/server/src/sync-engine.ts
index d4cfdfef1..ba4b50328 100644
--- a/packages/server/src/sync-engine.ts
+++ b/packages/server/src/sync-engine.ts
@@ -34,6 +34,7 @@ import type { CC1Broadcaster } from './cc1-broadcast.ts';
import { getLocalDir } from './config/paths.ts';
import { type ConflictEntry, ConflictStore } from './conflict-storage.ts';
import type { ContentFilter } from './content-filter.ts';
+import { isShareableOkArtifact } from './content-filter.ts';
import { isSupportedDocFile } from './doc-extensions.ts';
import {
type ClassifiedError,
@@ -231,6 +232,16 @@ function pushPermissionStatusEqual(
interface SyncStatus {
state: SyncState;
lastSyncUtc: string | null;
+ lastRunUtc: string | null;
+ /**
+ * Per-direction companions to `lastRunUtc`, which collapses both directions
+ * into one stamp and so cannot say WHICH ran. Same admission rule as
+ * `lastRunUtc` — the op reached the remote, whether or not anything moved —
+ * split so the panel can report the two legs separately. Neither is a
+ * content-changed signal; that is `lastSyncUtc`.
+ */
+ lastPullOkUtc: string | null;
+ lastPushOkUtc: string | null;
lastFetchUtc: string | null;
lastPushedSha: string | null;
/**
@@ -322,10 +333,56 @@ const CONTENT_SYNC_STAGING_SCOPE = { syncScope: { pathBase: 'content' } } as con
const PROJECT_SYNC_STAGING_SCOPE = { syncScope: { pathBase: 'project' } } as const;
type SyncStagingScope = typeof CONTENT_SYNC_STAGING_SCOPE | typeof PROJECT_SYNC_STAGING_SCOPE;
+/**
+ * Which VERB asked for this pull. Buttons are mode-independent (user-directed:
+ * the same click does the same thing whatever the sync-mode dropdown says; the
+ * mode only chooses what runs on the timer):
+ *
+ * - `'explicit'` — the Pull verb: the Pull button in any mode, and the
+ * pull-only automation (follow's scheduled loop). Runs the B1 overlay
+ * cycle and never commits; diverged committed history refuses rather than
+ * merging, because merging requires authoring a commit.
+ * - `'sync'` — the Sync verb: the Pull-and-Push button in any mode, and
+ * full mode's scheduled loop. Keeps the classic commit+merge machinery —
+ * syncing is the act of committing your work.
+ */
+type PullInvocation = 'explicit' | 'sync';
+
+/**
+ * Cap on the overlapping-path set carried in the status payload. The list is a
+ * UI affordance, not a report: past a few dozen the user is not picking through
+ * rows, and the payload rides the CC1 status broadcast.
+ */
+const BLOCKING_PATHS_CAP = 50;
+
+/**
+ * Pauses a one-shot cycle may RAISE and keep, rather than having rolled back by
+ * the Manual-mode posture restore.
+ *
+ * Both are the visible answer to a click the user just made. Rolling them back
+ * left Manual — the default resting mode — showing nothing at all: the
+ * blocked-changes panel gates on `external-changes-pending` surviving, so
+ * without it the flagship affordance never rendered in the mode that most needs
+ * it, silently and with no log line.
+ */
+const FORWARD_ONLY_PAUSES: ReadonlySet<string | undefined> = new Set([
+ 'diverged-local-commits',
+ 'external-changes-pending',
+]);
+
+/** Commit subject for the user-pressed "commit the blocking files" action. */
+const COMMIT_BLOCKING_MESSAGE = 'Commit local changes before syncing';
+
/** Persisted state (sync-state.json). */
interface PersistedSyncState {
version: 1;
lastSyncUtc: string | null;
+ /**
+ * Optional so a state file written before these existed still loads — a
+ * missing leg reads as "never", which is honest for a restored engine.
+ */
+ lastPullOkUtc?: string | null;
+ lastPushOkUtc?: string | null;
lastFetchUtc: string | null;
lastPushedSha: string | null;
consecutiveFailures: number;
@@ -529,11 +586,17 @@ export class SyncEngine {
private pullIntervalSeconds: number;
private pushIntervalSeconds: number;
/**
- * The single source of truth for what direction (if any) this engine syncs.
- * `off` = inactive, `pull` = fetch + fast-forward only (never pushes), `full`
- * = bidirectional. Push is structurally impossible unless this is `full` (the
- * gate lives at the push routine entrance), so no scheduling path can push for
- * a pull-only project.
+ * The single source of truth for what this engine does ON A SCHEDULE.
+ * `off` = nothing scheduled, `follow` = scheduled fetch + fast-forward only,
+ * `full` = scheduled both directions. (`pull` is a legacy alias for
+ * `follow`.)
+ *
+ * SCHEDULED push is structurally impossible unless this is `full` — the gate
+ * is at `runPushCycle`'s entrance — so no timer can publish commits for a
+ * follower. It is NOT a capability gate: `pushOnce()` runs in every mode,
+ * including `off`, because a button the user pressed is its own consent. Read
+ * `ConfigSchema`'s `autoSync.mode` description as the user-facing contract;
+ * the two must not drift.
*/
private mode: SyncMode;
private credentialConfig: string[];
@@ -600,6 +663,52 @@ export class SyncEngine {
// Runtime state
private lastSyncUtc: string | null = null;
+ /**
+ * When a sync operation last completed successfully — a push or a pull,
+ * scheduled or user-pressed, whether or not anything actually moved.
+ *
+ * Excludes the read-only fetch on panel open: that fires whenever the user
+ * looks, so counting it would pin this to "just now" permanently.
+ *
+ * Distinct from `lastSyncUtc`, which advances only when CONTENT changed (a
+ * merge landed, a commit was pushed). That distinction is invisible to a user
+ * who just pressed Pull on an already-current repo: nothing changed, so
+ * `lastSyncUtc` stayed put and the panel read "18h ago", which looks like the
+ * button did nothing. This is the timestamp the UI shows.
+ */
+ /**
+ * Derived, never stored: the later of the two per-direction legs.
+ *
+ * It used to be a third field assigned alongside each leg, which meant
+ * `saveStateNow` persisted the legs but not it — so after a restart the legs
+ * restored while this read `null`. Deriving makes that asymmetry
+ * unrepresentable. ISO-8601 UTC is fixed-width, so lexicographic max is
+ * chronological max.
+ */
+ private get lastRunUtc(): string | null {
+ if (this.lastPullOkUtc === null) return this.lastPushOkUtc;
+ if (this.lastPushOkUtc === null) return this.lastPullOkUtc;
+ return this.lastPullOkUtc > this.lastPushOkUtc ? this.lastPullOkUtc : this.lastPushOkUtc;
+ }
+ /**
+ * The same successful-run signal as `lastRunUtc`, kept per direction so the
+ * panel can distinguish "pulled a moment ago" from "pushed a moment ago".
+ * `lastRunUtc` derives from these two and stays the single-value fallback for
+ * a client that predates the split.
+ */
+ private lastPullOkUtc: string | null = null;
+ private lastPushOkUtc: string | null = null;
+ /**
+ * Whether the most recent push cycle actually landed (pushed, or verified
+ * there was nothing to push). Set only at the two success sites in
+ * `doPushCycle`; reset at each cycle entry. The wrappers stamp `lastRunUtc`
+ * off THIS, never off error-absence — the retry-exhausted non-fast-forward
+ * path exits without recording an error, and inferring success from a
+ * missing error stamped "Updated just now" for a push that never landed.
+ */
+ private pushCycleLanded = false;
+ /** Single-flight for the read-only panel-open fetch. */
+ private fetchOnlyInFlight = false;
private lastFetchUtc: string | null = null;
private lastPushedSha: string | null = null;
private lastPullUtc: string | null = null;
@@ -613,6 +722,14 @@ export class SyncEngine {
private pullError: string | undefined;
private pullErrorCode: UserFacingErrorCode | undefined;
private pausedReason: string | undefined;
+ /**
+ * Tracked paths whose local edits overlap the incoming merge, recorded when
+ * `prepareForMerge` pauses. Read back out only while that pause holds (see
+ * `blockingPathsForStatus`), so a stale set can never outlive the condition
+ * that produced it — the alternative is clearing it at each of the five
+ * places `pausedReason` is reset, one of which would eventually be missed.
+ */
+ private blockingPaths: string[] = [];
private currentBranch = 'main';
// Concurrency guard: only one operation at a time
@@ -997,6 +1114,41 @@ export class SyncEngine {
* checkpoint + overlay conversion; that transition machinery is not wired here
* yet, so this treats every non-`off` target as the plain enable path.
*/
+ /**
+ * Apply a new scheduled-cycle cadence.
+ *
+ * Idempotent on a same-value call, for the same reason `setMode` is: the
+ * config re-apply path fires on both a producer notify and a watcher echo.
+ *
+ * A changed interval re-arms the timers immediately rather than waiting for
+ * the in-flight one to elapse — a user who moves 60 min → 30 s expects the
+ * next pull in 30 s, not up to an hour later. The re-arm goes through the
+ * normal schedule helpers, so backoff, jitter, and the mode gate on pushing
+ * all still apply. An in-flight cycle is left alone; its own `finally`
+ * re-schedules at the new interval.
+ */
+ setIntervals(pullIntervalSeconds: number, pushIntervalSeconds: number): void {
+ const pullChanged = this.pullIntervalSeconds !== pullIntervalSeconds;
+ const pushChanged = this.pushIntervalSeconds !== pushIntervalSeconds;
+ if (!pullChanged && !pushChanged) return;
+ log.info(
+ {
+ pullFrom: this.pullIntervalSeconds,
+ pullTo: pullIntervalSeconds,
+ pushFrom: this.pushIntervalSeconds,
+ pushTo: pushIntervalSeconds,
+ },
+ '[sync] cycle intervals changed',
+ );
+ this.pullIntervalSeconds = pullIntervalSeconds;
+ this.pushIntervalSeconds = pushIntervalSeconds;
+ // Only re-arm what is already armed. Re-scheduling a timer that is null
+ // because the engine is off, dormant, or mid-cycle would start a loop the
+ // mode gate never authorized.
+ if (pullChanged && this.pullTimer !== null) this.schedulePull();
+ if (pushChanged && this.pushTimer !== null) this.schedulePush();
+ }
+
async setMode(mode: SyncMode, source: SyncModeChangeSource = 'config'): Promise<void> {
if (this.mode === mode) return;
const from = this.mode;
@@ -1048,9 +1200,15 @@ export class SyncEngine {
this.transitionTo('idle');
this.schedulePull(0);
+ // Immediate, symmetric with the pull above. Deferring the first push by a
+ // full interval made enabling Auto look like it had synced — the pull lands
+ // at once and stamps the freshness line — while pending edits sat locally
+ // for the whole interval. Harmless before the cadence was configurable
+ // (60 s); with a user-chosen interval it stretched to an hour.
+ //
// No-op unless mode === 'full' (the push gate lives in schedulePush +
// runPushCycle), so a pull-only project schedules pulls only.
- this.schedulePush();
+ this.schedulePush(0);
this.saveStateNow();
// Re-check push permission so the engine state and the probe state stay
// consistent. For `full`, a stale `denied` probe would otherwise let this
@@ -1256,15 +1414,30 @@ export class SyncEngine {
this.transitionTo('idle');
this.schedulePull(0);
- this.schedulePush();
+ // Immediate for the same reason as the mode-change path above: a resumed
+ // engine that pulls at once but withholds the push reads as synced while
+ // local work stays local.
+ this.schedulePush(0);
this.saveStateNow();
void this.probePushPermissionInternal('refresh');
}
// ─── Manual trigger ────────────────────────────────────────────────────────
- /** Trigger an immediate pull + push cycle (bypasses backoff, resets consecutiveFailures). */
- async trigger(op: 'sync' | 'push' | 'pull' = 'sync'): Promise<void> {
+ /**
+ * Trigger an immediate push and/or pull (bypasses backoff, resets
+ * consecutiveFailures). Every `op` runs through a once-primitive, so a
+ * manual-mode project (`off`, no background loop) does real work on an
+ * explicit user act.
+ */
+ async trigger(op: 'sync' | 'push' | 'pull' | 'fetch' = 'sync'): Promise<void> {
+ if (op === 'fetch') {
+ // Read-only and deliberately ahead of everything below: a fetch must not
+ // reset failure counters, clear paused reasons, or re-probe permissions.
+ // Those are recoveries a user-requested sync earns; a panel open does not.
+ await this.fetchOnly();
+ return;
+ }
this.consecutiveFailures = 0;
// Retry clears transient paused reasons; protected-branch etc. stay set.
if (
@@ -1329,15 +1502,17 @@ export class SyncEngine {
return;
}
- // Log why a push/sync trigger is a no-op so "Sync now returns OK but nothing
+ if (op === 'push') {
+ await this.pushOnce();
+ return;
+ }
+
+ // Log why a sync trigger is a no-op so "Sync now returns OK but nothing
// happens" is diagnosable from the server terminal. The cycle guards
- // silently early-return in these states; surface them here.
- if (
- this.state === 'dormant' ||
- this.state === 'disabled' ||
- this.state === 'conflict' ||
- this.state === 'auth-error'
- ) {
+ // silently early-return in these states; surface them here. `disabled` is
+ // NOT in this set: it is the resting state of a manual-mode project, where
+ // a trigger is expected to do real work.
+ if (this.state === 'dormant' || this.state === 'conflict' || this.state === 'auth-error') {
log.warn(
{
op,
@@ -1352,14 +1527,187 @@ export class SyncEngine {
} else {
log.info({ op, state: this.state }, `[sync] trigger(${op}) running`);
}
- if (op === 'push') {
- await this.runPushCycle();
- } else {
- // Push first so pending working-tree edits get committed via the
- // isolated-index path. A subsequent merge then has a clean tree
- // instead of refusing with "working tree has uncommitted changes".
+ // Push first so pending working-tree edits get committed via the
+ // isolated-index path. A subsequent merge then has a clean tree instead of
+ // refusing with "working tree has uncommitted changes". Both legs go
+ // through the once-primitives so a manual (mode `off`) project runs a real
+ // cycle rather than two silent no-ops.
+ await this.pushOnce();
+ // The sync op's pull leg is 'sync' context: in full mode it keeps the
+ // commit+merge machinery. Push ran first, so the tree is usually clean and
+ // the interim commit fires only on mid-window dirt.
+ await this.pullOnce('sync');
+ }
+
+ /**
+ * Run a single push — the primitive behind every user-pressed Push, and the
+ * push leg of a user-pressed Pull-and-Push.
+ *
+ * Symmetric with {@link pullOnce}: it runs in every mode, so a project whose
+ * automation does not push (`off` — manual, or `follow` — auto pull-only) can
+ * still push on an explicit user act. The scheduled loop is untouched — a
+ * manual push neither starts one nor leaves the project looking active.
+ *
+ * The consent guarantee lives on the scheduling axis, not the mode axis:
+ * Open Knowledge never pushes on its OWN initiative outside `full` mode
+ * (`runPushCycle` is the single gate for that). A button press is not the
+ * product's initiative — it is the user's, and the user is allowed to send
+ * their own work whichever automation they chose. What `follow` guarantees is
+ * that nothing leaves this machine unless they ask; it is not a promise that
+ * they can never ask.
+ */
+ async pushOnce(): Promise<void> {
+ // A full-mode project already owns a push loop; reuse it so the manual push
+ // chains the next scheduled one exactly as a background push would.
+ if (this.mode === 'full') {
await this.runPushCycle();
- await this.runPullCycle();
+ return;
+ }
+ await this.runOneShotPush();
+ }
+
+ /**
+ * Push once for a project whose automation has no push loop — mode `off`
+ * (manual) or `follow` (auto pull-only).
+ *
+ * Mirrors `runOneShotPull`'s shape: same single-flight guard, same
+ * "restore the resting posture" discipline so the project does not end up
+ * looking like it started auto-pushing, and deliberately no `schedulePush()`
+ * — an explicit push must not arm a background loop the user did not choose.
+ */
+ private async runOneShotPush(): Promise<void> {
+ // Single-flight: a concurrent cycle already owns the working tree and the
+ // isolated index. Refuse rather than race it.
+ // Every refusal logs. `runOneShotPull`'s equivalents all route through
+ // `recordPullOutcome('refused')`, which stamps status and signals CC1; the
+ // push one-shot has no such outcome channel, so the log line is the only
+ // record that an explicit user press did nothing. Without it "Push does
+ // nothing" is undiagnosable — and this is a desktop app whose users have no
+ // server log to read, so support has only this.
+ if (this.pushInFlight || this.pullInFlight) {
+ log.info(
+ { pushInFlight: this.pushInFlight, pullInFlight: this.pullInFlight },
+ '[sync] one-shot push refused — a cycle is already in flight',
+ );
+ return;
+ }
+ // The conflict resolver owns the tree until the user resolves — ledger
+ // conflicts included (B1 keeps the engine idle while they wait).
+ if (this.state === 'conflict' || this.state === 'auth-error') {
+ log.info({ state: this.state }, `[sync] one-shot push refused — state=${this.state}`);
+ return;
+ }
+ if (this.conflictCount > 0) {
+ log.info(
+ { conflictCount: this.conflictCount },
+ '[sync] one-shot push refused — unresolved conflicts hold the tree',
+ );
+ return;
+ }
+
+ if (!this.hasRemote || isUnbornHead(this.projectDir)) {
+ log.info(
+ { hasRemote: this.hasRemote },
+ '[sync] one-shot push refused — no remote, or no commits yet',
+ );
+ return;
+ }
+
+ const restingState = this.state;
+ this.pushInFlight = true;
+ try {
+ await this.doPushCycle(1);
+ } finally {
+ this.pushInFlight = false;
+ if (this.pushCycleLanded) this.markRun();
+ // Restore the resting STATE only. A `pausedReason` or `pushError` the
+ // cycle just recorded is the answer to "why didn't my push land", so
+ // unlike the pull one-shot this path never rolls those back — the user
+ // asked for this push and has to be able to see how it went. A cycle that
+ // ended in conflict/auth-error keeps that state: it outranks the resting
+ // posture and needs the user's attention.
+ const settled = this.currentState();
+ if (settled !== 'conflict' && settled !== 'auth-error') {
+ this.transitionTo(restingState);
+ }
+ this.cc1Broadcaster?.signal('sync-status');
+ }
+ }
+
+ /**
+ * Update remote-tracking refs and the ahead/behind counts, and nothing else.
+ *
+ * Read-only by construction: `git fetch` writes `refs/remotes/origin/*` and
+ * never touches the working tree, the index, or HEAD. That is what makes it
+ * safe to run when the user merely OPENS the sync panel — a panel headed
+ * "2 behind" is the user asking about remote state, and answering that
+ * question must not move their files. Merging stays exclusively behind the
+ * Pull button (`pullOnce`), which is what "Nothing moves until you ask"
+ * promises in manual mode.
+ *
+ * Failures are deliberately QUIET. The caller here is a passive panel open,
+ * not a sync the user requested, so this never routes through `handleError`:
+ * that classifies failures, can set `pullError`, and can pause the engine —
+ * turning an offline laptop into a red error state for someone who only
+ * clicked to look. A failed background fetch leaves the previous counts
+ * standing and reports `false`; the visible state is "these numbers are old",
+ * which is the truth.
+ *
+ * Returns true when refs were refreshed. Never throws.
+ */
+ async fetchOnly(): Promise<boolean> {
+ if (!this.hasRemote || isUnbornHead(this.projectDir)) return false;
+ // A cycle already owns the repo; its own fetch is fresher than ours would
+ // be, so decline rather than issue a second concurrent network call. The
+ // fetchOnlyInFlight leg covers two panel opens racing each other (two
+ // clients on one server): concurrent `git fetch` processes contend on ref
+ // locks for nothing — one fetch serves both.
+ if (this.pullInFlight || this.pushInFlight || this.fetchOnlyInFlight) return false;
+
+ this.fetchOnlyInFlight = true;
+ const handle = this.gitHandle();
+ try {
+ await handle.git.fetch('origin');
+ this.lastFetchUtc = new Date().toISOString();
+ // Persisted so the restart-recovery scheduler computes its remaining
+ // delay from the real last fetch rather than treating every boot as
+ // never-fetched.
+ this.scheduleSaveState();
+ } catch (err) {
+ // Quiet by contract — see the doc comment. No handleError, no state
+ // transition, no pullError: the counts simply stay as they were. The log
+ // line is the one concession: without it an expired token or a renamed
+ // remote is indistinguishable from being genuinely current, and the
+ // bug-report bundle carries no evidence at all.
+ log.debug({ err }, '[sync] panel-open fetch failed — counts left as they were');
+ return false;
+ } finally {
+ this.fetchOnlyInFlight = false;
+ }
+ await this.refreshDivergenceCounts(handle);
+ // Deliberately NOT a run: this fires on panel open, so stamping it would
+ // make "Updated" read "just now" every time the user so much as looks at
+ // the popover — a field that always says the same thing tells them nothing.
+ // The fetch still refreshes the counts and the incoming list; "Updated"
+ // stays reserved for when content actually flowed.
+ this.cc1Broadcaster?.signal('sync-status');
+ return true;
+ }
+
+ /**
+ * Re-read ahead/behind from the tracking ref. Local-only — `git status`
+ * compares HEAD against `@{upstream}` with no network — so the numbers are
+ * exactly as fresh as the last fetch, no fresher.
+ */
+ private async refreshDivergenceCounts(handle: GitHandle): Promise<void> {
+ try {
+ const status = await handle.git.status();
+ this.ahead = status.ahead;
+ this.behind = status.behind;
+ } catch (err) {
+ // Non-fatal — continue with previous counts. Logged because a silently
+ // stale ahead/behind pair renders as "up to date" in the popover.
+ log.debug({ err }, '[sync] divergence-count refresh failed — keeping previous counts');
}
}
@@ -1380,9 +1728,9 @@ export class SyncEngine {
* that read status before triggering can wait for the timestamp to change and
* read the outcome of a pull that completed after its trigger.
*/
- async pullOnce(): Promise<PullOutcome> {
+ async pullOnce(invocation: PullInvocation = 'explicit'): Promise<PullOutcome> {
const mode = this.mode;
- const outcome = await this.runOneShotPull();
+ const outcome = await this.runOneShotPull(invocation);
// One-shot outcomes are the discrete, consumer-visible pull events (e.g. a
// downstream update button); log each so their distribution is observable
// without the per-cycle noise a background-pull log would add.
@@ -1390,14 +1738,37 @@ export class SyncEngine {
return outcome;
}
- private async runOneShotPull(): Promise<PullOutcome> {
+ private async runOneShotPull(invocation: PullInvocation): Promise<PullOutcome> {
// Single-flight: a background or concurrent one-shot cycle already owns the
// working tree. Refuse rather than race it — the consumer retries on refused.
- if (this.pullInFlight || this.pushInFlight) return this.recordPullOutcome('refused');
+ // Each site names its own cause. `recordPullOutcome` collapses all three to
+ // the same `'refused'` on the wire — deliberately, since a consumer's only
+ // useful response to any of them is to retry — but that leaves the log as
+ // the sole place the three are distinguishable when a user reports that
+ // Pull does nothing.
+ if (this.pullInFlight || this.pushInFlight) {
+ log.info(
+ { pullInFlight: this.pullInFlight, pushInFlight: this.pushInFlight },
+ '[sync] one-shot pull refused — a cycle is already in flight',
+ );
+ return this.recordPullOutcome('refused');
+ }
// The full-mode conflict resolver owns the tree until the user resolves.
- if (this.state === 'conflict') return this.recordPullOutcome('refused');
+ if (this.state === 'conflict') {
+ log.info(
+ { state: this.state },
+ '[sync] one-shot pull refused — the conflict resolver holds the tree',
+ );
+ return this.recordPullOutcome('refused');
+ }
// Nothing to pull from, or no commits to fast-forward against yet.
- if (!this.hasRemote || isUnbornHead(this.projectDir)) return this.recordPullOutcome('refused');
+ if (!this.hasRemote || isUnbornHead(this.projectDir)) {
+ log.info(
+ { hasRemote: this.hasRemote },
+ '[sync] one-shot pull refused — no remote, or no commits yet',
+ );
+ return this.recordPullOutcome('refused');
+ }
// Snapshot the resting posture so an off/null project can be restored to it
// afterwards — the cycle transitions through fetching/pulling/idle, which
@@ -1407,11 +1778,21 @@ export class SyncEngine {
const restingPausedReason = this.pausedReason;
this.pullInFlight = true;
try {
- return this.recordPullOutcome(await this.doPullCycle());
+ return this.recordPullOutcome(await this.doPullCycle(invocation));
} finally {
this.pullInFlight = false;
if (restingMode === 'off') {
- this.pausedReason = restingPausedReason;
+ // Restore the resting posture — with an asymmetry for the pauses that
+ // only ever flow FORWARD: if this cycle just raised one, keep it (it is
+ // the visible answer to the click the user made — in Manual, Pull is
+ // the primary affordance and rolling it back made the press change
+ // nothing); and if this cycle CLEARED a previously-raised one, never
+ // resurrect the stale copy from the resting snapshot.
+ if (!FORWARD_ONLY_PAUSES.has(this.pausedReason)) {
+ if (!FORWARD_ONLY_PAUSES.has(restingPausedReason)) {
+ this.pausedReason = restingPausedReason;
+ }
+ }
this.transitionTo(restingState);
} else {
// A background timer that fired during this one-shot early-returned on
@@ -1430,6 +1811,13 @@ export class SyncEngine {
private recordPullOutcome(outcome: PullOutcome): PullOutcome {
this.lastPullUtc = new Date().toISOString();
this.lastPullOutcome = outcome;
+ // `up-to-date` counts: the pull ran and confirmed there was nothing to
+ // bring in. `refused` (a guard declined) and `error` do not — neither
+ // reached the remote. `conflict` did the work and left something to resolve.
+ if (outcome === 'succeeded' || outcome === 'up-to-date' || outcome === 'conflict') {
+ // `lastRunUtc` derives from the legs, so stamping this one is enough.
+ this.lastPullOkUtc = new Date().toISOString();
+ }
this.cc1Broadcaster?.signal('sync-status');
return outcome;
}
@@ -1440,6 +1828,9 @@ export class SyncEngine {
return {
state: this.state,
lastSyncUtc: this.lastSyncUtc,
+ lastRunUtc: this.lastRunUtc,
+ lastPullOkUtc: this.lastPullOkUtc,
+ lastPushOkUtc: this.lastPushOkUtc,
lastFetchUtc: this.lastFetchUtc,
lastPushedSha: this.lastPushedSha,
lastPullUtc: this.lastPullUtc,
@@ -1460,10 +1851,109 @@ export class SyncEngine {
...(this.pullError !== undefined ? { pullError: this.pullError } : {}),
...(this.pullErrorCode !== undefined ? { pullErrorCode: this.pullErrorCode } : {}),
pausedReason: this.pausedReason,
+ ...(this.blockingPathsForStatus().length > 0
+ ? { blockingPaths: this.blockingPathsForStatus() }
+ : {}),
...(this.pushPermission !== null ? { pushPermission: this.pushPermission } : {}),
};
}
+ /**
+ * The overlapping paths, but only while the pause that produced them holds.
+ * Guarding on `pausedReason` here rather than clearing the field at every
+ * reset site is what keeps a resumed engine from advertising stale paths —
+ * and what makes the two resolution actions below safe to run without a
+ * caller-supplied path list.
+ */
+ private blockingPathsForStatus(): string[] {
+ if (this.pausedReason !== 'external-changes-pending') return [];
+ // The cap bounds the CC1 payload only; `getBlockingPaths()` (the action
+ // path) applies the same pause-gate but stays uncapped.
+ return this.blockingPaths.slice(0, BLOCKING_PATHS_CAP);
+ }
+
+ /** Public read of the same guarded set, for the resolution endpoints. */
+ getBlockingPaths(): string[] {
+ // Same pause-gating as the status projection (a stale set must never be
+ // actionable) but WITHOUT its display cap: this is what Commit operates on,
+ // and inheriting the bound made one press clear only the first 50 overlaps.
+ return this.pausedReason === 'external-changes-pending' ? [...this.blockingPaths] : [];
+ }
+
+ /**
+ * Commit exactly the paths blocking the merge, then let the caller resume.
+ *
+ * Scoped to the blocking set on purpose: the user pressed a button about
+ * four named files, and sweeping the rest of a dirty tree into a commit they
+ * never saw is not what that button said. The set comes from the engine's own
+ * state rather than the request body — an endpoint that committed
+ * caller-named paths would be a general-purpose commit API reachable from any
+ * page the browser loads.
+ *
+ * Returns the new commit SHA, or null when there was nothing to commit.
+ */
+ async commitBlockingPaths(): Promise<string | null> {
+ const paths = this.getBlockingPaths();
+ if (paths.length === 0) return null;
+ const handle = this.gitHandle();
+ return withParentLock(async () => {
+ // Inside the lock like every mutation below it — running it outside left
+ // a window where a concurrent cycle's identity write could interleave.
+ await this.applyCommitIdentity(handle);
+ try {
+ await handle.git.raw(['add', '--', ...paths]);
+ // Pathspec-scoped: an unscoped `--cached` probe passes on unrelated
+ // content the USER staged by hand, even when the add above staged
+ // nothing — and `git commit -- <paths>` then fails, surfacing as a
+ // generic 500 with the user's staging silently altered.
+ const staged = await listNames(handle.git, [
+ 'diff',
+ '--cached',
+ '--name-only',
+ '--',
+ ...paths,
+ ]);
+ if (staged.length === 0) return null;
+ await handle.git.raw(['commit', '-m', COMMIT_BLOCKING_MESSAGE, '--', ...paths]);
+ } catch (err) {
+ // This path stages into the user's REAL index (unlike every scheduled
+ // commit, which builds through an isolated GIT_INDEX_FILE), so a failed
+ // attempt must not leave files staged the user never staged — that
+ // silently changes the semantics of their next hand-typed `git commit`.
+ // Best-effort: the reset can itself fail on the same broken repo.
+ await handle.git.raw(['reset', '--', ...paths]).catch(() => {});
+ log.error({ err, files: paths.length }, '[sync] commit of blocking paths failed');
+ throw err;
+ }
+ const sha = (await handle.git.revparse('HEAD')).trim();
+ this.clearBlockingPause();
+ log.info({ files: paths.length }, '[sync] committed overlapping paths at user request');
+ return sha;
+ });
+ }
+
+ // There is deliberately no `discardBlockingPaths` sibling to
+ // `commitBlockingPaths`. Restoring the blocking paths to HEAD destroys
+ // uncommitted work with no reflog entry and no stash object behind it, and a
+ // confirmation dialog is not a substitute for recoverability. The verb ships
+ // once a snapshot does; until then the panel offers Commit and a terminal,
+ // which at least makes the user type the destructive command somewhere they
+ // can inspect first. Re-adding this must come WITH the snapshot, not before.
+
+ /**
+ * Drop the pause the resolution actions just cleared the cause of. Leaves
+ * the engine idle so the caller's follow-up trigger runs a real cycle
+ * instead of short-circuiting on a paused state that no longer applies.
+ */
+ private clearBlockingPause(): void {
+ this.blockingPaths = [];
+ this.pausedReason = undefined;
+ this.clearPullError();
+ this.consecutiveFailures = 0;
+ this.cc1Broadcaster?.signal('sync-status');
+ this.scheduleSaveState();
+ }
+
/**
* Re-run the push-permission probe. Public for callers that observe an
* auth-state change (e.g. set-identity, manual sync trigger) and want the
@@ -1799,7 +2289,10 @@ export class SyncEngine {
}
if (this.conflictCount === before) return;
- if (this.conflictCount === 0 && this.state === 'conflict') {
+ // Keyed on the ledger emptying, NOT on `state === 'conflict'`: B1 records
+ // conflicts while the engine sits at `idle`, so a state-keyed gate skips
+ // exactly the case that needs the legs restarted.
+ if (this.conflictCount === 0) {
this.transitionTo('idle'); // fires CC1
this.pausedReason = undefined;
this.schedulePull();
@@ -1854,7 +2347,10 @@ export class SyncEngine {
await this.notifyContentConflictsResolved([file]);
}
this.conflictCount = this.conflictStore.count();
- if (this.conflictCount === 0 && this.state === 'conflict') {
+ // Ledger-keyed, not state-keyed: B1 leaves the engine at `idle` while its
+ // conflicts sit in the ledger, so gating on `state === 'conflict'` skips
+ // the re-arm for exactly the conflicts that stopped the push loop.
+ if (this.conflictCount === 0) {
this.transitionTo('idle');
this.pausedReason = undefined;
this.schedulePull();
@@ -2006,14 +2502,16 @@ export class SyncEngine {
this.pullInFlight = true;
try {
- this.recordPullOutcome(await this.doPullCycle());
+ // Automation maps to its verb: full mode's loop IS auto-sync; follow's
+ // loop is auto-Pull (pull-only — it must never commit).
+ this.recordPullOutcome(await this.doPullCycle(this.mode === 'full' ? 'sync' : 'explicit'));
} finally {
this.pullInFlight = false;
this.schedulePull(); // chain: schedule next after current completes
}
}
- private async doPullCycle(): Promise<PullOutcome> {
+ private async doPullCycle(invocation: PullInvocation): Promise<PullOutcome> {
const handle = this.gitHandle();
// Detached HEAD check
@@ -2047,26 +2545,27 @@ export class SyncEngine {
}
// Check ahead/behind
- try {
- const status = await handle.git.status();
- this.ahead = status.ahead;
- this.behind = status.behind;
- } catch {
- // Non-fatal — continue with previous counts
- }
-
- // Merge if behind. Pull-only runs the B1 cycle even with existing
- // working-tree conflicts tracked — it re-pins them against the new tip and
- // fast-forwards the rest of the repo (the engine stays idle, not paused, so
- // followers keep updating while a single doc waits on resolution). The
- // full-sync merge still gates on `conflictCount === 0`: a MERGE_HEAD in
- // flight must be resolved before another merge starts.
- if (this.behind > 0 && this.mode !== 'full') {
+ await this.refreshDivergenceCounts(handle);
+
+ // Merge if behind. The dispatch is keyed on the VERB alone — never the
+ // mode — so a button click behaves identically wherever the dropdown sits
+ // (see PullInvocation). Pull → B1 overlay, never commits (B1's own
+ // `ahead > 0` guard refuses diverged committed history: reconciling it
+ // needs a merge commit, and Pull doesn't author commits — Pull-and-Push
+ // does). Sync → classic commit+merge. B1 runs even with working-tree
+ // conflicts tracked (it re-pins them against the new tip and
+ // fast-forwards the rest of the repo).
+ if (this.behind > 0 && invocation === 'explicit') {
const outcome = await this.doPullCycleB1(handle, branch);
this.scheduleSaveState();
return outcome;
}
+ // Sync context, any mode. Gates on `conflictCount === 0`: a MERGE_HEAD in
+ // flight must be resolved before another merge starts.
if (this.behind > 0 && this.conflictCount === 0) {
+ // An explicit pull that refused on diverged history parked this reason;
+ // the merge about to run is what reconciles it.
+ if (this.pausedReason === 'diverged-local-commits') this.pausedReason = undefined;
this.transitionTo('pulling');
// Gate batch to suppress HEAD watcher reconciliation during SyncEngine merge
this.setBatchInProgress?.(true);
@@ -2086,6 +2585,13 @@ export class SyncEngine {
await handle.git.merge([`origin/${branch}`]);
this.lastSyncUtc = new Date().toISOString();
this.behind = 0;
+ if (this.pausedReason === 'external-changes-pending') this.clearBlockingPause();
+ // The merge that just landed IS the resolution of any overlap pause,
+ // so clear it here. Without this a user who resolved the overlap
+ // themselves (which the panel's terminal handoff tells them to do)
+ // left a fully-synced idle engine still advertising the pause and a
+ // stale path list, indefinitely — nothing else on the success path
+ // clears either field.
this.transitionTo('idle');
} finally {
if (mergePrep.needsStashPop) {
@@ -2322,7 +2828,11 @@ export class SyncEngine {
this.lastSyncUtc = new Date().toISOString();
this.behind = 0;
this.clearPullError();
+ // Clears the paths too, not just the reason: leaving `blockingPaths`
+ // populated behind a cleared reason is what lets a later pause republish
+ // a stale set.
this.pausedReason = undefined;
+ this.blockingPaths = [];
this.transitionTo('idle');
if (plan.newConflicts.length > 0) {
@@ -2568,7 +3078,9 @@ export class SyncEngine {
if (theirsStr === null || !this.isContentConflictPath(p)) {
// Non-content or unreadable tip blob: keep the overlay verbatim, never
- // line-merge or escalate (matches adjacent-config behavior).
+ // line-merge or escalate (matches adjacent-config behavior). B1 serves
+ // only the Pull verb, whose disposition is keep-mine — the Sync verb's
+ // theirs-wins for these paths lives in the classic merge path.
writes.push({ path: p, bytes: mineBuf });
continue;
}
@@ -2640,14 +3152,20 @@ export class SyncEngine {
writes: Array<{ path: string; bytes: Buffer }>,
deletions: string[],
): void {
+ // The exemption admits shareable `.ok` artifacts by their RESOLVED path —
+ // the overlay legitimately re-writes a dirty `.ok/config.yml` or root
+ // template, while a symlink resolving into private `.ok` state stays
+ // refused. Without it every dirty-artifact-overlapping-incoming pull dies
+ // here as a phantom "offline".
+ const guardOpts = { allowShareableOkArtifact: isShareableOkArtifact };
for (const { path, bytes } of writes) {
const abs = join(this.projectDir, path);
- assertRealpathWithinDir(abs, this.projectDir);
+ assertRealpathWithinDir(abs, this.projectDir, guardOpts);
tracedWriteFileSync(abs, bytes);
}
for (const path of deletions) {
const abs = join(this.projectDir, path);
- assertRealpathWithinDir(abs, this.projectDir);
+ assertRealpathWithinDir(abs, this.projectDir, guardOpts);
try {
tracedUnlinkSync(abs);
} catch (e) {
@@ -2720,13 +3238,31 @@ export class SyncEngine {
private async runPushCycle(): Promise<void> {
if (this.pushInFlight) return;
- // The single, authoritative push gate. Push is structurally impossible
- // unless the project is in `full` mode — no scheduling path, manual trigger,
- // or self-heal can reach the push subprocess for a pull-only or off project.
- // This is the consent guarantee: a pull-only follower is never pushed for.
+ // The single, authoritative gate on pushing at the product's own
+ // initiative. Only `full` mode does that — no scheduling path, backoff
+ // retry, or self-heal can reach the push subprocess for any other mode.
+ // `off` and `follow` reach it solely through `runOneShotPush`, behind an
+ // explicit user act. Loosening this line is what would let Open Knowledge
+ // push for a user who never asked it to.
if (this.mode !== 'full') return;
if (this.state === 'dormant' || this.state === 'disabled') return;
if (this.state === 'conflict' || this.state === 'auth-error') return;
+ // B1 records conflicts in the ledger while the engine stays idle, so the
+ // state gate above no longer covers them. Unresolved keep-mine bytes on
+ // disk must not be committed and pushed over a teammate's version — the
+ // resolver decides that, not the push loop. Same rule as the old
+ // state==='conflict' pause, keyed off the ledger instead.
+ //
+ // Re-arm before returning. The timer that fired is already cleared, and
+ // this is the ONLY chain call — a bare return kills the push loop for the
+ // process lifetime. `doPullCycleB1` transitions to `idle` before recording
+ // its conflicts, so the state-keyed re-arm in the resolver never fires for
+ // a B1 conflict and nothing else brings the loop back. Every visible signal
+ // would stay green while commits pile up locally.
+ if (this.conflictCount > 0) {
+ this.schedulePush();
+ return;
+ }
if (isUnbornHead(this.projectDir)) {
this.schedulePush();
return;
@@ -2737,12 +3273,31 @@ export class SyncEngine {
await this.doPushCycle(1);
} finally {
this.pushInFlight = false;
+ if (this.pushCycleLanded) this.markRun();
this.schedulePush(); // chain: schedule next after current completes
}
}
+ // NOTE: the guards above look like `runOneShotPush`'s and are deliberately
+ // NOT shared. Three differences make a common predicate wrong here:
+ // - mode: this path refuses outside `full`; the explicit one runs in every
+ // mode, because a button press is its own consent.
+ // - re-arm: refusals here are split — `conflict`/`auth-error` return bare
+ // (the resolver and the auth flow re-arm), while ledger-conflict and
+ // unborn-head MUST call `schedulePush()` or the loop dies for the process
+ // lifetime. The explicit path re-arms on none of them: arming a
+ // background loop the user did not choose is the bug in the other
+ // direction.
+ // - signal: refusals here are silent by design (a timer fires constantly);
+ // the explicit path logs every refusal, since a user is waiting on it.
+ // Collapsing them is how the loop-death case gets reintroduced. Change one
+ // side deliberately, and re-read the other before assuming they should match.
+
/** @param retriesLeft - Max inline fetch+merge+retry attempts on non-fast-forward. */
private async doPushCycle(retriesLeft = 0): Promise<void> {
+ // Reset per attempt; the retry recursion re-enters here, so the flag
+ // reflects the FINAL attempt's outcome by the time a wrapper reads it.
+ this.pushCycleLanded = false;
// Temp index file for GIT_INDEX_FILE isolation
const tmpIndexPath = join(tmpdir(), `ok-sync-idx-${process.pid}-${Date.now()}.idx`);
let commitSha: string | null = null;
@@ -2840,6 +3395,7 @@ export class SyncEngine {
);
this.lastPushedSha = headSha;
this.lastSyncUtc = new Date().toISOString();
+ this.pushCycleLanded = true;
this.clearPushError();
this.transitionTo('idle');
return;
@@ -2960,6 +3516,7 @@ export class SyncEngine {
if (commitSha) {
this.lastPushedSha = commitSha;
this.lastSyncUtc = new Date().toISOString();
+ this.pushCycleLanded = true;
this.ahead = 0;
this.clearPushError();
if (this.state === 'pushing') {
@@ -3021,7 +3578,20 @@ export class SyncEngine {
if (mc.class === 'semantic' && mc.subclass === 'merge-conflict') {
await this.handleMergeConflict();
} else if (mergeErr instanceof ShareableOkEnumerationError) {
- throw mergeErr;
+ // Routed, NOT rethrown. This catch sits inside the outer catch, so
+ // a throw here escapes doPushCycle entirely — past runOneShotPush's
+ // catch-less try/finally, out to the fire-and-forget
+ // `void engine.trigger()` call sites, where an unhandled rejection
+ // terminates the server.
+ //
+ // `'push'`, unlike the `else` below: a staging failure is the push
+ // leg failing to assemble what it would send, so it belongs on
+ // `pushError` — where the outer catch already puts this same error
+ // type. The sibling branch says `'pull'` because it handles MERGE
+ // errors, and the merge is the retry's pull leg. Same catch block,
+ // genuinely different directions.
+ log.warn({ err: mergeErr }, '[sync] push retry: staging error detail');
+ this.handleError(mc, 'push');
} else {
this.handleError(mc, 'pull');
}
@@ -3296,6 +3866,12 @@ export class SyncEngine {
if (blocking.length > 0) {
const display = blocking.slice(0, 3).join(', ');
const rest = blocking.length > 3 ? `, +${blocking.length - 3} more` : '';
+ // Uncapped: this set is what the resolution ACTION operates on, and a
+ // display bound must not leak into it — a capped set made Commit clear
+ // only the first 50 overlaps, re-pause on the remainder with a different
+ // file list, and read as a product bug. The cap is applied at the status
+ // projection, whose payload rides the CC1 broadcast.
+ this.blockingPaths = blocking;
this.pullErrorCode = undefined;
this.pullError = `Sync paused — your local changes to ${display}${rest} conflict with incoming changes. Commit, stash, or discard them before syncing.`;
this.pausedReason = 'external-changes-pending';
@@ -3326,6 +3902,10 @@ export class SyncEngine {
this.pullError =
'Sync paused — OpenKnowledge could not safely isolate local MCP launcher changes before merging.';
this.pausedReason = 'external-changes-pending';
+ // This pause has no path list — it is an isolation failure, not an
+ // overlap. Clearing explicitly stops it republishing whatever set a
+ // previous overlap pause left behind.
+ this.blockingPaths = [];
this.transitionTo('idle');
this.scheduleSaveState();
return { proceed: false, needsStashPop: false, reconciled: [] };
@@ -3696,24 +4276,38 @@ export class SyncEngine {
return results;
}
+ /**
+ * Whether a project-relative path is inside the set this engine will commit.
+ *
+ * The staging walk, HEAD deletion tracking, and the working-tree status
+ * surface must all answer this identically — a path one admits and another
+ * refuses is precedent #55's failure mode (a HEAD path the gather walk
+ * refuses gets committed as a spurious deletion every cycle). Public because
+ * the status endpoint marks out-of-scope paths in the UI, and a second
+ * predicate for that marking would be free to drift.
+ */
+ isSyncScopedPath(projRelPath: string): boolean {
+ const absPath = join(this.projectDir, projRelPath);
+ const contentRelPath = toPosix(relative(this.contentDir, absPath));
+ const inContentWalk =
+ !contentRelPath.startsWith('..') &&
+ !this.contentFilter.isExcluded(contentRelPath, CONTENT_SYNC_STAGING_SCOPE);
+ // Mirror of the gather walk's project-root enumeration: without this
+ // term, a tracked project-root artifact would be misread as deleted
+ // on every push cycle in subfolder-content.dir projects.
+ const inRootOkWalk =
+ this.rootOkOutsideContentWalk &&
+ projRelPath.startsWith(`${OK_DIR}/`) &&
+ !this.contentFilter.isExcluded(projRelPath, PROJECT_SYNC_STAGING_SCOPE);
+ return inContentWalk || inRootOkWalk;
+ }
+
private async listHeadContentPaths(handle: GitHandle, headSha: string): Promise<Set<string>> {
const paths = new Set<string>();
try {
const headPaths = await listNames(handle.git, ['ls-tree', '-r', '--name-only', headSha]);
for (const projRelPath of headPaths) {
- const absPath = join(this.projectDir, projRelPath);
- const contentRelPath = toPosix(relative(this.contentDir, absPath));
- const inContentWalk =
- !contentRelPath.startsWith('..') &&
- !this.contentFilter.isExcluded(contentRelPath, CONTENT_SYNC_STAGING_SCOPE);
- // Mirror of the gather walk's project-root enumeration: without this
- // term, a tracked project-root artifact would be misread as deleted
- // on every push cycle in subfolder-content.dir projects.
- const inRootOkWalk =
- this.rootOkOutsideContentWalk &&
- projRelPath.startsWith(`${OK_DIR}/`) &&
- !this.contentFilter.isExcluded(projRelPath, PROJECT_SYNC_STAGING_SCOPE);
- if (inContentWalk || inRootOkWalk) {
+ if (this.isSyncScopedPath(projRelPath)) {
paths.add(projRelPath);
}
}
@@ -4065,6 +4659,30 @@ export class SyncEngine {
// ─── State transitions ────────────────────────────────────────────────────
+ /**
+ * Read `this.state` opaquely. An awaited cycle reassigns it, but TypeScript's
+ * control-flow analysis keeps the narrowing from the calling method's own
+ * earlier guards, so a direct `this.state` comparison after the await is
+ * checked against a stale union and reported as an impossible comparison.
+ */
+ private currentState(): SyncState {
+ return this.state;
+ }
+
+ /**
+ * Stamp a successful sync run — a push or pull that reached the remote.
+ * Called only from completion points that know the op did not error: a failed
+ * push must not read "Updated just now" while a red error line sits above it.
+ * The panel-open fetch deliberately does not call this.
+ */
+ private markRun(): void {
+ // Both call sites gate on `pushCycleLanded`, so reaching here always means
+ // a push landed. Pull success stamps its own leg in `recordPullOutcome`;
+ // `lastRunUtc` derives from whichever is later.
+ this.lastPushOkUtc = new Date().toISOString();
+ this.cc1Broadcaster?.signal('sync-status');
+ }
+
private transitionTo(newState: SyncState): void {
if (this.state === newState) return;
const prev = this.state;
@@ -4100,6 +4718,8 @@ export class SyncEngine {
const data: PersistedSyncState = {
version: 1,
lastSyncUtc: this.lastSyncUtc,
+ lastPullOkUtc: this.lastPullOkUtc,
+ lastPushOkUtc: this.lastPushOkUtc,
lastFetchUtc: this.lastFetchUtc,
lastPushedSha: this.lastPushedSha,
consecutiveFailures: this.consecutiveFailures,
@@ -4121,6 +4741,8 @@ export class SyncEngine {
const data = JSON.parse(raw) as Partial<PersistedSyncState>;
if (data.version !== 1) return;
this.lastSyncUtc = data.lastSyncUtc ?? null;
+ this.lastPullOkUtc = data.lastPullOkUtc ?? null;
+ this.lastPushOkUtc = data.lastPushOkUtc ?? null;
this.lastFetchUtc = data.lastFetchUtc ?? null;
this.lastPushedSha = data.lastPushedSha ?? null;
this.consecutiveFailures = data.consecutiveFailures ?? 0;
@@ -4128,8 +4750,15 @@ export class SyncEngine {
// `'auth-error'` out, but a state file written by an earlier build (or
// hand-edited) could still contain them. Drop both on load so a restart
// re-attempts sync rather than resurrecting a stuck auth/permission state.
+ // `external-changes-pending` joins them: `blockingPaths` is memory-only,
+ // so a restored reason advertises a pause the panel cannot render (no
+ // paths) and the resolve endpoint 409s on. The overlap may also have been
+ // resolved outside the app while we were down; the next cycle re-derives
+ // it truthfully.
this.pausedReason =
- data.pausedReason === 'no-push-permission' || data.pausedReason === 'auth-error'
+ data.pausedReason === 'no-push-permission' ||
+ data.pausedReason === 'auth-error' ||
+ data.pausedReason === 'external-changes-pending'
? undefined
: data.pausedReason;