Permalink
Browse files

Merge pull request #28 from galthaus/pull-req-release-rails3anddb-mas…

…ter-6f3ca0ac87

More locale and nav changes [3/18]
  • Loading branch information...
2 parents 529e8a8 + 6f3ca0a commit 897fb90cb00007001c51348543eaad5eb39ccf93 @galthaus galthaus committed Jul 25, 2012
Showing with 29 additions and 16 deletions.
  1. +0 −16 crowbar.yml
  2. +29 −0 crowbar_framework/config/locales/keystone/en.yml
View
@@ -30,22 +30,6 @@ crowbar:
run_order: 75
chef_order: 75
-locale_additions:
- en:
- barclamp:
- keystone:
- edit_deployment:
- deployment: Deployment
- edit_attributes:
- attributes: Attributes
- sql_engine: SQL Engine
- mysql_instance: MySQL Instance
- default-tenant: Default Tenant
- admin-username: Administrator Username
- admin-password: Administrator Password
- default-username: Regular User Username
- default-password: Regular User Password
-
debs:
ubuntu-10.10:
repos:
@@ -0,0 +1,29 @@
+Copyright 2012, Dell
+#
+# 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:
+ barclamp:
+ keystone:
+ edit_deployment:
+ deployment: Deployment
+ edit_attributes:
+ attributes: Attributes
+ sql_engine: SQL Engine
+ mysql_instance: MySQL Instance
+ default-tenant: Default Tenant
+ admin-username: Administrator Username
+ admin-password: Administrator Password
+ default-username: Regular User Username
+ default-password: Regular User Password
+

0 comments on commit 897fb90

Please sign in to comment.