Merge

timschneeb · Dec 30, 2020 · 0baa59d · 0baa59d
2 parents f755161 + 4519ac0
commit 0baa59d
Show file tree

Hide file tree

Showing 7 changed files with 706 additions and 154 deletions.
diff --git a/Galaxy Buds Client/i18N/cz.xaml b/Galaxy Buds Client/i18N/cz.xaml
diff --git a/Galaxy Buds Client/i18N/ko.xaml b/Galaxy Buds Client/i18N/ko.xaml
@@ -16,6 +16,8 @@
     <sys:String x:Key="notset">설정되지 않음</sys:String>
     <sys:String x:Key="nobluetoothdev">Bluetooth 송수신 장치를 찾지 못했습니다. Bluetooth를 켠 후 다시 시도해 주세요.</sys:String>
 
+    <sys:String x:Key="anc">액티브 노이즈 캔슬링</sys:String>
+
     <!-- SPP Message Parser -->
     <sys:String x:Key="sppmsg_too_small">패킷 크기가 너무 작음</sys:String>
     <sys:String x:Key="sppmsg_invalid_som">유효하지 않은 SOM</sys:String>
@@ -81,6 +83,8 @@
     <sys:String x:Key="tray_disable_ambient_sound">주변 소리 듣기 끄기</sys:String>
     <sys:String x:Key="tray_enable_eq">이퀄라이저 켜기</sys:String>
     <sys:String x:Key="tray_disable_eq">이퀄라이저 끄기</sys:String>
+    <sys:String x:Key="tray_enable_anc">액티브 노이즈 캔슬링 활성화</sys:String>
+    <sys:String x:Key="tray_disable_anc">액티브 노이즈 캔슬링 비활성화/sys:String>
     <sys:String x:Key="tray_quit">종료</sys:String>
 
 
@@ -93,12 +97,13 @@
     <sys:String x:Key="hotrec_title">키 지정</sys:String>
     <sys:String x:Key="hotrec_content">키 조합을 입력하세요 (누른 채로 유지):</sys:String>
     <sys:String x:Key="hotrec_empty">없음</sys:String>
+    <sys:String x:Key="hotrec_note">참고: 사용자 인터페이스 권한 격리(UIPI)로 인해, 동일한 권한 수준의 앱에서만 키 조합을 수신할 수 있습니다.</sys:String>
 
     <!-- Welcome page -->
     <sys:String x:Key="welcome_textblock_header">환영합니다!</sys:String>
     <sys:String x:Key="welcome_textblock_p1">
-        안녕하세요! 이 Galaxy Buds Manager는 비공식 프로그램이며, Samsung과 일절의 관련이 없습니다.
-		이 프로그램은 공식 Samsung Wearable 앱에서 할 수 없는 여러 가지 것들을 할 수 있지만, 안전을 위해 이어버드 소프트웨어 OTA 업데이트 기능을 제외했습니다. 만약 업데이트가 필요하시다면, 공식 Galaxy Buds Manager를 사용해 주세요.
+        안녕하세요! 이 갤럭시 버즈 매니저는 비공식 프로그램이며, 삼성과 일절의 관련이 없습니다.
+		이 프로그램은 공식 삼성 웨어러블 앱에서 할 수 없는 여러 가지 것들을 할 수 있지만, 안전을 위해 이어버드 소프트웨어 OTA 업데이트 기능을 제외했습니다. 만약 업데이트가 필요하시다면, 공식 갤럭시 버즈 매니저를 사용해 주세요.
     </sys:String>
     <sys:String x:Key="welcome_textblock_p2">
         만약 이 프로그램이 개발되는 과정을 보고 싶으시다면, 저의 리버스 엔지니어링의 성과물들이 있는 GitHub 레포지토리에서 확인하실 수 있습니다. 또한 문제가 생기면 Telegram에서 @thepbone으로 메시지를 보내는 방법도 있습니다.
@@ -238,7 +243,6 @@
     <sys:String x:Key="settings_cpopup_position">표시 위치</sys:String>
     <sys:String x:Key="settings_cpopup_position_placeholder">알 수 없음</sys:String>
     <sys:String x:Key="settings_cpopup_demo">팝업 보기</sys:String>
-
     <sys:String x:Key="settings_cpopup_override_title">팝업 타이틀 변경</sys:String>
     <sys:String x:Key="settings_cpopup_override_title_dialog">팝업 타이틀을 입력해 주세요. 공백으로 둘 시 기본 타이틀이 적용됩니다.</sys:String>
 
@@ -290,6 +294,8 @@
     <sys:String x:Key="adv_resume_playback_desc">하나 이상의 거리 센서가 가려졌을 경우 전체 재생/정지 신호를 보냅니다. (Windows 기능)</sys:String>
     <sys:String x:Key="adv_sidetone">통화 중 주변 소리 듣기 허용</sys:String>
     <sys:String x:Key="adv_sidetone_desc">통화 중에 내 목소리를 더 또렷하게 들어보세요.</sys:String>
+    <sys:String x:Key="adv_passthrough">주변 소리 듣기로 압력을 완화해요.</sys:String>
+    <sys:String x:Key="adv_passthrough_desc">액티브 노이즈 캔슬링을 쓰지 않을 때의 답답함이나 압박감을 해결할 수 있어요.</sys:String>
     <sys:String x:Key="adv_gaming_mode">게임 모드</sys:String>
     <sys:String x:Key="adv_gaming_mode_desc">오디오 지연을 최소화하여, 더 생생하고 싱크가 완벽한 게임 사운드를 즐길 수 있어요. (Samsung 기능)</sys:String>
 
@@ -312,4 +318,5 @@
     <sys:String x:Key="connlost_noinfo">오류 정보를 가져오지 못했습니다.</sys:String>
     <sys:String x:Key="connlost_connect">연결</sys:String>
     <sys:String x:Key="connlost_connecting">연결 중...</sys:String>
-</ResourceDictionary>
+
+</ResourceDictionary>
diff --git a/Galaxy Buds Client/packages.config b/Galaxy Buds Client/packages.config
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autoupdater.NET.Official" version="1.6.0" targetFramework="net461" />
+  <package id="Autoupdater.NET.Official" version="1.6.4" targetFramework="net461" />
   <package id="FontAwesome.WPF" version="4.7.0.9" targetFramework="net472" />
   <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net461" />
   <package id="InputSimulator" version="1.0.4.0" targetFramework="net461" />
   <package id="MacroLib" version="1.5.6" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
   <package id="Sentry" version="2.1.8" targetFramework="net461" />
   <package id="Sentry.PlatformAbstractions" version="1.1.1" targetFramework="net461" />
   <package id="Sentry.Protocol" version="2.1.8" targetFramework="net461" />

diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 <p align="center">
-  English | <a href="./README_rus.md">pусский </a> | <a href="./README_ukr.md"> украинец</a>
+  English | <a href="./README_chs.md">中文</a> | <a href="./README_rus.md">Русский</a> | <a href="./README_jpn.md">日本語</a> | <a href="./README_ukr.md">Українська</a> | <a href="./README_kor.md">한국어</a><br>
+    <sub>Attention: readme files are maintained by translators and may become outdated from time to time. For newest info rely on English version.</sub>
 </p>
 <h1 align="center">
   Galaxy Buds Client
@@ -8,7 +9,7 @@
 <h4 align="center">An unofficial manager for the Buds, Buds+ and Buds Live</h4>
 <p align="center">
   <a href="https://github.com/ThePBone/GalaxyBudsClient/releases">
-    <img alt="GitHub all releases" src="https://img.shields.io/github/downloads/thepbone/galaxybudsclient/total">
+    <img alt="GitHub downloads count" src="https://img.shields.io/github/downloads/thepbone/galaxybudsclient/total">
   </a>
   <a href="https://github.com/ThePBone/GalaxyBudsClient/releases">
   	<img alt="GitHub release (latest by date)" src="https://img.shields.io/github/v/release/thepbone/galaxybudsclient">
@@ -30,6 +31,7 @@
   <a href="#license">License</a> 
 </p>
 
+
 <p align="center">
     <a href="#"><img alt="Screenshot" src="screenshots/screencap.gif"></a>
 </p>
@@ -98,13 +100,15 @@ Version 4.0 is planned to be released by the end of 2020 and introduces cross-pl
 
 
 - [x] Move to .NET Core 3.1
+- [x] Port user interface to AvaloniaUI.NET
 - [x] Linux: Implement native Bluetooth interface
-- [ ] Windows: Implement native Bluetooth interface
+- [x] Cross-platform Bluetooth device selection dialog
+- [X] Windows: Implement native Bluetooth interface
 - [ ] Windows/Linux: Native tray icon support (libappindicator)
-- [ ] Cross-platform Bluetooth device selection dialog
-- [ ] Port user interface to AvaloniaUI.NET
 - [ ] Linux: Solve NVIDIA incompatibility with libSkia
 
+You can check the [kanban board for milestone v4.0](https://github.com/ThePBone/GalaxyBudsClient/projects/3) for more details.
+
 Contributions regarding this roadmap are very appreciated. The new implementation is available on the [`avalonia-rewrite`](https://github.com/ThePBone/GalaxyBudsClient/tree/avalonia-rewrite) branch.
 
 
@@ -113,7 +117,6 @@ Contributions regarding this roadmap are very appreciated. The new implementatio
 #### Contributors
 
 * [@ArthurWolfhound](https://github.com/ArthurWolfhound) - Issue templates, wiki and translations
-
 * [@AndriesK](https://github.com/AndriesK) - Buds Live bug fix
 * [@githubcatw](https://github.com/githubcatw) - Connection dialog base
 
@@ -134,6 +137,10 @@ Contributions regarding this roadmap are very appreciated. The new implementatio
 This project is licensed under [GPLv3](LICENSE). It is not affiliated with Samsung nor supervised by them in any way.
 
 ```
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR 
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ```