From: Jan Provaznik <[email protected]>

---
 src/config/locales/en.yml    |   43 +++++++++++++++++++++--------------------
 src/config/new_navigation.rb |    2 +-
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index abdc933..d14f77b 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -76,7 +76,7 @@ en:
   templates: Templates
   assemblies: Assemblies
   template_collections: Template Collections
-  admin: Administration
+  administration: Administration
   roles: Roles
   cloud_providers: Cloud Providers
   provider_account: Provider Account
@@ -84,26 +84,27 @@ en:
   cloud_engine_realms: Realms
   pool_families: Pool Families
   setting: Settings
-  settings:
-    index:
-      general_settings: General Settings
-      general_settings_desc: Enable Self-service Account Registration, Setup 
Custom Branding, Manage Content Sources
-      define_locales: Define Locales
-      define_locales_desc: View, edit and define the names of locales that 
DeltaCloud will expose to its users. The meaning of the names will be defined 
by being mapped to the geographical locations offered by individual providers.
-      manage_users: Manage Users
-      manage_users_desc: View, edit, create and delete user accounts on 
DeltaCloud. Adjust quotas and privileges for users.
-      define_hardware_profiles: Define Hardware Profiles
-      define_hardware_profiles_desc: View, edit and define the names of the 
hardware profiles that DeltaCloud will expose to its users. The meaning of the 
names will be defined by being mapped to capabilities offered by individual 
providers.
-      manage_providers: Manage Providers
-      manage_providers_desc: View, edit and add providers of virtual compute 
resources to DeltaCloud. View, edit and add DeltaCloud accounts for these 
providers. Map provider-specific concepts to DeltaCloud.
-      define_services:  Define Services
-      define_services_desc: View, edit and define services that DeltaCloud 
will offer. These services will be mapped to individual providers based on 
their capabilities.
-      permissions: Permissions
-      permissions_desc: Create and edit User Treatments that are applied to 
users. Treatments pair together Roles with Categories of Instances, Pools and 
Templates. Manage the categories, and define and edit Roles. Roles group 
together sets of permissions that are relevant to Pools, Templates and 
Instances.
-    self_service:
-      self_service_default: 'User Treatment: Self-service default'
-      quota: Quota
-      account: Account
+  admin:
+    settings:
+      index:
+        general_settings: General Settings
+        general_settings_desc: Enable Self-service Account Registration, Setup 
Custom Branding, Manage Content Sources
+        define_locales: Define Locales
+        define_locales_desc: View, edit and define the names of locales that 
DeltaCloud will expose to its users. The meaning of the names will be defined 
by being mapped to the geographical locations offered by individual providers.
+        manage_users: Manage Users
+        manage_users_desc: View, edit, create and delete user accounts on 
DeltaCloud. Adjust quotas and privileges for users.
+        define_hardware_profiles: Define Hardware Profiles
+        define_hardware_profiles_desc: View, edit and define the names of the 
hardware profiles that DeltaCloud will expose to its users. The meaning of the 
names will be defined by being mapped to capabilities offered by individual 
providers.
+        manage_providers: Manage Providers
+        manage_providers_desc: View, edit and add providers of virtual compute 
resources to DeltaCloud. View, edit and add DeltaCloud accounts for these 
providers. Map provider-specific concepts to DeltaCloud.
+        define_services:  Define Services
+        define_services_desc: View, edit and define services that DeltaCloud 
will offer. These services will be mapped to individual providers based on 
their capabilities.
+        permissions: Permissions
+        permissions_desc: Create and edit User Treatments that are applied to 
users. Treatments pair together Roles with Categories of Instances, Pools and 
Templates. Manage the categories, and define and edit Roles. Roles group 
together sets of permissions that are relevant to Pools, Templates and 
Instances.
+      self_service:
+        self_service_default: 'User Treatment: Self-service default'
+        quota: Quota
+        account: Account
   providers:
     providers: Providers
     form:
diff --git a/src/config/new_navigation.rb b/src/config/new_navigation.rb
index 06d7244..5d54b6b 100644
--- a/src/config/new_navigation.rb
+++ b/src/config/new_navigation.rb
@@ -11,7 +11,7 @@ SimpleNavigation::Configuration.run do |navigation|
       second_level.item :assemblies, t(:assemblies), 
image_factory_assemblies_path
       second_level.item :deployables, t(:deployables), 
image_factory_deployables_path
     end
-    first_level.item :administration, t(:admin), admin_users_path, 
:highlights_on => /\/admin/ do |second_level|
+    first_level.item :administration, t(:administration), admin_users_path, 
:highlights_on => /\/admin/ do |second_level|
       second_level.item :users, t(:users), admin_users_path
       second_level.item :roles, t(:roles), admin_roles_path
       second_level.item :providers, t('providers.providers'), 
admin_providers_path
-- 
1.7.2.3

_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel

Reply via email to