en.yml in ripple-1.0.0.beta

- old
+ new
@@ -1,26 +1,22 @@
-# Copyright 2010 Sean Cribbs, Sonian Inc., and Basho Technologies, Inc.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
 en:
   ripple:
+    around_callbacks_not_supported: "around_%{type} callbacks are not supported on embedded documents.  See https://github.com/seancribbs/ripple/issues/188 for more detail."
+    associated_document_error_summary: "for %{doc_type} %{doc_id}: %{errors}"
     attribute_hash: "value of attributes must be a Hash"
+    cluster_not_created: "The cluster for the current environment is not created yet. Run `rake riak:create` first."
+    conflict_handler_not_implemented: "No on_conflict handler has been implemented for %{document}"
     document_invalid: "Validation failed: %{errors}"
     document_not_found: 
       no_key: "Couldn't find document without a key"
       one_key: "Couldn't find document with key: %{key}"
       many_keys: "Couldn't find documents with keys: %{keys}"
     invalid_association_value: "Invalid value %{value} for association %{name} of type %{klass} on %{owner}"
+    many_association_validation_error: "are invalid (%{association_errors})"
+    many_key_association: "You cannot use a many association using :key"
     missing_configuration: "You are missing your ripple configuration file that should be at %{file}"
     no_root_document: "You cannot call %{method} on %{doc} without a root document"
+    one_association_validation_error: "is invalid (%{association_errors})"
     property_type_mismatch: "Cannot cast %{value} into a %{class}"
+    undefined_property: "Undefined property :%{prop} for class '%{class}'"
+    unexpected_conflicts: "Conflict cannot be resolved for %{conflicts} (for %{document})"
 