Merge commit 'upstream/2.32.0.2'

1 files changed, 19 insertions, 7 deletions

diff --git a/po/vi.po b/po/vi.po
index e628241..4658219 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 05:36+0000\n"
-"PO-Revision-Date: 2010-01-26 22:27+0000\n"
-"Last-Translator: Launchpad Translations Administrators "
-"<rosetta@launchpad.net>\n"
+"PO-Revision-Date: 2010-10-25 07:59+0000\n"
+"Last-Translator: Yang Ha Nguyen <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-18 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-10-26 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -41,7 +40,7 @@ msgstr "A_6"
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:10
 msgid "All Pages From _Feeder"
-msgstr ""
+msgstr "Tất cả trang từ _Khay (Feeder)"
 
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:12
@@ -246,7 +245,7 @@ msgstr ""
 #. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:89
 msgid "_Rotate Crop"
-msgstr ""
+msgstr "_Xoay phần Xén trên màn hình (_Rotate Crop)"
 
 #. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:91
@@ -563,6 +562,18 @@ msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
+"Phần mềm này là phần mềm tự do: bạn có thể phân phối lại cũng như sửa đổi\n"
+"nó căn cứ vào giấy phép GNU General Public License do\n"
+"Free Software Foundation đã công bố, theo phiên bản 3 của giấy phép, hoặc\n"
+"(tùy thích) bất kỳ phiên bản sau.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
 #: ../src/ui.c:1275
@@ -578,7 +589,8 @@ msgstr "Công cụ đơn giản để quét tài liệu"
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Vu Do Quynh https://launchpad.net/~vu-do-quynh"
+"  Vu Do Quynh https://launchpad.net/~vu-do-quynh\n"
+"  Yang Ha Nguyen https://launchpad.net/~cmpitg"
 
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:1305