From c357faa54f1f21b389b2611dc98c2fa4788f6876 Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Fri, 15 Oct 2021 16:14:19 -0400 Subject: [PATCH] Fix merge conflicts in Korean and Nederlands ts files --- Translations/Korean.ko.ts | 39 ---------------------------------- Translations/Nederlands.nl.ts | 40 ----------------------------------- 2 files changed, 79 deletions(-) diff --git a/Translations/Korean.ko.ts b/Translations/Korean.ko.ts index 16de21e4..f40ee3a6 100644 --- a/Translations/Korean.ko.ts +++ b/Translations/Korean.ko.ts @@ -3597,11 +3597,7 @@ p, li { white-space: pre-wrap; } I want to be notified of test versions. (Advanced users only please.) -<<<<<<< HEAD 테스트 버전에 대한 알림을 받고 싶습니다. (고급 사용자만 해당) -======= - ->>>>>>> master @@ -3773,11 +3769,7 @@ p, li { white-space: pre-wrap; } If you are interested in helping test new features and bugfixes early, click here. -<<<<<<< HEAD 새로운 기능 및 버그 수정을 조기에 테스트하려면 여기를 클릭하십시오. -======= - ->>>>>>> master @@ -7753,11 +7745,7 @@ TTIA: %1 EPAP %1-%2 IPAP %3-%4 (%5) -<<<<<<< HEAD EPAP(날숨) %1-%2 IPAP(들숨) %3-%4 (%5) -======= - EPAP(날숨) %1 IPAP(들숨) %2-%3 (%4) {1-%2 ?} {3-%4 ?} {5)?} ->>>>>>> master @@ -8506,20 +8494,12 @@ popout window, delete it, then pop out this graph again. A more recent version of OSCAR is available -<<<<<<< HEAD 오스카의 최신 버전을 사용할 수 있습니다 -======= - ->>>>>>> master release -<<<<<<< HEAD 릴리즈 -======= - ->>>>>>> master @@ -8529,26 +8509,17 @@ popout window, delete it, then pop out this graph again. You are running the latest %1 of OSCAR -<<<<<<< HEAD 오스카의 최신 %1을 실행하고 있습니다 -======= - ->>>>>>> master You are running OSCAR %1 -<<<<<<< HEAD OscAR %1을 실행하고 있습니다 -======= - ->>>>>>> master OSCAR %1 is available <a href='%2'>here</a>. -<<<<<<< HEAD OSCAR %1 이용할수 있다 <a href='%2'>여기</a>. @@ -8557,16 +8528,6 @@ popout window, delete it, then pop out this graph again. 최신 테스트 버전 %1에 대한 정보는 <a href='%2'>%2</a>에서 확인할 수 있다 -======= - - - - - Information about more recent test version %1 is available at <a href='%2'>%2</a> - - - ->>>>>>> master Check for OSCAR Updates 오스카 업데이트 확인 diff --git a/Translations/Nederlands.nl.ts b/Translations/Nederlands.nl.ts index bcfdab54..a66297d5 100644 --- a/Translations/Nederlands.nl.ts +++ b/Translations/Nederlands.nl.ts @@ -3613,11 +3613,7 @@ p, li { white-space: pre-wrap; } I want to be notified of test versions. (Advanced users only please.) -<<<<<<< HEAD Ik wil meldingen voor testversies ontvangen (Indien aangemeld als tester) -======= - ->>>>>>> master @@ -7848,11 +7844,7 @@ http://www.apneaboard.com/forums/Thread-CMS50D--3956 EPAP %1-%2 IPAP %3-%4 (%5) -<<<<<<< HEAD EPAP %1-%2 IPAP %3-%4 (%5) -======= - EPAP: %1 IPAP: %2-%3 (%4) {1-%2 ?} {3-%4 ?} {5)?} ->>>>>>> master @@ -8109,11 +8101,7 @@ Gaarne gegevens opnieuw inlezen PAC -<<<<<<< HEAD PAC -======= - ->>>>>>> master @@ -8267,29 +8255,17 @@ Gaarne gegevens opnieuw inlezen BiPAP-T -<<<<<<< HEAD BiPAP-T -======= - ->>>>>>> master BiPAP-S -<<<<<<< HEAD BiPAP-S -======= - ->>>>>>> master BiPAP-S/T -<<<<<<< HEAD BiPAP-S/T -======= - ->>>>>>> master @@ -8610,39 +8586,23 @@ popout venster verwijderen en dan deze grafiek weer vastzetten. release -<<<<<<< HEAD release -======= - ->>>>>>> master test version -<<<<<<< HEAD testversie -======= - ->>>>>>> master You are running the latest %1 of OSCAR -<<<<<<< HEAD U gebruikt de nieuwste %1 van OSCAR -======= - ->>>>>>> master You are running OSCAR %1 -<<<<<<< HEAD U gebruikt OSCAR %1 -======= - ->>>>>>> master