Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Apr 20, 2015 · e804037 · e804037
2 parents 780926d + c2bc8a1
commit e804037
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/...MyPasswordQuestions_en_US.utf8.properties → ...MyPasswordQuestions_en_US.utf8.properties b/...MyPasswordQuestions_en_US.utf8.properties → ...MyPasswordQuestions_en_US.utf8.properties
diff --git a/...src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.properties b/...src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.properties
@@ -0,0 +1,22 @@
+#
+# Copyright (c) 2010-2013 Evolveum
+#
+# 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.
+#
+
+page.title=Forgot Password
+PageForgetPassword.resetPassword=Reset Password
+PageForgetPassword.username=Username
+PageForgetPassword.password=Password
+PageForgetPassword.email=E-mail
+pageForgetPassword.message.usernotfound=User Not Found