[meld] Updated Japanese translation.

From: Takeshi Aihana <aihana src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] Updated Japanese translation.
Date: Mon, 10 Oct 2011 11:17:09 +0000 (UTC)
commit 870ab2ba265ea9d1ccd2ef9ee3c7849e41f73b3a
Author: Takeshi AIHANA <takeshi aihana gmail com>
Date:   Mon Oct 10 20:17:02 2011 +0900

    Updated Japanese translation.

 po/ja.po | 1018 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 566 insertions(+), 452 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 31471e0..0146f68 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,13 +1,13 @@
 # meld ja.po.
-# Copyright (C) 2003-2010 Free Software Foundation, Inc.
-# Takeshi AIHANA <takeshi aihana gmail com>, 2003-2010.
+# Copyright (C) 2003-2011 Free Software Foundation, Inc.
+# Takeshi AIHANA <takeshi aihana gmail com>, 2003-2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\n"
-"POT-Creation-Date: 2010-12-31 00:37+0900\n"
-"PO-Revision-Date: 2010-12-31 00:37+0900\n"
+"POT-Creation-Date: 2011-10-10 20:14+0900\n"
+"PO-Revision-Date: 2011-10-10 20:14+0900\n"
 "Last-Translator: Takeshi AIHANA <takeshi aihana gmail com>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
 "Language: ja\n"
@@ -26,22 +26,70 @@ msgstr "ãããããããããã:"
 msgid "Meld requires %s or higher."
 msgstr "Meld ãã %s ääãåèããã"
 
-#: ../data/meld.desktop.in.h:1
-msgid "Compare and merge your files"
-msgstr "èæããããããæèããããããããã"
+#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
+msgid "Meld"
+msgstr "Meld"
 
 #: ../data/meld.desktop.in.h:2
 msgid "Diff Viewer"
 msgstr "ååãããã"
 
-#: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.ui.h:5
-msgid "Meld"
-msgstr "Meld"
-
-#: ../data/meld.desktop.in.h:4
+#: ../data/meld.desktop.in.h:3
 msgid "Meld Diff Viewer"
 msgstr "Meld ååãããã"
 
+#: ../data/meld.desktop.in.h:4
+msgid "Compare and merge your files"
+msgstr "èæããããããæèããããããããã"
+
+#: ../data/ui/EditableList.ui.h:1
+msgid "Editable List"
+msgstr "çéåèãããã"
+
+#: ../data/ui/EditableList.ui.h:2
+msgid "Active"
+msgstr "æå"
+
+#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:156
+msgid "Name"
+msgstr "åå"
+
+#: ../data/ui/EditableList.ui.h:4
+msgid "Pattern"
+msgstr "ãããã"
+
+#: ../data/ui/EditableList.ui.h:5
+msgid "Add new filter"
+msgstr "æãããããããèåããã"
+
+#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:121
+msgid "_Add"
+msgstr "èå(_A)"
+
+#: ../data/ui/EditableList.ui.h:7
+msgid "Remove selected filter"
+msgstr "éæãããããããåéããã"
+
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:123
+msgid "_Remove"
+msgstr "åé(_R)"
+
+#: ../data/ui/EditableList.ui.h:9
+msgid "Move item up"
+msgstr "ãããããäãçåããã"
+
+#: ../data/ui/EditableList.ui.h:10
+msgid "Move _Up"
+msgstr "äãçåãã(_U)"
+
+#: ../data/ui/EditableList.ui.h:11
+msgid "Move item down"
+msgstr "ãããããäãçåããã"
+
+#: ../data/ui/EditableList.ui.h:12
+msgid "Move _Down"
+msgstr "äãçåãã(_D)"
+
 #: ../data/ui/filediff.ui.h:1
 msgid "Save modified files?"
 msgstr "åæãããããããäåããããï"
@@ -62,45 +110,41 @@ msgstr "åæãåãæã(_D)"
 msgid "_Save Selected"
 msgstr "éæçåãäåãã(_S)"
 
-#: ../data/ui/findbar.ui.h:1
-msgid "Regular E_xpression"
-msgstr "æèèç(_X)"
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:141
+msgid "_Replace"
+msgstr "çæ(_R)"
 
 #: ../data/ui/findbar.ui.h:2
 msgid "Replace _All"
 msgstr "åãçæ(_A)"
 
 #: ../data/ui/findbar.ui.h:3
-msgid "Replace _With"
-msgstr "æãçãæãã(_W):"
+msgid "_Previous"
+msgstr "åãçæ(_P)"
 
 #: ../data/ui/findbar.ui.h:4
-msgid "Who_le word"
-msgstr "åèåä(_L)"
+msgid "_Next"
+msgstr "æãçæ(_N)"
 
 #: ../data/ui/findbar.ui.h:5
-msgid "_Match Case"
-msgstr "å/åæåãååãã(_M)"
+msgid "_Search for"
+msgstr "æçããæåå(_S):"
 
 #: ../data/ui/findbar.ui.h:6
-msgid "_Next"
-msgstr "æãçæ(_N)"
+msgid "Replace _With"
+msgstr "æãçãæãã(_W):"
 
 #: ../data/ui/findbar.ui.h:7
-msgid "_Previous"
-msgstr "åãçæ(_P)"
+msgid "_Match Case"
+msgstr "å/åæåãååãã(_M)"
 
-#: ../data/ui/findbar.ui.h:8 ../meld/meldapp.py:147
-msgid "_Replace"
-msgstr "çæ(_R)"
+#: ../data/ui/findbar.ui.h:8
+msgid "Who_le word"
+msgstr "åèåä(_L)"
 
 #: ../data/ui/findbar.ui.h:9
-msgid "_Search for"
-msgstr "æçããæåå(_S):"
-
-#: ../data/ui/meldapp.ui.h:1
-msgid "Choose Files"
-msgstr "ãããããéæ"
+msgid "Regular E_xpression"
+msgstr "æèèç(_X)"
 
 #: ../data/ui/meldapp.ui.h:2
 msgid ""
@@ -111,60 +155,64 @@ msgstr ""
 "Copyright &#xA9; 2009-2010 Kai Willadsen"
 
 #: ../data/ui/meldapp.ui.h:4
-msgid "Directory"
-msgstr "ãããã"
+msgid "translator-credits"
+msgstr "çè æ <takeshi aihana gmail com>"
+
+#: ../data/ui/meldapp.ui.h:5
+msgid "Choose Files"
+msgstr "ãããããéæ"
+
+#: ../data/ui/meldapp.ui.h:6
+msgid "_Three Way Compare"
+msgstr "ïããéãæèãã(_T)"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:7
+#: ../data/ui/meldapp.ui.h:8
 msgid "Mine"
 msgstr "èåããã"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:9
+#: ../data/ui/meldapp.ui.h:10
 msgid "Original"
 msgstr "ããããã"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:11
+#: ../data/ui/meldapp.ui.h:12
 msgid "Other"
 msgstr "äããã"
 
-#: ../data/ui/meldapp.ui.h:12
-msgid "Select VC Directory"
-msgstr "ããããããããããããããããããéæ"
-
 #: ../data/ui/meldapp.ui.h:13
-msgid "_Directory Comparison"
-msgstr "ãããããæè(_D)"
-
-#: ../data/ui/meldapp.ui.h:14
 msgid "_File Comparison"
 msgstr "ãããããæè(_F)"
 
+#: ../data/ui/meldapp.ui.h:14
+msgid "_Directory Comparison"
+msgstr "ãããããæè(_D)"
+
 #: ../data/ui/meldapp.ui.h:15
-msgid "_Three Way Compare"
-msgstr "ïããéãæèãã(_T)"
+msgid "Select VC Directory"
+msgstr "ããããããããããããããããããéæ"
 
 #: ../data/ui/meldapp.ui.h:16
-msgid "_Version Control Browser"
-msgstr "ããããããããããããããããã(_V)"
+msgid "Directory"
+msgstr "ãããã"
 
 #: ../data/ui/meldapp.ui.h:17
-msgid "translator-credits"
-msgstr "çè æ <takeshi aihana gmail com>"
+msgid "_Version Control Browser"
+msgstr "ããããããããããããããããã(_V)"
 
 #: ../data/ui/patch-dialog.ui.h:1
-msgid "Copy to Clipboard"
-msgstr "ããããããããããã"
-
-#: ../data/ui/patch-dialog.ui.h:2
 msgid "Create Patch"
 msgstr "ããããçæ"
 
-#: ../data/ui/patch-dialog.ui.h:3
+#: ../data/ui/patch-dialog.ui.h:2
 msgid "Create a patch"
 msgstr "ããããçæ"
 
+#: ../data/ui/patch-dialog.ui.h:3
+msgid "Use differences between:"
+msgstr "æãããããéãååããããããã:"
+
 #: ../data/ui/patch-dialog.ui.h:4
 msgid "Left and middle panes"
 msgstr "ååãçãäãããã"
@@ -174,92 +222,78 @@ msgid "Middle and right panes"
 msgstr "çãäãååãããã"
 
 #: ../data/ui/patch-dialog.ui.h:6
-msgid "Use differences between:"
-msgstr "æãããããéãååããããããã:"
-
-#: ../data/ui/patch-dialog.ui.h:7
 msgid "_Reverse patch direction"
 msgstr "ãããããããããããéããã(_R)"
 
+#: ../data/ui/patch-dialog.ui.h:7
+msgid "Copy to Clipboard"
+msgstr "ããããããããããã"
+
 #: ../data/ui/preferences.ui.h:1
-msgid "Display"
-msgstr "èç"
+msgid "Meld Preferences"
+msgstr "Meld ãèå"
 
 #: ../data/ui/preferences.ui.h:2
-msgid "Do not _split words over two lines"
-msgstr "åèãäèããããããããããã(_S)"
+msgid "Font"
+msgstr "ãããã"
 
 #: ../data/ui/preferences.ui.h:3
-msgid "Edito_r command:"
-msgstr "ããäããããã(_R)"
+msgid "_Use the system fixed width font"
+msgstr "ãããããååãããããäã(_U)"
 
 #: ../data/ui/preferences.ui.h:4
-msgid "Editor"
-msgstr "ãããã"
+msgid "_Editor font:"
+msgstr "ããããããããã(_E):"
 
 #: ../data/ui/preferences.ui.h:5
-msgid "Enable text _wrapping"
-msgstr "æååãæãèããæåããã(_W)"
+msgid "Display"
+msgstr "èç"
 
 #: ../data/ui/preferences.ui.h:6
-msgid "Encoding"
-msgstr "ãããããããã"
+msgid "_Tab width:"
+msgstr "ãããå(_T):"
 
 #: ../data/ui/preferences.ui.h:7
-msgid "External editor"
-msgstr "åéãããã"
+msgid "_Insert spaces instead of tabs"
+msgstr "ãããäãããççãæåãã(_I)"
 
 #: ../data/ui/preferences.ui.h:8
-msgid "File Filters"
-msgstr "ããããããããã"
+msgid "Enable text _wrapping"
+msgstr "æååãæãèããæåããã(_W)"
 
 #: ../data/ui/preferences.ui.h:9
-msgid "Font"
-msgstr "ãããã"
+msgid "Do not _split words over two lines"
+msgstr "åèãäèããããããããããã(_S)"
 
 #: ../data/ui/preferences.ui.h:10
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "çèãæåãåéãçèãã"
+msgid "Show _line numbers"
+msgstr "èçåãèçãã(_L)"
 
 #: ../data/ui/preferences.ui.h:11
-msgid "Ignore symbolic links"
-msgstr "ãããããããããããçèãã"
+msgid "Show w_hitespace"
+msgstr "ççãæèãèçãã(_H)"
 
 #: ../data/ui/preferences.ui.h:12
-msgid "Loading"
-msgstr "èãèã"
+msgid "Use s_yntax highlighting"
+msgstr "ææãåèèçãã(_Y)"
 
 #: ../data/ui/preferences.ui.h:13
-msgid "Meld Preferences"
-msgstr "Meld ãèå"
+msgid "External editor"
+msgstr "åéãããã"
 
 #: ../data/ui/preferences.ui.h:14
-msgid "Show _line numbers"
-msgstr "èçåãèçãã(_L)"
+msgid "Use _default system editor"
+msgstr "ããããããããããããããããäçãã(_D)"
 
 #: ../data/ui/preferences.ui.h:15
-msgid "Show w_hitespace"
-msgstr "ççãæèãèçãã(_H)"
+msgid "Edito_r command:"
+msgstr "ããäããããã(_R)"
 
 #: ../data/ui/preferences.ui.h:16
-msgid "Text Filters"
-msgstr "æååããããã"
+msgid "Editor"
+msgstr "ãããã"
 
 #: ../data/ui/preferences.ui.h:17
-msgid "Use _default system editor"
-msgstr "ããããããããããããããããäçãã(_D)"
-
-#: ../data/ui/preferences.ui.h:18
-msgid "Use s_yntax highlighting"
-msgstr "ææãåèèçãã(_Y)"
-
-#: ../data/ui/preferences.ui.h:19
-msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
-msgstr ""
-"ãããããèãèãéããæãéçããããããããããèèããã (ä: 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 "
@@ -269,7 +303,15 @@ msgstr ""
 "ãããããããããããããããããããããããååãã SHELL ååããããã"
 "ããããäãããã"
 
-#: ../data/ui/preferences.ui.h:21
+#: ../data/ui/preferences.ui.h:18
+msgid "Ignore symbolic links"
+msgstr "ãããããããããããçèãã"
+
+#: ../data/ui/preferences.ui.h:19
+msgid "File Filters"
+msgstr "ããããããããã"
+
+#: ../data/ui/preferences.ui.h:20
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -283,176 +325,195 @@ msgstr ""
 "ããèåãããããããæååããçãæããããèçããããããããããããã"
 "ãèäããã"
 
+#: ../data/ui/preferences.ui.h:21
+msgid "Ignore changes which insert or delete blank lines"
+msgstr "çèãæåãåéãçèãã"
+
 #: ../data/ui/preferences.ui.h:22
-msgid "_Editor font:"
-msgstr "ããããããããã(_E):"
+msgid "Text Filters"
+msgstr "æååããããã"
 
 #: ../data/ui/preferences.ui.h:23
-msgid "_Insert spaces instead of tabs"
-msgstr "ãããäãããççãæåãã(_I)"
+msgid "Loading"
+msgstr "èãèã"
 
 #: ../data/ui/preferences.ui.h:24
-msgid "_Tab width:"
-msgstr "ãããå(_T):"
+msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
+msgstr ""
+"ãããããèãèãéããæãéçããããããããããèèããã (ä: utf8 "
+"iso8859)"
 
 #: ../data/ui/preferences.ui.h:25
-msgid "_Use the system fixed width font"
-msgstr "ãããããååãããããäã(_U)"
+msgid "Encoding"
+msgstr "ãããããããã"
 
 #: ../data/ui/vcview.ui.h:1
-msgid "Commit Files"
-msgstr "ããããããããã"
+msgid "VC Log"
+msgstr "ããããããããããããããã"
 
 #: ../data/ui/vcview.ui.h:2
-msgid "Compare Options"
-msgstr "æèãããããã"
+msgid "Commit Files"
+msgstr "ããããããããã"
 
 #: ../data/ui/vcview.ui.h:3
-msgid "Date"
-msgstr "æä"
+msgid "Previous Logs"
+msgstr "åããã"
 
 #: ../data/ui/vcview.ui.h:4
-msgid "Local copy against other remote revision"
-msgstr "ãããããäããããããããããããããããã"
+msgid "Log Message"
+msgstr "ãããããããã"
 
 #: ../data/ui/vcview.ui.h:5
-msgid "Local copy against same remote revision"
-msgstr "ãããããåããããããããããããããããã"
+msgid "Compare Options"
+msgstr "æèãããããã"
 
 #: ../data/ui/vcview.ui.h:6
-msgid "Log Message"
-msgstr "ãããããããã"
+msgid "Local copy against same remote revision"
+msgstr "ãããããåããããããããããããããããã"
 
 #: ../data/ui/vcview.ui.h:7
-msgid "Previous Logs"
-msgstr "åããã"
+msgid "Local copy against other remote revision"
+msgstr "ãããããäããããããããããããããããã"
 
 #: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:179
 msgid "Tag"
 msgstr "ãã"
 
 #: ../data/ui/vcview.ui.h:9
-msgid "VC Log"
-msgstr "ããããããããããããããã"
+msgid "Date"
+msgstr "æä"
 
-#: ../meld/dirdiff.py:142 ../meld/vcview.py:118
+#: ../meld/dirdiff.py:227 ../meld/vcview.py:118
 msgid "_Compare"
 msgstr "æè"
 
-#: ../meld/dirdiff.py:142 ../meld/vcview.py:118
+#: ../meld/dirdiff.py:227 ../meld/vcview.py:118
 msgid "Compare selected"
 msgstr "éæãããããããæèããã"
 
-#: ../meld/dirdiff.py:143
-msgid "Left"
-msgstr "åãããã"
+#: ../meld/dirdiff.py:228
+msgid "Copy _Left"
+msgstr "åãããããã(_L)"
 
-#: ../meld/dirdiff.py:143
-msgid "Copy To Left"
+#: ../meld/dirdiff.py:228
+msgid "Copy to left"
 msgstr "åããããããã"
 
-#: ../meld/dirdiff.py:144
-msgid "Right"
-msgstr "åãããã"
+#: ../meld/dirdiff.py:229
+msgid "Copy _Right"
+msgstr "åãããããã(_R)"
 
-#: ../meld/dirdiff.py:144
-msgid "Copy To Right"
+#: ../meld/dirdiff.py:229
+msgid "Copy to right"
 msgstr "åããããããã"
 
-#: ../meld/dirdiff.py:145
+#: ../meld/dirdiff.py:230
 msgid "Delete selected"
 msgstr "éæãããããããããåéããã"
 
-#: ../meld/dirdiff.py:146 ../meld/filediff.py:963
+#: ../meld/dirdiff.py:231 ../meld/filediff.py:1146
 msgid "Hide"
 msgstr "éã"
 
-#: ../meld/dirdiff.py:146
+#: ../meld/dirdiff.py:231
 msgid "Hide selected"
 msgstr "éæçåãéããã"
 
-#: ../meld/dirdiff.py:148 ../meld/filediff.py:246 ../meld/vcview.py:119
-msgid "Open selected"
-msgstr "éæãããããããéããã"
-
-#: ../meld/dirdiff.py:152
+#: ../meld/dirdiff.py:235
 msgid "Case"
 msgstr "å/åæå"
 
-#: ../meld/dirdiff.py:152
+#: ../meld/dirdiff.py:235
 msgid "Ignore case of entries"
 msgstr "å/åæåãçèããã"
 
-#: ../meld/dirdiff.py:153
+#: ../meld/dirdiff.py:236
 msgid "Same"
 msgstr "åãéå"
 
-#: ../meld/dirdiff.py:153
+#: ../meld/dirdiff.py:236
 msgid "Show identical"
 msgstr "äèããéåãèçããã"
 
-#: ../meld/dirdiff.py:154
+#: ../meld/dirdiff.py:237
 msgid "New"
 msgstr "æããéå"
 
-#: ../meld/dirdiff.py:154
+#: ../meld/dirdiff.py:237
 msgid "Show new"
 msgstr "æèãéåãèçããã"
 
-#: ../meld/dirdiff.py:155
+#: ../meld/dirdiff.py:238
 msgid "Modified"
 msgstr "åææ"
 
-#: ../meld/dirdiff.py:155 ../meld/vcview.py:132
+#: ../meld/dirdiff.py:238 ../meld/vcview.py:131
 msgid "Show modified"
 msgstr "åæããããããããèçããã"
 
-#: ../meld/dirdiff.py:157
+#: ../meld/dirdiff.py:240
 msgid "Filters"
 msgstr "ãããã"
 
-#: ../meld/dirdiff.py:157
+#: ../meld/dirdiff.py:240
 msgid "Set active filters"
 msgstr "ãããããéæããã"
 
-#: ../meld/dirdiff.py:213 ../meld/dirdiff.py:259
-#, python-format
-msgid "Error converting pattern '%s' to regular expression"
-msgstr "'%s' ããããããããæèèçãåæããéãããããççãããã"
-
-#: ../meld/dirdiff.py:270
+#: ../meld/dirdiff.py:357
 #, python-format
 msgid "Hide %s"
 msgstr "%sãèçãåãæããã"
 
-#: ../meld/dirdiff.py:355 ../meld/dirdiff.py:365 ../meld/vcview.py:299
-#: ../meld/vcview.py:327
+#: ../meld/dirdiff.py:460 ../meld/dirdiff.py:473 ../meld/vcview.py:304
+#: ../meld/vcview.py:332
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] %s ãããããä"
 
-#: ../meld/dirdiff.py:394
+#: ../meld/dirdiff.py:572
 #, python-format
-msgid "'%s' hidden by '%s'"
-msgstr "'%s' ã '%s' ããããéãããããã"
+msgid "[%s] Done"
+msgstr "[%s] åä"
 
-#: ../meld/dirdiff.py:400
-#, python-format
+#: ../meld/dirdiff.py:576
+msgid "Multiple errors occurred while scanning this folder"
+msgstr "ãããããããèæäãèæåãããããççãããã"
+
+#: ../meld/dirdiff.py:577
+msgid "Files with invalid encodings found"
+msgstr "ééãããããããããããæããããããèãããããã"
+
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:579
+msgid "Some files were in an incorrect encoding. The names are something like:"
+msgstr ""
+"ããããããããããééãããããããããããæãããããã (æãããããã"
+"ããåãã):"
+
+#: ../meld/dirdiff.py:581
+msgid "Files hidden by case insensitive comparison"
+msgstr "å/åæåãååãããæèãããããããäè"
+
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:583
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
-"filesystem. Some files are not visible:\n"
-"%s"
+"filesystem. The following files in this folder are hidden:"
 msgstr ""
 "å/åæåãååããããããããããäãå/åæåãçèããæèãèãããã"
-"ããããããããããããèçããããã:\n"
+"ããããããããããæããããããèçããããã:\n"
 "%s"
 
-#: ../meld/dirdiff.py:477
+#: ../meld/dirdiff.py:594
 #, python-format
-msgid "[%s] Done"
-msgstr "[%s] åä"
+msgid "'%s' hidden by '%s'"
+msgstr "'%s' ã '%s' ããããéãããããã"
+
+#: ../meld/dirdiff.py:619 ../meld/filediff.py:1009 ../meld/filediff.py:1150
+msgid "Hi_de"
+msgstr "éã(_D)"
 
-#: ../meld/dirdiff.py:523
+#: ../meld/dirdiff.py:669
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -461,7 +522,7 @@ msgstr ""
 "'%s' ãååãããã\n"
 "äæãããããï"
 
-#: ../meld/dirdiff.py:530
+#: ../meld/dirdiff.py:676
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -472,7 +533,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:548 ../meld/vcview.py:486
+#: ../meld/dirdiff.py:694 ../meld/vcview.py:504
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -481,7 +542,7 @@ msgstr ""
 "'%s' ãããããããã\n"
 "ååçãåéããããï"
 
-#: ../meld/dirdiff.py:555 ../meld/vcview.py:491
+#: ../meld/dirdiff.py:701 ../meld/vcview.py:509
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -492,249 +553,273 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:567
+#: ../meld/dirdiff.py:713
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%iç"
 msgstr[1] "%iç"
 
-#: ../meld/dirdiff.py:568
+#: ../meld/dirdiff.py:714
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%iå"
 msgstr[1] "%iå"
 
-#: ../meld/dirdiff.py:569
+#: ../meld/dirdiff.py:715
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%iæé"
 msgstr[1] "%iæé"
 
-#: ../meld/dirdiff.py:570
+#: ../meld/dirdiff.py:716
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%iæ"
 msgstr[1] "%iæ"
 
-#: ../meld/dirdiff.py:571
+#: ../meld/dirdiff.py:717
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%iéé"
 msgstr[1] "%iéé"
 
-#: ../meld/dirdiff.py:572
+#: ../meld/dirdiff.py:718
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%iãæ"
 msgstr[1] "%iãæ"
 
-#: ../meld/dirdiff.py:573
+#: ../meld/dirdiff.py:719
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%iå"
 msgstr[1] "%iå"
 
-#: ../meld/filediff.py:247
+#: ../meld/filediff.py:298
 msgid "Format as patch..."
 msgstr "ããããçæ..."
 
-#: ../meld/filediff.py:247
+#: ../meld/filediff.py:298
 msgid "Create a patch using differences between files"
 msgstr "ããããéãååããããããçæããã"
 
-#: ../meld/filediff.py:248
+#: ../meld/filediff.py:299
 msgid "Previous conflict"
 msgstr "åãèççæ"
 
-#: ../meld/filediff.py:248
+#: ../meld/filediff.py:299
 msgid "Go to the previous conflict"
 msgstr "åãèççæãããããããã"
 
-#: ../meld/filediff.py:249
+#: ../meld/filediff.py:300
 msgid "Next conflict"
 msgstr "æãèççæ"
 
-#: ../meld/filediff.py:249
+#: ../meld/filediff.py:300
 msgid "Go to the next conflict"
 msgstr "æãèççæãããããããã"
 
-#: ../meld/filediff.py:250
+#: ../meld/filediff.py:301
 msgid "Push to left"
 msgstr "ååãéçãã"
 
-#: ../meld/filediff.py:250
+#: ../meld/filediff.py:301
 msgid "Push current change to the left"
 msgstr "çåãåæãååããéçããã"
 
-#: ../meld/filediff.py:251
+#: ../meld/filediff.py:302
 msgid "Push to right"
 msgstr "ååãéçãã"
 
-#: ../meld/filediff.py:251
+#: ../meld/filediff.py:302
 msgid "Push current change to the right"
 msgstr "çåãåæãååããéçããã"
 
 #. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:253
+#: ../meld/filediff.py:304
 msgid "Pull from left"
 msgstr "ååãããããã"
 
-#: ../meld/filediff.py:253
+#: ../meld/filediff.py:304
 msgid "Pull change from the left"
 msgstr "ååãåæçããããããããã"
 
-#: ../meld/filediff.py:254
+#: ../meld/filediff.py:305
 msgid "Pull from right"
 msgstr "ååãããããã"
 
-#: ../meld/filediff.py:254
+#: ../meld/filediff.py:305
 msgid "Pull change from the right"
 msgstr "ååãåæçããããããããã"
 
-#: ../meld/filediff.py:255
+#: ../meld/filediff.py:306
 msgid "Copy above left"
 msgstr "åãäãããããã"
 
-#: ../meld/filediff.py:255
+#: ../meld/filediff.py:306
 msgid "Copy change above the left chunk"
 msgstr "ååãããåæçãäããããããã"
 
-#: ../meld/filediff.py:256
+#: ../meld/filediff.py:307
 msgid "Copy below left"
 msgstr "åãäãããããã"
 
-#: ../meld/filediff.py:256
+#: ../meld/filediff.py:307
 msgid "Copy change below the left chunk"
 msgstr "ååãããåæçãäããããããã"
 
-#: ../meld/filediff.py:257
+#: ../meld/filediff.py:308
 msgid "Copy above right"
 msgstr "åãäãããããã"
 
-#: ../meld/filediff.py:257
+#: ../meld/filediff.py:308
 msgid "Copy change above the right chunk"
 msgstr "ååãããåæçãäããããããã"
 
-#: ../meld/filediff.py:258
+#: ../meld/filediff.py:309
 msgid "Copy below right"
 msgstr "åãäãããããã"
 
-#: ../meld/filediff.py:258
+#: ../meld/filediff.py:309
 msgid "Copy change below the right chunk"
 msgstr "ååãããåæçãäããããããã"
 
-#: ../meld/filediff.py:259
+#: ../meld/filediff.py:310
 msgid "Delete"
 msgstr "åé"
 
-#: ../meld/filediff.py:259
+#: ../meld/filediff.py:310
 msgid "Delete change"
 msgstr "åæçãåéããã"
 
-#: ../meld/filediff.py:260
+#: ../meld/filediff.py:311
 msgid "Merge all changes from left"
-msgstr "ååãåæçãããã"
+msgstr "ååãåæçãããããã"
 
-#: ../meld/filediff.py:260
+#: ../meld/filediff.py:311
 msgid "Merge all non-conflicting changes from the left"
 msgstr "ååããã (èçããããããã) åæçãåããããããã"
 
-#: ../meld/filediff.py:261
+#: ../meld/filediff.py:312
 msgid "Merge all changes from right"
-msgstr "ååãåæçãããã"
+msgstr "ååãåæçãããããã"
 
-#: ../meld/filediff.py:261
+#: ../meld/filediff.py:312
 msgid "Merge all non-conflicting changes from the right"
 msgstr "ååããã (èçããããããã) åæçãåããããããã"
 
-#: ../meld/filediff.py:262
+#: ../meld/filediff.py:313
 msgid "Merge all non-conflicting"
-msgstr "åããåæçãããã"
+msgstr "åããåæçãããããã"
 
-#: ../meld/filediff.py:262
+#: ../meld/filediff.py:313
 msgid "Merge all non-conflicting changes from left and right panes"
 msgstr "ååãååããèçãããããããåããåæçãåããããããã"
 
+#: ../meld/filediff.py:314
+msgid "Cycle through documents"
+msgstr "ããããããéãåæãã"
+
+#: ../meld/filediff.py:314
+msgid "Move keyboard focus to the next document in this comparison"
+msgstr "ããæèãããããããããããããéããããããããçåããã"
+
+#: ../meld/filediff.py:318
+msgid "Lock scrolling"
+msgstr "ããããããããã"
+
+#: ../meld/filediff.py:319
+msgid "Lock scrolling of all panes"
+msgstr "åããããããããããããåæããã"
+
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:333
+#: ../meld/filediff.py:411
 msgid "INS"
 msgstr "[æå]"
 
-#: ../meld/filediff.py:333
+#: ../meld/filediff.py:411
 msgid "OVR"
 msgstr "[äæã]"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:335
+#: ../meld/filediff.py:413
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "(%ièã%iå)"
 
-#: ../meld/filediff.py:537
+#: ../meld/filediff.py:723
 #, 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."
+"Filter '%s' changed the number of lines in the file. Comparison will be "
+"incorrect. See the user manual for more details."
 msgstr ""
-"æèèç '%s' ããããããèæãåæããããããååãäæåãççããããè"
+"ãããã ('%s') ããããããèæãåæããããããååãäæåãçããããè"
 "çããããããããããããããèäããã"
 
 #. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:645
+#: ../meld/filediff.py:810
 msgid "<unnamed>"
 msgstr "<ååãã>"
 
-#: ../meld/filediff.py:828
+#: ../meld/filediff.py:997
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] çåããããããã"
 
-#: ../meld/filediff.py:834
+#: ../meld/filediff.py:1003
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] ãããããããããä"
 
-#: ../meld/filediff.py:840 ../meld/filediff.py:967
-msgid "Hi_de"
-msgstr "éã(_D)"
-
-#: ../meld/filediff.py:861 ../meld/filediff.py:870 ../meld/filediff.py:882
-#: ../meld/filediff.py:888
+#: ../meld/filediff.py:1027 ../meld/filediff.py:1036 ../meld/filediff.py:1048
+#: ../meld/filediff.py:1054
 msgid "Could not read file"
 msgstr "ãããããèãèããããããã"
 
-#: ../meld/filediff.py:862
+#: ../meld/filediff.py:1028
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] ãããããèãèãä"
 
-#: ../meld/filediff.py:871
+#: ../meld/filediff.py:1037
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s ããããããããããããããã"
 
-#: ../meld/filediff.py:883
+#: ../meld/filediff.py:1049
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ãæãããããããããããããããã: %s"
 
-#: ../meld/filediff.py:913 ../meld/filemerge.py:69
+#: ../meld/filediff.py:1079 ../meld/filemerge.py:67
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] ååãèçä"
 
-#: ../meld/filediff.py:961
+#: ../meld/filediff.py:1137
+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:1143
 msgid "Files are identical"
 msgstr "åäããããããã"
 
-#: ../meld/filediff.py:1096
+#: ../meld/filediff.py:1153
+msgid "Show without filters"
+msgstr "ãããããããçããèçãã"
+
+#: ../meld/filediff.py:1343
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -743,7 +828,7 @@ msgstr ""
 "\"%s\" ãååãããããï\n"
 "äæãããããï"
 
-#: ../meld/filediff.py:1109
+#: ../meld/filediff.py:1356
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -754,12 +839,12 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/filediff.py:1118
+#: ../meld/filediff.py:1365
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "ãããã %i ãååãéæ"
 
-#: ../meld/filediff.py:1133
+#: ../meld/filediff.py:1380
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -770,7 +855,7 @@ msgstr ""
 "\n"
 "ãããããããããäçããããï"
 
-#: ../meld/filediff.py:1149
+#: ../meld/filediff.py:1396
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -779,7 +864,7 @@ msgstr ""
 "'%s' ãã '%s' ããããããããããããæåãåããããããã\n"
 "UTF-8 ãããããããããããäåããããããããããï"
 
-#: ../meld/filediff.py:1208
+#: ../meld/filediff.py:1455
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -797,434 +882,467 @@ msgstr ""
 msgid "[%s] Merging files"
 msgstr "[%s] ããããããããä"
 
-#: ../meld/meldapp.py:132
+#: ../meld/meldapp.py:149
+msgid "wrong number of arguments supplied to --diff"
+msgstr "--diff ããããããåããåæãæãééããããã"
+
+#: ../meld/meldapp.py:153
+msgid "Start with an empty window"
+msgstr "äãéããã Meld ãèåãã"
+
+#: ../meld/meldapp.py:154 ../meld/meldapp.py:155 ../meld/meldapp.py:157
+msgid "file"
+msgstr "FILE"
+
+#: ../meld/meldapp.py:154 ../meld/meldapp.py:156 ../meld/meldapp.py:157
+msgid "dir"
+msgstr "DIR"
+
+#: ../meld/meldapp.py:154
+msgid "Start a version control comparison"
+msgstr "ãããããççãæèããããèåãã"
+
+#: ../meld/meldapp.py:155
+msgid "Start a 2- or 3-way file comparison"
+msgstr "ïãããïåããããããæèããããããèåãã"
+
+#: ../meld/meldapp.py:156
+msgid "Start a 2- or 3-way directory comparison"
+msgstr "ïãããïåããããããæèããããããèåãã"
+
+#: ../meld/meldapp.py:157
+msgid "Start a comparison between file and dir/file"
+msgstr "ãããããããããããæèããããããèåãã"
+
+#: ../meld/meldapp.py:163
+msgid "Meld is a file and directory comparison tool."
+msgstr "Meld ãããããããããããååãæèããããããã:"
+
+#: ../meld/meldapp.py:166
+msgid "Set label to use instead of file name"
+msgstr "ããããåãäãããäçããããããæåãã"
+
+#: ../meld/meldapp.py:168
+msgid "Automatically compare all differing files on startup"
+msgstr "èåæããããããäãããåãååãèåçãæåãã"
+
+#: ../meld/meldapp.py:170
+msgid "Ignored for compatibility"
+msgstr "äææãçèãã"
+
+#: ../meld/meldapp.py:173
+msgid "Set the target file for saving a merge result"
+msgstr "ãããããçæãäåããéãããããåãæåãã"
+
+#: ../meld/meldapp.py:176
+msgid "Creates a diff tab for up to 3 supplied files or directories."
+msgstr "æåããæåïããããããããããããããåããååããããèçãã"
+
+#: ../meld/meldapp.py:179
+#, python-format
+msgid "too many arguments (wanted 0-4, got %d)"
+msgstr "åæãåãããã (0ã4åãæåãããããåéã%då)"
+
+#: ../meld/meldapp.py:181 ../meld/meldapp.py:185
+msgid "can't compare more than three directories"
+msgstr "ïãääããããããéããæèãããããã"
+
+#: ../meld/melddoc.py:51 ../meld/melddoc.py:52
+msgid "untitled"
+msgstr "ãããããã"
+
+#: ../meld/meldwindow.py:125
 msgid "_File"
 msgstr "ãããã(_F)"
 
-#: ../meld/meldapp.py:133
+#: ../meld/meldwindow.py:126
 msgid "_New..."
 msgstr "æè(_N)..."
 
-#: ../meld/meldapp.py:133
+#: ../meld/meldwindow.py:126
 msgid "Start a new comparison"
 msgstr "æããæèãéåããã"
 
-#: ../meld/meldapp.py:134
+#: ../meld/meldwindow.py:127
 msgid "Save the current file"
 msgstr "ãããããããäåããã"
 
-#: ../meld/meldapp.py:136
+#: ../meld/meldwindow.py:129
 msgid "Close the current file"
 msgstr "ãããããããéããã"
 
-#: ../meld/meldapp.py:137
+#: ../meld/meldwindow.py:130
 msgid "Quit the program"
 msgstr "ããããããçäããã"
 
-#: ../meld/meldapp.py:139
+#: ../meld/meldwindow.py:132
 msgid "_Edit"
 msgstr "çé(_E)"
 
-#: ../meld/meldapp.py:140
+#: ../meld/meldwindow.py:133
 msgid "Undo the last action"
 msgstr "æåãéçããããããããæããã"
 
-#: ../meld/meldapp.py:141
+#: ../meld/meldwindow.py:134
 msgid "Redo the last undone action"
 msgstr "æåãéçããããããããããçããã"
 
-#: ../meld/meldapp.py:142
+#: ../meld/meldwindow.py:135
 msgid "Cut the selection"
 msgstr "éæçåãåãåããã"
 
-#: ../meld/meldapp.py:143
+#: ../meld/meldwindow.py:136
 msgid "Copy the selection"
 msgstr "éæçåããããããã"
 
-#: ../meld/meldapp.py:144
+#: ../meld/meldwindow.py:137
 msgid "Paste the clipboard"
 msgstr "ããããããããååãèãäããã"
 
-#: ../meld/meldapp.py:145
+#: ../meld/meldwindow.py:138
 msgid "Search for text"
 msgstr "æçããæåå:"
 
-#: ../meld/meldapp.py:146
+#: ../meld/meldwindow.py:139
 msgid "Find Ne_xt"
-msgstr "æãæç(_X)"
+msgstr "æãæçãã(_X)"
 
-#: ../meld/meldapp.py:146
+#: ../meld/meldwindow.py:139
 msgid "Search forwards for the same text"
-msgstr "åæãæçããã"
+msgstr "åãæååãåææçããã"
+
+#: ../meld/meldwindow.py:140
+msgid "Find _Previous"
+msgstr "åãæçãã(_P)"
 
-#: ../meld/meldapp.py:147
+#: ../meld/meldwindow.py:140
+msgid "Search backwards for the same text"
+msgstr "åãæååãåææçããã"
+
+#: ../meld/meldwindow.py:141
 msgid "Find and replace text"
 msgstr "æååãæçããçæããã"
 
-#: ../meld/meldapp.py:148
+#: ../meld/meldwindow.py:142
 msgid "Prefere_nces"
 msgstr "èå(_N)"
 
-#: ../meld/meldapp.py:148
+#: ../meld/meldwindow.py:142
 msgid "Configure the application"
 msgstr "Meld ãèåããã"
 
-#: ../meld/meldapp.py:150
+#: ../meld/meldwindow.py:144
 msgid "_Changes"
 msgstr "åæç(_C)"
 
-#: ../meld/meldapp.py:151
+#: ../meld/meldwindow.py:145
 msgid "Next change"
 msgstr "æãåæç"
 
-#: ../meld/meldapp.py:151
+#: ../meld/meldwindow.py:145
 msgid "Go to the next change"
 msgstr "æãåæçãããããããã"
 
-#: ../meld/meldapp.py:152
+#: ../meld/meldwindow.py:146
 msgid "Previous change"
 msgstr "åãåæç"
 
-#: ../meld/meldapp.py:152
+#: ../meld/meldwindow.py:146
 msgid "Go to the previous change"
 msgstr "åãåæçãããããããã"
 
-#: ../meld/meldapp.py:154
+#: ../meld/meldwindow.py:147
+msgid "Open externally"
+msgstr "åãããããéã"
+
+#: ../meld/meldwindow.py:147
+msgid "Open selected file or directory in the default external application"
+msgstr "éæãããããããããããããããããããããããããããéããã"
+
+#: ../meld/meldwindow.py:149
 msgid "_View"
 msgstr "èç(_V)"
 
-#: ../meld/meldapp.py:155
+#: ../meld/meldwindow.py:150
 msgid "File status"
 msgstr "ãããããçæ"
 
-#: ../meld/meldapp.py:156
+#: ../meld/meldwindow.py:151
 msgid "Version status"
 msgstr "ããããã"
 
-#: ../meld/meldapp.py:157
+#: ../meld/meldwindow.py:152
 msgid "File filters"
 msgstr "ããããããããã"
 
-#: ../meld/meldapp.py:158
+#: ../meld/meldwindow.py:153
 msgid "Stop the current action"
 msgstr "çåéçäãããããããåæããã"
 
-#: ../meld/meldapp.py:159
+#: ../meld/meldwindow.py:154
 msgid "Refresh the view"
 msgstr "èçãææããã"
 
-#: ../meld/meldapp.py:160
+#: ../meld/meldwindow.py:155
 msgid "Reload"
 msgstr "åèèã"
 
-#: ../meld/meldapp.py:160
+#: ../meld/meldwindow.py:155
 msgid "Reload the comparison"
 msgstr "æèååãææããã"
 
-#: ../meld/meldapp.py:162
+#: ../meld/meldwindow.py:157
+msgid "_Tabs"
+msgstr "ãã(_T)"
+
+#: ../meld/meldwindow.py:158
+msgid "_Previous Tab"
+msgstr "åããã(_P)"
+
+#: ../meld/meldwindow.py:158
+msgid "Activate previous tab"
+msgstr "åããããåãæããã"
+
+#: ../meld/meldwindow.py:159
+msgid "_Next Tab"
+msgstr "æããã(_N)"
+
+#: ../meld/meldwindow.py:159
+msgid "Activate next tab"
+msgstr "æããããåãæããã"
+
+#: ../meld/meldwindow.py:160
+msgid "Move Tab _Left"
+msgstr "ãããåãçåãã(_L)"
+
+#: ../meld/meldwindow.py:160
+msgid "Move current tab to left"
+msgstr "ãããããååãçåããã"
+
+#: ../meld/meldwindow.py:161
+msgid "Move Tab _Right"
+msgstr "ãããåãçåãã(_R)"
+
+#: ../meld/meldwindow.py:161
+msgid "Move current tab to right"
+msgstr "ãããããååãçåããã"
+
+#: ../meld/meldwindow.py:163
 msgid "_Help"
 msgstr "ããã(_H)"
 
-#: ../meld/meldapp.py:163
+#: ../meld/meldwindow.py:164
 msgid "_Contents"
 msgstr "çæ(_C)"
 
-#: ../meld/meldapp.py:163
+#: ../meld/meldwindow.py:164
 msgid "Open the Meld manual"
 msgstr "Meld ãããããéããã"
 
-#: ../meld/meldapp.py:164
+#: ../meld/meldwindow.py:165
 msgid "Report _Bug"
 msgstr "ãããåå(_B)"
 
-#: ../meld/meldapp.py:164
+#: ../meld/meldwindow.py:165
 msgid "Report a bug in Meld"
 msgstr "Meld ããããååããã"
 
-#: ../meld/meldapp.py:165
+#: ../meld/meldwindow.py:166
 msgid "About this program"
 msgstr "ããããããããããã"
 
-#: ../meld/meldapp.py:168
+#: ../meld/meldwindow.py:169
 msgid "Full Screen"
 msgstr "ãããããããèç"
 
-#: ../meld/meldapp.py:168
+#: ../meld/meldwindow.py:169
 msgid "View the comparison in full screen"
 msgstr "æèçæãããããããããèçããã"
 
-#: ../meld/meldapp.py:169
+#: ../meld/meldwindow.py:170
 msgid "_Toolbar"
 msgstr "ããããã(_T)"
 
-#: ../meld/meldapp.py:169
+#: ../meld/meldwindow.py:170
 msgid "Show or hide the toolbar"
 msgstr "ããããããèçã ON/OFF ããã"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldwindow.py:171
 msgid "_Statusbar"
 msgstr "ããããããã(_S)"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldwindow.py:171
 msgid "Show or hide the statusbar"
 msgstr "ããããããããèçã ON/OFF ããã"
 
+#: ../meld/meldwindow.py:538
+msgid "Switch to this tab"
+msgstr "ãããããåãæããã"
+
 #. exit at first non found directory + file
-#: ../meld/meldapp.py:544
+#: ../meld/meldwindow.py:629
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "ããããããããããéããæèããããããã\n"
 
-#: ../meld/meldapp.py:599
-msgid "wrong number of arguments supplied to --diff"
-msgstr "--diff ããããããåããåæãæãééããããã"
-
-#: ../meld/meldapp.py:603
-msgid "Start with an empty window"
-msgstr "äãéããã Meld ãèåãã"
-
-#: ../meld/meldapp.py:604 ../meld/meldapp.py:605 ../meld/meldapp.py:607
-msgid "file"
-msgstr "FILE"
-
-#: ../meld/meldapp.py:604 ../meld/meldapp.py:606 ../meld/meldapp.py:607
-msgid "dir"
-msgstr "DIR"
-
-#: ../meld/meldapp.py:604
-msgid "Start a version control comparison"
-msgstr "ãããããççãæèããããèåãã"
-
-#: ../meld/meldapp.py:605
-msgid "Start a 2- or 3-way file comparison"
-msgstr "ïãããïåããããããæèããããããèåãã"
-
-#: ../meld/meldapp.py:606
-msgid "Start a 2- or 3-way directory comparison"
-msgstr "ïãããïåããããããæèããããããèåãã"
-
-#: ../meld/meldapp.py:607
-msgid "Start a comparison between file and dir/file"
-msgstr "ãããããããããããæèããããããèåãã"
-
-#: ../meld/meldapp.py:613
-msgid "Meld is a file and directory comparison tool."
-msgstr "Meld ãããããããããããååãæèããããããã:"
-
-#: ../meld/meldapp.py:616
-msgid "Set label to use instead of file name"
-msgstr "ããããåãäãããäçããããããæåãã"
-
-#: ../meld/meldapp.py:618
-msgid "Automatically compare all differing files on startup"
-msgstr "èåæããããããäãããåãååãèåçãæåãã"
-
-#: ../meld/meldapp.py:621
-msgid "Set the target file for saving a merge result"
-msgstr "ãããããçæãäåããéãããããåãæåãã"
-
-#: ../meld/meldapp.py:624
-msgid "Creates a diff tab for up to 3 supplied files or directories."
-msgstr "æåããæåïããããããããããããããåããååããããèçãã"
-
-#: ../meld/meldapp.py:627
-#, python-format
-msgid "too many arguments (wanted 0-4, got %d)"
-msgstr "åæãåãããã (0ã4åãæåãããããåéã%då)"
-
-#: ../meld/melddoc.py:51 ../meld/melddoc.py:52
-msgid "untitled"
-msgstr "ãããããã"
-
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:192
+#: ../meld/misc.py:174
 msgid "[None]"
 msgstr "[ãã]"
 
-#: ../meld/patchdialog.py:119
+#: ../meld/patchdialog.py:122
 msgid "Save Patch As..."
 msgstr "ååãããããäå..."
 
-#: ../meld/preferences.py:81
+#: ../meld/preferences.py:37
 msgid "label"
 msgstr "(æããåå)"
 
-#: ../meld/preferences.py:81
+#: ../meld/preferences.py:37
 msgid "pattern"
 msgstr "(æãããããã)"
 
-#: ../meld/preferences.py:142
+#: ../meld/preferences.py:105
 msgid "Only available if you have gnome-python-desktop installed"
 msgstr ""
 "'gnome-python-desktop' ãããããããããããååãããèçåãèçããããã"
 "ããããã"
 
-#. file filters
-#. text filters
-#: ../meld/preferences.py:167 ../meld/preferences.py:172 ../meld/vcview.py:156
-msgid "Name"
-msgstr "åå"
-
-#: ../meld/preferences.py:167 ../meld/preferences.py:172
-msgid "Active"
-msgstr "æå"
-
-#: ../meld/preferences.py:167
-msgid "Pattern"
-msgstr "ãããã"
-
-#: ../meld/preferences.py:172
-msgid "Regex"
-msgstr "æèèç"
-
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:269
+#: ../meld/preferences.py:233
 msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 msgstr "ãããããã\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:271
+#: ../meld/preferences.py:235
 #, python-format
 msgid "Version Control\t1\t%s\n"
 msgstr "Version Control\t1\t%s\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:273
+#: ../meld/preferences.py:237
 msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
 msgstr "ãããã\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:275
+#: ../meld/preferences.py:239
 msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
 msgstr "ãããã\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:277
+#: ../meld/preferences.py:241
 msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
 msgstr "CVS ãããããã\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:279
+#: ../meld/preferences.py:243
 msgid "C++ comment\t0\t//.*\n"
 msgstr "C++ ããããã\t0\t//.*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:281
+#: ../meld/preferences.py:245
 msgid "C comment\t0\t/\\*.*?\\*/\n"
 msgstr "C ããããã\t0\t/\\*.*?\\*/\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:283
+#: ../meld/preferences.py:247
 msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
 msgstr "ççæå\t0\t[ \\t\\r\\f\\v]*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:285
+#: ../meld/preferences.py:249
 msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
 msgstr "åéãççæå\t0\t^[ \\t\\r\\f\\v]*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:287
+#: ../meld/preferences.py:251
 msgid "Script comment\t0\t#.*"
 msgstr "ãããããããããã\t0\t#.*"
 
-#: ../meld/vcview.py:120
-msgid "_Commit"
-msgstr "ãããã(_C)"
+#: ../meld/vcview.py:119
+msgid "Co_mmit"
+msgstr "ãããã(_M)"
 
-#: ../meld/vcview.py:120
+#: ../meld/vcview.py:119
 msgid "Commit"
 msgstr "ããããããã"
 
-#. FIXME: popup used to use gtk.STOCK_GO_BACK
-#: ../meld/vcview.py:121
+#: ../meld/vcview.py:120
 msgid "_Update"
 msgstr "ææ(_U)"
 
-#: ../meld/vcview.py:121
+#: ../meld/vcview.py:120
 msgid "Update"
 msgstr "ææããã"
 
-#. FIXME: popup used to use gtk.STOCK_GO_FORWARD
-#: ../meld/vcview.py:122
-msgid "_Add"
-msgstr "èå(_A)"
-
-#: ../meld/vcview.py:122
+#: ../meld/vcview.py:121
 msgid "Add to VC"
 msgstr "ãããããããããããããèåããã"
 
-#. FIXME: popup used to use gtk.STOCK_ADD
-#: ../meld/vcview.py:123
+#: ../meld/vcview.py:122
 msgid "Add _Binary"
 msgstr "ãããããèå(_B)"
 
-#: ../meld/vcview.py:123
+#: ../meld/vcview.py:122
 msgid "Add binary to VC"
 msgstr "ããããããããããããããããããèåããã"
 
-#. FIXME: stock is inconsistent with other VC actions
-#: ../meld/vcview.py:124
-msgid "_Remove"
-msgstr "åé(_R)"
-
-#: ../meld/vcview.py:124
+#: ../meld/vcview.py:123
 msgid "Remove from VC"
 msgstr "ããããããããããããããåéããã"
 
-#. FIXME: popup used to use gtk.STOCK_REMOVE
-#: ../meld/vcview.py:125
+#: ../meld/vcview.py:124
 msgid "_Resolved"
 msgstr "èææ(_R)"
 
-#: ../meld/vcview.py:125
+#: ../meld/vcview.py:124
 msgid "Mark as resolved for VC"
 msgstr "ãããããççãèææããããããã"
 
-#: ../meld/vcview.py:126
+#: ../meld/vcview.py:125
 msgid "Revert to original"
 msgstr "åãæããã"
 
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:126
 msgid "Delete locally"
 msgstr "ããããããããããåéããã"
 
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:130
 msgid "_Flatten"
 msgstr "äèèç(_F)"
 
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:130
 msgid "Flatten directories"
 msgstr "éäããããããçèããã"
 
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:131
 msgid "_Modified"
 msgstr "åææããã(_M)"
 
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:132
 msgid "_Normal"
 msgstr "éåããã(_N)"
 
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:132
 msgid "Show normal"
 msgstr "éåããããããèçããã"
 
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:133
 msgid "Non _VC"
 msgstr "VCäå(_V)"
 
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:133
 msgid "Show unversioned files"
 msgstr "ãããããççåããããããèçããã"
 
-#: ../meld/vcview.py:135
+#: ../meld/vcview.py:134
 msgid "Ignored"
 msgstr "çèãããã"
 
-#: ../meld/vcview.py:135
+#: ../meld/vcview.py:134
 msgid "Show ignored files"
 msgstr "çèãããããããèçããã"
 
-#: ../meld/vcview.py:176 ../meld/vcview.py:295
+#: ../meld/vcview.py:176 ../meld/vcview.py:300
 msgid "Location"
 msgstr "åæ"
 
@@ -1240,61 +1358,57 @@ msgstr "ããããã"
 msgid "Options"
 msgstr "ããããã"
 
-#: ../meld/vcview.py:227
+#: ../meld/vcview.py:232
 msgid "Choose one Version Control"
 msgstr "ïãããããããããããããéæ"
 
-#: ../meld/vcview.py:228
+#: ../meld/vcview.py:233
 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:241
+#: ../meld/vcview.py:246
 #, python-format
 msgid "%s Not Installed"
 msgstr "%s ãããããããããããããã"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:245
+#: ../meld/vcview.py:250
 msgid "Invalid Repository"
 msgstr "ããããããããããã"
 
-#: ../meld/vcview.py:254
+#: ../meld/vcview.py:259
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:295
+#: ../meld/vcview.py:300
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:343
+#: ../meld/vcview.py:348
 msgid "(Empty)"
 msgstr "(ç)"
 
-#: ../meld/vcview.py:376
+#: ../meld/vcview.py:386
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] ååãååä"
 
-#: ../meld/vcview.py:383
+#: ../meld/vcview.py:394
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] ããããéçä"
 
-#: ../meld/vcview.py:387
-msgid "No differences found."
-msgstr "ååãããããããããã"
-
-#: ../meld/vcview.py:461
+#: ../meld/vcview.py:479
 msgid "Select some files first."
 msgstr "ããæåããããããéæããäããã"
 
-#: ../meld/vcview.py:527
+#: ../meld/vcview.py:552
 #, python-format
 msgid ""
 "\n"
@@ -1343,7 +1457,7 @@ msgstr ""
 "                    ããããããçãæããäãã\n"
 "                    "
 
-#: ../meld/ui/findbar.py:120
+#: ../meld/ui/findbar.py:127
 #, python-format
 msgid ""
 "Regular expression error\n"
@@ -1352,27 +1466,27 @@ msgstr ""
 "æèèçããã\n"
 "'%s'"
 
-#: ../meld/ui/historyentry.py:290
+#: ../meld/ui/historyentry.py:293
 msgid "_Browse..."
 msgstr "åç(_B)..."
 
-#: ../meld/ui/historyentry.py:298
+#: ../meld/ui/historyentry.py:301
 msgid "Path"
 msgstr "ãã"
 
-#: ../meld/ui/historyentry.py:299
+#: ../meld/ui/historyentry.py:302
 msgid "Path to file"
 msgstr "ããããããããã"
 
-#: ../meld/ui/historyentry.py:300
+#: ../meld/ui/historyentry.py:303
 msgid "Pop up a file selector to choose a file"
 msgstr "ãããããéæããã"
 
-#: ../meld/ui/historyentry.py:419
+#: ../meld/ui/historyentry.py:441
 msgid "Select directory"
 msgstr "ãããããéæ"
 
-#: ../meld/ui/historyentry.py:423
+#: ../meld/ui/historyentry.py:445
 msgid "Select file"
 msgstr "ãããããéæ"
 
@@ -1387,7 +1501,7 @@ msgid ""
 msgstr ""
 "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing"
 
-#: ../meld/vc/cvs.py:156
+#: ../meld/vc/cvs.py:163
 #, python-format
 msgid ""
 "Error converting to a regular expression\n"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]