[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    l10n-support/ja/summit/messages/extragear-utils (silent)
From:       Fumiaki Okushi <fumiaki () okushi ! com>
Date:       2010-05-31 6:59:58
Message-ID: 20100531070617.CC481AC8C9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1132677 by okushi:

SVN_SILENT: summit merge

 M  +9 -53     kdiff3.po  
 M  +5 -1      krecipes.po  


--- trunk/l10n-support/ja/summit/messages/extragear-utils/kdiff3.po #1132676:1132677
@@ -61,9 +61,6 @@
 
 #. +> trunk
 #: diff.cpp:1662 diff.cpp:1676
-#| msgid ""
-#| "Data loss error:\n"
-#| "If it is reproducable please contact the author.\n"
 msgid ""
 "Data loss error:\n"
 "If it is reproducible please contact the author.\n"
@@ -93,7 +90,6 @@
 
 #. +> trunk
 #: difftextwindow.cpp:1700 difftextwindow.cpp:1733
-#| msgid "File Encoding for A:"
 msgid "Encoding:"
 msgstr "エンコーディング:"
 
@@ -549,24 +545,27 @@
 msgid ""
 "The highlighted item has a different type in the different directories. "
 "Select what to do."
-msgstr "強調表示された� \
�目はディレクトリによってタイプが違います。どうするか選択してく� \
さい。" +msgstr ""
+"強調表示された� \
�目はディレクトリによってタイプが違います。どうするか選択して"
 +"く� さい。"
 
 #. +> trunk
 #: directorymergewindow.cpp:2111
 msgid ""
 "The modification dates of the file are equal but the files are not. Select "
 "what to do."
-msgstr "ファイルの更新日時は同じですが、ファイルは等しくありません。どうするか選択してく� \
さい。" +msgstr ""
+"ファイルの更新日時は同じですが、ファイルは等しくありません。どうするか選択し"
 +"てく� さい。"
 
 #. +> trunk
 #: directorymergewindow.cpp:2120
-#| msgid ""
-#| "The highlighted item has a different type in the different directories. "
-#| "Select what to do."
 msgid ""
 "The highlighted item was changed in one directory and deleted in the other. "
 "Select what to do."
-msgstr "強調表示された� \
�目は一方のディレクトリで変更され、他方のディレクトリで削除されました。どうするか選択してく� \
さい。" +msgstr ""
+"強調表示された� \
�目は一方のディレクトリで変更され、他方のディレクトリで削除さ"
 +"れました。どうするか選択してく� さい。"
 
 #. +> trunk
 #: directorymergewindow.cpp:2171
@@ -1644,19 +1643,16 @@
 
 #. +> trunk
 #: kdiff3.cpp:810
-#| msgid "Print..."
 msgid "Printing..."
 msgstr "印刷中..."
 
 #. +> trunk
 #: kdiff3.cpp:951
-#| msgid "Select Font"
 msgid "Selection"
 msgstr "選択"
 
 #. +> trunk
 #: kdiff3.cpp:977
-#| msgid "Merge operation complete."
 msgid "Printing completed."
 msgstr "印刷完了。"
 
@@ -1883,7 +1879,6 @@
 
 #. +> trunk
 #: kreplacements/kreplacements.cpp:685
-#| msgid "Show &Statusbar"
 msgid "Show &Status Bar"
 msgstr "ステータスバーを表示(&S)"
 
@@ -1987,7 +1982,6 @@
 
 #. +> trunk
 #: main.cpp:160
-#| msgid "(c) 2002-2008 Joachim Eibl"
 msgid "(c) 2002-2009 Joachim Eibl"
 msgstr "(c) 2002-2009 Joachim Eibl"
 
@@ -2367,7 +2361,6 @@
 
 #. +> trunk
 #: mergeresultwindow.cpp:3215
-#| msgid "Conflicts"
 msgid "Conflict"
 msgstr "衝突"
 
@@ -2540,9 +2533,6 @@
 
 #. +> trunk
 #: optiondialog.cpp:735
-#| msgid ""
-#| "On: Pressing tab generates the appropriate number of spaces.\n"
-#| "Off: A Tab-character will be inserted."
 msgid ""
 "On: Pressing tab generates the appropriate number of spaces.\n"
 "Off: A tab character will be inserted."
@@ -2791,10 +2781,6 @@
 
 #. +> trunk
 #: optiondialog.cpp:966
-#| msgid ""
-#| "Regular expression for the start of the version control history entry.\n"
-#| "Usually this line contains the \"$Log$\"-keyword.\n"
-#| "Default value: \".*\\$Log.*\\$.*\""
 msgid ""
 "Regular expression for the start of the version control history entry.\n"
 "Usually this line contains the \"$Log$\" keyword.\n"
@@ -2901,11 +2887,6 @@
 
 #. +> trunk
 #: optiondialog.cpp:1050
-#| msgid ""
-#| "When KDiff3 was started for a file-merge from the commandline and all\n"
-#| "conflicts are solvable without user interaction then automatically save "
-#| "and quit.\n"
-#| "(Similar to command line option \"--auto\"."
 msgid ""
 "If KDiff3 was started for a file-merge from the command line and all\n"
 "conflicts are solvable without user interaction then automatically save and "
@@ -2918,7 +2899,6 @@
 
 #. +> trunk
 #: optiondialog.cpp:1061 optiondialog.cpp:1062
-#| msgid "&Directory"
 msgid "Directory"
 msgstr "ディレクトリ"
 
@@ -2987,9 +2967,6 @@
 
 #. +> trunk
 #: optiondialog.cpp:1115
-#| msgid ""
-#| "Extends the antipattern to anything that would be ignored by CVS.\n"
-#| "Via local \".cvsignore\"-files this can be directory specific."
 msgid ""
 "Extends the antipattern to anything that would be ignored by CVS.\n"
 "Via local \".cvsignore\" files this can be directory specific."
@@ -3108,9 +3085,6 @@
 
 #. +> trunk
 #: optiondialog.cpp:1184
-#| msgid ""
-#| "Trust the size and date, but use binary comparison if date doesn't match "
-#| "(unsafe)"
 msgid ""
 "Trust the size and date, but use binary comparison if date does not match "
 "(unsafe)"
@@ -3118,11 +3092,6 @@
 
 #. +> trunk
 #: optiondialog.cpp:1185
-#| msgid ""
-#| "Assume that files are equal if the modification date and file length are "
-#| "equal.\n"
-#| "If the date isn't equal but the sizes are, use binary comparison.\n"
-#| "Useful for big directories or slow networks."
 msgid ""
 "Assume that files are equal if the modification date and file length are "
 "equal.\n"
@@ -3201,9 +3170,6 @@
 
 #. +> trunk
 #: optiondialog.cpp:1228
-#| msgid ""
-#| "When a file would be saved over an old file, then the old file\n"
-#| "will be renamed with a '.orig'-extension instead of being deleted."
 msgid ""
 "If a file would be saved over an old file, then the old file\n"
 "will be renamed with a '.orig' extension instead of being deleted."
@@ -3223,9 +3189,6 @@
 
 #. +> trunk
 #: optiondialog.cpp:1468
-#| msgid ""
-#| "Choose the language of the GUI-strings or \"Auto\".\n"
-#| "For a change of language to take place, quit and restart KDiff3."
 msgid ""
 "Choose the language of the GUI strings or \"Auto\".\n"
 "For a change of language to take place, quit and restart KDiff3."
@@ -3343,11 +3306,6 @@
 
 #. +> trunk
 #: optiondialog.cpp:1591
-#| msgid ""
-#| "List of command line options that should be ignored when KDiff3 is used "
-#| "by other tools.\n"
-#| "Several values can be specified if separated via ';'\n"
-#| "This will suppress the \"Unknown option\"-error."
 msgid ""
 "List of command line options that should be ignored when KDiff3 is used by "
 "other tools.\n"
@@ -3688,7 +3646,6 @@
 
 #. +> trunk
 #: smalldialogs.cpp:424
-#| msgid "For auto merge test copy a line as used in your files."
 msgid "To test auto merge, copy a line as used in your files."
 msgstr "自動マージをテストするために、既存のファイルから 1 \
行コピーします。"  
@@ -3750,7 +3707,6 @@
 
 #. +> trunk
 #: smalldialogs.cpp:576
-#| msgid "Opening and closing parentheses don't match in regular expression."
 msgid "Opening and closing parentheses do not match in regular expression."
 msgstr "正規表現中の左右の括弧が一致していません。"
 
--- trunk/l10n-support/ja/summit/messages/extragear-utils/krecipes.po \
#1132676:1132677 @@ -4446,7 +4446,11 @@
 "b></p><p>It looks like this is the first time you are using it. This wizard "
 "will help you with the initial setup so that you can start using it quickly."
 "</p><p>Welcome, and enjoy cooking!</p>"
-msgstr "<p><font size=\"+1\">Krecipes をお選びいた� \
き、ありがとうございます。</font></p><p>今回初めて Krecipes \
を起動されたようです。このウィザードは、Krecipes \
を早く使えるように、最初のセットアップのお手伝いをします。</p><p>料理を楽しんでく� \
さい!</p>" +msgstr ""
+"<p><font size=\"+1\">Krecipes をお選びいた� \
き、ありがとうございます。</" +"font></p><p>今回初めて Krecipes \
を起動されたようです。このウィザードは、" +"Krecipes \
を早く使えるように、最初のセットアップのお手伝いをします。</p><p>料"
 +"理を楽しんでく� さい!</p>"
 
 #. +> trunk
 #: setupassistant.cpp:181


[prev in list] [next in list] [prev in thread] [next in thread]