[meld] Updated Japanese translation

From: Jiro Matsuzawa <jmatsuzawa src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] Updated Japanese translation
Date: Tue, 22 Nov 2011 23:06:21 +0000 (UTC)
commit 6a907e0a979bfcf96e567c9581378dc94e469f24
Author: Jiro Matsuzawa <jmatsuzawa src gnome org>
Date:   Wed Nov 23 08:06:12 2011 +0900

    Updated Japanese translation

 po/ja.po |  400 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 204 insertions(+), 196 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 0146f68..ccc9317 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,15 +5,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
-"Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\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"
+"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"
+"Last-Translator: Jiro Matsuzawa <jmatsuzawa src gnome org>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
 "Generated-By: pygettext.py 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -26,69 +27,69 @@ msgstr "ãããããããããã:"
 msgid "Meld requires %s or higher."
 msgstr "Meld ãã %s ääãåèããã"
 
-#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
-msgid "Meld"
-msgstr "Meld"
+#: ../data/meld.desktop.in.h:1
+msgid "Compare and merge your files"
+msgstr "èæããããããæèããããããããã"
 
 #: ../data/meld.desktop.in.h:2
 msgid "Diff Viewer"
 msgstr "ååãããã"
 
-#: ../data/meld.desktop.in.h:3
-msgid "Meld Diff Viewer"
-msgstr "Meld ååãããã"
+#: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.ui.h:5
+msgid "Meld"
+msgstr "Meld"
 
 #: ../data/meld.desktop.in.h:4
-msgid "Compare and merge your files"
-msgstr "èæããããããæèããããããããã"
+msgid "Meld Diff Viewer"
+msgstr "Meld ååãããã"
 
 #: ../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:2
+msgid "Add new filter"
+msgstr "æãããããããèåããã"
+
+#: ../data/ui/EditableList.ui.h:3
+msgid "Editable List"
+msgstr "çéåèãããã"
 
 #: ../data/ui/EditableList.ui.h:4
-msgid "Pattern"
-msgstr "ãããã"
+msgid "Move _Down"
+msgstr "äãçåãã(_D)"
 
 #: ../data/ui/EditableList.ui.h:5
-msgid "Add new filter"
-msgstr "æãããããããèåããã"
+msgid "Move _Up"
+msgstr "äãçåãã(_U)"
 
-#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:121
-msgid "_Add"
-msgstr "èå(_A)"
+#: ../data/ui/EditableList.ui.h:6
+msgid "Move item down"
+msgstr "ãããããäãçåããã"
 
 #: ../data/ui/EditableList.ui.h:7
-msgid "Remove selected filter"
-msgstr "éæãããããããåéããã"
+msgid "Move item up"
+msgstr "ãããããäãçåããã"
 
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:123
-msgid "_Remove"
-msgstr "åé(_R)"
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:156
+msgid "Name"
+msgstr "åå"
 
 #: ../data/ui/EditableList.ui.h:9
-msgid "Move item up"
-msgstr "ãããããäãçåããã"
+msgid "Pattern"
+msgstr "ãããã"
 
 #: ../data/ui/EditableList.ui.h:10
-msgid "Move _Up"
-msgstr "äãçåãã(_U)"
+msgid "Remove selected filter"
+msgstr "éæãããããããåéããã"
 
-#: ../data/ui/EditableList.ui.h:11
-msgid "Move item down"
-msgstr "ãããããäãçåããã"
+#: ../data/ui/EditableList.ui.h:11 ../meld/vcview.py:121
+msgid "_Add"
+msgstr "èå(_A)"
 
-#: ../data/ui/EditableList.ui.h:12
-msgid "Move _Down"
-msgstr "äãçåãã(_D)"
+#: ../data/ui/EditableList.ui.h:12 ../meld/vcview.py:123
+msgid "_Remove"
+msgstr "åé(_R)"
 
 #: ../data/ui/filediff.ui.h:1
 msgid "Save modified files?"
@@ -110,41 +111,45 @@ msgstr "åæãåãæã(_D)"
 msgid "_Save Selected"
 msgstr "éæçåãäåãã(_S)"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:141
-msgid "_Replace"
-msgstr "çæ(_R)"
+#: ../data/ui/findbar.ui.h:1
+msgid "Regular E_xpression"
+msgstr "æèèç(_X)"
 
 #: ../data/ui/findbar.ui.h:2
 msgid "Replace _All"
 msgstr "åãçæ(_A)"
 
 #: ../data/ui/findbar.ui.h:3
-msgid "_Previous"
-msgstr "åãçæ(_P)"
+msgid "Replace _With"
+msgstr "æãçãæãã(_W):"
 
 #: ../data/ui/findbar.ui.h:4
-msgid "_Next"
-msgstr "æãçæ(_N)"
+msgid "Who_le word"
+msgstr "åèåä(_L)"
 
 #: ../data/ui/findbar.ui.h:5
-msgid "_Search for"
-msgstr "æçããæåå(_S):"
+msgid "_Match Case"
+msgstr "å/åæåãååãã(_M)"
 
 #: ../data/ui/findbar.ui.h:6
-msgid "Replace _With"
-msgstr "æãçãæãã(_W):"
+msgid "_Next"
+msgstr "æãçæ(_N)"
 
 #: ../data/ui/findbar.ui.h:7
-msgid "_Match Case"
-msgstr "å/åæåãååãã(_M)"
+msgid "_Previous"
+msgstr "åãçæ(_P)"
 
-#: ../data/ui/findbar.ui.h:8
-msgid "Who_le word"
-msgstr "åèåä(_L)"
+#: ../data/ui/findbar.ui.h:8 ../meld/meldwindow.py:141
+msgid "_Replace"
+msgstr "çæ(_R)"
 
 #: ../data/ui/findbar.ui.h:9
-msgid "Regular E_xpression"
-msgstr "æèèç(_X)"
+msgid "_Search for"
+msgstr "æçããæåå(_S):"
+
+#: ../data/ui/meldapp.ui.h:1
+msgid "Choose Files"
+msgstr "ãããããéæ"
 
 #: ../data/ui/meldapp.ui.h:2
 msgid ""
@@ -155,63 +160,59 @@ msgstr ""
 "Copyright &#xA9; 2009-2010 Kai Willadsen"
 
 #: ../data/ui/meldapp.ui.h:4
-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)"
+msgid "Directory"
+msgstr "ãããã"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:8
+#: ../data/ui/meldapp.ui.h:7
 msgid "Mine"
 msgstr "èåããã"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:10
+#: ../data/ui/meldapp.ui.h:9
 msgid "Original"
 msgstr "ããããã"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:12
+#: ../data/ui/meldapp.ui.h:11
 msgid "Other"
 msgstr "äããã"
 
-#: ../data/ui/meldapp.ui.h:13
-msgid "_File Comparison"
-msgstr "ãããããæè(_F)"
+#: ../data/ui/meldapp.ui.h:12
+msgid "Select VC Directory"
+msgstr "ããããããããããããããããããéæ"
 
-#: ../data/ui/meldapp.ui.h:14
+#: ../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:15
-msgid "Select VC Directory"
-msgstr "ããããããããããããããããããéæ"
+msgid "_Three Way Compare"
+msgstr "ïããéãæèãã(_T)"
 
 #: ../data/ui/meldapp.ui.h:16
-msgid "Directory"
-msgstr "ãããã"
-
-#: ../data/ui/meldapp.ui.h:17
 msgid "_Version Control Browser"
 msgstr "ããããããããããããããããã(_V)"
 
+#: ../data/ui/meldapp.ui.h:17
+msgid "translator-credits"
+msgstr "çè æ <takeshi aihana gmail com>"
+
 #: ../data/ui/patch-dialog.ui.h:1
-msgid "Create Patch"
-msgstr "ããããçæ"
+msgid "Copy to Clipboard"
+msgstr "ããããããããããã"
 
 #: ../data/ui/patch-dialog.ui.h:2
-msgid "Create a patch"
+msgid "Create Patch"
 msgstr "ããããçæ"
 
 #: ../data/ui/patch-dialog.ui.h:3
-msgid "Use differences between:"
-msgstr "æãããããéãååããããããã:"
+msgid "Create a patch"
+msgstr "ããããçæ"
 
 #: ../data/ui/patch-dialog.ui.h:4
 msgid "Left and middle panes"
@@ -222,78 +223,92 @@ msgid "Middle and right panes"
 msgstr "çãäãååãããã"
 
 #: ../data/ui/patch-dialog.ui.h:6
-msgid "_Reverse patch direction"
-msgstr "ãããããããããããéããã(_R)"
+msgid "Use differences between:"
+msgstr "æãããããéãååããããããã:"
 
 #: ../data/ui/patch-dialog.ui.h:7
-msgid "Copy to Clipboard"
-msgstr "ããããããããããã"
+msgid "_Reverse patch direction"
+msgstr "ãããããããããããéããã(_R)"
 
 #: ../data/ui/preferences.ui.h:1
-msgid "Meld Preferences"
-msgstr "Meld ãèå"
+msgid "Display"
+msgstr "èç"
 
 #: ../data/ui/preferences.ui.h:2
-msgid "Font"
-msgstr "ãããã"
+msgid "Do not _split words over two lines"
+msgstr "åèãäèããããããããããã(_S)"
 
 #: ../data/ui/preferences.ui.h:3
-msgid "_Use the system fixed width font"
-msgstr "ãããããååãããããäã(_U)"
+msgid "Edito_r command:"
+msgstr "ããäããããã(_R)"
 
 #: ../data/ui/preferences.ui.h:4
-msgid "_Editor font:"
-msgstr "ããããããããã(_E):"
+msgid "Editor"
+msgstr "ãããã"
 
 #: ../data/ui/preferences.ui.h:5
-msgid "Display"
-msgstr "èç"
+msgid "Enable text _wrapping"
+msgstr "æååãæãèããæåããã(_W)"
 
 #: ../data/ui/preferences.ui.h:6
-msgid "_Tab width:"
-msgstr "ãããå(_T):"
+msgid "Encoding"
+msgstr "ãããããããã"
 
 #: ../data/ui/preferences.ui.h:7
-msgid "_Insert spaces instead of tabs"
-msgstr "ãããäãããççãæåãã(_I)"
+msgid "External editor"
+msgstr "åéãããã"
 
 #: ../data/ui/preferences.ui.h:8
-msgid "Enable text _wrapping"
-msgstr "æååãæãèããæåããã(_W)"
+msgid "File Filters"
+msgstr "ããããããããã"
 
 #: ../data/ui/preferences.ui.h:9
-msgid "Do not _split words over two lines"
-msgstr "åèãäèããããããããããã(_S)"
+msgid "Font"
+msgstr "ãããã"
 
 #: ../data/ui/preferences.ui.h:10
-msgid "Show _line numbers"
-msgstr "èçåãèçãã(_L)"
+msgid "Ignore changes which insert or delete blank lines"
+msgstr "çèãæåãåéãçèãã"
 
 #: ../data/ui/preferences.ui.h:11
-msgid "Show w_hitespace"
-msgstr "ççãæèãèçãã(_H)"
+msgid "Ignore symbolic links"
+msgstr "ãããããããããããçèãã"
 
 #: ../data/ui/preferences.ui.h:12
-msgid "Use s_yntax highlighting"
-msgstr "ææãåèèçãã(_Y)"
+msgid "Loading"
+msgstr "èãèã"
 
 #: ../data/ui/preferences.ui.h:13
-msgid "External editor"
-msgstr "åéãããã"
+msgid "Meld Preferences"
+msgstr "Meld ãèå"
 
 #: ../data/ui/preferences.ui.h:14
-msgid "Use _default system editor"
-msgstr "ããããããããããããããããäçãã(_D)"
+msgid "Show _line numbers"
+msgstr "èçåãèçãã(_L)"
 
 #: ../data/ui/preferences.ui.h:15
-msgid "Edito_r command:"
-msgstr "ããäããããã(_R)"
+msgid "Show w_hitespace"
+msgstr "ççãæèãèçãã(_H)"
 
 #: ../data/ui/preferences.ui.h:16
-msgid "Editor"
-msgstr "ãããã"
+msgid "Text Filters"
+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 "
@@ -303,15 +318,7 @@ msgstr ""
 "ãããããããããããããããããããããããååãã SHELL ååããããã"
 "ããããäãããã"
 
-#: ../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
+#: ../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 "
@@ -325,67 +332,61 @@ msgstr ""
 "ããèåãããããããæååããçãæããããèçããããããããããããã"
 "ãèäããã"
 
-#: ../data/ui/preferences.ui.h:21
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "çèãæåãåéãçèãã"
-
 #: ../data/ui/preferences.ui.h:22
-msgid "Text Filters"
-msgstr "æååããããã"
+msgid "_Editor font:"
+msgstr "ããããããããã(_E):"
 
 #: ../data/ui/preferences.ui.h:23
-msgid "Loading"
-msgstr "èãèã"
+msgid "_Insert spaces instead of tabs"
+msgstr "ãããäãããççãæåãã(_I)"
 
 #: ../data/ui/preferences.ui.h:24
-msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
-msgstr ""
-"ãããããèãèãéããæãéçããããããããããèèããã (ä: utf8 "
-"iso8859)"
+msgid "_Tab width:"
+msgstr "ãããå(_T):"
 
 #: ../data/ui/preferences.ui.h:25
-msgid "Encoding"
-msgstr "ãããããããã"
+msgid "_Use the system fixed width font"
+msgstr "ãããããååãããããäã(_U)"
 
 #: ../data/ui/vcview.ui.h:1
-msgid "VC Log"
-msgstr "ããããããããããããããã"
-
-#: ../data/ui/vcview.ui.h:2
 msgid "Commit Files"
 msgstr "ããããããããã"
 
+#: ../data/ui/vcview.ui.h:2
+msgid "Compare Options"
+msgstr "æèãããããã"
+
 #: ../data/ui/vcview.ui.h:3
-msgid "Previous Logs"
-msgstr "åããã"
+msgid "Date"
+msgstr "æä"
 
 #: ../data/ui/vcview.ui.h:4
-msgid "Log Message"
-msgstr "ãããããããã"
+msgid "Local copy against other remote revision"
+msgstr "ãããããäããããããããããããããããã"
 
 #: ../data/ui/vcview.ui.h:5
-msgid "Compare Options"
-msgstr "æèãããããã"
-
-#: ../data/ui/vcview.ui.h:6
 msgid "Local copy against same remote revision"
 msgstr "ãããããåããããããããããããããããã"
 
+#: ../data/ui/vcview.ui.h:6
+msgid "Log Message"
+msgstr "ãããããããã"
+
 #: ../data/ui/vcview.ui.h:7
-msgid "Local copy against other remote revision"
-msgstr "ãããããäããããããããããããããããã"
+msgid "Previous Logs"
+msgstr "åããã"
 
 #: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:179
 msgid "Tag"
 msgstr "ãã"
 
 #: ../data/ui/vcview.ui.h:9
-msgid "Date"
-msgstr "æä"
+msgid "VC Log"
+msgstr "ããããããããããããããã"
 
 #: ../meld/dirdiff.py:227 ../meld/vcview.py:118
 msgid "_Compare"
-msgstr "æè"
+msgstr "æè(_C)"
 
 #: ../meld/dirdiff.py:227 ../meld/vcview.py:118
 msgid "Compare selected"
@@ -411,7 +412,7 @@ msgstr "åããããããã"
 msgid "Delete selected"
 msgstr "éæãããããããããåéããã"
 
-#: ../meld/dirdiff.py:231 ../meld/filediff.py:1146
+#: ../meld/dirdiff.py:231 ../meld/filediff.py:1161
 msgid "Hide"
 msgstr "éã"
 
@@ -509,7 +510,7 @@ msgstr ""
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' ã '%s' ããããéãããããã"
 
-#: ../meld/dirdiff.py:619 ../meld/filediff.py:1009 ../meld/filediff.py:1150
+#: ../meld/dirdiff.py:619 ../meld/filediff.py:1012 ../meld/filediff.py:1165
 msgid "Hi_de"
 msgstr "éã(_D)"
 
@@ -740,21 +741,21 @@ msgid "Lock scrolling of all panes"
 msgstr "åããããããããããããåæããã"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:411
+#: ../meld/filediff.py:400
 msgid "INS"
 msgstr "[æå]"
 
-#: ../meld/filediff.py:411
+#: ../meld/filediff.py:400
 msgid "OVR"
 msgstr "[äæã]"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:413
+#: ../meld/filediff.py:402
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "(%ièã%iå)"
 
-#: ../meld/filediff.py:723
+#: ../meld/filediff.py:726
 #, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -764,46 +765,46 @@ msgstr ""
 "çããããããããããããããèäããã"
 
 #. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:810
+#: ../meld/filediff.py:813
 msgid "<unnamed>"
 msgstr "<ååãã>"
 
-#: ../meld/filediff.py:997
+#: ../meld/filediff.py:1000
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] çåããããããã"
 
-#: ../meld/filediff.py:1003
+#: ../meld/filediff.py:1006
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] ãããããããããä"
 
-#: ../meld/filediff.py:1027 ../meld/filediff.py:1036 ../meld/filediff.py:1048
-#: ../meld/filediff.py:1054
+#: ../meld/filediff.py:1030 ../meld/filediff.py:1039 ../meld/filediff.py:1051
+#: ../meld/filediff.py:1057
 msgid "Could not read file"
 msgstr "ãããããèãèããããããã"
 
-#: ../meld/filediff.py:1028
+#: ../meld/filediff.py:1031
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] ãããããèãèãä"
 
-#: ../meld/filediff.py:1037
+#: ../meld/filediff.py:1040
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s ããããããããããããããã"
 
-#: ../meld/filediff.py:1049
+#: ../meld/filediff.py:1052
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ãæãããããããããããããããã: %s"
 
-#: ../meld/filediff.py:1079 ../meld/filemerge.py:67
+#: ../meld/filediff.py:1082 ../meld/filemerge.py:67
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] ååãèçä"
 
-#: ../meld/filediff.py:1137
+#: ../meld/filediff.py:1152
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -811,15 +812,15 @@ msgstr ""
 "æååãããããããããèããããããããããããéãéããçããååããã"
 "ãããããããããããããæèããããããï"
 
-#: ../meld/filediff.py:1143
+#: ../meld/filediff.py:1158
 msgid "Files are identical"
 msgstr "åäããããããã"
 
-#: ../meld/filediff.py:1153
+#: ../meld/filediff.py:1168
 msgid "Show without filters"
 msgstr "ãããããããçããèçãã"
 
-#: ../meld/filediff.py:1343
+#: ../meld/filediff.py:1358
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -828,7 +829,7 @@ msgstr ""
 "\"%s\" ãååãããããï\n"
 "äæãããããï"
 
-#: ../meld/filediff.py:1356
+#: ../meld/filediff.py:1371
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -839,12 +840,12 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/filediff.py:1365
+#: ../meld/filediff.py:1380
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "ãããã %i ãååãéæ"
 
-#: ../meld/filediff.py:1380
+#: ../meld/filediff.py:1395
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -855,7 +856,7 @@ msgstr ""
 "\n"
 "ãããããããããäçããããï"
 
-#: ../meld/filediff.py:1396
+#: ../meld/filediff.py:1411
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -864,7 +865,7 @@ msgstr ""
 "'%s' ãã '%s' ããããããããããããæåãåããããããã\n"
 "UTF-8 ãããããããããããäåããããããããããï"
 
-#: ../meld/filediff.py:1455
+#: ../meld/filediff.py:1470
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -1214,47 +1215,54 @@ 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
+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
 #, 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:237
+#: ../meld/preferences.py:239
 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:239
+#: ../meld/preferences.py:241
 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:241
+#: ../meld/preferences.py:243
 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:243
+#: ../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:245
+#: ../meld/preferences.py:247
 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:249
 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:249
+#: ../meld/preferences.py:251
 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:251
+#: ../meld/preferences.py:253
 msgid "Script comment\t0\t#.*"
 msgstr "ãããããããããã\t0\t#.*"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]