[meld] Updated Japanese translation

From: Jiro Matsuzawa <jmatsuzawa src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] Updated Japanese translation
Date: Wed, 11 Jan 2012 13:50:12 +0000 (UTC)
commit b5f5d6539e4eb049ee517c008d5b2a4200d50d5b
Author: Jiro Matsuzawa <jmatsuzawa src gnome org>
Date:   Wed Jan 11 22:50:00 2012 +0900

    Updated Japanese translation

 po/ja.po |  454 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 227 insertions(+), 227 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index ccc9317..fe23106 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: meld master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-11-15 20:05+0000\n"
-"PO-Revision-Date: 2011-11-22 12:32+0900\n"
+"POT-Creation-Date: 2012-01-10 20:26+0000\n"
+"PO-Revision-Date: 2012-01-01 19:55+0900\n"
 "Last-Translator: Jiro Matsuzawa <jmatsuzawa src gnome org>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr "èæããããããæèããããããããã"
 
 #: ../data/meld.desktop.in.h:2
 msgid "Diff Viewer"
-msgstr "ååãããã"
+msgstr "ååããããã"
 
 #: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.ui.h:5
 msgid "Meld"
@@ -41,7 +41,7 @@ msgstr "Meld"
 
 #: ../data/meld.desktop.in.h:4
 msgid "Meld Diff Viewer"
-msgstr "Meld ååãããã"
+msgstr "Meld ååããããã"
 
 #: ../data/ui/EditableList.ui.h:1
 msgid "Active"
@@ -49,7 +49,7 @@ msgstr "æå"
 
 #: ../data/ui/EditableList.ui.h:2
 msgid "Add new filter"
-msgstr "æãããããããèåããã"
+msgstr "æããããããããèåããã"
 
 #: ../data/ui/EditableList.ui.h:3
 msgid "Editable List"
@@ -71,7 +71,7 @@ msgstr "ãããããäãçåããã"
 msgid "Move item up"
 msgstr "ãããããäãçåããã"
 
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:156
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:166
 msgid "Name"
 msgstr "åå"
 
@@ -81,13 +81,13 @@ msgstr "ãããã"
 
 #: ../data/ui/EditableList.ui.h:10
 msgid "Remove selected filter"
-msgstr "éæãããããããåéããã"
+msgstr "éæããããããããåéããã"
 
-#: ../data/ui/EditableList.ui.h:11 ../meld/vcview.py:121
+#: ../data/ui/EditableList.ui.h:11 ../meld/vcview.py:130
 msgid "_Add"
 msgstr "èå(_A)"
 
-#: ../data/ui/EditableList.ui.h:12 ../meld/vcview.py:123
+#: ../data/ui/EditableList.ui.h:12 ../meld/vcview.py:132
 msgid "_Remove"
 msgstr "åé(_R)"
 
@@ -152,16 +152,20 @@ msgid "Choose Files"
 msgstr "ãããããéæ"
 
 #: ../data/ui/meldapp.ui.h:2
+#, fuzzy
+#| msgid ""
+#| "Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
+#| "Copyright &#xA9; 2009-2010 Kai Willadsen"
 msgid ""
 "Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
-"Copyright &#xA9; 2009-2010 Kai Willadsen"
+"Copyright &#xA9; 2009-2011 Kai Willadsen"
 msgstr ""
 "Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
 "Copyright &#xA9; 2009-2010 Kai Willadsen"
 
 #: ../data/ui/meldapp.ui.h:4
 msgid "Directory"
-msgstr "ãããã"
+msgstr "ããããã"
 
 #. Refers to version of the file being compared
 #: ../data/ui/meldapp.ui.h:7
@@ -180,11 +184,11 @@ msgstr "äããã"
 
 #: ../data/ui/meldapp.ui.h:12
 msgid "Select VC Directory"
-msgstr "ããããããããããããããããããéæ"
+msgstr "ãããããããããããããããããããéæ"
 
 #: ../data/ui/meldapp.ui.h:13
 msgid "_Directory Comparison"
-msgstr "ãããããæè(_D)"
+msgstr "ããããããæè(_D)"
 
 #: ../data/ui/meldapp.ui.h:14
 msgid "_File Comparison"
@@ -196,7 +200,7 @@ msgstr "ïããéãæèãã(_T)"
 
 #: ../data/ui/meldapp.ui.h:16
 msgid "_Version Control Browser"
-msgstr "ããããããããããããããããã(_V)"
+msgstr "ãããããããããããããããããã(_V)"
 
 #: ../data/ui/meldapp.ui.h:17
 msgid "translator-credits"
@@ -240,11 +244,11 @@ msgstr "åèãäèããããããããããã(_S)"
 
 #: ../data/ui/preferences.ui.h:3
 msgid "Edito_r command:"
-msgstr "ããäããããã(_R)"
+msgstr "ããäãããããã(_R)"
 
 #: ../data/ui/preferences.ui.h:4
 msgid "Editor"
-msgstr "ãããã"
+msgstr "ããããã"
 
 #: ../data/ui/preferences.ui.h:5
 msgid "Enable text _wrapping"
@@ -256,11 +260,11 @@ msgstr "ãããããããã"
 
 #: ../data/ui/preferences.ui.h:7
 msgid "External editor"
-msgstr "åéãããã"
+msgstr "åéããããã"
 
 #: ../data/ui/preferences.ui.h:8
 msgid "File Filters"
-msgstr "ããããããããã"
+msgstr "ãããããããããã"
 
 #: ../data/ui/preferences.ui.h:9
 msgid "Font"
@@ -292,11 +296,11 @@ msgstr "ççãæèãèçãã(_H)"
 
 #: ../data/ui/preferences.ui.h:16
 msgid "Text Filters"
-msgstr "æååããããã"
+msgstr "æååãããããã"
 
 #: ../data/ui/preferences.ui.h:17
 msgid "Use _default system editor"
-msgstr "ããããããããããããããããäçãã(_D)"
+msgstr "ãããããããããããããããããäçãã(_D)"
 
 #: ../data/ui/preferences.ui.h:18
 msgid "Use s_yntax highlighting"
@@ -314,9 +318,9 @@ msgid ""
 "directories by name. Each pattern is a list of shell style wildcards "
 "separated by spaces."
 msgstr ""
-"ãããããæèãèãæãããããããããããååããããããããããããã"
-"ãããããããããããããããããããããããååãã SHELL ååããããã"
-"ããããäãããã"
+"ããããããæèãèãæããããããããããããååããããããããããã"
+"ãããããããããããããããããããããããããååãã SHELL ååãããã"
+"ãããããäãããã"
 
 #: ../data/ui/preferences.ui.h:21
 msgid ""
@@ -334,7 +338,7 @@ msgstr ""
 
 #: ../data/ui/preferences.ui.h:22
 msgid "_Editor font:"
-msgstr "ããããããããã(_E):"
+msgstr "ãããããããããã(_E):"
 
 #: ../data/ui/preferences.ui.h:23
 msgid "_Insert spaces instead of tabs"
@@ -353,168 +357,148 @@ msgid "Commit Files"
 msgstr "ããããããããã"
 
 #: ../data/ui/vcview.ui.h:2
-msgid "Compare Options"
-msgstr "æèãããããã"
-
-#: ../data/ui/vcview.ui.h:3
-msgid "Date"
-msgstr "æä"
-
-#: ../data/ui/vcview.ui.h:4
-msgid "Local copy against other remote revision"
-msgstr "ãããããäããããããããããããããããã"
-
-#: ../data/ui/vcview.ui.h:5
-msgid "Local copy against same remote revision"
-msgstr "ãããããåããããããããããããããããã"
-
-#: ../data/ui/vcview.ui.h:6
 msgid "Log Message"
 msgstr "ãããããããã"
 
-#: ../data/ui/vcview.ui.h:7
+#: ../data/ui/vcview.ui.h:3
 msgid "Previous Logs"
 msgstr "åããã"
 
-#: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:179
-msgid "Tag"
-msgstr "ãã"
-
-#: ../data/ui/vcview.ui.h:9
+#: ../data/ui/vcview.ui.h:4
 msgid "VC Log"
 msgstr "ããããããããããããããã"
 
-#: ../meld/dirdiff.py:227 ../meld/vcview.py:118
+#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
 msgid "_Compare"
 msgstr "æè(_C)"
 
-#: ../meld/dirdiff.py:227 ../meld/vcview.py:118
+#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
 msgid "Compare selected"
 msgstr "éæãããããããæèããã"
 
-#: ../meld/dirdiff.py:228
+#: ../meld/dirdiff.py:233
 msgid "Copy _Left"
 msgstr "åãããããã(_L)"
 
-#: ../meld/dirdiff.py:228
+#: ../meld/dirdiff.py:233
 msgid "Copy to left"
 msgstr "åããããããã"
 
-#: ../meld/dirdiff.py:229
+#: ../meld/dirdiff.py:234
 msgid "Copy _Right"
 msgstr "åãããããã(_R)"
 
-#: ../meld/dirdiff.py:229
+#: ../meld/dirdiff.py:234
 msgid "Copy to right"
 msgstr "åããããããã"
 
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:235
 msgid "Delete selected"
 msgstr "éæãããããããããåéããã"
 
-#: ../meld/dirdiff.py:231 ../meld/filediff.py:1161
+#: ../meld/dirdiff.py:236 ../meld/filediff.py:1157
 msgid "Hide"
 msgstr "éã"
 
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:236
 msgid "Hide selected"
 msgstr "éæçåãéããã"
 
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:240
 msgid "Case"
 msgstr "å/åæå"
 
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:240
 msgid "Ignore case of entries"
 msgstr "å/åæåãçèããã"
 
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:241
 msgid "Same"
 msgstr "åãéå"
 
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:241
 msgid "Show identical"
 msgstr "äèããéåãèçããã"
 
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:242
 msgid "New"
 msgstr "æããéå"
 
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:242
 msgid "Show new"
 msgstr "æèãéåãèçããã"
 
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:243
 msgid "Modified"
 msgstr "åææ"
 
-#: ../meld/dirdiff.py:238 ../meld/vcview.py:131
+#: ../meld/dirdiff.py:243 ../meld/vcview.py:140
 msgid "Show modified"
 msgstr "åæããããããããèçããã"
 
-#: ../meld/dirdiff.py:240
+#: ../meld/dirdiff.py:245
 msgid "Filters"
-msgstr "ãããã"
+msgstr "ããããã"
 
-#: ../meld/dirdiff.py:240
+#: ../meld/dirdiff.py:245
 msgid "Set active filters"
-msgstr "ãããããéæããã"
+msgstr "ããããããéæããã"
 
-#: ../meld/dirdiff.py:357
+#: ../meld/dirdiff.py:362
 #, python-format
 msgid "Hide %s"
 msgstr "%sãèçãåãæããã"
 
-#: ../meld/dirdiff.py:460 ../meld/dirdiff.py:473 ../meld/vcview.py:304
-#: ../meld/vcview.py:332
+#: ../meld/dirdiff.py:465 ../meld/dirdiff.py:478 ../meld/vcview.py:322
+#: ../meld/vcview.py:346
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] %s ãããããä"
 
-#: ../meld/dirdiff.py:572
+#: ../meld/dirdiff.py:577
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] åä"
 
-#: ../meld/dirdiff.py:576
+#: ../meld/dirdiff.py:581
 msgid "Multiple errors occurred while scanning this folder"
-msgstr "ãããããããèæäãèæåãããããççãããã"
+msgstr "ããããããããèæäãèæåãããããççãããã"
 
-#: ../meld/dirdiff.py:577
+#: ../meld/dirdiff.py:582
 msgid "Files with invalid encodings found"
 msgstr "ééãããããããããããæããããããèãããããã"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:579
+#: ../meld/dirdiff.py:584
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr ""
 "ããããããããããééãããããããããããæãããããã (æãããããã"
 "ããåãã):"
 
-#: ../meld/dirdiff.py:581
+#: ../meld/dirdiff.py:586
 msgid "Files hidden by case insensitive comparison"
 msgstr "å/åæåãååãããæèãããããããäè"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:583
+#: ../meld/dirdiff.py:588
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
 msgstr ""
 "å/åæåãååããããããããããäãå/åæåãçèããæèãèãããã"
-"ããããããããããæããããããèçããããã:\n"
+"ãããããããããããæããããããèçããããã:\n"
 "%s"
 
-#: ../meld/dirdiff.py:594
+#: ../meld/dirdiff.py:599
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' ã '%s' ããããéãããããã"
 
-#: ../meld/dirdiff.py:619 ../meld/filediff.py:1012 ../meld/filediff.py:1165
+#: ../meld/dirdiff.py:624 ../meld/filediff.py:1008 ../meld/filediff.py:1161
 msgid "Hi_de"
 msgstr "éã(_D)"
 
-#: ../meld/dirdiff.py:669
+#: ../meld/dirdiff.py:674
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -523,7 +507,7 @@ msgstr ""
 "'%s' ãååãããã\n"
 "äæãããããï"
 
-#: ../meld/dirdiff.py:676
+#: ../meld/dirdiff.py:681
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -534,16 +518,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:694 ../meld/vcview.py:504
+#: ../meld/dirdiff.py:699 ../meld/vcview.py:526
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
 "Remove recursively?"
 msgstr ""
-"'%s' ãããããããã\n"
+"'%s' ããããããããã\n"
 "ååçãåéããããï"
 
-#: ../meld/dirdiff.py:701 ../meld/vcview.py:509
+#: ../meld/dirdiff.py:706 ../meld/vcview.py:531
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -554,257 +538,257 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:713
+#: ../meld/dirdiff.py:731
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
 msgstr[0] "%iç"
 msgstr[1] "%iç"
 
-#: ../meld/dirdiff.py:714
+#: ../meld/dirdiff.py:732
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
 msgstr[0] "%iå"
 msgstr[1] "%iå"
 
-#: ../meld/dirdiff.py:715
+#: ../meld/dirdiff.py:733
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
 msgstr[0] "%iæé"
 msgstr[1] "%iæé"
 
-#: ../meld/dirdiff.py:716
+#: ../meld/dirdiff.py:734
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
 msgstr[0] "%iæ"
 msgstr[1] "%iæ"
 
-#: ../meld/dirdiff.py:717
+#: ../meld/dirdiff.py:735
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
 msgstr[0] "%iéé"
 msgstr[1] "%iéé"
 
-#: ../meld/dirdiff.py:718
+#: ../meld/dirdiff.py:736
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
 msgstr[0] "%iãæ"
 msgstr[1] "%iãæ"
 
-#: ../meld/dirdiff.py:719
+#: ../meld/dirdiff.py:737
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
 msgstr[0] "%iå"
 msgstr[1] "%iå"
 
-#: ../meld/filediff.py:298
+#: ../meld/filediff.py:294
 msgid "Format as patch..."
 msgstr "ããããçæ..."
 
-#: ../meld/filediff.py:298
+#: ../meld/filediff.py:294
 msgid "Create a patch using differences between files"
 msgstr "ããããéãååããããããçæããã"
 
-#: ../meld/filediff.py:299
+#: ../meld/filediff.py:295
 msgid "Previous conflict"
 msgstr "åãèççæ"
 
-#: ../meld/filediff.py:299
+#: ../meld/filediff.py:295
 msgid "Go to the previous conflict"
 msgstr "åãèççæãããããããã"
 
-#: ../meld/filediff.py:300
+#: ../meld/filediff.py:296
 msgid "Next conflict"
 msgstr "æãèççæ"
 
-#: ../meld/filediff.py:300
+#: ../meld/filediff.py:296
 msgid "Go to the next conflict"
 msgstr "æãèççæãããããããã"
 
-#: ../meld/filediff.py:301
+#: ../meld/filediff.py:297
 msgid "Push to left"
 msgstr "ååãéçãã"
 
-#: ../meld/filediff.py:301
+#: ../meld/filediff.py:297
 msgid "Push current change to the left"
 msgstr "çåãåæãååããéçããã"
 
-#: ../meld/filediff.py:302
+#: ../meld/filediff.py:298
 msgid "Push to right"
 msgstr "ååãéçãã"
 
-#: ../meld/filediff.py:302
+#: ../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:304
+#: ../meld/filediff.py:300
 msgid "Pull from left"
 msgstr "ååãããããã"
 
-#: ../meld/filediff.py:304
+#: ../meld/filediff.py:300
 msgid "Pull change from the left"
 msgstr "ååãåæçããããããããã"
 
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:301
 msgid "Pull from right"
 msgstr "ååãããããã"
 
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:301
 msgid "Pull change from the right"
 msgstr "ååãåæçããããããããã"
 
-#: ../meld/filediff.py:306
+#: ../meld/filediff.py:302
 msgid "Copy above left"
 msgstr "åãäãããããã"
 
-#: ../meld/filediff.py:306
+#: ../meld/filediff.py:302
 msgid "Copy change above the left chunk"
 msgstr "ååãããåæçãäããããããã"
 
-#: ../meld/filediff.py:307
+#: ../meld/filediff.py:303
 msgid "Copy below left"
 msgstr "åãäãããããã"
 
-#: ../meld/filediff.py:307
+#: ../meld/filediff.py:303
 msgid "Copy change below the left chunk"
 msgstr "ååãããåæçãäããããããã"
 
-#: ../meld/filediff.py:308
+#: ../meld/filediff.py:304
 msgid "Copy above right"
 msgstr "åãäãããããã"
 
-#: ../meld/filediff.py:308
+#: ../meld/filediff.py:304
 msgid "Copy change above the right chunk"
 msgstr "ååãããåæçãäããããããã"
 
-#: ../meld/filediff.py:309
+#: ../meld/filediff.py:305
 msgid "Copy below right"
 msgstr "åãäãããããã"
 
-#: ../meld/filediff.py:309
+#: ../meld/filediff.py:305
 msgid "Copy change below the right chunk"
 msgstr "ååãããåæçãäããããããã"
 
-#: ../meld/filediff.py:310
+#: ../meld/filediff.py:306
 msgid "Delete"
 msgstr "åé"
 
-#: ../meld/filediff.py:310
+#: ../meld/filediff.py:306
 msgid "Delete change"
 msgstr "åæçãåéããã"
 
-#: ../meld/filediff.py:311
+#: ../meld/filediff.py:307
 msgid "Merge all changes from left"
 msgstr "ååãåæçãããããã"
 
-#: ../meld/filediff.py:311
+#: ../meld/filediff.py:307
 msgid "Merge all non-conflicting changes from the left"
 msgstr "ååããã (èçããããããã) åæçãåããããããã"
 
-#: ../meld/filediff.py:312
+#: ../meld/filediff.py:308
 msgid "Merge all changes from right"
 msgstr "ååãåæçãããããã"
 
-#: ../meld/filediff.py:312
+#: ../meld/filediff.py:308
 msgid "Merge all non-conflicting changes from the right"
 msgstr "ååããã (èçããããããã) åæçãåããããããã"
 
-#: ../meld/filediff.py:313
+#: ../meld/filediff.py:309
 msgid "Merge all non-conflicting"
 msgstr "åããåæçãããããã"
 
-#: ../meld/filediff.py:313
+#: ../meld/filediff.py:309
 msgid "Merge all non-conflicting changes from left and right panes"
 msgstr "ååãååããèçãããããããåããåæçãåããããããã"
 
-#: ../meld/filediff.py:314
+#: ../meld/filediff.py:310
 msgid "Cycle through documents"
 msgstr "ããããããéãåæãã"
 
-#: ../meld/filediff.py:314
+#: ../meld/filediff.py:310
 msgid "Move keyboard focus to the next document in this comparison"
 msgstr "ããæèãããããããããããããéããããããããçåããã"
 
-#: ../meld/filediff.py:318
+#: ../meld/filediff.py:314
 msgid "Lock scrolling"
 msgstr "ããããããããã"
 
-#: ../meld/filediff.py:319
+#: ../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:400
+#: ../meld/filediff.py:396
 msgid "INS"
 msgstr "[æå]"
 
-#: ../meld/filediff.py:400
+#: ../meld/filediff.py:396
 msgid "OVR"
 msgstr "[äæã]"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:402
+#: ../meld/filediff.py:398
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "(%ièã%iå)"
 
-#: ../meld/filediff.py:726
+#: ../meld/filediff.py:722
 #, python-format
 msgid ""
 "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:813
+#: ../meld/filediff.py:809
 msgid "<unnamed>"
 msgstr "<ååãã>"
 
-#: ../meld/filediff.py:1000
+#: ../meld/filediff.py:996
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] çåããããããã"
 
-#: ../meld/filediff.py:1006
+#: ../meld/filediff.py:1002
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] ãããããããããä"
 
-#: ../meld/filediff.py:1030 ../meld/filediff.py:1039 ../meld/filediff.py:1051
-#: ../meld/filediff.py:1057
+#: ../meld/filediff.py:1026 ../meld/filediff.py:1035 ../meld/filediff.py:1047
+#: ../meld/filediff.py:1053
 msgid "Could not read file"
 msgstr "ãããããèãèããããããã"
 
-#: ../meld/filediff.py:1031
+#: ../meld/filediff.py:1027
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] ãããããèãèãä"
 
-#: ../meld/filediff.py:1040
+#: ../meld/filediff.py:1036
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s ããããããããããããããã"
 
-#: ../meld/filediff.py:1052
+#: ../meld/filediff.py:1048
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ãæãããããããããããããããã: %s"
 
-#: ../meld/filediff.py:1082 ../meld/filemerge.py:67
+#: ../meld/filediff.py:1078 ../meld/filemerge.py:67
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] ååãèçä"
 
-#: ../meld/filediff.py:1152
+#: ../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?"
@@ -812,15 +796,15 @@ msgstr ""
 "æååãããããããããèããããããããããããéãéããçããååããã"
 "ãããããããããããããæèããããããï"
 
-#: ../meld/filediff.py:1158
+#: ../meld/filediff.py:1154
 msgid "Files are identical"
 msgstr "åäããããããã"
 
-#: ../meld/filediff.py:1168
+#: ../meld/filediff.py:1164
 msgid "Show without filters"
 msgstr "ãããããããçããèçãã"
 
-#: ../meld/filediff.py:1358
+#: ../meld/filediff.py:1354
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -829,7 +813,7 @@ msgstr ""
 "\"%s\" ãååãããããï\n"
 "äæãããããï"
 
-#: ../meld/filediff.py:1371
+#: ../meld/filediff.py:1367
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -840,12 +824,12 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/filediff.py:1380
+#: ../meld/filediff.py:1376
 #, python-format
 msgid "Choose a name for buffer %i."
-msgstr "ãããã %i ãååãéæ"
+msgstr "ããããã %i ãååãéæ"
 
-#: ../meld/filediff.py:1395
+#: ../meld/filediff.py:1391
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -856,7 +840,7 @@ msgstr ""
 "\n"
 "ãããããããããäçããããï"
 
-#: ../meld/filediff.py:1411
+#: ../meld/filediff.py:1407
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -865,7 +849,7 @@ msgstr ""
 "'%s' ãã '%s' ããããããããããããæåãåããããããã\n"
 "UTF-8 ãããããããããããäåããããããããããï"
 
-#: ../meld/filediff.py:1470
+#: ../meld/filediff.py:1466
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -883,72 +867,72 @@ msgstr ""
 msgid "[%s] Merging files"
 msgstr "[%s] ããããããããä"
 
-#: ../meld/meldapp.py:149
+#: ../meld/meldapp.py:152
 msgid "wrong number of arguments supplied to --diff"
 msgstr "--diff ããããããåããåæãæãééããããã"
 
-#: ../meld/meldapp.py:153
+#: ../meld/meldapp.py:156
 msgid "Start with an empty window"
 msgstr "äãéããã Meld ãèåãã"
 
-#: ../meld/meldapp.py:154 ../meld/meldapp.py:155 ../meld/meldapp.py:157
+#: ../meld/meldapp.py:157 ../meld/meldapp.py:158 ../meld/meldapp.py:160
 msgid "file"
 msgstr "FILE"
 
-#: ../meld/meldapp.py:154 ../meld/meldapp.py:156 ../meld/meldapp.py:157
+#: ../meld/meldapp.py:157 ../meld/meldapp.py:159 ../meld/meldapp.py:160
 msgid "dir"
 msgstr "DIR"
 
-#: ../meld/meldapp.py:154
+#: ../meld/meldapp.py:157
 msgid "Start a version control comparison"
 msgstr "ãããããççãæèããããèåãã"
 
-#: ../meld/meldapp.py:155
+#: ../meld/meldapp.py:158
 msgid "Start a 2- or 3-way file comparison"
 msgstr "ïãããïåããããããæèããããããèåãã"
 
-#: ../meld/meldapp.py:156
+#: ../meld/meldapp.py:159
 msgid "Start a 2- or 3-way directory comparison"
-msgstr "ïãããïåããããããæèããããããèåãã"
+msgstr "ïãããïåãããããããæèããããããèåãã"
 
-#: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:160
 msgid "Start a comparison between file and dir/file"
-msgstr "ãããããããããããæèããããããèåãã"
+msgstr "ããããããããããããæèããããããèåãã"
 
-#: ../meld/meldapp.py:163
+#: ../meld/meldapp.py:166
 msgid "Meld is a file and directory comparison tool."
-msgstr "Meld ãããããããããããååãæèããããããã:"
+msgstr "Meld ããããããããããããååãæèããããããã:"
 
-#: ../meld/meldapp.py:166
+#: ../meld/meldapp.py:169
 msgid "Set label to use instead of file name"
 msgstr "ããããåãäãããäçããããããæåãã"
 
-#: ../meld/meldapp.py:168
+#: ../meld/meldapp.py:171
 msgid "Automatically compare all differing files on startup"
 msgstr "èåæããããããäãããåãååãèåçãæåãã"
 
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:173
 msgid "Ignored for compatibility"
 msgstr "äææãçèãã"
 
-#: ../meld/meldapp.py:173
+#: ../meld/meldapp.py:176
 msgid "Set the target file for saving a merge result"
 msgstr "ãããããçæãäåããéãããããåãæåãã"
 
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:179
 msgid "Creates a diff tab for up to 3 supplied files or directories."
-msgstr "æåããæåïããããããããããããããåããååããããèçãã"
+msgstr "æåããæåïãããããããããããããããåããååããããèçãã"
 
-#: ../meld/meldapp.py:179
+#: ../meld/meldapp.py:182
 #, python-format
 msgid "too many arguments (wanted 0-4, got %d)"
 msgstr "åæãåãããã (0ã4åãæåãããããåéã%då)"
 
-#: ../meld/meldapp.py:181 ../meld/meldapp.py:185
+#: ../meld/meldapp.py:184 ../meld/meldapp.py:188
 msgid "can't compare more than three directories"
-msgstr "ïãääããããããéããæèãããããã"
+msgstr "ïãääãããããããéããæèãããããã"
 
-#: ../meld/melddoc.py:51 ../meld/melddoc.py:52
+#: ../meld/melddoc.py:56 ../meld/melddoc.py:57
 msgid "untitled"
 msgstr "ãããããã"
 
@@ -1058,7 +1042,7 @@ msgstr "åãããããéã"
 
 #: ../meld/meldwindow.py:147
 msgid "Open selected file or directory in the default external application"
-msgstr "éæãããããããããããããããããããããããããããéããã"
+msgstr "éæããããããããããããããããããããããããããããéããã"
 
 #: ../meld/meldwindow.py:149
 msgid "_View"
@@ -1074,7 +1058,7 @@ msgstr "ããããã"
 
 #: ../meld/meldwindow.py:152
 msgid "File filters"
-msgstr "ããããããããã"
+msgstr "ãããããããããã"
 
 #: ../meld/meldwindow.py:153
 msgid "Stop the current action"
@@ -1183,7 +1167,7 @@ msgstr "ãããããåãæããã"
 #. exit at first non found directory + file
 #: ../meld/meldwindow.py:629
 msgid "Cannot compare a mixture of files and directories.\n"
-msgstr "ããããããããããéããæèããããããã\n"
+msgstr "ãããããããããããéããæèããããããã\n"
 
 #. no common path. empty names get changed to "[None]"
 #: ../meld/misc.py:174
@@ -1202,221 +1186,225 @@ msgstr "(æããåå)"
 msgid "pattern"
 msgstr "(æãããããã)"
 
-#: ../meld/preferences.py:105
+#: ../meld/preferences.py:111
 msgid "Only available if you have gnome-python-desktop installed"
 msgstr ""
 "'gnome-python-desktop' ãããããããããããååãããèçåãèçããããã"
 "ããããã"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:233
+#: ../meld/preferences.py:234
 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:235
+#: ../meld/preferences.py:236
 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
+#: ../meld/preferences.py:238
 #, 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:239
+#: ../meld/preferences.py:240
 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:241
+#: ../meld/preferences.py:242
 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:243
+#: ../meld/preferences.py:244
 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:245
+#: ../meld/preferences.py:246
 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:247
+#: ../meld/preferences.py:248
 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:249
+#: ../meld/preferences.py:250
 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:251
+#: ../meld/preferences.py:252
 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:253
+#: ../meld/preferences.py:254
 msgid "Script comment\t0\t#.*"
 msgstr "ãããããããããã\t0\t#.*"
 
-#: ../meld/vcview.py:119
+#: ../meld/vcview.py:128
 msgid "Co_mmit"
 msgstr "ãããã(_M)"
 
-#: ../meld/vcview.py:119
+#: ../meld/vcview.py:128
 msgid "Commit"
 msgstr "ããããããã"
 
-#: ../meld/vcview.py:120
+#: ../meld/vcview.py:129
 msgid "_Update"
 msgstr "ææ(_U)"
 
-#: ../meld/vcview.py:120
+#: ../meld/vcview.py:129
 msgid "Update"
 msgstr "ææããã"
 
-#: ../meld/vcview.py:121
+#: ../meld/vcview.py:130
 msgid "Add to VC"
 msgstr "ãããããããããããããèåããã"
 
-#: ../meld/vcview.py:122
+#: ../meld/vcview.py:131
 msgid "Add _Binary"
 msgstr "ãããããèå(_B)"
 
-#: ../meld/vcview.py:122
+#: ../meld/vcview.py:131
 msgid "Add binary to VC"
 msgstr "ããããããããããããããããããèåããã"
 
-#: ../meld/vcview.py:123
+#: ../meld/vcview.py:132
 msgid "Remove from VC"
 msgstr "ããããããããããããããåéããã"
 
-#: ../meld/vcview.py:124
+#: ../meld/vcview.py:133
 msgid "_Resolved"
 msgstr "èææ(_R)"
 
-#: ../meld/vcview.py:124
+#: ../meld/vcview.py:133
 msgid "Mark as resolved for VC"
 msgstr "ãããããççãèææããããããã"
 
-#: ../meld/vcview.py:125
+#: ../meld/vcview.py:134
 msgid "Revert to original"
 msgstr "åãæããã"
 
-#: ../meld/vcview.py:126
+#: ../meld/vcview.py:135
 msgid "Delete locally"
 msgstr "ããããããããããåéããã"
 
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:139
 msgid "_Flatten"
 msgstr "äèèç(_F)"
 
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:139
 msgid "Flatten directories"
-msgstr "éäããããããçèããã"
+msgstr "éäãããããããçèããã"
 
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:140
 msgid "_Modified"
 msgstr "åææããã(_M)"
 
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:141
 msgid "_Normal"
 msgstr "éåããã(_N)"
 
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:141
 msgid "Show normal"
 msgstr "éåããããããèçããã"
 
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:142
 msgid "Non _VC"
 msgstr "VCäå(_V)"
 
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:142
 msgid "Show unversioned files"
 msgstr "ãããããççåããããããèçããã"
 
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:143
 msgid "Ignored"
 msgstr "çèãããã"
 
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:143
 msgid "Show ignored files"
 msgstr "çèãããããããèçããã"
 
-#: ../meld/vcview.py:176 ../meld/vcview.py:300
+#: ../meld/vcview.py:186 ../meld/vcview.py:318
 msgid "Location"
 msgstr "åæ"
 
-#: ../meld/vcview.py:177
+#: ../meld/vcview.py:187
 msgid "Status"
 msgstr "çæ"
 
-#: ../meld/vcview.py:178
+#: ../meld/vcview.py:188
 msgid "Rev"
 msgstr "ããããã"
 
-#: ../meld/vcview.py:180
+#: ../meld/vcview.py:189
+msgid "Tag"
+msgstr "ãã"
+
+#: ../meld/vcview.py:190
 msgid "Options"
 msgstr "ããããã"
 
-#: ../meld/vcview.py:232
+#: ../meld/vcview.py:249
 msgid "Choose one Version Control"
 msgstr "ïãããããããããããããéæ"
 
-#: ../meld/vcview.py:233
+#: ../meld/vcview.py:250
 msgid "Only one Version Control in this directory"
-msgstr "ãããããããïãããããããããããããã"
+msgstr "ããããããããïãããããããããããããã"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:246
+#: ../meld/vcview.py:263
 #, 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:250
+#: ../meld/vcview.py:267
 msgid "Invalid Repository"
 msgstr "ããããããããããã"
 
-#: ../meld/vcview.py:259
+#: ../meld/vcview.py:276
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:300
+#: ../meld/vcview.py:318
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:348
+#: ../meld/vcview.py:362
 msgid "(Empty)"
 msgstr "(ç)"
 
-#: ../meld/vcview.py:386
+#: ../meld/vcview.py:400
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] ååãååä"
 
-#: ../meld/vcview.py:394
+#: ../meld/vcview.py:408
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] ããããéçä"
 
-#: ../meld/vcview.py:479
+#: ../meld/vcview.py:501
 msgid "Select some files first."
 msgstr "ããæåããããããéæããäããã"
 
-#: ../meld/vcview.py:552
+#: ../meld/vcview.py:574
 #, python-format
 msgid ""
 "\n"
@@ -1492,7 +1480,7 @@ msgstr "ãããããéæããã"
 
 #: ../meld/ui/historyentry.py:441
 msgid "Select directory"
-msgstr "ãããããéæ"
+msgstr "ããããããéæ"
 
 #: ../meld/ui/historyentry.py:445
 msgid "Select file"
@@ -1519,3 +1507,15 @@ msgstr ""
 "æèèçãåæããéãããããççãããã\n"
 "ãããã: '%s'\n"
 "ããã: '%s'"
+
+#~ msgid "Compare Options"
+#~ msgstr "æèãããããã"
+
+#~ msgid "Date"
+#~ msgstr "æä"
+
+#~ msgid "Local copy against other remote revision"
+#~ msgstr "ãããããäããããããããããããããããã"
+
+#~ msgid "Local copy against same remote revision"
+#~ msgstr "ãããããåããããããããããããããããã"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]