From: mits <mits>
Date: Tue, 10 Dec 2002 16:05:22 +0000 (+0000)
Subject: Conflict solved
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=8c6cdfc6131b53ee759e90d166561c7c7cb30b8f;p=moodle.git

Conflict solved
---

diff --git a/lang/ja/assignment.php b/lang/ja/assignment.php
index c6a9eb105d..b1846e2658 100644
--- a/lang/ja/assignment.php
+++ b/lang/ja/assignment.php
@@ -1 +1 @@
-<?PHP // $Id$ 
      // assignment.php - created with Moodle 1.0.6.4 (2002112400)


$string['allowresubmit'] = "ºÆÄó½Ð¤òµö²Ä¤¹¤ë";
$string['assignmentdetails'] = "²ÝÂê¤Î¾ÜºÙ";
$string['assignmentname'] = "²ÝÂê̾";
$string['assignmenttype'] = "²ÝÂ꥿¥¤¥×";
$string['description'] = "¾ÜºÙ";
$string['duedate'] = "Äó½Ð´ü¸Â";
$string['early'] = "\$a ÆüÁᤤ";
$string['failedupdatefeedback'] = "¥æ¡¼¥¶ \$a ¤Î¥Õ¥£¡¼¥É¥Ð¥Ã¥¯¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿ ";
$string['feedbackupdated'] = "\$a ¤Î»²²Ã¼Ô¤ËÂФ¹¤ë¥Õ¥£¡¼¥É¥Ð¥Ã¥¯¤Î¹¹¿·";
$string['late'] = "\$a ÆüÃÙ¤¤";
$string['maximumgrade'] = "ºÇÂçɾ²Á";
$string['maximumsize'] = "ºÇÂ祵¥¤¥º";
$string['modulename'] = "²ÝÂê";
$string['modulenameplural'] = "²ÝÂê";
$string['newsubmissions'] = "²ÝÂ꤬Äó½Ð¤µ¤ì¤Þ¤·¤¿";
$string['notsubmittedyet'] = "̤Äó½Ð";
$string['overwritewarning'] = "·Ù¹ð:ºÆÅÙ¥¢¥Ã¥×¥í¡¼¥É¤¹¤ë¤³¤È¤Ë¤è¤ê¸½ºß¤ÎÄó½Ðʪ¤ÏÃÖ¤­´¹¤¨¤é¤ì¤Þ¤¹";
$string['submissionfeedback'] = "Äó½Ð¤Î¥Õ¥£¡¼¥É¥Ð¥Ã¥¯";
$string['submissions'] = "Äó½Ð";
$string['submitassignment'] = "¥Õ¥©¡¼¥à¤ò»ÈÍѤ·¤Æ²ÝÂê¤òÄó½Ð¤¹¤ë";
$string['submitted'] = "Äó½Ð";
$string['typeoffline'] = "¥ª¥Õ¥é¥¤¥ó²ÝÂê";
$string['typeuploadsingle'] = "¥Õ¥¡¥¤¥ë¤Î¥¢¥Ã¥×¥í¡¼¥É";
$string['uploadbadname'] = "ÉÔÀµ¤Êʸ»ú¤¬¥Õ¥¡¥¤¥ë̾¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤¿¤á¡¢¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¥¢¥Ã¥×¥í¡¼¥É½ÐÍè¤Þ¤»¤ó";
$string['uploadedfiles'] = "¥Õ¥¡¥¤¥ë¤ò¥¢¥Ã¥×¥í¡¼¥É¤·¤Þ¤·¤¿";
$string['uploaderror'] = "¥µ¡¼¥Ð¤Ë¥Õ¥¡¥¤¥ë¤òÊݸÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿";
$string['uploadfailnoupdate'] = "¥Õ¥¡¥¤¥ë¤Ï¥¢¥Ã¥×¥í¡¼¥É¤µ¤ì¤Þ¤·¤¿¤¬Äó½Ðʪ¤Î¹¹¿·¤Ï½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿!";
$string['uploadfiletoobig'] = "¿½¤·Ìõ¤´¤¶¤¤¤Þ¤»¤ó¡¢¥Õ¥¡¥¤¥ë¥µ¥¤¥º¤¬À©¸Â¤ò±Û¤¨¤Æ¤¤¤Þ¤¹(\$a ¥Ð¥¤¥È°ÊÆâ)";
$string['uploadnofilefound'] = "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿ - ¼ÂºÝ¤Ë¸ºß¤¹¤ë¥Õ¥¡¥¤¥ë¤Ç¤¹¤«?";
$string['uploadnotregistered'] = "'\$a' ¤ÏÀµ¾ï¤Ë¥¢¥Ã¥×¥í¡¼¥É¤µ¤ì¤Þ¤·¤¿¤¬ÅÐÏ¿¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿!";
$string['uploadsuccess'] = "'\$a' ¤Î¥¢¥Ã¥×¥í¡¼¥É¤¬´°Î»¤·¤Þ¤·¤¿";
$string['viewfeedback'] = "²ÝÂê¤Îɾ²Á¤È¥Õ¥£¡¼¥É¥Ð¥Ã¥¯¤ò³Îǧ¤¹¤ë";
$string['viewsubmissions'] = "\$a ·ï¤ÎÄó½Ð²ÝÂê¤ò³Îǧ¤¹¤ë";
$string['yoursubmission'] = "¤¢¤Ê¤¿¤ÎÄó½Ðʪ";

?>
\ No newline at end of file
+<?PHP // $Id$ 
      // assignment.php - created with Moodle 1.0.6.4 (2002112400)


$string['allowresubmit'] = "ºÆÄó½Ð¤òµö²Ä¤¹¤ë";
$string['assignmentdetails'] = "²ÝÂê¤Î¾ÜºÙ";
$string['assignmentname'] = "²ÝÂê̾";
$string['assignmenttype'] = "²ÝÂ꥿¥¤¥×";
$string['description'] = "¾ÜºÙ";
$string['duedate'] = "Äó½Ð´ü¸Â";
$string['early'] = "\$a ÆüÁᤤ";
$string['failedupdatefeedback'] = "¥æ¡¼¥¶ \$a ¤Î¥Õ¥£¡¼¥É¥Ð¥Ã¥¯¹¹¿·¤Ë¼ºÇÔ¤·¤Þ¤·¤¿ ";
$string['feedbackupdated'] = "\$a ¤Î»²²Ã¼Ô¤ËÂФ¹¤ë¥Õ¥£¡¼¥É¥Ð¥Ã¥¯¤Î¹¹¿·";
$string['late'] = "\$a ÆüÃÙ¤¤";
$string['maximumgrade'] = "ºÇÂçɾ²Á";
$string['maximumsize'] = "ºÇÂ祵¥¤¥º";
$string['modulename'] = "²ÝÂê";
$string['modulenameplural'] = "²ÝÂê";
$string['newsubmissions'] = "²ÝÂ꤬Äó½Ð¤µ¤ì¤Þ¤·¤¿";
$string['notsubmittedyet'] = "̤Äó½Ð";
$string['overwritewarning'] = "·Ù¹ð:ºÆÅÙ¥¢¥Ã¥×¥í¡¼¥É¤¹¤ë¤³¤È¤Ë¤è¤ê¸½ºß¤ÎÄó½Ðʪ¤ÏÃÖ¤­´¹¤¨¤é¤ì¤Þ¤¹";
$string['submissionfeedback'] = "Äó½Ð¤Î¥Õ¥£¡¼¥É¥Ð¥Ã¥¯";
$string['submissions'] = "Äó½Ð";
$string['submitassignment'] = "¥Õ¥©¡¼¥à¤ò»ÈÍѤ·¤Æ²ÝÂê¤òÄó½Ð¤¹¤ë";
$string['submitted'] = "Äó½Ð";
$string['typeoffline'] = "¥ª¥Õ¥é¥¤¥ó²ÝÂê";
$string['typeuploadsingle'] = "¥Õ¥¡¥¤¥ë¤Î¥¢¥Ã¥×¥í¡¼¥É";
$string['uploadbadname'] = "ÉÔÀµ¤Êʸ»ú¤¬¥Õ¥¡¥¤¥ë̾¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤¿¤á¡¢¤³¤Î¥Õ¥¡¥¤¥ë¤Ï¥¢¥Ã¥×¥í¡¼¥É½ÐÍè¤Þ¤»¤ó";
$string['uploadedfiles'] = "¥Õ¥¡¥¤¥ë¤ò¥¢¥Ã¥×¥í¡¼¥É¤·¤Þ¤·¤¿";
$string['uploaderror'] = "¥µ¡¼¥Ð¤Ë¥Õ¥¡¥¤¥ë¤òÊݸÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿";
$string['uploadfailnoupdate'] = "¥Õ¥¡¥¤¥ë¤Ï¥¢¥Ã¥×¥í¡¼¥É¤µ¤ì¤Þ¤·¤¿¤¬Äó½Ðʪ¤Î¹¹¿·¤Ï½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿!";
$string['uploadfiletoobig'] = "¿½¤·Ìõ¤´¤¶¤¤¤Þ¤»¤ó¡¢¥Õ¥¡¥¤¥ë¥µ¥¤¥º¤¬À©¸Â¤ò±Û¤¨¤Æ¤¤¤Þ¤¹(\$a ¥Ð¥¤¥È°ÊÆâ)";
$string['uploadnofilefound'] = "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿ - ¼ÂºÝ¤Ë¸ºß¤¹¤ë¥Õ¥¡¥¤¥ë¤Ç¤¹¤«?";
$string['uploadnotregistered'] = "'\$a' ¤ÏÀµ¾ï¤Ë¥¢¥Ã¥×¥í¡¼¥É¤µ¤ì¤Þ¤·¤¿¤¬ÅÐÏ¿¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿!";
$string['uploadsuccess'] = "'\$a' ¤Î¥¢¥Ã¥×¥í¡¼¥É¤¬´°Î»¤·¤Þ¤·¤¿";
$string['viewfeedback'] = "²ÝÂê¤Îɾ²Á¤È¥Õ¥£¡¼¥É¥Ð¥Ã¥¯¤ò³Îǧ¤¹¤ë";
$string['viewsubmissions'] = "\$a ·ï¤ÎÄó½Ð²ÝÂê¤ò³Îǧ¤¹¤ë";
$string['yoursubmission'] = "¤¢¤Ê¤¿¤ÎÄó½Ðʪ";

?>