| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -304,7 +304,7 @@ |
| 305 | 305 | 'filedeleteerror', |
| 306 | 306 | 'directorycreateerror', |
| 307 | 307 | 'filenotfound', |
| 308 | | - 'fileexists', |
| | 308 | + 'fileexistserror', |
| 309 | 309 | 'unexpected', |
| 310 | 310 | 'formerror', |
| 311 | 311 | 'badarticleerror', |
| Index: trunk/phase3/includes/filerepo/FSRepo.php |
| — | — | @@ -166,10 +166,10 @@ |
| 167 | 167 | $hashSource = sha1_file( $srcPath ); |
| 168 | 168 | $hashDest = sha1_file( $dstPath ); |
| 169 | 169 | if ( $hashSource != $hashDest ) { |
| 170 | | - $status->fatal( 'fileexists', $dstPath ); |
| | 170 | + $status->fatal( 'fileexistserror', $dstPath ); |
| 171 | 171 | } |
| 172 | 172 | } else { |
| 173 | | - $status->fatal( 'fileexists', $dstPath ); |
| | 173 | + $status->fatal( 'fileexistserror', $dstPath ); |
| 174 | 174 | } |
| 175 | 175 | } |
| 176 | 176 | } |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -767,7 +767,7 @@ |
| 768 | 768 | 'filedeleteerror' => 'Could not delete file "$1".', |
| 769 | 769 | 'directorycreateerror' => 'Could not create directory "$1".', |
| 770 | 770 | 'filenotfound' => 'Could not find file "$1".', |
| 771 | | -'fileexists' => 'Unable to write to file "$1": file exists', |
| | 771 | +'fileexistserror' => 'Unable to write to file "$1": file exists', |
| 772 | 772 | 'unexpected' => 'Unexpected value: "$1"="$2".', |
| 773 | 773 | 'formerror' => 'Error: could not submit form', |
| 774 | 774 | 'badarticleerror' => 'This action cannot be performed on this page.', |
| Index: trunk/phase3/languages/messages/MessagesHe.php |
| — | — | @@ -505,7 +505,7 @@ |
| 506 | 506 | 'filedeleteerror' => 'מחיקת "$1" נכשלה.', |
| 507 | 507 | 'directorycreateerror' => 'יצירת התיקייה "$1" נכשלה.', |
| 508 | 508 | 'filenotfound' => 'הקובץ "$1" לא נמצא.', |
| 509 | | -'fileexists' => 'הכתיבה לקובץ "$1" נכשלה: הקובץ קיים', |
| | 509 | +'fileexistserror' => 'הכתיבה לקובץ "$1" נכשלה: הקובץ קיים', |
| 510 | 510 | 'unexpected' => 'ערך לא צפוי: "$1"="$2"', |
| 511 | 511 | 'formerror' => 'שגיאה: לא יכול לשלוח טופס.', |
| 512 | 512 | 'badarticleerror' => 'לא ניתן לבצע פעולה זו בדף זה.', |