Merge remote-tracking branch 'origin/blueprint'

# Conflicts: # application/translations/vi_VN.ts
theCheeseboard · Jul 19, 2023 · 949df74 · 949df74
2 parents 98b119d + 47c67dd
commit 949df74
Show file tree

Hide file tree

Showing 4 changed files with 310 additions and 55 deletions.
diff --git a/application/translations/apple-lproj/vi_VN.lproj/InfoPlist.strings b/application/translations/apple-lproj/vi_VN.lproj/InfoPlist.strings
@@ -0,0 +1,2 @@
+"CFBundleGetInfoString" = "Bộ nghe nhạc";
+"NSRemovableVolumesUsageDescription" = "Để khám phá phương tiện trên thiết bị đã bị kết nối, và phát CD, theBeat cần quyền truy cập lưu trữ di động.";
diff --git a/application/translations/vi_VN.ts b/application/translations/vi_VN.ts
@@ -6,12 +6,12 @@
     <message>
         <location filename="../commandpalette/artistsalbumscommandpalettescope.cpp" line="+35"/>
         <source>Artists</source>
-        <translation type="unfinished">Nghệ sĩ</translation>
+        <translation>Nghệ sĩ</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Albums</source>
-        <translation type="unfinished">Đĩa nhạc</translation>
+        <translation>Đĩa nhạc</translation>
     </message>
 </context>
 <context>
@@ -296,12 +296,12 @@
     <message>
         <location filename="../library/librarymanager.cpp" line="+455"/>
         <source>20 Most Played Tracks</source>
-        <translation></translation>
+        <translation>20 Bài Được Phát Nhiều Nhất</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>20 Random Tracks</source>
-        <translation></translation>
+        <translation>20 Bài Ngẫu Nhiên</translation>
     </message>
 </context>
 <context>
@@ -405,7 +405,7 @@ theBeat sẽ khởi chạy lại sau khi việc đặt lại hoàn tất. Hoạt
     <message>
         <location line="+16"/>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Xem</translation>
     </message>
     <message>
         <location line="+14"/>
@@ -522,37 +522,37 @@ theBeat sẽ khởi chạy lại sau khi việc đặt lại hoàn tất. Hoạt
     <message>
         <location line="+8"/>
         <source>Zen Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Chế độ Thiền</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Increase Volume</source>
-        <translation type="unfinished"></translation>
+        <translation>Tăng âm lượng</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Up</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Decrease Volume</source>
-        <translation type="unfinished"></translation>
+        <translation>Giảm âm lượng</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Down</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Pause after current track</source>
-        <translation type="unfinished">Tạm dừng sau bài hát này</translation>
+        <translation>Tạm dừng sau bài hát này</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Shift+Esc</source>
-        <translation type="unfinished"></translation>
+        <translation>Shift+Esc</translation>
     </message>
     <message>
         <location line="-120"/>
@@ -577,7 +577,7 @@ theBeat sẽ khởi chạy lại sau khi việc đặt lại hoàn tất. Hoạt
     <message>
         <location filename="../mainwindow.cpp" line="-3"/>
         <source>Pause</source>
-        <translation type="unfinished"></translation>
+        <translation>Tạm dừng</translation>
     </message>
     <message>
         <location line="+28"/>
@@ -690,7 +690,7 @@ theBeat sẽ khởi chạy lại sau khi việc đặt lại hoàn tất. Hoạt
     <message>
         <location line="+23"/>
         <source>Album</source>
-        <translation>Album</translation>
+        <translation>Đĩa nhạc</translation>
     </message>
 </context>
 <context>
@@ -740,17 +740,17 @@ theBeat sẽ khởi chạy lại sau khi việc đặt lại hoàn tất. Hoạt
     <message>
         <location filename="../print/printsettings.ui" line="+25"/>
         <source>PRINT TYPE</source>
-        <translation></translation>
+        <translation>KIỂU IN</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Track Listing</source>
-        <translation></translation>
+        <translation>Danh sách bài</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Jewel Case Insert</source>
-        <translation></translation>
+        <translation>Giấy hộp đĩa</translation>
     </message>
 </context>
 <context>
@@ -763,19 +763,21 @@ theBeat sẽ khởi chạy lại sau khi việc đặt lại hoàn tất. Hoạt
     <message>
         <location line="+21"/>
         <source>Reset Library</source>
-        <translation></translation>
+        <translation>Đặt lại thư viện</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>This is it!</source>
-        <translation></translation>
+        <translation>Sẵn sàng chưa?</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Resetting the library will clear all tracks that have been added to theBeat, and theBeat will rescan your Music folder upon startup.
 
 theBeat will restart once the reset is complete. This action is irreversible.</source>
-        <translation></translation>
+        <translation>Khi bạn đặt lại thư viện của bạn, các bài nhạc sẽ bị thêm vào theBeat sẽ bị quên, và theBeat sẽ quét lại thư mục nhạc của bạn lần sau theBeat khởi chạy.
+
+theBeat sẽ khởi chạy lại sau khi hoạt động đặt lại hoàn thành. Hoạt động này không thể bị hoàn tác.</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -855,32 +857,32 @@ theBeat sẽ khởi chạy lại sau khi việc đặt lại hoàn tất. Hoạt
     <message>
         <location filename="../tageditor/tageditor.ui" line="+35"/>
         <source>Track Properties</source>
-        <translation></translation>
+        <translation>Thuộc tính bài</translation>
     </message>
     <message>
         <location line="+50"/>
         <source>DETAILS MODIFIED</source>
-        <translation></translation>
+        <translation>CHI TIẾT BỊ THAY ĐỔI</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Save your changes to this track to keep them saved.</source>
-        <translation></translation>
+        <translation>Lưu các thay đổi của bạn để giữ nó.</translation>
     </message>
     <message>
         <location line="+25"/>
         <source>Revert</source>
-        <translation></translation>
+        <translation>Hoàn nguyên</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Save</source>
-        <translation></translation>
+        <translation>Lưu</translation>
     </message>
     <message>
         <location line="+82"/>
         <source>Track #</source>
-        <translation></translation>
+        <translation># Bài</translation>
     </message>
     <message>
         <location line="+33"/>
@@ -890,22 +892,22 @@ theBeat sẽ khởi chạy lại sau khi việc đặt lại hoàn tất. Hoạt
     <message>
         <location line="+7"/>
         <source>Genre</source>
-        <translation></translation>
+        <translation>Thể loại</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Length</source>
-        <translation></translation>
+        <translation>Độ dài</translation>
     </message>
     <message>
         <location line="-67"/>
         <source>Artist</source>
-        <translation></translation>
+        <translation>Nghệ sĩ</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Disc #</source>
-        <translation></translation>
+        <translation># Đĩa</translation>
     </message>
     <message>
         <location line="-24"/>
@@ -915,7 +917,7 @@ theBeat sẽ khởi chạy lại sau khi việc đặt lại hoàn tất. Hoạt
     <message>
         <location line="+10"/>
         <source>Album</source>
-        <translation></translation>
+        <translation>Đĩa nhạc</translation>
     </message>
 </context>
 <context>
@@ -941,7 +943,7 @@ theBeat sẽ khởi chạy lại sau khi việc đặt lại hoàn tất. Hoạt
     <message>
         <location filename="../commandpalette/trackscommandpalettescope.cpp" line="+34"/>
         <source>Tracks</source>
-        <translation type="unfinished">Bài hát</translation>
+        <translation>Bài hát</translation>
     </message>
 </context>
 <context>
@@ -975,7 +977,7 @@ theBeat sẽ khởi chạy lại sau khi việc đặt lại hoàn tất. Hoạt
     <message>
         <location filename="../trackswidget.cpp" line="+2"/>
         <source>Search for %1</source>
-        <translation></translation>
+        <translation>Tìm kiếm cho %1</translation>
     </message>
 </context>
 <context>
@@ -1085,17 +1087,17 @@ theBeat sẽ khởi chạy lại sau khi việc đặt lại hoàn tất. Hoạt
     <message>
         <location line="+68"/>
         <source>General</source>
-        <translation type="unfinished">Chung</translation>
+        <translation>Chung</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Appearance</source>
-        <translation type="unfinished">Giao diện</translation>
+        <translation>Giao diện</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Library</source>
-        <translation type="unfinished">Thư viện</translation>
+        <translation>Thư viện</translation>
     </message>
 </context>
 </TS>
diff --git a/plugins/MacIntegration/translations/vi_VN.ts b/plugins/MacIntegration/translations/vi_VN.ts
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TS version="2.1">
+<TS version="2.1" language="vi_VN">
   <context>
     <name>CdChecker</name>
     <message>
@@ -62,79 +62,79 @@
       <source>More than one result was found on MusicBrainz for this CD. Select the correct CD for accurate track information.</source>
     </message>
     <message>
-      <translation></translation>
+      <translation>Không thể nhổ đĩa ra</translation>
       <location filename="../cd/cdchecker-objc.mm" line="31" />
       <source>Couldn't eject the disc</source>
     </message>
     <message>
-      <translation></translation>
+      <translation>Đảm bảo rằng ứng dụng khác không cố truy cập đĩa, rồi thử lại.</translation>
       <location filename="../cd/cdchecker-objc.mm" line="32" />
       <source>Make sure no other applications are accessing the disc, and then try again.</source>
     </message>
   </context>
   <context>
     <name>MacBurnJob</name>
     <message>
-      <translation></translation>
+      <translation>Ghi đĩa hoàn thành</translation>
       <location filename="../burn/macburnjob.mm" line="79" />
       <source>Burn Complete</source>
     </message>
     <message>
-      <translation></translation>
+      <translation>Ghi đĩa bị hủy</translation>
       <location filename="../burn/macburnjob.mm" line="82" />
       <source>Burn cancelled</source>
     </message>
     <message>
-      <translation></translation>
+      <translation>Không thể ghi đĩa: %1</translation>
       <location filename="../burn/macburnjob.mm" line="84" />
       <source>Failed to burn: %1</source>
     </message>
     <message>
-      <translation></translation>
+      <translation>Đang xóa đĩa</translation>
       <location filename="../burn/macburnjob.mm" line="87" />
       <source>Erasing disc</source>
     </message>
     <message>
-      <translation></translation>
+      <translation>Đang hoàn thành đĩa</translation>
       <location filename="../burn/macburnjob.mm" line="91" />
       <source>Finalising disc</source>
     </message>
     <message>
-      <translation></translation>
+      <translation>Đang chuẩn bị ghi</translation>
       <location filename="../burn/macburnjob.mm" line="95" />
       <location filename="../burn/macburnjob.mm" line="97" />
       <source>Preparing to burn</source>
     </message>
     <message>
-      <translation></translation>
+      <translation>Đang ghi bài %1</translation>
       <location filename="../burn/macburnjob.mm" line="99" />
       <source>Burning track %1</source>
     </message>
     <message>
-      <translation></translation>
+      <translation>Đang ghi đĩa</translation>
       <location filename="../burn/macburnjob.mm" line="101" />
       <source>Burning</source>
     </message>
   </context>
   <context>
     <name>MacBurnJobPrivate</name>
     <message>
-      <translation></translation>
+      <translation>Ghi đĩa thành công</translation>
       <location filename="../burn/macburnjob.mm" line="69" />
       <source>Burn Successful</source>
     </message>
     <message>
-      <translation></translation>
+      <translation>Được ghi %1 vào đĩa</translation>
       <location filename="../burn/macburnjob.mm" line="69" />
       <source>Burned %1 to disc</source>
     </message>
     <message>
-      <translation></translation>
+      <translation>Ghi đĩa không thành công</translation>
       <location filename="../burn/macburnjob.mm" line="72" />
       <source>Burn Failure</source>
     </message>
     <message>
-      <translation></translation>
+      <translation>Không thể ghi %1 vào đĩa</translation>
       <location filename="../burn/macburnjob.mm" line="72" />
       <source>Failed to burn %1 to disc</source>
     </message>
@@ -155,25 +155,25 @@
       <source>Burn on macOS</source>
     </message>
     <message>
-      <translation></translation>
+      <translation>Vui lòng chèn một đĩa CD-R hoặc CD-RW</translation>
       <location filename="../burn/macburnprovider-objc.mm" line="90" />
       <source>Insert a CD-R or CD-RW</source>
     </message>
   </context>
   <context>
     <name>MusicBrainzReleaseModel</name>
     <message>
-      <translation></translation>
+      <translation>Phát hành: %1</translation>
       <location filename="../../PhononPlugin/musicbrainzreleasemodel.cpp" line="71" />
       <source>Released: %1</source>
     </message>
     <message>
-      <translation></translation>
+      <translation>Mã vạch %1</translation>
       <location filename="../../PhononPlugin/musicbrainzreleasemodel.cpp" line="73" />
       <source>Barcode: %1</source>
     </message>
     <message>
-      <translation></translation>
+      <translation>Quốc gia: %1</translation>
       <location filename="../../PhononPlugin/musicbrainzreleasemodel.cpp" line="75" />
       <source>Country: %1</source>
     </message>