Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

Warn before symlinking skill folders that have diverged (PRD-7980) (#3581)

tim-inkeepc56c3e8f91a6
diff --git a/.changeset/quiet-melons-invite.md b/.changeset/quiet-melons-invite.md
new file mode 100644
index 000000000..4310e1712
--- /dev/null
+++ b/.changeset/quiet-melons-invite.md
@@ -0,0 +1,5 @@
+---
+'@inkeep/open-knowledge': patch
+---
+
+Warn before symlinking two skills folders whose contents differ. Picking a folder to symlink now previews the merge first and states exactly what it moves and what it deletes, including the harness dot-entries (Codex's `.system`) that go away with the folder. Folders holding the same skills still link in one click, and the two refusals — differing versions of the same skill, non-skill entries — are reported before the write instead of as a red toast after it.
diff --git a/packages/app/src/components/settings/SkillFolderLinkConfirmDialog.tsx b/packages/app/src/components/settings/SkillFolderLinkConfirmDialog.tsx
new file mode 100644
index 000000000..8ca0ed258
--- /dev/null
+++ b/packages/app/src/components/settings/SkillFolderLinkConfirmDialog.tsx
@@ -0,0 +1,182 @@
+/**
+ * The consent screen for linking one host skills folder into another: it draws
+ * which folder survives, then groups everything the merge touches by what it
+ * costs you — moves and duplicate drops are lossless, destroyed entries and
+ * replaced deliveries are not.
+ *
+ * Presentational: the caller owns the write and clears `open` when it settles.
+ * The confirm control is a plain Button (not AlertDialogAction) so the dialog
+ * does not tear itself down before the caller's awaited work finishes, matching
+ * SkillInstallConfirmDialog and DeleteConfirmationDialog.
+ *
+ * Direction is the thing users read backwards, so it is drawn rather than
+ * described: the picked folder is on the left becoming a pointer, the surviving
+ * folder on the right keeping the skills.
+ */
+import type { SkillFolderLinkPreview } from '@inkeep/open-knowledge-core';
+import { Trans, useLingui } from '@lingui/react/macro';
+import { ArrowRight, Copy, Trash2, Unlink } from 'lucide-react';
+import {
+ AlertDialog,
+ AlertDialogBody,
+ AlertDialogCancel,
+ AlertDialogContent,
+ AlertDialogDescription,
+ AlertDialogFooter,
+ AlertDialogHeader,
+ AlertDialogTitle,
+} from '@/components/ui/alert-dialog';
+import { Button } from '@/components/ui/button';
+
+export interface SkillFolderLinkConfirmDialogProps {
+ open: boolean;
+ onOpenChange: (open: boolean) => void;
+ /** The folder being consumed — it becomes the symlink. */
+ pick: string;
+ /** The folder that survives and keeps the skills. */
+ keep: string;
+ preview: SkillFolderLinkPreview;
+ onConfirm: () => void;
+}
+
+/** One outcome group: icon + label + count, with the names it covers. `tone`
+ * carries whether the group costs the user anything — destructive for the two
+ * that do, muted for the duplicate drop that does not. */
+function OutcomeRow({
+ icon,
+ label,
+ detail,
+ names,
+ tone,
+ testId,
+}: {
+ icon: React.ReactNode;
+ label: React.ReactNode;
+ detail?: React.ReactNode;
+ names: readonly string[];
+ tone: 'default' | 'muted' | 'destructive';
+ testId: string;
+}) {
+ const toneClass =
+ tone === 'destructive'
+ ? 'text-destructive'
+ : tone === 'muted'
+ ? 'text-muted-foreground'
+ : 'text-foreground';
+ return (
+ <div className="flex gap-2.5" data-testid={testId}>
+ <span className={`mt-0.5 shrink-0 ${toneClass}`} aria-hidden>
+ {icon}
+ </span>
+ <div className="min-w-0 flex-1">
+ <div className="flex items-baseline gap-1.5">
+ <span className={`font-medium text-xs ${toneClass}`}>{label}</span>
+ <span className="text-[10px] text-muted-foreground tabular-nums">{names.length}</span>
+ </div>
+ {detail ? <p className="text-[11px] text-muted-foreground leading-snug">{detail}</p> : null}
+ <div className="mt-1 flex flex-wrap gap-x-2 gap-y-0.5">
+ {names.map((n) => (
+ <code key={n} className="break-all text-[11px] text-muted-foreground">
+ {n}
+ </code>
+ ))}
+ </div>
+ </div>
+ </div>
+ );
+}
+
+export function SkillFolderLinkConfirmDialog({
+ open,
+ onOpenChange,
+ pick,
+ keep,
+ preview,
+ onConfirm,
+}: SkillFolderLinkConfirmDialogProps) {
+ const { t } = useLingui();
+
+ return (
+ <AlertDialog open={open} onOpenChange={onOpenChange}>
+ <AlertDialogContent>
+ <AlertDialogHeader>
+ <AlertDialogTitle>
+ <Trans>Link these skill folders?</Trans>
+ </AlertDialogTitle>
+ <AlertDialogDescription>
+ <Trans>Both agents end up reading everything in {keep}.</Trans>
+ </AlertDialogDescription>
+ </AlertDialogHeader>
+ <AlertDialogBody className="flex flex-col gap-4 py-1">
+ {/* Direction, drawn. Reading it backwards is the mistake this
+ surface keeps producing, so it leads. */}
+ <div className="flex items-center gap-2" data-testid="skill-folder-link-direction">
+ <div className="min-w-0 flex-1 rounded border border-border/60 px-2 py-1.5">
+ <code className="block break-all font-mono text-[11px]">{pick}</code>
+ <span className="text-[10px] text-muted-foreground">
+ <Trans>becomes a symlink</Trans>
+ </span>
+ </div>
+ <ArrowRight className="size-4 shrink-0 text-muted-foreground" aria-hidden />
+ <div className="min-w-0 flex-1 rounded border border-border/60 bg-muted/40 px-2 py-1.5">
+ <code className="block break-all font-mono text-[11px]">{keep}</code>
+ <span className="text-[10px] text-muted-foreground">
+ <Trans>keeps the skills</Trans>
+ </span>
+ </div>
+ </div>
+
+ <div className="flex flex-col gap-3">
+ {preview.moves.length > 0 ? (
+ <OutcomeRow
+ testId="skill-folder-link-moves"
+ icon={<ArrowRight className="size-3.5" />}
+ tone="default"
+ label={<Trans>Move across</Trans>}
+ names={preview.moves}
+ />
+ ) : null}
+ {preview.drops.length > 0 ? (
+ <OutcomeRow
+ testId="skill-folder-link-drops"
+ icon={<Copy className="size-3.5" />}
+ tone="muted"
+ label={<Trans>Duplicates dropped</Trans>}
+ detail={t`Identical in both — ${pick} still reads them.`}
+ names={preview.drops}
+ />
+ ) : null}
+ {preview.replaces.length > 0 ? (
+ <OutcomeRow
+ testId="skill-folder-link-replaces"
+ icon={<Unlink className="size-3.5" />}
+ tone="destructive"
+ label={<Trans>Skills reassigned</Trans>}
+ detail={t`These currently read from another folder. After linking, they read from ${keep} instead.`}
+ names={preview.replaces}
+ />
+ ) : null}
+ {preview.removes.length > 0 ? (
+ <OutcomeRow
+ testId="skill-folder-link-removes"
+ icon={<Trash2 className="size-3.5" />}
+ tone="destructive"
+ label={<Trans>Deleted for good</Trans>}
+ detail={t`OK can't move these, so they go when ${pick} does.`}
+ names={preview.removes}
+ />
+ ) : null}
+ </div>
+ </AlertDialogBody>
+ <AlertDialogFooter>
+ <AlertDialogCancel>
+ <Trans>Cancel</Trans>
+ </AlertDialogCancel>
+ <Button onClick={onConfirm} data-testid="skill-folder-link-confirm">
+ <Trans>Link folders</Trans>
+ </Button>
+ </AlertDialogFooter>
+ </AlertDialogContent>
+ </AlertDialog>
+ );
+}
diff --git a/packages/app/src/components/settings/SkillTargetsPicker.dom.test.tsx b/packages/app/src/components/settings/SkillTargetsPicker.dom.test.tsx
index 46b5fb71f..07147e038 100644
--- a/packages/app/src/components/settings/SkillTargetsPicker.dom.test.tsx
+++ b/packages/app/src/components/settings/SkillTargetsPicker.dom.test.tsx
@@ -5,24 +5,25 @@
* state and the SYMLINK (explicit pick) / UNLINK verbs.
*/
-import { cleanup, render, screen, waitFor } from '@testing-library/react';
+import { 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';
+const translate = (strings: TemplateStringsArray | string, ...values: unknown[]) => {
+ if (typeof strings === 'string') return strings;
+ let out = '';
+ strings.forEach((sPart, i) => {
+ out += sPart;
+ if (i < values.length) out += String(values[i]);
+ });
+ return out;
+};
+
vi.doMock('@lingui/react/macro', () => ({
Trans: ({ children }: { children: ReactNode }) => children,
- useLingui: () => ({
- t: (strings: TemplateStringsArray | string, ...values: unknown[]) => {
- if (typeof strings === 'string') return strings;
- let out = '';
- strings.forEach((sPart, i) => {
- out += sPart;
- if (i < values.length) out += String(values[i]);
- });
- return out;
- },
- }),
+ t: translate,
+ useLingui: () => ({ t: translate }),
}));
vi.doMock('sonner', () => ({
@@ -35,6 +36,7 @@ const realFetch = global.fetch;
afterEach(() => {
cleanup();
global.fetch = realFetch;
+ vi.restoreAllMocks();
});
const FOLDERS_PAYLOAD = {
@@ -81,30 +83,229 @@ describe('SkillTargetsPicker (folders)', () => {
expect(screen.queryByTestId('skill-install-mode-user')).toBeNull();
expect(screen.queryByTestId('skill-install-mode-project')).toBeNull();
expect(screen.queryByTestId('skill-target-claude')).toBeNull();
+ expect(screen.getByRole('textbox', { name: 'Custom skills folder path' })).toBeDefined();
});
- test('the row you act on survives; the folder you pick becomes the symlink', async () => {
+ /** Record every folderAction sent, answering the preview request with `preview`. */
+ function captureFolderActions(preview?: Record<string, unknown>): Array<Record<string, unknown>> {
const calls: Array<Record<string, unknown>> = [];
global.fetch = vi.fn(async (_url: unknown, init?: { body?: string }) => {
- if (init?.body) calls.push(JSON.parse(init.body).folderAction);
- return { ok: true, status: 200, json: async () => FOLDERS_PAYLOAD };
+ const action = init?.body
+ ? (JSON.parse(init.body).folderAction as Record<string, unknown>)
+ : undefined;
+ if (action) calls.push(action);
+ return {
+ ok: true,
+ status: 200,
+ json: async () =>
+ action?.preview === true && preview ? { ...FOLDERS_PAYLOAD, preview } : FOLDERS_PAYLOAD,
+ };
}) as unknown as typeof fetch;
+ return calls;
+ }
+
+ const EMPTY_PREVIEW = {
+ moves: [],
+ drops: [],
+ removes: [],
+ replaces: [],
+ conflicts: [],
+ strays: [],
+ };
+ async function pickAgentsIntoClaude(): Promise<void> {
render(<SkillTargetsPicker scope="project" />);
await waitFor(() => expect(screen.getByTestId('skill-folder-link-claude')).toBeDefined());
-
await userEvent.click(screen.getByTestId('skill-folder-link-claude'));
await userEvent.click(await screen.findByTestId('skill-folder-link-claude-to-.agents/skills'));
+ }
+
+ test('the row you act on survives; the folder you pick becomes the symlink', async () => {
+ const calls = captureFolderActions(EMPTY_PREVIEW);
+ await pickAgentsIntoClaude();
// `.agents` was PICKED, so `.agents` is the one that merges in and becomes
// the symlink; the clicked `.claude` row stays the real folder. Running it
// the other way round was the inverted direction people read backwards.
- await waitFor(() => expect(calls).toHaveLength(1));
+ // Nothing to disclose, so the write follows the classification with no
+ // question in between — a clean link stays one click.
+ await waitFor(() => expect(calls).toHaveLength(2));
expect(calls[0]).toMatchObject({
action: 'link',
root: '.agents/skills',
target: '.claude/skills',
+ preview: true,
+ });
+ expect(calls[1]).toMatchObject({
+ action: 'link',
+ root: '.agents/skills',
+ target: '.claude/skills',
});
+ expect(calls[1].preview).toBeUndefined();
+ });
+
+ test('a pure-duplicate merge never asks — it costs the user nothing', async () => {
+ const confirmSpy = vi.spyOn(window, 'confirm');
+ // Every name is byte-identical in both folders. After the link the picked
+ // folder IS a symlink to the one holding those copies, so every agent reads
+ // exactly what it read before. Nothing to consent to.
+ const calls = captureFolderActions({ ...EMPTY_PREVIEW, drops: ['a', 'b', 'c'] });
+ await pickAgentsIntoClaude();
+
+ await waitFor(() => expect(calls).toHaveLength(2));
+ expect(screen.queryByTestId('skill-folder-link-confirm')).toBeNull();
+ expect(confirmSpy).not.toHaveBeenCalled();
+ expect(calls[1].preview).toBeUndefined();
+ confirmSpy.mockRestore();
+ });
+
+ test('a link that moves or destroys asks first, and a decline writes nothing', async () => {
+ const calls = captureFolderActions({
+ ...EMPTY_PREVIEW,
+ moves: ['only-here'],
+ drops: ['both'],
+ removes: ['.system'],
+ });
+ await pickAgentsIntoClaude();
+
+ const dialog = await screen.findByRole('alertdialog');
+ // Direction is drawn, not described — the picked folder becomes the link,
+ // the acted-on row keeps the skills. Reading it backwards is the mistake
+ // this surface keeps producing.
+ expect(within(dialog).getByTestId('skill-folder-link-direction').textContent).toContain(
+ '.agents/skills',
+ );
+ expect(within(dialog).getByTestId('skill-folder-link-moves').textContent).toContain(
+ 'only-here',
+ );
+ expect(within(dialog).getByTestId('skill-folder-link-drops').textContent).toContain('both');
+ // The dot-entries no move covers go away with the folder — say so before
+ // the write, not never.
+ expect(within(dialog).getByTestId('skill-folder-link-removes').textContent).toContain(
+ '.system',
+ );
+
+ await userEvent.click(within(dialog).getByText('Cancel'));
+ // Declined: the classification was the only request.
+ expect(calls).toHaveLength(1);
+ expect(calls[0]?.preview).toBe(true);
+ });
+
+ test('a delivery link the merge overwrites in the SURVIVOR is disclosed too', async () => {
+ const calls = captureFolderActions({
+ ...EMPTY_PREVIEW,
+ moves: ['shared'],
+ replaces: ['shared'],
+ });
+ await pickAgentsIntoClaude();
+
+ const dialog = await screen.findByRole('alertdialog');
+ // Listed only under "moves" the name reads as a pure addition, when the
+ // survivor is in fact losing a working delivery.
+ expect(within(dialog).getByTestId('skill-folder-link-replaces').textContent).toContain(
+ 'shared',
+ );
+ expect(calls).toHaveLength(1);
+ });
+
+ test('accepting the disclosure performs the link', async () => {
+ const calls = captureFolderActions({ ...EMPTY_PREVIEW, moves: ['only-here'] });
+ await pickAgentsIntoClaude();
+
+ await userEvent.click(await screen.findByTestId('skill-folder-link-confirm'));
+ await waitFor(() => expect(calls).toHaveLength(2));
+ expect(calls[1].preview).toBeUndefined();
+ });
+
+ test('conflicting skills block before the write, not as a 409 after it', async () => {
+ const calls = captureFolderActions({ ...EMPTY_PREVIEW, conflicts: ['fork'] });
+ await pickAgentsIntoClaude();
+
+ const { toast } = await import('sonner');
+ await waitFor(() => expect(toast.error).toHaveBeenCalled());
+ expect(String(vi.mocked(toast.error).mock.calls.at(-1)?.[0])).toContain('fork');
+ // Never asked, never written — the link could only have been refused.
+ expect(screen.queryByRole('alertdialog')).toBeNull();
+ expect(calls).toHaveLength(1);
+ });
+
+ test('non-skill entries block before the write, not as a 409 after it', async () => {
+ const calls = captureFolderActions({ ...EMPTY_PREVIEW, strays: ['notes.md'] });
+ await pickAgentsIntoClaude();
+
+ const { toast } = await import('sonner');
+ await waitFor(() => expect(toast.error).toHaveBeenCalled());
+ const message = String(vi.mocked(toast.error).mock.calls.at(-1)?.[0]);
+ expect(message).toContain('notes.md');
+ expect(message).toContain('Remove or move them from the folder and try again.');
+ // Same shape as the conflicts refusal: the classification is the only
+ // request, no dialog, no write.
+ expect(screen.queryByRole('alertdialog')).toBeNull();
+ expect(calls).toHaveLength(1);
+ });
+
+ test('a preview whose plan cannot be read fails closed — no unwitnessed write', async () => {
+ const calls: Array<Record<string, unknown>> = [];
+ global.fetch = vi.fn(async (_url: unknown, init?: { body?: string }) => {
+ const action = init?.body
+ ? (JSON.parse(init.body).folderAction as Record<string, unknown>)
+ : undefined;
+ if (action) calls.push(action);
+ // The preview PUT answers with an unreadable body — the plan is lost in
+ // transit. The write must NOT fire on the strength of "nothing came back".
+ if (action?.preview === true) {
+ return {
+ ok: true,
+ status: 200,
+ json: async () => {
+ throw new Error('unparseable');
+ },
+ };
+ }
+ return { ok: true, status: 200, json: async () => FOLDERS_PAYLOAD };
+ }) as unknown as typeof fetch;
+ await pickAgentsIntoClaude();
+
+ const { toast } = await import('sonner');
+ await waitFor(() => expect(toast.error).toHaveBeenCalled());
+ // The classification was the only request — the merge never ran unwitnessed.
+ expect(calls).toHaveLength(1);
+ expect(calls[0]?.preview).toBe(true);
+ expect(screen.queryByRole('alertdialog')).toBeNull();
+ });
+
+ test('a structurally malformed preview fails closed at the HTTP boundary', async () => {
+ const calls = captureFolderActions({ ...EMPTY_PREVIEW, conflicts: null });
+ await pickAgentsIntoClaude();
+
+ const { toast } = await import('sonner');
+ await waitFor(() => expect(toast.error).toHaveBeenCalled());
+ expect(String(vi.mocked(toast.error).mock.calls.at(-1)?.[0])).toContain(
+ 'Server returned a malformed response.',
+ );
+ expect(calls).toHaveLength(1);
+ expect(calls[0]?.preview).toBe(true);
+ expect(screen.queryByRole('alertdialog')).toBeNull();
+ });
+
+ test('an absent preview plan is refused again at the component boundary', async () => {
+ global.fetch = vi.fn(async () => ({
+ ok: true,
+ status: 200,
+ json: async () => FOLDERS_PAYLOAD,
+ })) as unknown as typeof fetch;
+ const skillsApi = await import('../../lib/skills-api');
+ const actionSpy = vi.spyOn(skillsApi, 'putSkillFolderAction').mockResolvedValue({ ok: true });
+
+ await pickAgentsIntoClaude();
+
+ const { toast } = await import('sonner');
+ await waitFor(() => expect(toast.error).toHaveBeenCalled());
+ expect(String(vi.mocked(toast.error).mock.calls.at(-1)?.[0])).toContain(
+ 'Could not classify the merge',
+ );
+ expect(actionSpy).toHaveBeenCalledTimes(1);
+ expect(screen.queryByRole('alertdialog')).toBeNull();
});
test('a folder that is already a symlink is not offered as a pick', async () => {
diff --git a/packages/app/src/components/settings/SkillTargetsPicker.tsx b/packages/app/src/components/settings/SkillTargetsPicker.tsx
index 693bd7644..cbb7b86ca 100644
--- a/packages/app/src/components/settings/SkillTargetsPicker.tsx
+++ b/packages/app/src/components/settings/SkillTargetsPicker.tsx
@@ -1,11 +1,12 @@
// 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 type { SkillScope } from '@inkeep/open-knowledge-core';
+import type { SkillFolderLinkPreview, SkillScope } from '@inkeep/open-knowledge-core';
import { Trans, useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { toast } from 'sonner';
import { AgentBrandIcon } from '@/components/AgentIconCluster';
import { ChangedOutsideBadge } from '@/components/ChangedOutsideBadge';
+import { SkillFolderLinkConfirmDialog } from '@/components/settings/SkillFolderLinkConfirmDialog';
import { Button } from '@/components/ui/button';
import {
DropdownMenu,
@@ -34,6 +35,13 @@ export function SkillTargetsPicker({ scope }: { scope: SkillScope }) {
const { t } = useLingui();
const { state, saving, folderAction } = useSkillTargets();
const [newRoot, setNewRoot] = useState('');
+ const [pendingLink, setPendingLink] = useState<{
+ root: string;
+ target: string;
+ pick: string;
+ keep: string;
+ preview: SkillFolderLinkPreview;
+ } | null>(null);
const folders =
state.status === 'ready' ? (state.data.folders ?? []).filter((f) => f.scope === scope) : [];
@@ -65,6 +73,56 @@ export function SkillTargetsPicker({ scope }: { scope: SkillScope }) {
);
};
+ const displayRoot = (root: string) => (scope === 'global' ? `~/${root}` : root);
+
+ /**
+ * A link only asks when it costs you something. Moves change what the
+ * surviving folder's agent reads; destroyed entries and replaced deliveries
+ * are outright losses. Duplicate drops are none of those — the folder becomes
+ * a symlink to the folder holding the identical copies, so every agent reads
+ * exactly what it read before — so they never open the dialog on their own.
+ * The two refusals are reported here rather than fired at a request that can
+ * only 409.
+ */
+ const runFolderLink = (root: string, target: string) => {
+ const pick = displayRoot(root);
+ const keep = displayRoot(target);
+ void folderAction({ scope, root, action: 'link', target, preview: true })
+ .then((p) => {
+ if (!p) {
+ toast.error(t`Could not classify the merge — try again.`);
+ return;
+ }
+ if (p.conflicts.length > 0) {
+ toast.error(
+ t`${pick} and ${keep} both hold a different version of: ${p.conflicts.join(', ')}. Resolve those first — a symlink can only keep one of each.`,
+ );
+ return;
+ }
+ if (p.strays.length > 0) {
+ toast.error(
+ t`${pick} holds entries that aren't skills: ${p.strays.join(', ')}. Remove or move them from the folder and try again.`,
+ );
+ return;
+ }
+ if (p.moves.length + p.removes.length + p.replaces.length > 0) {
+ setPendingLink({ root, target, pick, keep, preview: p });
+ return;
+ }
+ return folderAction({ scope, root, action: 'link', target });
+ })
+ .catch((err) => toast.error(err instanceof Error ? err.message : String(err)));
+ };
+
+ const confirmPendingLink = () => {
+ if (!pendingLink) return;
+ const { root, target } = pendingLink;
+ setPendingLink(null);
+ void folderAction({ scope, root, action: 'link', target }).catch((err) =>
+ toast.error(err instanceof Error ? err.message : String(err)),
+ );
+ };
+
return (
<section
className="space-y-2 rounded-lg border bg-card p-3"
@@ -93,7 +151,7 @@ export function SkillTargetsPicker({ scope }: { scope: SkillScope }) {
) : (
<ul className="space-y-1 pt-1">
{rows.map((f) => {
- const display = scope === 'global' ? `~/${f.root}` : f.root;
+ const display = displayRoot(f.root);
const following = followers.get(f.root) ?? [];
// Offerable: every OTHER root at this scope that can still BECOME a
// symlink to this one. A folder that is already a symlink (its own,
@@ -152,7 +210,7 @@ export function SkillTargetsPicker({ scope }: { scope: SkillScope }) {
title={t`Pick a folder to merge INTO ${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.`}
data-testid={`skill-folder-link-${f.host}`}
>
- <Trans>symlink</Trans>
+ <Trans>Link</Trans>
</Button>
</DropdownMenuTrigger>
{/* Size to the widest item, not the tiny trigger: the base
@@ -164,7 +222,7 @@ export function SkillTargetsPicker({ scope }: { scope: SkillScope }) {
key={o.root}
// THIS row survives: the PICKED folder is the one that
// merges in and becomes the symlink.
- onSelect={() => runFolderAction(o.root, 'link', f.root)}
+ onSelect={() => runFolderLink(o.root, f.root)}
data-testid={`skill-folder-link-${f.host}-to-${o.root}`}
>
<AgentBrandIcon host={o.host} aria-hidden className="size-4" />
@@ -256,6 +314,7 @@ export function SkillTargetsPicker({ scope }: { scope: SkillScope }) {
<Input
value={newRoot}
onChange={(e) => setNewRoot(e.target.value)}
+ aria-label={t`Custom skills folder path`}
placeholder={scope === 'global' ? t`~/.myteam/skills` : t`.myteam/skills`}
className="h-7 flex-1 font-mono text-xs"
disabled={saving}
@@ -271,6 +330,18 @@ export function SkillTargetsPicker({ scope }: { scope: SkillScope }) {
<Trans>Add custom path</Trans>
</Button>
</form>
+ {pendingLink ? (
+ <SkillFolderLinkConfirmDialog
+ open
+ onOpenChange={(next) => {
+ if (!next) setPendingLink(null);
+ }}
+ pick={pendingLink.pick}
+ keep={pendingLink.keep}
+ preview={pendingLink.preview}
+ onConfirm={confirmPendingLink}
+ />
+ ) : null}
</section>
);
}
diff --git a/packages/app/src/hooks/use-skill-targets.ts b/packages/app/src/hooks/use-skill-targets.ts
index fe7cf9a9d..34fc06d14 100644
--- a/packages/app/src/hooks/use-skill-targets.ts
+++ b/packages/app/src/hooks/use-skill-targets.ts
@@ -1,4 +1,5 @@
import {
+ type SkillFolderLinkPreview,
type SkillScope,
type SkillTargetsGetSuccess,
SkillTargetsGetSuccessSchema,
@@ -16,13 +17,16 @@ export interface SkillTargetsHandle {
saving: boolean;
/** Folder-level verb: LINK a host's skills folder into a root (merge-then-
* swap; conflicts reject with a message) or UNLINK it back into per-skill
- * symlinks. Refreshes the snapshot + skills list on success. */
+ * symlinks. Refreshes the snapshot + skills list on success. `preview`
+ * classifies a LINK and resolves with the plan instead — nothing is written,
+ * so nothing is refreshed. */
folderAction: (action: {
scope: SkillScope;
root: string;
action: 'link' | 'unlink' | 'add-root';
target?: string;
- }) => Promise<void>;
+ preview?: boolean;
+ }) => Promise<SkillFolderLinkPreview | undefined>;
}
/**
@@ -81,7 +85,8 @@ export function useSkillTargets(): SkillTargetsHandle {
root: string;
action: 'link' | 'unlink' | 'add-root';
target?: string;
- }): Promise<void> => {
+ preview?: boolean;
+ }): Promise<SkillFolderLinkPreview | undefined> => {
setSaving(true);
// One client for this endpoint. Two independently-written ones had drifted
// into reporting different fields of the same error body.
@@ -90,9 +95,14 @@ export function useSkillTargets(): SkillTargetsHandle {
setSaving(false);
throw new Error(result.error);
}
+ if (action.preview) {
+ setSaving(false);
+ return result.preview;
+ }
emitSkillsChanged();
setRefreshKey((k) => k + 1);
setSaving(false);
+ return undefined;
};
return { state, saving, folderAction };
diff --git a/packages/app/src/lib/skills-api.ts b/packages/app/src/lib/skills-api.ts
index 617a1c352..14dd8f067 100644
--- a/packages/app/src/lib/skills-api.ts
+++ b/packages/app/src/lib/skills-api.ts
@@ -2,6 +2,7 @@ import type {
SeedInstallPackSkillSuccess,
SkillDetail,
SkillDiscover,
+ SkillFolderLinkPreview,
SkillFrontmatter,
SkillInstallWarningCode,
SkillPreview,
@@ -12,7 +13,7 @@ import type {
SkillsListEntry,
SkillsSearchSuccess,
} from '@inkeep/open-knowledge-core';
-import { SkillsListSuccessSchema } from '@inkeep/open-knowledge-core';
+import { SkillFolderLinkPreviewSchema, SkillsListSuccessSchema } from '@inkeep/open-knowledge-core';
import { t } from '@lingui/core/macro';
import { emitSkillsChanged } from '@/lib/documents-events';
import { parseApiError } from '@/lib/parse-api-error';
@@ -982,7 +983,9 @@ export async function putSkillFolderAction(action: {
action: 'link' | 'unlink' | 'add-root';
target?: string;
exclude?: string[];
-}): Promise<{ ok: true } | { ok: false; error: string }> {
+ /** `link` only — classify the merge and return it, writing nothing. */
+ preview?: boolean;
+}): Promise<{ ok: true; preview?: SkillFolderLinkPreview } | { ok: false; error: string }> {
try {
const res = await fetch('/api/skill-targets', {
method: 'PUT',
@@ -990,7 +993,20 @@ export async function putSkillFolderAction(action: {
body: JSON.stringify({ folderAction: action }),
});
if (!res.ok) return { ok: false, error: await readErrorBody(res) };
- return { ok: true };
+ // Non-preview verbs carry no body worth reading — the 2xx is the receipt.
+ if (!action.preview) return { ok: true };
+ // A preview asked for the plan; if none comes back (unreadable body, or a
+ // response missing it) fail CLOSED. The caller merges only on a plan it has
+ // seen — never on the strength of an absent one, which would run the
+ // destructive link with nothing disclosed.
+ const payload: unknown = await res.json().catch(() => null);
+ const preview =
+ typeof payload === 'object' && payload !== null && 'preview' in payload
+ ? payload.preview
+ : undefined;
+ const parsed = SkillFolderLinkPreviewSchema.safeParse(preview);
+ if (!parsed.success) return { ok: false, error: t`Server returned a malformed response.` };
+ return { ok: true, preview: parsed.data };
} catch (e) {
return { ok: false, error: e instanceof Error ? e.message : String(e) };
}
diff --git a/packages/app/src/locales/ar/messages.json b/packages/app/src/locales/ar/messages.json
index de35c362a..7f2935a9f 100644
--- a/packages/app/src/locales/ar/messages.json
+++ b/packages/app/src/locales/ar/messages.json
@@ -67,6 +67,12 @@
"-q4abP": [
"النتائج محدودة — تحتوي مساحة العمل هذه على ملفات أكثر مما يستطيع البحث فهرسته. قد يكون الملف المفقود أثرًا للحد، لا خطأً إملائيًا."
],
+ "-qBQVd": [
+ ["pick"],
+ " يحتوي على عناصر ليست مهارات: ",
+ ["0"],
+ ". أزلها من المجلد أو انقلها، ثم حاول مرة أخرى."
+ ],
"-slrNR": ["بدّل قائمة المهام."],
"-uaQnI": ["لا توجد أشجار عمل أو فروع مطابقة."],
"-yOx8u": ["جارٍ حفظ التغييرات…"],
@@ -129,6 +135,7 @@
"0g7rCZ": ["تم التكرار إلى «", ["0"], "»"],
"0jD-Gn": ["قاعدة معرفة لفريق، ويكي شخصي، مستندات مشروع..."],
"0kTAXe": ["فتح المصدر: ", ["mirrorSrc"]],
+ "0m4Snh": ["أُعيد إسناد المهارات"],
"0pZmTP": ["تعذّرت مشاركة هذا المسار."],
"0qyKG6": ["متزامن من القرص"],
"0r6d6v": ["حُفظت التغييرات تلقائيًا."],
@@ -216,6 +223,7 @@
"2BBAbc": ["قائمة"],
"2C-6zf": ["غير مُرسل"],
"2CHoQv": ["إعادة تحميل قسرية"],
+ "2Ce6hp": ["تنتقل"],
"2D1x3Y": ["تطبيق وإعادة تشغيل خادم المشروع"],
"2FYpfJ": ["المزيد"],
"2FnYUD": [
@@ -1269,6 +1277,7 @@
"ErRi6L": ["حُذف القالب «", ["label"], "»"],
"Es-eZU": ["الإزالة من المشاريع الحديثة"],
"Es3G-g": ["يعيش في هذا المشروع (حيثما كان مجلد المهارة) ويُشارَك مع المتعاونين عبر git."],
+ "Eu-LIb": ["هل تربط مجلدي المهارات هذين؟"],
"Ev2r9A": ["لا نتائج"],
"EvIJVD": ["استدعاء أداة"],
"EvPX7f": ["يفتح منتقي مجلدات لاختيار مكان استنساخ المستودع."],
@@ -1466,6 +1475,7 @@
"H1TmTu": ["توقف الإصلاح. تبقى الملفات المُصلَحة بالفعل كما هي."],
"H3oH0g": ["إعادة"],
"H86f9p": ["طيّ"],
+ "H8DVOJ": ["متطابقة في الاثنين، وسيظل ", ["pick"], " يقرأها."],
"HAkEqR": ["الملفات الأخيرة"],
"HAvHev": ["التحديث التلقائي معطّل لـ «", ["name"], "»"],
"HAvRAI": [
@@ -1600,6 +1610,7 @@
"It9ARY": ["بدّل لوحة المستند اليمنى."],
"It9oAP": ["أصبحت نسخة ", ["editor"], " هي المصدر"],
"ItxGi3": ["يجب أن يقل إجمالي المرفقات عن 3 ميغابايت."],
+ "IvKbeq": ["سيقرأ الوكيلان في النهاية كل ما في ", ["keep"], "."],
"Ix0K8o": ["إخفاء عقد الروابط الخارجية"],
"IxHMdF": ["تعذّر حذف ذلك التعليق."],
"IxyZXD": ["لقطة الشاشة"],
@@ -1705,6 +1716,7 @@
"Kiytqd": ["استثناء: المهارات مشتركة"],
"KjTmeO": ["حدّث OpenKnowledge لفتح هذه المشاركة."],
"KkEAud": ["أنشئ ملفًا من سياق المستند أو المجلد الحالي."],
+ "KkRyMI": ["تعذّر تصنيف الدمج — حاول مرة أخرى."],
"KmydK6": ["عريض"],
"KnoB--": ["سيُحفظ باسم <0>", ["sanitized"], "</0>."],
"KpOJFY": ["تفعيل معاينات الروابط الخارجية"],
@@ -2306,6 +2318,7 @@
"RrAIZx": ["ما تشمله مشاركة الإعدادات"],
"Rsdhj9": ["تحذيرات الإعداد"],
"Rx5ReQ": ["إعادة تسمية ", ["keyName"]],
+ "RxF-am": ["إسقاط المكرر"],
"RyIKxy": [
"نُقل هذا ",
["targetNoun"],
@@ -3190,6 +3203,7 @@
"bcDHUM": [["descriptorLabel"], " — خطأ في العرض، يمكن تحرير المصدر أدناه"],
"bcjYUA": ["طيّ المصدر أو بسطه"],
"bcm0pR": ["الوكيل المفتوح"],
+ "beHZo4": ["لا يستطيع OK نقل هذه العناصر، لذا تختفي مع ", ["pick"], "."],
"bi2C2s": ["تعذّر الوصول إلى ", ["displayName"], ". يُرجى المحاولة لاحقًا."],
"bjsEcb": ["إحضار الكل إلى الأمام"],
"bkQRMh": ["فقرة"],
@@ -3466,6 +3480,7 @@
"evs0iw": ["وسوم تطابق «", ["tagListQuery"], "»"],
"ewSbS_": ["جلسة Shell"],
"ezUmoU": ["قيم العناصر المسموح بها (فارغ = أي قيمة)"],
+ "f1-q9m": ["يحتفظ بالمهارات"],
"f14doC": ["Slidev"],
"f1XQyZ": ["نقل الكتلة"],
"f65AOQ": ["البدء من"],
@@ -3704,6 +3719,7 @@
"hpzRlK": ["إعادة فتح التبويب المغلق"],
"hqCwRf": ["لم يُحدَّد ملف"],
"hqVQbT": ["إضافة تعليق"],
+ "hs5BRR": ["تُحذف نهائيًا"],
"hvZwVx": ["تحويل"],
"hwFOFD": ["فشل تحميل الإعدادات"],
"hxBHxQ": ["سطر مع حاشية<0><1>[1]</1></0> وتعريف معروض أدناه."],
@@ -3829,6 +3845,7 @@
"jENU1Q": [
"ينطبق على كل المشاريع على هذا الجهاز. يوافق Claude وCodex، عند تشغيلهما من الطرفية المدمجة، تلقائيًا على أدوات القراءة والكتابة في OpenKnowledge (كما يشغّل Claude «ok open» تلقائيًا). أما الحذف والنقل والمشاركة والاستيراد وتثبيت المهارات، والأوامر الأخرى، وتحرير الملفات خارج OpenKnowledge فتظل تسأل. لا يتأثر Cursor وOpenCode وPi. حسب المتاح لكل وكيل."
],
+ "jEVipR": ["تُقرأ هذه حاليًا من مجلد آخر. بعد الربط، ستُقرأ من ", ["keep"], " بدلًا منه."],
"jEZ6Lf": ["مؤقت"],
"jEdF24": ["صفحة مفقودة: ", ["linkTitle"], ". انقر لإنشائها."],
"jJdwCB": ["التراجع"],
@@ -3975,6 +3992,7 @@
"kfL8BJ": ["فشل الاستيراد: ", ["0"]],
"khCa4M": ["يعلّم وكلاء البرمجة في هذا المشروع القراءة والكتابة عبر OpenKnowledge."],
"kj9pAE": ["يجري إنشاء الصفحة"],
+ "kjlQ9D": ["يصبح رابطًا رمزيًا"],
"kknhfj": ["لا تغييرات"],
"kkux8f": ["تعذّر حذف ", ["0"], ". حاول مرة أخرى."],
"klPS-L": ["الملف الأصلي — قبل تعديلات هذا الوكيل."],
@@ -3994,6 +4012,15 @@
"l17ab4": ["تعذّرت كتابة ملفات المشروع. جرّب موقعًا مختلفًا."],
"l1aQKz": ["جدول المحرر المرئي"],
"l1l8sj": ["قبل ", ["0"], " يوم"],
+ "l2BOXd": [
+ "يحتوي كل من ",
+ ["pick"],
+ " و",
+ ["keep"],
+ " على نسخة مختلفة من: ",
+ ["0"],
+ ". عالج ذلك أولًا: الرابط الرمزي لا يمكنه الاحتفاظ إلا بنسخة واحدة من كل مهارة."
+ ],
"l3s5ri": ["استيراد"],
"l3zD7w": ["يجري تشغيل الوكيل…"],
"l46MqT": ["التبويب التالي"],
@@ -4331,6 +4358,7 @@
"». أعد التحميل للمحاولة مرة أخرى."
],
"oxdGJn": ["قبل أن تغادر، هل تخبرنا بالسبب؟"],
+ "oyBV3W": ["مسار مجلد المهارات المخصص"],
"p0Iq25": ["إدراج رابط"],
"p2LEhJ": ["رمز وصول شخصي"],
"p3m_Gk": [
@@ -4556,6 +4584,7 @@
"rbrHTd": ["موافق عليه — ", ["optionName"]],
"rcJmK8": ["تحويل المواقع إلى نسخ"],
"rdU729": ["التخطيط"],
+ "rf0tV1": ["اربط المجلدين"],
"rf8fiC": ["إغلاق النافذة"],
"rfFpcF": ["إزالة ", ["chip"]],
"rg7hNd": ["قيّم تجربتك"],
diff --git a/packages/app/src/locales/ar/messages.po b/packages/app/src/locales/ar/messages.po
index 355986acd..1faf84804 100644
--- a/packages/app/src/locales/ar/messages.po
+++ b/packages/app/src/locales/ar/messages.po
@@ -814,6 +814,16 @@ msgstr "{percent}% مستخدَم ({left}% متبقٍّ)"
msgid "{phase} — {pct}%"
msgstr "{phase} — {pct}%"
+#. placeholder {0}: p.conflicts.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} and {keep} both hold a different version of: {0}. Resolve those first — a symlink can only keep one of each."
+msgstr "يحتوي كل من {pick} و{keep} على نسخة مختلفة من: {0}. عالج ذلك أولًا: الرابط الرمزي لا يمكنه الاحتفاظ إلا بنسخة واحدة من كل مهارة."
+
+#. placeholder {0}: p.strays.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} holds entries that aren't skills: {0}. Remove or move them from the folder and try again."
+msgstr "{pick} يحتوي على عناصر ليست مهارات: {0}. أزلها من المجلد أو انقلها، ثم حاول مرة أخرى."
+
#: src/components/CreatedItemsList.tsx
msgid "{pluginCount, plural, one {plugin} other {plugins}}"
msgstr "{pluginCount, plural, zero {إضافات} one {إضافة} two {إضافتان} few {إضافات} many {إضافة} other {إضافة}}"
@@ -1980,6 +1990,10 @@ msgstr "لم تطابق استجابة الروابط الخلفية الشكل
msgid "Base branch"
msgstr "الفرع الأساسي"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "becomes a symlink"
+msgstr "يصبح رابطًا رمزيًا"
+
#: src/components/TemplateBody.tsx
msgid "Becomes the document's content when someone creates a doc from this template. Type <0>{dateToken}</0> or <1>{userToken}</1> to fill in today's date or the author's name automatically."
msgstr "يصبح محتوى المستند عندما ينشئ أحدهم مستندًا من هذا القالب. اكتب <0>{dateToken}</0> أو <1>{userToken}</1> لملء تاريخ اليوم أو اسم المؤلف تلقائيًا."
@@ -2051,6 +2065,10 @@ msgstr "عريض"
msgid "Both"
msgstr "كلاهما"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Both agents end up reading everything in {keep}."
+msgstr "سيقرأ الوكيلان في النهاية كل ما في {keep}."
+
#: src/components/share-metadata-rows.tsx
msgid "Branch"
msgstr "فرع"
@@ -2247,6 +2265,7 @@ msgstr "تعذّرت مشاركة هذا المسار."
#: src/components/settings/NetworkAccessSection.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SearchSection.tsx
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
#: src/components/ShareBranchSwitchDialog.tsx
#: src/components/ShareReceiveDialog.tsx
#: src/components/SkillFileCreateDialog.tsx
@@ -3284,6 +3303,10 @@ msgstr "يجري النسخ"
msgid "Copying..."
msgstr "يجري النسخ..."
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Could not classify the merge — try again."
+msgstr "تعذّر تصنيف الدمج — حاول مرة أخرى."
+
#: src/components/FileTree.tsx
msgid "Could not complete delete"
msgstr "تعذّر إتمام الحذف"
@@ -4125,6 +4148,10 @@ msgstr "HTML مخصص مع لوحة معاينة حية (إطار معزول)."
msgid "Custom open-knowledge entry — not managed by OpenKnowledge"
msgstr "مدخل open-knowledge مخصص — غير مُدار من OpenKnowledge"
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Custom skills folder path"
+msgstr "مسار مجلد المهارات المخصص"
+
#: src/components/settings/CustomThemeEditor.tsx
msgid "Custom theme"
msgstr "سمة مخصصة"
@@ -4268,6 +4295,10 @@ msgstr "تم حذف {file}"
msgid "Deleted {filePath}"
msgstr "تم حذف {filePath}"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Deleted for good"
+msgstr "تُحذف نهائيًا"
+
#: src/components/FolderTimelineCard.tsx
msgid "deleted template"
msgstr "حذف قالبًا"
@@ -4669,6 +4700,10 @@ msgstr "كرّر عنصر شجرة الملفات المركَّز عليه عن
msgid "Duplicated to \"{0}\""
msgstr "تم التكرار إلى «{0}»"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Duplicates dropped"
+msgstr "إسقاط المكرر"
+
#: src/components/settings/AttachmentsSection.tsx
msgid "e.g. assets/uploads"
msgstr "مثال: assets/uploads"
@@ -6391,6 +6426,10 @@ msgstr "منتقي الأيقونات"
msgid "ID: {0}"
msgstr "المعرّف: {0}"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Identical in both — {pick} still reads them."
+msgstr "متطابقة في الاثنين، وسيظل {pick} يقرأها."
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "If an update arrives for something you are editing, you choose which version to keep, like a merge conflict."
msgstr "إذا وصل تحديث لشيء تحرّره، فأنت من يختار أي نسخة يُبقي، مثل تعارض الدمج."
@@ -6982,6 +7021,10 @@ msgstr "أبقِ هذا المشروع متزامنًا مع مستودعك ال
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."
msgstr "تتبّع الأشخاص والشركات التي تعمل معها والاجتماعات التي تعقدها معهم. مناسب لتذكّر من يكون أحدهم، وكيف تعرفه، وآخر ما تحدثتما عنه."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "keeps the skills"
+msgstr "يحتفظ بالمهارات"
+
#: src/components/settings/LintingSection.tsx
msgid "Keeps your knowledge base aligned with the Open Knowledge Format."
msgstr "يحافظ على توافق قاعدة معارفك مع Open Knowledge Format."
@@ -7070,6 +7113,7 @@ msgstr "فاتح أو داكن أو تتبع نظام التشغيل."
msgid "line {displayLine}"
msgstr "السطر {displayLine}"
+#: src/components/settings/SkillTargetsPicker.tsx
#: src/editor/bubble-menu/LinkEditPopover.tsx
#: src/editor/slash-command/component-items.tsx
msgid "Link"
@@ -7080,6 +7124,10 @@ msgstr "رابط"
msgid "Link copied."
msgstr "تم نسخ الرابط."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link folders"
+msgstr "اربط المجلدين"
+
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Link preview settings not yet loaded — try again in a moment"
msgstr "لم تُحمَّل إعدادات معاينة الروابط بعد — أعد المحاولة بعد قليل"
@@ -7113,6 +7161,10 @@ msgstr "هدف الرابط \"{shown}\" لا يشير إلى ملف موجود."
msgid "Link the selected text, or edit the link under the caret."
msgstr "اربط النص المحدد، أو حرّر الرابط الواقع تحت المؤشر."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link these skill folders?"
+msgstr "هل تربط مجلدي المهارات هذين؟"
+
#: src/editor/slash-command/component-items.tsx
msgid "Link to a page or external URL."
msgstr "اربط بصفحة أو رابط خارجي."
@@ -7622,6 +7674,10 @@ msgstr "الأكثر تثبيتًا"
msgid "Move"
msgstr "نقل"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Move across"
+msgstr "تنتقل"
+
#: src/lib/keyboard-shortcuts.ts
msgid "Move between table cells"
msgstr "التنقل بين خلايا الجدول"
@@ -8533,6 +8589,10 @@ msgstr "معطّل — يرتّب البحث بالكلمات المفتاحية
msgid "Offline"
msgstr "غير متصل"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "OK can't move these, so they go when {pick} does."
+msgstr "لا يستطيع OK نقل هذه العناصر، لذا تختفي مع {pick}."
+
#: src/lib/keyboard-shortcuts.ts
msgid "OK Desktop"
msgstr "OK Desktop"
@@ -11668,6 +11728,10 @@ msgstr "أصبحت المهارات مشتركة. أودع .ok/skills لمشار
msgid "Skills install to every AI tool detected on this machine, independent of the MCP connections you chose above."
msgstr "تُثبَّت المهارات في كل أداة ذكاء اصطناعي مكتشفة على هذا الجهاز، بغض النظر عن اتصالات MCP التي اخترتها أعلاه."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Skills reassigned"
+msgstr "أُعيد إسناد المهارات"
+
#: src/components/AppMenubar.tsx
#: src/components/command-palette-commands.ts
#: src/components/FileSidebar.tsx
@@ -12103,7 +12167,6 @@ msgstr "يجري تبديل الفروع"
msgid "Switching to <0>local-only</0> will refuse until they're untracked via<1> git rm --cached</1>."
msgstr "سيُرفض التبديل إلى <0>local-only</0> حتى يُلغى تتبّعها عبر<1> git rm --cached</1>."
-#: src/components/settings/SkillTargetsPicker.tsx
#: src/components/SkillInstallMenu.tsx
msgid "symlink"
msgstr "رابط رمزي"
@@ -12754,6 +12817,10 @@ msgstr "السمات"
msgid "There's no project folder for this window, so a terminal can't start here."
msgstr "لا يوجد مجلد مشروع لهذه النافذة، لذا لا يمكن بدء طرفية هنا."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "These currently read from another folder. After linking, they read from {keep} instead."
+msgstr "تُقرأ هذه حاليًا من مجلد آخر. بعد الربط، ستُقرأ من {keep} بدلًا منه."
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "These rules come from your project's <0>{configFile}</0> file, which fully governs linting for this project. Turn rules on or off and edit their options here; changes write back to the file."
msgstr "تأتي هذه القواعد من ملف <0>{configFile}</0> في مشروعك، وهو الذي يحكم الفحص لهذا المشروع بالكامل. شغّل القواعد أو أوقفها وحرّر خياراتها هنا؛ وتُكتب التغييرات في الملف."
diff --git a/packages/app/src/locales/bn/messages.json b/packages/app/src/locales/bn/messages.json
index 0093421d5..e2cf170c0 100644
--- a/packages/app/src/locales/bn/messages.json
+++ b/packages/app/src/locales/bn/messages.json
@@ -43,6 +43,12 @@
"-q4abP": [
"ফলাফল সীমিত — এই ওয়ার্কস্পেসে অনুসন্ধান যত সূচিভুক্ত করতে পারে তার চেয়ে বেশি ফাইল আছে। অনুপস্থিত কোনো ফাইল এই সীমার ফল হতে পারে, বানান ভুল নয়।"
],
+ "-qBQVd": [
+ ["pick"],
+ "-এ এমন এন্ট্রি আছে যা স্কিল নয়: ",
+ ["0"],
+ "। সেগুলো ফোল্ডার থেকে সরান বা অন্যত্র নিন, তারপর আবার চেষ্টা করুন।"
+ ],
"-slrNR": ["কাজের তালিকা চালু বা বন্ধ করুন।"],
"-uaQnI": ["মিলে যাওয়া কোনো ওয়ার্কট্রি বা ব্রাঞ্চ নেই।"],
"-yOx8u": ["পরিবর্তনগুলি সংরক্ষণ করা হচ্ছে…"],
@@ -104,6 +110,7 @@
"0g7rCZ": ["\"", ["0"], "\"-এ প্রতিলিপি করা হয়েছে"],
"0jD-Gn": ["একটি দলগত জ্ঞানভাণ্ডার, একটি ব্যক্তিগত উইকি, প্রকল্পের নথিপত্র…"],
"0kTAXe": ["উৎস খুলুন: ", ["mirrorSrc"]],
+ "0m4Snh": ["স্কিলগুলো পুনরায় নির্ধারিত হয়েছে"],
"0pZmTP": ["এই পাথ শেয়ার করা যাচ্ছে না।"],
"0qyKG6": ["ডিস্ক থেকে সিঙ্ক করা"],
"0r6d6v": ["পরিবর্তনগুলি স্বয়ংক্রিয়ভাবে সংরক্ষিত হয়েছে।"],
@@ -193,6 +200,7 @@
"2BBAbc": ["তালিকা"],
"2C-6zf": ["পাঠানো হয়নি"],
"2CHoQv": ["জোর করে আবার লোড করুন"],
+ "2Ce6hp": ["সরে যাবে"],
"2D1x3Y": ["প্রয়োগ করুন এবং প্রজেক্ট সার্ভার পুনরায় চালু করুন"],
"2FYpfJ": ["আরও"],
"2FnYUD": [
@@ -1080,6 +1088,7 @@
"Es3G-g": [
"এই প্রকল্পেই থাকে (স্কিলের ফোল্ডার যেখানেই হোক) এবং git-এর মাধ্যমে সহযোগীদের সঙ্গে ভাগ করা হয়।"
],
+ "Eu-LIb": ["এই স্কিল ফোল্ডারগুলো লিংক করবেন?"],
"Ev2r9A": ["কোনো ফলাফল নেই"],
"EvIJVD": ["টুল কল"],
"EvPX7f": ["রিপোজিটরিটি কোথায় ক্লোন করবেন তা বাছতে একটি ফোল্ডার নির্বাচক খোলে।"],
@@ -1247,6 +1256,7 @@
"H1TmTu": ["ঠিক করা থামানো হয়েছে। যেসব ফাইল আগেই ঠিক হয়েছে সেগুলো ঠিকই থাকে।"],
"H3oH0g": ["পুনরায় করুন"],
"H86f9p": ["গুটিয়ে নিন"],
+ "H8DVOJ": ["দুই জায়গাতেই এক — ", ["pick"], " এগুলো পড়তেই থাকবে।"],
"HAkEqR": ["সাম্প্রতিক ফাইল"],
"HAvHev": ["\"", ["name"], "\"-এর জন্য স্বয়ংক্রিয় হালনাগাদ বন্ধ"],
"HAvRAI": [["skillCount", "plural", { "one": ["স্কিল"], "other": ["স্কিল"] }]],
@@ -1340,6 +1350,7 @@
"It9ARY": ["ডান দিকের নথি প্যানেল চালু বা বন্ধ করুন।"],
"It9oAP": [["editor"], " সংস্করণটি এখন উৎস"],
"ItxGi3": ["সংযুক্তির মোট আকার ৩ MB-র কম হতে হবে।"],
+ "IvKbeq": ["শেষমেশ দুই এজেন্টই ", ["keep"], "-এর সবকিছু পড়বে।"],
"Ix0K8o": ["বাইরের URL নোড লুকান"],
"IxHMdF": ["ওই মন্তব্যটি মুছে ফেলা যায়নি।"],
"IxyZXD": ["স্ক্রিনশট"],
@@ -1447,6 +1458,7 @@
"Kiytqd": ["ব্যতিক্রম: স্কিল ভাগ করা হয়"],
"KjTmeO": ["এই শেয়ার করা জিনিসটি খুলতে OpenKnowledge আপডেট করুন।"],
"KkEAud": ["বর্তমান নথি বা ফোল্ডারের প্রসঙ্গ থেকে একটি ফাইল তৈরি করুন।"],
+ "KkRyMI": ["মার্জটি শ্রেণিবদ্ধ করা যায়নি — আবার চেষ্টা করুন।"],
"KmydK6": ["গাঢ়"],
"KnoB--": ["<0>", ["sanitized"], "</0> হিসেবে সংরক্ষিত হবে।"],
"KpOJFY": ["বাইরের লিংকের প্রাকদর্শন চালু করুন"],
@@ -1986,6 +1998,7 @@
"RrAIZx": ["কনফিগ ভাগাভাগি যা যা ঢাকে"],
"Rsdhj9": ["কনফিগারেশন সতর্কতা"],
"Rx5ReQ": [["keyName"], "-এর নাম বদলান"],
+ "RxF-am": ["ডুপ্লিকেট বাদ"],
"RyIKxy": [
"এই ",
["targetNoun"],
@@ -2730,6 +2743,7 @@
"bcDHUM": [["descriptorLabel"], " — রেন্ডার ত্রুটি, সোর্স নিচে সম্পাদনাযোগ্য"],
"bcjYUA": ["সোর্স ভাঁজ করুন বা খুলুন"],
"bcm0pR": ["খোলা এজেন্ট"],
+ "beHZo4": ["OK এগুলো সরাতে পারে না, তাই ", ["pick"], "-এর সঙ্গেই এগুলো চলে যাবে।"],
"bi2C2s": [["displayName"], "-এ পৌঁছানো যায়নি। অনুগ্রহ করে পরে আবার চেষ্টা করুন।"],
"bjsEcb": ["সব সামনে আনুন"],
"bkQRMh": ["অনুচ্ছেদ"],
@@ -2943,6 +2957,7 @@
"evs0iw": ["\"", ["tagListQuery"], "\"-এর সঙ্গে মিলে যাওয়া ট্যাগ"],
"ewSbS_": ["Shell সেশন"],
"ezUmoU": ["অনুমোদিত উপাদান মান (খালি = যেকোনো)"],
+ "f1-q9m": ["স্কিলগুলো রেখে দেয়"],
"f14doC": ["Slidev"],
"f1XQyZ": ["ব্লক সরান"],
"f65AOQ": ["এখান থেকে শুরু"],
@@ -3150,6 +3165,7 @@
"hpzRlK": ["বন্ধ করা ট্যাব আবার খুলুন"],
"hqCwRf": ["কোনো ফাইল নির্বাচিত নেই"],
"hqVQbT": ["মন্তব্য যোগ করুন"],
+ "hs5BRR": ["চিরতরে মুছে যাবে"],
"hvZwVx": ["রূপান্তর করুন"],
"hwFOFD": ["সেটিং লোড করা যায়নি"],
"hxBHxQ": ["একটি পাদটীকা<0><1>[1]</1></0> সহ একটি লাইন এবং নিচে দেখানো একটি সংজ্ঞা।"],
@@ -3272,6 +3288,11 @@
"jENU1Q": [
"এই মেশিনের সব প্রকল্পে প্রযোজ্য। নিজস্ব টার্মিনাল থেকে চালু করা Claude ও Codex, OpenKnowledge-এর পড়া ও লেখার টুল স্বয়ংক্রিয়ভাবে অনুমোদন করে (Claude \"ok open\"-ও নিজে থেকে চালায়)। স্কিল মোছা, সরানো, ভাগ করা, আমদানি করা বা ইনস্টল করা, অন্য কমান্ড, এবং OpenKnowledge-বহির্ভূত ফাইল সম্পাদনা এখনও জিজ্ঞেস করে। Cursor, OpenCode ও Pi অপ্রভাবিত। প্রতিটি এজেন্টের ক্ষেত্রে যথাসাধ্য।"
],
+ "jEVipR": [
+ "এগুলো বর্তমানে অন্য একটি ফোল্ডার থেকে পড়ে। লিংক করার পরে এগুলো পরিবর্তে ",
+ ["keep"],
+ " থেকে পড়বে।"
+ ],
"jEZ6Lf": ["সাময়িক"],
"jEdF24": ["অনুপস্থিত পাতা: ", ["linkTitle"], "। তৈরি করতে ক্লিক করুন।"],
"jJdwCB": ["ফিরিয়ে নিন"],
@@ -3402,6 +3423,7 @@
"kfL8BJ": ["আমদানি ব্যর্থ: ", ["0"]],
"khCa4M": ["এই প্রকল্পের কোডিং এজেন্টদের OpenKnowledge-এর মাধ্যমে পড়তে ও লিখতে শেখায়।"],
"kj9pAE": ["পাতা তৈরি করা হচ্ছে"],
+ "kjlQ9D": ["সিমলিংক হয়ে যায়"],
"kknhfj": ["কোনো পরিবর্তন নেই"],
"kkux8f": [["0"], " মুছে ফেলা যায়নি। আবার চেষ্টা করুন।"],
"klPS-L": ["মূল ফাইল — এই এজেন্টের সম্পাদনার আগে।"],
@@ -3421,6 +3443,14 @@
"l17ab4": ["প্রকল্পের ফাইল লেখা যায়নি। অন্য জায়গা চেষ্টা করুন।"],
"l1aQKz": ["দৃশ্য সম্পাদকের টেবিল"],
"l1l8sj": [["0"], " দিন আগে"],
+ "l2BOXd": [
+ ["pick"],
+ " এবং ",
+ ["keep"],
+ " দুটোতেই ",
+ ["0"],
+ "-এর আলাদা সংস্করণ আছে। আগে সেগুলো মিটিয়ে নিন: একটি সিমলিংক প্রতিটির শুধু একটি সংস্করণই রাখতে পারে।"
+ ],
"l3s5ri": ["আমদানি করুন"],
"l3zD7w": ["এজেন্ট শুরু করা হচ্ছে…"],
"l46MqT": ["পরবর্তী ট্যাব"],
@@ -3709,6 +3739,7 @@
"\"-এর স্থানীয় সহযোগিতা তথ্য মুছে ফেলা যায়নি। আবার চেষ্টা করতে পাতাটি পুনরায় লোড করুন।"
],
"oxdGJn": ["যাওয়ার আগে কারণটা জানাবেন কি?"],
+ "oyBV3W": ["কাস্টম স্কিল ফোল্ডারের পাথ"],
"p0Iq25": ["লিংক ঢোকান"],
"p2LEhJ": ["ব্যক্তিগত প্রবেশ টোকেন"],
"p3m_Gk": [
@@ -3879,6 +3910,7 @@
"rbrHTd": ["অনুমোদিত — ", ["optionName"]],
"rcJmK8": ["জায়গাগুলোকে অনুলিপিতে রূপান্তর করুন"],
"rdU729": ["বিন্যাস"],
+ "rf0tV1": ["ফোল্ডার লিংক করুন"],
"rf8fiC": ["উইন্ডো বন্ধ করুন"],
"rfFpcF": [["chip"], " সরান"],
"rg7hNd": ["আপনার অভিজ্ঞতা মূল্যায়ন করুন"],
diff --git a/packages/app/src/locales/bn/messages.po b/packages/app/src/locales/bn/messages.po
index 085690b60..e6042e27f 100644
--- a/packages/app/src/locales/bn/messages.po
+++ b/packages/app/src/locales/bn/messages.po
@@ -814,6 +814,16 @@ msgstr "{percent}% ব্যবহৃত ({left}% বাকি)"
msgid "{phase} — {pct}%"
msgstr "{phase} — {pct}%"
+#. placeholder {0}: p.conflicts.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} and {keep} both hold a different version of: {0}. Resolve those first — a symlink can only keep one of each."
+msgstr "{pick} এবং {keep} দুটোতেই {0}-এর আলাদা সংস্করণ আছে। আগে সেগুলো মিটিয়ে নিন: একটি সিমলিংক প্রতিটির শুধু একটি সংস্করণই রাখতে পারে।"
+
+#. placeholder {0}: p.strays.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} holds entries that aren't skills: {0}. Remove or move them from the folder and try again."
+msgstr "{pick}-এ এমন এন্ট্রি আছে যা স্কিল নয়: {0}। সেগুলো ফোল্ডার থেকে সরান বা অন্যত্র নিন, তারপর আবার চেষ্টা করুন।"
+
#: src/components/CreatedItemsList.tsx
msgid "{pluginCount, plural, one {plugin} other {plugins}}"
msgstr "{pluginCount, plural, one {প্লাগইন} other {প্লাগইন}}"
@@ -1976,6 +1986,10 @@ msgstr "ব্যাকলিংকের সাড়া প্রত্যা
msgid "Base branch"
msgstr "ভিত্তি ব্রাঞ্চ"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "becomes a symlink"
+msgstr "সিমলিংক হয়ে যায়"
+
#: src/components/TemplateBody.tsx
msgid "Becomes the document's content when someone creates a doc from this template. Type <0>{dateToken}</0> or <1>{userToken}</1> to fill in today's date or the author's name automatically."
msgstr "কেউ এই টেমপ্লেট থেকে নথি তৈরি করলে এটিই সেই নথির বিষয়বস্তু হয়। আজকের তারিখ বা লেখকের নাম নিজে থেকে বসাতে <0>{dateToken}</0> বা <1>{userToken}</1> লিখুন।"
@@ -2047,6 +2061,10 @@ msgstr "গাঢ়"
msgid "Both"
msgstr "দুটোই"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Both agents end up reading everything in {keep}."
+msgstr "শেষমেশ দুই এজেন্টই {keep}-এর সবকিছু পড়বে।"
+
#: src/components/share-metadata-rows.tsx
msgid "Branch"
msgstr "ব্রাঞ্চ"
@@ -2243,6 +2261,7 @@ msgstr "এই পাথ শেয়ার করা যাচ্ছে না
#: src/components/settings/NetworkAccessSection.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SearchSection.tsx
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
#: src/components/ShareBranchSwitchDialog.tsx
#: src/components/ShareReceiveDialog.tsx
#: src/components/SkillFileCreateDialog.tsx
@@ -3280,6 +3299,10 @@ msgstr "কপি করা হচ্ছে"
msgid "Copying..."
msgstr "কপি করা হচ্ছে…"
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Could not classify the merge — try again."
+msgstr "মার্জটি শ্রেণিবদ্ধ করা যায়নি — আবার চেষ্টা করুন।"
+
#: src/components/FileTree.tsx
msgid "Could not complete delete"
msgstr "মুছে ফেলা সম্পূর্ণ করা যায়নি"
@@ -4121,6 +4144,10 @@ msgstr "সরাসরি প্রাকদর্শন প্যানেল
msgid "Custom open-knowledge entry — not managed by OpenKnowledge"
msgstr "কাস্টম open-knowledge এন্ট্রি — OpenKnowledge দ্বারা পরিচালিত নয়"
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Custom skills folder path"
+msgstr "কাস্টম স্কিল ফোল্ডারের পাথ"
+
#: src/components/settings/CustomThemeEditor.tsx
msgid "Custom theme"
msgstr "কাস্টম থিম"
@@ -4264,6 +4291,10 @@ msgstr "{file} মুছে ফেলা হয়েছে"
msgid "Deleted {filePath}"
msgstr "{filePath} মোছা হয়েছে"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Deleted for good"
+msgstr "চিরতরে মুছে যাবে"
+
#: src/components/FolderTimelineCard.tsx
msgid "deleted template"
msgstr "টেমপ্লেট মুছে ফেলা হয়েছে"
@@ -4665,6 +4696,10 @@ msgstr "ফোকাস Files সাইডবারে থাকলে ফোক
msgid "Duplicated to \"{0}\""
msgstr "\"{0}\"-এ প্রতিলিপি করা হয়েছে"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Duplicates dropped"
+msgstr "ডুপ্লিকেট বাদ"
+
#: src/components/settings/AttachmentsSection.tsx
msgid "e.g. assets/uploads"
msgstr "যেমন assets/uploads"
@@ -6387,6 +6422,10 @@ msgstr "আইকন নির্বাচক"
msgid "ID: {0}"
msgstr "আইডি: {0}"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Identical in both — {pick} still reads them."
+msgstr "দুই জায়গাতেই এক — {pick} এগুলো পড়তেই থাকবে।"
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "If an update arrives for something you are editing, you choose which version to keep, like a merge conflict."
msgstr "আপনি যা সম্পাদনা করছেন তার জন্য কোনো হালনাগাদ এলে আপনি বেছে নেন কোন সংস্করণটি রাখবেন, ঠিক মার্জ দ্বন্দ্বের মতো।"
@@ -6978,6 +7017,10 @@ msgstr "এই প্রকল্পটি আপনার git রিমোট
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."
msgstr "আপনি যাদের ও যে কোম্পানিগুলোর সঙ্গে কাজ করেন এবং তাদের সঙ্গে আপনার বৈঠকগুলোর হিসাব রাখুন। কেউ কে, আপনি তাকে কীভাবে চেনেন, এবং শেষবার কী নিয়ে কথা হয়েছিল তা মনে রাখার জন্য ভালো।"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "keeps the skills"
+msgstr "স্কিলগুলো রেখে দেয়"
+
#: src/components/settings/LintingSection.tsx
msgid "Keeps your knowledge base aligned with the Open Knowledge Format."
msgstr "আপনার জ্ঞানভান্ডারকে Open Knowledge Format-এর সঙ্গে সামঞ্জস্যপূর্ণ রাখে।"
@@ -7066,6 +7109,7 @@ msgstr "হালকা, গাঢ়, বা OS অনুসরণ করুন
msgid "line {displayLine}"
msgstr "লাইন {displayLine}"
+#: src/components/settings/SkillTargetsPicker.tsx
#: src/editor/bubble-menu/LinkEditPopover.tsx
#: src/editor/slash-command/component-items.tsx
msgid "Link"
@@ -7076,6 +7120,10 @@ msgstr "লিংক"
msgid "Link copied."
msgstr "লিংক কপি হয়েছে।"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link folders"
+msgstr "ফোল্ডার লিংক করুন"
+
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Link preview settings not yet loaded — try again in a moment"
msgstr "লিংক প্রাকদর্শনের সেটিং এখনও লোড হয়নি — একটু পরে আবার চেষ্টা করুন"
@@ -7109,6 +7157,10 @@ msgstr "লিংকের লক্ষ্য \"{shown}\" কোনো বিদ
msgid "Link the selected text, or edit the link under the caret."
msgstr "নির্বাচিত লেখাটি লিংক করুন, বা কার্সরের নিচের লিংকটি সম্পাদনা করুন।"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link these skill folders?"
+msgstr "এই স্কিল ফোল্ডারগুলো লিংক করবেন?"
+
#: src/editor/slash-command/component-items.tsx
msgid "Link to a page or external URL."
msgstr "একটি পাতা বা বাইরের URL-এ লিংক করুন।"
@@ -7618,6 +7670,10 @@ msgstr "সবচেয়ে বেশি ইনস্টল হওয়া"
msgid "Move"
msgstr "সরান"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Move across"
+msgstr "সরে যাবে"
+
#: src/lib/keyboard-shortcuts.ts
msgid "Move between table cells"
msgstr "টেবিলের ঘরগুলোর মধ্যে সরুন"
@@ -8529,6 +8585,10 @@ msgstr "বন্ধ — অনুসন্ধান কেবল কীওয
msgid "Offline"
msgstr "অফলাইন"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "OK can't move these, so they go when {pick} does."
+msgstr "OK এগুলো সরাতে পারে না, তাই {pick}-এর সঙ্গেই এগুলো চলে যাবে।"
+
#: src/lib/keyboard-shortcuts.ts
msgid "OK Desktop"
msgstr "OK Desktop"
@@ -11664,6 +11724,10 @@ msgstr "স্কিল এখন ভাগ করা। আপনার দল
msgid "Skills install to every AI tool detected on this machine, independent of the MCP connections you chose above."
msgstr "স্কিল এই মেশিনে শনাক্ত হওয়া প্রতিটি AI টুলে ইনস্টল হয়, উপরে বেছে নেওয়া MCP সংযোগ যাই হোক না কেন।"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Skills reassigned"
+msgstr "স্কিলগুলো পুনরায় নির্ধারিত হয়েছে"
+
#: src/components/AppMenubar.tsx
#: src/components/command-palette-commands.ts
#: src/components/FileSidebar.tsx
@@ -12099,7 +12163,6 @@ msgstr "ব্রাঞ্চ বদলানো হচ্ছে"
msgid "Switching to <0>local-only</0> will refuse until they're untracked via<1> git rm --cached</1>."
msgstr "<0>শুধু-স্থানীয়</0>-তে যাওয়া তখন পর্যন্ত প্রত্যাখ্যাত হবে যতক্ষণ না সেগুলো<1> git rm --cached</1> দিয়ে হিসাবের বাইরে নেওয়া হয়।"
-#: src/components/settings/SkillTargetsPicker.tsx
#: src/components/SkillInstallMenu.tsx
msgid "symlink"
msgstr "সিমলিংক"
@@ -12750,6 +12813,10 @@ msgstr "থিম"
msgid "There's no project folder for this window, so a terminal can't start here."
msgstr "এই জানালার জন্য কোনো প্রকল্প ফোল্ডার নেই, তাই এখানে টার্মিনাল চালু হতে পারে না।"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "These currently read from another folder. After linking, they read from {keep} instead."
+msgstr "এগুলো বর্তমানে অন্য একটি ফোল্ডার থেকে পড়ে। লিংক করার পরে এগুলো পরিবর্তে {keep} থেকে পড়বে।"
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "These rules come from your project's <0>{configFile}</0> file, which fully governs linting for this project. Turn rules on or off and edit their options here; changes write back to the file."
msgstr "এই নিয়মগুলো আপনার প্রকল্পের <0>{configFile}</0> ফাইল থেকে আসে, যা এই প্রকল্পের linting পুরোপুরি নিয়ন্ত্রণ করে। নিয়ম এখানে চালু বা বন্ধ করুন ও তাদের বিকল্প সম্পাদনা করুন; পরিবর্তন সেই ফাইলেই ফিরে লেখা হয়।"
diff --git a/packages/app/src/locales/en/messages.json b/packages/app/src/locales/en/messages.json
index a14e5c80f..387009993 100644
--- a/packages/app/src/locales/en/messages.json
+++ b/packages/app/src/locales/en/messages.json
@@ -47,6 +47,12 @@
"-q4abP": [
"Results capped — this workspace has more files than search can index. A missing file may be a cap artifact, not a typo."
],
+ "-qBQVd": [
+ ["pick"],
+ " holds entries that aren't skills: ",
+ ["0"],
+ ". Remove or move them from the folder and try again."
+ ],
"-slrNR": ["Toggle a task list."],
"-uaQnI": ["No matching worktrees or branches."],
"-yOx8u": ["Saving changes…"],
@@ -108,6 +114,7 @@
"0g7rCZ": ["Duplicated to \"", ["0"], "\""],
"0jD-Gn": ["A team knowledge base, a personal wiki, project docs..."],
"0kTAXe": ["Open source: ", ["mirrorSrc"]],
+ "0m4Snh": ["Skills reassigned"],
"0pZmTP": ["Can't share this path."],
"0qyKG6": ["Synced from disk"],
"0r6d6v": ["Changes saved automatically."],
@@ -197,6 +204,7 @@
"2BBAbc": ["List"],
"2C-6zf": ["Not sent"],
"2CHoQv": ["Force Reload"],
+ "2Ce6hp": ["Move across"],
"2D1x3Y": ["Apply and restart project server"],
"2FYpfJ": ["More"],
"2FnYUD": [
@@ -1104,6 +1112,7 @@
"Es3G-g": [
"Lives in this project (wherever the skill's folder is) and is shared with collaborators through git."
],
+ "Eu-LIb": ["Link these skill folders?"],
"Ev2r9A": ["No results"],
"EvIJVD": ["Tool call"],
"EvPX7f": ["Opens a folder picker to choose where to clone the repository."],
@@ -1276,6 +1285,7 @@
"H1TmTu": ["Stopped fixing. Files already fixed stay fixed."],
"H3oH0g": ["Redo"],
"H86f9p": ["Collapse"],
+ "H8DVOJ": ["Identical in both — ", ["pick"], " still reads them."],
"HAkEqR": ["Recent files"],
"HAvHev": ["Auto-update off for \"", ["name"], "\""],
"HAvRAI": [["skillCount", "plural", { "one": ["skill"], "other": ["skills"] }]],
@@ -1375,6 +1385,7 @@
"It9ARY": ["Toggle the right document panel."],
"It9oAP": ["The ", ["editor"], " version is now the source"],
"ItxGi3": ["Attachments must total under 3 MB."],
+ "IvKbeq": ["Both agents end up reading everything in ", ["keep"], "."],
"Ix0K8o": ["Hide external URL nodes"],
"IxHMdF": ["Couldn't delete that comment."],
"IxyZXD": ["Screenshot"],
@@ -1484,6 +1495,7 @@
"Kiytqd": ["Exception: skills are shared"],
"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."],
"KmydK6": ["Bold"],
"KnoB--": ["Will be saved as <0>", ["sanitized"], "</0>."],
"KpOJFY": ["Enable external link previews"],
@@ -2032,6 +2044,7 @@
"RrAIZx": ["What config sharing covers"],
"Rsdhj9": ["Configuration warnings"],
"Rx5ReQ": ["Rename ", ["keyName"]],
+ "RxF-am": ["Duplicates dropped"],
"RyIKxy": [
"This ",
["targetNoun"],
@@ -2785,6 +2798,7 @@
"bcDHUM": [["descriptorLabel"], " — render error, source editable below"],
"bcjYUA": ["Fold or unfold source"],
"bcm0pR": ["the open agent"],
+ "beHZo4": ["OK can't move these, so they go when ", ["pick"], " does."],
"bi2C2s": ["Couldn't reach ", ["displayName"], " — please try again later."],
"bjsEcb": ["Bring All to Front"],
"bkQRMh": ["Paragraph"],
@@ -3020,6 +3034,7 @@
"evs0iw": ["Tags matching \"", ["tagListQuery"], "\""],
"ewSbS_": ["Shell session"],
"ezUmoU": ["Allowed element values (empty = any)"],
+ "f1-q9m": ["keeps the skills"],
"f14doC": ["Slidev"],
"f1XQyZ": ["Move block"],
"f65AOQ": ["Start from"],
@@ -3246,6 +3261,7 @@
"hpzRlK": ["Reopen closed tab"],
"hqCwRf": ["No file selected"],
"hqVQbT": ["Add Comment"],
+ "hs5BRR": ["Deleted for good"],
"hvZwVx": ["Convert"],
"hwFOFD": ["Settings failed to load"],
"hxBHxQ": ["A line with a footnote<0><1>[1]</1></0> and a definition shown below."],
@@ -3368,6 +3384,11 @@
"jENU1Q": [
"Applies to all projects on this machine. Claude and Codex, started from the built-in terminal, auto-approve OpenKnowledge's read and write tools (Claude also auto-runs \"ok open\"). Deleting, moving, sharing, importing or installing skills, other commands, and non-OpenKnowledge file edits still ask. Cursor, OpenCode, and Pi are unaffected. Best-effort per agent."
],
+ "jEVipR": [
+ "These currently read from another folder. After linking, they read from ",
+ ["keep"],
+ " instead."
+ ],
"jEZ6Lf": ["provisional"],
"jEdF24": ["Missing page: ", ["linkTitle"], ". Click to create."],
"jJdwCB": ["Revert"],
@@ -3501,6 +3522,7 @@
"kfL8BJ": ["Import failed: ", ["0"]],
"khCa4M": ["Teaches coding agents in this project to read and write through OpenKnowledge."],
"kj9pAE": ["Creating page"],
+ "kjlQ9D": ["becomes a symlink"],
"kknhfj": ["No changes"],
"kkux8f": ["Couldn’t delete ", ["0"], ". Try again."],
"klPS-L": ["Original file — before this agent's edits."],
@@ -3520,6 +3542,14 @@
"l17ab4": ["Could not write project files. Try a different location."],
"l1aQKz": ["Visual editor table"],
"l1l8sj": [["0"], "d ago"],
+ "l2BOXd": [
+ ["pick"],
+ " and ",
+ ["keep"],
+ " both hold a different version of: ",
+ ["0"],
+ ". Resolve those first — a symlink can only keep one of each."
+ ],
"l3s5ri": ["Import"],
"l3zD7w": ["Starting the agent…"],
"l46MqT": ["Next tab"],
@@ -3820,6 +3850,7 @@
"\" could not be cleared. Reload to retry."
],
"oxdGJn": ["Before you go, mind sharing why?"],
+ "oyBV3W": ["Custom skills folder path"],
"p0Iq25": ["Insert link"],
"p2LEhJ": ["Personal access token"],
"p3m_Gk": [
@@ -4007,6 +4038,7 @@
"rbrHTd": ["Approved — ", ["optionName"]],
"rcJmK8": ["Convert locations to copies"],
"rdU729": ["Layout"],
+ "rf0tV1": ["Link folders"],
"rf8fiC": ["Close window"],
"rfFpcF": ["Remove ", ["chip"]],
"rg7hNd": ["Rate your experience"],
diff --git a/packages/app/src/locales/en/messages.po b/packages/app/src/locales/en/messages.po
index 8c58b0e5f..ca86bd52b 100644
--- a/packages/app/src/locales/en/messages.po
+++ b/packages/app/src/locales/en/messages.po
@@ -814,6 +814,16 @@ msgstr "{percent}% used ({left}% left)"
msgid "{phase} — {pct}%"
msgstr "{phase} — {pct}%"
+#. placeholder {0}: p.conflicts.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} and {keep} both hold a different version of: {0}. Resolve those first — a symlink can only keep one of each."
+msgstr "{pick} and {keep} both hold a different version of: {0}. Resolve those first — a symlink can only keep one of each."
+
+#. placeholder {0}: p.strays.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} holds entries that aren't skills: {0}. Remove or move them from the folder and try again."
+msgstr "{pick} holds entries that aren't skills: {0}. Remove or move them from the folder and try again."
+
#: src/components/CreatedItemsList.tsx
msgid "{pluginCount, plural, one {plugin} other {plugins}}"
msgstr "{pluginCount, plural, one {plugin} other {plugins}}"
@@ -1980,6 +1990,10 @@ msgstr "Backlinks response did not match expected shape."
msgid "Base branch"
msgstr "Base branch"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "becomes a symlink"
+msgstr "becomes a symlink"
+
#: src/components/TemplateBody.tsx
msgid "Becomes the document's content when someone creates a doc from this template. Type <0>{dateToken}</0> or <1>{userToken}</1> to fill in today's date or the author's name automatically."
msgstr "Becomes the document's content when someone creates a doc from this template. Type <0>{dateToken}</0> or <1>{userToken}</1> to fill in today's date or the author's name automatically."
@@ -2051,6 +2065,10 @@ msgstr "Bold"
msgid "Both"
msgstr "Both"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Both agents end up reading everything in {keep}."
+msgstr "Both agents end up reading everything in {keep}."
+
#: src/components/share-metadata-rows.tsx
msgid "Branch"
msgstr "Branch"
@@ -2247,6 +2265,7 @@ msgstr "Can't share this path."
#: src/components/settings/NetworkAccessSection.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SearchSection.tsx
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
#: src/components/ShareBranchSwitchDialog.tsx
#: src/components/ShareReceiveDialog.tsx
#: src/components/SkillFileCreateDialog.tsx
@@ -3284,6 +3303,10 @@ msgstr "Copying"
msgid "Copying..."
msgstr "Copying..."
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Could not classify the merge — try again."
+msgstr "Could not classify the merge — try again."
+
#: src/components/FileTree.tsx
msgid "Could not complete delete"
msgstr "Could not complete delete"
@@ -4125,6 +4148,10 @@ msgstr "Custom HTML with a live preview pane (sandboxed iframe)."
msgid "Custom open-knowledge entry — not managed by OpenKnowledge"
msgstr "Custom open-knowledge entry — not managed by OpenKnowledge"
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Custom skills folder path"
+msgstr "Custom skills folder path"
+
#: src/components/settings/CustomThemeEditor.tsx
msgid "Custom theme"
msgstr "Custom theme"
@@ -4268,6 +4295,10 @@ msgstr "Deleted {file}"
msgid "Deleted {filePath}"
msgstr "Deleted {filePath}"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Deleted for good"
+msgstr "Deleted for good"
+
#: src/components/FolderTimelineCard.tsx
msgid "deleted template"
msgstr "deleted template"
@@ -4669,6 +4700,10 @@ msgstr "Duplicate the focused file-tree item when focus is in the Files sidebar.
msgid "Duplicated to \"{0}\""
msgstr "Duplicated to \"{0}\""
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Duplicates dropped"
+msgstr "Duplicates dropped"
+
#: src/components/settings/AttachmentsSection.tsx
msgid "e.g. assets/uploads"
msgstr "e.g. assets/uploads"
@@ -6391,6 +6426,10 @@ msgstr "Icon picker"
msgid "ID: {0}"
msgstr "ID: {0}"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Identical in both — {pick} still reads them."
+msgstr "Identical in both — {pick} still reads them."
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "If an update arrives for something you are editing, you choose which version to keep, like a merge conflict."
msgstr "If an update arrives for something you are editing, you choose which version to keep, like a merge conflict."
@@ -6982,6 +7021,10 @@ msgstr "Keep this project in sync with your git remote. Follow fetches updates w
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."
msgstr "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."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "keeps the skills"
+msgstr "keeps the skills"
+
#: src/components/settings/LintingSection.tsx
msgid "Keeps your knowledge base aligned with the Open Knowledge Format."
msgstr "Keeps your knowledge base aligned with the Open Knowledge Format."
@@ -7070,6 +7113,7 @@ msgstr "Light, dark, or follow the OS."
msgid "line {displayLine}"
msgstr "line {displayLine}"
+#: src/components/settings/SkillTargetsPicker.tsx
#: src/editor/bubble-menu/LinkEditPopover.tsx
#: src/editor/slash-command/component-items.tsx
msgid "Link"
@@ -7080,6 +7124,10 @@ msgstr "Link"
msgid "Link copied."
msgstr "Link copied."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link folders"
+msgstr "Link folders"
+
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Link preview settings not yet loaded — try again in a moment"
msgstr "Link preview settings not yet loaded — try again in a moment"
@@ -7113,6 +7161,10 @@ msgstr "Link target \"{shown}\" does not resolve to an existing file."
msgid "Link the selected text, or edit the link under the caret."
msgstr "Link the selected text, or edit the link under the caret."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link these skill folders?"
+msgstr "Link these skill folders?"
+
#: src/editor/slash-command/component-items.tsx
msgid "Link to a page or external URL."
msgstr "Link to a page or external URL."
@@ -7622,6 +7674,10 @@ msgstr "Most installed"
msgid "Move"
msgstr "Move"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Move across"
+msgstr "Move across"
+
#: src/lib/keyboard-shortcuts.ts
msgid "Move between table cells"
msgstr "Move between table cells"
@@ -8533,6 +8589,10 @@ msgstr "Off — search ranks by keyword only. No content leaves this computer."
msgid "Offline"
msgstr "Offline"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "OK can't move these, so they go when {pick} does."
+msgstr "OK can't move these, so they go when {pick} does."
+
#: src/lib/keyboard-shortcuts.ts
msgid "OK Desktop"
msgstr "OK Desktop"
@@ -11668,6 +11728,10 @@ msgstr "Skills are now shared. Commit .ok/skills to share them with your team."
msgid "Skills install to every AI tool detected on this machine, independent of the MCP connections you chose above."
msgstr "Skills install to every AI tool detected on this machine, independent of the MCP connections you chose above."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Skills reassigned"
+msgstr "Skills reassigned"
+
#: src/components/AppMenubar.tsx
#: src/components/command-palette-commands.ts
#: src/components/FileSidebar.tsx
@@ -12103,7 +12167,6 @@ msgstr "Switching branches"
msgid "Switching to <0>local-only</0> will refuse until they're untracked via<1> git rm --cached</1>."
msgstr "Switching to <0>local-only</0> will refuse until they're untracked via<1> git rm --cached</1>."
-#: src/components/settings/SkillTargetsPicker.tsx
#: src/components/SkillInstallMenu.tsx
msgid "symlink"
msgstr "symlink"
@@ -12754,6 +12817,10 @@ msgstr "Themes"
msgid "There's no project folder for this window, so a terminal can't start here."
msgstr "There's no project folder for this window, so a terminal can't start here."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "These currently read from another folder. After linking, they read from {keep} instead."
+msgstr "These currently read from another folder. After linking, they read from {keep} instead."
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "These rules come from your project's <0>{configFile}</0> file, which fully governs linting for this project. Turn rules on or off and edit their options here; changes write back to the file."
msgstr "These rules come from your project's <0>{configFile}</0> file, which fully governs linting for this project. Turn rules on or off and edit their options here; changes write back to the file."
diff --git a/packages/app/src/locales/es/messages.json b/packages/app/src/locales/es/messages.json
index da51004ad..1c6fc296d 100644
--- a/packages/app/src/locales/es/messages.json
+++ b/packages/app/src/locales/es/messages.json
@@ -59,6 +59,12 @@
"-q4abP": [
"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."
],
+ "-qBQVd": [
+ ["pick"],
+ " contiene elementos que no son habilidades: ",
+ ["0"],
+ ". Elimínalos o sácalos de la carpeta y vuelve a intentarlo."
+ ],
"-slrNR": ["Activa o desactiva una lista de tareas."],
"-uaQnI": ["Ningún worktree ni rama coincide."],
"-yOx8u": ["Guardando cambios…"],
@@ -126,6 +132,7 @@
"Una base de conocimiento de equipo, una wiki personal, documentación de proyecto..."
],
"0kTAXe": ["Abrir el origen: ", ["mirrorSrc"]],
+ "0m4Snh": ["Habilidades reasignadas"],
"0pZmTP": ["No se puede compartir esta ruta."],
"0qyKG6": ["Sincronizado desde el disco"],
"0r6d6v": ["Los cambios se guardaron automáticamente."],
@@ -221,6 +228,7 @@
"2BBAbc": ["Lista"],
"2C-6zf": ["No enviado"],
"2CHoQv": ["Recargar a la fuerza"],
+ "2Ce6hp": ["Se trasladan"],
"2D1x3Y": ["Aplicar y reiniciar el servidor del proyecto"],
"2FYpfJ": ["Más"],
"2FnYUD": [
@@ -1277,6 +1285,7 @@
"Es3G-g": [
"Vive en este proyecto (esté donde esté la carpeta de la habilidad) y se comparte con tus colaboradores mediante git."
],
+ "Eu-LIb": ["¿Enlazar estas carpetas de habilidades?"],
"Ev2r9A": ["Sin resultados"],
"EvIJVD": ["Llamada a herramienta"],
"EvPX7f": ["Abre un selector de carpetas para elegir dónde clonar el repositorio."],
@@ -1481,6 +1490,7 @@
"H1TmTu": ["Se dejó de arreglar. Los archivos ya arreglados se quedan como están."],
"H3oH0g": ["Rehacer"],
"H86f9p": ["Contraer"],
+ "H8DVOJ": ["Idénticas en ambas: ", ["pick"], " las sigue leyendo."],
"HAkEqR": ["Archivos recientes"],
"HAvHev": ["Actualización automática desactivada para \"", ["name"], "\""],
"HAvRAI": [
@@ -1612,6 +1622,7 @@
"It9ARY": ["Muestra u oculta el panel derecho del documento."],
"It9oAP": ["La versión de ", ["editor"], " es ahora el origen"],
"ItxGi3": ["Los adjuntos deben sumar menos de 3 MB."],
+ "IvKbeq": ["Ambos agentes acaban leyendo todo lo que hay en ", ["keep"], "."],
"Ix0K8o": ["Ocultar los nodos de URL externas"],
"IxHMdF": ["No se pudo eliminar ese comentario."],
"IxyZXD": ["Captura de pantalla"],
@@ -1733,6 +1744,7 @@
"Kiytqd": ["Excepción: las habilidades se comparten"],
"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."],
"KmydK6": ["Negrita"],
"KnoB--": ["Se guardará como <0>", ["sanitized"], "</0>."],
"KpOJFY": ["Activar la vista previa de enlaces externos"],
@@ -2335,6 +2347,7 @@
"RrAIZx": ["Qué abarca compartir la configuración"],
"Rsdhj9": ["Advertencias de configuración"],
"Rx5ReQ": ["Renombrar ", ["keyName"]],
+ "RxF-am": ["Duplicados descartados"],
"RyIKxy": [
"Este ",
["targetNoun"],
@@ -3232,6 +3245,7 @@
"bcDHUM": [["descriptorLabel"], " — error de renderizado, el código se puede editar abajo"],
"bcjYUA": ["Plegar o desplegar el código"],
"bcm0pR": ["el agente abierto"],
+ "beHZo4": ["OK no puede mover esto, así que desaparece junto con ", ["pick"], "."],
"bi2C2s": ["No se pudo conectar con ", ["displayName"], ". Inténtalo de nuevo más tarde."],
"bjsEcb": ["Traer todo al frente"],
"bkQRMh": ["Párrafo"],
@@ -3520,6 +3534,7 @@
"evs0iw": ["Etiquetas que coinciden con \"", ["tagListQuery"], "\""],
"ewSbS_": ["Sesión de shell"],
"ezUmoU": ["Valores de elemento permitidos (vacío = cualquiera)"],
+ "f1-q9m": ["conserva las habilidades"],
"f14doC": ["Slidev"],
"f1XQyZ": ["Mover el bloque"],
"f65AOQ": ["Empezar desde"],
@@ -3775,6 +3790,7 @@
"hpzRlK": ["Reabrir la pestaña cerrada"],
"hqCwRf": ["No hay ningún archivo seleccionado"],
"hqVQbT": ["Añadir comentario"],
+ "hs5BRR": ["Se eliminan definitivamente"],
"hvZwVx": ["Convertir"],
"hwFOFD": ["No se pudieron cargar los ajustes"],
"hxBHxQ": [
@@ -3913,6 +3929,11 @@
"jENU1Q": [
"Se aplica a todos los proyectos de este equipo. Claude y Codex, iniciados desde la terminal integrada, aprueban automáticamente las herramientas de lectura y escritura de OpenKnowledge (Claude además ejecuta \"ok open\" por su cuenta). Eliminar, mover, compartir, importar o instalar habilidades, otros comandos y las ediciones de archivos ajenos a OpenKnowledge siguen preguntando. Cursor, OpenCode y Pi no se ven afectados. Es un esfuerzo por agente, sin garantías."
],
+ "jEVipR": [
+ "Actualmente se leen desde otra carpeta. Después de vincularlas, se leerán desde ",
+ ["keep"],
+ "."
+ ],
"jEZ6Lf": ["provisional"],
"jEdF24": ["Página inexistente: ", ["linkTitle"], ". Haz clic para crearla."],
"jJdwCB": ["Revertir"],
@@ -4063,6 +4084,7 @@
"Enseña a los agentes de programación de este proyecto a leer y escribir a través de OpenKnowledge."
],
"kj9pAE": ["Creando la página"],
+ "kjlQ9D": ["pasa a ser un enlace simbólico"],
"kknhfj": ["Sin cambios"],
"kkux8f": ["No se pudo eliminar ", ["0"], ". Inténtalo de nuevo."],
"klPS-L": ["Archivo original, antes de las ediciones de este agente."],
@@ -4084,6 +4106,14 @@
"l17ab4": ["No se pudieron escribir los archivos del proyecto. Prueba con otra ubicación."],
"l1aQKz": ["Tabla del editor visual"],
"l1l8sj": ["hace ", ["0"], " d"],
+ "l2BOXd": [
+ ["pick"],
+ " y ",
+ ["keep"],
+ " contienen versiones distintas de: ",
+ ["0"],
+ ". Resuélvelas primero: un enlace simbólico solo puede conservar una de cada una."
+ ],
"l3s5ri": ["Importar"],
"l3zD7w": ["Iniciando el agente…"],
"l46MqT": ["Pestaña siguiente"],
@@ -4420,6 +4450,7 @@
"\". Recarga para reintentarlo."
],
"oxdGJn": ["Antes de irte, ¿nos cuentas por qué?"],
+ "oyBV3W": ["Ruta de la carpeta de habilidades personalizada"],
"p0Iq25": ["Insertar enlace"],
"p2LEhJ": ["Token de acceso personal"],
"p3m_Gk": [
@@ -4632,6 +4663,7 @@
"rbrHTd": ["Aprobado — ", ["optionName"]],
"rcJmK8": ["Convertir las ubicaciones en copias"],
"rdU729": ["Diseño"],
+ "rf0tV1": ["Enlazar carpetas"],
"rf8fiC": ["Cerrar ventana"],
"rfFpcF": ["Quitar ", ["chip"]],
"rg7hNd": ["Valora tu experiencia"],
diff --git a/packages/app/src/locales/es/messages.po b/packages/app/src/locales/es/messages.po
index 7752d92dd..68634ee98 100644
--- a/packages/app/src/locales/es/messages.po
+++ b/packages/app/src/locales/es/messages.po
@@ -814,6 +814,16 @@ msgstr "{percent}% usado (queda {left}%)"
msgid "{phase} — {pct}%"
msgstr "{phase} — {pct}%"
+#. placeholder {0}: p.conflicts.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} and {keep} both hold a different version of: {0}. Resolve those first — a symlink can only keep one of each."
+msgstr "{pick} y {keep} contienen versiones distintas de: {0}. Resuélvelas primero: un enlace simbólico solo puede conservar una de cada una."
+
+#. placeholder {0}: p.strays.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} holds entries that aren't skills: {0}. Remove or move them from the folder and try again."
+msgstr "{pick} contiene elementos que no son habilidades: {0}. Elimínalos o sácalos de la carpeta y vuelve a intentarlo."
+
#: src/components/CreatedItemsList.tsx
msgid "{pluginCount, plural, one {plugin} other {plugins}}"
msgstr "{pluginCount, plural, one {complemento} many {complementos} other {complementos}}"
@@ -1980,6 +1990,10 @@ msgstr "La respuesta de retroenlaces no tenía la forma esperada."
msgid "Base branch"
msgstr "Rama base"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "becomes a symlink"
+msgstr "pasa a ser un enlace simbólico"
+
#: src/components/TemplateBody.tsx
msgid "Becomes the document's content when someone creates a doc from this template. Type <0>{dateToken}</0> or <1>{userToken}</1> to fill in today's date or the author's name automatically."
msgstr "Se convierte en el contenido del documento cuando alguien crea uno a partir de esta plantilla. Escribe <0>{dateToken}</0> o <1>{userToken}</1> para rellenar automáticamente la fecha de hoy o el nombre del autor."
@@ -2051,6 +2065,10 @@ msgstr "Negrita"
msgid "Both"
msgstr "Ambos"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Both agents end up reading everything in {keep}."
+msgstr "Ambos agentes acaban leyendo todo lo que hay en {keep}."
+
#: src/components/share-metadata-rows.tsx
msgid "Branch"
msgstr "Rama"
@@ -2247,6 +2265,7 @@ msgstr "No se puede compartir esta ruta."
#: src/components/settings/NetworkAccessSection.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SearchSection.tsx
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
#: src/components/ShareBranchSwitchDialog.tsx
#: src/components/ShareReceiveDialog.tsx
#: src/components/SkillFileCreateDialog.tsx
@@ -3284,6 +3303,10 @@ msgstr "Copiando"
msgid "Copying..."
msgstr "Copiando..."
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Could not classify the merge — try again."
+msgstr "No se pudo clasificar la fusión. Inténtalo de nuevo."
+
#: src/components/FileTree.tsx
msgid "Could not complete delete"
msgstr "No se pudo completar la eliminación"
@@ -4125,6 +4148,10 @@ msgstr "HTML personalizado con panel de vista previa en vivo (iframe aislado)."
msgid "Custom open-knowledge entry — not managed by OpenKnowledge"
msgstr "Entrada open-knowledge personalizada, no gestionada por OpenKnowledge"
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Custom skills folder path"
+msgstr "Ruta de la carpeta de habilidades personalizada"
+
#: src/components/settings/CustomThemeEditor.tsx
msgid "Custom theme"
msgstr "Tema personalizado"
@@ -4268,6 +4295,10 @@ msgstr "Se eliminó {file}"
msgid "Deleted {filePath}"
msgstr "Se eliminó {filePath}"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Deleted for good"
+msgstr "Se eliminan definitivamente"
+
#: src/components/FolderTimelineCard.tsx
msgid "deleted template"
msgstr "plantilla eliminada"
@@ -4669,6 +4700,10 @@ msgstr "Duplica el elemento enfocado del árbol de archivos cuando el foco está
msgid "Duplicated to \"{0}\""
msgstr "Se duplicó en \"{0}\""
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Duplicates dropped"
+msgstr "Duplicados descartados"
+
#: src/components/settings/AttachmentsSection.tsx
msgid "e.g. assets/uploads"
msgstr "p. ej. assets/uploads"
@@ -6391,6 +6426,10 @@ msgstr "Selector de iconos"
msgid "ID: {0}"
msgstr "ID: {0}"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Identical in both — {pick} still reads them."
+msgstr "Idénticas en ambas: {pick} las sigue leyendo."
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "If an update arrives for something you are editing, you choose which version to keep, like a merge conflict."
msgstr "Si llega una actualización de algo que estás editando, tú eliges qué versión conservar, como en un conflicto de fusión."
@@ -6982,6 +7021,10 @@ msgstr "Mantén este proyecto sincronizado con tu remoto de git. Seguir obtiene
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."
msgstr "Lleva la cuenta de las personas y empresas con las que trabajas y de las reuniones que tienes con ellas. Va bien para recordar quién es alguien, de qué la conoces y de qué hablasteis la última vez."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "keeps the skills"
+msgstr "conserva las habilidades"
+
#: src/components/settings/LintingSection.tsx
msgid "Keeps your knowledge base aligned with the Open Knowledge Format."
msgstr "Mantiene tu base de conocimientos alineada con el Open Knowledge Format."
@@ -7070,6 +7113,7 @@ msgstr "Claro, oscuro o seguir al sistema."
msgid "line {displayLine}"
msgstr "línea {displayLine}"
+#: src/components/settings/SkillTargetsPicker.tsx
#: src/editor/bubble-menu/LinkEditPopover.tsx
#: src/editor/slash-command/component-items.tsx
msgid "Link"
@@ -7080,6 +7124,10 @@ msgstr "Enlace"
msgid "Link copied."
msgstr "Enlace copiado."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link folders"
+msgstr "Enlazar carpetas"
+
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Link preview settings not yet loaded — try again in a moment"
msgstr "Los ajustes de vista previa de enlaces aún no se han cargado; inténtalo de nuevo en un momento"
@@ -7113,6 +7161,10 @@ msgstr "El destino del enlace «{shown}» no corresponde a un archivo existente.
msgid "Link the selected text, or edit the link under the caret."
msgstr "Enlaza el texto seleccionado o edita el enlace bajo el cursor."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link these skill folders?"
+msgstr "¿Enlazar estas carpetas de habilidades?"
+
#: src/editor/slash-command/component-items.tsx
msgid "Link to a page or external URL."
msgstr "Enlaza a una página o a una URL externa."
@@ -7622,6 +7674,10 @@ msgstr "Las más instaladas"
msgid "Move"
msgstr "Mover"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Move across"
+msgstr "Se trasladan"
+
#: src/lib/keyboard-shortcuts.ts
msgid "Move between table cells"
msgstr "Moverse entre celdas de la tabla"
@@ -8533,6 +8589,10 @@ msgstr "Desactivada: la búsqueda ordena solo por palabras clave. No sale ningú
msgid "Offline"
msgstr "Sin conexión"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "OK can't move these, so they go when {pick} does."
+msgstr "OK no puede mover esto, así que desaparece junto con {pick}."
+
#: src/lib/keyboard-shortcuts.ts
msgid "OK Desktop"
msgstr "OK Desktop"
@@ -11668,6 +11728,10 @@ msgstr "Las habilidades ahora se comparten. Haz commit de .ok/skills para compar
msgid "Skills install to every AI tool detected on this machine, independent of the MCP connections you chose above."
msgstr "Las habilidades se instalan en todas las herramientas de IA detectadas en este equipo, con independencia de las conexiones MCP que elegiste arriba."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Skills reassigned"
+msgstr "Habilidades reasignadas"
+
#: src/components/AppMenubar.tsx
#: src/components/command-palette-commands.ts
#: src/components/FileSidebar.tsx
@@ -12103,7 +12167,6 @@ msgstr "Cambiando de rama"
msgid "Switching to <0>local-only</0> will refuse until they're untracked via<1> git rm --cached</1>."
msgstr "Cambiar a <0>solo local</0> se rechazará hasta que dejen de seguirse con<1> git rm --cached</1>."
-#: src/components/settings/SkillTargetsPicker.tsx
#: src/components/SkillInstallMenu.tsx
msgid "symlink"
msgstr "enlace simbólico"
@@ -12754,6 +12817,10 @@ msgstr "Temas"
msgid "There's no project folder for this window, so a terminal can't start here."
msgstr "Esta ventana no tiene carpeta de proyecto, así que aquí no se puede iniciar una terminal."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "These currently read from another folder. After linking, they read from {keep} instead."
+msgstr "Actualmente se leen desde otra carpeta. Después de vincularlas, se leerán desde {keep}."
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "These rules come from your project's <0>{configFile}</0> file, which fully governs linting for this project. Turn rules on or off and edit their options here; changes write back to the file."
msgstr "Estas reglas vienen del archivo <0>{configFile}</0> de tu proyecto, que gobierna por completo el análisis de este proyecto. Activa o desactiva reglas y edita sus opciones aquí; los cambios se escriben en el archivo."
diff --git a/packages/app/src/locales/fr/messages.json b/packages/app/src/locales/fr/messages.json
index 37fd3be2e..98c44a259 100644
--- a/packages/app/src/locales/fr/messages.json
+++ b/packages/app/src/locales/fr/messages.json
@@ -59,6 +59,12 @@
"-q4abP": [
"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."
],
+ "-qBQVd": [
+ ["pick"],
+ " contient des éléments qui ne sont pas des compétences : ",
+ ["0"],
+ ". Supprimez-les ou déplacez-les hors du dossier, puis réessayez."
+ ],
"-slrNR": ["Bascule une liste de tâches."],
"-uaQnI": ["Aucun worktree ni branche correspondant."],
"-yOx8u": ["Enregistrement des modifications…"],
@@ -128,6 +134,7 @@
"Une base de connaissances d'équipe, un wiki personnel, la documentation d'un projet…"
],
"0kTAXe": ["Source : ", ["mirrorSrc"]],
+ "0m4Snh": ["Compétences réaffectées"],
"0pZmTP": ["Impossible de partager ce chemin."],
"0qyKG6": ["Synchronisé depuis le disque"],
"0r6d6v": ["Modifications enregistrées automatiquement."],
@@ -233,6 +240,7 @@
"2BBAbc": ["Liste"],
"2C-6zf": ["Non envoyé"],
"2CHoQv": ["Forcer le rechargement"],
+ "2Ce6hp": ["Déplacées"],
"2D1x3Y": ["Appliquer et redémarrer le serveur du projet"],
"2FYpfJ": ["Plus"],
"2FnYUD": [
@@ -1308,6 +1316,7 @@
"Es3G-g": [
"Réside dans ce projet (où que se trouve le dossier de la compétence) et est partagée avec les collaborateurs via git."
],
+ "Eu-LIb": ["Lier ces dossiers de compétences ?"],
"Ev2r9A": ["Aucun résultat"],
"EvIJVD": ["Appel d'outil"],
"EvPX7f": ["Ouvre un sélecteur de dossier pour choisir où cloner le dépôt."],
@@ -1508,6 +1517,7 @@
"H1TmTu": ["Correction arrêtée. Les fichiers déjà corrigés le restent."],
"H3oH0g": ["Rétablir"],
"H86f9p": ["Réduire"],
+ "H8DVOJ": ["Identiques dans les deux : ", ["pick"], " continue de les lire."],
"HAkEqR": ["Fichiers récents"],
"HAvHev": ["Mise à jour automatique désactivée pour « ", ["name"], " »"],
"HAvRAI": [
@@ -1635,6 +1645,7 @@
"It9ARY": ["Affiche ou masque le panneau du document, à droite."],
"It9oAP": ["La version ", ["editor"], " est désormais la source"],
"ItxGi3": ["Les pièces jointes doivent totaliser moins de 3 Mo."],
+ "IvKbeq": ["Les deux agents liront tout ce qui se trouve dans ", ["keep"], "."],
"Ix0K8o": ["Masquer les nœuds d'URL externes"],
"IxHMdF": ["Impossible de supprimer ce commentaire."],
"IxyZXD": ["Capture d'écran"],
@@ -1760,6 +1771,7 @@
"Kiytqd": ["Exception : les compétences sont partagées"],
"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."],
"KmydK6": ["Gras"],
"KnoB--": ["Sera enregistré sous <0>", ["sanitized"], "</0>."],
"KpOJFY": ["Activer les aperçus de liens externes"],
@@ -2362,6 +2374,7 @@
"RrAIZx": ["Ce que couvre le partage de la configuration"],
"Rsdhj9": ["Avertissements de configuration"],
"Rx5ReQ": ["Renommer ", ["keyName"]],
+ "RxF-am": ["Doublons écartés"],
"RyIKxy": [
"Ce ",
["targetNoun"],
@@ -3258,6 +3271,7 @@
"bcDHUM": [["descriptorLabel"], " — erreur de rendu, source modifiable ci-dessous"],
"bcjYUA": ["Replier ou déplier la source"],
"bcm0pR": ["l'agent ouvert"],
+ "beHZo4": ["OK ne peut pas les déplacer, elles disparaissent donc avec ", ["pick"], "."],
"bi2C2s": ["Impossible de joindre ", ["displayName"], ". Veuillez réessayer plus tard."],
"bjsEcb": ["Tout ramener au premier plan"],
"bkQRMh": ["Paragraphe"],
@@ -3549,6 +3563,7 @@
"evs0iw": ["Étiquettes correspondant à « ", ["tagListQuery"], " »"],
"ewSbS_": ["Session shell"],
"ezUmoU": ["Valeurs d'élément autorisées (vide = toutes)"],
+ "f1-q9m": ["conserve les compétences"],
"f14doC": ["Slidev"],
"f1XQyZ": ["Déplacer le bloc"],
"f65AOQ": ["Partir de"],
@@ -3802,6 +3817,7 @@
"hpzRlK": ["Rouvrir l'onglet fermé"],
"hqCwRf": ["Aucun fichier sélectionné"],
"hqVQbT": ["Ajouter un commentaire"],
+ "hs5BRR": ["Supprimées définitivement"],
"hvZwVx": ["Convertir"],
"hwFOFD": ["Échec du chargement des paramètres"],
"hxBHxQ": [
@@ -3942,6 +3958,11 @@
"jENU1Q": [
"S'applique à tous les projets de cette machine. Claude et Codex, lancés depuis le terminal intégré, approuvent automatiquement les outils de lecture et d'écriture d'OpenKnowledge (Claude exécute aussi automatiquement « ok open »). Supprimer, déplacer, partager, importer ou installer des compétences, les autres commandes et les modifications de fichiers hors OpenKnowledge demandent toujours confirmation. Cursor, OpenCode et Pi ne sont pas concernés. Au mieux selon l'agent."
],
+ "jEVipR": [
+ "Ces compétences sont actuellement lues depuis un autre dossier. Après la liaison, elles seront lues depuis ",
+ ["keep"],
+ "."
+ ],
"jEZ6Lf": ["provisoire"],
"jEdF24": ["Page manquante : ", ["linkTitle"], ". Cliquez pour la créer."],
"jJdwCB": ["Rétablir"],
@@ -4092,6 +4113,7 @@
"kfL8BJ": ["Échec de l'importation : ", ["0"]],
"khCa4M": ["Apprend aux agents de code de ce projet à lire et écrire via OpenKnowledge."],
"kj9pAE": ["Création de la page"],
+ "kjlQ9D": ["devient un lien symbolique"],
"kknhfj": ["Aucune modification"],
"kkux8f": ["Impossible de supprimer ", ["0"], ". Réessayez."],
"klPS-L": ["Fichier d'origine — avant les modifications de cet agent."],
@@ -4113,6 +4135,14 @@
"l17ab4": ["Impossible d'écrire les fichiers du projet. Essayez un autre emplacement."],
"l1aQKz": ["Tableau de l'éditeur visuel"],
"l1l8sj": ["il y a ", ["0"], " j"],
+ "l2BOXd": [
+ ["pick"],
+ " et ",
+ ["keep"],
+ " contiennent chacun une version différente de : ",
+ ["0"],
+ ". Résolvez-les d'abord : un lien symbolique ne peut en garder qu'une seule de chaque."
+ ],
"l3s5ri": ["Importer"],
"l3zD7w": ["Démarrage de l'agent…"],
"l46MqT": ["Onglet suivant"],
@@ -4453,6 +4483,7 @@
" » n'ont pas pu être effacées. Rechargez pour réessayer."
],
"oxdGJn": ["Avant de partir, accepteriez-vous de nous dire pourquoi ?"],
+ "oyBV3W": ["Chemin du dossier de compétences personnalisé"],
"p0Iq25": ["Insérer un lien"],
"p2LEhJ": ["Jeton d'accès personnel"],
"p3m_Gk": [
@@ -4685,6 +4716,7 @@
"rbrHTd": ["Approuvé — ", ["optionName"]],
"rcJmK8": ["Convertir les emplacements en copies"],
"rdU729": ["Mise en page"],
+ "rf0tV1": ["Lier les dossiers"],
"rf8fiC": ["Fermer la fenêtre"],
"rfFpcF": ["Retirer ", ["chip"]],
"rg7hNd": ["Évaluez votre expérience"],
diff --git a/packages/app/src/locales/fr/messages.po b/packages/app/src/locales/fr/messages.po
index 843b67cf7..457d7b418 100644
--- a/packages/app/src/locales/fr/messages.po
+++ b/packages/app/src/locales/fr/messages.po
@@ -814,6 +814,16 @@ msgstr "{percent}% utilisé ({left}% restant)"
msgid "{phase} — {pct}%"
msgstr "{phase} — {pct}%"
+#. placeholder {0}: p.conflicts.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} and {keep} both hold a different version of: {0}. Resolve those first — a symlink can only keep one of each."
+msgstr "{pick} et {keep} contiennent chacun une version différente de : {0}. Résolvez-les d'abord : un lien symbolique ne peut en garder qu'une seule de chaque."
+
+#. placeholder {0}: p.strays.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} holds entries that aren't skills: {0}. Remove or move them from the folder and try again."
+msgstr "{pick} contient des éléments qui ne sont pas des compétences : {0}. Supprimez-les ou déplacez-les hors du dossier, puis réessayez."
+
#: src/components/CreatedItemsList.tsx
msgid "{pluginCount, plural, one {plugin} other {plugins}}"
msgstr "{pluginCount, plural, one {extension} many {extensions} other {extensions}}"
@@ -1980,6 +1990,10 @@ msgstr "La réponse des rétroliens ne correspond pas à la forme attendue."
msgid "Base branch"
msgstr "Branche de base"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "becomes a symlink"
+msgstr "devient un lien symbolique"
+
#: src/components/TemplateBody.tsx
msgid "Becomes the document's content when someone creates a doc from this template. Type <0>{dateToken}</0> or <1>{userToken}</1> to fill in today's date or the author's name automatically."
msgstr "Devient le contenu du document lorsque quelqu'un en crée un à partir de ce modèle. Saisissez <0>{dateToken}</0> ou <1>{userToken}</1> pour insérer automatiquement la date du jour ou le nom de l'auteur."
@@ -2051,6 +2065,10 @@ msgstr "Gras"
msgid "Both"
msgstr "Les deux"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Both agents end up reading everything in {keep}."
+msgstr "Les deux agents liront tout ce qui se trouve dans {keep}."
+
#: src/components/share-metadata-rows.tsx
msgid "Branch"
msgstr "Branche"
@@ -2247,6 +2265,7 @@ msgstr "Impossible de partager ce chemin."
#: src/components/settings/NetworkAccessSection.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SearchSection.tsx
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
#: src/components/ShareBranchSwitchDialog.tsx
#: src/components/ShareReceiveDialog.tsx
#: src/components/SkillFileCreateDialog.tsx
@@ -3284,6 +3303,10 @@ msgstr "Copie en cours"
msgid "Copying..."
msgstr "Copie en cours…"
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Could not classify the merge — try again."
+msgstr "Impossible de classer la fusion. Réessayez."
+
#: src/components/FileTree.tsx
msgid "Could not complete delete"
msgstr "Impossible de terminer la suppression"
@@ -4125,6 +4148,10 @@ msgstr "HTML personnalisé avec un volet d'aperçu en direct (iframe en bac à s
msgid "Custom open-knowledge entry — not managed by OpenKnowledge"
msgstr "Entrée open-knowledge personnalisée — non gérée par OpenKnowledge"
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Custom skills folder path"
+msgstr "Chemin du dossier de compétences personnalisé"
+
#: src/components/settings/CustomThemeEditor.tsx
msgid "Custom theme"
msgstr "Thème personnalisé"
@@ -4268,6 +4295,10 @@ msgstr "{file} supprimé"
msgid "Deleted {filePath}"
msgstr "{filePath} supprimé"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Deleted for good"
+msgstr "Supprimées définitivement"
+
#: src/components/FolderTimelineCard.tsx
msgid "deleted template"
msgstr "modèle supprimé"
@@ -4669,6 +4700,10 @@ msgstr "Duplique l'élément de l'arborescence ayant le focus lorsque le focus e
msgid "Duplicated to \"{0}\""
msgstr "Dupliqué sous « {0} »"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Duplicates dropped"
+msgstr "Doublons écartés"
+
#: src/components/settings/AttachmentsSection.tsx
msgid "e.g. assets/uploads"
msgstr "par ex. assets/uploads"
@@ -6391,6 +6426,10 @@ msgstr "Sélecteur d'icônes"
msgid "ID: {0}"
msgstr "ID : {0}"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Identical in both — {pick} still reads them."
+msgstr "Identiques dans les deux : {pick} continue de les lire."
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "If an update arrives for something you are editing, you choose which version to keep, like a merge conflict."
msgstr "Si une mise à jour arrive pour ce que vous êtes en train de modifier, vous choisissez quelle version conserver, comme pour un conflit de fusion."
@@ -6982,6 +7021,10 @@ msgstr "Gardez ce projet synchronisé avec votre dépôt git distant. Suivre ré
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."
msgstr "Gardez la trace des personnes et des entreprises avec lesquelles vous travaillez et des réunions que vous avez avec elles. Utile pour se rappeler qui est quelqu'un, comment vous le connaissez, et de quoi vous avez parlé la dernière fois."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "keeps the skills"
+msgstr "conserve les compétences"
+
#: src/components/settings/LintingSection.tsx
msgid "Keeps your knowledge base aligned with the Open Knowledge Format."
msgstr "Maintient votre base de connaissances alignée sur l’Open Knowledge Format."
@@ -7070,6 +7113,7 @@ msgstr "Clair, sombre, ou suivre le système."
msgid "line {displayLine}"
msgstr "ligne {displayLine}"
+#: src/components/settings/SkillTargetsPicker.tsx
#: src/editor/bubble-menu/LinkEditPopover.tsx
#: src/editor/slash-command/component-items.tsx
msgid "Link"
@@ -7080,6 +7124,10 @@ msgstr "Lien"
msgid "Link copied."
msgstr "Lien copié."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link folders"
+msgstr "Lier les dossiers"
+
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Link preview settings not yet loaded — try again in a moment"
msgstr "Les paramètres d'aperçu des liens ne sont pas encore chargés — réessayez dans un instant"
@@ -7113,6 +7161,10 @@ msgstr "La cible du lien « {shown} » ne correspond à aucun fichier existant
msgid "Link the selected text, or edit the link under the caret."
msgstr "Ajoute un lien au texte sélectionné, ou modifie le lien situé sous le curseur."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link these skill folders?"
+msgstr "Lier ces dossiers de compétences ?"
+
#: src/editor/slash-command/component-items.tsx
msgid "Link to a page or external URL."
msgstr "Lien vers une page ou une URL externe."
@@ -7622,6 +7674,10 @@ msgstr "Les plus installées"
msgid "Move"
msgstr "Déplacer"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Move across"
+msgstr "Déplacées"
+
#: src/lib/keyboard-shortcuts.ts
msgid "Move between table cells"
msgstr "Se déplacer entre les cellules du tableau"
@@ -8533,6 +8589,10 @@ msgstr "Désactivé — la recherche classe uniquement par mots-clés. Aucun con
msgid "Offline"
msgstr "Hors ligne"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "OK can't move these, so they go when {pick} does."
+msgstr "OK ne peut pas les déplacer, elles disparaissent donc avec {pick}."
+
#: src/lib/keyboard-shortcuts.ts
msgid "OK Desktop"
msgstr "OK Desktop"
@@ -11668,6 +11728,10 @@ msgstr "Les compétences sont maintenant partagées. Validez .ok/skills pour les
msgid "Skills install to every AI tool detected on this machine, independent of the MCP connections you chose above."
msgstr "Les compétences s'installent dans tous les outils IA détectés sur cette machine, indépendamment des connexions MCP choisies ci-dessus."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Skills reassigned"
+msgstr "Compétences réaffectées"
+
#: src/components/AppMenubar.tsx
#: src/components/command-palette-commands.ts
#: src/components/FileSidebar.tsx
@@ -12103,7 +12167,6 @@ msgstr "Changement de branche"
msgid "Switching to <0>local-only</0> will refuse until they're untracked via<1> git rm --cached</1>."
msgstr "Le passage à <0>local uniquement</0> sera refusé tant qu'ils ne seront pas retirés du suivi via<1> git rm --cached</1>."
-#: src/components/settings/SkillTargetsPicker.tsx
#: src/components/SkillInstallMenu.tsx
msgid "symlink"
msgstr "lien symbolique"
@@ -12754,6 +12817,10 @@ msgstr "Thèmes"
msgid "There's no project folder for this window, so a terminal can't start here."
msgstr "Il n'y a pas de dossier de projet pour cette fenêtre, un terminal ne peut donc pas y démarrer."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "These currently read from another folder. After linking, they read from {keep} instead."
+msgstr "Ces compétences sont actuellement lues depuis un autre dossier. Après la liaison, elles seront lues depuis {keep}."
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "These rules come from your project's <0>{configFile}</0> file, which fully governs linting for this project. Turn rules on or off and edit their options here; changes write back to the file."
msgstr "Ces règles proviennent du fichier <0>{configFile}</0> de votre projet, qui régit entièrement la vérification pour ce projet. Activez ou désactivez des règles et modifiez leurs options ici ; les changements sont réécrits dans le fichier."
diff --git a/packages/app/src/locales/hi/messages.json b/packages/app/src/locales/hi/messages.json
index c45f0ca99..669f6c718 100644
--- a/packages/app/src/locales/hi/messages.json
+++ b/packages/app/src/locales/hi/messages.json
@@ -47,6 +47,12 @@
"-q4abP": [
"परिणाम सीमित — इस कार्यक्षेत्र में खोज के अनुक्रमण से ज़्यादा फ़ाइलें हैं। कोई अनुपस्थित फ़ाइल इस सीमा का नतीजा हो सकती है, वर्तनी की ग़लती नहीं।"
],
+ "-qBQVd": [
+ ["pick"],
+ " में ऐसी प्रविष्टियाँ हैं जो स्किल नहीं हैं: ",
+ ["0"],
+ "। उन्हें फ़ोल्डर से हटाएँ या कहीं और ले जाएँ, फिर दोबारा कोशिश करें।"
+ ],
"-slrNR": ["कार्य सूची चालू या बंद करें।"],
"-uaQnI": ["कोई मेल खाता वर्कट्री या ब्रांच नहीं।"],
"-yOx8u": ["बदलाव सहेजे जा रहे हैं…"],
@@ -108,6 +114,7 @@
"0g7rCZ": ["\"", ["0"], "\" में नकल बनाई गई"],
"0jD-Gn": ["एक टीम ज्ञान आधार, एक निजी विकी, प्रोजेक्ट दस्तावेज़…"],
"0kTAXe": ["स्रोत खोलें: ", ["mirrorSrc"]],
+ "0m4Snh": ["स्किल फिर से असाइन किए गए"],
"0pZmTP": ["यह पथ साझा नहीं किया जा सकता।"],
"0qyKG6": ["डिस्क से सिंक किया गया"],
"0r6d6v": ["बदलाव अपने आप सहेज दिए गए।"],
@@ -195,6 +202,7 @@
"2BBAbc": ["सूची"],
"2C-6zf": ["भेजा नहीं गया"],
"2CHoQv": ["बलपूर्वक फिर से लोड करें"],
+ "2Ce6hp": ["स्थानांतरित होंगी"],
"2D1x3Y": ["लागू करें और प्रोजेक्ट सर्वर पुनः प्रारंभ करें"],
"2FYpfJ": ["और"],
"2FnYUD": [
@@ -1080,6 +1088,7 @@
"Es3G-g": [
"इसी प्रोजेक्ट में रहता है (जहाँ भी स्किल का फ़ोल्डर है) और git के ज़रिए सहयोगियों के साथ साझा होता है।"
],
+ "Eu-LIb": ["इन स्किल फ़ोल्डरों को लिंक करें?"],
"Ev2r9A": ["कोई परिणाम नहीं"],
"EvIJVD": ["टूल कॉल"],
"EvPX7f": ["रिपॉज़िटरी कहाँ क्लोन करनी है यह चुनने के लिए फ़ोल्डर चयनकर्ता खोलता है।"],
@@ -1241,6 +1250,7 @@
"H1TmTu": ["ठीक करना रोक दिया गया। जो फ़ाइलें पहले ही ठीक हो चुकी हैं वे ठीक ही रहेंगी।"],
"H3oH0g": ["फिर से करें"],
"H86f9p": ["समेटें"],
+ "H8DVOJ": ["दोनों में एक जैसी हैं — ", ["pick"], " इन्हें फिर भी पढ़ता रहेगा।"],
"HAkEqR": ["हाल की फ़ाइलें"],
"HAvHev": ["\"", ["name"], "\" के लिए स्वत: अपडेट बंद"],
"HAvRAI": [["skillCount", "plural", { "one": ["स्किल"], "other": ["स्किल"] }]],
@@ -1336,6 +1346,7 @@
"It9ARY": ["दायाँ दस्तावेज़ पैनल चालू या बंद करें।"],
"It9oAP": [["editor"], " संस्करण अब स्रोत है"],
"ItxGi3": ["संलग्नकों का कुल आकार 3 MB से कम होना चाहिए।"],
+ "IvKbeq": ["दोनों एजेंट अंत में ", ["keep"], " की हर चीज़ पढ़ेंगे।"],
"Ix0K8o": ["बाहरी URL नोड छिपाएँ"],
"IxHMdF": ["वह टिप्पणी नहीं हटाई जा सकी।"],
"IxyZXD": ["स्क्रीनशॉट"],
@@ -1447,6 +1458,7 @@
"Kiytqd": ["अपवाद: स्किल साझा की जाती हैं"],
"KjTmeO": ["इस साझा सामग्री को खोलने के लिए OpenKnowledge अपडेट करें।"],
"KkEAud": ["मौजूदा दस्तावेज़ या फ़ोल्डर संदर्भ से एक फ़ाइल बनाएँ।"],
+ "KkRyMI": ["मर्ज को वर्गीकृत नहीं किया जा सका — फिर से कोशिश करें।"],
"KmydK6": ["गाढ़ा"],
"KnoB--": ["<0>", ["sanitized"], "</0> के रूप में सहेजा जाएगा।"],
"KpOJFY": ["बाहरी लिंक पूर्वावलोकन सक्षम करें"],
@@ -1981,6 +1993,7 @@
"RrAIZx": ["कॉन्फ़िग साझाकरण में क्या आता है"],
"Rsdhj9": ["कॉन्फ़िगरेशन चेतावनियाँ"],
"Rx5ReQ": [["keyName"], " का नाम बदलें"],
+ "RxF-am": ["डुप्लिकेट हटाए गए"],
"RyIKxy": [
"यह ",
["targetNoun"],
@@ -2719,6 +2732,7 @@
"bcDHUM": [["descriptorLabel"], " — रेंडर त्रुटि, स्रोत नीचे संपादन योग्य"],
"bcjYUA": ["स्रोत मोड़ें या खोलें"],
"bcm0pR": ["खुला हुआ एजेंट"],
+ "beHZo4": ["OK इन्हें ले जा नहीं सकता, इसलिए ये ", ["pick"], " के साथ ही चले जाएंगे।"],
"bi2C2s": [["displayName"], " तक नहीं पहुँचा जा सका। कृपया बाद में फिर कोशिश करें।"],
"bjsEcb": ["सभी को सामने लाएँ"],
"bkQRMh": ["पैराग्राफ़"],
@@ -2934,6 +2948,7 @@
"evs0iw": ["\"", ["tagListQuery"], "\" से मेल खाते टैग"],
"ewSbS_": ["Shell सत्र"],
"ezUmoU": ["अनुमत तत्व मान (खाली = कोई भी)"],
+ "f1-q9m": ["स्किल अपने पास रखता है"],
"f14doC": ["Slidev"],
"f1XQyZ": ["ब्लॉक हिलाएँ"],
"f65AOQ": ["यहाँ से शुरू करें"],
@@ -3142,6 +3157,7 @@
"hpzRlK": ["बंद किया गया टैब फिर से खोलें"],
"hqCwRf": ["कोई फ़ाइल नहीं चुनी गई"],
"hqVQbT": ["टिप्पणी जोड़ें"],
+ "hs5BRR": ["हमेशा के लिए हटेंगी"],
"hvZwVx": ["बदलें"],
"hwFOFD": ["सेटिंग लोड नहीं हो सकीं"],
"hxBHxQ": ["फ़ुटनोट<0><1>[1]</1></0> वाली एक पंक्ति और नीचे दिखाई गई परिभाषा।"],
@@ -3264,6 +3280,11 @@
"jENU1Q": [
"इस मशीन के सभी प्रोजेक्ट पर लागू होता है। अंतर्निहित टर्मिनल से शुरू किए गए Claude और Codex, OpenKnowledge के पढ़ने और लिखने वाले टूल स्वत: स्वीकृत करते हैं (Claude \"ok open\" भी स्वत: चलाता है)। स्किल हटाना, हिलाना, साझा करना, आयात करना या इंस्टॉल करना, अन्य कमांड, और OpenKnowledge के बाहर की फ़ाइल संपादन अब भी पूछते हैं। Cursor, OpenCode और Pi अप्रभावित रहते हैं। हर एजेंट के लिए यथासंभव।"
],
+ "jEVipR": [
+ "ये अभी किसी दूसरे फ़ोल्डर से पढ़े जाते हैं। लिंक करने के बाद, ये उसकी जगह ",
+ ["keep"],
+ " से पढ़े जाएँगे।"
+ ],
"jEZ6Lf": ["अस्थायी"],
"jEdF24": ["अनुपस्थित पेज: ", ["linkTitle"], ". बनाने के लिए क्लिक करें।"],
"jJdwCB": ["वापस लें"],
@@ -3396,6 +3417,7 @@
"kfL8BJ": ["आयात विफल: ", ["0"]],
"khCa4M": ["इस प्रोजेक्ट के कोडिंग एजेंट को OpenKnowledge के ज़रिए पढ़ना और लिखना सिखाता है।"],
"kj9pAE": ["पेज बनाया जा रहा है"],
+ "kjlQ9D": ["सिमलिंक बन जाता है"],
"kknhfj": ["कोई बदलाव नहीं"],
"kkux8f": [["0"], " नहीं हटाया जा सका। फिर से कोशिश करें।"],
"klPS-L": ["मूल फ़ाइल — इस एजेंट के संपादन से पहले।"],
@@ -3415,6 +3437,14 @@
"l17ab4": ["प्रोजेक्ट फ़ाइलें नहीं लिखी जा सकीं। कोई दूसरा स्थान आज़माएँ।"],
"l1aQKz": ["दृश्य संपादक की तालिका"],
"l1l8sj": [["0"], " दिन पहले"],
+ "l2BOXd": [
+ ["pick"],
+ " और ",
+ ["keep"],
+ " दोनों में ",
+ ["0"],
+ " के अलग-अलग संस्करण हैं। पहले उन्हें सुलझाएँ: एक सिमलिंक हर स्किल का सिर्फ़ एक ही संस्करण रख सकता है।"
+ ],
"l3s5ri": ["आयात करें"],
"l3zD7w": ["एजेंट शुरू किया जा रहा है…"],
"l46MqT": ["अगला टैब"],
@@ -3703,6 +3733,7 @@
"\" का स्थानीय सहयोग डेटा साफ़ नहीं हो सका। फिर कोशिश करने के लिए पेज दोबारा लोड करें।"
],
"oxdGJn": ["जाने से पहले, क्या आप बताना चाहेंगे कि क्यों?"],
+ "oyBV3W": ["कस्टम स्किल फ़ोल्डर पाथ"],
"p0Iq25": ["लिंक डालें"],
"p2LEhJ": ["व्यक्तिगत पहुँच टोकन"],
"p3m_Gk": [
@@ -3875,6 +3906,7 @@
"rbrHTd": ["स्वीकृत — ", ["optionName"]],
"rcJmK8": ["स्थानों को प्रतियों में बदलें"],
"rdU729": ["लेआउट"],
+ "rf0tV1": ["फ़ोल्डर लिंक करें"],
"rf8fiC": ["विंडो बंद करें"],
"rfFpcF": [["chip"], " हटाएँ"],
"rg7hNd": ["अपने अनुभव को आँकें"],
diff --git a/packages/app/src/locales/hi/messages.po b/packages/app/src/locales/hi/messages.po
index 503d5b0ab..c2f8c86bb 100644
--- a/packages/app/src/locales/hi/messages.po
+++ b/packages/app/src/locales/hi/messages.po
@@ -814,6 +814,16 @@ msgstr "{percent}% उपयोग में ({left}% शेष)"
msgid "{phase} — {pct}%"
msgstr "{phase} — {pct}%"
+#. placeholder {0}: p.conflicts.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} and {keep} both hold a different version of: {0}. Resolve those first — a symlink can only keep one of each."
+msgstr "{pick} और {keep} दोनों में {0} के अलग-अलग संस्करण हैं। पहले उन्हें सुलझाएँ: एक सिमलिंक हर स्किल का सिर्फ़ एक ही संस्करण रख सकता है।"
+
+#. placeholder {0}: p.strays.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} holds entries that aren't skills: {0}. Remove or move them from the folder and try again."
+msgstr "{pick} में ऐसी प्रविष्टियाँ हैं जो स्किल नहीं हैं: {0}। उन्हें फ़ोल्डर से हटाएँ या कहीं और ले जाएँ, फिर दोबारा कोशिश करें।"
+
#: src/components/CreatedItemsList.tsx
msgid "{pluginCount, plural, one {plugin} other {plugins}}"
msgstr "{pluginCount, plural, one {प्लगइन} other {प्लगइन}}"
@@ -1976,6 +1986,10 @@ msgstr "बैकलिंक प्रतिक्रिया अपेक्
msgid "Base branch"
msgstr "आधार ब्रांच"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "becomes a symlink"
+msgstr "सिमलिंक बन जाता है"
+
#: src/components/TemplateBody.tsx
msgid "Becomes the document's content when someone creates a doc from this template. Type <0>{dateToken}</0> or <1>{userToken}</1> to fill in today's date or the author's name automatically."
msgstr "जब कोई इस टेम्पलेट से दस्तावेज़ बनाता है तो यह उस दस्तावेज़ की सामग्री बन जाती है। आज की तारीख़ या लेखक का नाम अपने आप भरने के लिए <0>{dateToken}</0> या <1>{userToken}</1> लिखें।"
@@ -2047,6 +2061,10 @@ msgstr "गाढ़ा"
msgid "Both"
msgstr "दोनों"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Both agents end up reading everything in {keep}."
+msgstr "दोनों एजेंट अंत में {keep} की हर चीज़ पढ़ेंगे।"
+
#: src/components/share-metadata-rows.tsx
msgid "Branch"
msgstr "ब्रांच"
@@ -2243,6 +2261,7 @@ msgstr "यह पथ साझा नहीं किया जा सकता
#: src/components/settings/NetworkAccessSection.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SearchSection.tsx
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
#: src/components/ShareBranchSwitchDialog.tsx
#: src/components/ShareReceiveDialog.tsx
#: src/components/SkillFileCreateDialog.tsx
@@ -3280,6 +3299,10 @@ msgstr "कॉपी किया जा रहा है"
msgid "Copying..."
msgstr "कॉपी किया जा रहा है…"
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Could not classify the merge — try again."
+msgstr "मर्ज को वर्गीकृत नहीं किया जा सका — फिर से कोशिश करें।"
+
#: src/components/FileTree.tsx
msgid "Could not complete delete"
msgstr "विलोपन पूरा नहीं हो सका"
@@ -4121,6 +4144,10 @@ msgstr "लाइव पूर्वावलोकन पैनल वाला
msgid "Custom open-knowledge entry — not managed by OpenKnowledge"
msgstr "कस्टम open-knowledge प्रविष्टि — OpenKnowledge द्वारा प्रबंधित नहीं"
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Custom skills folder path"
+msgstr "कस्टम स्किल फ़ोल्डर पाथ"
+
#: src/components/settings/CustomThemeEditor.tsx
msgid "Custom theme"
msgstr "कस्टम थीम"
@@ -4264,6 +4291,10 @@ msgstr "{file} हटाई गई"
msgid "Deleted {filePath}"
msgstr "{filePath} मिटाई गई"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Deleted for good"
+msgstr "हमेशा के लिए हटेंगी"
+
#: src/components/FolderTimelineCard.tsx
msgid "deleted template"
msgstr "टेम्पलेट हटाया गया"
@@ -4665,6 +4696,10 @@ msgstr "जब फ़ोकस Files साइडबार में हो त
msgid "Duplicated to \"{0}\""
msgstr "\"{0}\" में नकल बनाई गई"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Duplicates dropped"
+msgstr "डुप्लिकेट हटाए गए"
+
#: src/components/settings/AttachmentsSection.tsx
msgid "e.g. assets/uploads"
msgstr "जैसे assets/uploads"
@@ -6387,6 +6422,10 @@ msgstr "आइकन चयनकर्ता"
msgid "ID: {0}"
msgstr "ID: {0}"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Identical in both — {pick} still reads them."
+msgstr "दोनों में एक जैसी हैं — {pick} इन्हें फिर भी पढ़ता रहेगा।"
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "If an update arrives for something you are editing, you choose which version to keep, like a merge conflict."
msgstr "यदि आपके संपादित किए जा रहे किसी हिस्से के लिए कोई अपडेट आता है, तो आप चुनते हैं कि कौन सा संस्करण रखना है, ठीक मर्ज टकराव की तरह।"
@@ -6978,6 +7017,10 @@ msgstr "इस प्रोजेक्ट को अपने git रिमो
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."
msgstr "आप जिन लोगों और कंपनियों के साथ काम करते हैं और उनके साथ होने वाली बैठकों पर नज़र रखें। यह याद रखने के लिए अच्छा कि कोई कौन है, आप उसे कैसे जानते हैं, और आपकी आख़िरी बात किस पर हुई थी।"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "keeps the skills"
+msgstr "स्किल अपने पास रखता है"
+
#: src/components/settings/LintingSection.tsx
msgid "Keeps your knowledge base aligned with the Open Knowledge Format."
msgstr "आपके ज्ञानकोष को Open Knowledge Format के अनुरूप रखता है।"
@@ -7066,6 +7109,7 @@ msgstr "हल्का, गहरा, या OS का अनुसरण।"
msgid "line {displayLine}"
msgstr "पंक्ति {displayLine}"
+#: src/components/settings/SkillTargetsPicker.tsx
#: src/editor/bubble-menu/LinkEditPopover.tsx
#: src/editor/slash-command/component-items.tsx
msgid "Link"
@@ -7076,6 +7120,10 @@ msgstr "लिंक"
msgid "Link copied."
msgstr "लिंक कॉपी किया गया।"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link folders"
+msgstr "फ़ोल्डर लिंक करें"
+
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Link preview settings not yet loaded — try again in a moment"
msgstr "लिंक पूर्वावलोकन सेटिंग अभी लोड नहीं हुई — कुछ देर बाद फिर कोशिश करें"
@@ -7109,6 +7157,10 @@ msgstr "लिंक लक्ष्य \"{shown}\" किसी मौजूद
msgid "Link the selected text, or edit the link under the caret."
msgstr "चयनित पाठ को लिंक करें, या कर्सर के नीचे वाला लिंक संपादित करें।"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link these skill folders?"
+msgstr "इन स्किल फ़ोल्डरों को लिंक करें?"
+
#: src/editor/slash-command/component-items.tsx
msgid "Link to a page or external URL."
msgstr "किसी पेज या बाहरी URL से लिंक करें।"
@@ -7618,6 +7670,10 @@ msgstr "सबसे ज़्यादा इंस्टॉल"
msgid "Move"
msgstr "हिलाएँ"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Move across"
+msgstr "स्थानांतरित होंगी"
+
#: src/lib/keyboard-shortcuts.ts
msgid "Move between table cells"
msgstr "तालिका की कोशिकाओं के बीच जाएँ"
@@ -8529,6 +8585,10 @@ msgstr "बंद — खोज केवल कीवर्ड से क्र
msgid "Offline"
msgstr "ऑफ़लाइन"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "OK can't move these, so they go when {pick} does."
+msgstr "OK इन्हें ले जा नहीं सकता, इसलिए ये {pick} के साथ ही चले जाएंगे।"
+
#: src/lib/keyboard-shortcuts.ts
msgid "OK Desktop"
msgstr "OK Desktop"
@@ -11664,6 +11724,10 @@ msgstr "स्किल अब साझा हैं। अपनी टीम
msgid "Skills install to every AI tool detected on this machine, independent of the MCP connections you chose above."
msgstr "स्किल इस मशीन पर मिले हर AI टूल में इंस्टॉल होती हैं, चाहे आपने ऊपर कोई भी MCP कनेक्शन चुना हो।"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Skills reassigned"
+msgstr "स्किल फिर से असाइन किए गए"
+
#: src/components/AppMenubar.tsx
#: src/components/command-palette-commands.ts
#: src/components/FileSidebar.tsx
@@ -12099,7 +12163,6 @@ msgstr "ब्रांच बदली जा रही हैं"
msgid "Switching to <0>local-only</0> will refuse until they're untracked via<1> git rm --cached</1>."
msgstr "<0>केवल-स्थानीय</0> पर जाना तब तक मना रहेगा जब तक उन्हें<1> git rm --cached</1> से अनट्रैक न किया जाए।"
-#: src/components/settings/SkillTargetsPicker.tsx
#: src/components/SkillInstallMenu.tsx
msgid "symlink"
msgstr "सिमलिंक"
@@ -12750,6 +12813,10 @@ msgstr "थीम"
msgid "There's no project folder for this window, so a terminal can't start here."
msgstr "इस विंडो के लिए कोई प्रोजेक्ट फ़ोल्डर नहीं है, इसलिए यहाँ टर्मिनल शुरू नहीं हो सकता।"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "These currently read from another folder. After linking, they read from {keep} instead."
+msgstr "ये अभी किसी दूसरे फ़ोल्डर से पढ़े जाते हैं। लिंक करने के बाद, ये उसकी जगह {keep} से पढ़े जाएँगे।"
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "These rules come from your project's <0>{configFile}</0> file, which fully governs linting for this project. Turn rules on or off and edit their options here; changes write back to the file."
msgstr "ये नियम आपके प्रोजेक्ट की <0>{configFile}</0> फ़ाइल से आते हैं, जो इस प्रोजेक्ट की linting पूरी तरह तय करती है। नियम यहाँ चालू या बंद करें और उनके विकल्प संपादित करें; बदलाव उसी फ़ाइल में लिखे जाते हैं।"
diff --git a/packages/app/src/locales/id/messages.json b/packages/app/src/locales/id/messages.json
index aed74bcf9..d9c406e15 100644
--- a/packages/app/src/locales/id/messages.json
+++ b/packages/app/src/locales/id/messages.json
@@ -43,6 +43,12 @@
"-q4abP": [
"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."
],
+ "-qBQVd": [
+ ["pick"],
+ " berisi entri yang bukan keterampilan: ",
+ ["0"],
+ ". Hapus atau pindahkan entri tersebut dari folder, lalu coba lagi."
+ ],
"-slrNR": ["Menyalakan atau mematikan daftar tugas."],
"-uaQnI": ["Tidak ada worktree atau cabang yang cocok."],
"-yOx8u": ["Menyimpan perubahan…"],
@@ -108,6 +114,7 @@
"0g7rCZ": ["Digandakan menjadi \"", ["0"], "\""],
"0jD-Gn": ["Basis pengetahuan tim, wiki pribadi, dokumentasi proyek..."],
"0kTAXe": ["Buka sumber: ", ["mirrorSrc"]],
+ "0m4Snh": ["Keterampilan dialihkan"],
"0pZmTP": ["Tidak dapat membagikan jalur ini."],
"0qyKG6": ["Tersinkron dari disk"],
"0r6d6v": ["Perubahan disimpan otomatis."],
@@ -197,6 +204,7 @@
"2BBAbc": ["Daftar"],
"2C-6zf": ["Belum terkirim"],
"2CHoQv": ["Muat Ulang Paksa"],
+ "2Ce6hp": ["Dipindahkan"],
"2D1x3Y": ["Terapkan dan mulai ulang server proyek"],
"2FYpfJ": ["Lainnya"],
"2FnYUD": [
@@ -1100,6 +1108,7 @@
"Es3G-g": [
"Berada di proyek ini (di mana pun folder keterampilannya) dan dibagikan ke kolaborator lewat git."
],
+ "Eu-LIb": ["Tautkan folder keterampilan ini?"],
"Ev2r9A": ["Tidak ada hasil"],
"EvIJVD": ["Panggilan alat"],
"EvPX7f": ["Membuka pemilih folder untuk memilih tempat mengkloning repositorinya."],
@@ -1278,6 +1287,7 @@
"H1TmTu": ["Perbaikan dihentikan. Berkas yang sudah diperbaiki tetap terperbaiki."],
"H3oH0g": ["Ulangi"],
"H86f9p": ["Ciutkan"],
+ "H8DVOJ": ["Identik di keduanya — ", ["pick"], " tetap membacanya."],
"HAkEqR": ["Berkas terbaru"],
"HAvHev": ["Pembaruan otomatis mati untuk \"", ["name"], "\""],
"HAvRAI": [["skillCount", "plural", { "other": ["keterampilan"] }]],
@@ -1386,6 +1396,7 @@
"It9ARY": ["Menampilkan atau menyembunyikan panel dokumen di kanan."],
"It9oAP": ["Versi ", ["editor"], " kini menjadi sumbernya"],
"ItxGi3": ["Total lampiran harus di bawah 3 MB."],
+ "IvKbeq": ["Kedua agen akhirnya membaca semua yang ada di ", ["keep"], "."],
"Ix0K8o": ["Sembunyikan simpul URL eksternal"],
"IxHMdF": ["Komentar itu tidak bisa dihapus."],
"IxyZXD": ["Tangkapan layar"],
@@ -1501,6 +1512,7 @@
"Kiytqd": ["Pengecualian: keterampilan dibagikan"],
"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."],
"KmydK6": ["Tebal"],
"KnoB--": ["Akan disimpan sebagai <0>", ["sanitized"], "</0>."],
"KpOJFY": ["Aktifkan pratinjau tautan eksternal"],
@@ -2045,6 +2057,7 @@
"RrAIZx": ["Apa saja yang dicakup berbagi konfigurasi"],
"Rsdhj9": ["Peringatan konfigurasi"],
"Rx5ReQ": ["Ganti nama ", ["keyName"]],
+ "RxF-am": ["Duplikat dibuang"],
"RyIKxy": [
["targetNoun"],
" ini sudah dipindahkan, diganti nama, atau dihapus di salinan lokal Anda, dan perubahan itu belum tersinkron."
@@ -2808,6 +2821,7 @@
"bcDHUM": [["descriptorLabel"], " — galat render, sumber bisa disunting di bawah"],
"bcjYUA": ["Lipat atau buka lipatan sumber"],
"bcm0pR": ["agen yang terbuka"],
+ "beHZo4": ["OK tidak bisa memindahkan ini, jadi ikut hilang bersama ", ["pick"], "."],
"bi2C2s": ["Tidak dapat menghubungi ", ["displayName"], ". Silakan coba lagi nanti."],
"bjsEcb": ["Bawa semua ke depan"],
"bkQRMh": ["Paragraf"],
@@ -3045,6 +3059,7 @@
"evs0iw": ["Tag yang cocok dengan \"", ["tagListQuery"], "\""],
"ewSbS_": ["Sesi shell"],
"ezUmoU": ["Nilai elemen yang diizinkan (kosong = apa saja)"],
+ "f1-q9m": ["menyimpan keterampilan"],
"f14doC": ["Slidev"],
"f1XQyZ": ["Pindahkan blok"],
"f65AOQ": ["Mulai dari"],
@@ -3270,6 +3285,7 @@
"hpzRlK": ["Buka lagi tab yang ditutup"],
"hqCwRf": ["Tidak ada berkas yang dipilih"],
"hqVQbT": ["Tambah Komentar"],
+ "hs5BRR": ["Dihapus permanen"],
"hvZwVx": ["Ubah"],
"hwFOFD": ["Gagal memuat pengaturan"],
"hxBHxQ": [
@@ -3403,6 +3419,11 @@
"jENU1Q": [
"Berlaku untuk semua proyek di komputer ini. Claude dan Codex, yang dijalankan dari terminal bawaan, otomatis menyetujui alat baca dan tulis OpenKnowledge (Claude juga menjalankan \"ok open\" sendiri). Menghapus, memindahkan, membagikan, mengimpor atau memasang keterampilan, perintah lain, dan penyuntingan berkas di luar OpenKnowledge tetap ditanyakan. Cursor, OpenCode, dan Pi tidak terpengaruh. Sebaik mungkin, per agen."
],
+ "jEVipR": [
+ "Saat ini keterampilan ini dibaca dari folder lain. Setelah ditautkan, keterampilan ini dibaca dari ",
+ ["keep"],
+ "."
+ ],
"jEZ6Lf": ["sementara"],
"jEdF24": ["Halaman belum ada: ", ["linkTitle"], ". Klik untuk membuat."],
"jJdwCB": ["Kembalikan"],
@@ -3537,6 +3558,7 @@
"Mengajari agen pemrograman di proyek ini untuk membaca dan menulis lewat OpenKnowledge."
],
"kj9pAE": ["Membuat halaman"],
+ "kjlQ9D": ["menjadi tautan simbolik"],
"kknhfj": ["Tidak ada perubahan"],
"kkux8f": [["0"], " tidak dapat dihapus. Coba lagi."],
"klPS-L": ["Berkas asli — sebelum suntingan agen ini."],
@@ -3558,6 +3580,14 @@
"l17ab4": ["Berkas proyek tidak dapat ditulis. Coba lokasi lain."],
"l1aQKz": ["Tabel penyunting visual"],
"l1l8sj": [["0"], " hr lalu"],
+ "l2BOXd": [
+ ["pick"],
+ " dan ",
+ ["keep"],
+ " sama-sama memuat versi berbeda dari: ",
+ ["0"],
+ ". Selesaikan itu dulu: satu tautan simbolik hanya bisa menyimpan satu versi untuk masing-masing."
+ ],
"l3s5ri": ["Impor"],
"l3zD7w": ["Memulai agennya…"],
"l46MqT": ["Tab berikutnya"],
@@ -3857,6 +3887,7 @@
"\" tidak dapat dibersihkan. Muat ulang untuk mencoba lagi."
],
"oxdGJn": ["Sebelum pergi, boleh cerita kenapa?"],
+ "oyBV3W": ["Jalur folder keterampilan khusus"],
"p0Iq25": ["Sisipkan tautan"],
"p2LEhJ": ["Token akses pribadi"],
"p3m_Gk": [
@@ -4035,6 +4066,7 @@
"rbrHTd": ["Disetujui — ", ["optionName"]],
"rcJmK8": ["Ubah lokasi menjadi salinan"],
"rdU729": ["Tata letak"],
+ "rf0tV1": ["Tautkan folder"],
"rf8fiC": ["Tutup jendela"],
"rfFpcF": ["Hapus ", ["chip"]],
"rg7hNd": ["Nilai pengalaman Anda"],
diff --git a/packages/app/src/locales/id/messages.po b/packages/app/src/locales/id/messages.po
index f1a737d42..ba4ffd796 100644
--- a/packages/app/src/locales/id/messages.po
+++ b/packages/app/src/locales/id/messages.po
@@ -814,6 +814,16 @@ msgstr "{percent}% terpakai (sisa {left}%)"
msgid "{phase} — {pct}%"
msgstr "{phase} — {pct}%"
+#. placeholder {0}: p.conflicts.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} and {keep} both hold a different version of: {0}. Resolve those first — a symlink can only keep one of each."
+msgstr "{pick} dan {keep} sama-sama memuat versi berbeda dari: {0}. Selesaikan itu dulu: satu tautan simbolik hanya bisa menyimpan satu versi untuk masing-masing."
+
+#. placeholder {0}: p.strays.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} holds entries that aren't skills: {0}. Remove or move them from the folder and try again."
+msgstr "{pick} berisi entri yang bukan keterampilan: {0}. Hapus atau pindahkan entri tersebut dari folder, lalu coba lagi."
+
#: src/components/CreatedItemsList.tsx
msgid "{pluginCount, plural, one {plugin} other {plugins}}"
msgstr "{pluginCount, plural, other {plugin}}"
@@ -1976,6 +1986,10 @@ msgstr "Respons tautan balik tidak sesuai bentuk yang diharapkan."
msgid "Base branch"
msgstr "Cabang dasar"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "becomes a symlink"
+msgstr "menjadi tautan simbolik"
+
#: src/components/TemplateBody.tsx
msgid "Becomes the document's content when someone creates a doc from this template. Type <0>{dateToken}</0> or <1>{userToken}</1> to fill in today's date or the author's name automatically."
msgstr "Menjadi isi dokumen ketika seseorang membuat dokumen dari templat ini. Ketik <0>{dateToken}</0> atau <1>{userToken}</1> untuk mengisi tanggal hari ini atau nama penulis secara otomatis."
@@ -2047,6 +2061,10 @@ msgstr "Tebal"
msgid "Both"
msgstr "Keduanya"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Both agents end up reading everything in {keep}."
+msgstr "Kedua agen akhirnya membaca semua yang ada di {keep}."
+
#: src/components/share-metadata-rows.tsx
msgid "Branch"
msgstr "Cabang"
@@ -2243,6 +2261,7 @@ msgstr "Tidak dapat membagikan jalur ini."
#: src/components/settings/NetworkAccessSection.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SearchSection.tsx
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
#: src/components/ShareBranchSwitchDialog.tsx
#: src/components/ShareReceiveDialog.tsx
#: src/components/SkillFileCreateDialog.tsx
@@ -3280,6 +3299,10 @@ msgstr "Menyalin"
msgid "Copying..."
msgstr "Menyalin..."
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Could not classify the merge — try again."
+msgstr "Penggabungan tidak dapat diklasifikasikan — coba lagi."
+
#: src/components/FileTree.tsx
msgid "Could not complete delete"
msgstr "Penghapusan tidak dapat diselesaikan"
@@ -4121,6 +4144,10 @@ msgstr "HTML khusus dengan panel pratinjau langsung (iframe tersekat)."
msgid "Custom open-knowledge entry — not managed by OpenKnowledge"
msgstr "Entri open-knowledge khusus — tidak dikelola OpenKnowledge"
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Custom skills folder path"
+msgstr "Jalur folder keterampilan khusus"
+
#: src/components/settings/CustomThemeEditor.tsx
msgid "Custom theme"
msgstr "Tema khusus"
@@ -4264,6 +4291,10 @@ msgstr "{file} dihapus"
msgid "Deleted {filePath}"
msgstr "{filePath} dihapus"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Deleted for good"
+msgstr "Dihapus permanen"
+
#: src/components/FolderTimelineCard.tsx
msgid "deleted template"
msgstr "templat dihapus"
@@ -4665,6 +4696,10 @@ msgstr "Menggandakan item pohon berkas yang difokus ketika fokus ada di bilah si
msgid "Duplicated to \"{0}\""
msgstr "Digandakan menjadi \"{0}\""
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Duplicates dropped"
+msgstr "Duplikat dibuang"
+
#: src/components/settings/AttachmentsSection.tsx
msgid "e.g. assets/uploads"
msgstr "mis. assets/uploads"
@@ -6387,6 +6422,10 @@ msgstr "Pemilih ikon"
msgid "ID: {0}"
msgstr "ID: {0}"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Identical in both — {pick} still reads them."
+msgstr "Identik di keduanya — {pick} tetap membacanya."
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "If an update arrives for something you are editing, you choose which version to keep, like a merge conflict."
msgstr "Jika sebuah pembaruan datang untuk hal yang sedang Anda sunting, Anda memilih versi mana yang disimpan, seperti konflik penggabungan."
@@ -6978,6 +7017,10 @@ msgstr "Jaga proyek ini tetap selaras dengan remote git Anda. Ikuti mengambil pe
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."
msgstr "Catat orang dan perusahaan yang bekerja dengan Anda serta pertemuan yang Anda adakan dengan mereka. Cocok untuk mengingat siapa seseorang, dari mana Anda mengenalnya, dan apa yang terakhir Anda bicarakan."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "keeps the skills"
+msgstr "menyimpan keterampilan"
+
#: src/components/settings/LintingSection.tsx
msgid "Keeps your knowledge base aligned with the Open Knowledge Format."
msgstr "Menjaga basis pengetahuan Anda tetap selaras dengan Open Knowledge Format."
@@ -7066,6 +7109,7 @@ msgstr "Terang, gelap, atau ikuti sistem."
msgid "line {displayLine}"
msgstr "baris {displayLine}"
+#: src/components/settings/SkillTargetsPicker.tsx
#: src/editor/bubble-menu/LinkEditPopover.tsx
#: src/editor/slash-command/component-items.tsx
msgid "Link"
@@ -7076,6 +7120,10 @@ msgstr "Tautan"
msgid "Link copied."
msgstr "Tautan disalin."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link folders"
+msgstr "Tautkan folder"
+
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Link preview settings not yet loaded — try again in a moment"
msgstr "Pengaturan pratinjau tautan belum dimuat — coba lagi sebentar"
@@ -7109,6 +7157,10 @@ msgstr "Target tautan \"{shown}\" tidak merujuk ke file yang ada."
msgid "Link the selected text, or edit the link under the caret."
msgstr "Menautkan teks yang dipilih, atau menyunting tautan di bawah kursor."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link these skill folders?"
+msgstr "Tautkan folder keterampilan ini?"
+
#: src/editor/slash-command/component-items.tsx
msgid "Link to a page or external URL."
msgstr "Menaut ke sebuah halaman atau URL eksternal."
@@ -7618,6 +7670,10 @@ msgstr "Paling banyak dipasang"
msgid "Move"
msgstr "Pindahkan"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Move across"
+msgstr "Dipindahkan"
+
#: src/lib/keyboard-shortcuts.ts
msgid "Move between table cells"
msgstr "Berpindah antarsel tabel"
@@ -8529,6 +8585,10 @@ msgstr "Mati — pencarian hanya memeringkat berdasarkan kata kunci. Tidak ada k
msgid "Offline"
msgstr "Luring"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "OK can't move these, so they go when {pick} does."
+msgstr "OK tidak bisa memindahkan ini, jadi ikut hilang bersama {pick}."
+
#: src/lib/keyboard-shortcuts.ts
msgid "OK Desktop"
msgstr "OK Desktop"
@@ -11664,6 +11724,10 @@ msgstr "Keterampilan kini dibagikan. Lakukan commit pada .ok/skills untuk membag
msgid "Skills install to every AI tool detected on this machine, independent of the MCP connections you chose above."
msgstr "Keterampilan dipasang ke setiap alat AI yang terdeteksi di mesin ini, terlepas dari koneksi MCP yang Anda pilih di atas."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Skills reassigned"
+msgstr "Keterampilan dialihkan"
+
#: src/components/AppMenubar.tsx
#: src/components/command-palette-commands.ts
#: src/components/FileSidebar.tsx
@@ -12099,7 +12163,6 @@ msgstr "Mengganti cabang"
msgid "Switching to <0>local-only</0> will refuse until they're untracked via<1> git rm --cached</1>."
msgstr "Beralih ke <0>lokal saja</0> akan ditolak sampai semuanya berhenti dilacak lewat<1> git rm --cached</1>."
-#: src/components/settings/SkillTargetsPicker.tsx
#: src/components/SkillInstallMenu.tsx
msgid "symlink"
msgstr "symlink"
@@ -12750,6 +12813,10 @@ msgstr "Tema"
msgid "There's no project folder for this window, so a terminal can't start here."
msgstr "Tidak ada folder proyek untuk jendela ini, jadi terminal tidak bisa dimulai di sini."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "These currently read from another folder. After linking, they read from {keep} instead."
+msgstr "Saat ini keterampilan ini dibaca dari folder lain. Setelah ditautkan, keterampilan ini dibaca dari {keep}."
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "These rules come from your project's <0>{configFile}</0> file, which fully governs linting for this project. Turn rules on or off and edit their options here; changes write back to the file."
msgstr "Aturan-aturan ini berasal dari berkas <0>{configFile}</0> proyek Anda, yang sepenuhnya mengatur lint untuk proyek ini. Nyalakan atau matikan aturan dan sunting opsinya di sini; perubahannya ditulis kembali ke berkas itu."
diff --git a/packages/app/src/locales/ko/messages.json b/packages/app/src/locales/ko/messages.json
index edf4b9e01..de8c6c127 100644
--- a/packages/app/src/locales/ko/messages.json
+++ b/packages/app/src/locales/ko/messages.json
@@ -41,6 +41,12 @@
"-q4abP": [
"결과가 제한되었습니다. 이 워크스페이스에는 검색에서 색인할 수 있는 파일보다 더 많은 파일이 있습니다. 누락된 파일은 오타가 아니라 제한으로 인해 빠진 것일 수 있습니다."
],
+ "-qBQVd": [
+ ["pick"],
+ "에 스킬이 아닌 항목이 있습니다: ",
+ ["0"],
+ ". 폴더에서 제거하거나 이동한 후 다시 시도하세요."
+ ],
"-slrNR": ["작업 목록을 전환합니다."],
"-uaQnI": ["일치하는 워크트리 또는 브랜치 없음."],
"-yOx8u": ["변경사항 저장 중…"],
@@ -103,6 +109,7 @@
"0g7rCZ": ["\"", ["0"], "\"에 복제됨"],
"0jD-Gn": ["팀 지식 베이스, 개인 위키, 프로젝트 문서…"],
"0kTAXe": ["소스 열기: ", ["mirrorSrc"]],
+ "0m4Snh": ["스킬 재할당됨"],
"0pZmTP": ["이 경로는 공유할 수 없습니다."],
"0qyKG6": ["디스크에서 동기화됨"],
"0r6d6v": ["변경사항이 자동으로 저장되었습니다."],
@@ -188,6 +195,7 @@
"2BBAbc": ["목록"],
"2C-6zf": ["전송되지 않음"],
"2CHoQv": ["강제 새로 고침"],
+ "2Ce6hp": ["이동됨"],
"2D1x3Y": ["적용하고 프로젝트 서버 재시작"],
"2FYpfJ": ["더 보기"],
"2FnYUD": [
@@ -1055,6 +1063,7 @@
"ErRi6L": ["템플릿 \"", ["label"], "\" 삭제됨"],
"Es-eZU": ["최근 프로젝트에서 제거"],
"Es3G-g": ["이 프로젝트에 있습니다(스킬 폴더 위치와 무관). git을 통해 협업자와 공유됩니다."],
+ "Eu-LIb": ["이 스킬 폴더를 연결할까요?"],
"Ev2r9A": ["결과 없음"],
"EvIJVD": ["도구 호출"],
"EvPX7f": ["저장소를 클론할 위치를 선택하는 폴더 선택기를 엽니다."],
@@ -1231,6 +1240,7 @@
"H1TmTu": ["수정을 중지했습니다. 이미 수정된 파일은 그대로 유지됩니다."],
"H3oH0g": ["다시 실행"],
"H86f9p": ["접기"],
+ "H8DVOJ": ["양쪽이 동일하며 ", ["pick"], "에서 계속 읽을 수 있습니다."],
"HAkEqR": ["최근 파일"],
"HAvHev": ["\"", ["name"], "\" 자동 업데이트 꺼짐"],
"HAvRAI": [["skillCount", "plural", { "other": ["스킬"] }]],
@@ -1329,6 +1339,7 @@
"It9ARY": ["오른쪽 문서 패널 전환"],
"It9oAP": [["editor"], " 버전이 이제 소스입니다"],
"ItxGi3": ["첨부 파일 총 용량은 3MB 미만이어야 합니다."],
+ "IvKbeq": ["두 에이전트 모두 결국 ", ["keep"], "의 모든 항목을 읽게 됩니다."],
"Ix0K8o": ["외부 URL 노드 숨기기"],
"IxHMdF": ["댓글 삭제에 실패했습니다."],
"IxyZXD": ["스크린샷"],
@@ -1438,6 +1449,7 @@
"Kiytqd": ["예외: 스킬은 공유됨"],
"KjTmeO": ["이 공유를 열려면 OpenKnowledge를 업데이트하세요."],
"KkEAud": ["현재 문서 또는 폴더를 기준으로 파일을 만듭니다."],
+ "KkRyMI": ["병합을 분류할 수 없습니다. 다시 시도하세요."],
"KmydK6": ["굵게"],
"KnoB--": ["<0>", ["sanitized"], "</0>으로 저장됩니다."],
"KpOJFY": ["외부 링크 미리보기 사용"],
@@ -1955,6 +1967,7 @@
"RrAIZx": ["구성 공유에 포함되는 항목"],
"Rsdhj9": ["구성 경고"],
"Rx5ReQ": [["keyName"], " 이름 바꾸기"],
+ "RxF-am": ["중복 항목 정리"],
"RyIKxy": [
["targetNoun"],
" 이동, 이름 변경 또는 삭제가 로컬 사본에서 발생했으며 아직 동기화되지 않았습니다."
@@ -2689,6 +2702,7 @@
"bcDHUM": [["descriptorLabel"], ", 렌더링 오류, 아래에서 소스를 편집할 수 있습니다"],
"bcjYUA": ["소스 접기 또는 펼치기"],
"bcm0pR": ["열린 에이전트"],
+ "beHZo4": ["OK가 이 항목은 옮길 수 없어 ", ["pick"], "과(와) 함께 사라집니다."],
"bi2C2s": [["displayName"], " 연결 실패. 잠시 후 다시 시도하세요."],
"bjsEcb": ["모두 앞으로 가져오기"],
"bkQRMh": ["문단"],
@@ -2917,6 +2931,7 @@
"evs0iw": ["“", ["tagListQuery"], "”와 일치하는 태그"],
"ewSbS_": ["셸 세션"],
"ezUmoU": ["허용되는 요소 값 (비워 두면 모두 허용)"],
+ "f1-q9m": ["스킬을 유지합니다"],
"f14doC": ["Slidev"],
"f1XQyZ": ["블록 이동"],
"f65AOQ": ["시작 위치"],
@@ -3132,6 +3147,7 @@
"hpzRlK": ["닫은 탭 다시 열기"],
"hqCwRf": ["파일 선택 안 됨"],
"hqVQbT": ["댓글 추가"],
+ "hs5BRR": ["완전히 삭제됨"],
"hvZwVx": ["변환"],
"hwFOFD": ["설정을 불러오지 못했습니다"],
"hxBHxQ": ["각주<0><1>[1]</1></0>와 아래에 표시되는 정의가 있는 줄입니다."],
@@ -3251,6 +3267,7 @@
"jENU1Q": [
"이 컴퓨터의 모든 프로젝트에 적용됩니다. 기본 제공 터미널에서 시작한 Claude와 Codex는 OpenKnowledge의 읽기 및 쓰기 도구를 자동 승인합니다(Claude는 \"ok open\"도 자동 실행). 삭제, 이동, 공유, 가져오기, 스킬 설치, 기타 명령, OpenKnowledge 외부 파일 편집은 계속 확인을 요청합니다. Cursor, OpenCode, Pi에는 적용되지 않습니다. 에이전트별로 최선의 동작을 시도합니다."
],
+ "jEVipR": ["현재 다른 폴더에서 읽습니다. 연결한 후에는 대신 ", ["keep"], "에서 읽습니다."],
"jEZ6Lf": ["임시"],
"jEdF24": ["누락된 페이지: ", ["linkTitle"], ". 클릭하여 만듭니다."],
"jJdwCB": ["되돌리기"],
@@ -3381,6 +3398,7 @@
"kfL8BJ": ["가져오기 실패: ", ["0"]],
"khCa4M": ["이 프로젝트의 코딩 에이전트가 OpenKnowledge를 통해 읽고 쓰도록 가르칩니다."],
"kj9pAE": ["페이지 만드는 중"],
+ "kjlQ9D": ["심볼릭 링크가 됩니다"],
"kknhfj": ["변경 없음"],
"kkux8f": [["0"], " 삭제에 실패했습니다. 다시 시도합니다."],
"klPS-L": ["원본 파일, 이 에이전트 변경 전."],
@@ -3400,6 +3418,14 @@
"l17ab4": ["프로젝트 파일을 쓸 수 없습니다. 다른 위치를 시도하세요."],
"l1aQKz": ["비주얼 편집기 표"],
"l1l8sj": [["0"], "일 전"],
+ "l2BOXd": [
+ ["pick"],
+ " 및 ",
+ ["keep"],
+ "에 ",
+ ["0"],
+ "의 서로 다른 버전이 있습니다. 먼저 정리하세요. 심볼릭 링크는 각 스킬을 하나만 유지할 수 있습니다."
+ ],
"l3s5ri": ["가져오기"],
"l3zD7w": ["에이전트 시작 중…"],
"l46MqT": ["다음 탭"],
@@ -3683,6 +3709,7 @@
"\"의 로컬 협업 데이터를 지우지 못했습니다. 다시 시도하려면 다시 로드하세요."
],
"oxdGJn": ["떠나기 전에 이유를 알려주시겠어요?"],
+ "oyBV3W": ["사용자 지정 스킬 폴더 경로"],
"p0Iq25": ["링크 삽입"],
"p2LEhJ": ["개인 액세스 토큰"],
"p3m_Gk": [
@@ -3851,6 +3878,7 @@
"rbrHTd": ["승인됨: ", ["optionName"]],
"rcJmK8": ["위치를 복사본으로 변환"],
"rdU729": ["레이아웃"],
+ "rf0tV1": ["폴더 연결"],
"rf8fiC": ["창 닫기"],
"rfFpcF": [["chip"], " 제거"],
"rg7hNd": ["경험 평가"],
diff --git a/packages/app/src/locales/ko/messages.po b/packages/app/src/locales/ko/messages.po
index b1aa41488..4de7e73a3 100644
--- a/packages/app/src/locales/ko/messages.po
+++ b/packages/app/src/locales/ko/messages.po
@@ -814,6 +814,16 @@ msgstr "{percent}% 사용됨 ({left}% 남음)"
msgid "{phase} — {pct}%"
msgstr "{phase}: {pct}%"
+#. placeholder {0}: p.conflicts.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} and {keep} both hold a different version of: {0}. Resolve those first — a symlink can only keep one of each."
+msgstr "{pick} 및 {keep}에 {0}의 서로 다른 버전이 있습니다. 먼저 정리하세요. 심볼릭 링크는 각 스킬을 하나만 유지할 수 있습니다."
+
+#. placeholder {0}: p.strays.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} holds entries that aren't skills: {0}. Remove or move them from the folder and try again."
+msgstr "{pick}에 스킬이 아닌 항목이 있습니다: {0}. 폴더에서 제거하거나 이동한 후 다시 시도하세요."
+
#: src/components/CreatedItemsList.tsx
msgid "{pluginCount, plural, one {plugin} other {plugins}}"
msgstr "{pluginCount, plural, other {플러그인}}"
@@ -1980,6 +1990,10 @@ msgstr "백링크 응답 형식이 예상과 일치하지 않습니다."
msgid "Base branch"
msgstr "기준 브랜치"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "becomes a symlink"
+msgstr "심볼릭 링크가 됩니다"
+
#: src/components/TemplateBody.tsx
msgid "Becomes the document's content when someone creates a doc from this template. Type <0>{dateToken}</0> or <1>{userToken}</1> to fill in today's date or the author's name automatically."
msgstr "누군가 이 템플릿으로 문서를 만들면 문서 내용이 됩니다. <0>{dateToken}</0> 또는 <1>{userToken}</1>을 입력하면 오늘 날짜나 작성자 이름이 자동으로 채워집니다."
@@ -2051,6 +2065,10 @@ msgstr "굵게"
msgid "Both"
msgstr "둘 다"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Both agents end up reading everything in {keep}."
+msgstr "두 에이전트 모두 결국 {keep}의 모든 항목을 읽게 됩니다."
+
#: src/components/share-metadata-rows.tsx
msgid "Branch"
msgstr "브랜치"
@@ -2247,6 +2265,7 @@ msgstr "이 경로는 공유할 수 없습니다."
#: src/components/settings/NetworkAccessSection.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SearchSection.tsx
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
#: src/components/ShareBranchSwitchDialog.tsx
#: src/components/ShareReceiveDialog.tsx
#: src/components/SkillFileCreateDialog.tsx
@@ -3284,6 +3303,10 @@ msgstr "복사 중"
msgid "Copying..."
msgstr "복사 중…"
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Could not classify the merge — try again."
+msgstr "병합을 분류할 수 없습니다. 다시 시도하세요."
+
#: src/components/FileTree.tsx
msgid "Could not complete delete"
msgstr "삭제를 완료하지 못했습니다"
@@ -4125,6 +4148,10 @@ msgstr "실시간 미리보기 창이 있는 사용자 지정 HTML입니다. 샌
msgid "Custom open-knowledge entry — not managed by OpenKnowledge"
msgstr "사용자 지정 OpenKnowledge 항목, OpenKnowledge에서 관리하지 않음"
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Custom skills folder path"
+msgstr "사용자 지정 스킬 폴더 경로"
+
#: src/components/settings/CustomThemeEditor.tsx
msgid "Custom theme"
msgstr "사용자 지정 테마"
@@ -4268,6 +4295,10 @@ msgstr "{file} 삭제됨"
msgid "Deleted {filePath}"
msgstr "{filePath} 삭제됨"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Deleted for good"
+msgstr "완전히 삭제됨"
+
#: src/components/FolderTimelineCard.tsx
msgid "deleted template"
msgstr "템플릿 삭제됨"
@@ -4669,6 +4700,10 @@ msgstr "파일 사이드바에 포커스가 있을 때 포커스된 파일 트
msgid "Duplicated to \"{0}\""
msgstr "\"{0}\"에 복제됨"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Duplicates dropped"
+msgstr "중복 항목 정리"
+
#: src/components/settings/AttachmentsSection.tsx
msgid "e.g. assets/uploads"
msgstr "예: assets/uploads"
@@ -6391,6 +6426,10 @@ msgstr "아이콘 선택기"
msgid "ID: {0}"
msgstr "ID: {0}"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Identical in both — {pick} still reads them."
+msgstr "양쪽이 동일하며 {pick}에서 계속 읽을 수 있습니다."
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "If an update arrives for something you are editing, you choose which version to keep, like a merge conflict."
msgstr "편집 중인 항목에 업데이트가 도착하면 병합 충돌처럼 유지할 버전을 선택합니다."
@@ -6982,6 +7021,10 @@ msgstr "이 프로젝트를 git 원격 저장소와 동기화합니다. 팔로
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."
msgstr "함께 일하는 사람과 회사, 그들과의 회의를 기록합니다. 누군지, 어떻게 알게 되었는지, 마지막으로 무엇을 이야기했는지 기억하는 데 유용합니다."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "keeps the skills"
+msgstr "스킬을 유지합니다"
+
#: src/components/settings/LintingSection.tsx
msgid "Keeps your knowledge base aligned with the Open Knowledge Format."
msgstr "지식 베이스를 Open Knowledge Format에 맞게 유지합니다."
@@ -7070,6 +7113,7 @@ msgstr "밝은 테마, 어두운 테마 또는 운영 체제 설정을 따릅니
msgid "line {displayLine}"
msgstr "줄 {displayLine}"
+#: src/components/settings/SkillTargetsPicker.tsx
#: src/editor/bubble-menu/LinkEditPopover.tsx
#: src/editor/slash-command/component-items.tsx
msgid "Link"
@@ -7080,6 +7124,10 @@ msgstr "링크"
msgid "Link copied."
msgstr "링크가 복사되었습니다."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link folders"
+msgstr "폴더 연결"
+
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Link preview settings not yet loaded — try again in a moment"
msgstr "링크 미리보기 설정을 아직 불러오지 못했습니다. 잠시 후 다시 시도합니다."
@@ -7113,6 +7161,10 @@ msgstr "링크 대상 \"{shown}\"이 존재하는 파일로 확인되지 않습
msgid "Link the selected text, or edit the link under the caret."
msgstr "선택한 텍스트에 링크를 추가하거나 커서 아래의 링크를 편집합니다."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link these skill folders?"
+msgstr "이 스킬 폴더를 연결할까요?"
+
#: src/editor/slash-command/component-items.tsx
msgid "Link to a page or external URL."
msgstr "페이지 또는 외부 URL로 연결합니다."
@@ -7622,6 +7674,10 @@ msgstr "가장 많이 설치됨"
msgid "Move"
msgstr "이동"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Move across"
+msgstr "이동됨"
+
#: src/lib/keyboard-shortcuts.ts
msgid "Move between table cells"
msgstr "표 셀 사이를 이동합니다."
@@ -8533,6 +8589,10 @@ msgstr "꺼짐, 검색은 키워드로만 순위를 매깁니다. 이 컴퓨터
msgid "Offline"
msgstr "오프라인"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "OK can't move these, so they go when {pick} does."
+msgstr "OK가 이 항목은 옮길 수 없어 {pick}과(와) 함께 사라집니다."
+
#: src/lib/keyboard-shortcuts.ts
msgid "OK Desktop"
msgstr "OK Desktop"
@@ -11668,6 +11728,10 @@ msgstr "이제 스킬을 공유합니다. 팀과 공유하려면 .ok/skills를
msgid "Skills install to every AI tool detected on this machine, independent of the MCP connections you chose above."
msgstr "스킬은 이 컴퓨터에서 감지된 모든 AI 도구에 설치되며, 위에서 선택한 MCP 연결과는 무관합니다."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Skills reassigned"
+msgstr "스킬 재할당됨"
+
#: src/components/AppMenubar.tsx
#: src/components/command-palette-commands.ts
#: src/components/FileSidebar.tsx
@@ -12103,7 +12167,6 @@ msgstr "브랜치 전환 중"
msgid "Switching to <0>local-only</0> will refuse until they're untracked via<1> git rm --cached</1>."
msgstr "<0>로컬 전용</0>으로 전환하려면 <1> git rm --cached</1>로 추적을 해제해야 합니다."
-#: src/components/settings/SkillTargetsPicker.tsx
#: src/components/SkillInstallMenu.tsx
msgid "symlink"
msgstr "심볼릭 링크"
@@ -12754,6 +12817,10 @@ msgstr "테마"
msgid "There's no project folder for this window, so a terminal can't start here."
msgstr "이 창에 프로젝트 폴더 없음. 터미널 시작 불가."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "These currently read from another folder. After linking, they read from {keep} instead."
+msgstr "현재 다른 폴더에서 읽습니다. 연결한 후에는 대신 {keep}에서 읽습니다."
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "These rules come from your project's <0>{configFile}</0> file, which fully governs linting for this project. Turn rules on or off and edit their options here; changes write back to the file."
msgstr "이 규칙은 프로젝트의 <0>{configFile}</0> 파일에서 가져오며, 이 파일이 프로젝트의 linting을 완전히 관리합니다. 여기서 규칙을 켜거나 끄고 옵션을 편집하면 파일에 다시 기록됩니다."
diff --git a/packages/app/src/locales/pseudo/messages.json b/packages/app/src/locales/pseudo/messages.json
index dd932fc02..65f99a0ad 100644
--- a/packages/app/src/locales/pseudo/messages.json
+++ b/packages/app/src/locales/pseudo/messages.json
@@ -47,6 +47,12 @@
"-q4abP": [
"Ŕēśũĺţś ćàƥƥēď — ţĥĩś ŵōŕķśƥàćē ĥàś ḿōŕē ƒĩĺēś ţĥàń śēàŕćĥ ćàń ĩńďēx. À ḿĩśśĩńĝ ƒĩĺē ḿàŷ ƀē à ćàƥ àŕţĩƒàćţ, ńōţ à ţŷƥō."
],
+ "-qBQVd": [
+ ["pick"],
+ " ĥōĺďś ēńţŕĩēś ţĥàţ àŕēń'ţ śķĩĺĺś: ",
+ ["0"],
+ ". Ŕēḿōvē ōŕ ḿōvē ţĥēḿ ƒŕōḿ ţĥē ƒōĺďēŕ àńď ţŕŷ àĝàĩń."
+ ],
"-slrNR": ["Ţōĝĝĺē à ţàśķ ĺĩśţ."],
"-uaQnI": ["Ńō ḿàţćĥĩńĝ ŵōŕķţŕēēś ōŕ ƀŕàńćĥēś."],
"-yOx8u": ["Śàvĩńĝ ćĥàńĝēś…"],
@@ -108,6 +114,7 @@
"0g7rCZ": ["Ďũƥĺĩćàţēď ţō \"", ["0"], "\""],
"0jD-Gn": ["À ţēàḿ ķńōŵĺēďĝē ƀàśē, à ƥēŕśōńàĺ ŵĩķĩ, ƥŕōĴēćţ ďōćś..."],
"0kTAXe": ["Ōƥēń śōũŕćē: ", ["mirrorSrc"]],
+ "0m4Snh": ["Śķĩĺĺś ŕēàśśĩĝńēď"],
"0pZmTP": ["Ćàń'ţ śĥàŕē ţĥĩś ƥàţĥ."],
"0qyKG6": ["Śŷńćēď ƒŕōḿ ďĩśķ"],
"0r6d6v": ["Ćĥàńĝēś śàvēď àũţōḿàţĩćàĺĺŷ."],
@@ -197,6 +204,7 @@
"2BBAbc": ["Ĺĩśţ"],
"2C-6zf": ["Ńōţ śēńţ"],
"2CHoQv": ["Ƒōŕćē Ŕēĺōàď"],
+ "2Ce6hp": ["Ḿōvē àćŕōśś"],
"2D1x3Y": ["Àƥƥĺŷ àńď ŕēśţàŕţ ƥŕōĴēćţ śēŕvēŕ"],
"2FYpfJ": ["Ḿōŕē"],
"2FnYUD": [
@@ -1104,6 +1112,7 @@
"Es3G-g": [
"Ĺĩvēś ĩń ţĥĩś ƥŕōĴēćţ (ŵĥēŕēvēŕ ţĥē śķĩĺĺ'ś ƒōĺďēŕ ĩś) àńď ĩś śĥàŕēď ŵĩţĥ ćōĺĺàƀōŕàţōŕś ţĥŕōũĝĥ ĝĩţ."
],
+ "Eu-LIb": ["Ĺĩńķ ţĥēśē śķĩĺĺ ƒōĺďēŕś?"],
"Ev2r9A": ["Ńō ŕēśũĺţś"],
"EvIJVD": ["Ţōōĺ ćàĺĺ"],
"EvPX7f": ["Ōƥēńś à ƒōĺďēŕ ƥĩćķēŕ ţō ćĥōōśē ŵĥēŕē ţō ćĺōńē ţĥē ŕēƥōśĩţōŕŷ."],
@@ -1276,6 +1285,7 @@
"H1TmTu": ["Śţōƥƥēď ƒĩxĩńĝ. Ƒĩĺēś àĺŕēàďŷ ƒĩxēď śţàŷ ƒĩxēď."],
"H3oH0g": ["Ŕēďō"],
"H86f9p": ["Ćōĺĺàƥśē"],
+ "H8DVOJ": ["Ĩďēńţĩćàĺ ĩń ƀōţĥ — ", ["pick"], " śţĩĺĺ ŕēàďś ţĥēḿ."],
"HAkEqR": ["Ŕēćēńţ ƒĩĺēś"],
"HAvHev": ["Àũţō-ũƥďàţē ōƒƒ ƒōŕ \"", ["name"], "\""],
"HAvRAI": [["skillCount", "plural", { "one": ["śķĩĺĺ"], "other": ["śķĩĺĺś"] }]],
@@ -1375,6 +1385,7 @@
"It9ARY": ["Ţōĝĝĺē ţĥē ŕĩĝĥţ ďōćũḿēńţ ƥàńēĺ."],
"It9oAP": ["Ţĥē ", ["editor"], " vēŕśĩōń ĩś ńōŵ ţĥē śōũŕćē"],
"ItxGi3": ["Àţţàćĥḿēńţś ḿũśţ ţōţàĺ ũńďēŕ 3 Ḿß."],
+ "IvKbeq": ["ßōţĥ àĝēńţś ēńď ũƥ ŕēàďĩńĝ ēvēŕŷţĥĩńĝ ĩń ", ["keep"], "."],
"Ix0K8o": ["Ĥĩďē ēxţēŕńàĺ ŨŔĹ ńōďēś"],
"IxHMdF": ["Ćōũĺďń'ţ ďēĺēţē ţĥàţ ćōḿḿēńţ."],
"IxyZXD": ["Śćŕēēńśĥōţ"],
@@ -1484,6 +1495,7 @@
"Kiytqd": ["Ēxćēƥţĩōń: śķĩĺĺś àŕē śĥàŕēď"],
"KjTmeO": ["Ũƥďàţē ŌƥēńĶńōŵĺēďĝē ţō ōƥēń ţĥĩś śĥàŕē."],
"KkEAud": ["Ćŕēàţē à ƒĩĺē ƒŕōḿ ţĥē ćũŕŕēńţ ďōćũḿēńţ ōŕ ƒōĺďēŕ ćōńţēxţ."],
+ "KkRyMI": ["Ćōũĺď ńōţ ćĺàśśĩƒŷ ţĥē ḿēŕĝē — ţŕŷ àĝàĩń."],
"KmydK6": ["ßōĺď"],
"KnoB--": ["Ŵĩĺĺ ƀē śàvēď àś <0>", ["sanitized"], "</0>."],
"KpOJFY": ["Ēńàƀĺē ēxţēŕńàĺ ĺĩńķ ƥŕēvĩēŵś"],
@@ -2032,6 +2044,7 @@
"RrAIZx": ["Ŵĥàţ ćōńƒĩĝ śĥàŕĩńĝ ćōvēŕś"],
"Rsdhj9": ["Ćōńƒĩĝũŕàţĩōń ŵàŕńĩńĝś"],
"Rx5ReQ": ["Ŕēńàḿē ", ["keyName"]],
+ "RxF-am": ["Ďũƥĺĩćàţēś ďŕōƥƥēď"],
"RyIKxy": [
"Ţĥĩś ",
["targetNoun"],
@@ -2785,6 +2798,7 @@
"bcDHUM": [["descriptorLabel"], " — ŕēńďēŕ ēŕŕōŕ, śōũŕćē ēďĩţàƀĺē ƀēĺōŵ"],
"bcjYUA": ["Ƒōĺď ōŕ ũńƒōĺď śōũŕćē"],
"bcm0pR": ["ţĥē ōƥēń àĝēńţ"],
+ "beHZo4": ["ŌĶ ćàń'ţ ḿōvē ţĥēśē, śō ţĥēŷ ĝō ŵĥēń ", ["pick"], " ďōēś."],
"bi2C2s": ["Ćōũĺďń'ţ ŕēàćĥ ", ["displayName"], " — ƥĺēàśē ţŕŷ àĝàĩń ĺàţēŕ."],
"bjsEcb": ["ßŕĩńĝ Àĺĺ ţō Ƒŕōńţ"],
"bkQRMh": ["Ƥàŕàĝŕàƥĥ"],
@@ -3020,6 +3034,7 @@
"evs0iw": ["Ţàĝś ḿàţćĥĩńĝ \"", ["tagListQuery"], "\""],
"ewSbS_": ["Śĥēĺĺ śēśśĩōń"],
"ezUmoU": ["Àĺĺōŵēď ēĺēḿēńţ vàĺũēś (ēḿƥţŷ = àńŷ)"],
+ "f1-q9m": ["ķēēƥś ţĥē śķĩĺĺś"],
"f14doC": ["Śĺĩďēv"],
"f1XQyZ": ["Ḿōvē ƀĺōćķ"],
"f65AOQ": ["Śţàŕţ ƒŕōḿ"],
@@ -3246,6 +3261,7 @@
"hpzRlK": ["Ŕēōƥēń ćĺōśēď ţàƀ"],
"hqCwRf": ["Ńō ƒĩĺē śēĺēćţēď"],
"hqVQbT": ["Àďď Ćōḿḿēńţ"],
+ "hs5BRR": ["Ďēĺēţēď ƒōŕ ĝōōď"],
"hvZwVx": ["Ćōńvēŕţ"],
"hwFOFD": ["Śēţţĩńĝś ƒàĩĺēď ţō ĺōàď"],
"hxBHxQ": ["À ĺĩńē ŵĩţĥ à ƒōōţńōţē<0><1>[1]</1></0> àńď à ďēƒĩńĩţĩōń śĥōŵń ƀēĺōŵ."],
@@ -3368,6 +3384,11 @@
"jENU1Q": [
"Àƥƥĺĩēś ţō àĺĺ ƥŕōĴēćţś ōń ţĥĩś ḿàćĥĩńē. Ćĺàũďē àńď Ćōďēx, śţàŕţēď ƒŕōḿ ţĥē ƀũĩĺţ-ĩń ţēŕḿĩńàĺ, àũţō-àƥƥŕōvē ŌƥēńĶńōŵĺēďĝē'ś ŕēàď àńď ŵŕĩţē ţōōĺś (Ćĺàũďē àĺśō àũţō-ŕũńś \"ōķ ōƥēń\"). Ďēĺēţĩńĝ, ḿōvĩńĝ, śĥàŕĩńĝ, ĩḿƥōŕţĩńĝ ōŕ ĩńśţàĺĺĩńĝ śķĩĺĺś, ōţĥēŕ ćōḿḿàńďś, àńď ńōń-ŌƥēńĶńōŵĺēďĝē ƒĩĺē ēďĩţś śţĩĺĺ àśķ. Ćũŕśōŕ, ŌƥēńĆōďē, àńď Ƥĩ àŕē ũńàƒƒēćţēď. ßēśţ-ēƒƒōŕţ ƥēŕ àĝēńţ."
],
+ "jEVipR": [
+ "Ţĥēśē ćũŕŕēńţĺŷ ŕēàď ƒŕōḿ àńōţĥēŕ ƒōĺďēŕ. Àƒţēŕ ĺĩńķĩńĝ, ţĥēŷ ŕēàď ƒŕōḿ ",
+ ["keep"],
+ " ĩńśţēàď."
+ ],
"jEZ6Lf": ["ƥŕōvĩśĩōńàĺ"],
"jEdF24": ["Ḿĩśśĩńĝ ƥàĝē: ", ["linkTitle"], ". Ćĺĩćķ ţō ćŕēàţē."],
"jJdwCB": ["Ŕēvēŕţ"],
@@ -3501,6 +3522,7 @@
"kfL8BJ": ["Ĩḿƥōŕţ ƒàĩĺēď: ", ["0"]],
"khCa4M": ["Ţēàćĥēś ćōďĩńĝ àĝēńţś ĩń ţĥĩś ƥŕōĴēćţ ţō ŕēàď àńď ŵŕĩţē ţĥŕōũĝĥ ŌƥēńĶńōŵĺēďĝē."],
"kj9pAE": ["Ćŕēàţĩńĝ ƥàĝē"],
+ "kjlQ9D": ["ƀēćōḿēś à śŷḿĺĩńķ"],
"kknhfj": ["Ńō ćĥàńĝēś"],
"kkux8f": ["Ćōũĺďń’ţ ďēĺēţē ", ["0"], ". Ţŕŷ àĝàĩń."],
"klPS-L": ["Ōŕĩĝĩńàĺ ƒĩĺē — ƀēƒōŕē ţĥĩś àĝēńţ'ś ēďĩţś."],
@@ -3520,6 +3542,14 @@
"l17ab4": ["Ćōũĺď ńōţ ŵŕĩţē ƥŕōĴēćţ ƒĩĺēś. Ţŕŷ à ďĩƒƒēŕēńţ ĺōćàţĩōń."],
"l1aQKz": ["Vĩśũàĺ ēďĩţōŕ ţàƀĺē"],
"l1l8sj": [["0"], "ď àĝō"],
+ "l2BOXd": [
+ ["pick"],
+ " àńď ",
+ ["keep"],
+ " ƀōţĥ ĥōĺď à ďĩƒƒēŕēńţ vēŕśĩōń ōƒ: ",
+ ["0"],
+ ". Ŕēśōĺvē ţĥōśē ƒĩŕśţ — à śŷḿĺĩńķ ćàń ōńĺŷ ķēēƥ ōńē ōƒ ēàćĥ."
+ ],
"l3s5ri": ["Ĩḿƥōŕţ"],
"l3zD7w": ["Śţàŕţĩńĝ ţĥē àĝēńţ…"],
"l46MqT": ["Ńēxţ ţàƀ"],
@@ -3820,6 +3850,7 @@
"\" ćōũĺď ńōţ ƀē ćĺēàŕēď. Ŕēĺōàď ţō ŕēţŕŷ."
],
"oxdGJn": ["ßēƒōŕē ŷōũ ĝō, ḿĩńď śĥàŕĩńĝ ŵĥŷ?"],
+ "oyBV3W": ["Ćũśţōḿ śķĩĺĺś ƒōĺďēŕ ƥàţĥ"],
"p0Iq25": ["Ĩńśēŕţ ĺĩńķ"],
"p2LEhJ": ["Ƥēŕśōńàĺ àććēśś ţōķēń"],
"p3m_Gk": [
@@ -4007,6 +4038,7 @@
"rbrHTd": ["Àƥƥŕōvēď — ", ["optionName"]],
"rcJmK8": ["Ćōńvēŕţ ĺōćàţĩōńś ţō ćōƥĩēś"],
"rdU729": ["Ĺàŷōũţ"],
+ "rf0tV1": ["Ĺĩńķ ƒōĺďēŕś"],
"rf8fiC": ["Ćĺōśē ŵĩńďōŵ"],
"rfFpcF": ["Ŕēḿōvē ", ["chip"]],
"rg7hNd": ["Ŕàţē ŷōũŕ ēxƥēŕĩēńćē"],
diff --git a/packages/app/src/locales/pseudo/messages.po b/packages/app/src/locales/pseudo/messages.po
index fe59505eb..c820a42f9 100644
--- a/packages/app/src/locales/pseudo/messages.po
+++ b/packages/app/src/locales/pseudo/messages.po
@@ -814,6 +814,16 @@ msgstr ""
msgid "{phase} — {pct}%"
msgstr ""
+#. placeholder {0}: p.conflicts.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} and {keep} both hold a different version of: {0}. Resolve those first — a symlink can only keep one of each."
+msgstr ""
+
+#. placeholder {0}: p.strays.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} holds entries that aren't skills: {0}. Remove or move them from the folder and try again."
+msgstr ""
+
#: src/components/CreatedItemsList.tsx
msgid "{pluginCount, plural, one {plugin} other {plugins}}"
msgstr ""
@@ -1976,6 +1986,10 @@ msgstr ""
msgid "Base branch"
msgstr ""
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "becomes a symlink"
+msgstr ""
+
#: src/components/TemplateBody.tsx
msgid "Becomes the document's content when someone creates a doc from this template. Type <0>{dateToken}</0> or <1>{userToken}</1> to fill in today's date or the author's name automatically."
msgstr ""
@@ -2047,6 +2061,10 @@ msgstr ""
msgid "Both"
msgstr ""
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Both agents end up reading everything in {keep}."
+msgstr ""
+
#: src/components/share-metadata-rows.tsx
msgid "Branch"
msgstr ""
@@ -2243,6 +2261,7 @@ msgstr ""
#: src/components/settings/NetworkAccessSection.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SearchSection.tsx
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
#: src/components/ShareBranchSwitchDialog.tsx
#: src/components/ShareReceiveDialog.tsx
#: src/components/SkillFileCreateDialog.tsx
@@ -3280,6 +3299,10 @@ msgstr ""
msgid "Copying..."
msgstr ""
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Could not classify the merge — try again."
+msgstr ""
+
#: src/components/FileTree.tsx
msgid "Could not complete delete"
msgstr ""
@@ -4121,6 +4144,10 @@ msgstr ""
msgid "Custom open-knowledge entry — not managed by OpenKnowledge"
msgstr ""
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Custom skills folder path"
+msgstr ""
+
#: src/components/settings/CustomThemeEditor.tsx
msgid "Custom theme"
msgstr ""
@@ -4264,6 +4291,10 @@ msgstr ""
msgid "Deleted {filePath}"
msgstr ""
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Deleted for good"
+msgstr ""
+
#: src/components/FolderTimelineCard.tsx
msgid "deleted template"
msgstr ""
@@ -4665,6 +4696,10 @@ msgstr ""
msgid "Duplicated to \"{0}\""
msgstr ""
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Duplicates dropped"
+msgstr ""
+
#: src/components/settings/AttachmentsSection.tsx
msgid "e.g. assets/uploads"
msgstr ""
@@ -6387,6 +6422,10 @@ msgstr ""
msgid "ID: {0}"
msgstr ""
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Identical in both — {pick} still reads them."
+msgstr ""
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "If an update arrives for something you are editing, you choose which version to keep, like a merge conflict."
msgstr ""
@@ -6978,6 +7017,10 @@ msgstr ""
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."
msgstr ""
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "keeps the skills"
+msgstr ""
+
#: src/components/settings/LintingSection.tsx
msgid "Keeps your knowledge base aligned with the Open Knowledge Format."
msgstr ""
@@ -7066,6 +7109,7 @@ msgstr ""
msgid "line {displayLine}"
msgstr ""
+#: src/components/settings/SkillTargetsPicker.tsx
#: src/editor/bubble-menu/LinkEditPopover.tsx
#: src/editor/slash-command/component-items.tsx
msgid "Link"
@@ -7076,6 +7120,10 @@ msgstr ""
msgid "Link copied."
msgstr ""
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link folders"
+msgstr ""
+
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Link preview settings not yet loaded — try again in a moment"
msgstr ""
@@ -7109,6 +7157,10 @@ msgstr ""
msgid "Link the selected text, or edit the link under the caret."
msgstr ""
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link these skill folders?"
+msgstr ""
+
#: src/editor/slash-command/component-items.tsx
msgid "Link to a page or external URL."
msgstr ""
@@ -7618,6 +7670,10 @@ msgstr ""
msgid "Move"
msgstr ""
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Move across"
+msgstr ""
+
#: src/lib/keyboard-shortcuts.ts
msgid "Move between table cells"
msgstr ""
@@ -8529,6 +8585,10 @@ msgstr ""
msgid "Offline"
msgstr ""
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "OK can't move these, so they go when {pick} does."
+msgstr ""
+
#: src/lib/keyboard-shortcuts.ts
msgid "OK Desktop"
msgstr ""
@@ -11664,6 +11724,10 @@ msgstr ""
msgid "Skills install to every AI tool detected on this machine, independent of the MCP connections you chose above."
msgstr ""
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Skills reassigned"
+msgstr ""
+
#: src/components/AppMenubar.tsx
#: src/components/command-palette-commands.ts
#: src/components/FileSidebar.tsx
@@ -12099,7 +12163,6 @@ msgstr ""
msgid "Switching to <0>local-only</0> will refuse until they're untracked via<1> git rm --cached</1>."
msgstr ""
-#: src/components/settings/SkillTargetsPicker.tsx
#: src/components/SkillInstallMenu.tsx
msgid "symlink"
msgstr ""
@@ -12750,6 +12813,10 @@ msgstr ""
msgid "There's no project folder for this window, so a terminal can't start here."
msgstr ""
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "These currently read from another folder. After linking, they read from {keep} instead."
+msgstr ""
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "These rules come from your project's <0>{configFile}</0> file, which fully governs linting for this project. Turn rules on or off and edit their options here; changes write back to the file."
msgstr ""
diff --git a/packages/app/src/locales/pt-BR/messages.json b/packages/app/src/locales/pt-BR/messages.json
index 15cb318b9..fef5cb02d 100644
--- a/packages/app/src/locales/pt-BR/messages.json
+++ b/packages/app/src/locales/pt-BR/messages.json
@@ -59,6 +59,12 @@
"-q4abP": [
"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."
],
+ "-qBQVd": [
+ ["pick"],
+ " contém itens que não são habilidades: ",
+ ["0"],
+ ". Remova-os ou mova-os para fora da pasta e tente novamente."
+ ],
"-slrNR": ["Liga ou desliga uma lista de tarefas."],
"-uaQnI": ["Nenhum worktree ou ramo corresponde."],
"-yOx8u": ["Salvando alterações…"],
@@ -122,6 +128,7 @@
"0g7rCZ": ["Duplicado em \"", ["0"], "\""],
"0jD-Gn": ["Uma base de conhecimento de equipe, uma wiki pessoal, documentação de projeto..."],
"0kTAXe": ["Abrir a fonte: ", ["mirrorSrc"]],
+ "0m4Snh": ["Habilidades reatribuídas"],
"0pZmTP": ["Não é possível compartilhar este caminho."],
"0qyKG6": ["Sincronizado a partir do disco"],
"0r6d6v": ["Alterações salvas automaticamente."],
@@ -217,6 +224,7 @@
"2BBAbc": ["Lista"],
"2C-6zf": ["Não enviado"],
"2CHoQv": ["Recarregar à força"],
+ "2Ce6hp": ["São movidas"],
"2D1x3Y": ["Aplicar e reiniciar o servidor do projeto"],
"2FYpfJ": ["Mais"],
"2FnYUD": [
@@ -1263,6 +1271,7 @@
"Es3G-g": [
"Fica neste projeto (onde quer que esteja a pasta da habilidade) e é compartilhada com os colaboradores pelo git."
],
+ "Eu-LIb": ["Vincular estas pastas de habilidades?"],
"Ev2r9A": ["Sem resultados"],
"EvIJVD": ["Chamada de ferramenta"],
"EvPX7f": ["Abre um seletor de pastas para escolher onde clonar o repositório."],
@@ -1467,6 +1476,7 @@
"H1TmTu": ["A correção parou. Os arquivos já corrigidos continuam corrigidos."],
"H3oH0g": ["Refazer"],
"H86f9p": ["Recolher"],
+ "H8DVOJ": ["Idênticas nas duas: ", ["pick"], " continua lendo."],
"HAkEqR": ["Arquivos recentes"],
"HAvHev": ["Atualização automática desligada para \"", ["name"], "\""],
"HAvRAI": [
@@ -1590,6 +1600,7 @@
"It9ARY": ["Mostra ou oculta o painel direito do documento."],
"It9oAP": ["A versão do ", ["editor"], " agora é a fonte"],
"ItxGi3": ["Os anexos devem somar menos de 3 MB."],
+ "IvKbeq": ["Os dois agentes passam a ler tudo o que está em ", ["keep"], "."],
"Ix0K8o": ["Ocultar os nós de URL externa"],
"IxHMdF": ["Não deu para excluir esse comentário."],
"IxyZXD": ["Captura de tela"],
@@ -1711,6 +1722,7 @@
"Kiytqd": ["Exceção: as habilidades são compartilhadas"],
"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."],
"KmydK6": ["Negrito"],
"KnoB--": ["Será salvo como <0>", ["sanitized"], "</0>."],
"KpOJFY": ["Ativar a pré-visualização de links externos"],
@@ -2305,6 +2317,7 @@
"RrAIZx": ["O que o compartilhamento de configuração abrange"],
"Rsdhj9": ["Avisos de configuração"],
"Rx5ReQ": ["Renomear ", ["keyName"]],
+ "RxF-am": ["Duplicatas descartadas"],
"RyIKxy": [
"Este ",
["targetNoun"],
@@ -3165,6 +3178,7 @@
"bcDHUM": [["descriptorLabel"], " — erro de renderização, código editável abaixo"],
"bcjYUA": ["Dobrar ou desdobrar o código"],
"bcm0pR": ["o agente aberto"],
+ "beHZo4": ["OK não consegue mover isto, então some junto com ", ["pick"], "."],
"bi2C2s": ["Não foi possível acessar ", ["displayName"], ". Tente novamente mais tarde."],
"bjsEcb": ["Trazer tudo para a frente"],
"bkQRMh": ["Parágrafo"],
@@ -3448,6 +3462,7 @@
"evs0iw": ["Tags que correspondem a \"", ["tagListQuery"], "\""],
"ewSbS_": ["Sessão de shell"],
"ezUmoU": ["Valores de elemento permitidos (vazio = qualquer)"],
+ "f1-q9m": ["mantém as habilidades"],
"f14doC": ["Slidev"],
"f1XQyZ": ["Mover o bloco"],
"f65AOQ": ["Começar a partir de"],
@@ -3697,6 +3712,7 @@
"hpzRlK": ["Reabrir a aba fechada"],
"hqCwRf": ["Nenhum arquivo selecionado"],
"hqVQbT": ["Adicionar comentário"],
+ "hs5BRR": ["Excluídas de vez"],
"hvZwVx": ["Converter"],
"hwFOFD": ["Falha ao carregar as configurações"],
"hxBHxQ": [
@@ -3835,6 +3851,11 @@
"jENU1Q": [
"Aplica-se a todos os projetos deste computador. Claude e Codex, iniciados pelo terminal integrado, aprovam automaticamente as ferramentas de leitura e escrita do OpenKnowledge (o Claude também executa \"ok open\" sozinho). Excluir, mover, compartilhar, importar ou instalar habilidades, outros comandos e edições de arquivos fora do OpenKnowledge continuam perguntando. Cursor, OpenCode e Pi não são afetados. É um esforço por agente, sem garantias."
],
+ "jEVipR": [
+ "Elas são lidas de outra pasta no momento. Após a vinculação, serão lidas de ",
+ ["keep"],
+ "."
+ ],
"jEZ6Lf": ["provisório"],
"jEdF24": ["Página inexistente: ", ["linkTitle"], ". Clique para criar."],
"jJdwCB": ["Reverter"],
@@ -3983,6 +4004,7 @@
"Ensina os agentes de programação deste projeto a ler e escrever pelo OpenKnowledge."
],
"kj9pAE": ["Criando a página"],
+ "kjlQ9D": ["vira um link simbólico"],
"kknhfj": ["Sem alterações"],
"kkux8f": ["Não foi possível excluir ", ["0"], ". Tente novamente."],
"klPS-L": ["Arquivo original — antes das edições deste agente."],
@@ -4004,6 +4026,14 @@
"l17ab4": ["Não foi possível gravar os arquivos do projeto. Tente outro local."],
"l1aQKz": ["Tabela do editor visual"],
"l1l8sj": ["há ", ["0"], " d"],
+ "l2BOXd": [
+ ["pick"],
+ " e ",
+ ["keep"],
+ " contêm versões diferentes de: ",
+ ["0"],
+ ". Resolva isso primeiro: um link simbólico só pode manter uma de cada."
+ ],
"l3s5ri": ["Importar"],
"l3zD7w": ["Iniciando o agente…"],
"l46MqT": ["Próxima aba"],
@@ -4332,6 +4362,7 @@
"\". Recarregue para tentar de novo."
],
"oxdGJn": ["Antes de ir, quer contar por quê?"],
+ "oyBV3W": ["Caminho da pasta de habilidades personalizada"],
"p0Iq25": ["Inserir link"],
"p2LEhJ": ["Token de acesso pessoal"],
"p3m_Gk": [
@@ -4538,6 +4569,7 @@
"rbrHTd": ["Aprovado — ", ["optionName"]],
"rcJmK8": ["Converter os locais em cópias"],
"rdU729": ["Layout"],
+ "rf0tV1": ["Vincular pastas"],
"rf8fiC": ["Fechar janela"],
"rfFpcF": ["Remover ", ["chip"]],
"rg7hNd": ["Avalie sua experiência"],
diff --git a/packages/app/src/locales/pt-BR/messages.po b/packages/app/src/locales/pt-BR/messages.po
index 0f611bb1c..27959697b 100644
--- a/packages/app/src/locales/pt-BR/messages.po
+++ b/packages/app/src/locales/pt-BR/messages.po
@@ -814,6 +814,16 @@ msgstr "{percent}% usado (restam {left}%)"
msgid "{phase} — {pct}%"
msgstr "{phase} — {pct}%"
+#. placeholder {0}: p.conflicts.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} and {keep} both hold a different version of: {0}. Resolve those first — a symlink can only keep one of each."
+msgstr "{pick} e {keep} contêm versões diferentes de: {0}. Resolva isso primeiro: um link simbólico só pode manter uma de cada."
+
+#. placeholder {0}: p.strays.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} holds entries that aren't skills: {0}. Remove or move them from the folder and try again."
+msgstr "{pick} contém itens que não são habilidades: {0}. Remova-os ou mova-os para fora da pasta e tente novamente."
+
#: src/components/CreatedItemsList.tsx
msgid "{pluginCount, plural, one {plugin} other {plugins}}"
msgstr "{pluginCount, plural, one {plugin} many {plugins} other {plugins}}"
@@ -1976,6 +1986,10 @@ msgstr "A resposta de retrolinks não tinha o formato esperado."
msgid "Base branch"
msgstr "Ramo base"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "becomes a symlink"
+msgstr "vira um link simbólico"
+
#: src/components/TemplateBody.tsx
msgid "Becomes the document's content when someone creates a doc from this template. Type <0>{dateToken}</0> or <1>{userToken}</1> to fill in today's date or the author's name automatically."
msgstr "Vira o conteúdo do documento quando alguém cria um documento a partir deste modelo. Digite <0>{dateToken}</0> ou <1>{userToken}</1> para preencher automaticamente a data de hoje ou o nome do autor."
@@ -2047,6 +2061,10 @@ msgstr "Negrito"
msgid "Both"
msgstr "Ambos"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Both agents end up reading everything in {keep}."
+msgstr "Os dois agentes passam a ler tudo o que está em {keep}."
+
#: src/components/share-metadata-rows.tsx
msgid "Branch"
msgstr "Ramo"
@@ -2243,6 +2261,7 @@ msgstr "Não é possível compartilhar este caminho."
#: src/components/settings/NetworkAccessSection.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SearchSection.tsx
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
#: src/components/ShareBranchSwitchDialog.tsx
#: src/components/ShareReceiveDialog.tsx
#: src/components/SkillFileCreateDialog.tsx
@@ -3280,6 +3299,10 @@ msgstr "Copiando"
msgid "Copying..."
msgstr "Copiando..."
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Could not classify the merge — try again."
+msgstr "Não foi possível classificar a mesclagem. Tente novamente."
+
#: src/components/FileTree.tsx
msgid "Could not complete delete"
msgstr "Não foi possível concluir a exclusão"
@@ -4121,6 +4144,10 @@ msgstr "HTML personalizado com painel de pré-visualização ao vivo (iframe iso
msgid "Custom open-knowledge entry — not managed by OpenKnowledge"
msgstr "Entrada open-knowledge personalizada — não gerenciada pelo OpenKnowledge"
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Custom skills folder path"
+msgstr "Caminho da pasta de habilidades personalizada"
+
#: src/components/settings/CustomThemeEditor.tsx
msgid "Custom theme"
msgstr "Tema personalizado"
@@ -4264,6 +4291,10 @@ msgstr "{file} excluído"
msgid "Deleted {filePath}"
msgstr "{filePath} excluído"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Deleted for good"
+msgstr "Excluídas de vez"
+
#: src/components/FolderTimelineCard.tsx
msgid "deleted template"
msgstr "modelo excluído"
@@ -4665,6 +4696,10 @@ msgstr "Duplica o item em foco na árvore de arquivos quando o foco está na bar
msgid "Duplicated to \"{0}\""
msgstr "Duplicado em \"{0}\""
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Duplicates dropped"
+msgstr "Duplicatas descartadas"
+
#: src/components/settings/AttachmentsSection.tsx
msgid "e.g. assets/uploads"
msgstr "ex.: assets/uploads"
@@ -6387,6 +6422,10 @@ msgstr "Seletor de ícones"
msgid "ID: {0}"
msgstr "ID: {0}"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Identical in both — {pick} still reads them."
+msgstr "Idênticas nas duas: {pick} continua lendo."
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "If an update arrives for something you are editing, you choose which version to keep, like a merge conflict."
msgstr "Se chegar uma atualização de algo que você está editando, você escolhe qual versão manter, como em um conflito de mesclagem."
@@ -6978,6 +7017,10 @@ msgstr "Mantenha este projeto em sincronia com seu remoto do git. Acompanhar bus
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."
msgstr "Acompanhe as pessoas e empresas com quem você trabalha e as reuniões que tem com elas. Bom para lembrar quem é alguém, de onde você a conhece e sobre o que vocês falaram da última vez."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "keeps the skills"
+msgstr "mantém as habilidades"
+
#: src/components/settings/LintingSection.tsx
msgid "Keeps your knowledge base aligned with the Open Knowledge Format."
msgstr "Mantém sua base de conhecimento alinhada ao Open Knowledge Format."
@@ -7066,6 +7109,7 @@ msgstr "Claro, escuro ou seguir o sistema."
msgid "line {displayLine}"
msgstr "linha {displayLine}"
+#: src/components/settings/SkillTargetsPicker.tsx
#: src/editor/bubble-menu/LinkEditPopover.tsx
#: src/editor/slash-command/component-items.tsx
msgid "Link"
@@ -7076,6 +7120,10 @@ msgstr "Link"
msgid "Link copied."
msgstr "Link copiado."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link folders"
+msgstr "Vincular pastas"
+
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Link preview settings not yet loaded — try again in a moment"
msgstr "As configurações de pré-visualização de links ainda não carregaram — tente de novo em instantes"
@@ -7109,6 +7157,10 @@ msgstr "O destino do link \"{shown}\" não corresponde a um arquivo existente."
msgid "Link the selected text, or edit the link under the caret."
msgstr "Cria um link no texto selecionado ou edita o link sob o cursor."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link these skill folders?"
+msgstr "Vincular estas pastas de habilidades?"
+
#: src/editor/slash-command/component-items.tsx
msgid "Link to a page or external URL."
msgstr "Aponta para uma página ou uma URL externa."
@@ -7618,6 +7670,10 @@ msgstr "Mais instaladas"
msgid "Move"
msgstr "Mover"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Move across"
+msgstr "São movidas"
+
#: src/lib/keyboard-shortcuts.ts
msgid "Move between table cells"
msgstr "Mover entre as células da tabela"
@@ -8529,6 +8585,10 @@ msgstr "Desligada — a busca classifica só por palavra-chave. Nenhum conteúdo
msgid "Offline"
msgstr "Offline"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "OK can't move these, so they go when {pick} does."
+msgstr "OK não consegue mover isto, então some junto com {pick}."
+
#: src/lib/keyboard-shortcuts.ts
msgid "OK Desktop"
msgstr "OK Desktop"
@@ -11664,6 +11724,10 @@ msgstr "As habilidades agora são compartilhadas. Faça commit de .ok/skills par
msgid "Skills install to every AI tool detected on this machine, independent of the MCP connections you chose above."
msgstr "As habilidades são instaladas em todas as ferramentas de IA detectadas nesta máquina, independentemente das conexões MCP que você escolheu acima."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Skills reassigned"
+msgstr "Habilidades reatribuídas"
+
#: src/components/AppMenubar.tsx
#: src/components/command-palette-commands.ts
#: src/components/FileSidebar.tsx
@@ -12099,7 +12163,6 @@ msgstr "Trocando de ramo"
msgid "Switching to <0>local-only</0> will refuse until they're untracked via<1> git rm --cached</1>."
msgstr "Mudar para <0>somente local</0> será recusado até que eles deixem de ser rastreados com<1> git rm --cached</1>."
-#: src/components/settings/SkillTargetsPicker.tsx
#: src/components/SkillInstallMenu.tsx
msgid "symlink"
msgstr "link simbólico"
@@ -12750,6 +12813,10 @@ msgstr "Temas"
msgid "There's no project folder for this window, so a terminal can't start here."
msgstr "Esta janela não tem pasta de projeto, então não dá para iniciar um terminal aqui."
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "These currently read from another folder. After linking, they read from {keep} instead."
+msgstr "Elas são lidas de outra pasta no momento. Após a vinculação, serão lidas de {keep}."
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "These rules come from your project's <0>{configFile}</0> file, which fully governs linting for this project. Turn rules on or off and edit their options here; changes write back to the file."
msgstr "Estas regras vêm do arquivo <0>{configFile}</0> do seu projeto, que governa por completo a análise deste projeto. Ligue ou desligue regras e edite as opções delas aqui; as alterações são gravadas no arquivo."
diff --git a/packages/app/src/locales/ur/messages.json b/packages/app/src/locales/ur/messages.json
index fa36e3a8b..15624a361 100644
--- a/packages/app/src/locales/ur/messages.json
+++ b/packages/app/src/locales/ur/messages.json
@@ -45,6 +45,12 @@
"-q4abP": [
"نتائج محدود — اس ورک اسپیس میں اتنی فائلیں ہیں جتنی تلاش اشاریہ بند نہیں کر سکتی۔ کوئی غائب فائل اس حد کا نتیجہ ہو سکتی ہے، املا کی غلطی نہیں۔"
],
+ "-qBQVd": [
+ ["pick"],
+ " میں ایسی اندراجات ہیں جو مہارتیں نہیں ہیں: ",
+ ["0"],
+ "۔ انہیں فولڈر سے ہٹائیں یا منتقل کریں، پھر دوبارہ کوشش کریں۔"
+ ],
"-slrNR": ["کاموں کی فہرست بدلیں۔"],
"-uaQnI": ["کوئی مماثل ورک ٹری یا برانچ نہیں۔"],
"-yOx8u": ["تبدیلیاں محفوظ ہو رہی ہیں…"],
@@ -106,6 +112,7 @@
"0g7rCZ": ["«", ["0"], "» پر نقل بن گئی"],
"0jD-Gn": ["ٹیم کا نالج بیس، ذاتی وکی، پروجیکٹ کی دستاویزات..."],
"0kTAXe": ["ماخذ کھولیں: ", ["mirrorSrc"]],
+ "0m4Snh": ["مہارتیں دوبارہ تفویض ہوئیں"],
"0pZmTP": ["یہ راستہ شیئر نہیں کیا جا سکتا۔"],
"0qyKG6": ["ڈسک سے مطابق"],
"0r6d6v": ["تبدیلیاں خودکار طور پر محفوظ ہو گئیں۔"],
@@ -197,6 +204,7 @@
"2BBAbc": ["فہرست"],
"2C-6zf": ["نہیں بھیجا گیا"],
"2CHoQv": ["زبردستی دوبارہ لوڈ کریں"],
+ "2Ce6hp": ["منتقل ہوں گی"],
"2D1x3Y": ["لاگو کریں اور پروجیکٹ سرور دوبارہ شروع کریں"],
"2FYpfJ": ["مزید"],
"2FnYUD": [
@@ -1120,6 +1128,7 @@
"Es3G-g": [
"اسی پروجیکٹ میں رہتا ہے (جہاں بھی مہارت کا فولڈر ہو) اور git کے ذریعے ساتھیوں کے ساتھ مشترک ہوتا ہے۔"
],
+ "Eu-LIb": ["کیا یہ مہارت فولڈرز لنک کریں؟"],
"Ev2r9A": ["کوئی نتیجہ نہیں"],
"EvIJVD": ["ٹول کال"],
"EvPX7f": ["ریپازٹری کہاں کلون کرنی ہے، یہ منتخب کرنے کے لیے فولڈر منتخب کنندہ کھولتا ہے۔"],
@@ -1296,6 +1305,7 @@
"H1TmTu": ["ٹھیک کرنا رک گیا۔ جو فائلیں پہلے ہی ٹھیک ہو چکی ہیں وہ ٹھیک ہی رہیں گی۔"],
"H3oH0g": ["دوبارہ کریں"],
"H86f9p": ["سکیڑیں"],
+ "H8DVOJ": ["دونوں میں ایک جیسی ہیں — ", ["pick"], " پھر بھی انہیں پڑھتا رہے گا۔"],
"HAkEqR": ["حالیہ فائلیں"],
"HAvHev": ["«", ["name"], "» کے لیے خودکار اپ ڈیٹ بند"],
"HAvRAI": [["skillCount", "plural", { "one": ["مہارت"], "other": ["مہارتیں"] }]],
@@ -1401,6 +1411,7 @@
"It9ARY": ["دائیں دستاویز پینل بدلیں۔"],
"It9oAP": ["اب ", ["editor"], " والا ورژن ماخذ ہے"],
"ItxGi3": ["منسلکات کا مجموعی حجم 3 MB سے کم ہونا چاہیے۔"],
+ "IvKbeq": ["دونوں ایجنٹس بالآخر ", ["keep"], " کی ہر چیز پڑھیں گے۔"],
"Ix0K8o": ["بیرونی URL نوڈز چھپائیں"],
"IxHMdF": ["وہ تبصرہ حذف نہیں ہو سکا۔"],
"IxyZXD": ["اسکرین شاٹ"],
@@ -1518,6 +1529,7 @@
"Kiytqd": ["استثنا: مہارتیں مشترک ہیں"],
"KjTmeO": ["اس شیئر کو کھولنے کے لیے OpenKnowledge اپ ڈیٹ کریں۔"],
"KkEAud": ["موجودہ دستاویز یا فولڈر کے سیاق سے فائل بنائیں۔"],
+ "KkRyMI": ["ضم کی درجہ بندی نہیں ہو سکی — دوبارہ کوشش کریں۔"],
"KmydK6": ["جلی"],
"KnoB--": ["<0>", ["sanitized"], "</0> کے نام سے محفوظ ہو گا۔"],
"KpOJFY": ["بیرونی لنکس کے پیش منظر فعال کریں"],
@@ -2078,6 +2090,7 @@
"RrAIZx": ["کنفیگ کا اشتراک کیا شامل کرتا ہے"],
"Rsdhj9": ["کنفیگریشن کے انتباہات"],
"Rx5ReQ": [["keyName"], " کا نام بدلیں"],
+ "RxF-am": ["نقول ہٹا دی گئیں"],
"RyIKxy": [
"یہ ",
["targetNoun"],
@@ -2854,6 +2867,7 @@
"bcDHUM": [["descriptorLabel"], " — رینڈر کی خرابی، سورس نیچے قابلِ ترمیم ہے"],
"bcjYUA": ["سورس تہ کریں یا کھولیں"],
"bcm0pR": ["کھلا ہوا ایجنٹ"],
+ "beHZo4": ["OK انہیں منتقل نہیں کر سکتا، اس لیے یہ ", ["pick"], " کے ساتھ ہی چلے جائیں گے۔"],
"bi2C2s": [["displayName"], " تک رسائی نہیں ہو سکی۔ براہِ کرم بعد میں دوبارہ کوشش کریں۔"],
"bjsEcb": ["سب کو سامنے لائیں"],
"bkQRMh": ["پیراگراف"],
@@ -3095,6 +3109,7 @@
"evs0iw": ["«", ["tagListQuery"], "» سے مماثل ٹیگز"],
"ewSbS_": ["Shell سیشن"],
"ezUmoU": ["اجازت شدہ عنصری اقدار (خالی = کوئی بھی)"],
+ "f1-q9m": ["مہارتیں اپنے پاس رکھتا ہے"],
"f14doC": ["Slidev"],
"f1XQyZ": ["بلاک منتقل کریں"],
"f65AOQ": ["یہاں سے شروع کریں"],
@@ -3317,6 +3332,7 @@
"hpzRlK": ["بند کیا گیا ٹیب دوبارہ کھولیں"],
"hqCwRf": ["کوئی فائل منتخب نہیں"],
"hqVQbT": ["تبصرہ شامل کریں"],
+ "hs5BRR": ["ہمیشہ کے لیے حذف"],
"hvZwVx": ["تبدیل کریں"],
"hwFOFD": ["ترتیبات لوڈ نہیں ہو سکیں"],
"hxBHxQ": ["ایک سطر جس میں فٹ نوٹ<0><1>[1]</1></0> اور نیچے دکھائی گئی تعریف ہے۔"],
@@ -3444,6 +3460,11 @@
"jENU1Q": [
"اس مشین کے تمام پروجیکٹس پر لاگو ہوتا ہے۔ بلٹ اِن ٹرمینل سے شروع کیے گئے Claude اور Codex، OpenKnowledge کے پڑھنے اور لکھنے کے ٹولز کو خودکار طور پر منظور کرتے ہیں (Claude «ok open» بھی خودکار چلاتا ہے)۔ حذف کرنا، منتقل کرنا، شیئر کرنا، درآمد کرنا یا مہارتیں نصب کرنا، دیگر کمانڈز، اور OpenKnowledge سے باہر کی فائل ترامیم اب بھی پوچھتی ہیں۔ Cursor، OpenCode اور Pi متاثر نہیں ہوتے۔ ہر ایجنٹ کے لیے حسبِ استطاعت۔"
],
+ "jEVipR": [
+ "یہ اس وقت کسی دوسرے فولڈر سے پڑھی جاتی ہیں۔ لنک کرنے کے بعد، یہ اس کی بجائے ",
+ ["keep"],
+ " سے پڑھی جائیں گی۔"
+ ],
"jEZ6Lf": ["عارضی"],
"jEdF24": ["غائب صفحہ: ", ["linkTitle"], "۔ بنانے کے لیے کلک کریں۔"],
"jJdwCB": ["واپس پلٹیں"],
@@ -3583,6 +3604,7 @@
"kfL8BJ": ["درآمد ناکام: ", ["0"]],
"khCa4M": ["اس پروجیکٹ کے کوڈنگ ایجنٹس کو OpenKnowledge کے ذریعے پڑھنا اور لکھنا سکھاتا ہے۔"],
"kj9pAE": ["صفحہ بنایا جا رہا ہے"],
+ "kjlQ9D": ["سِم لنک بن جاتا ہے"],
"kknhfj": ["کوئی تبدیلی نہیں"],
"kkux8f": [["0"], " حذف نہیں کیا جا سکا۔ دوبارہ کوشش کریں۔"],
"klPS-L": ["اصل فائل — اس ایجنٹ کی ترامیم سے پہلے۔"],
@@ -3602,6 +3624,14 @@
"l17ab4": ["پروجیکٹ کی فائلیں لکھی نہیں جا سکیں۔ کوئی مختلف مقام آزمائیں۔"],
"l1aQKz": ["بصری ایڈیٹر کا ٹیبل"],
"l1l8sj": [["0"], " دن پہلے"],
+ "l2BOXd": [
+ ["pick"],
+ " اور ",
+ ["keep"],
+ " دونوں میں ",
+ ["0"],
+ " کے مختلف نسخے موجود ہیں۔ پہلے انہیں حل کریں: ایک سِم لنک ہر مہارت کا صرف ایک ہی نسخہ رکھ سکتا ہے۔"
+ ],
"l3s5ri": ["درآمد کریں"],
"l3zD7w": ["ایجنٹ شروع کیا جا رہا ہے…"],
"l46MqT": ["اگلا ٹیب"],
@@ -3909,6 +3939,7 @@
"» کا مقامی اشتراکی ڈیٹا صاف نہیں ہو سکا۔ دوبارہ کوشش کے لیے صفحہ لوڈ کریں۔"
],
"oxdGJn": ["جانے سے پہلے، وجہ بتانا پسند کریں گے؟"],
+ "oyBV3W": ["حسبِ ضرورت مہارت فولڈر کا راستہ"],
"p0Iq25": ["لنک داخل کریں"],
"p2LEhJ": ["ذاتی رسائی ٹوکن"],
"p3m_Gk": [
@@ -4081,6 +4112,7 @@
"rbrHTd": ["منظور شدہ — ", ["optionName"]],
"rcJmK8": ["مقامات کو نقول میں بدلیں"],
"rdU729": ["خاکہ بندی"],
+ "rf0tV1": ["فولڈرز لنک کریں"],
"rf8fiC": ["ونڈو بند کریں"],
"rfFpcF": [["chip"], " ہٹائیں"],
"rg7hNd": ["اپنے تجربے کی درجہ بندی کریں"],
diff --git a/packages/app/src/locales/ur/messages.po b/packages/app/src/locales/ur/messages.po
index 9fb28af81..8c6752d99 100644
--- a/packages/app/src/locales/ur/messages.po
+++ b/packages/app/src/locales/ur/messages.po
@@ -814,6 +814,16 @@ msgstr "{percent}% استعمال شدہ ({left}% باقی)"
msgid "{phase} — {pct}%"
msgstr "{phase} — {pct}%"
+#. placeholder {0}: p.conflicts.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} and {keep} both hold a different version of: {0}. Resolve those first — a symlink can only keep one of each."
+msgstr "{pick} اور {keep} دونوں میں {0} کے مختلف نسخے موجود ہیں۔ پہلے انہیں حل کریں: ایک سِم لنک ہر مہارت کا صرف ایک ہی نسخہ رکھ سکتا ہے۔"
+
+#. placeholder {0}: p.strays.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} holds entries that aren't skills: {0}. Remove or move them from the folder and try again."
+msgstr "{pick} میں ایسی اندراجات ہیں جو مہارتیں نہیں ہیں: {0}۔ انہیں فولڈر سے ہٹائیں یا منتقل کریں، پھر دوبارہ کوشش کریں۔"
+
#: src/components/CreatedItemsList.tsx
msgid "{pluginCount, plural, one {plugin} other {plugins}}"
msgstr "{pluginCount, plural, one {پلگ اِن} other {پلگ اِنز}}"
@@ -1980,6 +1990,10 @@ msgstr "بیک لنکس کا جواب متوقع ساخت سے میل نہیں
msgid "Base branch"
msgstr "بنیادی برانچ"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "becomes a symlink"
+msgstr "سِم لنک بن جاتا ہے"
+
#: src/components/TemplateBody.tsx
msgid "Becomes the document's content when someone creates a doc from this template. Type <0>{dateToken}</0> or <1>{userToken}</1> to fill in today's date or the author's name automatically."
msgstr "جب کوئی اس ٹیمپلیٹ سے دستاویز بناتا ہے تو یہ دستاویز کا مواد بن جاتا ہے۔ آج کی تاریخ یا مصنف کا نام خودکار بھرنے کے لیے <0>{dateToken}</0> یا <1>{userToken}</1> لکھیں۔"
@@ -2051,6 +2065,10 @@ msgstr "جلی"
msgid "Both"
msgstr "دونوں"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Both agents end up reading everything in {keep}."
+msgstr "دونوں ایجنٹس بالآخر {keep} کی ہر چیز پڑھیں گے۔"
+
#: src/components/share-metadata-rows.tsx
msgid "Branch"
msgstr "برانچ"
@@ -2247,6 +2265,7 @@ msgstr "یہ راستہ شیئر نہیں کیا جا سکتا۔"
#: src/components/settings/NetworkAccessSection.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SearchSection.tsx
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
#: src/components/ShareBranchSwitchDialog.tsx
#: src/components/ShareReceiveDialog.tsx
#: src/components/SkillFileCreateDialog.tsx
@@ -3284,6 +3303,10 @@ msgstr "نقل کیا جا رہا ہے"
msgid "Copying..."
msgstr "نقل کیا جا رہا ہے..."
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Could not classify the merge — try again."
+msgstr "ضم کی درجہ بندی نہیں ہو سکی — دوبارہ کوشش کریں۔"
+
#: src/components/FileTree.tsx
msgid "Could not complete delete"
msgstr "حذف مکمل نہیں ہو سکا"
@@ -4125,6 +4148,10 @@ msgstr "براہِ راست پیش منظر کے پین کے ساتھ حسبِ
msgid "Custom open-knowledge entry — not managed by OpenKnowledge"
msgstr "حسبِ ضرورت open-knowledge اندراج — OpenKnowledge کے زیرِ انتظام نہیں"
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Custom skills folder path"
+msgstr "حسبِ ضرورت مہارت فولڈر کا راستہ"
+
#: src/components/settings/CustomThemeEditor.tsx
msgid "Custom theme"
msgstr "حسبِ ضرورت تھیم"
@@ -4268,6 +4295,10 @@ msgstr "{file} حذف ہو گئی"
msgid "Deleted {filePath}"
msgstr "{filePath} حذف کر دی گئی"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Deleted for good"
+msgstr "ہمیشہ کے لیے حذف"
+
#: src/components/FolderTimelineCard.tsx
msgid "deleted template"
msgstr "ٹیمپلیٹ حذف کیا"
@@ -4669,6 +4700,10 @@ msgstr "جب فوکس فائلوں کے سائیڈ بار میں ہو تو فو
msgid "Duplicated to \"{0}\""
msgstr "«{0}» پر نقل بن گئی"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Duplicates dropped"
+msgstr "نقول ہٹا دی گئیں"
+
#: src/components/settings/AttachmentsSection.tsx
msgid "e.g. assets/uploads"
msgstr "مثلاً assets/uploads"
@@ -6391,6 +6426,10 @@ msgstr "آئیکن منتخب کنندہ"
msgid "ID: {0}"
msgstr "ID: {0}"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Identical in both — {pick} still reads them."
+msgstr "دونوں میں ایک جیسی ہیں — {pick} پھر بھی انہیں پڑھتا رہے گا۔"
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "If an update arrives for something you are editing, you choose which version to keep, like a merge conflict."
msgstr "اگر آپ جس چیز میں ترمیم کر رہے ہیں اس کی اپ ڈیٹ آ جائے تو آپ خود منتخب کرتے ہیں کہ کون سا ورژن رکھنا ہے، بالکل ضم کے تصادم کی طرح۔"
@@ -6982,6 +7021,10 @@ msgstr "اس پروجیکٹ کو اپنے git ریموٹ کے ساتھ ہم آہ
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."
msgstr "ان لوگوں اور کمپنیوں کا حساب رکھیں جن کے ساتھ آپ کام کرتے ہیں اور ان کے ساتھ ہونے والی ملاقاتوں کا۔ یہ یاد رکھنے کے لیے مفید کہ کوئی کون ہے، آپ اسے کیسے جانتے ہیں، اور آخری بار کس بارے میں بات ہوئی تھی۔"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "keeps the skills"
+msgstr "مہارتیں اپنے پاس رکھتا ہے"
+
#: src/components/settings/LintingSection.tsx
msgid "Keeps your knowledge base aligned with the Open Knowledge Format."
msgstr "آپ کے علمی ذخیرے کو Open Knowledge Format کے مطابق رکھتا ہے۔"
@@ -7070,6 +7113,7 @@ msgstr "روشن، تاریک، یا OS کی پیروی۔"
msgid "line {displayLine}"
msgstr "سطر {displayLine}"
+#: src/components/settings/SkillTargetsPicker.tsx
#: src/editor/bubble-menu/LinkEditPopover.tsx
#: src/editor/slash-command/component-items.tsx
msgid "Link"
@@ -7080,6 +7124,10 @@ msgstr "لنک"
msgid "Link copied."
msgstr "لنک نقل ہو گیا۔"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link folders"
+msgstr "فولڈرز لنک کریں"
+
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Link preview settings not yet loaded — try again in a moment"
msgstr "لنک کے پیش منظر کی ترتیبات ابھی لوڈ نہیں ہوئیں — تھوڑی دیر بعد دوبارہ کوشش کریں"
@@ -7113,6 +7161,10 @@ msgstr "لنک کا ہدف \"{shown}\" کسی موجودہ فائل کی طرف
msgid "Link the selected text, or edit the link under the caret."
msgstr "منتخب متن کو لنک کریں، یا کرسر کے نیچے موجود لنک میں ترمیم کریں۔"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link these skill folders?"
+msgstr "کیا یہ مہارت فولڈرز لنک کریں؟"
+
#: src/editor/slash-command/component-items.tsx
msgid "Link to a page or external URL."
msgstr "کسی صفحے یا بیرونی URL سے لنک کریں۔"
@@ -7622,6 +7674,10 @@ msgstr "سب سے زیادہ نصب شدہ"
msgid "Move"
msgstr "منتقل کریں"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Move across"
+msgstr "منتقل ہوں گی"
+
#: src/lib/keyboard-shortcuts.ts
msgid "Move between table cells"
msgstr "ٹیبل کے خانوں کے درمیان جائیں"
@@ -8533,6 +8589,10 @@ msgstr "بند — تلاش صرف کلیدی الفاظ سے درجہ بندی
msgid "Offline"
msgstr "آف لائن"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "OK can't move these, so they go when {pick} does."
+msgstr "OK انہیں منتقل نہیں کر سکتا، اس لیے یہ {pick} کے ساتھ ہی چلے جائیں گے۔"
+
#: src/lib/keyboard-shortcuts.ts
msgid "OK Desktop"
msgstr "OK Desktop"
@@ -11668,6 +11728,10 @@ msgstr "مہارتیں اب مشترک ہیں۔ انہیں اپنی ٹیم کے
msgid "Skills install to every AI tool detected on this machine, independent of the MCP connections you chose above."
msgstr "مہارتیں اس مشین پر ملنے والے ہر AI ٹول میں نصب ہوتی ہیں، چاہے آپ نے اوپر کوئی بھی MCP کنکشن منتخب کیا ہو۔"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Skills reassigned"
+msgstr "مہارتیں دوبارہ تفویض ہوئیں"
+
#: src/components/AppMenubar.tsx
#: src/components/command-palette-commands.ts
#: src/components/FileSidebar.tsx
@@ -12103,7 +12167,6 @@ msgstr "برانچیں بدلی جا رہی ہیں"
msgid "Switching to <0>local-only</0> will refuse until they're untracked via<1> git rm --cached</1>."
msgstr "<0>local-only</0> پر بدلنا اس وقت تک انکار کرے گا جب تک انہیں<1> git rm --cached</1> سے غیر ٹریک شدہ نہ کیا جائے۔"
-#: src/components/settings/SkillTargetsPicker.tsx
#: src/components/SkillInstallMenu.tsx
msgid "symlink"
msgstr "سِم لنک"
@@ -12754,6 +12817,10 @@ msgstr "تھیمز"
msgid "There's no project folder for this window, so a terminal can't start here."
msgstr "اس ونڈو کے لیے کوئی پروجیکٹ فولڈر نہیں، اس لیے یہاں ٹرمینل شروع نہیں ہو سکتا۔"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "These currently read from another folder. After linking, they read from {keep} instead."
+msgstr "یہ اس وقت کسی دوسرے فولڈر سے پڑھی جاتی ہیں۔ لنک کرنے کے بعد، یہ اس کی بجائے {keep} سے پڑھی جائیں گی۔"
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "These rules come from your project's <0>{configFile}</0> file, which fully governs linting for this project. Turn rules on or off and edit their options here; changes write back to the file."
msgstr "یہ قواعد آپ کے پروجیکٹ کی <0>{configFile}</0> فائل سے آتے ہیں، جو اس پروجیکٹ کے لِنٹنگ کو مکمل طور پر چلاتی ہے۔ قواعد یہاں فعال یا بند کریں اور ان کے آپشنز میں ترمیم کریں؛ تبدیلیاں واپس فائل میں لکھی جاتی ہیں۔"
diff --git a/packages/app/src/locales/zh-Hans/messages.json b/packages/app/src/locales/zh-Hans/messages.json
index 90584760d..edeb411b5 100644
--- a/packages/app/src/locales/zh-Hans/messages.json
+++ b/packages/app/src/locales/zh-Hans/messages.json
@@ -39,6 +39,12 @@
"-q4abP": [
"结果已被截断——这个工作区的文件数超出了搜索可索引的上限。找不到某个文件可能是上限造成的,而不是拼写错误。"
],
+ "-qBQVd": [
+ ["pick"],
+ " 中包含非技能条目:",
+ ["0"],
+ "。请将它们从文件夹中删除或移走,然后重试。"
+ ],
"-slrNR": ["切换任务清单。"],
"-uaQnI": ["没有匹配的 worktree 或分支。"],
"-yOx8u": ["正在保存更改…"],
@@ -101,6 +107,7 @@
"0g7rCZ": ["已创建副本 \"", ["0"], "\""],
"0jD-Gn": ["团队知识库、个人维基、项目文档……"],
"0kTAXe": ["来源:", ["mirrorSrc"]],
+ "0m4Snh": ["技能已重新分配"],
"0pZmTP": ["无法共享此路径。"],
"0qyKG6": ["已从磁盘同步"],
"0r6d6v": ["更改已自动保存。"],
@@ -180,6 +187,7 @@
"2BBAbc": ["列表"],
"2C-6zf": ["未发送"],
"2CHoQv": ["强制重新加载"],
+ "2Ce6hp": ["移动过去"],
"2D1x3Y": ["应用并重启项目服务器"],
"2FYpfJ": ["更多"],
"2FnYUD": ["应用与系统信息、最近的应用日志和项目服务器日志:复现问题所需的基本材料。"],
@@ -979,6 +987,7 @@
"ErRi6L": ["已删除模板“", ["label"], "”"],
"Es-eZU": ["从最近的项目中移除"],
"Es3G-g": ["保存在这个项目里(技能文件夹在哪里都行),并通过 git 与协作者共享。"],
+ "Eu-LIb": ["要链接这两个技能文件夹吗?"],
"Ev2r9A": ["没有结果"],
"EvIJVD": ["工具调用"],
"EvPX7f": ["打开文件夹选择器,选择把仓库克隆到哪里。"],
@@ -1126,6 +1135,7 @@
"H1TmTu": ["已停止修复。已修复的文件保持已修复状态。"],
"H3oH0g": ["重做"],
"H86f9p": ["折叠"],
+ "H8DVOJ": ["两边完全相同,", ["pick"], " 仍会读取它们。"],
"HAkEqR": ["最近的文件"],
"HAvHev": ["已关闭“", ["name"], "”的自动更新"],
"HAvRAI": [["skillCount", "plural", { "other": ["技能"] }]],
@@ -1210,6 +1220,7 @@
"It9ARY": ["显示或隐藏右侧的文档面板。"],
"It9oAP": [["editor"], " 的版本现在成为来源"],
"ItxGi3": ["附件总大小必须小于 3 MB。"],
+ "IvKbeq": ["两个智能体最终都会读取 ", ["keep"], " 中的全部内容。"],
"Ix0K8o": ["隐藏外部 URL 节点"],
"IxHMdF": ["无法删除那条评论。"],
"IxyZXD": ["截图"],
@@ -1307,6 +1318,7 @@
"Kiytqd": ["例外:技能是共享的"],
"KjTmeO": ["请更新 OpenKnowledge 以打开此共享内容。"],
"KkEAud": ["基于当前文档或文件夹创建一个文件。"],
+ "KkRyMI": ["无法对合并进行分类,请重试。"],
"KmydK6": ["粗体"],
"KnoB--": ["将保存为 <0>", ["sanitized"], "</0>。"],
"KpOJFY": ["开启外部链接预览"],
@@ -1794,6 +1806,7 @@
"RrAIZx": ["配置共享涵盖哪些内容"],
"Rsdhj9": ["配置警告"],
"Rx5ReQ": ["重命名 ", ["keyName"]],
+ "RxF-am": ["丢弃重复项"],
"RyIKxy": [
"这个",
["targetNoun"],
@@ -2475,6 +2488,7 @@
"bcDHUM": [["descriptorLabel"], " — 渲染出错,可在下方编辑源码"],
"bcjYUA": ["折叠或展开源码"],
"bcm0pR": ["已打开的智能体"],
+ "beHZo4": ["OK 无法移动这些内容,它们会随 ", ["pick"], " 一起消失。"],
"bi2C2s": ["无法连接 ", ["displayName"], "。请稍后再试。"],
"bjsEcb": ["前置全部窗口"],
"bkQRMh": ["段落"],
@@ -2680,6 +2694,7 @@
"evs0iw": ["匹配 \"", ["tagListQuery"], "\" 的标签"],
"ewSbS_": ["Shell 会话"],
"ezUmoU": ["允许的元素值(留空 = 任意)"],
+ "f1-q9m": ["保留这些技能"],
"f14doC": ["Slidev"],
"f1XQyZ": ["移动块"],
"f65AOQ": ["起始于"],
@@ -2875,6 +2890,7 @@
"hpzRlK": ["重新打开已关闭的标签页"],
"hqCwRf": ["未选择任何文件"],
"hqVQbT": ["添加评论"],
+ "hs5BRR": ["彻底删除"],
"hvZwVx": ["转换"],
"hwFOFD": ["设置加载失败"],
"hxBHxQ": ["一行带脚注<0><1>[1]</1></0>的文字,定义显示在下方。"],
@@ -2983,6 +2999,7 @@
"jENU1Q": [
"适用于这台电脑上的所有项目。从内置终端启动的 Claude 和 Codex 会自动批准 OpenKnowledge 的读写工具(Claude 还会自动运行 “ok open”)。删除、移动、共享、导入或安装技能,以及其他命令和 OpenKnowledge 之外的文件编辑,仍然会询问。Cursor、OpenCode 和 Pi 不受影响。各智能体尽力而为。"
],
+ "jEVipR": ["这些技能目前从另一个文件夹读取。链接后,它们将改为从 ", ["keep"], " 读取。"],
"jEZ6Lf": ["临时"],
"jEdF24": ["页面不存在:", ["linkTitle"], "。点击可创建。"],
"jJdwCB": ["还原"],
@@ -3103,6 +3120,7 @@
"kfL8BJ": ["导入失败:", ["0"]],
"khCa4M": ["教会这个项目中的编程智能体通过 OpenKnowledge 读写内容。"],
"kj9pAE": ["正在创建页面"],
+ "kjlQ9D": ["变成符号链接"],
"kknhfj": ["没有改动"],
"kkux8f": ["无法删除 ", ["0"], "。请重试。"],
"klPS-L": ["原始文件——这个智能体编辑之前的版本。"],
@@ -3122,6 +3140,14 @@
"l17ab4": ["无法写入项目文件。请换一个位置。"],
"l1aQKz": ["可视化编辑器表格"],
"l1l8sj": [["0"], " 天前"],
+ "l2BOXd": [
+ ["pick"],
+ " 和 ",
+ ["keep"],
+ " 各自保存着不同版本的:",
+ ["0"],
+ "。请先处理这些冲突:符号链接对每个技能只能保留一个版本。"
+ ],
"l3s5ri": ["导入"],
"l3zD7w": ["正在启动智能体…"],
"l46MqT": ["下一个标签页"],
@@ -3377,6 +3403,7 @@
"outYNy": ["名称重复 \"", ["keyName"], "\""],
"ovIGrT": ["无法清除“", ["docName"], "”的本地协作数据。请重新加载后重试。"],
"oxdGJn": ["在你离开之前,方便说说原因吗?"],
+ "oyBV3W": ["自定义技能文件夹路径"],
"p0Iq25": ["插入链接"],
"p2LEhJ": ["个人访问令牌"],
"p3m_Gk": [
@@ -3539,6 +3566,7 @@
"rbrHTd": ["已批准 — ", ["optionName"]],
"rcJmK8": ["把这些位置改为副本"],
"rdU729": ["布局"],
+ "rf0tV1": ["链接文件夹"],
"rf8fiC": ["关闭窗口"],
"rfFpcF": ["移除 ", ["chip"]],
"rg7hNd": ["为你的体验打分"],
diff --git a/packages/app/src/locales/zh-Hans/messages.po b/packages/app/src/locales/zh-Hans/messages.po
index ed961b4cb..38218c73a 100644
--- a/packages/app/src/locales/zh-Hans/messages.po
+++ b/packages/app/src/locales/zh-Hans/messages.po
@@ -814,6 +814,16 @@ msgstr "已使用 {percent}%(剩余 {left}%)"
msgid "{phase} — {pct}%"
msgstr "{phase} — {pct}%"
+#. placeholder {0}: p.conflicts.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} and {keep} both hold a different version of: {0}. Resolve those first — a symlink can only keep one of each."
+msgstr "{pick} 和 {keep} 各自保存着不同版本的:{0}。请先处理这些冲突:符号链接对每个技能只能保留一个版本。"
+
+#. placeholder {0}: p.strays.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} holds entries that aren't skills: {0}. Remove or move them from the folder and try again."
+msgstr "{pick} 中包含非技能条目:{0}。请将它们从文件夹中删除或移走,然后重试。"
+
#: src/components/CreatedItemsList.tsx
msgid "{pluginCount, plural, one {plugin} other {plugins}}"
msgstr "{pluginCount, plural, other {插件}}"
@@ -1980,6 +1990,10 @@ msgstr "反向链接响应的结构与预期不符。"
msgid "Base branch"
msgstr "基础分支"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "becomes a symlink"
+msgstr "变成符号链接"
+
#: src/components/TemplateBody.tsx
msgid "Becomes the document's content when someone creates a doc from this template. Type <0>{dateToken}</0> or <1>{userToken}</1> to fill in today's date or the author's name automatically."
msgstr "当有人用这个模板创建文档时,这会成为该文档的内容。输入 <0>{dateToken}</0> 或 <1>{userToken}</1> 可自动填入今天的日期或作者姓名。"
@@ -2051,6 +2065,10 @@ msgstr "粗体"
msgid "Both"
msgstr "两者"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Both agents end up reading everything in {keep}."
+msgstr "两个智能体最终都会读取 {keep} 中的全部内容。"
+
#: src/components/share-metadata-rows.tsx
msgid "Branch"
msgstr "分支"
@@ -2247,6 +2265,7 @@ msgstr "无法共享此路径。"
#: src/components/settings/NetworkAccessSection.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SearchSection.tsx
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
#: src/components/ShareBranchSwitchDialog.tsx
#: src/components/ShareReceiveDialog.tsx
#: src/components/SkillFileCreateDialog.tsx
@@ -3284,6 +3303,10 @@ msgstr "正在复制"
msgid "Copying..."
msgstr "正在复制…"
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Could not classify the merge — try again."
+msgstr "无法对合并进行分类,请重试。"
+
#: src/components/FileTree.tsx
msgid "Could not complete delete"
msgstr "无法完成删除"
@@ -4125,6 +4148,10 @@ msgstr "带实时预览面板的自定义 HTML(沙箱 iframe)。"
msgid "Custom open-knowledge entry — not managed by OpenKnowledge"
msgstr "自定义 open-knowledge 条目——不由 OpenKnowledge 管理"
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Custom skills folder path"
+msgstr "自定义技能文件夹路径"
+
#: src/components/settings/CustomThemeEditor.tsx
msgid "Custom theme"
msgstr "自定义主题"
@@ -4268,6 +4295,10 @@ msgstr "已删除 {file}"
msgid "Deleted {filePath}"
msgstr "已删除 {filePath}"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Deleted for good"
+msgstr "彻底删除"
+
#: src/components/FolderTimelineCard.tsx
msgid "deleted template"
msgstr "已删除模板"
@@ -4669,6 +4700,10 @@ msgstr "当焦点在「文件」侧边栏时,为聚焦的文件树项目创建
msgid "Duplicated to \"{0}\""
msgstr "已创建副本 \"{0}\""
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Duplicates dropped"
+msgstr "丢弃重复项"
+
#: src/components/settings/AttachmentsSection.tsx
msgid "e.g. assets/uploads"
msgstr "例如 assets/uploads"
@@ -6391,6 +6426,10 @@ msgstr "图标选择器"
msgid "ID: {0}"
msgstr "ID:{0}"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Identical in both — {pick} still reads them."
+msgstr "两边完全相同,{pick} 仍会读取它们。"
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "If an update arrives for something you are editing, you choose which version to keep, like a merge conflict."
msgstr "如果你正在编辑的内容收到更新,你可以像处理合并冲突那样选择保留哪个版本。"
@@ -6982,6 +7021,10 @@ msgstr "让这个项目与你的 git 远程保持同步。「跟随」只获取
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."
msgstr "记录你打交道的人和公司,以及你们之间的会面。适合用来记住某人是谁、你怎么认识他们,以及上次聊了什么。"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "keeps the skills"
+msgstr "保留这些技能"
+
#: src/components/settings/LintingSection.tsx
msgid "Keeps your knowledge base aligned with the Open Knowledge Format."
msgstr "让您的知识库与 Open Knowledge Format 保持一致。"
@@ -7070,6 +7113,7 @@ msgstr "浅色、深色,或跟随系统。"
msgid "line {displayLine}"
msgstr "第 {displayLine} 行"
+#: src/components/settings/SkillTargetsPicker.tsx
#: src/editor/bubble-menu/LinkEditPopover.tsx
#: src/editor/slash-command/component-items.tsx
msgid "Link"
@@ -7080,6 +7124,10 @@ msgstr "链接"
msgid "Link copied."
msgstr "链接已复制。"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link folders"
+msgstr "链接文件夹"
+
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Link preview settings not yet loaded — try again in a moment"
msgstr "链接预览设置尚未加载——请稍后再试"
@@ -7113,6 +7161,10 @@ msgstr "链接目标“{shown}”未指向现有文件。"
msgid "Link the selected text, or edit the link under the caret."
msgstr "为选中的文本加链接,或编辑光标处的链接。"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link these skill folders?"
+msgstr "要链接这两个技能文件夹吗?"
+
#: src/editor/slash-command/component-items.tsx
msgid "Link to a page or external URL."
msgstr "链接到某个页面或外部 URL。"
@@ -7622,6 +7674,10 @@ msgstr "安装量最高"
msgid "Move"
msgstr "移动"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Move across"
+msgstr "移动过去"
+
#: src/lib/keyboard-shortcuts.ts
msgid "Move between table cells"
msgstr "在表格单元格之间移动"
@@ -8533,6 +8589,10 @@ msgstr "关闭——搜索仅按关键词排序。不会有任何内容离开这
msgid "Offline"
msgstr "离线"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "OK can't move these, so they go when {pick} does."
+msgstr "OK 无法移动这些内容,它们会随 {pick} 一起消失。"
+
#: src/lib/keyboard-shortcuts.ts
msgid "OK Desktop"
msgstr "OK 桌面版"
@@ -11668,6 +11728,10 @@ msgstr "技能现在已共享。提交 .ok/skills 即可分享给你的团队。
msgid "Skills install to every AI tool detected on this machine, independent of the MCP connections you chose above."
msgstr "技能会安装到本机检测到的每个 AI 工具,与上面选择的 MCP 连接无关。"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Skills reassigned"
+msgstr "技能已重新分配"
+
#: src/components/AppMenubar.tsx
#: src/components/command-palette-commands.ts
#: src/components/FileSidebar.tsx
@@ -12103,7 +12167,6 @@ msgstr "正在切换分支"
msgid "Switching to <0>local-only</0> will refuse until they're untracked via<1> git rm --cached</1>."
msgstr "在用<1> git rm --cached</1> 取消跟踪之前,切换到<0>仅本地</0>会被拒绝。"
-#: src/components/settings/SkillTargetsPicker.tsx
#: src/components/SkillInstallMenu.tsx
msgid "symlink"
msgstr "符号链接"
@@ -12754,6 +12817,10 @@ msgstr "主题"
msgid "There's no project folder for this window, so a terminal can't start here."
msgstr "这个窗口没有对应的项目文件夹,因此无法在这里启动终端。"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "These currently read from another folder. After linking, they read from {keep} instead."
+msgstr "这些技能目前从另一个文件夹读取。链接后,它们将改为从 {keep} 读取。"
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "These rules come from your project's <0>{configFile}</0> file, which fully governs linting for this project. Turn rules on or off and edit their options here; changes write back to the file."
msgstr "这些规则来自你项目的 <0>{configFile}</0> 文件,该文件完全决定了这个项目的检查行为。可以在这里开关规则并编辑它们的选项;更改会写回该文件。"
diff --git a/packages/app/src/locales/zh-Hant/messages.json b/packages/app/src/locales/zh-Hant/messages.json
index 40344715b..d9f07b27a 100644
--- a/packages/app/src/locales/zh-Hant/messages.json
+++ b/packages/app/src/locales/zh-Hant/messages.json
@@ -39,6 +39,12 @@
"-q4abP": [
"結果已被截斷——這個工作區的檔案數超過搜尋能索引的上限。找不到某個檔案可能是上限造成的,不是打錯字。"
],
+ "-qBQVd": [
+ ["pick"],
+ " 中包含非技能項目:",
+ ["0"],
+ "。請將它們從資料夾中刪除或移走,然後再試一次。"
+ ],
"-slrNR": ["切換工作清單。"],
"-uaQnI": ["沒有相符的 worktree 或分支。"],
"-yOx8u": ["正在儲存變更…"],
@@ -101,6 +107,7 @@
"0g7rCZ": ["已建立副本「", ["0"], "」"],
"0jD-Gn": ["團隊知識庫、個人維基、專案文件……"],
"0kTAXe": ["來源:", ["mirrorSrc"]],
+ "0m4Snh": ["技能已重新指派"],
"0pZmTP": ["無法分享這個路徑。"],
"0qyKG6": ["已從磁碟同步"],
"0r6d6v": ["變更已自動儲存。"],
@@ -182,6 +189,7 @@
"2BBAbc": ["清單"],
"2C-6zf": ["未傳送"],
"2CHoQv": ["強制重新載入"],
+ "2Ce6hp": ["移動過去"],
"2D1x3Y": ["套用並重新啟動專案伺服器"],
"2FYpfJ": ["更多"],
"2FnYUD": [
@@ -989,6 +997,7 @@
"ErRi6L": ["已刪除範本「", ["label"], "」"],
"Es-eZU": ["從最近的專案中移除"],
"Es3G-g": ["放在這個專案裡(技能資料夾在哪都行),並透過 git 分享給協作者。"],
+ "Eu-LIb": ["要連結這兩個技能資料夾嗎?"],
"Ev2r9A": ["沒有結果"],
"EvIJVD": ["工具呼叫"],
"EvPX7f": ["開啟資料夾選擇器,挑一個地方把儲存庫複製過去。"],
@@ -1140,6 +1149,7 @@
"H1TmTu": ["已停止修正。已經修正好的檔案會維持原狀。"],
"H3oH0g": ["重做"],
"H86f9p": ["摺疊"],
+ "H8DVOJ": ["兩邊完全相同,", ["pick"], " 仍會讀到它們。"],
"HAkEqR": ["最近的檔案"],
"HAvHev": ["已關閉「", ["name"], "」的自動更新"],
"HAvRAI": [["skillCount", "plural", { "other": ["技能"] }]],
@@ -1222,6 +1232,7 @@
"It9ARY": ["顯示或隱藏右側的文件面板。"],
"It9oAP": [["editor"], " 的版本現在成為來源"],
"ItxGi3": ["附件總大小必須小於 3 MB。"],
+ "IvKbeq": ["兩個代理最後都會讀到 ", ["keep"], " 裡的全部內容。"],
"Ix0K8o": ["隱藏外部 URL 節點"],
"IxHMdF": ["無法刪除那則註解。"],
"IxyZXD": ["螢幕擷圖"],
@@ -1323,6 +1334,7 @@
"Kiytqd": ["例外:技能是共享的"],
"KjTmeO": ["請更新 OpenKnowledge 以開啟這個分享內容。"],
"KkEAud": ["依目前的文件或資料夾情境建立一個檔案。"],
+ "KkRyMI": ["無法對合併進行分類,請再試一次。"],
"KmydK6": ["粗體"],
"KnoB--": ["會儲存成 <0>", ["sanitized"], "</0>。"],
"KpOJFY": ["開啟外部連結預覽"],
@@ -1818,6 +1830,7 @@
"RrAIZx": ["設定分享涵蓋哪些東西"],
"Rsdhj9": ["設定警告"],
"Rx5ReQ": ["重新命名 ", ["keyName"]],
+ "RxF-am": ["捨棄重複項"],
"RyIKxy": [
"這個",
["targetNoun"],
@@ -2499,6 +2512,7 @@
"bcDHUM": [["descriptorLabel"], " — 顯示出錯,可在下方編輯原始碼"],
"bcjYUA": ["摺疊或展開原始碼"],
"bcm0pR": ["已開啟的代理"],
+ "beHZo4": ["OK 無法移動這些內容,它們會隨 ", ["pick"], " 一起消失。"],
"bi2C2s": ["無法連線到 ", ["displayName"], "。請稍後再試。"],
"bjsEcb": ["將全部移至最前"],
"bkQRMh": ["段落"],
@@ -2704,6 +2718,7 @@
"evs0iw": ["符合「", ["tagListQuery"], "」的標籤"],
"ewSbS_": ["Shell 工作階段"],
"ezUmoU": ["允許的元素值(留空 = 任意)"],
+ "f1-q9m": ["保留這些技能"],
"f14doC": ["Slidev"],
"f1XQyZ": ["移動區塊"],
"f65AOQ": ["起點"],
@@ -2903,6 +2918,7 @@
"hpzRlK": ["重新開啟已關閉的分頁"],
"hqCwRf": ["沒有選取任何檔案"],
"hqVQbT": ["新增註解"],
+ "hs5BRR": ["徹底刪除"],
"hvZwVx": ["轉換"],
"hwFOFD": ["設定載入失敗"],
"hxBHxQ": ["一行帶註腳<0><1>[1]</1></0>的文字,定義顯示在下方。"],
@@ -3011,6 +3027,7 @@
"jENU1Q": [
"適用於這台電腦上的所有專案。從內建終端機啟動的 Claude 和 Codex 會自動核准 OpenKnowledge 的讀取與寫入工具(Claude 還會自動執行「ok open」)。刪除、移動、分享、匯入或安裝技能,以及其他指令和 OpenKnowledge 之外的檔案編輯,仍然會詢問。Cursor、OpenCode 和 Pi 不受影響。各代理盡力而為。"
],
+ "jEVipR": ["這些技能目前從另一個資料夾讀取。連結後,它們將改為從 ", ["keep"], " 讀取。"],
"jEZ6Lf": ["暫定"],
"jEdF24": ["頁面不存在:", ["linkTitle"], "。點一下可建立。"],
"jJdwCB": ["回復"],
@@ -3131,6 +3148,7 @@
"kfL8BJ": ["匯入失敗:", ["0"]],
"khCa4M": ["教會這個專案裡的程式碼代理透過 OpenKnowledge 讀寫內容。"],
"kj9pAE": ["正在建立頁面"],
+ "kjlQ9D": ["變成符號連結"],
"kknhfj": ["沒有變更"],
"kkux8f": ["無法刪除 ", ["0"], "。請再試一次。"],
"klPS-L": ["原始檔案——這個代理編輯之前的樣子。"],
@@ -3150,6 +3168,14 @@
"l17ab4": ["無法寫入專案檔案。請換一個位置。"],
"l1aQKz": ["視覺化編輯器表格"],
"l1l8sj": [["0"], " 天前"],
+ "l2BOXd": [
+ ["pick"],
+ " 和 ",
+ ["keep"],
+ " 各自存著不同版本的:",
+ ["0"],
+ "。請先處理這些衝突:符號連結對每個技能只能保留一個版本。"
+ ],
"l3s5ri": ["匯入"],
"l3zD7w": ["正在啟動代理…"],
"l46MqT": ["下一個分頁"],
@@ -3407,6 +3433,7 @@
"outYNy": ["名稱重複「", ["keyName"], "」"],
"ovIGrT": ["無法清除「", ["docName"], "」的本機協作資料。請重新載入後再試一次。"],
"oxdGJn": ["在你離開之前,方便說說原因嗎?"],
+ "oyBV3W": ["自訂技能資料夾路徑"],
"p0Iq25": ["插入連結"],
"p2LEhJ": ["個人存取權杖"],
"p3m_Gk": [
@@ -3569,6 +3596,7 @@
"rbrHTd": ["已核准 — ", ["optionName"]],
"rcJmK8": ["把這些位置改成副本"],
"rdU729": ["版面配置"],
+ "rf0tV1": ["連結資料夾"],
"rf8fiC": ["關閉視窗"],
"rfFpcF": ["移除 ", ["chip"]],
"rg7hNd": ["為你的體驗評分"],
diff --git a/packages/app/src/locales/zh-Hant/messages.po b/packages/app/src/locales/zh-Hant/messages.po
index b2c59dec7..7614d8c13 100644
--- a/packages/app/src/locales/zh-Hant/messages.po
+++ b/packages/app/src/locales/zh-Hant/messages.po
@@ -814,6 +814,16 @@ msgstr "已使用 {percent}%(剩餘 {left}%)"
msgid "{phase} — {pct}%"
msgstr "{phase} — {pct}%"
+#. placeholder {0}: p.conflicts.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} and {keep} both hold a different version of: {0}. Resolve those first — a symlink can only keep one of each."
+msgstr "{pick} 和 {keep} 各自存著不同版本的:{0}。請先處理這些衝突:符號連結對每個技能只能保留一個版本。"
+
+#. placeholder {0}: p.strays.join(', ')
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "{pick} holds entries that aren't skills: {0}. Remove or move them from the folder and try again."
+msgstr "{pick} 中包含非技能項目:{0}。請將它們從資料夾中刪除或移走,然後再試一次。"
+
#: src/components/CreatedItemsList.tsx
msgid "{pluginCount, plural, one {plugin} other {plugins}}"
msgstr "{pluginCount, plural, other {外掛程式}}"
@@ -1980,6 +1990,10 @@ msgstr "反向連結的回應結構與預期不符。"
msgid "Base branch"
msgstr "基底分支"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "becomes a symlink"
+msgstr "變成符號連結"
+
#: src/components/TemplateBody.tsx
msgid "Becomes the document's content when someone creates a doc from this template. Type <0>{dateToken}</0> or <1>{userToken}</1> to fill in today's date or the author's name automatically."
msgstr "當有人用這個範本建立文件時,這會成為那份文件的內容。輸入 <0>{dateToken}</0> 或 <1>{userToken}</1> 可自動填入今天的日期或作者姓名。"
@@ -2051,6 +2065,10 @@ msgstr "粗體"
msgid "Both"
msgstr "兩者"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Both agents end up reading everything in {keep}."
+msgstr "兩個代理最後都會讀到 {keep} 裡的全部內容。"
+
#: src/components/share-metadata-rows.tsx
msgid "Branch"
msgstr "分支"
@@ -2247,6 +2265,7 @@ msgstr "無法分享這個路徑。"
#: src/components/settings/NetworkAccessSection.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SearchSection.tsx
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
#: src/components/ShareBranchSwitchDialog.tsx
#: src/components/ShareReceiveDialog.tsx
#: src/components/SkillFileCreateDialog.tsx
@@ -3284,6 +3303,10 @@ msgstr "正在複製"
msgid "Copying..."
msgstr "正在複製…"
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Could not classify the merge — try again."
+msgstr "無法對合併進行分類,請再試一次。"
+
#: src/components/FileTree.tsx
msgid "Could not complete delete"
msgstr "無法完成刪除"
@@ -4125,6 +4148,10 @@ msgstr "帶即時預覽窗格的自訂 HTML(沙箱 iframe)。"
msgid "Custom open-knowledge entry — not managed by OpenKnowledge"
msgstr "自訂的 open-knowledge 項目——不由 OpenKnowledge 管理"
+#: src/components/settings/SkillTargetsPicker.tsx
+msgid "Custom skills folder path"
+msgstr "自訂技能資料夾路徑"
+
#: src/components/settings/CustomThemeEditor.tsx
msgid "Custom theme"
msgstr "自訂主題"
@@ -4268,6 +4295,10 @@ msgstr "已刪除 {file}"
msgid "Deleted {filePath}"
msgstr "已刪除 {filePath}"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Deleted for good"
+msgstr "徹底刪除"
+
#: src/components/FolderTimelineCard.tsx
msgid "deleted template"
msgstr "已刪除範本"
@@ -4669,6 +4700,10 @@ msgstr "當焦點在「檔案」側邊欄時,為聚焦的檔案樹項目建立
msgid "Duplicated to \"{0}\""
msgstr "已建立副本「{0}」"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Duplicates dropped"
+msgstr "捨棄重複項"
+
#: src/components/settings/AttachmentsSection.tsx
msgid "e.g. assets/uploads"
msgstr "例如 assets/uploads"
@@ -6391,6 +6426,10 @@ msgstr "圖示選擇器"
msgid "ID: {0}"
msgstr "ID:{0}"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Identical in both — {pick} still reads them."
+msgstr "兩邊完全相同,{pick} 仍會讀到它們。"
+
#: src/components/AutoSyncEnableWarning.tsx
msgid "If an update arrives for something you are editing, you choose which version to keep, like a merge conflict."
msgstr "如果你正在編輯的東西收到更新,你可以像處理合併衝突那樣選擇要保留哪個版本。"
@@ -6982,6 +7021,10 @@ msgstr "讓這個專案和你的 git 遠端保持同步。「跟隨」只取得
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."
msgstr "記錄你往來的人和公司,以及你們之間的會面。適合用來記住某人是誰、你怎麼認識他們,還有上次聊了什麼。"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "keeps the skills"
+msgstr "保留這些技能"
+
#: src/components/settings/LintingSection.tsx
msgid "Keeps your knowledge base aligned with the Open Knowledge Format."
msgstr "讓您的知識庫與 Open Knowledge Format 保持一致。"
@@ -7070,6 +7113,7 @@ msgstr "淺色、深色,或跟隨系統。"
msgid "line {displayLine}"
msgstr "第 {displayLine} 行"
+#: src/components/settings/SkillTargetsPicker.tsx
#: src/editor/bubble-menu/LinkEditPopover.tsx
#: src/editor/slash-command/component-items.tsx
msgid "Link"
@@ -7080,6 +7124,10 @@ msgstr "連結"
msgid "Link copied."
msgstr "已複製連結。"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link folders"
+msgstr "連結資料夾"
+
#: src/components/settings/LinkPreviewsSection.tsx
msgid "Link preview settings not yet loaded — try again in a moment"
msgstr "連結預覽設定尚未載入——請稍候再試"
@@ -7113,6 +7161,10 @@ msgstr "連結目標「{shown}」未指向現有檔案。"
msgid "Link the selected text, or edit the link under the caret."
msgstr "為選取的文字加上連結,或編輯游標處的連結。"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Link these skill folders?"
+msgstr "要連結這兩個技能資料夾嗎?"
+
#: src/editor/slash-command/component-items.tsx
msgid "Link to a page or external URL."
msgstr "連到某個頁面或外部 URL。"
@@ -7622,6 +7674,10 @@ msgstr "安裝次數最多"
msgid "Move"
msgstr "移動"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Move across"
+msgstr "移動過去"
+
#: src/lib/keyboard-shortcuts.ts
msgid "Move between table cells"
msgstr "在表格儲存格之間移動"
@@ -8533,6 +8589,10 @@ msgstr "關閉——搜尋只按關鍵字排序。不會有任何內容離開這
msgid "Offline"
msgstr "離線"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "OK can't move these, so they go when {pick} does."
+msgstr "OK 無法移動這些內容,它們會隨 {pick} 一起消失。"
+
#: src/lib/keyboard-shortcuts.ts
msgid "OK Desktop"
msgstr "OK 桌面版"
@@ -11668,6 +11728,10 @@ msgstr "技能現在已分享。提交 .ok/skills 就能分享給你的團隊。
msgid "Skills install to every AI tool detected on this machine, independent of the MCP connections you chose above."
msgstr "技能會安裝到本機偵測到的每個 AI 工具,與上面選擇的 MCP 連線無關。"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "Skills reassigned"
+msgstr "技能已重新指派"
+
#: src/components/AppMenubar.tsx
#: src/components/command-palette-commands.ts
#: src/components/FileSidebar.tsx
@@ -12103,7 +12167,6 @@ msgstr "正在切換分支"
msgid "Switching to <0>local-only</0> will refuse until they're untracked via<1> git rm --cached</1>."
msgstr "在用<1> git rm --cached</1> 取消追蹤之前,切換到<0>僅本機</0>會被拒絕。"
-#: src/components/settings/SkillTargetsPicker.tsx
#: src/components/SkillInstallMenu.tsx
msgid "symlink"
msgstr "符號連結"
@@ -12754,6 +12817,10 @@ msgstr "主題"
msgid "There's no project folder for this window, so a terminal can't start here."
msgstr "這個視窗沒有對應的專案資料夾,所以無法在這裡啟動終端機。"
+#: src/components/settings/SkillFolderLinkConfirmDialog.tsx
+msgid "These currently read from another folder. After linking, they read from {keep} instead."
+msgstr "這些技能目前從另一個資料夾讀取。連結後,它們將改為從 {keep} 讀取。"
+
#: src/components/settings/markdownlint-rule-browser.tsx
msgid "These rules come from your project's <0>{configFile}</0> file, which fully governs linting for this project. Turn rules on or off and edit their options here; changes write back to the file."
msgstr "這些規則來自你專案的 <0>{configFile}</0> 檔案,那個檔案完全決定了這個專案的檢查行為。可以在這裡開關規則並編輯它們的選項;變更會寫回那個檔案。"
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index d0af6e141..66f5c79e6 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -1241,7 +1241,11 @@ export {
type SkillFileRenameSuccess,
SkillFileRenameSuccessSchema,
type SkillFolderAction,
+ type SkillFolderActionMcp,
+ SkillFolderActionMcpSchema,
SkillFolderActionSchema,
+ type SkillFolderLinkPreview,
+ SkillFolderLinkPreviewSchema,
type SkillFrontmatter,
SkillFrontmatterSchema,
type SkillGetSuccess,
diff --git a/packages/core/src/schemas/api/tags-search.ts b/packages/core/src/schemas/api/tags-search.ts
index ba8acaec3..d1c309e2f 100644
--- a/packages/core/src/schemas/api/tags-search.ts
+++ b/packages/core/src/schemas/api/tags-search.ts
@@ -1258,44 +1258,71 @@ export type SkillTargetsGetSuccess = z.infer<typeof SkillTargetsGetSuccessSchema
* - `add-root` — declare a NEW custom skills root; it becomes a folder row
* and a link/install target from declaration (no first placement needed).
*/
+const SkillFolderLinkBase = z.object({
+ action: z.literal('link'),
+ scope: SkillScopeSchema,
+ root: z.string().min(1).meta({ description: 'The folder to link (e.g. ".codex/skills").' }),
+ target: z
+ .string()
+ .min(1)
+ .meta({ description: 'The root it merges into (e.g. ".agents/skills"). Required.' }),
+});
+
+const SkillFolderUnlinkSchema = z
+ .object({
+ action: z.literal('unlink'),
+ scope: SkillScopeSchema,
+ root: z.string().min(1).meta({ description: 'The linked folder to materialize back.' }),
+ /** Skill names to leave out of the materialized links — "stop this
+ * agent reading that skill": the folder keeps everything else it sees
+ * today but stops following the target root. */
+ exclude: z.array(z.string().min(1)).optional().meta({
+ description:
+ 'Skill names to LEAVE OUT when materializing — the folder keeps every other skill it currently sees (as per-skill links) and stops auto-following the target root.',
+ }),
+ })
+ .strict();
+
+const SkillFolderAddRootSchema = z
+ .object({
+ action: z.literal('add-root'),
+ scope: SkillScopeSchema,
+ root: SkillRootPathSchema.meta({
+ description: 'New custom skills root to declare (base-relative, e.g. ".team/skills").',
+ }),
+ })
+ .strict();
+
export const SkillFolderActionSchema = z.discriminatedUnion('action', [
- z
- .object({
- action: z.literal('link'),
- scope: SkillScopeSchema,
- root: z.string().min(1).meta({ description: 'The folder to link (e.g. ".codex/skills").' }),
- target: z
- .string()
- .min(1)
- .meta({ description: 'The root it merges into (e.g. ".agents/skills"). Required.' }),
- })
- .strict(),
- z
- .object({
- action: z.literal('unlink'),
- scope: SkillScopeSchema,
- root: z.string().min(1).meta({ description: 'The linked folder to materialize back.' }),
- /** Skill names to leave out of the materialized links — "stop this
- * agent reading that skill": the folder keeps everything else it sees
- * today but stops following the target root. */
- exclude: z.array(z.string().min(1)).optional().meta({
- description:
- 'Skill names to LEAVE OUT when materializing — the folder keeps every other skill it currently sees (as per-skill links) and stops auto-following the target root.',
- }),
- })
- .strict(),
- z
- .object({
- action: z.literal('add-root'),
- scope: SkillScopeSchema,
- root: SkillRootPathSchema.meta({
- description: 'New custom skills root to declare (base-relative, e.g. ".team/skills").',
- }),
- })
- .strict(),
+ SkillFolderLinkBase.extend({
+ /** Canonical classify-without-writing field for new APIs. Classifies the
+ * merge without touching disk so callers can disclose its effects first.
+ * Legacy siblings: `dryRun` (reimport), `apply: false` (track-in-git). */
+ preview: z.boolean().optional().meta({
+ description:
+ 'Return the merge plan only (moves, drops, removes, conflicts, strays) — nothing is written.',
+ }),
+ }).strict(),
+ SkillFolderUnlinkSchema,
+ SkillFolderAddRootSchema,
]);
export type SkillFolderAction = z.infer<typeof SkillFolderActionSchema>;
+/**
+ * The same verbs without `preview`. A preview classifies and returns; it does
+ * NOT link. The MCP `install` tool summarizes a folder verb from the response's
+ * `folder` field, which a preview response doesn't carry — so accepting the
+ * flag there reports a completed link for an operation that never ran. The
+ * disclosure is a UI affordance (it needs someone to show the plan to), so the
+ * flag stays off this surface rather than growing an MCP rendering for it.
+ */
+export const SkillFolderActionMcpSchema = z.discriminatedUnion('action', [
+ SkillFolderLinkBase.strict(),
+ SkillFolderUnlinkSchema,
+ SkillFolderAddRootSchema,
+]);
+export type SkillFolderActionMcp = z.infer<typeof SkillFolderActionMcpSchema>;
+
/**
* Request body for `PUT /api/skill-targets` — set the committed target set.
* A user/UI action (not agent-attributed), so no identity fields. Changing
@@ -1308,6 +1335,28 @@ export const SkillTargetsPutRequestSchema = z
.strict() satisfies StandardSchemaV1;
export type SkillTargetsPutRequest = z.infer<typeof SkillTargetsPutRequestSchema>;
+/**
+ * What a folder LINK would do, computed without writing. `moves` land in the
+ * target; `drops` are same-hash duplicates and `removes` are entries no move
+ * covers (a harness's own dot-entries, `.git`) — both disappear with the
+ * folder. `replaces` are the deletions on the OTHER side: live per-skill
+ * delivery links in the target that a move overwrites, so those skills stop
+ * following the root they came from. A non-empty `conflicts` or `strays` means
+ * the link would refuse.
+ */
+export const SkillFolderLinkPreviewSchema = z
+ .object({
+ moves: z.array(z.string()),
+ drops: z.array(z.string()),
+ removes: z.array(z.string()),
+ // Deletions in the TARGET: per-skill delivery links the merge overwrites.
+ replaces: z.array(z.string()),
+ conflicts: z.array(z.string()),
+ strays: z.array(z.string()),
+ })
+ .strict();
+export type SkillFolderLinkPreview = z.infer<typeof SkillFolderLinkPreviewSchema>;
+
/**
* Success body for `PUT /api/skill-targets`. `reprojected` lists each managed
* skill and the hosts it now lives in; `bundleHosts` is where OK's shipped
@@ -1329,6 +1378,8 @@ export const SkillTargetsPutSuccessSchema = z
})
.strict()
.optional(),
+ /** Merge plan (present when the request asked for `preview`). Nothing was written. */
+ preview: SkillFolderLinkPreviewSchema.optional(),
})
.strict() satisfies StandardSchemaV1;
export type SkillTargetsPutSuccess = z.infer<typeof SkillTargetsPutSuccessSchema>;
diff --git a/packages/server/src/api-extension.ts b/packages/server/src/api-extension.ts
index f180913d9..f92070a59 100644
--- a/packages/server/src/api-extension.ts
+++ b/packages/server/src/api-extension.ts
@@ -718,6 +718,7 @@ import {
import { createSingleFlight } from './single-flight.ts';
import {
linkEditorSkillFolder,
+ previewEditorFolderLink,
scanSkillFolderStates,
unlinkEditorSkillFolder,
} from './skill-folder-links.ts';
@@ -18860,6 +18861,40 @@ export function createApiExtension(
);
return;
}
+ // PREVIEW: classify the merge and return it, writing nothing — the
+ // Folders surface discloses what a link moves and deletes before it
+ // asks for it. No receipt, no change signal: nothing changed.
+ if (fa.action === 'link' && fa.preview) {
+ const p = previewEditorFolderLink({
+ base,
+ folderRel: fa.root,
+ targetRootRel: target,
+ });
+ const plan = p.kind === 'plan' ? p.plan : null;
+ successResponse(
+ res,
+ 200,
+ SkillTargetsPutSuccessSchema,
+ {
+ targets: resolveSkillTargets(projectDir ?? ''),
+ reprojected: [],
+ bundleHosts: [],
+ removedFrom: [],
+ preview: {
+ moves: plan
+ ? [...plan.linkedBundlesToMove.map(({ name }) => name), ...plan.toMove]
+ : [],
+ drops: plan?.toDrop ?? [],
+ removes: plan?.removes ?? [],
+ replaces: plan?.liveDestLinks ?? [],
+ conflicts: p.kind === 'conflicts' ? p.conflicts : [],
+ strays: p.kind === 'stray-entries' ? p.strays : [],
+ },
+ },
+ { handler: 'skill-targets-put' },
+ );
+ return;
+ }
const result =
fa.action === 'link'
? linkEditorSkillFolder({ base, folderRel: fa.root, targetRootRel: target })
diff --git a/packages/server/src/mcp/tools/install.test.ts b/packages/server/src/mcp/tools/install.test.ts
index 860b6b15b..529bb5303 100644
--- a/packages/server/src/mcp/tools/install.test.ts
+++ b/packages/server/src/mcp/tools/install.test.ts
@@ -37,6 +37,31 @@ function captureInstall(serverUrl: string): Handler {
return handler;
}
+/** The `inputSchema` the tool registers — what the MCP SDK validates a caller's
+ * args against before the handler ever runs. `captureInstall` keeps only the
+ * handler, so schema-level contracts have to be read from here. */
+function registeredInstallInputSchema(): Record<
+ string,
+ { safeParse: (v: unknown) => { success: boolean } }
+> {
+ let cfg: { inputSchema?: unknown } | undefined;
+ const server = {
+ registerTool(_name: string, c: { inputSchema?: unknown }, _h: Handler) {
+ cfg = c;
+ },
+ } as unknown as ServerInstance;
+ registerInstall(server, {
+ serverUrl: 'http://localhost:1234',
+ config: BASE_CONFIG,
+ resolveCwd: async () => process.cwd(),
+ });
+ const schema = cfg?.inputSchema as
+ | Record<string, { safeParse: (v: unknown) => { success: boolean } }>
+ | undefined;
+ if (!schema) throw new Error('tool registered no inputSchema');
+ return schema;
+}
+
const text = (r: ToolResult) => r.content.map((c) => c.text).join('\n');
let originalFetch: typeof fetch;
@@ -190,6 +215,20 @@ describe('skillFolders — folder topology, moved off the read-only `config` too
expect(text(res)).toContain('dropped 1 duplicate(s)');
});
+ // The HTTP surface takes `preview` to classify a merge without running it.
+ // This surface summarizes from the response's `folder`, which a preview
+ // never carries — so accepting the flag would print a completed-link receipt
+ // for an operation that never ran. Asserted against the schema the tool
+ // REGISTERS (what the SDK validates against before the handler is reached),
+ // not the handler, which the harness below calls directly.
+ test('the registered skillFolders schema refuses a link carrying preview', () => {
+ const schema = registeredInstallInputSchema().skillFolders;
+ const link = { action: 'link', scope: 'project', root: '.cursor/skills', target: '.a/skills' };
+
+ expect(schema.safeParse(link).success).toBe(true);
+ expect(schema.safeParse({ ...link, preview: true }).success).toBe(false);
+ });
+
test('reports an unlink verb as reversible, not as a removal', async () => {
stubOk({ folder: { moved: [], dropped: [], linked: [] } });
const install = captureInstall('http://localhost:1234');
diff --git a/packages/server/src/mcp/tools/install.ts b/packages/server/src/mcp/tools/install.ts
index 145842481..5687b3acd 100644
--- a/packages/server/src/mcp/tools/install.ts
+++ b/packages/server/src/mcp/tools/install.ts
@@ -12,8 +12,8 @@
*/
import {
SKILL_INSTALL_WARNING_CODES,
- type SkillFolderAction,
- SkillFolderActionSchema,
+ type SkillFolderActionMcp,
+ SkillFolderActionMcpSchema,
type SkillLocationId,
SkillLocationIdSchema,
type SkillScope,
@@ -67,7 +67,7 @@ const DESCRIPTION = [
*/
async function runSkillFolderAction(
deps: InstallDeps,
- action: SkillFolderAction,
+ action: SkillFolderActionMcp,
cwd: string | undefined,
): Promise<ReturnType<typeof textResult>> {
const context = await requireProjectServer(deps.resolveCwd, deps.config, deps.serverUrl, cwd);
@@ -110,7 +110,7 @@ export function register(server: ServerInstance, deps: InstallDeps): void {
.string()
.optional()
.describe(`${SKILL_NAME_DESCRIBE} Required unless \`skillFolders\` is given.`),
- skillFolders: SkillFolderActionSchema.optional().describe(
+ skillFolders: SkillFolderActionMcpSchema.optional().describe(
'Folder-level skill-topology verb (link / unlink / add-root). Lives here rather than on `config` so that `config` stays a pure read and hosts can auto-approve it. Run alone, without `name`.',
),
add: z
@@ -188,7 +188,7 @@ export function register(server: ServerInstance, deps: InstallDeps): void {
},
async (args: {
name?: string;
- skillFolders?: SkillFolderAction;
+ skillFolders?: SkillFolderActionMcp;
add?: SkillLocationId[];
remove?: SkillLocationId[];
convert?: SkillLocationId[];
diff --git a/packages/server/src/skill-folder-links.test.ts b/packages/server/src/skill-folder-links.test.ts
index 6656e87ea..e72be5de1 100644
--- a/packages/server/src/skill-folder-links.test.ts
+++ b/packages/server/src/skill-folder-links.test.ts
@@ -3,6 +3,7 @@ import {
lstatSync,
mkdirSync,
mkdtempSync,
+ readdirSync,
readFileSync,
realpathSync,
rmSync,
@@ -12,7 +13,11 @@ import {
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { afterEach, beforeEach, describe, expect, test } from 'vitest';
-import { linkEditorSkillFolder, unlinkEditorSkillFolder } from './skill-folder-links.ts';
+import {
+ linkEditorSkillFolder,
+ previewEditorFolderLink,
+ unlinkEditorSkillFolder,
+} from './skill-folder-links.ts';
function writeSkill(root: string, rel: string, body: string): void {
const dir = join(root, rel);
@@ -181,6 +186,201 @@ describe('linkEditorSkillFolder (merge-then-swap)', () => {
});
});
+describe('previewEditorFolderLink (what a LINK would do)', () => {
+ /** Every path under `dir`, with symlinks reported as links (not followed). */
+ function tree(dir: string): string[] {
+ const out: string[] = [];
+ const walk = (rel: string): void => {
+ for (const e of readdirSync(join(dir, rel), { withFileTypes: true }).sort((a, b) =>
+ a.name.localeCompare(b.name),
+ )) {
+ const p = rel === '' ? e.name : `${rel}/${e.name}`;
+ if (e.isSymbolicLink()) {
+ out.push(`L ${p}`);
+ continue;
+ }
+ out.push(`${e.isDirectory() ? 'D' : 'F'} ${p}`);
+ if (e.isDirectory()) walk(p);
+ }
+ };
+ walk('');
+ return out;
+ }
+
+ test('classifies exactly what the link then does, and writes nothing', () => {
+ writeSkill(base, '.codex/skills/only-here', '# A');
+ writeSkill(base, '.codex/skills/both', '# Same');
+ writeSkill(base, '.agents/skills/both', '# Same');
+
+ const before = tree(base);
+ const p = previewEditorFolderLink({
+ base,
+ folderRel: '.codex/skills',
+ targetRootRel: '.agents/skills',
+ });
+ expect(tree(base)).toEqual(before);
+ expect(p.kind).toBe('plan');
+ if (p.kind !== 'plan') return;
+ expect(p.plan.toMove).toEqual(['only-here']);
+ expect(p.plan.toDrop).toEqual(['both']);
+ expect(p.plan.removes).toEqual([]);
+
+ const r = linkEditorSkillFolder({
+ base,
+ folderRel: '.codex/skills',
+ targetRootRel: '.agents/skills',
+ });
+ expect(r.ok).toBe(true);
+ if (!r.ok) return;
+ expect(r.moved).toEqual(p.plan.toMove);
+ expect(r.dropped).toEqual(p.plan.toDrop);
+ });
+
+ test("names the harness dot-entries the link destroys — they're never moved", () => {
+ mkdirSync(join(base, '.codex/skills/foo'), { recursive: true });
+ writeFileSync(join(base, '.codex/skills/foo/SKILL.md'), '# foo');
+ mkdirSync(join(base, '.codex/skills/.system/imagegen'), { recursive: true });
+ writeFileSync(join(base, '.codex/skills/.system/imagegen/SKILL.md'), '# vendor');
+ // Benign OS noise stays out of the disclosure — nobody needs consent to
+ // lose a `.DS_Store`.
+ writeFileSync(join(base, '.codex/skills/.DS_Store'), 'noise');
+
+ const p = previewEditorFolderLink({
+ base,
+ folderRel: '.codex/skills',
+ targetRootRel: '.agents/skills',
+ });
+ expect(p.kind).toBe('plan');
+ if (p.kind !== 'plan') return;
+ expect(p.plan.removes).toEqual(['.system']);
+
+ linkEditorSkillFolder({ base, folderRel: '.codex/skills', targetRootRel: '.agents/skills' });
+ expect(existsSync(join(base, '.agents/skills/.system'))).toBe(false);
+ });
+
+ test('a per-skill delivery link counts as a move, not a silent drop', () => {
+ writeSkill(base, '.ok/skills/foreign', '# Canonical');
+ mkdirSync(join(base, '.codex', 'skills'), { recursive: true });
+ symlinkSync(join(base, '.ok/skills/foreign'), join(base, '.codex/skills/foreign'), 'dir');
+
+ const p = previewEditorFolderLink({
+ base,
+ folderRel: '.codex/skills',
+ targetRootRel: '.agents/skills',
+ });
+ expect(p.kind).toBe('plan');
+ if (p.kind !== 'plan') return;
+ // The disclosure folds both lists into one "moves" — a linked bundle that
+ // fell out of the plan would under-report what the link touches.
+ expect(p.plan.linkedBundlesToMove.map(({ name }) => name)).toEqual(['foreign']);
+ expect(p.plan.toMove).toEqual([]);
+
+ const r = linkEditorSkillFolder({
+ base,
+ folderRel: '.codex/skills',
+ targetRootRel: '.agents/skills',
+ });
+ expect(r.ok).toBe(true);
+ if (!r.ok) return;
+ expect(r.moved).toEqual(['foreign']);
+ });
+
+ test('a skills folder that is its own git repo discloses the .git it will destroy', () => {
+ writeSkill(base, '.codex/skills/foo', '# foo');
+ mkdirSync(join(base, '.codex/skills/.git/objects'), { recursive: true });
+ writeFileSync(join(base, '.codex/skills/.git/HEAD'), 'ref: refs/heads/main');
+ // Sibling git dotfiles are recoverable noise and stay silent.
+ writeFileSync(join(base, '.codex/skills/.gitignore'), 'node_modules');
+
+ const p = previewEditorFolderLink({
+ base,
+ folderRel: '.codex/skills',
+ targetRootRel: '.agents/skills',
+ });
+ expect(p.kind).toBe('plan');
+ if (p.kind !== 'plan') return;
+ expect(p.plan.removes).toEqual(['.git']);
+
+ linkEditorSkillFolder({ base, folderRel: '.codex/skills', targetRootRel: '.agents/skills' });
+ // The disclosure has to match what actually happens: the history is gone.
+ expect(existsSync(join(base, '.agents/skills/.git'))).toBe(false);
+ });
+
+ test('a live delivery link in the TARGET that the merge overwrites is disclosed', () => {
+ writeSkill(base, '.ok/skills/shared', '# Delivered');
+ writeSkill(base, '.codex/skills/shared', '# Codex own copy');
+ mkdirSync(join(base, '.agents', 'skills'), { recursive: true });
+ // `.agents/skills/shared` follows `.ok/skills/shared` — exactly what
+ // unlinkEditorSkillFolder materializes.
+ symlinkSync(join(base, '.ok/skills/shared'), join(base, '.agents/skills/shared'), 'dir');
+
+ const p = previewEditorFolderLink({
+ base,
+ folderRel: '.codex/skills',
+ targetRootRel: '.agents/skills',
+ });
+ expect(p.kind).toBe('plan');
+ if (p.kind !== 'plan') return;
+ expect(p.plan.liveDestLinks).toEqual(['shared']);
+ expect(p.plan.toMove).toEqual(['shared']);
+
+ linkEditorSkillFolder({ base, folderRel: '.codex/skills', targetRootRel: '.agents/skills' });
+ // The delivery is gone: the target now holds codex's real copy, and
+ // `.ok/skills/shared` no longer reaches it.
+ expect(lstatSync(join(base, '.agents/skills/shared')).isSymbolicLink()).toBe(false);
+ expect(readFileSync(join(base, '.agents/skills/shared/SKILL.md'), 'utf-8')).toContain(
+ '# Codex own copy',
+ );
+ expect(readFileSync(join(base, '.ok/skills/shared/SKILL.md'), 'utf-8')).toContain(
+ '# Delivered',
+ );
+ });
+
+ test('a DANGLING delivery link in the target is cleanup, not a disclosure', () => {
+ writeSkill(base, '.codex/skills/mover', '# Bytes');
+ mkdirSync(join(base, '.agents', 'skills'), { recursive: true });
+ symlinkSync(join(base, 'gone-away'), join(base, '.agents/skills/mover'), 'dir');
+
+ const p = previewEditorFolderLink({
+ base,
+ folderRel: '.codex/skills',
+ targetRootRel: '.agents/skills',
+ });
+ expect(p.kind).toBe('plan');
+ if (p.kind !== 'plan') return;
+ // Still removed before the rename, but it pointed at nothing — nobody
+ // needs to consent to losing it.
+ expect(p.plan.destLinks).toEqual(['mover']);
+ expect(p.plan.liveDestLinks).toEqual([]);
+ });
+
+ test('reports the conflicts that would abort, without writing', () => {
+ writeSkill(base, '.codex/skills/fork', '# Mine');
+ writeSkill(base, '.agents/skills/fork', '# Theirs DIFFERENT');
+
+ const before = tree(base);
+ const p = previewEditorFolderLink({
+ base,
+ folderRel: '.codex/skills',
+ targetRootRel: '.agents/skills',
+ });
+ expect(tree(base)).toEqual(before);
+ expect(p.kind).toBe('conflicts');
+ if (p.kind !== 'conflicts') return;
+ expect(p.conflicts).toEqual(['fork']);
+ });
+
+ test('an absent folder has nothing to disclose', () => {
+ const p = previewEditorFolderLink({
+ base,
+ folderRel: '.cursor/skills',
+ targetRootRel: '.agents/skills',
+ });
+ expect(p.kind).toBe('absent');
+ expect(existsSync(join(base, '.cursor'))).toBe(false);
+ });
+});
+
describe('unlinkEditorSkillFolder (materialize as per-skill links)', () => {
test('replaces the folder link with a real dir of per-skill symlinks', () => {
writeSkill(base, '.agents/skills/one', '# 1');
diff --git a/packages/server/src/skill-folder-links.ts b/packages/server/src/skill-folder-links.ts
index fc72622d1..cfe4b0a73 100644
--- a/packages/server/src/skill-folder-links.ts
+++ b/packages/server/src/skill-folder-links.ts
@@ -92,21 +92,28 @@ export type FolderLinkResult =
* into any browsed directory, so treating every dotfile as a stray would
* permanently block LINK for a developer who opened `.claude/skills/` in
* Finder. These are ignored (neither bundle nor stray); other dotfiles stay
- * strays so genuinely unexpected hidden content still trips the guard. */
+ * strays so genuinely unexpected hidden content still trips the guard.
+ *
+ * `.git` is deliberately NOT here. A link deletes the folder it consumes, so
+ * a skills folder that is itself a clone loses its history — the one loss in
+ * this set that can't be undone. Leaving it out routes it through the
+ * dot-entry branch below, where it gets disclosed before the write. */
const BENIGN_DOTFILES = new Set([
'.DS_Store',
'.localized',
'Thumbs.db',
- '.git',
'.gitignore',
'.gitkeep',
'.gitattributes',
]);
-/** Bundle dir names (entries containing a SKILL.md) directly under `root`. */
-function bundleNames(rootAbs: string): { bundles: string[]; strays: string[] } {
+/** Bundle dir names (entries containing a SKILL.md) directly under `root`.
+ * `ignored` are the entries a LINK neither moves nor treats as strays — they
+ * go away with the folder, so callers can disclose that before writing. */
+function bundleNames(rootAbs: string): { bundles: string[]; strays: string[]; ignored: string[] } {
const bundles: string[] = [];
const strays: string[] = [];
+ const ignored: string[] = [];
for (const e of readdirSync(rootAbs, { withFileTypes: true })) {
if (BENIGN_DOTFILES.has(e.name)) continue;
// A skill dir name can't begin with a dot, so a dot-entry here is the
@@ -114,7 +121,10 @@ function bundleNames(rootAbs: string): { bundles: string[]; strays: string[] } {
// skills under `.system`. Treating those as strays meant a harness that
// writes anything beside your skills could never have its folder linked,
// which is not a state the user can clean up.
- if (e.name.startsWith('.')) continue;
+ if (e.name.startsWith('.')) {
+ ignored.push(e.name);
+ continue;
+ }
const p = join(rootAbs, e.name);
if (existsSync(join(p, 'SKILL.md'))) {
bundles.push(e.name);
@@ -126,7 +136,7 @@ function bundleNames(rootAbs: string): { bundles: string[]; strays: string[] } {
if (e.isDirectory() && isEmptyDir(p)) continue;
strays.push(e.name);
}
- return { bundles, strays };
+ return { bundles, strays, ignored };
}
/** True when `dirAbs` has no entries. Unreadable counts as non-empty: a folder
@@ -139,15 +149,38 @@ function isEmptyDir(dirAbs: string): boolean {
}
}
+/** What a LINK would do. `toDrop` and `removes` are deletions from the folder
+ * being consumed; `removes` are the entries no bundle move covers — they go
+ * away when the folder is replaced by the symlink. `liveDestLinks` is the one
+ * deletion on the OTHER side: a per-skill delivery link in the target that the
+ * merge overwrites, so that skill stops following the root it came from. */
+interface FolderLinkPlan {
+ toMove: string[];
+ toDrop: string[];
+ destLinks: string[];
+ liveDestLinks: string[];
+ linkedBundlesToMove: Array<{ name: string; target: string }>;
+ removes: string[];
+}
+
+export type FolderLinkPreview =
+ | { kind: 'plan'; plan: FolderLinkPlan }
+ /** Nothing to merge — the link is a bare symlink creation. */
+ | { kind: 'absent' }
+ | { kind: 'not-linkable' }
+ | { kind: 'stray-entries'; strays: string[] }
+ | { kind: 'conflicts'; conflicts: string[] };
+
/**
- * Merge-then-swap: `folderRel` (an editor's own skills folder under `base`)
- * merges into `targetRootRel` and becomes a symlink to it.
+ * Classify what `linkEditorSkillFolder` would do, WITHOUT writing anything.
+ * The link runs this first and applies the plan, so a caller can disclose the
+ * exact moves and deletions before asking for them.
*/
-export function linkEditorSkillFolder(opts: {
+export function previewEditorFolderLink(opts: {
base: string;
folderRel: string;
targetRootRel: string;
-}): FolderLinkResult {
+}): FolderLinkPreview {
const { base, folderRel, targetRootRel } = opts;
const folderAbs = join(base, folderRel);
const targetAbs = join(base, targetRootRel);
@@ -155,27 +188,23 @@ export function linkEditorSkillFolder(opts: {
try {
st = lstatSync(folderAbs);
} catch {
- // Absent folder: nothing to merge — create the link directly.
- tracedMkdirSync(dirname(folderAbs), { recursive: true });
- tracedMkdirSync(targetAbs, { recursive: true });
- tracedSymlinkSync(relative(dirname(folderAbs), targetAbs), folderAbs, 'dir');
- return { ok: true, moved: [], dropped: [], linked: [folderRel] };
+ return { kind: 'absent' };
}
- if (st.isSymbolicLink()) return { ok: false, reason: 'not-linkable' }; // already a link
- if (!st.isDirectory()) return { ok: false, reason: 'not-linkable' };
+ if (st.isSymbolicLink()) return { kind: 'not-linkable' }; // already a link
+ if (!st.isDirectory()) return { kind: 'not-linkable' };
try {
- if (realpathSync(folderAbs) === realpathSync(targetAbs))
- return { ok: false, reason: 'not-linkable' }; // same physical dir (parent alias)
+ if (realpathSync(folderAbs) === realpathSync(targetAbs)) return { kind: 'not-linkable' }; // same physical dir (parent alias)
} catch {
- // target absent — created below
+ // target absent — created by the link
}
- const { bundles, strays } = bundleNames(folderAbs);
- if (strays.length > 0) return { ok: false, reason: 'stray-entries', strays };
- // Pass 1 — classify EVERYTHING before touching anything (abort must be a no-op).
+ const { bundles, strays, ignored } = bundleNames(folderAbs);
+ if (strays.length > 0) return { kind: 'stray-entries', strays };
+ // Classify EVERYTHING before touching anything (abort must be a no-op).
const conflicts: string[] = [];
const toMove: string[] = [];
const toDrop: string[] = [];
const destLinks: string[] = [];
+ const liveDestLinks: string[] = [];
const linkedBundlesToMove: Array<{ name: string; target: string }> = [];
for (const name of bundles) {
const ownDir = join(folderAbs, name);
@@ -211,6 +240,10 @@ export function linkEditorSkillFolder(opts: {
}
if (destIsLink) {
destLinks.push(name);
+ // A link that still RESOLVES is a working delivery this merge overwrites
+ // — the one thing a link destroys outside the folder it consumes, so it
+ // needs saying. A dangling one points at nothing and is pure cleanup.
+ if (existsSync(destDir)) liveDestLinks.push(name);
toMove.push(name);
continue;
}
@@ -223,8 +256,40 @@ export function linkEditorSkillFolder(opts: {
if (ownHash !== undefined && ownHash === destHash) toDrop.push(name);
else conflicts.push(name);
}
- if (conflicts.length > 0) return { ok: false, reason: 'conflicts', conflicts };
- // Pass 2 — apply. Each move is a complete per-bundle rename, so a failure
+ if (conflicts.length > 0) return { kind: 'conflicts', conflicts };
+ return {
+ kind: 'plan',
+ plan: { toMove, toDrop, destLinks, liveDestLinks, linkedBundlesToMove, removes: ignored },
+ };
+}
+
+/**
+ * Merge-then-swap: `folderRel` (an editor's own skills folder under `base`)
+ * merges into `targetRootRel` and becomes a symlink to it.
+ */
+export function linkEditorSkillFolder(opts: {
+ base: string;
+ folderRel: string;
+ targetRootRel: string;
+}): FolderLinkResult {
+ const { base, folderRel, targetRootRel } = opts;
+ const folderAbs = join(base, folderRel);
+ const targetAbs = join(base, targetRootRel);
+ const preview = previewEditorFolderLink({ base, folderRel, targetRootRel });
+ if (preview.kind === 'absent') {
+ // Absent folder: nothing to merge — create the link directly.
+ tracedMkdirSync(dirname(folderAbs), { recursive: true });
+ tracedMkdirSync(targetAbs, { recursive: true });
+ tracedSymlinkSync(relative(dirname(folderAbs), targetAbs), folderAbs, 'dir');
+ return { ok: true, moved: [], dropped: [], linked: [folderRel] };
+ }
+ if (preview.kind === 'not-linkable') return { ok: false, reason: 'not-linkable' };
+ if (preview.kind === 'stray-entries')
+ return { ok: false, reason: 'stray-entries', strays: preview.strays };
+ if (preview.kind === 'conflicts')
+ return { ok: false, reason: 'conflicts', conflicts: preview.conflicts };
+ const { toMove, toDrop, destLinks, linkedBundlesToMove } = preview.plan;
+ // Apply. Each move is a complete per-bundle rename, so a failure
// midway leaves a RESUMABLE half-merge (already-moved bundles classify as
// same-hash/absent on the next run) — report it structurally, never a bare
// throw: the caller tells the user to re-run the link.