This commit is contained in:
Timothy Jaeryang Baek 2026-10-14 23:09:31 +04:00
parent c0f56767f5
commit 97b7ed73c8
66 changed files with 181 additions and 5 deletions

View file

@ -23,6 +23,7 @@
} from './diffEditorAlignment';
import {
copyChunk,
keepBothChunk,
selectedChunk,
chunkOverview,
changedLineCounts,
@ -65,6 +66,7 @@
let comparing = false;
let merge: MergeView | null = null;
let activeChunk = 0;
let canKeepBoth = false;
let overview: ReturnType<typeof chunkOverview> = [];
let chunkCount = 0;
let lineNumberDigits = 1;
@ -101,6 +103,7 @@
proposal = session.proposal;
comparing = proposedContent !== undefined;
activeChunk = chunkCount = 0;
canKeepBoth = false;
overview = [];
lineChanges = { removed: 0, added: 0 };
copied = null;
@ -200,6 +203,11 @@
if (index >= 0) activeChunk = index;
}
activeChunk = Math.max(0, Math.min(activeChunk, chunkCount - 1));
const chunk = merge.chunks[activeChunk];
canKeepBoth =
session?.mode === 'edit' &&
!!chunk &&
keepBothChunk(merge.a.state.doc, merge.b.state.doc, chunk) !== null;
};
const reveal = (index: number) => {
if (!merge || !chunkCount) return;
@ -215,6 +223,7 @@
effects: EditorView.scrollIntoView(position, { y: 'center' })
});
}
refresh();
};
const navigateOverview = (event: MouseEvent) => {
const bounds =
@ -253,6 +262,21 @@
refresh();
};
const keepBoth = () => {
if (session?.mode !== 'edit' || loading || !merge) return;
const chunk = merge.chunks[activeChunk];
if (!chunk) return;
const changes = keepBothChunk(merge.a.state.doc, merge.b.state.doc, chunk);
if (!changes) return;
merge.b.dispatch({
changes,
annotations: isolateHistory.of('full'),
userEvent: 'input.merge'
});
refresh();
merge.b.focus();
};
const mountMerge = (node: HTMLElement) => {
let disposed = false;
let view: MergeView | null = null;
@ -403,7 +427,7 @@
>
<!-- svelte-ignore a11y-no-static-element-interactions -->
<div class="diff-editor flex h-full min-h-0 flex-col text-xs" on:keydown|capture={preventSave}>
<header class="flex shrink-0 flex-wrap items-center gap-3 px-5 pt-4 pb-2">
<header class="flex shrink-0 flex-wrap items-center gap-2 px-5 pt-4 pb-2">
<div class="min-w-0 flex-1">
<Tooltip content={session.path ?? ''} allowHTML={false} className="min-w-0">
<h2 class="truncate font-medium">{session.title || $i18n.t('Compare revision')}</h2>
@ -415,7 +439,7 @@
>
{/if}
{#if comparing}
<div class="comparison-controls flex flex-wrap items-center gap-3">
<div class="comparison-controls flex flex-wrap items-center gap-1.5">
<div class="mr-1 flex items-center gap-1.5">
<span class="whitespace-nowrap text-gray-500" role="status" aria-live="polite"
>{loading
@ -469,6 +493,13 @@
title={$i18n.t('Copy change to proposal')}
on:click={() => copy('to-proposal')}>{$i18n.t('Proposed revision')} →</button
>
<button
type="button"
class="secondary"
disabled={loading || !canKeepBoth}
title={$i18n.t('Keep both versions in the proposed revision, original first.')}
on:click={keepBoth}>{$i18n.t('Keep both')}</button
>
{:else}
<button type="button" class="secondary" disabled={loading} on:click={swap}
>{$i18n.t('Swap sides')}</button
@ -710,13 +741,14 @@
.secondary,
.primary {
display: inline-flex;
height: 1.75rem;
height: 1.5rem;
min-width: 1.5rem;
flex-shrink: 0;
align-items: center;
justify-content: center;
gap: 0.375rem;
border-radius: 0.5rem;
padding: 0 0.625rem;
border-radius: 0.375rem;
padding: 0 0.5rem;
font-size: 0.75rem;
font-weight: 400;
transition:

View file

@ -67,6 +67,22 @@ export function copyChunk(a: Text, b: Text, chunk: Chunk, direction: MergeDirect
return { from, to: Math.min(to, destination.length), insert };
}
export function keepBothChunk(a: Text, b: Text, chunk: Chunk): ChangeSpec | null {
// A line-aligned chunk can include text on both sides even for a pure EOF insertion.
if (
!chunk.changes.some((change) => change.fromA < change.toA) ||
!chunk.changes.some((change) => change.fromB < change.toB)
)
return null;
const original = a.sliceString(chunk.fromA, Math.min(chunk.toA, a.length));
const proposed = b.sliceString(chunk.fromB, Math.min(chunk.toB, b.length));
return {
from: chunk.fromB,
to: Math.min(chunk.toB, b.length),
insert: original + (original.endsWith('\n') ? '' : '\n') + proposed
};
}
export function selectedChunk(chunks: readonly Chunk[], side: 'a' | 'b', position: number) {
return chunks.findIndex((chunk) => {
const from = side === 'a' ? chunk.fromA : chunk.fromB;

View file

@ -1502,6 +1502,8 @@
"JSON Spec": "المواصفات بصيغة JSON",
"July": "يوليو",
"June": "يونيو",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "الاحتفاظ بعنوان URL الحالي لخطاف الويب",
"Keep in Sidebar": "إبقاء في الشريط الجانبي",
"Keep tools listed even while your shell is closed.": "إبقاء الأدوات مدرجة حتى أثناء إغلاق الطرفية.",

View file

@ -1502,6 +1502,8 @@
"JSON Spec": "المواصفات بصيغة JSON",
"July": "يوليو",
"June": "يونيو",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "الاحتفاظ بعنوان URL الحالي لخطاف الويب",
"Keep in Sidebar": "إبقاء في الشريط الجانبي",
"Keep tools listed even while your shell is closed.": "إبقاء الأدوات مدرجة حتى أثناء إغلاق الطرفية.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "JSON Spesifikasiyası",
"July": "İyul",
"June": "İyun",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Cari Webhook URL-ini saxla",
"Keep in Sidebar": "Yan paneldə saxla",
"Keep tools listed even while your shell is closed.": "Əmr qabığı bağlı olduqda belə alətləri siyahıda saxlayın.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "JSON спецификация",
"July": "Юли",
"June": "Юни",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Запазване на текущия URL адрес на уебкуката",
"Keep in Sidebar": "Запазване в страничната лента",
"Keep tools listed even while your shell is closed.": "Инструментите остават в списъка, дори когато командната обвивка е затворена.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "JSON স্পেসিফিকেশন",
"July": "জুলাই",
"June": "জুন",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "বর্তমান ওয়েবহুক URL রাখুন",
"Keep in Sidebar": "সাইডবারে রাখুন",
"Keep tools listed even while your shell is closed.": "শেল বন্ধ থাকলেও টুলগুলো তালিকায় রাখুন।",

View file

@ -1437,6 +1437,8 @@
"JSON Spec": "JSON ཚད་གཞི།",
"July": "ཟླ་བ་བདུན་པ།",
"June": "ཟླ་བ་དྲུག་པ།",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "ད་ལྟའི་ webhook URL ཉར་བ།",
"Keep in Sidebar": "གཞོགས་སྡེར་ཉར་བ།",
"Keep tools listed even while your shell is closed.": "ཁྱེད་ཀྱི་བཀའ་བརྡའི་འགྲེལ་བཤད་ཆས་ཁ་བརྒྱབ་ཡོད་སྐབས་ཀྱང་ལག་ཆ་ཐོ་ནང་འཇོག་པ།",

View file

@ -1463,6 +1463,8 @@
"JSON Spec": "JSON specifikacija",
"July": "Juli",
"June": "Juni",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Zadrži trenutni URL webhooka",
"Keep in Sidebar": "Zadrži na bočnoj traci",
"Keep tools listed even while your shell is closed.": "Alati ostaju navedeni čak i dok je vaša komandna ljuska zatvorena.",

View file

@ -1463,6 +1463,8 @@
"JSON Spec": "Especificacions del JSON",
"July": "Juliol",
"June": "Juny",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Mantenir l'URL actual del webhook",
"Keep in Sidebar": "Mantenir a la barra lateral",
"Keep tools listed even while your shell is closed.": "",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "Espesipikasyon sa JSON",
"July": "Hulyo",
"June": "Hunyo",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Hupti ang kasamtangang URL sa webhook",
"Keep in Sidebar": "Hupti sa sidebar",
"Keep tools listed even while your shell is closed.": "Ipadayon ang paglista sa mga himan bisan kon sirado ang imong tighubad sa mga sugo.",

View file

@ -1476,6 +1476,8 @@
"JSON Spec": "Specifikace JSON",
"July": "Červenec",
"June": "Červen",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Zachovat aktuální URL webhooku",
"Keep in Sidebar": "Ponechat v postranním panelu",
"Keep tools listed even while your shell is closed.": "Ponechat nástroje v seznamu, i když je váš příkazový interpret zavřený.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "JSON spec",
"July": "Juli",
"June": "Juni",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Behold den aktuelle webhook-URL",
"Keep in Sidebar": "Behold i sidebaren",
"Keep tools listed even while your shell is closed.": "Bevar værktøjer på listen, selv når din kommandofortolker er lukket.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "JSON-Spezifikation",
"July": "Juli",
"June": "Juni",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Aktuelle Webhook-URL beibehalten",
"Keep in Sidebar": "In Seitenleiste anzeigen",
"Keep tools listed even while your shell is closed.": "Behält Werkzeuge in der Liste, auch wenn Ihre Shell geschlossen ist.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "Such JSON Spec",
"July": "July",
"June": "June",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Keep such current webhook URL",
"Keep in Sidebar": "Keep in Sidebar",
"Keep tools listed even while your shell is closed.": "Keep tools listed even while such shell is closed. So handy.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "Προδιαγραφή JSON",
"July": "Ιούλιος",
"June": "Ιούνιος",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Διατήρηση τρέχοντος URL webhook",
"Keep in Sidebar": "Κρατήστε στην πλευρική μπάρα",
"Keep tools listed even while your shell is closed.": "Τα εργαλεία παραμένουν στη λίστα ακόμη και όταν το κέλυφός σας είναι κλειστό.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "",
"July": "",
"June": "",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "",
"Keep in Sidebar": "",
"Keep tools listed even while your shell is closed.": "",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "",
"July": "",
"June": "",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "",
"Keep in Sidebar": "",
"Keep tools listed even while your shell is closed.": "",

View file

@ -1463,6 +1463,8 @@
"JSON Spec": "Especif. JSON",
"July": "Julio",
"June": "Junio",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Mantener la URL actual del webhook",
"Keep in Sidebar": "Mantener en Barra Lateral",
"Keep tools listed even while your shell is closed.": "Mantiene las herramientas en la lista incluso mientras tu intérprete de comandos está cerrado.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "JSON spetsifikatsioon",
"July": "Juuli",
"June": "Juuni",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Säilitage praegune webhook'i URL",
"Keep in Sidebar": "Hoia külgribal",
"Keep tools listed even while your shell is closed.": "Tööriistad jäävad loendisse ka siis, kui kest on suletud.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "JSON espezifikazioa",
"July": "Uztaila",
"June": "Ekaina",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Mantendu uneko webhook URLa",
"Keep in Sidebar": "Mantendu alboko barran",
"Keep tools listed even while your shell is closed.": "Mantendu tresnak zerrendan, komando-interpretea itxita dagoenean ere.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "مشخصات JSON",
"July": "ژوئیه",
"June": "ژوئن",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "حفظ آدرس وب\u200cهوک فعلی",
"Keep in Sidebar": "نگه داشتن در نوار کناری",
"Keep tools listed even while your shell is closed.": "ابزارها حتی زمانی که شل شما بسته است در فهرست باقی می\u200cمانند.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "JSON Spec",
"July": "heinäkuu",
"June": "kesäkuu",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Käytä nykyistä webhook-verkko-osoitetta",
"Keep in Sidebar": "Pidä sivupalkissa",
"Keep tools listed even while your shell is closed.": "",

View file

@ -1451,6 +1451,8 @@
"JSON Spec": "JSON Spec",
"July": "Hulyo",
"June": "Hunyo",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Panatilihin ang kasalukuyang webhook URL",
"Keep in Sidebar": "Panatilihin sa Sidebar",
"Keep tools listed even while your shell is closed.": "Panatilihing nakalista ang mga tool kahit sarado ang iyong shell.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "JSON-forskrift",
"July": "juli",
"June": "juni",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Varðveit núverandi webhook-URL",
"Keep in Sidebar": "Varðveit í síðustikuni",
"Keep tools listed even while your shell is closed.": "Lat amboð vera á listanum, eisini meðan Shell hjá tær er afturlatið.",

View file

@ -1463,6 +1463,8 @@
"JSON Spec": "Spécification JSON",
"July": "Juillet",
"June": "Juin",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Conserver l'URL actuelle du webhook",
"Keep in Sidebar": "Epingler dans la barre latérale",
"Keep tools listed even while your shell is closed.": "",

View file

@ -1463,6 +1463,8 @@
"JSON Spec": "Spécification JSON",
"July": "Juillet",
"June": "Juin",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Conserver l'URL actuelle du webhook",
"Keep in Sidebar": "Epingler dans la barre latérale",
"Keep tools listed even while your shell is closed.": "",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "Especificación JSON",
"July": "Xullo",
"June": "Xuño",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Manter a URL actual do webhook",
"Keep in Sidebar": "Manter na barra lateral",
"Keep tools listed even while your shell is closed.": "Manter as ferramentas listadas mesmo cando o seu intérprete de ordes estea pechado.",

View file

@ -1463,6 +1463,8 @@
"JSON Spec": "מפרט JSON",
"July": "יולי",
"June": "יוני",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "השאר את כתובת ה-URL הנוכחית של ה-Webhook",
"Keep in Sidebar": "הצג בסרגל הצד",
"Keep tools listed even while your shell is closed.": "השארת הכלים ברשימה גם כשהמעטפת שלך סגורה.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "JSON विनिर्देश",
"July": "जुलाई",
"June": "जून",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "वर्तमान वेबहुक URL रखें",
"Keep in Sidebar": "साइडबार में रखें",
"Keep tools listed even while your shell is closed.": "आपका शेल बंद होने पर भी टूल सूची में रखें.",

View file

@ -1463,6 +1463,8 @@
"JSON Spec": "JSON specifikacija",
"July": "Srpanj",
"June": "Lipanj",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Zadrži trenutačni URL webhooka",
"Keep in Sidebar": "Zadrži na bočnoj traci",
"Keep tools listed even while your shell is closed.": "Zadrži alate na popisu i dok je vaša ljuska zatvorena.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "JSON-specifikáció",
"July": "Július",
"June": "Június",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Jelenlegi webhook URL megtartása",
"Keep in Sidebar": "Megtartás az oldalsávon",
"Keep tools listed even while your shell is closed.": "Az eszközök akkor is a listában maradnak, ha a shell be van zárva.",

View file

@ -1449,6 +1449,8 @@
"JSON Spec": "Spesifikasi JSON",
"July": "Juli",
"June": "Juni",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Pertahankan URL webhook saat ini",
"Keep in Sidebar": "Pertahankan di Bilah Sisi",
"Keep tools listed even while your shell is closed.": "Tetap cantumkan alat meskipun shell Anda ditutup.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "Sonraíocht JSON",
"July": "Iúil",
"June": "Meitheamh",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Coinnigh URL an chrúca gréasáin reatha",
"Keep in Sidebar": "Coinnigh sa Bharra Taobh",
"Keep tools listed even while your shell is closed.": "Coinnigh na huirlisí ar an liosta fiú nuair atá do bhlaosc dúnta.",

View file

@ -1463,6 +1463,8 @@
"JSON Spec": "Specifica JSON",
"July": "Luglio",
"June": "Giugno",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Mantieni l'URL del webhook attuale",
"Keep in Sidebar": "Mantieni nella barra laterale",
"Keep tools listed even while your shell is closed.": "Mantieni gli strumenti elencati anche quando la shell è chiusa.",

View file

@ -1449,6 +1449,8 @@
"JSON Spec": "JSON仕様",
"July": "7月",
"June": "6月",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "現在のウェブフックURLを保持",
"Keep in Sidebar": "サイドバーに残す",
"Keep tools listed even while your shell is closed.": "シェルが閉じている間もツールを一覧に残します。",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "JSON-ის სპეციფიკაცია",
"July": "ივლისი",
"June": "ივნისი",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "მიმდინარე ვებჰუკის URL-ის შენარჩუნება",
"Keep in Sidebar": "დატოვება გვერდით პანელზე",
"Keep tools listed even while your shell is closed.": "ხელსაწყოებს სიაში ტოვებს მაშინაც, როცა თქვენი გარსი დახურულია.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "Ilugan s JSON",
"July": "Yulyu",
"June": "Yunyu",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Eǧǧ tansa URL tamirant n webhook",
"Keep in Sidebar": "Senṭeḍ-it deg ufeggag n yidis",
"Keep tools listed even while your shell is closed.": "Eǧǧ ifecka deg tebdart ula ma yella shell-ik·im yemdel.",

View file

@ -1438,6 +1438,8 @@
"JSON Spec": "JSON 스펙",
"July": "7월",
"June": "6월",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "현재 웹훅 URL 유지",
"Keep in Sidebar": "사이드바에 유지",
"Keep tools listed even while your shell is closed.": "셸이 닫혀 있는 동안에도 도구를 목록에 유지합니다.",

View file

@ -1476,6 +1476,8 @@
"JSON Spec": "JSON specifikacija",
"July": "liepa",
"June": "birželis",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Paliekamas dabartinis webhook URL adresas",
"Keep in Sidebar": "Laikyti šoninėje juostoje",
"Keep tools listed even while your shell is closed.": "Rodyti įrankius sąraše net tada, kai jūsų apvalkalas uždarytas.",

View file

@ -1463,6 +1463,8 @@
"JSON Spec": "JSON specifikācija",
"July": "Jūlijs",
"June": "Jūnijs",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Paturēt pašreizējo webhook URL",
"Keep in Sidebar": "Saglabāt sānjoslā",
"Keep tools listed even while your shell is closed.": "Rādīt rīkus sarakstā arī tad, kad jūsu čaula ir aizvērta.",

View file

@ -1449,6 +1449,8 @@
"JSON Spec": "Spesifikasi JSON",
"July": "Julai",
"June": "Jun",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Kekalkan URL webhook semasa",
"Keep in Sidebar": "Simpan dalam Bar Sisi",
"Keep tools listed even while your shell is closed.": "Kekalkan alat dalam senarai walaupun semasa shell anda ditutup.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "JSON-spesifikasjon",
"July": "juli",
"June": "juni",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Behold nåværende webhook-URL",
"Keep in Sidebar": "Vis i sidepanelet",
"Keep tools listed even while your shell is closed.": "Behold verktøyene i listen selv når skallet ditt er lukket.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "JSON-specificatie",
"July": "juli",
"June": "juni",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Huidige webhook-URL behouden",
"Keep in Sidebar": "In zijbalk houden",
"Keep tools listed even while your shell is closed.": "Houd tools in de lijst, ook als je shell gesloten is.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "JSON ਨਿਰਧਾਰਨ",
"July": "ਜੁਲਾਈ",
"June": "ਜੂਨ",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "ਮੌਜੂਦਾ ਵੈੱਬਹੁੱਕ URL ਰੱਖੋ",
"Keep in Sidebar": "ਸਾਈਡਬਾਰ ਵਿੱਚ ਰੱਖੋ",
"Keep tools listed even while your shell is closed.": "ਤੁਹਾਡਾ ਸ਼ੈੱਲ ਬੰਦ ਹੋਣ 'ਤੇ ਵੀ ਟੂਲ ਸੂਚੀ ਵਿੱਚ ਰੱਖੋ।",

View file

@ -1476,6 +1476,8 @@
"JSON Spec": "Specyfikacja JSON",
"July": "Lipiec",
"June": "Czerwiec",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Zachowaj obecny adres URL webhooka",
"Keep in Sidebar": "Zachowaj w pasku bocznym",
"Keep tools listed even while your shell is closed.": "Pokazuj narzędzia na liście nawet wtedy, gdy powłoka jest zamknięta.",

View file

@ -1463,6 +1463,8 @@
"JSON Spec": "Especificação JSON",
"July": "Julho",
"June": "Junho",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Manter a URL atual do webhook",
"Keep in Sidebar": "Manter na barra lateral",
"Keep tools listed even while your shell is closed.": "Mantenha as ferramentas listadas mesmo com o shell fechado.",

View file

@ -1463,6 +1463,8 @@
"JSON Spec": "Especificação JSON",
"July": "Julho",
"June": "Junho",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Manter o URL do webhook atual",
"Keep in Sidebar": "Manter na Barra Lateral",
"Keep tools listed even while your shell is closed.": "",

View file

@ -1463,6 +1463,8 @@
"JSON Spec": "Specificație JSON",
"July": "Iulie",
"June": "Iunie",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Păstrează URL-ul curent al webhook-ului",
"Keep in Sidebar": "Păstrează în bara laterală",
"Keep tools listed even while your shell is closed.": "Păstrează instrumentele listate chiar și când shell-ul dumneavoastră este închis.",

View file

@ -1476,6 +1476,8 @@
"JSON Spec": "JSON-спецификация",
"July": "Июль",
"June": "Июнь",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Сохранить текущий URL вебхука",
"Keep in Sidebar": "Оставить на боковой панели",
"Keep tools listed even while your shell is closed.": "Оставлять инструменты в списке, даже когда командная строка закрыта.",

View file

@ -1476,6 +1476,8 @@
"JSON Spec": "Špecifikácia JSON",
"July": "Júl",
"June": "Jún",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Ponechať aktuálnu URL adresu webhooku",
"Keep in Sidebar": "Ponechať v bočnom paneli",
"Keep tools listed even while your shell is closed.": "Ponechať nástroje v zozname, aj keď je váš shell zatvorený.",

View file

@ -1476,6 +1476,8 @@
"JSON Spec": "JSON Spec",
"July": "julij",
"June": "junij",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Ohrani trenutni URL spletnega klica",
"Keep in Sidebar": "Obdrži v stranski vrstici",
"Keep tools listed even while your shell is closed.": "Orodja ohrani na seznamu tudi, ko je vaša lupina zaprta.",

View file

@ -1463,6 +1463,8 @@
"JSON Spec": "JSON спецификација",
"July": "Јул",
"June": "Јун",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Задржите тренутни URL вебхука",
"Keep in Sidebar": "Задржи на бочној траци",
"Keep tools listed even while your shell is closed.": "Задржава алате на листи чак и док је ваша љуска затворена.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "JSON-specifikation",
"July": "juli",
"June": "juni",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Behåll aktuell webhook-URL",
"Keep in Sidebar": "Behåll i sidofältet",
"Keep tools listed even while your shell is closed.": "Behåll verktygen i listan även när ditt skal är stängt.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "JSON விவரக்குறிப்பு",
"July": "ஜூலை",
"June": "ஜூன்",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "தற்போதைய வெப்ஹூக் URL ஐ வைத்திருக்கவும்",
"Keep in Sidebar": "பக்கப்பட்டியில் வைக்கவும்",
"Keep tools listed even while your shell is closed.": "உங்கள் ஷெல் மூடப்பட்டிருக்கும்போதும் கருவிகளைப் பட்டியலில் வைத்திருக்கவும்.",

View file

@ -1437,6 +1437,8 @@
"JSON Spec": "สเปก JSON",
"July": "กรกฎาคม",
"June": "มิถุนายน",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "คง URL ของ Webhook ปัจจุบันไว้",
"Keep in Sidebar": "ปักหมุดไว้ที่แถบด้านข้าง",
"Keep tools listed even while your shell is closed.": "แสดงเครื่องมือในรายการไว้แม้ขณะที่ Shell ของคุณปิดอยู่",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "JSON Spesifikasiýasy",
"July": "Iýul",
"June": "Iýun",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Häzirki webhook URL salgysyny saklaň",
"Keep in Sidebar": "Gapdal Panelde Sakla",
"Keep tools listed even while your shell is closed.": "Shell-iňiz ýapyk wagty hem gurallary sanawda saklaň.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "JSON Belirtimi",
"July": "Temmuz",
"June": "Haziran",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Mevcut webhook URL'sini koru",
"Keep in Sidebar": "Kenar Çubuğunda Tut",
"Keep tools listed even while your shell is closed.": "Kabuğunuz kapalıyken bile araçları listede tut.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "JSON ئۆلچىمى",
"July": "ئىيۇل",
"June": "ئىيۇن",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "نۆۋەتتىكى Webhook URL نى ساقلاپ قېلىڭ",
"Keep in Sidebar": "يانتاختىدا ساقلا",
"Keep tools listed even while your shell is closed.": "shell يېپىلغان ۋاقىتتىمۇ قوراللارنى تىزىملىكتە ساقلاڭ.",

View file

@ -1476,6 +1476,8 @@
"JSON Spec": "Специфікація JSON",
"July": "Липень",
"June": "Червень",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Зберегти поточну URL-адресу вебхука",
"Keep in Sidebar": "Залишити на бічній панелі",
"Keep tools listed even while your shell is closed.": "Залишати інструменти в списку, навіть коли ваш командний рядок закрито.",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "JSON تصریح",
"July": "جولائی",
"June": "جون",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "موجودہ ویب ہک URL برقرار رکھیں",
"Keep in Sidebar": "سائیڈ بار میں رکھیں",
"Keep tools listed even while your shell is closed.": "آپ کا شیل بند ہونے پر بھی ٹولز فہرست میں رکھیں۔",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "",
"July": "июл",
"June": "июн",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "",
"Keep in Sidebar": "",
"Keep tools listed even while your shell is closed.": "",

View file

@ -1450,6 +1450,8 @@
"JSON Spec": "",
"July": "iyul",
"June": "iyun",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "",
"Keep in Sidebar": "",
"Keep tools listed even while your shell is closed.": "",

View file

@ -1437,6 +1437,8 @@
"JSON Spec": "Đặc tả JSON",
"July": "Tháng 7",
"June": "Tháng 6",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "Giữ URL webhook hiện tại",
"Keep in Sidebar": "Giữ trên thanh bên",
"Keep tools listed even while your shell is closed.": "Vẫn liệt kê các tool ngay cả khi shell của bạn đã đóng.",

View file

@ -1447,6 +1447,8 @@
"JSON Spec": "以 JSON 格式定义的接口规范",
"July": "七月",
"June": "六月",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "保留当前 webhook URL",
"Keep in Sidebar": "保留在侧边栏",
"Keep tools listed even while your shell is closed.": "",

View file

@ -1437,6 +1437,8 @@
"JSON Spec": "以 JSON 格式定義的介面規範",
"July": "7 月",
"June": "6 月",
"Keep both": "",
"Keep both versions in the proposed revision, original first.": "",
"Keep current webhook URL": "保留目前的 Webhook 網址",
"Keep in Sidebar": "保留在側邊欄",
"Keep tools listed even while your shell is closed.": "",