Author: keichwa Date: 2015-11-10 13:38:23 +0100 (Tue, 10 Nov 2015) New Revision: 94774 Modified: trunk/yast/vi/po/packager.vi.po trunk/yast/vi/po/storage.vi.po Log: merged Modified: trunk/yast/vi/po/packager.vi.po =================================================================== --- trunk/yast/vi/po/packager.vi.po 2015-11-10 12:38:13 UTC (rev 94773) +++ trunk/yast/vi/po/packager.vi.po 2015-11-10 12:38:23 UTC (rev 94774) @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: YaST\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2015-10-06 16:04+0200\n" "PO-Revision-Date: 2006-08-28 15:42+0400\n" "Last-Translator: Phan Vĩnh Thịnh <teppi82@gmail.com>\n" "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" @@ -201,8 +201,8 @@ #. force minimum width #. table header - name of the repo #. table header - name of the repo -#: src/clients/inst_mediacopy.rb:65 src/clients/repositories.rb:674 -#: src/clients/repositories.rb:687 +#: src/clients/inst_mediacopy.rb:65 src/clients/repositories.rb:703 +#: src/clients/repositories.rb:716 #: src/include/packager/key_manager_dialogs.rb:306 msgid "Name" msgstr "Tên" @@ -409,7 +409,7 @@ #. TRANSLATORS: dialog help #. TRANSLATORS: dialog help #: src/clients/inst_productsources.rb:1380 -#: src/include/packager/repositories_include.rb:91 +#: src/include/packager/repositories_include.rb:93 #, fuzzy msgid "<p>The repository manager is downloading repository details...</p>" msgstr "<p>Xin hãy đợi một chút trong khi cài đặt gói.</p>" @@ -525,8 +525,8 @@ #. dialog caption #. dialog caption #. dialog caption -#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1810 -#: src/modules/AddOnProduct.rb:682 +#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1845 +#: src/modules/AddOnProduct.rb:684 msgid "Initializing..." msgstr "Đang khởi chạy..." @@ -557,24 +557,24 @@ msgstr "Đang lưu cấu hình trình quản lý gói..." #. default (minimal) priority of a repository -#: src/clients/repositories.rb:55 +#: src/clients/repositories.rb:58 #, fuzzy msgid "&Priority" msgstr "&Cổng" -#: src/clients/repositories.rb:57 +#: src/clients/repositories.rb:60 #, fuzzy msgid "Keep Downloaded Packages" msgstr "Đang tải xuống gói" #. Command line help text for the repository module, %1 is "zypper" -#: src/clients/repositories.rb:72 +#: src/clients/repositories.rb:75 #, fuzzy msgid "Installation Repositories - This module does not support the command line interface, use '%1' instead." msgstr "Môđun YaST2 này không hỗ trợ giao diện câu lệnh." #. pad to 3 characters -#: src/clients/repositories.rb:166 +#: src/clients/repositories.rb:169 #, fuzzy msgid "Default" msgstr "Tuyến mặc định:" @@ -582,65 +582,81 @@ #. unkown name (alias) of the source #. get the editable propertis from 'source' parameter, #. get the fixed propertis from the package manager -#: src/clients/repositories.rb:195 src/clients/repositories.rb:260 +#: src/clients/repositories.rb:199 src/clients/repositories.rb:264 #, fuzzy msgid "Unknown Name" msgstr "Không biết thời gian" #. displaye only repositories from the selected service -#: src/clients/repositories.rb:326 src/clients/repositories.rb:362 -#: src/clients/repositories.rb:368 src/modules/SourceManager.rb:436 +#: src/clients/repositories.rb:334 src/clients/repositories.rb:335 +#: src/clients/repositories.rb:377 src/clients/repositories.rb:383 +#: src/modules/SourceManager.rb:436 msgid "Unknown" msgstr "Không biết" #. label to be used instead of URL if not found -#: src/clients/repositories.rb:328 src/clients/repositories.rb:361 -#: src/modules/AddOnProduct.rb:1334 +#: src/clients/repositories.rb:337 src/clients/repositories.rb:376 +#: src/modules/AddOnProduct.rb:1336 #, fuzzy msgid "URL: %1" msgstr "URL:" +#. TRANSLATORS: Raw URL is the address without expanding repo variables +#. e.g. Raw URL = http://something/$arch -> URL = http://something/x86_64 +#: src/clients/repositories.rb:342 +#, fuzzy +msgid "Raw URL: %s" +msgstr "URL:" + #. heading - in case repo name not found -#: src/clients/repositories.rb:357 +#: src/clients/repositories.rb:372 #, fuzzy msgid "Unknown Repository Name" msgstr "Không biết thư mục này" #. label, %1 is repo category (eg. YUM) -#: src/clients/repositories.rb:367 +#: src/clients/repositories.rb:382 #, fuzzy msgid "Category: %1" msgstr "Hạng mục" #. label, %1 is repo category (eg. YUM) -#: src/clients/repositories.rb:377 +#: src/clients/repositories.rb:392 #, fuzzy msgid "Service: %1" msgstr "Dịch vụ" #. #176013 -#: src/clients/repositories.rb:625 +#: src/clients/repositories.rb:640 #, fuzzy msgid "All repositories" msgstr "Kết quả: %1" -#: src/clients/repositories.rb:628 +#: src/clients/repositories.rb:643 #, fuzzy msgid "All services" msgstr "Dịch vụ" -#: src/clients/repositories.rb:637 +#: src/clients/repositories.rb:652 #, fuzzy msgid "Service '%1'" msgstr "Dịch vụ" +#. TRANSLATORS: Item in selection box that allow user to see only +#. repositories not associated with service. Sometimes called also +#. third party as they are usually repositories not provided by SUSE +#. within product subscription. +#: src/clients/repositories.rb:669 +msgid "Only repositories not provided by a service" +msgstr "" + #. combobox label -#: src/clients/repositories.rb:652 +#: src/clients/repositories.rb:681 msgid "View" msgstr "Xem" #. table header - priority of the repository - keep the translation as short as possible! -#: src/clients/repositories.rb:667 +#: src/clients/repositories.rb:696 #, fuzzy msgid "Priority" msgstr "&Cổng" @@ -648,7 +664,7 @@ #. table header - is the repo enabled? - keep the translation as short as possible! #. table header - is the repo enabled? - keep the translation as short as possible! #. status info, to be used inside summary -#: src/clients/repositories.rb:669 src/clients/repositories.rb:682 +#: src/clients/repositories.rb:698 src/clients/repositories.rb:711 #: src/modules/SourceManager.rb:393 msgid "Enabled" msgstr "Dùng" @@ -657,110 +673,110 @@ #. keep the translation as short as possible! #. table header - is autorefresh enabled for the repo? #. keep the translation as short as possible! -#: src/clients/repositories.rb:672 src/clients/repositories.rb:685 +#: src/clients/repositories.rb:701 src/clients/repositories.rb:714 #, fuzzy msgid "Autorefresh" msgstr "&Bỏ qua cập nhật" #. table header - service to which the repo belongs -#: src/clients/repositories.rb:676 +#: src/clients/repositories.rb:705 msgid "Service" msgstr "Dịch vụ" #. table header - URL of the repo #. table header - URL of the repo -#: src/clients/repositories.rb:678 src/clients/repositories.rb:689 +#: src/clients/repositories.rb:707 src/clients/repositories.rb:718 msgid "URL" msgstr "URL" #. push button - change URL of the selected repository -#: src/clients/repositories.rb:789 +#: src/clients/repositories.rb:818 msgid "&Replace..." msgstr "&Thay thế..." #. push button - refresh the selected repository now -#: src/clients/repositories.rb:791 +#: src/clients/repositories.rb:820 #, fuzzy msgid "Re&fresh Selected" msgstr "Hạng mục đăng ký" #. push button - disable/enable the selected repository -#: src/clients/repositories.rb:793 +#: src/clients/repositories.rb:822 #, fuzzy msgid "Status &on or off" msgstr "Dùng cập nhật hoặ&c không" #. push button - disable/enable automatic refresh of the selected repository -#: src/clients/repositories.rb:795 +#: src/clients/repositories.rb:824 #, fuzzy #| msgid "Refre&sh On or Off" msgid "Refre&sh on or off" msgstr "Dùng cập nhật hoặ&c không" #. push button - set name of the selected repository -#: src/clients/repositories.rb:797 +#: src/clients/repositories.rb:826 #, fuzzy msgid "Set &Name..." msgstr "Tê&n máy chủ" #. label -#: src/clients/repositories.rb:804 +#: src/clients/repositories.rb:833 #, fuzzy msgid "Properties" msgstr "Quá trình" #. check box -#: src/clients/repositories.rb:809 +#: src/clients/repositories.rb:838 #, fuzzy msgid "&Enabled" msgstr "Dùng" #. check box -#: src/clients/repositories.rb:815 +#: src/clients/repositories.rb:844 #, fuzzy msgid "Automatically &Refresh" msgstr "Tự động thay đổi" #. push button label -#: src/clients/repositories.rb:853 +#: src/clients/repositories.rb:882 #, fuzzy msgid "&GPG Keys..." msgstr "&Nhập chìa khóa..." #. menu button label -#: src/clients/repositories.rb:858 +#: src/clients/repositories.rb:887 msgid "Refresh" msgstr "Cập nhật" #. menu button label -#: src/clients/repositories.rb:862 +#: src/clients/repositories.rb:891 msgid "Refresh all Autor&efreshed" msgstr "" #. menu button label -#: src/clients/repositories.rb:864 +#: src/clients/repositories.rb:893 msgid "Refresh all &Enabled" msgstr "" #. dialog caption -#: src/clients/repositories.rb:871 +#: src/clients/repositories.rb:900 #, fuzzy msgid "Configured Software Repositories" msgstr "Hạng mục đã cấu hình" #. help -#: src/clients/repositories.rb:874 +#: src/clients/repositories.rb:903 #, fuzzy msgid "" "<p>\n" "Manage configured software repositories and services.</p>\n" msgstr "Hạng mục đã cấu hình" -#: src/clients/repositories.rb:880 +#: src/clients/repositories.rb:909 msgid "<P>A <B>service</B> or <B>Repository Index Service (RIS) </B> is a protocol for package repository management. A service can offer one or more software repositories which can be dynamically changed by the service administrator.</P>" msgstr "" -#: src/clients/repositories.rb:887 +#: src/clients/repositories.rb:916 msgid "" "<p>\n" "<b>Adding a new Repository or a Service</b><br>\n" @@ -770,7 +786,7 @@ msgstr "" #. help, continued -#: src/clients/repositories.rb:899 +#: src/clients/repositories.rb:928 #, fuzzy msgid "" "<p>\n" @@ -784,7 +800,7 @@ "</p>\n" #. help, continued -#: src/clients/repositories.rb:910 +#: src/clients/repositories.rb:939 #, fuzzy msgid "" "<p>\n" @@ -806,7 +822,7 @@ "</p>\n" #. help, continued -#: src/clients/repositories.rb:926 +#: src/clients/repositories.rb:955 msgid "" "<p>\n" "<b>Modifying Status of a Repository or a Service</b><br>\n" @@ -816,31 +832,31 @@ msgstr "" #. help text, continued -#: src/clients/repositories.rb:938 +#: src/clients/repositories.rb:967 msgid "" "<P><B>Priority of a Repository</B><BR>\n" "Priority of a repository is an integer value between 0 (the highest priority) and 200 (the lowest priority). Default is 99. If a package is available in more repositories, the repository with the highest priority is used.</P>\n" msgstr "" #. help text, continued -#: src/clients/repositories.rb:946 +#: src/clients/repositories.rb:975 msgid "<P>Select the appropriate option on top of the window for navigation in repositories and services.</P>" msgstr "" #. help text, continued -#: src/clients/repositories.rb:954 +#: src/clients/repositories.rb:983 msgid "" "<P><B>Keep Downloaded Packages</B><BR>Check this option to keep downloaded\n" "packages in a local cache so they can be reused later when the packages are\n" "reinstalled. If not checked, the downloaded packages are deleted after installation.</P>" msgstr "" -#: src/clients/repositories.rb:960 +#: src/clients/repositories.rb:989 msgid "<P>The default local cache is located in directory <B>/var/cache/zypp/packages</B>. Change the location in <B>/etc/zypp/zypp.conf</B> file.</P>" msgstr "" #. popup message part 1 -#: src/clients/repositories.rb:1005 +#: src/clients/repositories.rb:1034 #, fuzzy msgid "" "Unable to save changes to the repository\n" @@ -851,7 +867,7 @@ #. popup message part 2 followed by other info #. popup message, after message header, header of details -#: src/clients/repositories.rb:1011 src/modules/Packages.rb:1329 +#: src/clients/repositories.rb:1040 src/modules/Packages.rb:1329 #: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310 msgid "Details:" msgstr "Chi tiết:" @@ -859,19 +875,19 @@ #. popup message part 3 #. end of popup message, question #. end of popup message, question -#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1337 +#: src/clients/repositories.rb:1042 src/modules/Packages.rb:1337 #: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312 msgid "Try again?" msgstr "Thử lại?" #. popup headline -#: src/clients/repositories.rb:1030 +#: src/clients/repositories.rb:1059 #, fuzzy msgid "Abort Repository Configuration" msgstr "Dừng cấu hình hạng mục" #. popup message -#: src/clients/repositories.rb:1032 +#: src/clients/repositories.rb:1061 #, fuzzy msgid "" "Abort the repository configuration?\n" @@ -881,54 +897,54 @@ "Mọi thay đổi sẽ bị mất." #. refresh also the combobox widget -#: src/clients/repositories.rb:1329 +#: src/clients/repositories.rb:1364 msgid "" "There is no service at URL:\n" "%1" msgstr "" #. TODO: add help text -#: src/clients/repositories.rb:1440 +#: src/clients/repositories.rb:1475 #, fuzzy msgid "Refreshing Repositories" msgstr "Đang chạy môđun %1..." -#: src/clients/repositories.rb:1441 +#: src/clients/repositories.rb:1476 #, fuzzy msgid "Refreshing Services" msgstr "Đang chạy môđun %1..." -#: src/clients/repositories.rb:1446 +#: src/clients/repositories.rb:1481 #, fuzzy msgid "Refresh Repositories" msgstr "Hạng mục đăng ký" -#: src/clients/repositories.rb:1447 +#: src/clients/repositories.rb:1482 #, fuzzy msgid "Refresh Services" msgstr "Hạng mục đăng ký" #. progress bar label -#: src/clients/repositories.rb:1479 +#: src/clients/repositories.rb:1514 #, fuzzy msgid "Refreshing Repository %1..." msgstr "Đang chạy môđun %1..." #. refreshing services #. progress bar label -#: src/clients/repositories.rb:1505 +#: src/clients/repositories.rb:1540 #, fuzzy msgid "Refreshing Service %1..." msgstr "Đang chạy môđun %1..." #. yes-no popup -#: src/clients/repositories.rb:1524 +#: src/clients/repositories.rb:1559 #, fuzzy msgid "Delete the selected repository from the list?" msgstr "Xoá hạng mục đã chọn khỏi danh sách?" #. yes-no popup -#: src/clients/repositories.rb:1538 +#: src/clients/repositories.rb:1573 #, fuzzy msgid "" "Delete service %1\n" @@ -936,7 +952,7 @@ msgstr "Xoá hạng mục đã chọn khỏi danh sách?" #. popup message -#: src/clients/repositories.rb:1606 +#: src/clients/repositories.rb:1641 #, fuzzy msgid "" "For the selected repository, refresh\n" @@ -946,7 +962,7 @@ "thể cập nhật." #. popup question, %1 is repository URL -#: src/clients/repositories.rb:1768 +#: src/clients/repositories.rb:1803 msgid "" "Repository %1\n" "has been already added. Each repository should be added only once.\n" @@ -955,7 +971,7 @@ msgstr "" #. Error popup -#: src/clients/repositories.rb:1836 +#: src/clients/repositories.rb:1871 #, fuzzy msgid "<p>Errors occurred while restoring the repository configuration.</p>\n" msgstr "" @@ -1446,50 +1462,50 @@ msgstr "Thật sự xoá bỏ '%1'?" #. TRANSLATORS: dialog caption -#: src/include/packager/repositories_include.rb:77 +#: src/include/packager/repositories_include.rb:79 #, fuzzy msgid "Adding a New Repository" msgstr "Đang thêm hạng mục..." -#: src/include/packager/repositories_include.rb:81 +#: src/include/packager/repositories_include.rb:83 #, fuzzy msgid "Check Repository Type" msgstr "Chọn hạng mục SLP" -#: src/include/packager/repositories_include.rb:82 +#: src/include/packager/repositories_include.rb:84 #, fuzzy msgid "Add Repository" msgstr "Kết quả: %1" -#: src/include/packager/repositories_include.rb:83 +#: src/include/packager/repositories_include.rb:85 #, fuzzy msgid "Read Repository License" msgstr "Hạng mục đăng ký" -#: src/include/packager/repositories_include.rb:86 +#: src/include/packager/repositories_include.rb:88 #, fuzzy msgid "Checking Repository Type" msgstr "Đang chạy môđun %1..." -#: src/include/packager/repositories_include.rb:87 +#: src/include/packager/repositories_include.rb:89 #, fuzzy msgid "Adding Repository" msgstr "Đang thêm hạng mục..." -#: src/include/packager/repositories_include.rb:88 +#: src/include/packager/repositories_include.rb:90 #, fuzzy msgid "Reading Repository License" msgstr "Đang chạy môđun %1..." #. add at least one product if the scan result is empty (no product info available) -#: src/include/packager/repositories_include.rb:152 +#: src/include/packager/repositories_include.rb:154 #, fuzzy msgid "Repository" msgstr "Kết quả: %1" #. continue-back popup #. continue-back popup -#: src/include/packager/repositories_include.rb:224 +#: src/include/packager/repositories_include.rb:226 #: src/modules/SourceManager.rb:330 #, fuzzy #| msgid "" @@ -1512,7 +1528,7 @@ #. popup message part 1 #. Import GPG keys found in the inst-sys -#: src/include/packager/repositories_include.rb:319 +#: src/include/packager/repositories_include.rb:321 #: src/modules/Packages.rb:1324 src/modules/SourceManager.rb:306 #, fuzzy msgid "" @@ -1523,19 +1539,19 @@ "từ URL '%1'." #. error message -#: src/include/packager/repositories_include.rb:331 +#: src/include/packager/repositories_include.rb:333 msgid "" "Using an ISO image over ftp or http protocol is not possible.\n" "Change the protocol or unpack the ISO image on the server side." msgstr "" #. popup message part 2 -#: src/include/packager/repositories_include.rb:341 +#: src/include/packager/repositories_include.rb:343 msgid "Change the URL and try again?" msgstr "" #. popup error message, %1 is the package name -#: src/include/packager/repositories_include.rb:418 +#: src/include/packager/repositories_include.rb:420 msgid "" "Cannot search for SLP repositories\n" "without having %1 package installed.\n" @@ -1548,19 +1564,19 @@ #. error report #. popup error #. popup error -#: src/modules/AddOnProduct.rb:516 src/modules/AddOnProduct.rb:618 +#: src/modules/AddOnProduct.rb:518 src/modules/AddOnProduct.rb:620 #: src/modules/ProductLicense.rb:539 src/modules/ProductLicense.rb:730 msgid "An error occurred while preparing the installation system." msgstr "Gặp lỗi khi đợi chuẩn bị hệ thống cài đặt." #. error report -#: src/modules/AddOnProduct.rb:653 +#: src/modules/AddOnProduct.rb:655 msgid "Control file %1 not found on media." msgstr "Không tìm thấy tập tin điều khiển %1 trên đĩa." #. FATE #305578: Add-On Product Requiring Registration #. or check the content file -#: src/modules/AddOnProduct.rb:894 +#: src/modules/AddOnProduct.rb:896 #, fuzzy #| msgid "This package is not installed and it will not be installed." msgid "" @@ -1570,69 +1586,69 @@ #. TRANSLATORS: error report #. TRANSLATORS: error report -#: src/modules/AddOnProduct.rb:1261 src/modules/AddOnProduct.rb:1425 +#: src/modules/AddOnProduct.rb:1263 src/modules/AddOnProduct.rb:1427 #, fuzzy msgid "Unable to use additional products." msgstr "Lỗi thêm sản phẩm thương mại." #. fill up internal map (used later when item selected) -#: src/modules/AddOnProduct.rb:1312 src/modules/AddOnProduct.rb:1318 +#: src/modules/AddOnProduct.rb:1314 src/modules/AddOnProduct.rb:1320 #, fuzzy msgid "%1, URL: %2" msgstr "URL:" -#: src/modules/AddOnProduct.rb:1328 +#: src/modules/AddOnProduct.rb:1330 #, fuzzy msgid "URL: %1, Path: %2" msgstr "URL: %1, Thư mục: %2" #. TRANSLATORS: popup heading -#: src/modules/AddOnProduct.rb:1359 +#: src/modules/AddOnProduct.rb:1361 #, fuzzy msgid "Additional Products" msgstr "Sản phẩm thương mại" #. TRANSLATORS: additional dialog information -#: src/modules/AddOnProduct.rb:1365 +#: src/modules/AddOnProduct.rb:1367 msgid "" "The installation repository also contains the listed additional repositories.\n" "Select the ones you want to use.\n" msgstr "" -#: src/modules/AddOnProduct.rb:1376 +#: src/modules/AddOnProduct.rb:1378 #, fuzzy msgid "Additional Products to Select" msgstr "Chọn sản phẩm" #. push button label -#: src/modules/AddOnProduct.rb:1383 +#: src/modules/AddOnProduct.rb:1385 #, fuzzy msgid "Add Selected &Products" msgstr "Sản phẩm thương mại" #. %1 is either "CD" or "DVD" -#: src/modules/AddOnProduct.rb:1515 +#: src/modules/AddOnProduct.rb:1517 #, fuzzy #| msgid "Insert the add-on product CD" msgid "Insert the addon %1 medium" msgstr "Hãy đặt CD chứa sản phẩm thương mại vào ổ." #. %1 is the product name, %2 is either "CD" or "DVD" -#: src/modules/AddOnProduct.rb:1520 +#: src/modules/AddOnProduct.rb:1522 #, fuzzy #| msgid "Insert the first installation medium." msgid "Insert the %1 %2 medium" msgstr "Hãy đặt đĩa cài đặt đầu tiên vào ổ." #. TRANSLATORS: error message, %1 is replaced with product URL -#: src/modules/AddOnProduct.rb:1572 +#: src/modules/AddOnProduct.rb:1574 #, fuzzy msgid "Unable to add product %1." msgstr "Lỗi thêm sản phẩm thương mại." #. adding the product to the list of products (BNC #269625) #. no such products -#: src/modules/AddOnProduct.rb:1764 src/modules/AddOnProduct.rb:1770 +#: src/modules/AddOnProduct.rb:1766 src/modules/AddOnProduct.rb:1772 #: src/modules/Packages.rb:471 #, fuzzy msgid "Unknown Product" Modified: trunk/yast/vi/po/storage.vi.po =================================================================== --- trunk/yast/vi/po/storage.vi.po 2015-11-10 12:38:13 UTC (rev 94773) +++ trunk/yast/vi/po/storage.vi.po 2015-11-10 12:38:23 UTC (rev 94774) @@ -5357,7 +5357,7 @@ #. TRANSLATORS: error popup #: src/modules/Storage.rb:4893 msgid "Installing required packages failed." -msgstr "" +msgstr "Cài đặt gói yêu cầu không thành công." #: src/modules/Storage.rb:4894 src/modules/StorageClients.rb:159 #, fuzzy