GNOME.org
 

[meld] po/vi.po: import from Damned Lies

commit 69caa6635612fb9a9a1289ad055a4b80e63cdc9c
Author: Nguyán ThÃi Ngác Duy <pclouds gmail com>
Date:   Sun Feb 12 19:21:14 2012 +0700

    po/vi.po: import from Damned Lies

 po/vi.po | 2455 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 1630 insertions(+), 825 deletions(-)
---
diff --git a/po/vi.po b/po/vi.po
index f618a22..33c6a9f 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,13 +1,14 @@
 # Vietnamese translation for Meld.
 # Copyright  2005-2006 Gnome i18n Project for Vietnamese.
 # Clytie Siddall <clytie riverland net au>, 2005-2006.
-# 
+#
 msgid ""
-""
-msgstr "Project-Id-Version: meld 0.9 Gnome HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-10 12:15+0200\n"
-"PO-Revision-Date: 2006-04-10 22:57+0930\n"
+msgstr ""
+"Project-Id-Version: meld 0.9 Gnome HEAD\n"
+"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"
 "Language-Team: Vietnamese <gnomevi-list lists sourceforge net>\n"
 "MIME-Version: 1.0\n"
@@ -16,1143 +17,1947 @@ msgstr "Project-Id-Version: meld 0.9 Gnome HEAD\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: LocFactoryEditor 1.6b36\n"
 
-#:../dirdiff.py:252 ../dirdiff.py:267
-#,python-format
-msgid "Error converting pattern '%s' to regular expression"
-msgstr "Gáp lái khi chuyán Äái máu  %s  sang biáu thác chÃnh quy."
+#: ../bin/meld:96
+msgid "Cannot import: "
+msgstr ""
 
-#:../dirdiff.py:283
-#,python-format
+#: ../bin/meld:99
+#, c-format
+msgid "Meld requires %s or higher."
+msgstr "TrÃnh Meld cán thiát %s hay sau."
+
+#: ../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."
+
+#: ../data/meld.desktop.in.h:2
+#, fuzzy
+#| msgid "Meld Diff Viewer"
+msgid "Diff Viewer"
+msgstr "Bá xem khÃc biát Meld"
+
+#: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.ui.h:5
+msgid "Meld"
+msgstr "Meld"
+
+#: ../data/meld.desktop.in.h:4
+msgid "Meld Diff Viewer"
+msgstr "Bá xem khÃc biát Meld"
+
+#: ../data/ui/EditableList.ui.h:1
+msgid "Active"
+msgstr "Hoát Äáng"
+
+#: ../data/ui/EditableList.ui.h:2
+msgid "Add new filter"
+msgstr ""
+
+#: ../data/ui/EditableList.ui.h:3
+msgid "Editable List"
+msgstr ""
+
+#: ../data/ui/EditableList.ui.h:4
+#, fuzzy
+#| msgid "_Down"
+msgid "Move _Down"
+msgstr "_Xuáng"
+
+#: ../data/ui/EditableList.ui.h:5
+msgid "Move _Up"
+msgstr ""
+
+#: ../data/ui/EditableList.ui.h:6
+msgid "Move item down"
+msgstr ""
+
+#: ../data/ui/EditableList.ui.h:7
+msgid "Move item up"
+msgstr ""
+
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:158
+msgid "Name"
+msgstr "TÃn"
+
+#: ../data/ui/EditableList.ui.h:9
+msgid "Pattern"
+msgstr "Máu"
+
+#: ../data/ui/EditableList.ui.h:10
+msgid "Remove selected filter"
+msgstr ""
+
+#: ../data/ui/EditableList.ui.h:11 ../meld/vcview.py:122
+msgid "_Add"
+msgstr "Th_Ãm"
+
+#: ../data/ui/EditableList.ui.h:12 ../meld/vcview.py:124
+msgid "_Remove"
+msgstr "Gá _bá"
+
+#: ../data/ui/filediff.ui.h:1
+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>"
+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>"
+
+#: ../data/ui/filediff.ui.h:4
+msgid "_Discard Changes"
+msgstr ""
+
+#: ../data/ui/filediff.ui.h:5
+#, fuzzy
+#| msgid "_Delete Selected"
+msgid "_Save Selected"
+msgstr "_XÃa bá vÃng 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"
+
+#: ../data/ui/findbar.ui.h:2
+msgid "Replace _All"
+msgstr ""
+
+#: ../data/ui/findbar.ui.h:3
+msgid "Replace _With"
+msgstr ""
+
+#: ../data/ui/findbar.ui.h:4
+msgid "Who_le word"
+msgstr ""
+
+#: ../data/ui/findbar.ui.h:5
+#, fuzzy
+#| msgid "_Match case"
+msgid "_Match Case"
+msgstr "_Kháp chá hoa/thÆáng"
+
+#: ../data/ui/findbar.ui.h:6
+#, fuzzy
+#| msgid "_None"
+msgid "_Next"
+msgstr "_KhÃng cÃ"
+
+#: ../data/ui/findbar.ui.h:7
+#, fuzzy
+#| msgid "Previous Logs"
+msgid "_Previous"
+msgstr "Bán ghi trÆác"
+
+#: ../data/ui/findbar.ui.h:8 ../meld/meldwindow.py:141
+msgid "_Replace"
+msgstr ""
+
+#: ../data/ui/findbar.ui.h:9
+#, fuzzy
+#| msgid "Search for:"
+msgid "_Search for"
+msgstr "TÃm kiám:"
+
+#: ../data/ui/meldapp.ui.h:1
+msgid "Choose Files"
+msgstr "Chán táp tin"
+
+#: ../data/ui/meldapp.ui.h:2
+msgid ""
+"Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
+"Copyright &#xA9; 2009-2011 Kai Willadsen"
+msgstr ""
+
+#: ../data/ui/meldapp.ui.h:4
+msgid "Directory"
+msgstr "ThÆ mác"
+
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:7
+msgid "Mine"
+msgstr "Cáa tÃi"
+
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:9
+msgid "Original"
+msgstr "Gác"
+
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:11
+msgid "Other"
+msgstr "KhÃc"
+
+#: ../data/ui/meldapp.ui.h:12
+#, fuzzy
+#| msgid "CVS Directory"
+msgid "Select VC Directory"
+msgstr "ThÆ mác CVS"
+
+#: ../data/ui/meldapp.ui.h:13
+msgid "_Directory Comparison"
+msgstr "So sÃnh th_Æ mác"
+
+#: ../data/ui/meldapp.ui.h:14
+msgid "_File Comparison"
+msgstr "So sÃnh _táp tin"
+
+#: ../data/ui/meldapp.ui.h:15
+msgid "_Three Way Compare"
+msgstr "So sÃnh _ba chiáu"
+
+#: ../data/ui/meldapp.ui.h:16
+msgid "_Version Control Browser"
+msgstr "Bá Duyát Äiáu Khián _PhiÃn Bán"
+
+#: ../data/ui/meldapp.ui.h:17
+msgid "translator-credits"
+msgstr ""
+
+#: ../data/ui/patch-dialog.ui.h:1
+msgid "Copy to Clipboard"
+msgstr "ChÃp vÃo báng tám"
+
+#: ../data/ui/patch-dialog.ui.h:2
+msgid "Create Patch"
+msgstr "Táo Äáp vÃ"
+
+#: ../data/ui/patch-dialog.ui.h:3
+#, fuzzy
+#| msgid "Create Patch"
+msgid "Create a patch"
+msgstr "Táo Äáp vÃ"
+
+#: ../data/ui/patch-dialog.ui.h:4
+msgid "Left and middle panes"
+msgstr ""
+
+#: ../data/ui/patch-dialog.ui.h:5
+msgid "Middle and right panes"
+msgstr ""
+
+#: ../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."
+
+#: ../data/ui/patch-dialog.ui.h:7
+msgid "_Reverse patch direction"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:1
+msgid "Display"
+msgstr "Hián thá"
+
+#: ../data/ui/preferences.ui.h:2
+msgid "Do not _split words over two lines"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:3
+#, fuzzy
+#| msgid "Custom command"
+msgid "Edito_r command:"
+msgstr "Lánh tá chán"
+
+#: ../data/ui/preferences.ui.h:4
+msgid "Editor"
+msgstr "Bá hiáu chánh"
+
+#: ../data/ui/preferences.ui.h:5
+msgid "Enable text _wrapping"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:6
+msgid "Encoding"
+msgstr "Báng mÃ"
+
+#: ../data/ui/preferences.ui.h:7
+#, fuzzy
+#| msgid "Internal editor"
+msgid "External editor"
+msgstr "Bá hiáu chánh nái bá"
+
+#: ../data/ui/preferences.ui.h:8
+msgid "File Filters"
+msgstr "Bá lác táp tin"
+
+#: ../data/ui/preferences.ui.h:9
+msgid "Font"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:10
+msgid "Ignore changes which insert or delete blank lines"
+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 ""
+
+#: ../data/ui/preferences.ui.h:12
+#, fuzzy
+#| msgid "<b>Loading</b>"
+msgid "Loading"
+msgstr "<b>Äang tái</b>"
+
+#: ../data/ui/preferences.ui.h:13
+#, fuzzy
+#| msgid "Preferences : Meld"
+msgid "Meld Preferences"
+msgstr "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"
+
+#: ../data/ui/preferences.ui.h:15
+msgid "Show w_hitespace"
+msgstr ""
+
+#: ../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"
+
+#: ../data/ui/preferences.ui.h:18
+#, fuzzy
+#| msgid "Use syntax highlighting"
+msgid "Use s_yntax highlighting"
+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)"
+
+#: ../data/ui/preferences.ui.h:20
+msgid ""
+"When performing directory comparisons, you may filter out files and "
+"directories by name. Each pattern is a list of shell style wildcards "
+"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."
+
+#: ../data/ui/preferences.ui.h:21
+msgid ""
+"When performing file comparisons, you may ignore certain types of changes. "
+"Each pattern here is a python regular expression which replaces matching "
+"text with the empty string before comparison is performed. If the expression "
+"contains groups, only the groups are replaced. See the user manual for more "
+"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 "
+"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."
+
+#: ../data/ui/preferences.ui.h:22
+#, fuzzy
+#| msgid "Editor"
+msgid "_Editor font:"
+msgstr "Bá hiáu chánh"
+
+#: ../data/ui/preferences.ui.h:23
+msgid "_Insert spaces instead of tabs"
+msgstr ""
+
+#: ../data/ui/preferences.ui.h:24
+#, fuzzy
+#| msgid "Tab width"
+msgid "_Tab width:"
+msgstr "Ráng _tab:"
+
+#: ../data/ui/preferences.ui.h:25
+msgid "_Use the system fixed width font"
+msgstr ""
+
+#: ../data/ui/vcview.ui.h:1
+msgid "Commit Files"
+msgstr "GÃi táp tin vÃo"
+
+#: ../data/ui/vcview.ui.h:2
+msgid "Log Message"
+msgstr "ThÃng Äiáp ghi lÆu"
+
+#: ../data/ui/vcview.ui.h:3
+msgid "Previous Logs"
+msgstr "Bán ghi trÆác"
+
+#: ../data/ui/vcview.ui.h:4
+msgid "VC Log"
+msgstr "Bán ghi ÄKPB"
+
+#: ../meld/dirdiff.py:226 ../meld/vcview.py:119
+msgid "_Compare"
+msgstr "_So sÃnh"
+
+#: ../meld/dirdiff.py:226 ../meld/vcview.py:119
+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"
+
+#: ../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"
+
+#: ../meld/dirdiff.py:228
+#, fuzzy
+#| msgid "Copy To Right"
+msgid "Copy to right"
+msgstr "ChÃp sang phái"
+
+#: ../meld/dirdiff.py:229
+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"
+
+#: ../meld/dirdiff.py:230
+msgid "Hide selected"
+msgstr "án vÃng chán"
+
+#: ../meld/dirdiff.py:234
+msgid "Case"
+msgstr "Hoa/thÆáng"
+
+#: ../meld/dirdiff.py:234
+msgid "Ignore case of entries"
+msgstr "Bá qua hoa/thÆáng trong mác nháp"
+
+#: ../meld/dirdiff.py:235
+msgid "Same"
+msgstr "TrÃng"
+
+#: ../meld/dirdiff.py:235
+msgid "Show identical"
+msgstr "Hián trÃng chÃnh xÃc"
+
+#: ../meld/dirdiff.py:236
+msgid "New"
+msgstr "Mái"
+
+#: ../meld/dirdiff.py:236
+msgid "Show new"
+msgstr "Hián mái"
+
+#: ../meld/dirdiff.py:237
+msgid "Modified"
+msgstr "Bá sáa Äái"
+
+#: ../meld/dirdiff.py:237 ../meld/vcview.py:132
+msgid "Show modified"
+msgstr "Hián ÄÃ sáa Äái"
+
+#: ../meld/dirdiff.py:239
+#, fuzzy
+#| msgid "File Filters"
+msgid "Filters"
+msgstr "Bá lác táp tin"
+
+#: ../meld/dirdiff.py:239
+#, fuzzy
+#| msgid "File Filters"
+msgid "Set active filters"
+msgstr "Bá lác táp tin"
+
+#: ../meld/dirdiff.py:354
+#, python-format
 msgid "Hide %s"
 msgstr "án %s"
 
-#:../dirdiff.py:363 ../dirdiff.py:372 ../vcview.py:212 ../vcview.py:240
-#,python-format
+#: ../meld/dirdiff.py:457 ../meld/dirdiff.py:470 ../meld/vcview.py:306
+#: ../meld/vcview.py:334
+#, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Äang quÃt %s"
 
-#:../dirdiff.py:405
-#,python-format
-msgid "'%s' hidden by '%s'"
-msgstr " %s  do  %s  án"
+#: ../meld/dirdiff.py:569
+#, python-format
+msgid "[%s] Done"
+msgstr "[%s] ÄÃ xong."
 
-#:../dirdiff.py:411
-#,python-format
+#: ../meld/dirdiff.py:573
+msgid "Multiple errors occurred while scanning this folder"
+msgstr ""
+
+#: ../meld/dirdiff.py:574
+msgid "Files with invalid encodings found"
+msgstr ""
+
+#. 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 ""
+
+#: ../meld/dirdiff.py:578
+msgid "Files hidden by case insensitive comparison"
+msgstr ""
+
+#. 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"
+#| "%s"
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
-"filesystem. Some files are not visible:\n"
-"%s"
-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 "
+"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"
 
-#:../dirdiff.py:480
-#,python-format
-msgid "[%s] Done"
-msgstr "[%s] ÄÃ xong."
+#: ../meld/dirdiff.py:591
+#, python-format
+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"
 
-#:../dirdiff.py:526
-#,python-format
+#: ../meld/dirdiff.py:666
+#, python-format
 msgid ""
 "'%s' exists.\n"
 "Overwrite?"
-msgstr "Táp tin  %s  Äà cÃ.\n"
+msgstr ""
+"Táp tin  %s  Äà cÃ.\n"
 "Ghi ÄÃ?"
 
-#:../dirdiff.py:533
-#,python-format
+#: ../meld/dirdiff.py:673
+#, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
 "\n"
 "%s."
-msgstr "Gáp lái khi sao chÃp  %s  vÃo  %s Â\n"
+msgstr ""
+"Gáp lái khi sao chÃp  %s  vÃo  %s Â\n"
 "\n"
 "%s"
 
-#:../dirdiff.py:551 ../vcview.py:404
-#,python-format
+#: ../meld/dirdiff.py:691 ../meld/vcview.py:503
+#, fuzzy, python-format
+#| msgid ""
+#| "'%s' is a directory.\n"
+#| "Remove recusively?"
 msgid ""
 "'%s' is a directory.\n"
-"Remove recusively?"
-msgstr " %s  là mát thÆ mác\n"
+"Remove recursively?"
+msgstr ""
+" %s  là mát thÆ mác\n"
 "Gá bá Äá qui khÃng?"
 
-#:../dirdiff.py:558 ../vcview.py:409
-#,python-format
+#: ../meld/dirdiff.py:698 ../meld/vcview.py:508
+#, python-format
 msgid ""
 "Error removing %s\n"
 "\n"
 "%s."
-msgstr "Gáp lái khi gá bá %s\n"
+msgstr ""
+"Gáp lái khi gá bá %s\n"
 "\n"
 "%s"
 
-#:../dirdiff.py:569
-#,python-format
+#: ../meld/dirdiff.py:723
+#, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%i giÃy"
 
-#:../dirdiff.py:570
-#,python-format
+#: ../meld/dirdiff.py:724
+#, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%i phÃt"
 
-#:../dirdiff.py:571
-#,python-format
+#: ../meld/dirdiff.py:725
+#, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%i giá"
 
-#:../dirdiff.py:572
-#,python-format
+#: ../meld/dirdiff.py:726
+#, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%i ngÃy"
 
-#:../dirdiff.py:573
-#,python-format
+#: ../meld/dirdiff.py:727
+#, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%i tuán"
 
-#:../dirdiff.py:574
-#,python-format
+#: ../meld/dirdiff.py:728
+#, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%i thÃng"
 
-#:../dirdiff.py:575
-#,python-format
+#: ../meld/dirdiff.py:729
+#, python-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%i nÄm"
 
-#.Abbreviation for insert,overwrite so that it will fit in the status bar
-#:../filediff.py:215
-msgid "INS,OVR"
+#: ../meld/filediff.py:294
+msgid "Format as patch..."
+msgstr ""
+
+#: ../meld/filediff.py:294
+msgid "Create a patch using differences between files"
+msgstr ""
+
+#: ../meld/filediff.py:295
+#, fuzzy
+#| msgid "Previous Logs"
+msgid "Previous conflict"
+msgstr "Bán ghi trÆác"
+
+#: ../meld/filediff.py:295
+msgid "Go to the previous conflict"
+msgstr ""
+
+#: ../meld/filediff.py:296
+msgid "Next conflict"
+msgstr ""
+
+#: ../meld/filediff.py:296
+msgid "Go to the next conflict"
+msgstr ""
+
+#: ../meld/filediff.py:297
+msgid "Push to left"
+msgstr ""
+
+#: ../meld/filediff.py:297
+msgid "Push current change to the left"
+msgstr ""
+
+#: ../meld/filediff.py:298
+msgid "Push to right"
+msgstr ""
+
+#: ../meld/filediff.py:298
+msgid "Push current change to the right"
+msgstr ""
+
+#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
+#: ../meld/filediff.py:300
+msgid "Pull from left"
+msgstr ""
+
+#: ../meld/filediff.py:300
+msgid "Pull change from the left"
+msgstr ""
+
+#: ../meld/filediff.py:301
+msgid "Pull from right"
+msgstr ""
+
+#: ../meld/filediff.py:301
+msgid "Pull change from the right"
+msgstr ""
+
+#: ../meld/filediff.py:302
+#, fuzzy
+#| msgid "Copy To Left"
+msgid "Copy above left"
+msgstr "ChÃp sang trÃi"
+
+#: ../meld/filediff.py:302
+msgid "Copy change above the left chunk"
+msgstr ""
+
+#: ../meld/filediff.py:303
+#, fuzzy
+#| msgid "Copy To Left"
+msgid "Copy below left"
+msgstr "ChÃp sang trÃi"
+
+#: ../meld/filediff.py:303
+msgid "Copy change below the left chunk"
+msgstr ""
+
+#: ../meld/filediff.py:304
+#, fuzzy
+#| msgid "Copy To Right"
+msgid "Copy above right"
+msgstr "ChÃp sang phái"
+
+#: ../meld/filediff.py:304
+msgid "Copy change above the right chunk"
+msgstr ""
+
+#: ../meld/filediff.py:305
+#, fuzzy
+#| msgid "Copy To Right"
+msgid "Copy below right"
+msgstr "ChÃp sang phái"
+
+#: ../meld/filediff.py:305
+msgid "Copy change below the right chunk"
+msgstr ""
+
+#: ../meld/filediff.py:306
+#, fuzzy
+#| msgid "Date"
+msgid "Delete"
+msgstr "NgÃy"
+
+#: ../meld/filediff.py:306
+#, fuzzy
+#| msgid "Delete locally"
+msgid "Delete change"
+msgstr "Xoà bá các bá"
+
+#: ../meld/filediff.py:307
+msgid "Merge all changes from left"
+msgstr ""
+
+#: ../meld/filediff.py:307
+msgid "Merge all non-conflicting changes from the left"
+msgstr ""
+
+#: ../meld/filediff.py:308
+msgid "Merge all changes from right"
+msgstr ""
+
+#: ../meld/filediff.py:308
+msgid "Merge all non-conflicting changes from the right"
+msgstr ""
+
+#: ../meld/filediff.py:309
+msgid "Merge all non-conflicting"
+msgstr ""
+
+#: ../meld/filediff.py:309
+msgid "Merge all non-conflicting changes from left and right panes"
+msgstr ""
+
+#: ../meld/filediff.py:310
+msgid "Cycle through documents"
+msgstr ""
+
+#: ../meld/filediff.py:310
+msgid "Move keyboard focus to the next document in this comparison"
+msgstr ""
+
+#: ../meld/filediff.py:314
+msgid "Lock scrolling"
+msgstr ""
+
+#: ../meld/filediff.py:315
+msgid "Lock scrolling of all panes"
+msgstr ""
+
+#. Abbreviations for insert and overwrite that fit in the status bar
+#: ../meld/filediff.py:396
+#, fuzzy
+#| msgid "INS,OVR"
+msgid "INS"
 msgstr "CH,ÄÃ"
 
-#.Abbreviation for line, column so that it will fit in the status bar
-#:../filediff.py:217
-#,python-format
+#: ../meld/filediff.py:396
+#, fuzzy
+#| msgid "INS,OVR"
+msgid "OVR"
+msgstr "CH,ÄÃ"
+
+#. 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"
 
-#:../filediff.py:275
-#,python-format
+#: ../meld/filediff.py:722
+#, fuzzy, python-format
+#| msgid ""
+#| "Regular expression '%s' changed the number of lines in the file. "
+#| "Comparison will be incorrect. See the user manual for more details."
 msgid ""
-"Regular expression '%s' changed the number of lines in the file. Comparison "
-"will be incorrect. See the user manual for more details."
-msgstr "Biáu thác chÃnh quy  %s  Äà thay Äái sá dÃng trong táp tin, thà viác so "
+"Filter '%s' changed the number of lines in the file. Comparison will be "
+"incorrect. See the user manual for more details."
+msgstr ""
+"Biáu thác chÃnh quy  %s  Äà thay Äái sá dÃng trong táp tin, thà viác so "
 "sÃnh khÃng cháy ÄÃng. HÃy xem sá tay ngÆái dÃng Äá tÃm chi tiát."
 
-#:../filediff.py:523
-#,python-format
-msgid ""
-"Regular expression error\n"
-"'%s'"
-msgstr "Lái biáu thác chÃnh quy\n"
-"Â %s Â"
-
-#:../filediff.py:535
-#,python-format
-msgid "The regular expression '%s' was not found."
-msgstr "KhÃng tÃm tháy biáu thác chÃnh quy  %s Â."
+#. TRANSLATORS: this is the name of a new file which has not yet been saved
+#: ../meld/filediff.py:809
+msgid "<unnamed>"
+msgstr ""
 
-#:../filediff.py:537
-#,python-format
-msgid "The text '%s' was not found."
-msgstr "KhÃng tÃm tháy Äoán  %s Â."
-
-#:../filediff.py:581
-#,python-format
+#: ../meld/filediff.py:996
+#, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Äát à sá"
 
-#:../filediff.py:588
-#,python-format
+#: ../meld/filediff.py:1002
+#, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Äang má táp tin"
 
-#:../filediff.py:605 ../filediff.py:619 ../filediff.py:635 ../filediff.py:642
-#,python-format
-msgid "Could not read from '%s'"
+#: ../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 Â"
 
-#:../filediff.py:606 ../filediff.py:643
-msgid "The error was:"
-msgstr "Lái:"
-
-#:../filediff.py:611
-#,python-format
+#: ../meld/filediff.py:1027
+#, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Äang Äác táp tin"
 
-#:../filediff.py:620
-msgid ""
-"It contains ascii nulls.\n"
-"Perhaps it is a binary file."
-msgstr "Nà cháa kà tá ráng ASCII.\n"
-"Cà lá nà là táp tin nhá phÃn."
-
-#:../filediff.py:636
-#,python-format
-msgid "I tried encodings %s."
+#: ../meld/filediff.py:1036
+#, python-format
+msgid "%s appears to be a binary file."
+msgstr ""
+
+#: ../meld/filediff.py:1048
+#, fuzzy, 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."
 
-#:../filediff.py:665
-#,python-format
+#: ../meld/filediff.py:1078 ../meld/filemerge.py:67
+#, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Äang tÃnh khÃc biát"
 
-#:../filediff.py:769
-#,python-format
+#: ../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 ""
+
+#: ../meld/filediff.py:1154
+#, fuzzy
+#| msgid "Show identical"
+msgid "Files are identical"
+msgstr "Hián trÃng chÃnh xÃc"
+
+#: ../meld/filediff.py:1164
+#, fuzzy
+#| msgid "Show unversioned files"
+msgid "Show without filters"
+msgstr "Hián táp tin khÃng ÄKPB"
+
+#: ../meld/filediff.py:1354
+#, python-format
 msgid ""
 "\"%s\" exists!\n"
 "Overwrite?"
-msgstr "Táp tin  %s  Äà cÃ.\n"
+msgstr ""
+"Táp tin  %s  Äà cÃ.\n"
 "Ghi ÄÃ?"
 
-#:../filediff.py:782
-#,python-format
+#: ../meld/filediff.py:1367
+#, python-format
 msgid ""
 "Error writing to %s\n"
 "\n"
 "%s."
-msgstr "Gáp lái khi ghi vÃo  %s Â.\n"
+msgstr ""
+"Gáp lái khi ghi vÃo  %s Â.\n"
 "\n"
 "%s"
 
-#:../filediff.py:791
-#,python-format
+#: ../meld/filediff.py:1376
+#, python-format
 msgid "Choose a name for buffer %i."
 msgstr "HÃy chán tÃn cho bá Äám %i."
 
-#:../filediff.py:804
-#,python-format
+#: ../meld/filediff.py:1391
+#, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
 "\n"
 "Which format would you like to use?"
-msgstr "Táp tin  %s  cháa nhiáu kiáu kà tá kát thÃc dÃng.\n"
+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?"
 
-#:../filediff.py:820
-#,python-format
+#: ../meld/filediff.py:1407
+#, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
 "Would you like to save as UTF-8?"
-msgstr " %s  cháa kà tá khÃng thá ÄÆác mà hÃa báng  %s Â.\n"
+msgstr ""
+" %s  cháa kà tá khÃng thá ÄÆác mà hÃa báng  %s Â.\n"
 "Bán cà muán lÆu nà dáng UTF-8 khÃng?"
 
-#.save as
-#:../filediff.py:855
-msgid "Save patch as..."
-msgstr "LÆu Äáp và dáng..."
-
 # Type: boolean
 # Description
-#:../filediff.py:909
-#,python-format
+#: ../meld/filediff.py:1466
+#, fuzzy, python-format
+#| msgid ""
+#| "Refreshing will discard changes in:\n"
+#| "%s\n"
+#| "\n"
+#| "You cannot undo this operation."
 msgid ""
-"Refreshing will discard changes in:\n"
+"Reloading will discard changes in:\n"
 "%s\n"
 "\n"
 "You cannot undo this operation."
-msgstr "Viác lÃm tÆÆi sá háy bá thay Äái trong:\n"
+msgstr ""
+"Viác lÃm tÆÆi sá háy bá thay Äái trong:\n"
 "%s\n"
 "\n"
 "KhÃng thá hoÃn tÃc hÃnh Äáng nÃy."
 
-#:../glade2/dirdiff.glade.h:1
-msgid "Case"
-msgstr "Hoa/thÆáng"
+#: ../meld/filemerge.py:82
+#, fuzzy, python-format
+#| msgid "[%s] Opening files"
+msgid "[%s] Merging files"
+msgstr "[%s] Äang má táp tin"
 
-#:../glade2/dirdiff.glade.h:2
-msgid "Compare"
-msgstr "So sÃnh"
+#: ../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)."
 
-#:../glade2/dirdiff.glade.h:3 ../glade2/vcview.glade.h:6
-msgid "Compare selected"
-msgstr "So sÃnh vÃng chán"
+#: ../meld/meldapp.py:153
+msgid "Start with an empty window"
+msgstr ""
 
-#:../glade2/dirdiff.glade.h:4
-msgid "Copy To Left"
-msgstr "ChÃp sang trÃi"
+#: ../meld/meldapp.py:154 ../meld/meldapp.py:155 ../meld/meldapp.py:157
+msgid "file"
+msgstr ""
 
-#:../glade2/dirdiff.glade.h:5
-msgid "Copy To Right"
-msgstr "ChÃp sang phái"
+#: ../meld/meldapp.py:154 ../meld/meldapp.py:156 ../meld/meldapp.py:157
+#, fuzzy
+#| msgid "Editor"
+msgid "dir"
+msgstr "Bá hiáu chánh"
 
-#:../glade2/dirdiff.glade.h:6
-msgid "Delete selected"
-msgstr "XÃa bá vÃng chán"
+#: ../meld/meldapp.py:154
+msgid "Start a version control comparison"
+msgstr ""
 
-#:../glade2/dirdiff.glade.h:7 ../glade2/filediff.glade.h:7
-msgid "Edit"
-msgstr "Hiáu chánh"
+#: ../meld/meldapp.py:155
+msgid "Start a 2- or 3-way file comparison"
+msgstr ""
 
-#:../glade2/dirdiff.glade.h:8
-msgid "Hide selected"
-msgstr "án vÃng chán"
+#: ../meld/meldapp.py:156
+msgid "Start a 2- or 3-way directory comparison"
+msgstr ""
 
-#:../glade2/dirdiff.glade.h:9
-msgid "Hide..."
-msgstr "án..."
+#: ../meld/meldapp.py:157
+msgid "Start a comparison between file and dir/file"
+msgstr ""
 
-#:../glade2/dirdiff.glade.h:10
-msgid "Ignore case of entries"
-msgstr "Bá qua hoa/thÆáng trong mác nháp"
+#: ../meld/meldapp.py:163
+msgid "Meld is a file and directory comparison tool."
+msgstr ""
 
-#:../glade2/dirdiff.glade.h:11
-msgid "Left"
-msgstr "TrÃi"
+#: ../meld/meldapp.py:166
+msgid "Set label to use instead of file name"
+msgstr ""
 
-#:../glade2/dirdiff.glade.h:12
-msgid "Modified"
-msgstr "Bá sáa Äái"
+#: ../meld/meldapp.py:168
+msgid "Automatically compare all differing files on startup"
+msgstr ""
 
-#:../glade2/dirdiff.glade.h:13
-msgid "New"
-msgstr "Mái"
+#: ../meld/meldapp.py:170
+msgid "Ignored for compatibility"
+msgstr ""
 
-#:../glade2/dirdiff.glade.h:14
-msgid "Right"
-msgstr "Phái"
+#: ../meld/meldapp.py:173
+msgid "Set the target file for saving a merge result"
+msgstr ""
 
-#:../glade2/dirdiff.glade.h:15
-msgid "Same"
-msgstr "TrÃng"
+#: ../meld/meldapp.py:176
+msgid "Creates a diff tab for up to 3 supplied files or directories."
+msgstr ""
 
-#:../glade2/dirdiff.glade.h:16
-msgid "Show identical"
-msgstr "Hián trÃng chÃnh xÃc"
+#: ../meld/meldapp.py:179
+#, python-format
+msgid "too many arguments (wanted 0-4, got %d)"
+msgstr ""
 
-#:../glade2/dirdiff.glade.h:17 ../glade2/vcview.glade.h:18
-msgid "Show modified"
-msgstr "Hián ÄÃ sáa Äái"
+#: ../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"
 
-#:../glade2/dirdiff.glade.h:18
-msgid "Show new"
-msgstr "Hián mái"
+#: ../meld/melddoc.py:56 ../meld/melddoc.py:57
+msgid "untitled"
+msgstr "khÃng tÃn"
 
-#:../glade2/dirdiff.glade.h:19 ../glade2/meldapp.glade.h:86
-#:../glade2/vcview.glade.h:25
-msgid "_Compare"
-msgstr "_So sÃnh"
+#: ../meld/meldwindow.py:125
+#, fuzzy
+#| msgid "My File"
+msgid "_File"
+msgstr "Táp tin tÃi"
 
-#:../glade2/dirdiff.glade.h:20
-msgid "_Delete Selected"
-msgstr "_XÃa bá vÃng chán"
+#: ../meld/meldwindow.py:126
+msgid "_New..."
+msgstr "_Mái..."
 
-#:../glade2/filediff.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Some files have been modified.\n"
-"Which ones would you like to save?</span>"
-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>"
+#: ../meld/meldwindow.py:126
+msgid "Start a new comparison"
+msgstr ""
 
-#:../glade2/filediff.glade.h:3
-msgid "Copy All To _Left"
-msgstr "ChÃp hát sang _trÃi"
+#: ../meld/meldwindow.py:127
+msgid "Save the current file"
+msgstr ""
 
-#:../glade2/filediff.glade.h:4
-msgid "Copy All To _Right"
-msgstr "ChÃp hát sang _phái"
+#: ../meld/meldwindow.py:129
+msgid "Close the current file"
+msgstr ""
 
-#:../glade2/filediff.glade.h:5
-msgid "Copy to Clipboard"
-msgstr "ChÃp vÃo báng tám"
+#: ../meld/meldwindow.py:130
+msgid "Quit the program"
+msgstr ""
 
-#:../glade2/filediff.glade.h:6
-msgid "Create Patch"
-msgstr "Táo Äáp vÃ"
+#: ../meld/meldwindow.py:132
+msgid "_Edit"
+msgstr "_Hiáu chánh"
 
-#:../glade2/filediff.glade.h:8
-msgid "Find"
-msgstr "TÃm"
+#: ../meld/meldwindow.py:133
+msgid "Undo the last action"
+msgstr ""
 
-#:../glade2/filediff.glade.h:9
-msgid "Match _entire word only"
-msgstr "Chá kháp vái t_oÃn bá tá"
+#: ../meld/meldwindow.py:134
+msgid "Redo the last undone action"
+msgstr ""
 
-#:../glade2/filediff.glade.h:10
-msgid "Regular e_xpression"
-msgstr "_Biáu thác chÃnh quy"
+#: ../meld/meldwindow.py:135
+msgid "Cut the selection"
+msgstr ""
 
-#:../glade2/filediff.glade.h:11
-msgid "Save modified files?"
-msgstr "LÆu táp tin bá sáa Äái khÃng?"
+#: ../meld/meldwindow.py:136
+#, fuzzy
+#| msgid "Compare selected"
+msgid "Copy the selection"
+msgstr "So sÃnh vÃng chán"
 
-#:../glade2/filediff.glade.h:12
-msgid "Search for:"
+#: ../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:"
 
-#:../glade2/filediff.glade.h:13
-msgid "_Match case"
-msgstr "_Kháp chá hoa/thÆáng"
+#: ../meld/meldwindow.py:139
+msgid "Find Ne_xt"
+msgstr ""
 
-#:../glade2/filediff.glade.h:14
-msgid "_Wrap around"
-msgstr "_Cuán vÃng"
+#: ../meld/meldwindow.py:139
+msgid "Search forwards for the same text"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:1
-msgid "(gnome-default-editor)"
-msgstr "(bá hiáu chánh mác Äánh Gnome)"
+#: ../meld/meldwindow.py:140
+msgid "Find _Previous"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:2
-msgid "<b>Drawing Style</b>"
-msgstr "<b>Kiáu dÃng vá</b>"
+#: ../meld/meldwindow.py:140
+msgid "Search backwards for the same text"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:3
-msgid "<b>Edit Menu</b>"
-msgstr "<b>TrÃnh ÄÆn Hiáu chánh</b>"
+#: ../meld/meldwindow.py:141
+msgid "Find and replace text"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:4
-msgid "<b>Font</b>"
-msgstr "<b>PhÃng chá</b>"
+#: ../meld/meldwindow.py:142
+#, fuzzy
+#| msgid "Preferences : Meld"
+msgid "Prefere_nces"
+msgstr "TÃy thÃch: Meld"
 
-#:../glade2/meldapp.glade.h:5
-msgid "<b>Global options</b>"
-msgstr "<b>TÃy chán toÃn các</b>"
+#: ../meld/meldwindow.py:142
+msgid "Configure the application"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:6
-msgid "<b>Loading</b>"
-msgstr "<b>Äang tái</b>"
+#: ../meld/meldwindow.py:144
+msgid "_Changes"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:7
-msgid "<b>Misc</b>"
-msgstr "<b>Linh tinh</b>"
+#: ../meld/meldwindow.py:145
+msgid "Next change"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:8
-msgid "<b>Saving</b>"
-msgstr "<b>Äang lÆu</b>"
+#: ../meld/meldwindow.py:145
+msgid "Go to the next change"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:9
-msgid "<b>Toolbar Appearance</b>"
-msgstr "<b>Dián máo thanh cÃng cá</b>"
+#: ../meld/meldwindow.py:146
+#, fuzzy
+#| msgid "Previous Logs"
+msgid "Previous change"
+msgstr "Bán ghi trÆác"
 
-#:../glade2/meldapp.glade.h:10
-msgid "<b>Update Options</b>"
-msgstr "<b>TÃy chán cáp nhát</b>"
+#: ../meld/meldwindow.py:146
+msgid "Go to the previous change"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:11
-msgid "<b>Whitespace</b>"
-msgstr "<b>Dáu cÃch tráng</b>"
+#: ../meld/meldwindow.py:147
+msgid "Open externally"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:12
-msgid "<span weight=\"bold\" size=\"x-large\">CVS</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">CVS</span>"
+#: ../meld/meldwindow.py:147
+msgid "Open selected file or directory in the default external application"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:13
-msgid "<span weight=\"bold\" size=\"x-large\">Compare</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">So sÃnh</span>"
+#: ../meld/meldwindow.py:149
+msgid "_View"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:14
-msgid "<span weight=\"bold\" size=\"x-large\">Display</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Hián thá</span>"
+#: ../meld/meldwindow.py:150
+#, fuzzy
+#| msgid "File Filters"
+msgid "File status"
+msgstr "Bá lác táp tin"
 
-#:../glade2/meldapp.glade.h:15
-msgid "<span weight=\"bold\" size=\"x-large\">Editor</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Bá hiáu chánh</span>"
+#: ../meld/meldwindow.py:151
+msgid "Version status"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:16
-msgid "<span weight=\"bold\" size=\"x-large\">Encoding</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Báng mÃ</span>"
+#: ../meld/meldwindow.py:152
+#, fuzzy
+#| msgid "File Filters"
+msgid "File filters"
+msgstr "Bá lác táp tin"
 
-#:../glade2/meldapp.glade.h:17
-msgid "<span weight=\"bold\" size=\"x-large\">File Filters</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Bá lác táp tin</span>"
+#: ../meld/meldwindow.py:153
+msgid "Stop the current action"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:18
-msgid "<span weight=\"bold\" size=\"x-large\">Text Filters</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Bá lác chá</span>"
+#: ../meld/meldwindow.py:154
+msgid "Refresh the view"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:19
-msgid "Automatically supply missing newline at end of file."
-msgstr "Tá Äáng cung cáp kà tá dÃng mái thiáu tái kát thÃc táp tin."
+#: ../meld/meldwindow.py:155
+#, fuzzy
+#| msgid "Meld"
+msgid "Reload"
+msgstr "Meld"
 
-#:../glade2/meldapp.glade.h:20
-msgid "CVS"
-msgstr "CVS"
+#: ../meld/meldwindow.py:155
+#, fuzzy
+#| msgid "_File Comparison"
+msgid "Reload the comparison"
+msgstr "So sÃnh _táp tin"
 
-#:../glade2/meldapp.glade.h:21
-msgid "CVS Directory"
-msgstr "ThÆ mác CVS"
+#: ../meld/meldwindow.py:157
+msgid "_Tabs"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:22
-msgid "CVS binary"
-msgstr "Nhá phÃn CVS"
+#: ../meld/meldwindow.py:158
+#, fuzzy
+#| msgid "Previous Logs"
+msgid "_Previous Tab"
+msgstr "Bán ghi trÆác"
 
-#:../glade2/meldapp.glade.h:23
-msgid "Choose Files"
-msgstr "Chán táp tin"
+#: ../meld/meldwindow.py:158
+msgid "Activate previous tab"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:24
-msgid ""
-"Choose how the central bar of the diff viewer is drawn. You may wish to "
-"choose a simpler mode if you find scrolling is slow."
-msgstr "HÃy chán cÃch vá thanh trung tÃm trong bá xem khÃc biát. Bán cà lá sá muán "
-"chán chá Äá ÄÆn gián hÆn náu bán tháy nà cuán chám."
+#: ../meld/meldwindow.py:159
+msgid "_Next Tab"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:25
-msgid "Copyright (C) 2002-2006 Stephen Kennedy"
-msgstr "Bán quyán  nÄm 2002-2006 Stephen Kennedy"
+#: ../meld/meldwindow.py:159
+msgid "Activate next tab"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:26
-msgid "Create missing directories (-d)"
-msgstr "Táo thÆ mác thiáu (-d)"
+#: ../meld/meldwindow.py:160
+#, fuzzy
+#| msgid "Copy To Left"
+msgid "Move Tab _Left"
+msgstr "ChÃp sang trÃi"
 
-#:../glade2/meldapp.glade.h:27
-msgid "Curved : Filled Curves"
-msgstr "Cong: cong Äác"
+#: ../meld/meldwindow.py:160
+msgid "Move current tab to left"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:28
-msgid "Custom command"
-msgstr "Lánh tá chán"
+#: ../meld/meldwindow.py:161
+#, fuzzy
+#| msgid "Copy To Right"
+msgid "Move Tab _Right"
+msgstr "ChÃp sang phái"
 
-#:../glade2/meldapp.glade.h:29
-msgid "Directory"
-msgstr "ThÆ mác"
+#: ../meld/meldwindow.py:161
+msgid "Move current tab to right"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:30
-msgid "Display"
-msgstr "Hián thá"
+#: ../meld/meldwindow.py:163
+msgid "_Help"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:31
-msgid "Edit menu popup invokes"
-msgstr "TrÃnh ÄÆn hiáu chánh mà bát lÃn gái"
+#: ../meld/meldwindow.py:164
+msgid "_Contents"
+msgstr "_Nái dung"
 
-#:../glade2/meldapp.glade.h:32
-msgid "Editor"
-msgstr "Bá hiáu chánh"
+#: ../meld/meldwindow.py:164
+msgid "Open the Meld manual"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:33
-msgid "Encoding"
-msgstr "Báng mÃ"
+#: ../meld/meldwindow.py:165
+msgid "Report _Bug"
+msgstr "ThÃng bÃo _lái"
 
-#:../glade2/meldapp.glade.h:34
-msgid "File Filters"
-msgstr "Bá lác táp tin"
+#: ../meld/meldwindow.py:165
+msgid "Report a bug in Meld"
+msgstr ""
+
+#: ../meld/meldwindow.py:166
+msgid "About this program"
+msgstr ""
+
+#: ../meld/meldwindow.py:169
+msgid "Full Screen"
+msgstr ""
+
+#: ../meld/meldwindow.py:169
+msgid "View the comparison in full screen"
+msgstr ""
+
+#: ../meld/meldwindow.py:170
+msgid "_Toolbar"
+msgstr ""
+
+#: ../meld/meldwindow.py:170
+msgid "Show or hide the toolbar"
+msgstr ""
+
+#: ../meld/meldwindow.py:171
+#, fuzzy
+#| msgid "Status"
+msgid "_Statusbar"
+msgstr "Tráng thÃi"
+
+#: ../meld/meldwindow.py:171
+msgid "Show or hide the statusbar"
+msgstr ""
+
+#: ../meld/meldwindow.py:538
+msgid "Switch to this tab"
+msgstr ""
+
+#. exit at first non found directory + file
+#: ../meld/meldwindow.py:629
+msgid "Cannot compare a mixture of files and directories.\n"
+msgstr "KhÃng thá so sÃnh táp tin và thÆ mác vái nhau.\n"
+
+#. no common path. empty names get changed to "[None]"
+#: ../meld/misc.py:174
+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..."
+
+#: ../meld/preferences.py:37
+msgid "label"
+msgstr "nhÃn"
+
+#: ../meld/preferences.py:37
+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."
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:233
+msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
+msgstr "Sao lÆu\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:235
+msgid ""
+"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
+"Desktop.ini\n"
+msgstr ""
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:237
+#, fuzzy, 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"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:239
+msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
+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}"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:243
+msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
+msgstr "Tá khoà CVS\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
 
-#:../glade2/meldapp.glade.h:35
-msgid "Gnome Default"
-msgstr "Mác Äánh Gnome"
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:245
+msgid "C++ comment\t0\t//.*\n"
+msgstr "Ghi chà C++\t0\t//.*\n"
 
-#:../glade2/meldapp.glade.h:36
-msgid "Gnome default editor"
-msgstr "Bá hiáu chánh mác Äánh Gnome"
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:247
+msgid "C comment\t0\t/\\*.*?\\*/\n"
+msgstr "Ghi chà C\t0\t/\\*.*?\\*/\n"
 
-#:../glade2/meldapp.glade.h:37
-msgid "Icons Only"
-msgstr "Chá cà hÃnh"
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:249
+msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
+msgstr "Mái dáu cÃch\t0\t[ \\t\\r\\f\\v]*\n"
 
-#:../glade2/meldapp.glade.h:38
-msgid "Ignore .cvsrc (-f)"
-msgstr "Bá qua .cvsrc (-f)"
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:251
+msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
+msgstr "Dáu cÃch Äi trÆác\t0\t^[ \\t\\r\\f\\v]*\n"
 
-#:../glade2/meldapp.glade.h:39
-msgid "Ignore changes in amount of white space"
-msgstr "Bá qua sá dáu cÃch thay Äái."
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:253
+msgid "Script comment\t0\t#.*"
+msgstr "Ghi chà táp lánh\t0\t#.*"
 
-#:../glade2/meldapp.glade.h:40
-msgid ""
-"Ignore changes in case; consider upper and lower-case letters equivalent"
-msgstr "Bá qua chá hoa/thÆáng thay Äái: xem là trÃng"
+#: ../meld/vcview.py:120
+#, fuzzy
+#| msgid "Commit"
+msgid "Co_mmit"
+msgstr "GÃi vÃo"
 
-#:../glade2/meldapp.glade.h:41
-msgid "Ignore changes that just insert or delete blank lines"
-msgstr "Bá qua thay Äái chá chÃn hay xÃa bá dÃng tráng."
+#: ../meld/vcview.py:120
+msgid "Commit"
+msgstr "GÃi vÃo"
 
-#:../glade2/meldapp.glade.h:42
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "Bá qua thay Äái chÃn hay xÃa bá dÃng tráng."
+#: ../meld/vcview.py:121
+msgid "_Update"
+msgstr "_Cáp nhát"
 
-#:../glade2/meldapp.glade.h:43
-msgid "Internal editor"
-msgstr "Bá hiáu chánh nái bá"
+#: ../meld/vcview.py:121
+msgid "Update"
+msgstr "Cáp nhát"
 
-#:../glade2/meldapp.glade.h:44
-msgid "Line Wrapping "
-msgstr "Cuán dÃng "
+#: ../meld/vcview.py:122
+msgid "Add to VC"
+msgstr "ThÃm vÃo ÄKPB"
 
-#:../glade2/meldapp.glade.h:45
-msgid "Locate CVS binary : Meld"
-msgstr "Äánh vá nhá phÃn CVS: Meld"
+#: ../meld/vcview.py:123
+msgid "Add _Binary"
+msgstr "ThÃm _nhá phÃn"
 
-#:../glade2/meldapp.glade.h:46
-msgid "Meld"
-msgstr "Meld"
+#: ../meld/vcview.py:123
+#, fuzzy
+#| msgid "Add to VC"
+msgid "Add binary to VC"
+msgstr "ThÃm vÃo ÄKPB"
 
-#:../glade2/meldapp.glade.h:47
-msgid "Mine"
-msgstr "Cáa tÃi"
+#: ../meld/vcview.py:124
+msgid "Remove from VC"
+msgstr "Gá bá ra ÄKPB"
 
-#:../glade2/meldapp.glade.h:48
-msgid "My Directory"
-msgstr "ThÆ mác tÃi"
+#: ../meld/vcview.py:125
+#, fuzzy
+#| msgid "_Remove"
+msgid "_Resolved"
+msgstr "Gá _bá"
 
-#:../glade2/meldapp.glade.h:49
-msgid "My File"
-msgstr "Táp tin tÃi"
+#: ../meld/vcview.py:125
+msgid "Mark as resolved for VC"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:50
-msgid "New..."
-msgstr "Mái..."
+#: ../meld/vcview.py:126
+msgid "Revert to original"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:51
-msgid "Original"
-msgstr "Gác"
+#: ../meld/vcview.py:127
+msgid "Delete locally"
+msgstr "Xoà bá các bá"
 
-#:../glade2/meldapp.glade.h:52
-msgid "Original Directory"
-msgstr "ThÆ mác gác"
+#: ../meld/vcview.py:131
+msgid "_Flatten"
+msgstr "LÃm _pháng"
 
-#:../glade2/meldapp.glade.h:53
-msgid "Original File"
-msgstr "Táp tin gác"
+#: ../meld/vcview.py:131
+msgid "Flatten directories"
+msgstr "LÃm pháng thÆ mác"
 
-#:../glade2/meldapp.glade.h:54
-msgid "Other"
-msgstr "KhÃc"
+#: ../meld/vcview.py:132
+msgid "_Modified"
+msgstr "Bá sáa _Äái"
 
-#:../glade2/meldapp.glade.h:55
-msgid "Other Directory"
-msgstr "ThÆ mác khÃc"
+#: ../meld/vcview.py:133
+msgid "_Normal"
+msgstr "_BÃnh thÆáng"
 
-#:../glade2/meldapp.glade.h:56
-msgid "Other File"
-msgstr "Táp tin khÃc"
+#: ../meld/vcview.py:133
+#, fuzzy
+#| msgid "Show identical"
+msgid "Show normal"
+msgstr "Hián trÃng chÃnh xÃc"
 
-#:../glade2/meldapp.glade.h:57
-msgid "Preferences : Meld"
-msgstr "TÃy thÃch: Meld"
+#: ../meld/vcview.py:134
+msgid "Non _VC"
+msgstr "KhÃng _ÄKPB"
 
-#:../glade2/meldapp.glade.h:58
-msgid "Prune empty directories (-P)"
-msgstr "XÃn bát thÆ mác tráng (-P)"
+#: ../meld/vcview.py:134
+msgid "Show unversioned files"
+msgstr "Hián táp tin khÃng ÄKPB"
 
-#:../glade2/meldapp.glade.h:59
-msgid "Quiet mode (-q)"
-msgstr "Chá Äá im (-q)"
+#: ../meld/vcview.py:135
+msgid "Ignored"
+msgstr "Bá bá qua"
 
-#:../glade2/meldapp.glade.h:60
-msgid "Report _Bug"
-msgstr "ThÃng bÃo _lái"
+#: ../meld/vcview.py:135
+#, fuzzy
+#| msgid "Show unversioned files"
+msgid "Show ignored files"
+msgstr "Hián táp tin khÃng ÄKPB"
 
-#:../glade2/meldapp.glade.h:61
-msgid "Save _As"
-msgstr "LÆu _dáng"
+#: ../meld/vcview.py:178 ../meld/vcview.py:302
+msgid "Location"
+msgstr "Äáa Äiám"
 
-#:../glade2/meldapp.glade.h:62
-msgid "Save in UTF-8 encoding"
-msgstr "LÆu báng mà kà tá UTF-8"
+#: ../meld/vcview.py:179
+msgid "Status"
+msgstr "Tráng thÃi"
 
-#:../glade2/meldapp.glade.h:63
-msgid "Save in the files original encoding"
-msgstr "LÆu báng mà kà tá gác cáa táp tin"
+#: ../meld/vcview.py:180
+msgid "Rev"
+msgstr "Bán"
 
-#:../glade2/meldapp.glade.h:64
-msgid "Show line numbers"
-msgstr "Hián sá thá tá dÃng"
+#: ../meld/vcview.py:181
+msgid "Tag"
+msgstr "Thá"
 
-#:../glade2/meldapp.glade.h:65
-msgid "Simple : Lines only"
-msgstr "ÄÆn gián: chá dÃng"
+#: ../meld/vcview.py:182
+msgid "Options"
+msgstr "TÃy chán"
 
-#:../glade2/meldapp.glade.h:66
-msgid "Solid : Filled Quadilaterals"
-msgstr "Äác: hÃnh bán cánh Äác"
+#: ../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"
 
-#:../glade2/meldapp.glade.h:67
-msgid "Tab width"
-msgstr "Ráng _tab:"
+#: ../meld/vcview.py:234
+msgid "Only one Version Control in this directory"
+msgstr ""
+
+#. 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 ""
+
+#. 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á"
 
-#:../glade2/meldapp.glade.h:68
-msgid "Text Beside Icons"
-msgstr "Chá cánh hÃnh"
+#: ../meld/vcview.py:260
+#, python-format
+msgid "%s (%s)"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:69
-msgid "Text Filters"
-msgstr "Bá lác chá"
+#. TRANSLATORS: This is the location of the directory the user is diffing
+#: ../meld/vcview.py:302
+#, python-format
+msgid "%s: %s"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:70
-msgid "Text Only"
-msgstr "Chá cà chá"
+#: ../meld/vcview.py:350
+msgid "(Empty)"
+msgstr "(Ráng)"
 
-#:../glade2/meldapp.glade.h:71
-msgid "Text Under Icons"
-msgstr "Chá dÆái hÃnh"
+#: ../meld/vcview.py:388
+#, python-format
+msgid "[%s] Fetching differences"
+msgstr "[%s] Äang láy khÃc biát"
 
-#:../glade2/meldapp.glade.h:72
-msgid "Three way directory"
-msgstr "ThÆ mác ba chiáu"
+#: ../meld/vcview.py:396
+#, python-format
+msgid "[%s] Applying patch"
+msgstr "[%s] Äang Ãp dáng Äáp vÃ"
 
-#:../glade2/meldapp.glade.h:73
-msgid "Three way file"
-msgstr "Táp tin ba chiáu"
+#: ../meld/vcview.py:478
+msgid "Select some files first."
+msgstr "Chán táp tin trÆác tiÃn."
 
-#:../glade2/meldapp.glade.h:74
-msgid "Two way directory"
-msgstr "ThÆ mác hai chiáu"
+#: ../meld/vcview.py:551
+#, python-format
+msgid ""
+"\n"
+"                    Invoking 'patch' failed.\n"
+"                    \n"
+"                    Maybe you don't have 'GNU patch' installed,\n"
+"                    or you use an untested version of %s.\n"
+"                    \n"
+"                    Please send email bug report to:\n"
+"                    meld-list gnome org\n"
+"                    \n"
+"                    Containing the following information:\n"
+"                    \n"
+"                    - meld version: '%s'\n"
+"                    - source control software type: '%s'\n"
+"                    - source control software version: 'X.Y.Z'\n"
+"                    - the output of '%s somefile.txt'\n"
+"                    - patch command: '%s'\n"
+"                    (no need to actually run it, just provide\n"
+"                    the command line) \n"
+"                    \n"
+"                    Replace 'X.Y.Z' by the actual version for the\n"
+"                    source control software you use.\n"
+"                    "
+msgstr ""
+
+#: ../meld/ui/findbar.py:127
+#, python-format
+msgid ""
+"Regular expression error\n"
+"'%s'"
+msgstr ""
+"Lái biáu thác chÃnh quy\n"
+"Â %s Â"
 
-#:../glade2/meldapp.glade.h:75
-msgid "Two way file"
-msgstr "Táp tin hai chiáu"
+#: ../meld/ui/historyentry.py:293
+msgid "_Browse..."
+msgstr ""
 
-#:../glade2/meldapp.glade.h:76
-msgid "Use Compression (-z)"
-msgstr "NÃn (-z)"
+#: ../meld/ui/historyentry.py:301
+msgid "Path"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:77
-msgid "Use GNOME monospace font."
-msgstr "DÃng phÃng chá ÄÆn cÃch GNOME."
+#: ../meld/ui/historyentry.py:302
+msgid "Path to file"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:78
-msgid "Use custom font."
-msgstr "Dáng phÃng chá tá chán."
+#: ../meld/ui/historyentry.py:303
+msgid "Pop up a file selector to choose a file"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:79
-msgid "Use syntax highlighting"
-msgstr "Tà sÃng cà phÃp"
+#: ../meld/ui/historyentry.py:441
+#, fuzzy
+#| msgid "CVS Directory"
+msgid "Select directory"
+msgstr "ThÆ mác CVS"
 
-#:../glade2/meldapp.glade.h:80
-msgid "Version control view"
-msgstr "Khung xem Äiáu khián phiÃn bán"
+#: ../meld/ui/historyentry.py:445
+#, fuzzy
+#| msgid "Select some files first."
+msgid "Select file"
+msgstr "Chán táp tin trÆác tiÃn."
 
-#:../glade2/meldapp.glade.h:81
-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)"
+#: ../meld/ui/notebooklabel.py:60
+msgid "Close tab"
+msgstr ""
 
-#:../glade2/meldapp.glade.h:82
+#. These are the possible states of files. Be sure to get the colons correct.
+#: ../meld/vc/_vc.py:40
+#, fuzzy
+#| msgid ""
+#| "Ignored:Unversioned:::Error::Newly added:Modified:<b>Conflict</b>:Removed:"
+#| "Missing"
 msgid ""
-"When performing directory comparisons, you may filter out files and "
-"directories by name. Each pattern is a list of shell style wildcards "
-"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."
+"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing"
+msgstr ""
+"Bá bá qua:KhÃng DKPB:::Lái::Mái thÃm:Bá sáa Äái:<b>Xung Äát</b>:Bá gá bá:"
+"Thiáu"
 
-#:../glade2/meldapp.glade.h:83
+#: ../meld/vc/cvs.py:163
+#, python-format
 msgid ""
-"When performing file comparisons, you may ignore certain types of changes. "
-"Each pattern here is a python regular expression which replaces matching "
-"text with the empty string before comparison is performed. If the expression "
-"contains groups, only the groups are replaced. See the user manual for more "
-"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 "
-"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."
-
-#:../glade2/meldapp.glade.h:84
-msgid "Whitespace is significant"
-msgstr "Dáu cÃch là dá liáu"
-
-#:../glade2/meldapp.glade.h:85
-msgid "_Character"
-msgstr "_KÃ tá"
-
-#:../glade2/meldapp.glade.h:87
-msgid "_Contents"
-msgstr "_Nái dung"
-
-#:../glade2/meldapp.glade.h:88
-msgid "_Directory Comparison"
-msgstr "So sÃnh th_Æ mác"
-
-#:../glade2/meldapp.glade.h:89
-msgid "_Down"
-msgstr "_Xuáng"
+"Error converting to a regular expression\n"
+"The pattern was '%s'\n"
+"The error was '%s'"
+msgstr ""
+"Gáp lái khi chuyán Äái sang biáu thác chÃnh quy.\n"
+"Máu là  %s Â.\n"
+"Lái là  %s Â."
 
-#:../glade2/meldapp.glade.h:90
-msgid "_File Comparison"
-msgstr "So sÃnh _táp tin"
+#~ msgid "Error converting pattern '%s' to regular expression"
+#~ msgstr "Gáp lái khi chuyán Äái máu  %s  sang biáu thác chÃnh quy."
 
-#:../glade2/meldapp.glade.h:91
-msgid "_Logo"
-msgstr "_Biáu hÃnh"
+#~ msgid "The regular expression '%s' was not found."
+#~ msgstr "KhÃng tÃm tháy biáu thác chÃnh quy  %s Â."
 
-#:../glade2/meldapp.glade.h:92
-msgid "_New..."
-msgstr "_Mái..."
+#~ msgid "The text '%s' was not found."
+#~ msgstr "KhÃng tÃm tháy Äoán  %s Â."
 
-#:../glade2/meldapp.glade.h:93
-msgid "_None"
-msgstr "_KhÃng cÃ"
+#~ msgid "The error was:"
+#~ msgstr "Lái:"
 
-#:../glade2/meldapp.glade.h:94
-msgid "_Save"
-msgstr "_LÆu"
+#~ msgid ""
+#~ "It contains ascii nulls.\n"
+#~ "Perhaps it is a binary file."
+#~ msgstr ""
+#~ "Nà cháa kà tá ráng ASCII.\n"
+#~ "Cà lá nà là táp tin nhá phÃn."
 
-#:../glade2/meldapp.glade.h:95
-msgid "_Three Way Compare"
-msgstr "So sÃnh _ba chiáu"
+#~ msgid "Compare"
+#~ msgstr "So sÃnh"
 
-#:../glade2/meldapp.glade.h:96
-msgid "_Up"
-msgstr "_LÃn"
+#~ msgid "Edit"
+#~ msgstr "Hiáu chánh"
 
-#:../glade2/meldapp.glade.h:97
-msgid "_Version Control Browser"
-msgstr "Bá Duyát Äiáu Khián _PhiÃn Bán"
+#~ msgid "Hide..."
+#~ msgstr "án..."
 
-#:../glade2/meldapp.glade.h:98
-msgid "_Word"
-msgstr "_Tá"
+#~ msgid "Left"
+#~ msgstr "TrÃi"
 
-#:../glade2/vcview.glade.h:1
-msgid "Add _Binary"
-msgstr "ThÃm _nhá phÃn"
+#~ msgid "Right"
+#~ msgstr "Phái"
 
-#:../glade2/vcview.glade.h:2
-msgid "Add to VC"
-msgstr "ThÃm vÃo ÄKPB"
+#~ msgid "Copy All To _Left"
+#~ msgstr "ChÃp hát sang _trÃi"
 
-#:../glade2/vcview.glade.h:3
-msgid "Commit"
-msgstr "GÃi vÃo"
+#~ msgid "Copy All To _Right"
+#~ msgstr "ChÃp hát sang _phái"
 
-#:../glade2/vcview.glade.h:4
-msgid "Commit Files"
-msgstr "GÃi táp tin vÃo"
+#~ msgid "Find"
+#~ msgstr "TÃm"
 
-#:../glade2/vcview.glade.h:5
-msgid "Compare Options"
-msgstr "So sÃnh tÃy chán"
+#~ msgid "Match _entire word only"
+#~ msgstr "Chá kháp vái t_oÃn bá tá"
 
-#:../glade2/vcview.glade.h:7
-msgid "Date"
-msgstr "NgÃy"
+#~ msgid "_Wrap around"
+#~ msgstr "_Cuán vÃng"
 
-#:../glade2/vcview.glade.h:8
-msgid "Delete locally"
-msgstr "Xoà bá các bá"
+#~ msgid "(gnome-default-editor)"
+#~ msgstr "(bá hiáu chánh mác Äánh Gnome)"
 
-#:../glade2/vcview.glade.h:9
-msgid "Flatten directories"
-msgstr "LÃm pháng thÆ mác"
+#~ msgid "<b>Drawing Style</b>"
+#~ msgstr "<b>Kiáu dÃng vá</b>"
 
-#:../glade2/vcview.glade.h:10
-msgid "Ignored"
-msgstr "Bá bá qua"
+#~ msgid "<b>Edit Menu</b>"
+#~ msgstr "<b>TrÃnh ÄÆn Hiáu chánh</b>"
 
-#:../glade2/vcview.glade.h:11
-msgid "Local copy against other remote revision"
-msgstr "Bán sao các bá vái bán sáa Äái á xa khÃc"
+#~ msgid "<b>Font</b>"
+#~ msgstr "<b>PhÃng chá</b>"
 
-#:../glade2/vcview.glade.h:12
-msgid "Local copy against same remote revision"
-msgstr "Bán sao các bá vái cÃng bán sáa Äái á xa"
+#~ msgid "<b>Global options</b>"
+#~ msgstr "<b>TÃy chán toÃn các</b>"
 
-#:../glade2/vcview.glade.h:13
-msgid "Log Message"
-msgstr "ThÃng Äiáp ghi lÆu"
+#~ msgid "<b>Misc</b>"
+#~ msgstr "<b>Linh tinh</b>"
 
-#:../glade2/vcview.glade.h:14
-msgid "Non _VC"
-msgstr "KhÃng _ÄKPB"
+#~ msgid "<b>Saving</b>"
+#~ msgstr "<b>Äang lÆu</b>"
 
-#:../glade2/vcview.glade.h:15
-msgid "Previous Logs"
-msgstr "Bán ghi trÆác"
+#~ msgid "<b>Toolbar Appearance</b>"
+#~ msgstr "<b>Dián máo thanh cÃng cá</b>"
 
-#:../glade2/vcview.glade.h:16
-msgid "Remove _Locally"
-msgstr "Gá bá _các bá"
+#~ msgid "<b>Update Options</b>"
+#~ msgstr "<b>TÃy chán cáp nhát</b>"
 
-#:../glade2/vcview.glade.h:17
-msgid "Remove from VC"
-msgstr "Gá bá ra ÄKPB"
+#~ msgid "<b>Whitespace</b>"
+#~ msgstr "<b>Dáu cÃch tráng</b>"
 
-#:../glade2/vcview.glade.h:19
-msgid "Show unversioned files"
-msgstr "Hián táp tin khÃng ÄKPB"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">CVS</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">CVS</span>"
 
-#:../glade2/vcview.glade.h:20 ../vcview.py:173
-msgid "Tag"
-msgstr "Thá"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Compare</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">So sÃnh</span>"
 
-#:../glade2/vcview.glade.h:21
-msgid "Update"
-msgstr "Cáp nhát"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Display</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Hián thá</span>"
 
-#:../glade2/vcview.glade.h:22
-msgid "VC Log"
-msgstr "Bán ghi ÄKPB"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Editor</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Bá hiáu chánh</span>"
 
-#:../glade2/vcview.glade.h:23
-msgid "_Add"
-msgstr "Th_Ãm"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Encoding</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Báng mÃ</span>"
 
-#:../glade2/vcview.glade.h:24
-msgid "_Commit"
-msgstr "_GÃi vÃo"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">File Filters</span>"
+#~ msgstr "<span weight=\"bold\" size=\"larger\">Bá lác táp tin</span>"
 
-#:../glade2/vcview.glade.h:26
-msgid "_Edit"
-msgstr "_Hiáu chánh"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Text Filters</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Bá lác chá</span>"
 
-#:../glade2/vcview.glade.h:27
-msgid "_Flatten"
-msgstr "LÃm _pháng"
+#~ msgid "Automatically supply missing newline at end of file."
+#~ msgstr "Tá Äáng cung cáp kà tá dÃng mái thiáu tái kát thÃc táp tin."
 
-#:../glade2/vcview.glade.h:28
-msgid "_Modified"
-msgstr "Bá sáa _Äái"
+#~ msgid "CVS"
+#~ msgstr "CVS"
 
-#:../glade2/vcview.glade.h:29
-msgid "_Normal"
-msgstr "_BÃnh thÆáng"
+#~ msgid "CVS binary"
+#~ msgstr "Nhá phÃn CVS"
 
-#:../glade2/vcview.glade.h:30
-msgid "_Remove"
-msgstr "Gá _bá"
+#~ msgid ""
+#~ "Choose how the central bar of the diff viewer is drawn. You may wish to "
+#~ "choose a simpler mode if you find scrolling is slow."
+#~ msgstr ""
+#~ "HÃy chán cÃch vá thanh trung tÃm trong bá xem khÃc biát. Bán cà lá sá "
+#~ "muán chán chá Äá ÄÆn gián hÆn náu bán tháy nà cuán chám."
 
-#:../glade2/vcview.glade.h:31
-msgid "_Update"
-msgstr "_Cáp nhát"
+#~ msgid "Copyright (C) 2002-2006 Stephen Kennedy"
+#~ msgstr "Bán quyán  nÄm 2002-2006 Stephen Kennedy"
 
-#:../meld:60 ../meld:70 ../meld:80
-#,c-format
-msgid "Meld requires %s or higher."
-msgstr "TrÃnh Meld cán thiát %s hay sau."
+#~ msgid "Create missing directories (-d)"
+#~ msgstr "Táo thÆ mác thiáu (-d)"
 
-#:../meld:81
-msgid ""
-"Due to incompatible API changes some functions may not operate as expected."
-msgstr "Mát sá chác nÄng cà lá sá khÃng hoát Äáng mát cÃch ÄÆác ngá, và thay Äái API "
-"mát cÃch khÃng tÆÆng thÃch."
+#~ msgid "Curved : Filled Curves"
+#~ msgstr "Cong: cong Äác"
 
-#:../meld.desktop.in.h:1
-msgid "Compare and merge your files."
-msgstr "So sÃnh và trán táp tin cáa bán."
+#~ msgid "Edit menu popup invokes"
+#~ msgstr "TrÃnh ÄÆn hiáu chánh mà bát lÃn gái"
 
-#:../meld.desktop.in.h:2
-msgid "Meld Diff Viewer"
-msgstr "Bá xem khÃc biát Meld"
+#~ msgid "Gnome Default"
+#~ msgstr "Mác Äánh Gnome"
 
-#:../meldapp.py:145
-msgid "label"
-msgstr "nhÃn"
+#~ msgid "Icons Only"
+#~ msgstr "Chá cà hÃnh"
 
-#:../meldapp.py:146
-msgid "pattern"
-msgstr "máu"
+#~ msgid "Ignore .cvsrc (-f)"
+#~ msgstr "Bá qua .cvsrc (-f)"
 
-#.file filters
-#.text filters
-#:../meldapp.py:247 ../meldapp.py:251 ../vcview.py:153
-msgid "Name"
-msgstr "TÃn"
+#~ msgid "Ignore changes in amount of white space"
+#~ msgstr "Bá qua sá dáu cÃch thay Äái."
 
-#:../meldapp.py:247 ../meldapp.py:251
-msgid "Active"
-msgstr "Hoát Äáng"
+#~ msgid ""
+#~ "Ignore changes in case; consider upper and lower-case letters equivalent"
+#~ msgstr "Bá qua chá hoa/thÆáng thay Äái: xem là trÃng"
 
-#:../meldapp.py:247
-msgid "Pattern"
-msgstr "Máu"
+#~ msgid "Ignore changes that just insert or delete blank lines"
+#~ msgstr "Bá qua thay Äái chá chÃn hay xÃa bá dÃng tráng."
 
-#:../meldapp.py:251
-msgid "Regex"
-msgstr "Biáu thác c.q."
+#~ msgid "Line Wrapping "
+#~ msgstr "Cuán dÃng "
 
-#:../meldapp.py:292
-msgid "Line numbers are 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."
+#~ msgid "Locate CVS binary : Meld"
+#~ msgstr "Äánh vá nhá phÃn CVS: Meld"
 
-#:../meldapp.py:296
-msgid ""
-"Syntax highlighting is only available if you have gnome-python-desktop installed."
-msgstr "Chá cà khá nÄng tà sÃng cà phÃp cà sán náu bán Äà cÃi Äát gnome-python-desktop."
+#~ msgid "My Directory"
+#~ msgstr "ThÆ mác tÃi"
 
-#.TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#:../meldapp.py:435
-msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
-msgstr "Sao lÆu\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
+#~ msgid "New..."
+#~ msgstr "Mái..."
 
-#.TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#:../meldapp.py:437
-msgid "CVS\t1\tCVS\n"
-msgstr "CVS\t1\tCVS\n"
+#~ msgid "Original Directory"
+#~ msgstr "ThÆ mác gác"
 
-#.TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#:../meldapp.py:439
-msgid "SVN\t1\t.svn\n"
-msgstr "SVN\t1\t.svn\n"
+#~ msgid "Original File"
+#~ msgstr "Táp tin gác"
 
-#.TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#:../meldapp.py:441
-msgid "Monotone\t1\tMT\n"
-msgstr "Monotone\t1\tMT\n"
+#~ msgid "Other Directory"
+#~ msgstr "ThÆ mác khÃc"
 
-#.TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#:../meldapp.py:443
-msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
-msgstr "Nhá phÃn\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
+#~ msgid "Other File"
+#~ msgstr "Táp tin khÃc"
 
-#.TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#:../meldapp.py:445
-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}"
+#~ msgid "Prune empty directories (-P)"
+#~ msgstr "XÃn bát thÆ mác tráng (-P)"
 
-#.TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#:../meldapp.py:447
-msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
-msgstr "Tá khoà CVS\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
+#~ msgid "Quiet mode (-q)"
+#~ msgstr "Chá Äá im (-q)"
 
-#.TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#:../meldapp.py:449
-msgid "C++ comment\t0\t//.*\n"
-msgstr "Ghi chà C++\t0\t//.*\n"
+#~ msgid "Save _As"
+#~ msgstr "LÆu _dáng"
 
-#.TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#:../meldapp.py:451
-msgid "C comment\t0\t/\\*.*?\\*/\n"
-msgstr "Ghi chà C\t0\t/\\*.*?\\*/\n"
+#~ msgid "Save in UTF-8 encoding"
+#~ msgstr "LÆu báng mà kà tá UTF-8"
 
-#.TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#:../meldapp.py:453
-msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
-msgstr "Mái dáu cÃch\t0\t[ \\t\\r\\f\\v]*\n"
+#~ msgid "Save in the files original encoding"
+#~ msgstr "LÆu báng mà kà tá gác cáa táp tin"
 
-#.TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#:../meldapp.py:455
-msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
-msgstr "Dáu cÃch Äi trÆác\t0\t^[ \\t\\r\\f\\v]*\n"
+#~ msgid "Simple : Lines only"
+#~ msgstr "ÄÆn gián: chá dÃng"
 
-#.TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#:../meldapp.py:457
-msgid "Script comment\t0\t#.*"
-msgstr "Ghi chà táp lánh\t0\t#.*"
+#~ msgid "Solid : Filled Quadilaterals"
+#~ msgstr "Äác: hÃnh bán cánh Äác"
 
-#:../meldapp.py:762
-msgid "Cannot compare a mixture of files and directories.\n"
-msgstr "KhÃng thá so sÃnh táp tin và thÆ mác vái nhau.\n"
+#~ msgid "Text Beside Icons"
+#~ msgstr "Chá cánh hÃnh"
 
-#.###############################################################################
-#.
-#.usage
-#.
-#.###############################################################################
-#:../meldapp.py:808
-msgid ""
-"Meld is a file and directory comparison tool. Usage:\n"
-"\n"
-"    meld                        Start with no windows open\n"
-"    meld <dir>                  Start with VC browser in 'dir'\n"
-"    meld <file>                 Start with VC diff of 'file'\n"
-"    meld <file> <file> [file]   Start with 2 or 3 way file comparison\n"
-"    meld <dir>  <dir>  [dir]    Start with 2 or 3 way directory comparison\n"
-"\n"
-"Options:\n"
-"    -h, --help                  Show this help text and exit\n"
-"    -v, --version               Display the version and exit\n"
-"\n"
-"For more information choose help -> contents.\n"
-"Report bugs at http://bugzilla.gnome.org/buglist.cgi?product=meld\n";
-"Discuss meld at http://mail.gnome.org/mailman/listinfo/meld-list\n";
-msgstr "Meld là cÃng cá so sÃnh táp tin và thÆ mác.\n"
-"\n"
-"CÃch sá dáng:\n"
-"\n"
-"    meld                     \tKhái cháy khÃng cà cáa sá nÃo Äang má.\n"
-"    meld <thÆ_mác>\tKhái cháy cà bá duyát ÄKPB trong thÆ mác nÃy.\n"
-"    meld <táp_tin>    \tKhái cháy cà viác phÃn biát DKPB vá táp tin nÃy.\n"
-"    meld <táp_tin> <táp_tin> [táp_tin]\n"
-"\t\t\t\t\tKhái cháy cà viác so sÃnh hai hoác ba táp tin.\n"
-"    meld <thÆ_mác>  <thÆ_mác>  [thÆ_mác]\n"
-"\t\t\t\t\tKhái cháy cà viác so sÃnh hai hoác ba thÆ mác.\n"
-"\n"
-"TÃy chán:\n"
-"    -h, --help         \tHián thá _trá giÃp_ nÃy rái thoÃt.\n"
-"    -v, --version     \tHián thá thÃng tin _phiÃn bán_ rái thoÃt.\n"
-"\n"
-"Äá tÃm thÃng tin thÃm, hÃy chán Trá giÃp â Nái dung.\n"
-"HÃy thÃng bÃo lái tái\n"
-"\t<http://bugzilla.gnome.org/buglist.cgi?product=meld>\n"
-"CÃ thá bÃn chuyán Meld trong háp thÆ chung chÃng tÃi:\n"
-"\t<http://mail.gnome.org/mailman/listinfo/meld-list>\n"
-"[DKPB: Äiáu Khián PhiÃn Bán]\n"
-
-#:../meldapp.py:825
-#,python-format
-msgid ""
-"Meld %s\n"
-"Written by Stephen Kennedy <stevek gnome org>"
-msgstr "Meld %s\n"
-"TÃc giá: Stephen Kennedy <stevek gnome org>"
-
-#:../meldapp.py:875
-#,python-format
-msgid "Wrong number of arguments (Got %i)"
-msgstr "CÃ sá Äái sá khÃng ÄÃng (nhán %i)."
+#~ msgid "Text Only"
+#~ msgstr "Chá cà chá"
 
-#:../melddoc.py:45
-msgid "untitled"
-msgstr "khÃng tÃn"
+#~ msgid "Text Under Icons"
+#~ msgstr "Chá dÆái hÃnh"
 
-#.no common path. empty names get changed to "[None]"
-#:../misc.py:118
-msgid "[None]"
-msgstr "[khÃng cÃ]"
+#~ msgid "Three way directory"
+#~ msgstr "ThÆ mác ba chiáu"
 
-#:../vcview.py:170
-msgid "Location"
-msgstr "Äáa Äiám"
+#~ msgid "Three way file"
+#~ msgstr "Táp tin ba chiáu"
 
-#:../vcview.py:171
-msgid "Status"
-msgstr "Tráng thÃi"
+#~ msgid "Two way directory"
+#~ msgstr "ThÆ mác hai chiáu"
 
-#:../vcview.py:172
-msgid "Rev"
-msgstr "Bán"
+#~ msgid "Two way file"
+#~ msgstr "Táp tin hai chiáu"
 
-#:../vcview.py:174
-msgid "Options"
-msgstr "TÃy chán"
+#~ msgid "Use Compression (-z)"
+#~ msgstr "NÃn (-z)"
 
-#:../vcview.py:256
-msgid "(Empty)"
-msgstr "(Ráng)"
+#~ msgid "Use GNOME monospace font."
+#~ msgstr "DÃng phÃng chá ÄÆn cÃch GNOME."
 
-#:../vcview.py:293
-#,python-format
-msgid "[%s] Fetching differences"
-msgstr "[%s] Äang láy khÃc biát"
+#~ msgid "Use custom font."
+#~ msgstr "Dáng phÃng chá tá chán."
 
-#:../vcview.py:300
-#,python-format
-msgid "[%s] Applying patch"
-msgstr "[%s] Äang Ãp dáng Äáp vÃ"
+#~ msgid "Whitespace is significant"
+#~ msgstr "Dáu cÃch là dá liáu"
 
-#:../vcview.py:304
-msgid "No differences found."
-msgstr "KhÃng tÃm tháy khÃc biát."
+#~ msgid "_Character"
+#~ msgstr "_KÃ tá"
 
-#:../vcview.py:381
-msgid "Select some files first."
-msgstr "Chán táp tin trÆác tiÃn."
+#~ msgid "_Logo"
+#~ msgstr "_Biáu hÃnh"
 
-#.These are the possible states of files. Be sure to get the colons correct.
-#:../vc/_vc.py:37
-msgid ""
-"Ignored:Unversioned:::Error::Newly added:Modified:<b>Conflict</b>:Removed:"
-"Missing"
-msgstr "Bá bá qua:KhÃng DKPB:::Lái::Mái thÃm:Bá sáa Äái:<b>Xung Äát</b>:Bá gá bá:"
-"Thiáu"
+#~ msgid "_Save"
+#~ msgstr "_LÆu"
 
-#:../vc/cvs.py:160
-#,python-format
-msgid ""
-"Error converting to a regular expression\n"
-"The pattern was '%s'\n"
-"The error was '%s'"
-msgstr "Gáp lái khi chuyán Äái sang biáu thác chÃnh quy.\n"
-"Máu là  %s Â.\n"
-"Lái là  %s Â."
+#~ msgid "_Up"
+#~ msgstr "_LÃn"
+
+#~ msgid "_Word"
+#~ msgstr "_Tá"
+
+#~ msgid "Compare Options"
+#~ msgstr "So sÃnh tÃy chán"
+
+#~ msgid "Local copy against other remote revision"
+#~ msgstr "Bán sao các bá vái bán sáa Äái á xa khÃc"
+
+#~ msgid "Local copy against same remote revision"
+#~ msgstr "Bán sao các bá vái cÃng bán sáa Äái á xa"
+
+#~ msgid "Remove _Locally"
+#~ msgstr "Gá bá _các bá"
+
+#~ msgid "_Commit"
+#~ msgstr "_GÃi vÃo"
+
+#~ msgid ""
+#~ "Due to incompatible API changes some functions may not operate as "
+#~ "expected."
+#~ msgstr ""
+#~ "Mát sá chác nÄng cà lá sá khÃng hoát Äáng mát cÃch ÄÆác ngá, và thay Äái "
+#~ "API mát cÃch khÃng tÆÆng thÃch."
+
+#~ msgid "Regex"
+#~ msgstr "Biáu thác c.q."
+
+#~ msgid ""
+#~ "Syntax highlighting is only available if you have gnome-python-desktop "
+#~ "installed."
+#~ msgstr ""
+#~ "Chá cà khá nÄng tà sÃng cà phÃp cà sán náu bán Äà cÃi Äát gnome-python-"
+#~ "desktop."
+
+#~ msgid "CVS\t1\tCVS\n"
+#~ msgstr "CVS\t1\tCVS\n"
+
+#~ msgid "SVN\t1\t.svn\n"
+#~ msgstr "SVN\t1\t.svn\n"
+
+#~ msgid "Monotone\t1\tMT\n"
+#~ msgstr "Monotone\t1\tMT\n"
+
+#~ msgid ""
+#~ "Meld is a file and directory comparison tool. Usage:\n"
+#~ "\n"
+#~ "    meld                        Start with no windows open\n"
+#~ "    meld <dir>                  Start with VC browser in 'dir'\n"
+#~ "    meld <file>                 Start with VC diff of 'file'\n"
+#~ "    meld <file> <file> [file]   Start with 2 or 3 way file comparison\n"
+#~ "    meld <dir>  <dir>  [dir]    Start with 2 or 3 way directory "
+#~ "comparison\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "    -h, --help                  Show this help text and exit\n"
+#~ "    -v, --version               Display the version and exit\n"
+#~ "\n"
+#~ "For more information choose help -> contents.\n"
+#~ "Report bugs at http://bugzilla.gnome.org/buglist.cgi?product=meld\n";
+#~ "Discuss meld at http://mail.gnome.org/mailman/listinfo/meld-list\n";
+#~ msgstr ""
+#~ "Meld là cÃng cá so sÃnh táp tin và thÆ mác.\n"
+#~ "\n"
+#~ "CÃch sá dáng:\n"
+#~ "\n"
+#~ "    meld                     \tKhái cháy khÃng cà cáa sá nÃo Äang má.\n"
+#~ "    meld <thÆ_mác>\tKhái cháy cà bá duyát ÄKPB trong thÆ mác nÃy.\n"
+#~ "    meld <táp_tin>    \tKhái cháy cà viác phÃn biát DKPB vá táp tin nÃy.\n"
+#~ "    meld <táp_tin> <táp_tin> [táp_tin]\n"
+#~ "\t\t\t\t\tKhái cháy cà viác so sÃnh hai hoác ba táp tin.\n"
+#~ "    meld <thÆ_mác>  <thÆ_mác>  [thÆ_mác]\n"
+#~ "\t\t\t\t\tKhái cháy cà viác so sÃnh hai hoác ba thÆ mác.\n"
+#~ "\n"
+#~ "TÃy chán:\n"
+#~ "    -h, --help         \tHián thá _trá giÃp_ nÃy rái thoÃt.\n"
+#~ "    -v, --version     \tHián thá thÃng tin _phiÃn bán_ rái thoÃt.\n"
+#~ "\n"
+#~ "Äá tÃm thÃng tin thÃm, hÃy chán Trá giÃp â Nái dung.\n"
+#~ "HÃy thÃng bÃo lái tái\n"
+#~ "\t<http://bugzilla.gnome.org/buglist.cgi?product=meld>\n"
+#~ "CÃ thá bÃn chuyán Meld trong háp thÆ chung chÃng tÃi:\n"
+#~ "\t<http://mail.gnome.org/mailman/listinfo/meld-list>\n"
+#~ "[DKPB: Äiáu Khián PhiÃn Bán]\n"
+
+#~ msgid ""
+#~ "Meld %s\n"
+#~ "Written by Stephen Kennedy <stevek gnome org>"
+#~ msgstr ""
+#~ "Meld %s\n"
+#~ "TÃc giá: Stephen Kennedy <stevek gnome org>"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]