diff --git a/src/lib/components/common/DiffEditorModal.svelte b/src/lib/components/common/DiffEditorModal.svelte index afe6b4fec7..e802f22880 100644 --- a/src/lib/components/common/DiffEditorModal.svelte +++ b/src/lib/components/common/DiffEditorModal.svelte @@ -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 = []; 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 @@ >
-
+

{session.title || $i18n.t('Compare revision')}

@@ -415,7 +439,7 @@ > {/if} {#if comparing} -
+
{loading @@ -469,6 +493,13 @@ title={$i18n.t('Copy change to proposal')} on:click={() => copy('to-proposal')}>{$i18n.t('Proposed revision')} → + {:else} 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; diff --git a/src/lib/i18n/locales/ar-BH/translation.json b/src/lib/i18n/locales/ar-BH/translation.json index f216befd3c..d42adb5f2f 100644 --- a/src/lib/i18n/locales/ar-BH/translation.json +++ b/src/lib/i18n/locales/ar-BH/translation.json @@ -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.": "إبقاء الأدوات مدرجة حتى أثناء إغلاق الطرفية.", diff --git a/src/lib/i18n/locales/ar/translation.json b/src/lib/i18n/locales/ar/translation.json index 46f61f45db..b0c6c2a42f 100644 --- a/src/lib/i18n/locales/ar/translation.json +++ b/src/lib/i18n/locales/ar/translation.json @@ -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.": "إبقاء الأدوات مدرجة حتى أثناء إغلاق الطرفية.", diff --git a/src/lib/i18n/locales/az-AZ/translation.json b/src/lib/i18n/locales/az-AZ/translation.json index adb97f0ca6..5905d5d5c4 100644 --- a/src/lib/i18n/locales/az-AZ/translation.json +++ b/src/lib/i18n/locales/az-AZ/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/bg-BG/translation.json b/src/lib/i18n/locales/bg-BG/translation.json index 8286ad7064..123c0f24d0 100644 --- a/src/lib/i18n/locales/bg-BG/translation.json +++ b/src/lib/i18n/locales/bg-BG/translation.json @@ -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.": "Инструментите остават в списъка, дори когато командната обвивка е затворена.", diff --git a/src/lib/i18n/locales/bn-BD/translation.json b/src/lib/i18n/locales/bn-BD/translation.json index 443d21b483..da91cdb67e 100644 --- a/src/lib/i18n/locales/bn-BD/translation.json +++ b/src/lib/i18n/locales/bn-BD/translation.json @@ -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.": "শেল বন্ধ থাকলেও টুলগুলো তালিকায় রাখুন।", diff --git a/src/lib/i18n/locales/bo-TB/translation.json b/src/lib/i18n/locales/bo-TB/translation.json index 5f1ac1613c..73e0ccabda 100644 --- a/src/lib/i18n/locales/bo-TB/translation.json +++ b/src/lib/i18n/locales/bo-TB/translation.json @@ -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.": "ཁྱེད་ཀྱི་བཀའ་བརྡའི་འགྲེལ་བཤད་ཆས་ཁ་བརྒྱབ་ཡོད་སྐབས་ཀྱང་ལག་ཆ་ཐོ་ནང་འཇོག་པ།", diff --git a/src/lib/i18n/locales/bs-BA/translation.json b/src/lib/i18n/locales/bs-BA/translation.json index 5c1ca6af47..9e946c1822 100644 --- a/src/lib/i18n/locales/bs-BA/translation.json +++ b/src/lib/i18n/locales/bs-BA/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/ca-ES/translation.json b/src/lib/i18n/locales/ca-ES/translation.json index eb208bdb19..c5f9ca7378 100644 --- a/src/lib/i18n/locales/ca-ES/translation.json +++ b/src/lib/i18n/locales/ca-ES/translation.json @@ -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.": "", diff --git a/src/lib/i18n/locales/ceb-PH/translation.json b/src/lib/i18n/locales/ceb-PH/translation.json index baa7f87ad1..0f9bc34148 100644 --- a/src/lib/i18n/locales/ceb-PH/translation.json +++ b/src/lib/i18n/locales/ceb-PH/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/cs-CZ/translation.json b/src/lib/i18n/locales/cs-CZ/translation.json index 56099b5853..9a37e69603 100644 --- a/src/lib/i18n/locales/cs-CZ/translation.json +++ b/src/lib/i18n/locales/cs-CZ/translation.json @@ -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ý.", diff --git a/src/lib/i18n/locales/da-DK/translation.json b/src/lib/i18n/locales/da-DK/translation.json index a40520b387..bcca9167b7 100644 --- a/src/lib/i18n/locales/da-DK/translation.json +++ b/src/lib/i18n/locales/da-DK/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/de-DE/translation.json b/src/lib/i18n/locales/de-DE/translation.json index 4168c80ac8..cb3e62bb02 100644 --- a/src/lib/i18n/locales/de-DE/translation.json +++ b/src/lib/i18n/locales/de-DE/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/dg-DG/translation.json b/src/lib/i18n/locales/dg-DG/translation.json index 936a223c28..d6d3f632a1 100644 --- a/src/lib/i18n/locales/dg-DG/translation.json +++ b/src/lib/i18n/locales/dg-DG/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/el-GR/translation.json b/src/lib/i18n/locales/el-GR/translation.json index fbdbbb52b4..0ede1f4cd7 100644 --- a/src/lib/i18n/locales/el-GR/translation.json +++ b/src/lib/i18n/locales/el-GR/translation.json @@ -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.": "Τα εργαλεία παραμένουν στη λίστα ακόμη και όταν το κέλυφός σας είναι κλειστό.", diff --git a/src/lib/i18n/locales/en-GB/translation.json b/src/lib/i18n/locales/en-GB/translation.json index b3293aa173..09c800097e 100644 --- a/src/lib/i18n/locales/en-GB/translation.json +++ b/src/lib/i18n/locales/en-GB/translation.json @@ -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.": "", diff --git a/src/lib/i18n/locales/en-US/translation.json b/src/lib/i18n/locales/en-US/translation.json index aa5ba814cf..9b8e1765f8 100644 --- a/src/lib/i18n/locales/en-US/translation.json +++ b/src/lib/i18n/locales/en-US/translation.json @@ -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.": "", diff --git a/src/lib/i18n/locales/es-ES/translation.json b/src/lib/i18n/locales/es-ES/translation.json index 66629db827..cb3e0fb6e5 100644 --- a/src/lib/i18n/locales/es-ES/translation.json +++ b/src/lib/i18n/locales/es-ES/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/et-EE/translation.json b/src/lib/i18n/locales/et-EE/translation.json index 9f6c7b685b..7f6f0ac8f2 100644 --- a/src/lib/i18n/locales/et-EE/translation.json +++ b/src/lib/i18n/locales/et-EE/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/eu-ES/translation.json b/src/lib/i18n/locales/eu-ES/translation.json index c9bd301dd7..82b9e109c8 100644 --- a/src/lib/i18n/locales/eu-ES/translation.json +++ b/src/lib/i18n/locales/eu-ES/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/fa-IR/translation.json b/src/lib/i18n/locales/fa-IR/translation.json index 7896388660..059d78bf8f 100644 --- a/src/lib/i18n/locales/fa-IR/translation.json +++ b/src/lib/i18n/locales/fa-IR/translation.json @@ -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مانند.", diff --git a/src/lib/i18n/locales/fi-FI/translation.json b/src/lib/i18n/locales/fi-FI/translation.json index e408070d04..c760f58717 100644 --- a/src/lib/i18n/locales/fi-FI/translation.json +++ b/src/lib/i18n/locales/fi-FI/translation.json @@ -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.": "", diff --git a/src/lib/i18n/locales/fil-PH/translation.json b/src/lib/i18n/locales/fil-PH/translation.json index dd5674b6f5..8dad9f8247 100644 --- a/src/lib/i18n/locales/fil-PH/translation.json +++ b/src/lib/i18n/locales/fil-PH/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/fo-FO/translation.json b/src/lib/i18n/locales/fo-FO/translation.json index d3358d4c84..4a82d121e4 100644 --- a/src/lib/i18n/locales/fo-FO/translation.json +++ b/src/lib/i18n/locales/fo-FO/translation.json @@ -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ð.", diff --git a/src/lib/i18n/locales/fr-CA/translation.json b/src/lib/i18n/locales/fr-CA/translation.json index 670592c64c..45803de96b 100644 --- a/src/lib/i18n/locales/fr-CA/translation.json +++ b/src/lib/i18n/locales/fr-CA/translation.json @@ -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.": "", diff --git a/src/lib/i18n/locales/fr-FR/translation.json b/src/lib/i18n/locales/fr-FR/translation.json index 36f4de1e65..0b43b70f87 100644 --- a/src/lib/i18n/locales/fr-FR/translation.json +++ b/src/lib/i18n/locales/fr-FR/translation.json @@ -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.": "", diff --git a/src/lib/i18n/locales/gl-ES/translation.json b/src/lib/i18n/locales/gl-ES/translation.json index be73859610..78cab7780f 100644 --- a/src/lib/i18n/locales/gl-ES/translation.json +++ b/src/lib/i18n/locales/gl-ES/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/he-IL/translation.json b/src/lib/i18n/locales/he-IL/translation.json index b88f35fcbc..d1eca417ea 100644 --- a/src/lib/i18n/locales/he-IL/translation.json +++ b/src/lib/i18n/locales/he-IL/translation.json @@ -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.": "השארת הכלים ברשימה גם כשהמעטפת שלך סגורה.", diff --git a/src/lib/i18n/locales/hi-IN/translation.json b/src/lib/i18n/locales/hi-IN/translation.json index a97ad68529..8d798e8cb0 100644 --- a/src/lib/i18n/locales/hi-IN/translation.json +++ b/src/lib/i18n/locales/hi-IN/translation.json @@ -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.": "आपका शेल बंद होने पर भी टूल सूची में रखें.", diff --git a/src/lib/i18n/locales/hr-HR/translation.json b/src/lib/i18n/locales/hr-HR/translation.json index b32b2d8c05..8dbfee7811 100644 --- a/src/lib/i18n/locales/hr-HR/translation.json +++ b/src/lib/i18n/locales/hr-HR/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/hu-HU/translation.json b/src/lib/i18n/locales/hu-HU/translation.json index 0a69cf62d5..105c3661ef 100644 --- a/src/lib/i18n/locales/hu-HU/translation.json +++ b/src/lib/i18n/locales/hu-HU/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/id-ID/translation.json b/src/lib/i18n/locales/id-ID/translation.json index a4dd8e5586..82e957a326 100644 --- a/src/lib/i18n/locales/id-ID/translation.json +++ b/src/lib/i18n/locales/id-ID/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/ie-GA/translation.json b/src/lib/i18n/locales/ie-GA/translation.json index 9a867d983d..0731bebecf 100644 --- a/src/lib/i18n/locales/ie-GA/translation.json +++ b/src/lib/i18n/locales/ie-GA/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/it-IT/translation.json b/src/lib/i18n/locales/it-IT/translation.json index 15bc8c39f7..df78c01b3f 100644 --- a/src/lib/i18n/locales/it-IT/translation.json +++ b/src/lib/i18n/locales/it-IT/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/ja-JP/translation.json b/src/lib/i18n/locales/ja-JP/translation.json index 0336c54cac..78005daf52 100644 --- a/src/lib/i18n/locales/ja-JP/translation.json +++ b/src/lib/i18n/locales/ja-JP/translation.json @@ -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.": "シェルが閉じている間もツールを一覧に残します。", diff --git a/src/lib/i18n/locales/ka-GE/translation.json b/src/lib/i18n/locales/ka-GE/translation.json index 6cc954c4eb..e9a93fa685 100644 --- a/src/lib/i18n/locales/ka-GE/translation.json +++ b/src/lib/i18n/locales/ka-GE/translation.json @@ -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.": "ხელსაწყოებს სიაში ტოვებს მაშინაც, როცა თქვენი გარსი დახურულია.", diff --git a/src/lib/i18n/locales/kab-DZ/translation.json b/src/lib/i18n/locales/kab-DZ/translation.json index aef66aa7cd..a93b8f57c5 100644 --- a/src/lib/i18n/locales/kab-DZ/translation.json +++ b/src/lib/i18n/locales/kab-DZ/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/ko-KR/translation.json b/src/lib/i18n/locales/ko-KR/translation.json index 1899c1f160..482766adf6 100644 --- a/src/lib/i18n/locales/ko-KR/translation.json +++ b/src/lib/i18n/locales/ko-KR/translation.json @@ -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.": "셸이 닫혀 있는 동안에도 도구를 목록에 유지합니다.", diff --git a/src/lib/i18n/locales/lt-LT/translation.json b/src/lib/i18n/locales/lt-LT/translation.json index 298074981a..57fe0d6e16 100644 --- a/src/lib/i18n/locales/lt-LT/translation.json +++ b/src/lib/i18n/locales/lt-LT/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/lv-LV/translation.json b/src/lib/i18n/locales/lv-LV/translation.json index 03c0dedf37..038ad7164c 100644 --- a/src/lib/i18n/locales/lv-LV/translation.json +++ b/src/lib/i18n/locales/lv-LV/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/ms-MY/translation.json b/src/lib/i18n/locales/ms-MY/translation.json index fb0b6d0790..5994f8388c 100644 --- a/src/lib/i18n/locales/ms-MY/translation.json +++ b/src/lib/i18n/locales/ms-MY/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/nb-NO/translation.json b/src/lib/i18n/locales/nb-NO/translation.json index 69619c32d3..d901604143 100644 --- a/src/lib/i18n/locales/nb-NO/translation.json +++ b/src/lib/i18n/locales/nb-NO/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/nl-NL/translation.json b/src/lib/i18n/locales/nl-NL/translation.json index 1fe023b409..9bbfaf9706 100644 --- a/src/lib/i18n/locales/nl-NL/translation.json +++ b/src/lib/i18n/locales/nl-NL/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/pa-IN/translation.json b/src/lib/i18n/locales/pa-IN/translation.json index cee0f0be29..d52c0f5d44 100644 --- a/src/lib/i18n/locales/pa-IN/translation.json +++ b/src/lib/i18n/locales/pa-IN/translation.json @@ -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.": "ਤੁਹਾਡਾ ਸ਼ੈੱਲ ਬੰਦ ਹੋਣ 'ਤੇ ਵੀ ਟੂਲ ਸੂਚੀ ਵਿੱਚ ਰੱਖੋ।", diff --git a/src/lib/i18n/locales/pl-PL/translation.json b/src/lib/i18n/locales/pl-PL/translation.json index aeba776954..222bf28e02 100644 --- a/src/lib/i18n/locales/pl-PL/translation.json +++ b/src/lib/i18n/locales/pl-PL/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/pt-BR/translation.json b/src/lib/i18n/locales/pt-BR/translation.json index 81dfc5c02a..f50abc6132 100644 --- a/src/lib/i18n/locales/pt-BR/translation.json +++ b/src/lib/i18n/locales/pt-BR/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/pt-PT/translation.json b/src/lib/i18n/locales/pt-PT/translation.json index be22333af5..2cc3a28dd5 100644 --- a/src/lib/i18n/locales/pt-PT/translation.json +++ b/src/lib/i18n/locales/pt-PT/translation.json @@ -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.": "", diff --git a/src/lib/i18n/locales/ro-RO/translation.json b/src/lib/i18n/locales/ro-RO/translation.json index 5162469b50..1aa7fab859 100644 --- a/src/lib/i18n/locales/ro-RO/translation.json +++ b/src/lib/i18n/locales/ro-RO/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/ru-RU/translation.json b/src/lib/i18n/locales/ru-RU/translation.json index 4293669a9d..d2651ea9cf 100644 --- a/src/lib/i18n/locales/ru-RU/translation.json +++ b/src/lib/i18n/locales/ru-RU/translation.json @@ -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.": "Оставлять инструменты в списке, даже когда командная строка закрыта.", diff --git a/src/lib/i18n/locales/sk-SK/translation.json b/src/lib/i18n/locales/sk-SK/translation.json index 364c060ab4..9708dc53f3 100644 --- a/src/lib/i18n/locales/sk-SK/translation.json +++ b/src/lib/i18n/locales/sk-SK/translation.json @@ -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ý.", diff --git a/src/lib/i18n/locales/sl-SI/translation.json b/src/lib/i18n/locales/sl-SI/translation.json index bff5394cb7..235178721c 100644 --- a/src/lib/i18n/locales/sl-SI/translation.json +++ b/src/lib/i18n/locales/sl-SI/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/sr-RS/translation.json b/src/lib/i18n/locales/sr-RS/translation.json index 41b81d63ed..860a7f8795 100644 --- a/src/lib/i18n/locales/sr-RS/translation.json +++ b/src/lib/i18n/locales/sr-RS/translation.json @@ -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.": "Задржава алате на листи чак и док је ваша љуска затворена.", diff --git a/src/lib/i18n/locales/sv-SE/translation.json b/src/lib/i18n/locales/sv-SE/translation.json index 798582824f..6eee61dcae 100644 --- a/src/lib/i18n/locales/sv-SE/translation.json +++ b/src/lib/i18n/locales/sv-SE/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/ta-IN/translation.json b/src/lib/i18n/locales/ta-IN/translation.json index 10a1297f0b..dd9c713399 100644 --- a/src/lib/i18n/locales/ta-IN/translation.json +++ b/src/lib/i18n/locales/ta-IN/translation.json @@ -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.": "உங்கள் ஷெல் மூடப்பட்டிருக்கும்போதும் கருவிகளைப் பட்டியலில் வைத்திருக்கவும்.", diff --git a/src/lib/i18n/locales/th-TH/translation.json b/src/lib/i18n/locales/th-TH/translation.json index a56a18fd0c..512360b967 100644 --- a/src/lib/i18n/locales/th-TH/translation.json +++ b/src/lib/i18n/locales/th-TH/translation.json @@ -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 ของคุณปิดอยู่", diff --git a/src/lib/i18n/locales/tk-TM/translation.json b/src/lib/i18n/locales/tk-TM/translation.json index 850ca11774..34e0e3e212 100644 --- a/src/lib/i18n/locales/tk-TM/translation.json +++ b/src/lib/i18n/locales/tk-TM/translation.json @@ -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ň.", diff --git a/src/lib/i18n/locales/tr-TR/translation.json b/src/lib/i18n/locales/tr-TR/translation.json index 2d3989d716..c701047306 100644 --- a/src/lib/i18n/locales/tr-TR/translation.json +++ b/src/lib/i18n/locales/tr-TR/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/ug-CN/translation.json b/src/lib/i18n/locales/ug-CN/translation.json index e534ccbc2c..8c571f18a9 100644 --- a/src/lib/i18n/locales/ug-CN/translation.json +++ b/src/lib/i18n/locales/ug-CN/translation.json @@ -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 يېپىلغان ۋاقىتتىمۇ قوراللارنى تىزىملىكتە ساقلاڭ.", diff --git a/src/lib/i18n/locales/uk-UA/translation.json b/src/lib/i18n/locales/uk-UA/translation.json index 4dba863d31..9b2df3680c 100644 --- a/src/lib/i18n/locales/uk-UA/translation.json +++ b/src/lib/i18n/locales/uk-UA/translation.json @@ -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.": "Залишати інструменти в списку, навіть коли ваш командний рядок закрито.", diff --git a/src/lib/i18n/locales/ur-PK/translation.json b/src/lib/i18n/locales/ur-PK/translation.json index cc74bc3d43..faaacd2e61 100644 --- a/src/lib/i18n/locales/ur-PK/translation.json +++ b/src/lib/i18n/locales/ur-PK/translation.json @@ -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.": "آپ کا شیل بند ہونے پر بھی ٹولز فہرست میں رکھیں۔", diff --git a/src/lib/i18n/locales/uz-Cyrl-UZ/translation.json b/src/lib/i18n/locales/uz-Cyrl-UZ/translation.json index f6c508f53c..92ef1b4d0e 100644 --- a/src/lib/i18n/locales/uz-Cyrl-UZ/translation.json +++ b/src/lib/i18n/locales/uz-Cyrl-UZ/translation.json @@ -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.": "", diff --git a/src/lib/i18n/locales/uz-Latn-UZ/translation.json b/src/lib/i18n/locales/uz-Latn-UZ/translation.json index 04aa6e8f39..8baa1f392a 100644 --- a/src/lib/i18n/locales/uz-Latn-UZ/translation.json +++ b/src/lib/i18n/locales/uz-Latn-UZ/translation.json @@ -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.": "", diff --git a/src/lib/i18n/locales/vi-VN/translation.json b/src/lib/i18n/locales/vi-VN/translation.json index 8e32a719b4..6758737aaf 100644 --- a/src/lib/i18n/locales/vi-VN/translation.json +++ b/src/lib/i18n/locales/vi-VN/translation.json @@ -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.", diff --git a/src/lib/i18n/locales/zh-CN/translation.json b/src/lib/i18n/locales/zh-CN/translation.json index b03e17f0fa..e6078169fc 100644 --- a/src/lib/i18n/locales/zh-CN/translation.json +++ b/src/lib/i18n/locales/zh-CN/translation.json @@ -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.": "", diff --git a/src/lib/i18n/locales/zh-TW/translation.json b/src/lib/i18n/locales/zh-TW/translation.json index 51d1a6536e..4ee0d7af6c 100644 --- a/src/lib/i18n/locales/zh-TW/translation.json +++ b/src/lib/i18n/locales/zh-TW/translation.json @@ -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.": "",