[PATCH conductor] Clarifies naming within Conductor UI

Matt Wagner matt.wagner at redhat.com
Sun Apr 1 19:16:07 UTC 2012


See http://en.wikipedia.org/wiki/April_Fools%27_Day
---
 src/config/locales/en.yml |  340 ++++++++++++++++++++++----------------------
 1 files changed, 170 insertions(+), 170 deletions(-)

diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 4050e0b..f2e9557 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -11,23 +11,23 @@ en:
   search:
     no_results: "No matching results."
   users:
-    users: "Users"
+    users: "Chumps"
     return_to: "Return to:"
-    users: Users
+    users: Chumps 
     confirm_delete: "Are you sure you want to delete this user?"
     quick_jump: "Quick Jump:"
     index:
-      user_id: User ID
-      username: Username
+      user_id: Chump ID
+      username: Chump Name 
       last_name: Last Name
       first_name: First Name
       quota_instances: Quota Limit
       email: e-mail
     show:
       e-mail: "E-mail Address"
-      username: Username
+      username: Chump name
       edit: Edit
-      delete: Delete
+      delete: Dump
       created: CREATED
       number_of_logins: NUMBER OF LOGINS
       last_login: LAST LOGIN
@@ -35,39 +35,39 @@ en:
       failed_logins: FAILED LOGINS
       last_login_ip: LAST LOGIN IP
     form:
-      user_treatment: User Treatment
-      save_user: Save User
-      user_status: User Status
+      user_treatment: Chump Treatment
+      save_user: Save Chump
+      user_status: Chump Status
     new:
-      new_user: New User
-      neccessary_information: "Enter necessary information about your new user and click 'Save User' when you are finished."
+      new_user: New Chump 
+      neccessary_information: "Enter necessary information about your new user and click 'Save Chump' when you are finished."
     list:
-      delete_selected: Delete Selected
+      delete_selected: Dump Selected
       unlimited: Unlimited
     edit:
-      edit_user: Edit User
+      edit_user: Edit Chump 
       edit_account: Edit Account
     flash:
       notice:
-        registered: "User registered!"
+        registered: "Chump registered!"
         you_registred: "You have successfully registered!"
-        updated: "User updated!"
-        deleted: "User has been successfully deleted."
+        updated: "Chump updated!"
+        deleted: "Chump has been successfully dumped."
         more_deleted:
-          one: Deleted user
-          other: Deleted users
+          one: Dumped user
+          other: Dumped users
       warning:
         not_delete: 'Cannot delete: %{reason}'
         not_delete_same_user: "Cannot delete %{login} : you are logged in as this user"
     preset_filters:
-      all_users: "All Users"
+      all_users: "All Chumps"
       name_starts_with_A: "Name starts with A"
       name_starts_with_B: "Name starts with B"
     errors:
       has_running_instances: '%{login} has running instances'
   user_sessions:
     new:
-      username: "Username:"
+      username: "Chump name:"
       password: "Password:"
       show_password: Show my password
       login_assistance: Login Assistance
@@ -89,7 +89,7 @@ en:
         login: "Login successful!"
         logout: "Logout successful!"
       warning:
-        login_failed: "Login failed: The Username and Password you entered do not match"
+        login_failed: "Login failed: The Chump name and Password you entered do not match"
   about: About
   configure: Configure
   hello: Hello
@@ -106,22 +106,22 @@ en:
   map_profiles: Map Profiles
   map_locales: Map Locales
   self_service_settings: Self-service Settings
-  manage_users: Manage Users
+  manage_users: Manage Chumps 
   define_services: Define Services
   define_profiles: Define Profiles
   define_locales: Define Locales
   permissions: Permissions
   role: Role
   role_assignments: Role Assignments
-  user: User
+  user: Chump
   privileges: Privileges
   general_settings: General Settings
-  new_user: New User
-  edit_user: Edit User
+  new_user: New Chump
+  edit_user: Edit Chump
   audit_report: Audit / Report
   assistance_requests: Assistance Requests
   define: Define
-  image_imports: Image Imports
+  image_imports: Lump Imports
   browse_packages: Browse Packages
   builds: Builds
   runtime: Run
@@ -134,7 +134,7 @@ en:
   edit: Edit
   add: Add
   save: Save
-  delete: Delete
+  delete: Dump
   remove: Remove
   reset: Reset
   create_account: Create Account
@@ -148,7 +148,7 @@ en:
   last_name: Last name
   email: E-mail
   maximum_running_instances: Maximum Running Instances
-  apply_treatment: Apply User Treatment
+  apply_treatment: Apply Chump Treatment
   choose_treatment: Choose Treatment
   apply: Apply
   resource_management: Resource Management
@@ -164,20 +164,20 @@ en:
   realm_s: Realms
   connectivity: Connectivity
   accounts: Accounts
-  catalog_images: Catalog Images
+  catalog_images: Catalog Lumps
   quota: Quota
   choose: Choose
   default_none_selected_message: "Please make a selection first."
   default_confirm_message: "Are you sure you want to proceed?"
   deployments:
-    deployments: Deployments
-    deployment: Deployment
-    deployment_name: Deployment Name
-    new_deployment: New Deployment
-    deployment_name_subtext: "(uniquely identifies your deployment)"
-    deployment_details: Deployment Details
-    confirm_delete: "Are you sure you want to delete this deployment?"
-    list_of_events: List of deployment events
+    deployments: Clumps
+    deployment: Clump
+    deployment_name: Clump Name
+    new_deployment: New Clump
+    deployment_name_subtext: "(uniquely identifies your clump)"
+    deployment_details: Clump Details
+    confirm_delete: "Are you sure you want to delete this clump?"
+    list_of_events: List of clump events
     state: State
     status:
       running: All instances are running
@@ -185,7 +185,7 @@ en:
       stopped: No instances are currently running
     launch_time_params:
       title: "Launch-time parameters"
-      configure_launch_time_params: "Configure launch-time parameters for your deployment:"
+      configure_launch_time_params: "Configure launch-time parameters for your clump:"
       finalize: Finalize
       reference: "Reference to %{assembly}'s return parameter: %{parameter}"
     overview:
@@ -193,11 +193,11 @@ en:
       header: Deploy "%{deployment}" to %{pool} Pool?
       confirmation:
         Are you sure you wish to deploy "%{deployment}" to the %{pool} Pool? Doing
-        so will utilize %{quota} of your overall deployment quota.
+        so will utilize %{quota} of your overall clump quota.
       deployable_xml: Deployable XML
       name: Name
       description: Description
-      image_ids: Image IDs
+      image_ids: Lump IDs
       launch: Launch
     launch_from_catalog:
       profile: Profile
@@ -205,16 +205,16 @@ en:
       no_catalog_entry: 'No available deployable. Please add one first!'
       details: Details
       select: Select
-      image_id: Image ID
+      image_id: Lump ID
       profile: Profile
       hdd: HDD
       ram: RAM
       arch: ARCH
       deployable_xml: Deployable XML
     show:
-      name: %{name} Deployment
+      name: %{name} Clump
     new:
-      launch: Launch this deployment
+      launch: Thump this clump 
       deployable_definition: Deployable definition
       view: View
       deployable_details: Deployable details
@@ -222,10 +222,10 @@ en:
       description: "Description:"
       asseblies_name: Assembly Name
       hardware_profile: Hardware Profile
-      image_id: Image ID
+      image_id: Lump ID
       build_id: Build ID
     edit:
-      edit_deployment: Edit deployment
+      edit_deployment: Edit clump 
     launch_new:
       to_pool: "to %{name} Pool"
       already_in_use: That name is already in use
@@ -243,12 +243,12 @@ en:
       global_uptime: Global Uptime
       uptime_1st_instance: Uptime 1st instance running
     provider_services:
-      list_of_services: List of services required by deployment
+      list_of_services: List of services required by clump 
     required_services:
-      list_of_required_services: List of services required by deployment
+      list_of_required_services: List of services required by clump 
     list:
       stop_selected: Stop Selected
-      delete_selected: Delete Selected
+      delete_selected: Dump Selected
     pretty_view_show:
       ip_address: "IP Address:"
       no_ip_address: '-'
@@ -258,36 +258,36 @@ en:
       stop: "Stop"
     flash:
       notice:
-        launched: "Deployment launched."
+        launched: "Clump launched."
         stop: "stop action was successfully queued."
       warning:
-        disabled_pool: "Cannot launch a Deployment in this Pool. The pool has been disabled."
-        failed_to_launch: "Deployment launch failed!"
+        disabled_pool: "Cannot launch a Clump in this Pool. The pool has been disabled."
+        failed_to_launch: "Clump launch failed!"
         deployable_not_selected: "You need to select deployable"
       error:
         not_launched: "Some assemblies will not be launched:"
         failed_to_launch_assemblies: "Failed to launch following assemblies:"
         not_deleted:
-          one: "The deployment %{list} could not be deleted."
-          other: "The deployments %{list} could not be deleted."
-        none_selected: "You must select one or more deployments."
+          one: "The clump %{list} could not be deleted."
+          other: "The clumps %{list} could not be deleted."
+        none_selected: "You must select one or more clumps."
         not_updated:
-          one: "The deployment %{list} could not be updated."
-          other: "The deployments %{list} could not be updated."
+          one: "The clump %{list} could not be updated."
+          other: "The clumps %{list} could not be updated."
       success:
         deleted:
-          one: "The deployment %{list} was scheduled for deletion."
-          other: "The deployments %{list} were scheduled for deletion."
+          one: "The clump %{list} was scheduled for deletion."
+          other: "The clumps %{list} were scheduled for deletion."
         updated:
-          one: "The deployment %{list} was successfully updated."
-          other: "The deployments %{list} were successfully updated."
+          one: "The clump %{list} was successfully updated."
+          other: "The clumps %{list} were successfully updated."
     errors:
       config_server_connection: 'Cannot connect to the config server'
       cannot_stop: "stop cannot be performed on this instance."
       all_stopped: "All instances must be stopped or running"
       not_valid_deployable_xml: "seems to be not valid deployable XML: %{msg}"
     preset_filters:
-      all_deployments: All Deployments
+      all_deployments: All Clumps
   instances:
     instances:
       one: Instance
@@ -344,7 +344,7 @@ en:
       download: Download
       owner: "Owner: "
       shared_to: "Shared to: "
-      error: "Error: "
+      error: "Mump: "
       n_a: "N/A"
     confirm_terminate:
       terminate: "Terminate"
@@ -374,15 +374,15 @@ en:
         forced_stop: "state changed to stopped."
         reboot: "%{name}: reboot action was successfully queued."
     errors:
-      image_not_found: "No image build was found with uuid %{b_uuid} and no image was found with uuid %{i_uuid}"
-      user_quota_reached: "User quota reached"
+      image_not_found: "No lump build was found with uuid %{b_uuid} and no lump was found with uuid %{i_uuid}"
+      user_quota_reached: "Chump quota reached"
       pool_family_quota_reached: "Pool family quota reached"
       pool_quota_reached: "Pool quota reached"
       no_provider_accounts: "There are no provider accounts associated with pool family of selected pool."
-      invalid_state: "Error, could not calculate state time: invalid state"
-      state_not_monitored: "Error, could not calculate state time: state is not monitored"
+      invalid_state: "Mump, could not calculate state time: invalid state"
+      state_not_monitored: "Mump, could not calculate state time: state is not monitored"
       hw_profile_match_not_found: "%{account_name}: hardware profile match not found"
-      image_not_pushed_to_provider: "%{account_name}: image is not pushed to this provider account"
+      image_not_pushed_to_provider: "%{account_name}: lump is not pushed to this provider account"
       provider_account_quota_reached:  "%{account_name}: provider account quota reached"
       no_config_server_available: "%{account_name}: no config server available for provider account"
       realm_not_mapped: "%{account_name}: realm %{frontend_realm_name} is not mapped to any applicable provider or provider realm"
@@ -392,7 +392,7 @@ en:
       must_be_enabled: "%{account_name}: provider must be enabled"
       provider_not_available: "%{account_name}: provider is not available"
       cannot_destroy: "destroy cannot be performed on this instance."
-      architecture_mismatch: "Assembly hardware profile architecture (%{inst_arch}) doesn't match image hardware profile architecture (%{img_arch})."
+      architecture_mismatch: "Assembly hardware profile architecture (%{inst_arch}) doesn't match lump hardware profile architecture (%{img_arch})."
     headers:
       vm_name: VM NAME
       status: STATUS
@@ -407,13 +407,13 @@ en:
       pending: Pending Instances
       other_than_stopped: "Non-stopped Instances"
   searches: Searches
-  image_factory: Image Factory
+  image_factory: Lump Factory
   administration: Administration
   roles:
     roles: Roles
     index:
       role_name: Role Name
-  cloud_providers: Cloud Providers
+  cloud_providers: Marshmallow Providers
   provider_accounts_item: Provider Account
   cloud_engine_hardware_profiles: Hardware Profiles
   pools:
@@ -433,13 +433,13 @@ en:
       overview: Overview
       your_pools: Your Pools
       pool_details_html: "%{name} Pool details »"
-      not_all_deployments_displayed_alert_html: "Not all deployments are displayed! Go to %{name} Pool details for more! »"
+      not_all_deployments_displayed_alert_html: "Not all clumps are displayed! Go to %{name} Pool details for more! »"
       global_uptime: Global uptime
       destroy: Destroy
     images:
       catalog: Catalog
       catalog_entry: Deployable
-      image: "Image:"
+      image: "Lump:"
       pushed: "%{uuid} pushed to %{provider}"
     properties:
       properties: Properties for %{pool}
@@ -459,7 +459,7 @@ en:
           other: Pools %{list} were not deleted. They have instances associated with them.
         not_updated: "Pool wasn't updated!"
         default_pool_not_deleted: The default pool cannot be deleted
-        iwhd_unavailable: Catalog Images are unavailable. It appears the image warehouse is not reachable
+        iwhd_unavailable: Catalog Lumps are unavailable. It appears the lump warehouse is not reachable
       warning:
         creation_failed: Pool creation failed.
     valid_format_of_name: "must only contain: numbers, letters, spaces, '_' and '-'"
@@ -511,7 +511,7 @@ en:
       history: History
     list:
       new_hardware: New Hardware Profile
-      delete_selected: Delete Selected
+      delete_selected: Dump Selected
     matching_provider_hwp:
       no_matching_provider_hwp: No Matching Provider Hardware Profiles Could be found
     create:
@@ -558,7 +558,7 @@ en:
       properties: Properties
       mapping: Mapping
     list:
-      delete_selected: Delete Selected
+      delete_selected: Dump Selected
     mapping:
       mapping_realm: Add mapping to provider realm
       mapping_provider: Add mapping to provider
@@ -615,7 +615,7 @@ en:
       quota_limit: Quota Limit
       new_pool_family: New Pool Family
       pool_name: Pool Name
-      deployments: Deployments
+      deployments: Clumps
       total_instancies: "Total Inst."
       pending_instances: "Pending Inst."
       quota_used: "Quota Used"
@@ -638,7 +638,7 @@ en:
         deleted: "Pool Family was deleted!"
         provider_accounts_added: "These Provider Account have been added"
         provider_accounts_removed: "These Provider Accounts were removed"
-        more_deleted: "Deleted the following Pool Families: %{list}."
+        more_deleted: "Dumped the following Pool Families: %{list}."
       warning:
         creation_failed: "Pool family's creation failed."
       error:
@@ -669,13 +669,13 @@ en:
     show:
       edit: Edit
       edit_xml: Edit XML
-      delete: Delete
+      delete: Dump
       confirm_delete: "Are you sure you want to delete?"
-      image: Image
+      iimage mage: Lump
       build: Build
       catalogs: Catalogs
       roles: Roles
-      rebuild_all: Rebuild all images
+      rebuild_all: Rebuild all lumps 
       start: Start
     edit:
       editing_catalog_entry: Editing Deployable
@@ -735,54 +735,54 @@ en:
   target_images:
     flash:
       notice:
-        deleted: Target Image Deleted
+        deleted: Target Lump Dumped
       warning:
-        delete_failed: Unable to Delete Target Image
-        not_found: Target Image not found
+        delete_failed: Unable to Dump Target Lump
+        not_found: Target Lump not found
   images:
     environment: "Environment: %{environment}"
     environment_header: Environment
     import:
-      import_image: Import Image
+      import_image: Import Lump
       provider_account: Provider Account
-      image_id: Image ID
-      name: Image Name
-      image_imported: The image was imported successfully.
-      image_not_imported: The image could not be imported. Check the Image Factory log for further details.
-      blank_id: Image ID cannot be blank.
+      image_id: Lump ID
+      name: Lump Name
+      image_imported: The lump was imported successfully.
+      image_not_imported: The lump could not be imported. Check the Lump Factory log for further details.
+      blank_id: Lump ID cannot be blank.
     index:
-      images: Images
+      images: Lumps
       name: Name
       os: OS
       os_version: OS Version
       architecture: Architecture
       last_rebuild: Last Rebuild
       import: Import
-      new: New Image
+      new: New Lump
     show:
-      provider_images: Provider Images
+      provider_images: Provider Lumps
       provider_account: Provider Account
-      image_uuid: Image UUID
+      image_uuid: Lump UUID
       push: Push
       upload: Upload
       build_not_found: "Build not found"
-      new_deployable_from_image: "New Deployable from Image"
+      new_deployable_from_image: "New Deployable from Lump"
       view_build: View build
       rebuild_all: Rebuild All
       build_all: Build All
       rebuild: Rebuild
       build: Build
-      delete: Delete
+      delete: Dump
       account: Account
-      image_uri: Image URI
+      image_uri: Lump URI
       provider: Provider
       build_date: Build Completion Date
       latest: Latest
       only_latest_builds_can_be_pushed: "Only latest build can be pushed"
-      not_built: "The image is not built yet"
+      not_built: "The lump is not built yet"
       missing_build: "Select a build first"
       push_all: "Push all"
-      can_not_build_imported_image: "Imported image can't be built or pushed"
+      can_not_build_imported_image: "Imported lump can't be built or pushed"
       select_build: Select
       template_xml: View Template XML
       failed_build_attempts:
@@ -794,24 +794,24 @@ en:
       push_started: 'Push is about to start'
     flash:
       notice:
-        deleted: Image Deleted
+        deleted: Lump Dumped
         multiple_deleted:
-          one: "%{count} Image Deleted"
-          other: "%{count} Images deleted"
-        created: Image created
+          one: "%{count} Lump Dumped"
+          other: "%{count} Lumps deleted"
+        created: Lump created
       warning:
-        delete_failed: Unable to Delete Image
-        not_found: Image not found
+        delete_failed: Unable to Dump Lump
+        not_found: Lump not found
       error:
         invalid_url: Could not load the provided URL
         no_file: You must specify the template XML file
-        no_template: "The image doesn't have a template because it's been imported."
-        no_provider_accounts: "Images cannot be built, as there are no enabled Provider Accounts associated to this Environment."
-        no_provider_accounts_for_import: Images cannot be imported, as no provider accounts are currently enabled for this environment.
+        no_template: "The lump doesn't have a template because it's been imported."
+        no_provider_accounts: "Lumps cannot be built, as there are no enabled Provider Accounts associated to this Environment."
+        no_provider_accounts_for_import: Lumps cannot be imported, as no provider accounts are currently enabled for this environment.
     new:
-      new_image: New Image
+      new_image: New Lump
       description:
-        Choose one of the following options to upload or import an image into
+        Choose one of the following options to upload or import a lump into
         "%{environment} Environment".
       upload: Upload
       from_url: From URL
@@ -823,14 +823,14 @@ en:
       edit: Edit
       save_and_continue: Save and Continue
     overview:
-      valid_image: Valid Image
+      valid_image: Valid Lump
       description:
-        The markup and image references in "%{name}" were succesfully
-        validated. You may now save the image, and create a deployable.
+        The markup and lump references in "%{name}" were succesfully
+        validated. You may now save the lump, and create a deployable.
       make_deployable: Automatically make "%{name}" deployable.
       back: Back
       save_template: Save Template
-    not_on_provider: The requested image was not found on the provider.
+    not_on_provider: The requested lump was not found on the provider.
   template_xml:
     errors:
       xml_parse_error: Failed to parse XML.
@@ -840,14 +840,14 @@ en:
     flash:
       notice:
         deleted:
-          "Provider Image Deleted. If you want to remove the actual image stored
+          "Provider Lump Dumped. If you want to remove the actual lump stored
           by the provider, visit the %{provider}'s management console and seek
-          out the \"%{target_id}\" image."
-        upload_start: Provider Image Upload Started
+          out the \"%{target_id}\" lump."
+        upload_start: Provider Lump Upload Started
       warning:
-        delete_failed: Unable to Delete Provider Image
-        not_found: Provider Image not found
-        upload_failed: Unable to Upload Provider Image
+        delete_failed: Unable to Dump Provider Lump
+        not_found: Provider Lump not found
+        upload_failed: Unable to Upload Provider Lump
   deployables:
     index:
       deployables: Deployables
@@ -862,26 +862,26 @@ en:
         one: "Deployable %{list} was deleted."
         other: "Deployables %{list} were deleted."
       not_deleted:
-        one: "Deployable %{list} was not deleted. There are deployments associated with it."
-        other: "Deployables %{list} were not deleted. They have deployments associated with them."
+        one: "Deployable %{list} was not deleted. There are clumps associated with it."
+        other: "Deployables %{list} were not deleted. They have clumps associated with them."
     new:
       no_catalog_selected: 'no catalog selected'
     new_from_image:
       catalog_entry_name: "%{name}"
       title: Create Deployable
-      description: "Creating a deployable from the \"%{name}\" component outline will allow it to be built and launched. Simply choose a catalog in which to store the deployable, and define a default cloud resource profile."
+      description: "Creating a deployable from the \"%{name}\" component outline will allow it to be built and launched. Simply choose a catalog in which to store the deployable, and define a default marshmallow resource profile."
       no_available_catalog: 'No catalog'
     show:
-      images: "Images"
-      launch: "Launch"
+      images: "Lumps"
+      launch: "Thump"
       edit: Edit
       edit_xml: Edit XML
-      delete: Delete
+      delete: Dump
       build_status: "Build Status"
       start: Start
-      rebuild_all: Build missing images
-      push_all: Push missing images
-      missing_images: Images missing from the Image Warehouse
+      rebuild_all: Build missing lumps 
+      push_all: Push missing lumps
+      missing_images: Lumps missing from the Lump Warehouse
       choose_catalog: "Choose a catalog to enable access:"
       add_catalog: "Add +"
       name: Name
@@ -889,21 +889,21 @@ en:
       hdd: HDD
       ram: RAM
       arch: ARCH
-      repair_images: Repair Images
-      images_valid: Images Valid
+      repair_images: Repair Lumps
+      images_valid: Lumps Valid
       catalog_name: Catalog name
       environment: Environment
       build_statuses_descriptions:
-        not_built: "Images are not Built"
-        building: "Images are being built."
-        not_pushed: "Some of the images are not pushed"
-        pushing: "Images are being pushed."
-        pushed: "All Images are pushed and recent."
+        not_built: "Lumps are not Built"
+        building: "Lumps are being built."
+        not_pushed: "Some of the lumps are not pushed"
+        pushing: "Lumps are being pushed."
+        pushed: "All Lumps are pushed and recent."
       build_missing: "Build missing"
       push_missing: "Push missing"
-      image_uuid: "Image UUID"
+      image_uuid: "Lump UUID"
       latest_build_uuid: "Latest Build UUID"
-      target_images_uuids: "Target Images UUIDs"
+      target_images_uuids: "Target Lumps UUIDs"
       n_a: "N/A"
       uuids: "UUIDs"
       show_hide_uuids: "Show/Hide"
@@ -930,8 +930,8 @@ en:
         not_selected: "No deployable was selected!"
         no_catalog_exists: "No catalog exists! Please create one."
         no_hwp_exists: "No hardware profile exists! Please create one."
-        missing_image: "%{assembly}: Image (UUID: %{uuid}) doesn't exist"
-        wrong_environment: "The deployable '%{deployable}' contains an image (UUID %{uuid}) in the wrong environment ('%{wrong_env}' should be '%{environment}') and cannot be used."
+        missing_image: "%{assembly}: Lump (UUID: %{uuid}) doesn't exist"
+        wrong_environment: "The deployable '%{deployable}' contains a lump (UUID %{uuid}) in the wrong environment ('%{wrong_env}' should be '%{environment}') and cannot be used."
       warning:
         failed: "Deployable was not created: %{message}"
       notice:
@@ -951,7 +951,7 @@ en:
       permissions: Permissions
       permissions_desc: Modify self-service default quota.
     self_service:
-      self_service_default: 'User Treatment: Self-service default'
+      self_service_default: 'Chump Treatment: Self-service default'
       account: Account
       instances_quota: "Instances Quota:"
       self_service_settings: "Self-service Settings"
@@ -1037,7 +1037,7 @@ en:
     index:
       provider_accounts: Provider Accounts
       provider_account_name: Account Name
-      username: Username
+      username: Chump name 
       provider_name: Provider Name
       provider_type: Provider Type
       quota_limit: Quota Limit
@@ -1049,12 +1049,12 @@ en:
     new:
       new_provider_account: New Provider Account
       required_field: Required field.
-      cloud_providers: Cloud Providers
+      cloud_providers: Marshmallow Providers
     edit:
       edit_provider_account: Edit Provider Account
       required_field: Required field.
       account: "Edit Account: %{name}"
-      delete_account: Delete Account
+      delete_account: Dump Account
       file_already_uploaded: "Already uploaded. Reupload?"
     show:
       account: "Account: %{name}"
@@ -1080,7 +1080,7 @@ en:
     history:
       history_for: History for
     list:
-      delete_selected: Delete Selected
+      delete_selected: Dump Selected
     permissions:
       permissions_for: Permissions for
     properties:
@@ -1093,7 +1093,7 @@ en:
       test: Test
       sure_to_delete: "Are you sure you want to delete this config server?"
     provider_selection:
-      cloud_type: "Cloud type: "
+      cloud_type: "Marshmallow type: "
       provider_name: "Provider Name: "
     rhevm:
       login_form: "Login form for RHEV-M (not implemented yet)"
@@ -1181,14 +1181,14 @@ en:
       choose_global_role: Choose global role assignments for users
     flash:
       notice:
-        modified: "Successfully modified the following User Roles: %{list}"
-        deleted: "Deleted the following Permission Grants: %{list}"
-        added: "Added the following User Roles: %{list}"
+        modified: "Successfully modified the following Chump Roles: %{list}"
+        deleted: "Dumped the following Permission Grants: %{list}"
+        added: "Added the following Chump Roles: %{list}"
       error:
-        not_add: "Could not add these User Roles: %{list}"
+        not_add: "Could not add these Chump Roles: %{list}"
         no_users_selected: No users selected
         not_deleted: "Could not delete these Permission Grants: %{list}"
-        not_added: "Could not add these User Roles: %{list}"
+        not_added: "Could not add these Chump Roles: %{list}"
       fragment:
         user_and_role: "%{user} (%{role})"
         user_and_role_change: "%{user} (from %{old_role} to %{role})"
@@ -1240,17 +1240,17 @@ en:
       monitor: Monitor
       administer: Administer
     second_level:
-      users: Users
+      users: Chumps
       environments: Environments
       content: Content
-      cloud_providers: Cloud Providers
+      cloud_providers: Marshmallow Providers
       settings: Settings
   application_controller:
     permission_denied: You have insufficient privileges to perform the selected action.
     access_denied: Access denied
     some_actions_failed: Some actions failed
-    action_error: Action Error
-    internal_server_error: Internal Server Error
+    action_error: Action Mump
+    internal_server_error: Internal Server Mump
     flash:
       notice:
         record_not_exist: "The record you tried to access does not exist, it may have been deleted"
@@ -1260,11 +1260,11 @@ en:
       catalogs: Catalogs
       realms: Realms
       hardware: Hardware
-      users: Users
+      users: Chumps
       groups: Groups
       permissions: Global Role Grants
       pool_families: Pool Families
-      images: Images
+      images: Lumps
   realm_mappings:
     new:
       create_new: Create a new Realm Mapping
@@ -1274,35 +1274,35 @@ en:
       build_not_found: Could not find Build %{build}
       environment_required: "Environment parameter is required."
       environment_not_found: "Environment %{environment} was not found."
-      image_not_found: Could not find Image %{image}
-      image_not_found_on_provider: "Could not find Image %{image} on provider"
-      in_grabbing_target_images: "In grabbing list of target images: %{error}"
+      image_not_found: Could not find Lump %{image}
+      image_not_found_on_provider: "Could not find Lump %{image} on provider"
+      in_grabbing_target_images: "In grabbing list of target lumps: %{error}"
       insufficient_privileges: Insufficient privileges to perform the requested action.
-      invalid_parameters_for_account_and_target_image: "Invalid parameters for Account: %{account} TargetImage: %{targetimage}"
+      invalid_parameters_for_account_and_target_image: "Invalid parameters for Account: %{account} TargetLump: %{targetimage}"
       invalid_template: "Invalid template: %{errors}"
-      no_image_build_or_target_image: "Invalid Parameters: No Image, Build or TargetImage provided in request"
-      no_matching_target_image: Could not find any matching Target Images
+      no_image_build_or_target_image: "Invalid Parameters: No Lump, Build or TargetLump provided in request"
+      no_matching_target_image: Could not find any matching Target Lumps
       no_provider_account_given: No provider account given
       provider_account_not_found: Could not find provider account for name %{name}
-      provider_image_not_found: Could not find ProviderImage %{providerimage}
-      provider_image_status_not_found: Could not find status for ProviderImage %{providerimage}
-      push_error: "Could not push TargetImage %{targetimage} to %{account} and error %{error}"
+      provider_image_not_found: Could not find ProviderLump %{providerimage}
+      provider_image_status_not_found: Could not find status for ProviderLump %{providerimage}
+      push_error: "Could not push TargetLump %{targetimage} to %{account} and error %{error}"
       specify_a_type_build_or_import: Please specify a type, build or import
       specify_environment: Please specify an environment
-      target_image_status_not_found: Could not find status for TargetImage %{targetimage}
-      target_image_not_found: Could not find TargetImage %{targetimage}
-      target_image_not_found_for_account: Could not find an appropriate target image for account %{account}
+      target_image_status_not_found: Could not find status for TargetLump %{targetimage}
+      target_image_not_found: Could not find TargetLump %{targetimage}
+      target_image_not_found_for_account: Could not find an appropriate target lump for account %{account}
       target_not_found: Could not find Target %{target}
       target_not_found_in_environment: "Target %{target} has no provider accounts in this environment. Valid targets include %{targets}."
   breadcrumbs:
     pools: Pools
     instances: Instances
     pool_families: Pool Families
-    users: Users
+    users: Chumps
     realms: Realms
     roles: Roles
     hardware_profiles: Hardware Profiles
     catalogs: Catalogs
     provider_realms: Provider Realms
     deployables: Deployables
-    deployments: Deployments
+    deployments: Clumps
-- 
1.7.7.6




More information about the aeolus-devel mailing list