Index: app/models/attachment.rb
===================================================================
--- app/models/attachment.rb	(リビジョン 25025)
+++ app/models/attachment.rb	(作業コピー)
@@ -280,7 +280,7 @@
       rescue => e
         if logger
           logger.error(
-            "An error occured while generating thumbnail for #{disk_filename} " \
+            "An error occurred while generating thumbnail for #{disk_filename} " \
               "to #{target}\nException was: #{e.message}"
           )
         end
@@ -348,7 +348,7 @@
   rescue => e
     if logger
       logger.error(
-        "An error occured while generating markdownized preview for #{disk_filename} " \
+        "An error occurred while generating markdownized preview for #{disk_filename} " \
           "to #{target}\nException was: #{e.message}"
       )
     end
Index: app/models/user.rb
===================================================================
--- app/models/user.rb	(リビジョン 25025)
+++ app/models/user.rb	(作業コピー)
@@ -222,7 +222,7 @@
   def self.try_to_login(login, password, active_only=true)
     try_to_login!(login, password, active_only)
   rescue AuthSourceException => e
-    logger.error "An error occured when authenticating #{login}: #{e.message}"
+    logger.error "An error occurred when authenticating #{login}: #{e.message}"
     nil
   end