Conflict solved

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