[meld] Updated Vietnamese translation

From: Nguyen Thai Ngoc Duy <pclouds src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] Updated Vietnamese translation
Date: Sun, 12 Feb 2012 12:34:31 +0000 (UTC)
commit 6b6f935c64f02f188feb8ea229d950c15f3ca036
Author: TrÆÆng áng Minh <truongungminh gmail com>
Date:   Sun Feb 12 19:32:50 2012 +0700

    Updated Vietnamese translation

 po/vi.po |  516 +++++++++++++++++++++++++++-----------------------------------
 1 files changed, 225 insertions(+), 291 deletions(-)
---
diff --git a/po/vi.po b/po/vi.po
index 33c6a9f..f90ea57 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,6 +1,7 @@
 # Vietnamese translation for Meld.
 # Copyright Â 2005-2006 Gnome i18n Project for Vietnamese.
 # Clytie Siddall <clytie riverland net au>, 2005-2006.
+# TrÆÆng áng Minh <truongungminh gmail com>, 2012.
 #
 msgid ""
 msgstr ""
@@ -8,8 +9,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=meld&keywords=I18N+L10N&component=general\n"
 "POT-Creation-Date: 2011-12-09 23:15+0000\n"
-"PO-Revision-Date: 2012-02-12 19:20+0700\n"
-"Last-Translator: Clytie Siddall <clytie riverland net au>\n"
+"PO-Revision-Date: 2012-02-12 19:32+0700\n"
+"Last-Translator: TrÆÆng áng Minh <truongungminh gmail com>\n"
 "Language-Team: Vietnamese <gnomevi-list lists sourceforge net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -19,24 +20,22 @@ msgstr ""
 
 #: ../bin/meld:96
 msgid "Cannot import: "
-msgstr ""
+msgstr "KhÃng thá nháp: "
 
 #: ../bin/meld:99
 #, c-format
 msgid "Meld requires %s or higher."
-msgstr "TrÃnh Meld cán thiát %s hay sau."
+msgstr "Meld cán %s hay cao hÆn."
 
 #: ../data/meld.desktop.in.h:1
-#, fuzzy
 #| msgid "Compare and merge your files."
 msgid "Compare and merge your files"
-msgstr "So sÃnh vÃ trán táp tin cáa bán."
+msgstr "So sÃnh vÃ trán cÃc táp tin cáa bán"
 
 #: ../data/meld.desktop.in.h:2
-#, fuzzy
 #| msgid "Meld Diff Viewer"
 msgid "Diff Viewer"
-msgstr "Bá xem khÃc biát Meld"
+msgstr "Bá so sÃnh sá khÃc biát Meld"
 
 #: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.ui.h:5
 msgid "Meld"
@@ -44,7 +43,7 @@ msgstr "Meld"
 
 #: ../data/meld.desktop.in.h:4
 msgid "Meld Diff Viewer"
-msgstr "Bá xem khÃc biát Meld"
+msgstr "Bá so sÃnh sá khÃc biát Meld"
 
 #: ../data/ui/EditableList.ui.h:1
 msgid "Active"
@@ -52,29 +51,28 @@ msgstr "Hoát Äáng"
 
 #: ../data/ui/EditableList.ui.h:2
 msgid "Add new filter"
-msgstr ""
+msgstr "ThÃm bá lác mái"
 
 #: ../data/ui/EditableList.ui.h:3
 msgid "Editable List"
-msgstr ""
+msgstr "Danh sÃch cÃ thá sáa Äái"
 
 #: ../data/ui/EditableList.ui.h:4
-#, fuzzy
 #| msgid "_Down"
 msgid "Move _Down"
-msgstr "_Xuáng"
+msgstr "Há _Xuáng"
 
 #: ../data/ui/EditableList.ui.h:5
 msgid "Move _Up"
-msgstr ""
+msgstr "ÄÆa _LÃn"
 
 #: ../data/ui/EditableList.ui.h:6
 msgid "Move item down"
-msgstr ""
+msgstr "Há phán tá xuáng"
 
 #: ../data/ui/EditableList.ui.h:7
 msgid "Move item up"
-msgstr ""
+msgstr "ÄÆa phán tá lÃn"
 
 #: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:158
 msgid "Name"
@@ -86,11 +84,11 @@ msgstr "Máu"
 
 #: ../data/ui/EditableList.ui.h:10
 msgid "Remove selected filter"
-msgstr ""
+msgstr "XÃa bá bá lác ÄÃ chán"
 
 #: ../data/ui/EditableList.ui.h:11 ../meld/vcview.py:122
 msgid "_Add"
-msgstr "Th_Ãm"
+msgstr "_ThÃm"
 
 #: ../data/ui/EditableList.ui.h:12 ../meld/vcview.py:124
 msgid "_Remove"
@@ -101,7 +99,6 @@ msgid "Save modified files?"
 msgstr "LÆu táp tin bá sáa Äái khÃng?"
 
 #: ../data/ui/filediff.ui.h:2
-#, fuzzy
 #| msgid ""
 #| "<span weight=\"bold\" size=\"larger\">Some files have been modified.\n"
 #| "Which ones would you like to save?</span>"
@@ -109,64 +106,58 @@ msgid ""
 "Some files have been modified.\n"
 "Which ones would you like to save?"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Mát sá táp tin bá sáa Äái.\n"
-"Bán cÃ muán lÆu táp tin nÃo?</span>"
+"Mát sá táp tin ÄÃ bá thay Äái.\n"
+"Bán muán lÆu lái cÃi nÃo?"
 
 #: ../data/ui/filediff.ui.h:4
 msgid "_Discard Changes"
-msgstr ""
+msgstr "_Háy cÃc thay Äái"
 
 #: ../data/ui/filediff.ui.h:5
-#, fuzzy
 #| msgid "_Delete Selected"
 msgid "_Save Selected"
-msgstr "_XÃa bá vÃng chán"
+msgstr "_LÆu lái phán chán"
 
 #: ../data/ui/findbar.ui.h:1
-#, fuzzy
 #| msgid "Regular e_xpression"
 msgid "Regular E_xpression"
-msgstr "_Biáu thác chÃnh quy"
+msgstr "Biáu _thác chÃnh quy"
 
 #: ../data/ui/findbar.ui.h:2
 msgid "Replace _All"
-msgstr ""
+msgstr "Thay thá toÃn _bá"
 
 #: ../data/ui/findbar.ui.h:3
 msgid "Replace _With"
-msgstr ""
+msgstr "Thay thá _vái"
 
 #: ../data/ui/findbar.ui.h:4
 msgid "Who_le word"
-msgstr ""
+msgstr "_NguyÃn tá"
 
 #: ../data/ui/findbar.ui.h:5
-#, fuzzy
 #| msgid "_Match case"
 msgid "_Match Case"
-msgstr "_Kháp chá hoa/thÆáng"
+msgstr "Kháp _chá hoa/thÆáng"
 
 #: ../data/ui/findbar.ui.h:6
-#, fuzzy
 #| msgid "_None"
 msgid "_Next"
-msgstr "_KhÃng cÃ"
+msgstr "_Ká tiáp"
 
 #: ../data/ui/findbar.ui.h:7
-#, fuzzy
 #| msgid "Previous Logs"
 msgid "_Previous"
-msgstr "Bán ghi trÆác"
+msgstr "_TrÆác ÄÃ"
 
 #: ../data/ui/findbar.ui.h:8 ../meld/meldwindow.py:141
 msgid "_Replace"
-msgstr ""
+msgstr "_Thay thá"
 
 #: ../data/ui/findbar.ui.h:9
-#, fuzzy
 #| msgid "Search for:"
 msgid "_Search for"
-msgstr "TÃm kiám:"
+msgstr "TÃm _kiám"
 
 #: ../data/ui/meldapp.ui.h:1
 msgid "Choose Files"
@@ -177,6 +168,8 @@ msgid ""
 "Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
 "Copyright &#xA9; 2009-2011 Kai Willadsen"
 msgstr ""
+"Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
+"Copyright &#xA9; 2009-2011 Kai Willadsen"
 
 #: ../data/ui/meldapp.ui.h:4
 msgid "Directory"
@@ -198,14 +191,13 @@ msgid "Other"
 msgstr "KhÃc"
 
 #: ../data/ui/meldapp.ui.h:12
-#, fuzzy
 #| msgid "CVS Directory"
 msgid "Select VC Directory"
-msgstr "ThÆ mác CVS"
+msgstr "Chán thÆ mác ÄKPB"
 
 #: ../data/ui/meldapp.ui.h:13
 msgid "_Directory Comparison"
-msgstr "So sÃnh th_Æ mác"
+msgstr "So sÃnh thÆ _mác"
 
 #: ../data/ui/meldapp.ui.h:14
 msgid "_File Comparison"
@@ -213,15 +205,15 @@ msgstr "So sÃnh _táp tin"
 
 #: ../data/ui/meldapp.ui.h:15
 msgid "_Three Way Compare"
-msgstr "So sÃnh _ba chiáu"
+msgstr "So sÃnh _ba phÆÆng dián"
 
 #: ../data/ui/meldapp.ui.h:16
 msgid "_Version Control Browser"
-msgstr "Bá Duyát Äiáu Khián _PhiÃn Bán"
+msgstr "_PhiÃn Bán Bá Duyát Äiáu Khián"
 
 #: ../data/ui/meldapp.ui.h:17
 msgid "translator-credits"
-msgstr ""
+msgstr "TrÆÆng áng Minh <truongungminh gmail com>"
 
 #: ../data/ui/patch-dialog.ui.h:1
 msgid "Copy to Clipboard"
@@ -229,31 +221,29 @@ msgstr "ChÃp vÃo báng tám"
 
 #: ../data/ui/patch-dialog.ui.h:2
 msgid "Create Patch"
-msgstr "Táo Äáp vÃ"
+msgstr "Táo bán vÃ"
 
 #: ../data/ui/patch-dialog.ui.h:3
-#, fuzzy
 #| msgid "Create Patch"
 msgid "Create a patch"
-msgstr "Táo Äáp vÃ"
+msgstr "Táo bán vÃ"
 
 #: ../data/ui/patch-dialog.ui.h:4
 msgid "Left and middle panes"
-msgstr ""
+msgstr "Bán bÃn trÃi vÃ giáa"
 
 #: ../data/ui/patch-dialog.ui.h:5
 msgid "Middle and right panes"
-msgstr ""
+msgstr "Bán giáa vÃ bÃn phái"
 
 #: ../data/ui/patch-dialog.ui.h:6
-#, fuzzy
 #| msgid "No differences found."
 msgid "Use differences between:"
-msgstr "KhÃng tÃm tháy khÃc biát."
+msgstr "DÃng sá khÃc biát giáa:"
 
 #: ../data/ui/patch-dialog.ui.h:7
 msgid "_Reverse patch direction"
-msgstr ""
+msgstr "Äá_o ngÆác hÆáng cáa bán vÃ"
 
 #: ../data/ui/preferences.ui.h:1
 msgid "Display"
@@ -261,13 +251,12 @@ msgstr "Hián thá"
 
 #: ../data/ui/preferences.ui.h:2
 msgid "Do not _split words over two lines"
-msgstr ""
+msgstr "Äáng _tÃch cÃc tá quÃ hai dÃng"
 
 #: ../data/ui/preferences.ui.h:3
-#, fuzzy
 #| msgid "Custom command"
 msgid "Edito_r command:"
-msgstr "Lánh tá chán"
+msgstr "_Lánh bá soán tháo:"
 
 #: ../data/ui/preferences.ui.h:4
 msgid "Editor"
@@ -275,17 +264,16 @@ msgstr "Bá hiáu chánh"
 
 #: ../data/ui/preferences.ui.h:5
 msgid "Enable text _wrapping"
-msgstr ""
+msgstr "Bát _cuán chá"
 
 #: ../data/ui/preferences.ui.h:6
 msgid "Encoding"
-msgstr "Báng mÃ"
+msgstr "MÃ hÃa"
 
 #: ../data/ui/preferences.ui.h:7
-#, fuzzy
 #| msgid "Internal editor"
 msgid "External editor"
-msgstr "Bá hiáu chánh nái bá"
+msgstr "Bá soán tháo bÃn ngoÃi"
 
 #: ../data/ui/preferences.ui.h:8
 msgid "File Filters"
@@ -293,7 +281,7 @@ msgstr "Bá lác táp tin"
 
 #: ../data/ui/preferences.ui.h:9
 msgid "Font"
-msgstr ""
+msgstr "PhÃng chá"
 
 #: ../data/ui/preferences.ui.h:10
 msgid "Ignore changes which insert or delete blank lines"
@@ -301,49 +289,44 @@ msgstr "Bá qua thay Äái chÃn hay xÃa bá dÃng tráng."
 
 #: ../data/ui/preferences.ui.h:11
 msgid "Ignore symbolic links"
-msgstr ""
+msgstr "Bá qua cÃc liÃn kát biáu trÆng"
 
 #: ../data/ui/preferences.ui.h:12
-#, fuzzy
 #| msgid "<b>Loading</b>"
 msgid "Loading"
-msgstr "<b>Äang tái</b>"
+msgstr "Äang tái"
 
 #: ../data/ui/preferences.ui.h:13
-#, fuzzy
 #| msgid "Preferences : Meld"
 msgid "Meld Preferences"
-msgstr "TÃy thÃch: Meld"
+msgstr "Bá tÃy thÃch Meld"
 
 #: ../data/ui/preferences.ui.h:14
-#, fuzzy
 #| msgid "Show line numbers"
 msgid "Show _line numbers"
-msgstr "Hián sá thá tá dÃng"
+msgstr "Hián sá _dÃng"
 
 #: ../data/ui/preferences.ui.h:15
 msgid "Show w_hitespace"
-msgstr ""
+msgstr "Hián khoáng _tráng"
 
 #: ../data/ui/preferences.ui.h:16
 msgid "Text Filters"
 msgstr "Bá lác chá"
 
 #: ../data/ui/preferences.ui.h:17
-#, fuzzy
 #| msgid "Gnome default editor"
 msgid "Use _default system editor"
-msgstr "Bá hiáu chánh mác Äánh Gnome"
+msgstr "_DÃng  bá soán tháo mác Äánh cáa há tháng"
 
 #: ../data/ui/preferences.ui.h:18
-#, fuzzy
 #| msgid "Use syntax highlighting"
 msgid "Use s_yntax highlighting"
-msgstr "TÃ sÃng cÃ phÃp"
+msgstr "TÃ _sÃng cÃ phÃp"
 
 #: ../data/ui/preferences.ui.h:19
 msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
-msgstr "Khi tái thÃ thá ra nháng codec theo thá tá (v.d. utf8, iso8859)"
+msgstr "Khi tái thÃ thá nháng codec theo thá tá (v.d. utf8, iso8859)"
 
 #: ../data/ui/preferences.ui.h:20
 msgid ""
@@ -352,7 +335,7 @@ msgid ""
 "separated by spaces."
 msgstr ""
 "Khi so sÃnh thÆ mác, bán cÃ thá lác ra táp tin vÃ thÆ mác theo tÃn. Mái máu "
-"lÃ danh sÃch kÃ tá Äái dián kiáu há vá, Äánh giái báng dáu cÃch."
+"lÃ danh sÃch kÃ tá Äái dián kiáu há vá phÃn biát bái dáu cÃch."
 
 #: ../data/ui/preferences.ui.h:21
 msgid ""
@@ -363,29 +346,27 @@ msgid ""
 "details."
 msgstr ""
 "Khi so sÃnh táp tin, bán cÃ thá bá qua mát sá kiáu thay Äái. Tái ÄÃy, mái "
-"máu lÃ biáu thác chÃnh quy Python mÃ thay thá chuái kháp báng chuái ráng "
+"máu lÃ mát biáu thác chÃnh quy Python thay thá chuái kháp báng chuái ráng "
 "trÆác khi so sÃnh. Náu biáu thác cháa nhÃm thÃ chá thay thá nhÃm. HÃy xem sá "
-"tay ngÆái dÃng Äá tÃm chi tiát."
+"tay ngÆái dÃng Äá biát thÃm chi tiát."
 
 #: ../data/ui/preferences.ui.h:22
-#, fuzzy
 #| msgid "Editor"
 msgid "_Editor font:"
-msgstr "Bá hiáu chánh"
+msgstr "_PhÃng chá soán tháo:"
 
 #: ../data/ui/preferences.ui.h:23
 msgid "_Insert spaces instead of tabs"
-msgstr ""
+msgstr "_ChÃn khoáng tráng thay cho tab"
 
 #: ../data/ui/preferences.ui.h:24
-#, fuzzy
 #| msgid "Tab width"
 msgid "_Tab width:"
-msgstr "Ráng _tab:"
+msgstr "Äá ráng _tab:"
 
 #: ../data/ui/preferences.ui.h:25
 msgid "_Use the system fixed width font"
-msgstr ""
+msgstr "_DÃng Äá ráng phÃng chá Äá ráng cá Äánh cáa há tháng"
 
 #: ../data/ui/vcview.ui.h:1
 msgid "Commit Files"
@@ -412,25 +393,21 @@ msgid "Compare selected"
 msgstr "So sÃnh vÃng chán"
 
 #: ../meld/dirdiff.py:227
-#, fuzzy
 #| msgid "Copy To Left"
 msgid "Copy _Left"
-msgstr "ChÃp sang trÃi"
+msgstr "ChÃp sang _trÃi"
 
 #: ../meld/dirdiff.py:227
-#, fuzzy
 #| msgid "Copy To Left"
 msgid "Copy to left"
 msgstr "ChÃp sang trÃi"
 
 #: ../meld/dirdiff.py:228
-#, fuzzy
 #| msgid "Copy To Right"
 msgid "Copy _Right"
-msgstr "ChÃp sang phái"
+msgstr "ChÃp sang _phái"
 
 #: ../meld/dirdiff.py:228
-#, fuzzy
 #| msgid "Copy To Right"
 msgid "Copy to right"
 msgstr "ChÃp sang phái"
@@ -440,10 +417,9 @@ msgid "Delete selected"
 msgstr "XÃa bá vÃng chán"
 
 #: ../meld/dirdiff.py:230 ../meld/filediff.py:1157
-#, fuzzy
 #| msgid "Hide %s"
 msgid "Hide"
-msgstr "án %s"
+msgstr "án"
 
 #: ../meld/dirdiff.py:230
 msgid "Hide selected"
@@ -463,7 +439,7 @@ msgstr "TrÃng"
 
 #: ../meld/dirdiff.py:235
 msgid "Show identical"
-msgstr "Hián trÃng chÃnh xÃc"
+msgstr "Hián thá Äáng nhát"
 
 #: ../meld/dirdiff.py:236
 msgid "New"
@@ -479,19 +455,17 @@ msgstr "Bá sáa Äái"
 
 #: ../meld/dirdiff.py:237 ../meld/vcview.py:132
 msgid "Show modified"
-msgstr "Hián ÄÃ sáa Äái"
+msgstr "Hián cÃc thay Äái"
 
 #: ../meld/dirdiff.py:239
-#, fuzzy
 #| msgid "File Filters"
 msgid "Filters"
-msgstr "Bá lác táp tin"
+msgstr "Bá lác"
 
 #: ../meld/dirdiff.py:239
-#, fuzzy
 #| msgid "File Filters"
 msgid "Set active filters"
-msgstr "Bá lác táp tin"
+msgstr "Bát bá lác"
 
 #: ../meld/dirdiff.py:354
 #, python-format
@@ -511,24 +485,23 @@ msgstr "[%s] ÄÃ xong."
 
 #: ../meld/dirdiff.py:573
 msgid "Multiple errors occurred while scanning this folder"
-msgstr ""
+msgstr "Nhiáu lái phÃt sinh trong lÃc quÃt thÆ mác nÃy"
 
 #: ../meld/dirdiff.py:574
 msgid "Files with invalid encodings found"
-msgstr ""
+msgstr "ÄÃ tÃm tháy nhiáu táp tin bá lái mÃ hÃa ÄÃ tÃm tháy"
 
 #. TRANSLATORS: This is followed by a list of files
 #: ../meld/dirdiff.py:576
 msgid "Some files were in an incorrect encoding. The names are something like:"
-msgstr ""
+msgstr "Mát sá táp tin bá lái mÃ hÃa khÃng ÄÃng. TÃn cáa chÃng giáng nhÆ:"
 
 #: ../meld/dirdiff.py:578
 msgid "Files hidden by case insensitive comparison"
-msgstr ""
+msgstr "CÃc táp tin án trong trÆáng háp so sÃnh khÃng nháy cám"
 
 #. TRANSLATORS: This is followed by a list of files
 #: ../meld/dirdiff.py:580
-#, fuzzy
 #| msgid ""
 #| "You are running a case insensitive comparison on a case sensitive "
 #| "filesystem. Some files are not visible:\n"
@@ -538,9 +511,7 @@ msgid ""
 "filesystem. The following files in this folder are hidden:"
 msgstr ""
 "Bán Äang cháy viác so sÃnh khÃng phÃn biát chá hoa/thÆáng trong há tháng táp "
-"tin cÃ phái phÃn biát chá hoa/thÆáng. NhÆ thá thÃ, bán sá khÃng thá tháy mát "
-"sá táp tin:\n"
-"%s"
+"tin cÃ phái phÃn biát chá hoa/thÆáng. Nháng táp tin sau ÄÃy sá bá án:"
 
 #: ../meld/dirdiff.py:591
 #, python-format
@@ -548,10 +519,9 @@ msgid "'%s' hidden by '%s'"
 msgstr "Â %s Â do Â %s Â án"
 
 #: ../meld/dirdiff.py:616 ../meld/filediff.py:1008 ../meld/filediff.py:1161
-#, fuzzy
 #| msgid "Hide %s"
 msgid "Hi_de"
-msgstr "án %s"
+msgstr "á_n"
 
 #: ../meld/dirdiff.py:666
 #, python-format
@@ -574,7 +544,7 @@ msgstr ""
 "%s"
 
 #: ../meld/dirdiff.py:691 ../meld/vcview.py:503
-#, fuzzy, python-format
+#, python-format
 #| msgid ""
 #| "'%s' is a directory.\n"
 #| "Remove recusively?"
@@ -582,7 +552,7 @@ msgid ""
 "'%s' is a directory.\n"
 "Remove recursively?"
 msgstr ""
-"Â %s Â lÃ mát thÆ mác\n"
+"'%s' lÃ mát thÆ mác.\n"
 "Gá bá Äá qui khÃng?"
 
 #: ../meld/dirdiff.py:698 ../meld/vcview.py:508
@@ -640,173 +610,164 @@ msgstr[0] "%i nÄm"
 
 #: ../meld/filediff.py:294
 msgid "Format as patch..."
-msgstr ""
+msgstr "Äánh dáng nhÆ lÃ bán vÃ..."
 
 #: ../meld/filediff.py:294
 msgid "Create a patch using differences between files"
-msgstr ""
+msgstr "DÃng sá khÃc biát giáa cÃc táp tin Äá táo mát bán vÃ"
 
 #: ../meld/filediff.py:295
-#, fuzzy
 #| msgid "Previous Logs"
 msgid "Previous conflict"
-msgstr "Bán ghi trÆác"
+msgstr "Xung Äát váa rái"
 
 #: ../meld/filediff.py:295
 msgid "Go to the previous conflict"
-msgstr ""
+msgstr "Äi tái xung Äát váa xáy ra"
 
 #: ../meld/filediff.py:296
 msgid "Next conflict"
-msgstr ""
+msgstr "Xung Äát tiáp theo"
 
 #: ../meld/filediff.py:296
 msgid "Go to the next conflict"
-msgstr ""
+msgstr "Äi tái xung Äát tiáp theo"
 
 #: ../meld/filediff.py:297
 msgid "Push to left"
-msgstr ""
+msgstr "Äáy qua bÃn trÃi"
 
 #: ../meld/filediff.py:297
 msgid "Push current change to the left"
-msgstr ""
+msgstr "Äáy thay Äái hián cÃ sang phÃa bÃn trÃi"
 
 #: ../meld/filediff.py:298
 msgid "Push to right"
-msgstr ""
+msgstr "Äáy sang phái"
 
 #: ../meld/filediff.py:298
 msgid "Push current change to the right"
-msgstr ""
+msgstr "Äáy thay Äái hián cÃ sang phÃa bÃn phái"
 
 #. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
 #: ../meld/filediff.py:300
 msgid "Pull from left"
-msgstr ""
+msgstr "KÃo sang trÃi"
 
 #: ../meld/filediff.py:300
 msgid "Pull change from the left"
-msgstr ""
+msgstr "KÃo thay Äái sang phÃa bÃn trÃi"
 
 #: ../meld/filediff.py:301
 msgid "Pull from right"
-msgstr ""
+msgstr "KÃo sang phái"
 
 #: ../meld/filediff.py:301
 msgid "Pull change from the right"
-msgstr ""
+msgstr "KÃo thay Äái sang phÃa bÃn phái"
 
 #: ../meld/filediff.py:302
-#, fuzzy
 #| msgid "Copy To Left"
 msgid "Copy above left"
-msgstr "ChÃp sang trÃi"
+msgstr "ChÃp á trÃn sang trÃi"
 
 #: ../meld/filediff.py:302
 msgid "Copy change above the left chunk"
-msgstr ""
+msgstr "ChÃp thay Äái cáa Äoán dá liáu phÃa trÃn bÃn trÃi"
 
 #: ../meld/filediff.py:303
-#, fuzzy
 #| msgid "Copy To Left"
 msgid "Copy below left"
-msgstr "ChÃp sang trÃi"
+msgstr "ChÃp á dÆái sang trÃi"
 
 #: ../meld/filediff.py:303
 msgid "Copy change below the left chunk"
-msgstr ""
+msgstr "ChÃp thay Äái cáa Äoán dá liáu phÃa dÆái bÃn trÃi"
 
 #: ../meld/filediff.py:304
-#, fuzzy
 #| msgid "Copy To Right"
 msgid "Copy above right"
-msgstr "ChÃp sang phái"
+msgstr "ChÃp á trÃn sang phái"
 
 #: ../meld/filediff.py:304
 msgid "Copy change above the right chunk"
-msgstr ""
+msgstr "ChÃp thay Äái cáa Äoán dá liáu phÃa trÃn bÃn phái"
 
 #: ../meld/filediff.py:305
-#, fuzzy
 #| msgid "Copy To Right"
 msgid "Copy below right"
-msgstr "ChÃp sang phái"
+msgstr "ChÃp á dÆái sang phái"
 
 #: ../meld/filediff.py:305
 msgid "Copy change below the right chunk"
-msgstr ""
+msgstr "ChÃp thay Äái cáa Äoán dá liáu phÃa dÆái bÃn phái"
 
 #: ../meld/filediff.py:306
-#, fuzzy
 #| msgid "Date"
 msgid "Delete"
-msgstr "NgÃy"
+msgstr "XÃa"
 
 #: ../meld/filediff.py:306
-#, fuzzy
 #| msgid "Delete locally"
 msgid "Delete change"
-msgstr "XoÃ bá các bá"
+msgstr "XoÃ cÃc thay Äái"
 
 #: ../meld/filediff.py:307
 msgid "Merge all changes from left"
-msgstr ""
+msgstr "Háp nhát cÃc thay Äái tá bÃn trÃi"
 
 #: ../meld/filediff.py:307
 msgid "Merge all non-conflicting changes from the left"
-msgstr ""
+msgstr "Háp nhát nháng thay Äái khÃng xung Äát nhau tá bÃn trÃi"
 
 #: ../meld/filediff.py:308
 msgid "Merge all changes from right"
-msgstr ""
+msgstr "Háp nhát cÃc thay Äái tá bÃn phái"
 
 #: ../meld/filediff.py:308
 msgid "Merge all non-conflicting changes from the right"
-msgstr ""
+msgstr "Háp nhát nháng thay Äái khÃng xung Äát nhau tá bÃn phái"
 
 #: ../meld/filediff.py:309
 msgid "Merge all non-conflicting"
-msgstr ""
+msgstr "Háp nhát cÃc tÆÆng thÃch"
 
 #: ../meld/filediff.py:309
 msgid "Merge all non-conflicting changes from left and right panes"
-msgstr ""
+msgstr "Háp nhát tát cá thay Äái tÆÆng thÃch tá bán bÃn trÃi vÃ bÃn phái"
 
 #: ../meld/filediff.py:310
 msgid "Cycle through documents"
-msgstr ""
+msgstr "Quay vÃng trong cÃc tÃi liáu"
 
 #: ../meld/filediff.py:310
 msgid "Move keyboard focus to the next document in this comparison"
-msgstr ""
+msgstr "Chuyán tiÃu Äiám bÃn phÃm qua tÃi liáu ká tiáp trong so sÃnh nÃy"
 
 #: ../meld/filediff.py:314
 msgid "Lock scrolling"
-msgstr ""
+msgstr "KhoÃ cuán"
 
 #: ../meld/filediff.py:315
 msgid "Lock scrolling of all panes"
-msgstr ""
+msgstr "KhoÃ cuán trong tát cá cÃc khung"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
 #: ../meld/filediff.py:396
-#, fuzzy
 #| msgid "INS,OVR"
 msgid "INS"
-msgstr "CH,ÄÃ"
+msgstr "CHÃN"
 
 #: ../meld/filediff.py:396
-#, fuzzy
 #| msgid "INS,OVR"
 msgid "OVR"
-msgstr "CH,ÄÃ"
+msgstr "ÄÃ"
 
 #. Abbreviation for line, column so that it will fit in the status bar
 #: ../meld/filediff.py:398
 #, python-format
 msgid "Ln %i, Col %i"
-msgstr "Dg %i, Cát %i"
+msgstr "DÃng %i, Cát %i"
 
 #: ../meld/filediff.py:722
 #, fuzzy, python-format
@@ -823,7 +784,7 @@ msgstr ""
 #. TRANSLATORS: this is the name of a new file which has not yet been saved
 #: ../meld/filediff.py:809
 msgid "<unnamed>"
-msgstr ""
+msgstr "<ChÆa Äát tÃn>"
 
 #: ../meld/filediff.py:996
 #, python-format
@@ -837,10 +798,9 @@ msgstr "[%s] Äang má táp tin"
 
 #: ../meld/filediff.py:1026 ../meld/filediff.py:1035 ../meld/filediff.py:1047
 #: ../meld/filediff.py:1053
-#, fuzzy
 #| msgid "Could not read from '%s'"
 msgid "Could not read file"
-msgstr "KhÃng Äác ÄÆác tá Â %s Â"
+msgstr "KhÃng Äác ÄÆác táp tin"
 
 #: ../meld/filediff.py:1027
 #, python-format
@@ -850,36 +810,36 @@ msgstr "[%s] Äang Äác táp tin"
 #: ../meld/filediff.py:1036
 #, python-format
 msgid "%s appears to be a binary file."
-msgstr ""
+msgstr "%s hÃnh nhÆ lÃ mát táp tin nhá phÃn."
 
 #: ../meld/filediff.py:1048
-#, fuzzy, python-format
+#, python-format
 #| msgid "I tried encodings %s."
 msgid "%s is not in encodings: %s"
-msgstr "TrÃnh nÃy ÄÃ thá ra báng mÃ %s."
+msgstr "%s khÃng ÄÆác mÃ hÃa: %s"
 
 #: ../meld/filediff.py:1078 ../meld/filemerge.py:67
 #, python-format
 msgid "[%s] Computing differences"
-msgstr "[%s] Äang tÃnh khÃc biát"
+msgstr "[%s] Äang tÃnh sá khÃc biát"
 
 #: ../meld/filediff.py:1148
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
 msgstr ""
+"Bá lác chá Äang hoát Äáng vÃ cÃ thá che giáu sá khÃc biát giáa cÃc táp tin. "
+"Bán cÃ muán so sÃnh nháng táp tin chÆa ÄÆác lác?"
 
 #: ../meld/filediff.py:1154
-#, fuzzy
 #| msgid "Show identical"
 msgid "Files are identical"
-msgstr "Hián trÃng chÃnh xÃc"
+msgstr "CÃc táp tin Äáu giáng nhau"
 
 #: ../meld/filediff.py:1164
-#, fuzzy
 #| msgid "Show unversioned files"
 msgid "Show without filters"
-msgstr "Hián táp tin khÃng ÄKPB"
+msgstr "Hián thá nhÆng khÃng lác"
 
 #: ../meld/filediff.py:1354
 #, python-format
@@ -915,7 +875,7 @@ msgid ""
 msgstr ""
 "Táp tin Â %s Â cháa nhiáu kiáu kÃ tá kát thÃc dÃng.\n"
 "\n"
-"Bán cÃ muán sá dáng dáng thác nÃo?"
+"Bán muán dÃng Äánh dáng nÃo?"
 
 #: ../meld/filediff.py:1407
 #, python-format
@@ -929,7 +889,7 @@ msgstr ""
 # Type: boolean
 # Description
 #: ../meld/filediff.py:1466
-#, fuzzy, python-format
+#, python-format
 #| msgid ""
 #| "Refreshing will discard changes in:\n"
 #| "%s\n"
@@ -941,72 +901,70 @@ msgid ""
 "\n"
 "You cannot undo this operation."
 msgstr ""
-"Viác lÃm tÆÆi sá háy bá thay Äái trong:\n"
+"Viác tái lái sá háy bá cÃc thay Äái trong:\n"
 "%s\n"
 "\n"
 "KhÃng thá hoÃn tÃc hÃnh Äáng nÃy."
 
 #: ../meld/filemerge.py:82
-#, fuzzy, python-format
+#, python-format
 #| msgid "[%s] Opening files"
 msgid "[%s] Merging files"
-msgstr "[%s] Äang má táp tin"
+msgstr "[%s] Äang tráng táp tin"
 
 #: ../meld/meldapp.py:149
-#, fuzzy
 #| msgid "Wrong number of arguments (Got %i)"
 msgid "wrong number of arguments supplied to --diff"
-msgstr "CÃ sá Äái sá khÃng ÄÃng (nhán %i)."
+msgstr "Äái sá cung cáp cho --diff bá sai"
 
 #: ../meld/meldapp.py:153
 msgid "Start with an empty window"
-msgstr ""
+msgstr "Bát Äáu vái mát cáa sá ráng"
 
 #: ../meld/meldapp.py:154 ../meld/meldapp.py:155 ../meld/meldapp.py:157
 msgid "file"
-msgstr ""
+msgstr "táp tin"
 
 #: ../meld/meldapp.py:154 ../meld/meldapp.py:156 ../meld/meldapp.py:157
-#, fuzzy
 #| msgid "Editor"
 msgid "dir"
-msgstr "Bá hiáu chánh"
+msgstr "dir"
 
 #: ../meld/meldapp.py:154
 msgid "Start a version control comparison"
-msgstr ""
+msgstr "Bát Äáu vái viác so sÃnh bá Äiáu khián phiÃn bán"
 
 #: ../meld/meldapp.py:155
 msgid "Start a 2- or 3-way file comparison"
-msgstr ""
+msgstr "Bát Äáu mát so sÃnh 2 hoác 3 phÆÆng dián"
 
 #: ../meld/meldapp.py:156
 msgid "Start a 2- or 3-way directory comparison"
-msgstr ""
+msgstr "Bát Äáu so sÃnh 2 hoác 3 phÆÆng dián cáa thÆ mác"
 
 #: ../meld/meldapp.py:157
 msgid "Start a comparison between file and dir/file"
-msgstr ""
+msgstr "Bát Äáu so sÃnh giáa táp tin vÃ Äáa chá/táp tin"
 
 #: ../meld/meldapp.py:163
 msgid "Meld is a file and directory comparison tool."
-msgstr ""
+msgstr "Meld lÃ mát cÃng cá so sÃnh táp tin vÃ thÆ mác."
 
 #: ../meld/meldapp.py:166
 msgid "Set label to use instead of file name"
-msgstr ""
+msgstr "Äát nhÃn thay vÃ dÃng tÃn táp tin"
 
 #: ../meld/meldapp.py:168
 msgid "Automatically compare all differing files on startup"
-msgstr ""
+msgstr "LuÃn tá Äáng so sÃnh cÃc táp tin khi khái Äáng"
 
 #: ../meld/meldapp.py:170
 msgid "Ignored for compatibility"
-msgstr ""
+msgstr "Bá qua Äá tÆÆng thÃch"
 
 #: ../meld/meldapp.py:173
 msgid "Set the target file for saving a merge result"
-msgstr ""
+msgstr "Äát táp tin chá Äánh Äá lÆu lái kát quá háp nhát"
 
 #: ../meld/meldapp.py:176
 msgid "Creates a diff tab for up to 3 supplied files or directories."
@@ -1015,23 +973,21 @@ msgstr ""
 #: ../meld/meldapp.py:179
 #, python-format
 msgid "too many arguments (wanted 0-4, got %d)"
-msgstr ""
+msgstr "quÃ nhiáu Äái sá (muán 0-4, láy %d)"
 
 #: ../meld/meldapp.py:181 ../meld/meldapp.py:185
-#, fuzzy
 #| msgid "Cannot compare a mixture of files and directories.\n"
 msgid "can't compare more than three directories"
-msgstr "KhÃng thá so sÃnh táp tin vÃ thÆ mác vái nhau.\n"
+msgstr "khÃng thá so sÃnh nhiáu hÆn ba Äáa chá"
 
 #: ../meld/melddoc.py:56 ../meld/melddoc.py:57
 msgid "untitled"
 msgstr "khÃng tÃn"
 
 #: ../meld/meldwindow.py:125
-#, fuzzy
 #| msgid "My File"
 msgid "_File"
-msgstr "Táp tin tÃi"
+msgstr "_Táp tin"
 
 #: ../meld/meldwindow.py:126
 msgid "_New..."
@@ -1039,199 +995,187 @@ msgstr "_Mái..."
 
 #: ../meld/meldwindow.py:126
 msgid "Start a new comparison"
-msgstr ""
+msgstr "Bát Äáu mát so sÃnh mái"
 
 #: ../meld/meldwindow.py:127
 msgid "Save the current file"
-msgstr ""
+msgstr "LÆu táp tin hián tái"
 
 #: ../meld/meldwindow.py:129
 msgid "Close the current file"
-msgstr ""
+msgstr "ÄÃng táp tin hián tái"
 
 #: ../meld/meldwindow.py:130
 msgid "Quit the program"
-msgstr ""
+msgstr "ThoÃt chÆÆng trÃnh"
 
 #: ../meld/meldwindow.py:132
 msgid "_Edit"
-msgstr "_Hiáu chánh"
+msgstr "_Chánh sáa"
 
 #: ../meld/meldwindow.py:133
 msgid "Undo the last action"
-msgstr ""
+msgstr "HoÃn tÃc hÃnh Äáng gán nhát"
 
 #: ../meld/meldwindow.py:134
 msgid "Redo the last undone action"
-msgstr ""
+msgstr "LÃm lái hÃnh Äáng hoÃn tÃc gán nhát"
 
 #: ../meld/meldwindow.py:135
 msgid "Cut the selection"
-msgstr ""
+msgstr "Cát vÃng chán"
 
 #: ../meld/meldwindow.py:136
-#, fuzzy
 #| msgid "Compare selected"
 msgid "Copy the selection"
-msgstr "So sÃnh vÃng chán"
+msgstr "Sao chÃp vÃng chán"
 
 #: ../meld/meldwindow.py:137
-#, fuzzy
 #| msgid "Copy to Clipboard"
 msgid "Paste the clipboard"
 msgstr "ChÃp vÃo báng tám"
 
 #: ../meld/meldwindow.py:138
-#, fuzzy
 #| msgid "Search for:"
 msgid "Search for text"
-msgstr "TÃm kiám:"
+msgstr "TÃm kiám vÄn bán"
 
 #: ../meld/meldwindow.py:139
 msgid "Find Ne_xt"
-msgstr ""
+msgstr "TÃm Ká _tiáp"
 
 #: ../meld/meldwindow.py:139
 msgid "Search forwards for the same text"
-msgstr ""
+msgstr "TÃm á phán tiáp theo cho nháng chuái tÆÆng tá"
 
 #: ../meld/meldwindow.py:140
 msgid "Find _Previous"
-msgstr ""
+msgstr "TÃm Phán _trÆác"
 
 #: ../meld/meldwindow.py:140
 msgid "Search backwards for the same text"
-msgstr ""
+msgstr "TÃm ngÆác vá trÆác cho nháng chuái tÆÆng tá"
 
 #: ../meld/meldwindow.py:141
 msgid "Find and replace text"
-msgstr ""
+msgstr "TÃm vÃ thay thá vÄn bán"
 
 #: ../meld/meldwindow.py:142
-#, fuzzy
 #| msgid "Preferences : Meld"
 msgid "Prefere_nces"
-msgstr "TÃy thÃch: Meld"
+msgstr "TÃy thÃch_nc"
 
 #: ../meld/meldwindow.py:142
 msgid "Configure the application"
-msgstr ""
+msgstr "Cáu hÃnh áng dáng"
 
 #: ../meld/meldwindow.py:144
 msgid "_Changes"
-msgstr ""
+msgstr "_Thay Äái"
 
 #: ../meld/meldwindow.py:145
 msgid "Next change"
-msgstr ""
+msgstr "Thay Äái ká tiáp"
 
 #: ../meld/meldwindow.py:145
 msgid "Go to the next change"
-msgstr ""
+msgstr "Äi tái thay Äái ká tiáp"
 
 #: ../meld/meldwindow.py:146
-#, fuzzy
 #| msgid "Previous Logs"
 msgid "Previous change"
-msgstr "Bán ghi trÆác"
+msgstr "Thay Äái trÆác ÄÃ"
 
 #: ../meld/meldwindow.py:146
 msgid "Go to the previous change"
-msgstr ""
+msgstr "Äi tái thay Äái váa rái"
 
 #: ../meld/meldwindow.py:147
 msgid "Open externally"
-msgstr ""
+msgstr "Má bÃn ngoÃi"
 
 #: ../meld/meldwindow.py:147
 msgid "Open selected file or directory in the default external application"
-msgstr ""
+msgstr "Má táp tin hoác Äáa chá ÄÃ chán trong áng dáng bÃn ngoÃi mác Äánh"
 
 #: ../meld/meldwindow.py:149
 msgid "_View"
-msgstr ""
+msgstr "_Xem"
 
 #: ../meld/meldwindow.py:150
-#, fuzzy
 #| msgid "File Filters"
 msgid "File status"
-msgstr "Bá lác táp tin"
+msgstr "Tráng thÃi táp tin"
 
 #: ../meld/meldwindow.py:151
 msgid "Version status"
-msgstr ""
+msgstr "Tráng thÃi phiÃn bán"
 
 #: ../meld/meldwindow.py:152
-#, fuzzy
 #| msgid "File Filters"
 msgid "File filters"
 msgstr "Bá lác táp tin"
 
 #: ../meld/meldwindow.py:153
 msgid "Stop the current action"
-msgstr ""
+msgstr "Dáng tÃc vá hián tái"
 
 #: ../meld/meldwindow.py:154
 msgid "Refresh the view"
-msgstr ""
+msgstr "LÃm mái gÃc nhÃn"
 
 #: ../meld/meldwindow.py:155
-#, fuzzy
 #| msgid "Meld"
 msgid "Reload"
-msgstr "Meld"
+msgstr "Tái lái"
 
 #: ../meld/meldwindow.py:155
-#, fuzzy
 #| msgid "_File Comparison"
 msgid "Reload the comparison"
-msgstr "So sÃnh _táp tin"
+msgstr "Tái lái so sÃnh"
 
 #: ../meld/meldwindow.py:157
 msgid "_Tabs"
-msgstr ""
+msgstr "_Thá"
 
 #: ../meld/meldwindow.py:158
-#, fuzzy
 #| msgid "Previous Logs"
 msgid "_Previous Tab"
-msgstr "Bán ghi trÆác"
+msgstr "_Thá trÆác ÄÃ"
 
 #: ../meld/meldwindow.py:158
 msgid "Activate previous tab"
-msgstr ""
+msgstr "KÃch hoát thá váa rái"
 
 #: ../meld/meldwindow.py:159
 msgid "_Next Tab"
-msgstr ""
+msgstr "_Thá ká tiáp"
 
 #: ../meld/meldwindow.py:159
 msgid "Activate next tab"
-msgstr ""
+msgstr "KÃch hoát thá ká tiáp"
 
 #: ../meld/meldwindow.py:160
-#, fuzzy
 #| msgid "Copy To Left"
 msgid "Move Tab _Left"
-msgstr "ChÃp sang trÃi"
+msgstr "ChÃp Thá sang _TrÃi"
 
 #: ../meld/meldwindow.py:160
 msgid "Move current tab to left"
-msgstr ""
+msgstr "Chuyán thá hián tái sang trÃi"
 
 #: ../meld/meldwindow.py:161
-#, fuzzy
 #| msgid "Copy To Right"
 msgid "Move Tab _Right"
-msgstr "ChÃp sang phái"
+msgstr "ChÃp Thá sang _Phái"
 
 #: ../meld/meldwindow.py:161
 msgid "Move current tab to right"
-msgstr ""
+msgstr "Chuyán thá hián tái sang phái"
 
 #: ../meld/meldwindow.py:163
 msgid "_Help"
-msgstr ""
+msgstr "_GiÃp Äá"
 
 #: ../meld/meldwindow.py:164
 msgid "_Contents"
@@ -1239,7 +1183,7 @@ msgstr "_Nái dung"
 
 #: ../meld/meldwindow.py:164
 msgid "Open the Meld manual"
-msgstr ""
+msgstr "Má sá tay Meld"
 
 #: ../meld/meldwindow.py:165
 msgid "Report _Bug"
@@ -1247,41 +1191,40 @@ msgstr "ThÃng bÃo _lái"
 
 #: ../meld/meldwindow.py:165
 msgid "Report a bug in Meld"
-msgstr ""
+msgstr "BÃo cÃo lái trong Meld"
 
 #: ../meld/meldwindow.py:166
 msgid "About this program"
-msgstr ""
+msgstr "Vá chÆÆng trÃnh nÃy"
 
 #: ../meld/meldwindow.py:169
 msgid "Full Screen"
-msgstr ""
+msgstr "ToÃn mÃn hÃnh"
 
 #: ../meld/meldwindow.py:169
 msgid "View the comparison in full screen"
-msgstr ""
+msgstr "Xem so sÃnh trong chá Äá toÃn mÃn hÃnh"
 
 #: ../meld/meldwindow.py:170
 msgid "_Toolbar"
-msgstr ""
+msgstr "_Thanh cÃng cá"
 
 #: ../meld/meldwindow.py:170
 msgid "Show or hide the toolbar"
-msgstr ""
+msgstr "Hián hoác án thanh cÃng cá"
 
 #: ../meld/meldwindow.py:171
-#, fuzzy
 #| msgid "Status"
 msgid "_Statusbar"
-msgstr "Tráng thÃi"
+msgstr "_Thanh Tráng thÃi"
 
 #: ../meld/meldwindow.py:171
 msgid "Show or hide the statusbar"
-msgstr ""
+msgstr "Hián hay án thanh tráng thÃi"
 
 #: ../meld/meldwindow.py:538
 msgid "Switch to this tab"
-msgstr ""
+msgstr "Chuyán sang thá nÃy"
 
 #. exit at first non found directory + file
 #: ../meld/meldwindow.py:629
@@ -1294,10 +1237,9 @@ msgid "[None]"
 msgstr "[khÃng cÃ]"
 
 #: ../meld/patchdialog.py:122
-#, fuzzy
 #| msgid "Save patch as..."
 msgid "Save Patch As..."
-msgstr "LÆu Äáp vÃ dáng..."
+msgstr "LÆu bán vÃ dáng..."
 
 #: ../meld/preferences.py:37
 msgid "label"
@@ -1308,12 +1250,11 @@ msgid "pattern"
 msgstr "máu"
 
 #: ../meld/preferences.py:105
-#, fuzzy
 #| msgid ""
 #| "Line numbers are only available if you have gnome-python-desktop "
 #| "installed."
 msgid "Only available if you have gnome-python-desktop installed"
-msgstr "Chá cÃ sá thá tá dÃng cÃ sán náu bán ÄÃ cÃi Äát gnome-python-desktop."
+msgstr "Chá cÃ giÃ trá náu bán ÄÃ cÃi Äát gnome-python-desktop"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
 #: ../meld/preferences.py:233
@@ -1326,13 +1267,15 @@ msgid ""
 "OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
 "Desktop.ini\n"
 msgstr ""
+"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
+"Desktop.ini\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
 #: ../meld/preferences.py:237
-#, fuzzy, python-format
+#, python-format
 #| msgid "_Version Control Browser"
 msgid "Version Control\t1\t%s\n"
-msgstr "Bá Duyát Äiáu Khián _PhiÃn Bán"
+msgstr "Bá Äiáu Khián PhiÃn Bán\t1\t%s\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
 #: ../meld/preferences.py:239
@@ -1342,7 +1285,7 @@ msgstr "Nhá phÃn\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
 #: ../meld/preferences.py:241
 msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
-msgstr "Vát cháa\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
+msgstr "PhÆÆng tián\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
 #: ../meld/preferences.py:243
@@ -1375,14 +1318,13 @@ msgid "Script comment\t0\t#.*"
 msgstr "Ghi chÃ táp lánh\t0\t#.*"
 
 #: ../meld/vcview.py:120
-#, fuzzy
 #| msgid "Commit"
 msgid "Co_mmit"
-msgstr "GÃi vÃo"
+msgstr "XÃc _nhán"
 
 #: ../meld/vcview.py:120
 msgid "Commit"
-msgstr "GÃi vÃo"
+msgstr "XÃc nhán"
 
 #: ../meld/vcview.py:121
 msgid "_Update"
@@ -1401,7 +1343,6 @@ msgid "Add _Binary"
 msgstr "ThÃm _nhá phÃn"
 
 #: ../meld/vcview.py:123
-#, fuzzy
 #| msgid "Add to VC"
 msgid "Add binary to VC"
 msgstr "ThÃm vÃo ÄKPB"
@@ -1411,10 +1352,9 @@ msgid "Remove from VC"
 msgstr "Gá bá ra ÄKPB"
 
 #: ../meld/vcview.py:125
-#, fuzzy
 #| msgid "_Remove"
 msgid "_Resolved"
-msgstr "Gá _bá"
+msgstr "ÄÃ _giái quyát"
 
 #: ../meld/vcview.py:125
 msgid "Mark as resolved for VC"
@@ -1422,7 +1362,7 @@ msgstr ""
 
 #: ../meld/vcview.py:126
 msgid "Revert to original"
-msgstr ""
+msgstr "HoÃn vá bán gác"
 
 #: ../meld/vcview.py:127
 msgid "Delete locally"
@@ -1445,10 +1385,9 @@ msgid "_Normal"
 msgstr "_BÃnh thÆáng"
 
 #: ../meld/vcview.py:133
-#, fuzzy
 #| msgid "Show identical"
 msgid "Show normal"
-msgstr "Hián trÃng chÃnh xÃc"
+msgstr "Hián thá bÃnh thÆáng"
 
 #: ../meld/vcview.py:134
 msgid "Non _VC"
@@ -1463,10 +1402,9 @@ msgid "Ignored"
 msgstr "Bá bá qua"
 
 #: ../meld/vcview.py:135
-#, fuzzy
 #| msgid "Show unversioned files"
 msgid "Show ignored files"
-msgstr "Hián táp tin khÃng ÄKPB"
+msgstr "Hián cÃc táp tin bá bá qua"
 
 #: ../meld/vcview.py:178 ../meld/vcview.py:302
 msgid "Location"
@@ -1478,7 +1416,7 @@ msgstr "Tráng thÃi"
 
 #: ../meld/vcview.py:180
 msgid "Rev"
-msgstr "Bán"
+msgstr "PhiÃn bán"
 
 #: ../meld/vcview.py:181
 msgid "Tag"
@@ -1489,40 +1427,38 @@ msgid "Options"
 msgstr "TÃy chán"
 
 #: ../meld/vcview.py:233
-#, fuzzy
 #| msgid "Version control view"
 msgid "Choose one Version Control"
-msgstr "Khung xem Äiáu khián phiÃn bán"
+msgstr "Chán mát bá Äiáu khián phiÃn bán"
 
 #: ../meld/vcview.py:234
 msgid "Only one Version Control in this directory"
-msgstr ""
+msgstr "Chá cÃ mát bá Äiáu khián phiÃn bán á thÆ mác nÃy"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
 #: ../meld/vcview.py:247
 #, python-format
 msgid "%s Not Installed"
-msgstr ""
+msgstr "%s ChÆa cÃi Äát"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
 #: ../meld/vcview.py:251
-#, fuzzy
 #| msgid "Internal editor"
 msgid "Invalid Repository"
-msgstr "Bá hiáu chánh nái bá"
+msgstr "Kho bá lái"
 
 #: ../meld/vcview.py:260
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
 #: ../meld/vcview.py:302
 #, python-format
 msgid "%s: %s"
-msgstr ""
+msgstr "%s: %s"
 
 #: ../meld/vcview.py:350
 msgid "(Empty)"
@@ -1531,12 +1467,12 @@ msgstr "(Ráng)"
 #: ../meld/vcview.py:388
 #, python-format
 msgid "[%s] Fetching differences"
-msgstr "[%s] Äang láy khÃc biát"
+msgstr "[%s] Äang tÃm sá khÃc biát"
 
 #: ../meld/vcview.py:396
 #, python-format
 msgid "[%s] Applying patch"
-msgstr "[%s] Äang Ãp dáng Äáp vÃ"
+msgstr "[%s] Äang Ãp dáng bán vÃ"
 
 #: ../meld/vcview.py:478
 msgid "Select some files first."
@@ -1580,35 +1516,33 @@ msgstr ""
 
 #: ../meld/ui/historyentry.py:293
 msgid "_Browse..."
-msgstr ""
+msgstr "_Duyát..."
 
 #: ../meld/ui/historyentry.py:301
 msgid "Path"
-msgstr ""
+msgstr "ÄÆáng dán"
 
 #: ../meld/ui/historyentry.py:302
 msgid "Path to file"
-msgstr ""
+msgstr "ÄÆáng dán tái táp tin"
 
 #: ../meld/ui/historyentry.py:303
 msgid "Pop up a file selector to choose a file"
 msgstr ""
 
 #: ../meld/ui/historyentry.py:441
-#, fuzzy
 #| msgid "CVS Directory"
 msgid "Select directory"
-msgstr "ThÆ mác CVS"
+msgstr "Chán thÆ mác"
 
 #: ../meld/ui/historyentry.py:445
-#, fuzzy
 #| msgid "Select some files first."
 msgid "Select file"
-msgstr "Chán táp tin trÆác tiÃn."
+msgstr "Chán táp tin"
 
 #: ../meld/ui/notebooklabel.py:60
 msgid "Close tab"
-msgstr ""
+msgstr "ÄÃng thá"
 
 #. These are the possible states of files. Be sure to get the colons correct.
 #: ../meld/vc/_vc.py:40
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]