Selaa lähdekoodia

[core] Fix English mistakes

Ambreen Kazi 12 vuotta sitten
vanhempi
commit
b7824d9
38 muutettua tiedostoa jossa 124 lisäystä ja 124 poistoa
  1. 5 5
      apps/about/src/about/templates/admin_wizard.mako
  2. 1 1
      apps/beeswax/src/beeswax/conf.py
  3. 4 4
      apps/beeswax/src/beeswax/create_table.py
  4. 9 9
      apps/beeswax/src/beeswax/forms.py
  5. 3 3
      apps/beeswax/src/beeswax/management/commands/beeswax_install_examples.py
  6. 3 3
      apps/beeswax/src/beeswax/models.py
  7. 3 3
      apps/beeswax/src/beeswax/server/dbms.py
  8. 2 2
      apps/beeswax/src/beeswax/templates/choose_delimiter.mako
  9. 5 5
      apps/beeswax/src/beeswax/templates/choose_file.mako
  10. 1 1
      apps/beeswax/src/beeswax/templates/configuration.mako
  11. 3 3
      apps/beeswax/src/beeswax/templates/create_database.mako
  12. 5 5
      apps/beeswax/src/beeswax/templates/create_table_manually.mako
  13. 3 3
      apps/beeswax/src/beeswax/templates/execute.mako
  14. 1 1
      apps/beeswax/src/beeswax/templates/list_history.mako
  15. 3 3
      apps/beeswax/src/beeswax/templates/watch_results.mako
  16. 7 7
      apps/beeswax/src/beeswax/views.py
  17. 2 2
      apps/filebrowser/src/filebrowser/templates/listdir.mako
  18. 1 1
      apps/filebrowser/src/filebrowser/templates/listdir_components.mako
  19. 1 1
      apps/filebrowser/src/filebrowser/templates/saveas.mako
  20. 11 11
      apps/filebrowser/src/filebrowser/views.py
  21. 2 2
      apps/jobbrowser/src/jobbrowser/templates/job.mako
  22. 2 2
      apps/jobbrowser/src/jobbrowser/templates/jobs.mako
  23. 4 4
      apps/jobbrowser/src/jobbrowser/views.py
  24. 3 3
      apps/jobsub/src/jobsub/templates/designs.mako
  25. 1 1
      apps/jobsub/src/jobsub/views.py
  26. 1 1
      apps/oozie/src/oozie/forms.py
  27. 15 15
      apps/oozie/src/oozie/models.py
  28. 1 1
      apps/oozie/src/oozie/templates/editor/action_utils.mako
  29. 9 9
      apps/oozie/src/oozie/views/dashboard.py
  30. 4 4
      apps/pig/src/pig/templates/app.mako
  31. 1 1
      apps/search/src/search/decorators.py
  32. 1 1
      apps/search/src/search/forms.py
  33. 1 1
      apps/search/src/search/templates/admin_collection_template.mako
  34. 1 1
      apps/search/src/search/templates/admin_collections.mako
  35. 1 1
      apps/search/src/search/templates/no_collections.mako
  36. 1 1
      apps/search/src/search/views.py
  37. 2 2
      apps/useradmin/src/useradmin/forms.py
  38. 1 1
      desktop/core/src/desktop/templates/home.mako

+ 5 - 5
apps/about/src/about/templates/admin_wizard.mako

@@ -36,7 +36,7 @@ ${ commonheader(_('Quick Start'), "quickstart", user, "100px") | n,unicode }
 % endif
 % endif
 
 
 <div style="position: absolute;top:110px;right:30px">
 <div style="position: absolute;top:110px;right:30px">
-  <a href="http://gethue.com" target="_blank" title="${ _('Visit Hue website !') }">
+  <a href="http://gethue.com" target="_blank" title="${ _('Visit the Hue website.') }">
     <img src="/static/art/hue-logo-subtle.png"/>
     <img src="/static/art/hue-logo-subtle.png"/>
   </a>
   </a>
 </div>
 </div>
@@ -60,7 +60,7 @@ ${ commonheader(_('Quick Start'), "quickstart", user, "100px") | n,unicode }
       <li class="active"><a href="#step1" class="step">${ _('Step 1:') } <i class="icon-cogs"></i> ${ _('Check Configuration') }</a></li>
       <li class="active"><a href="#step1" class="step">${ _('Step 1:') } <i class="icon-cogs"></i> ${ _('Check Configuration') }</a></li>
       <li><a href="#step2" class="step">${ _('Step 2:') } <i class="icon-book"></i> ${ _('Examples') }</a></li>
       <li><a href="#step2" class="step">${ _('Step 2:') } <i class="icon-book"></i> ${ _('Examples') }</a></li>
       <li><a href="#step3" class="step">${ _('Step 3:') } <i class="icon-group"></i> ${ _('Users') }</a></li>
       <li><a href="#step3" class="step">${ _('Step 3:') } <i class="icon-group"></i> ${ _('Users') }</a></li>
-      <li><a id="lastStep" href="#step4" class="step">${ _('Step 4:') } <i class="icon-flag"></i> ${_('Go !') }</a></li>
+      <li><a id="lastStep" href="#step4" class="step">${ _('Step 4:') } <i class="icon-flag"></i> ${_('Go!') }</a></li>
     </ul>
     </ul>
 
 
     <div class="steps" >
     <div class="steps" >
@@ -82,7 +82,7 @@ ${ commonheader(_('Quick Start'), "quickstart", user, "100px") | n,unicode }
           <span class="icon">
           <span class="icon">
             <i class="icon-trash"></i>
             <i class="icon-trash"></i>
           </span>
           </span>
-          <h5>${ _('HDFS Trash configuration') }</h5>
+          <h5>${ _('HDFS Trash Configuration') }</h5>
         </div>
         </div>
         <div class="widget-content">
         <div class="widget-content">
           <div class="container-fluid">
           <div class="container-fluid">
@@ -175,7 +175,7 @@ ${ commonheader(_('Quick Start'), "quickstart", user, "100px") | n,unicode }
           <span class="icon">
           <span class="icon">
             <i class="icon-th-list"></i>
             <i class="icon-th-list"></i>
           </span>
           </span>
-          <h5>${ _('Go create or import users') }</h5>
+          <h5>${ _('Create or import users.') }</h5>
         </div>
         </div>
         <div class="widget-content">
         <div class="widget-content">
         <a  href="${ url('useradmin.views.list_users') }" target="_blank"><img src="/useradmin/static/art/icon_useradmin_24.png"> ${ _('User Admin') }</a>
         <a  href="${ url('useradmin.views.list_users') }" target="_blank"><img src="/useradmin/static/art/icon_useradmin_24.png"> ${ _('User Admin') }</a>
@@ -211,7 +211,7 @@ ${ commonheader(_('Quick Start'), "quickstart", user, "100px") | n,unicode }
           <span class="icon">
           <span class="icon">
             <i class="icon-th-list"></i>
             <i class="icon-th-list"></i>
           </span>
           </span>
-          <h5>${ _('Go use the apps') }</h5>
+          <h5>${ _('Use the applications') }</h5>
         </div>
         </div>
         <div class="widget-content">
         <div class="widget-content">
           <a href="${ url('desktop.views.home') }" class="step"><i class="icon-home"></i> ${_('Hue Home') }</a>
           <a href="${ url('desktop.views.home') }" class="step"><i class="icon-home"></i> ${_('Hue Home') }</a>

+ 1 - 1
apps/beeswax/src/beeswax/conf.py

@@ -126,6 +126,6 @@ def config_validator(user):
       server = dbms.get(user)
       server = dbms.get(user)
       server.get_databases()
       server.get_databases()
   except:
   except:
-    res.append((NICE_NAME, _("The app won't work without a running Beeswax/HiveServer2 server and/or Hive Metastore.")))
+    res.append((NICE_NAME, _("The application won't work without a running Beeswax/HiveServer2 server and/or Hive Metastore.")))
 
 
   return res
   return res

+ 4 - 4
apps/beeswax/src/beeswax/create_table.py

@@ -287,7 +287,7 @@ def _delim_preview(fs, file_form, encoding, file_types, delimiters):
                                             file_type=file_type,
                                             file_type=file_type,
                                             n_cols=n_cols))
                                             n_cols=n_cols))
   if not delim_form.is_valid():
   if not delim_form.is_valid():
-    assert False, _('Internal error when constructing the delimiter form: %(error)s') % {'error': delim_form.errors}
+    assert False, _('Internal error when constructing the delimiter form: %(error)s.') % {'error': delim_form.errors}
   return fields_list, n_cols, delim_form
   return fields_list, n_cols, delim_form
 
 
 
 
@@ -314,7 +314,7 @@ def _parse_fields(path, file_obj, encoding, filetypes, delimiters):
       return delim, reader.TYPE, fields_list
       return delim, reader.TYPE, fields_list
   else:
   else:
     # Even TextFileReader doesn't work
     # Even TextFileReader doesn't work
-    msg = _("Failed to decode file '%(path)s' into printable characters under %(encoding)s") % {'path': path, 'encoding': encoding}
+    msg = _("Failed to decode file '%(path)s' into printable characters under %(encoding)s.") % {'path': path, 'encoding': encoding}
     LOG.error(msg)
     LOG.error(msg)
     raise PopupException(msg)
     raise PopupException(msg)
 
 
@@ -379,7 +379,7 @@ def _peek_file(fs, file_form):
     file_obj.close()
     file_obj.close()
     return (path, file_head)
     return (path, file_head)
   except IOError, ex:
   except IOError, ex:
-    msg = _("Failed to open file '%(path)s': %(error)s") % {'path': path, 'error': ex}
+    msg = _("Failed to open file '%(path)s': %(error)s.") % {'path': path, 'error': ex}
     LOG.exception(msg)
     LOG.exception(msg)
     raise PopupException(msg)
     raise PopupException(msg)
 
 
@@ -431,7 +431,7 @@ def load_after_create(request, database):
   path = request.REQUEST.get('path')
   path = request.REQUEST.get('path')
 
 
   if not tablename or not path:
   if not tablename or not path:
-    msg = _('Internal error: Missing needed parameter to load data into table')
+    msg = _('Internal error: Missing needed parameter to load data into table.')
     LOG.error(msg)
     LOG.error(msg)
     raise PopupException(msg)
     raise PopupException(msg)
 
 

+ 9 - 9
apps/beeswax/src/beeswax/forms.py

@@ -67,7 +67,7 @@ class SaveForm(forms.Form):
     name = cleaned_data.get('name')
     name = cleaned_data.get('name')
     if save and not name:
     if save and not name:
       # Bother with name iff we're saving
       # Bother with name iff we're saving
-      raise forms.ValidationError(_('Please enter a name'))
+      raise forms.ValidationError(_('Enter a name.'))
     return cleaned_data
     return cleaned_data
 
 
   def set_data(self, name, desc=''):
   def set_data(self, name, desc=''):
@@ -92,7 +92,7 @@ class SaveResultsForm(DependencyAwareForm):
                                   help_text=_t("Name of the new table"))
                                   help_text=_t("Name of the new table"))
   target_dir = PathField(label=_t("Results Location"),
   target_dir = PathField(label=_t("Results Location"),
                          required=False,
                          required=False,
-                         help_text=_t("Empty directory in HDFS to put the results"))
+                         help_text=_t("Empty directory in HDFS to store results."))
   dependencies = [
   dependencies = [
     ('save_target', SAVE_TYPE_TBL, 'target_table'),
     ('save_target', SAVE_TYPE_TBL, 'target_table'),
     ('save_target', SAVE_TYPE_DIR, 'target_dir'),
     ('save_target', SAVE_TYPE_DIR, 'target_dir'),
@@ -121,7 +121,7 @@ class SaveResultsForm(DependencyAwareForm):
       if not target_dir.startswith('/'):
       if not target_dir.startswith('/'):
         self._errors['target_dir'] = self.error_class([_('Directory should start with /')])
         self._errors['target_dir'] = self.error_class([_('Directory should start with /')])
       elif self.fs.exists(target_dir):
       elif self.fs.exists(target_dir):
-        self._errors['target_dir'] = self.error_class([_('Directory already exists')]) # Overwrite destination directory content
+        self._errors['target_dir'] = self.error_class([_('Directory already exists.')]) # Overwrite destination directory content
 
 
     return cleaned_data
     return cleaned_data
 
 
@@ -209,7 +209,7 @@ class CreateTableForm(DependencyAwareForm):
   serde_name = forms.CharField(required=False, label=_t("SerDe Name"))
   serde_name = forms.CharField(required=False, label=_t("SerDe Name"))
   serde_properties = forms.CharField(
   serde_properties = forms.CharField(
                         required=False,
                         required=False,
-                        help_text=_t("Comma-separated list of key-value pairs, eg., 'p1=v1, p2=v2'"))
+                        help_text=_t("Comma-separated list of key-value pairs. E.g. 'p1=v1, p2=v2'"))
 
 
   dependencies += [
   dependencies += [
     ("row_format", "SerDe", "serde_name"),
     ("row_format", "SerDe", "serde_name"),
@@ -229,7 +229,7 @@ class CreateTableForm(DependencyAwareForm):
   ]
   ]
 
 
   # External?
   # External?
-  use_default_location = forms.BooleanField(required=False, initial=True, label=_t("Use default location"))
+  use_default_location = forms.BooleanField(required=False, initial=True, label=_t("Use default location."))
   external_location = forms.CharField(required=False, help_text=_t("Path to HDFS directory or file of table data."))
   external_location = forms.CharField(required=False, help_text=_t("Path to HDFS directory or file of table data."))
 
 
   dependencies += [
   dependencies += [
@@ -253,7 +253,7 @@ def _clean_tablename(db, name):
   try:
   try:
     table = db.get_table("default", name)
     table = db.get_table("default", name)
     if table.name:
     if table.name:
-      raise forms.ValidationError(_('Table "%(name)s" already exists') % {'name': name})
+      raise forms.ValidationError(_('Table "%(name)s" already exists.') % {'name': name})
   except Exception:
   except Exception:
     return name
     return name
 
 
@@ -337,15 +337,15 @@ class ColumnTypeForm(DependencyAwareForm):
                                      choices=common.to_choices(HIVE_PRIMITIVE_TYPES),
                                      choices=common.to_choices(HIVE_PRIMITIVE_TYPES),
                                      help_text=_t("Specify if column_type is map."))
                                      help_text=_t("Specify if column_type is map."))
 
 
-ColumnTypeFormSet = simple_formset_factory(ColumnTypeForm, initial=[{}], add_label=_t("add a column"))
+ColumnTypeFormSet = simple_formset_factory(ColumnTypeForm, initial=[{}], add_label=_t("Add a column"))
 # Default to no partitions
 # Default to no partitions
-PartitionTypeFormSet = simple_formset_factory(PartitionTypeForm, add_label=_t("add a partition"))
+PartitionTypeFormSet = simple_formset_factory(PartitionTypeForm, add_label=_t("Add a partition"))
 
 
 
 
 def _clean_databasename(name):
 def _clean_databasename(name):
   try:
   try:
     if name in db.get_databases():
     if name in db.get_databases():
-      raise forms.ValidationError(_('Database "%(name)s" already exists') % {'name': name})
+      raise forms.ValidationError(_('Database "%(name)s" already exists.') % {'name': name})
   except Exception:
   except Exception:
     return name
     return name
 
 

+ 3 - 3
apps/beeswax/src/beeswax/management/commands/beeswax_install_examples.py

@@ -125,7 +125,7 @@ class SampleTable(object):
     self._data_dir = beeswax.conf.LOCAL_EXAMPLES_DATA_DIR.get()
     self._data_dir = beeswax.conf.LOCAL_EXAMPLES_DATA_DIR.get()
     self._contents_file = os.path.join(self._data_dir, self.filename)
     self._contents_file = os.path.join(self._data_dir, self.filename)
     if not os.path.isfile(self._contents_file):
     if not os.path.isfile(self._contents_file):
-      msg = _('Cannot find table data in "%(file)s"') % {'file': self._contents_file}
+      msg = _('Cannot find table data in "%(file)s".') % {'file': self._contents_file}
       LOG.error(msg)
       LOG.error(msg)
       raise ValueError(msg)
       raise ValueError(msg)
 
 
@@ -154,7 +154,7 @@ class SampleTable(object):
           LOG.error(msg)
           LOG.error(msg)
           raise InstallException(msg)
           raise InstallException(msg)
       except Exception, ex:
       except Exception, ex:
-        msg = _('Error creating table %(table)s: %(error)s') % {'table': self.name, 'error': ex}
+        msg = _('Error creating table %(table)s: %(error)s.') % {'table': self.name, 'error': ex}
         LOG.error(msg)
         LOG.error(msg)
         raise InstallException(msg)
         raise InstallException(msg)
 
 
@@ -178,7 +178,7 @@ class SampleTable(object):
         LOG.error(msg)
         LOG.error(msg)
         raise InstallException(msg)
         raise InstallException(msg)
     except BeeswaxException, ex:
     except BeeswaxException, ex:
-      msg = _('Error loading table %(table)s: %(error)s') % {'table': self.name, 'error': ex}
+      msg = _('Error loading table %(table)s: %(error)s.') % {'table': self.name, 'error': ex}
       LOG.error(msg)
       LOG.error(msg)
       raise InstallException(msg)
       raise InstallException(msg)
 
 

+ 3 - 3
apps/beeswax/src/beeswax/models.py

@@ -320,16 +320,16 @@ class SavedQuery(models.Model):
     try:
     try:
       design = SavedQuery.objects.get(id=id)
       design = SavedQuery.objects.get(id=id)
     except SavedQuery.DoesNotExist, err:
     except SavedQuery.DoesNotExist, err:
-      msg = _('Cannot retrieve Beeswax design id %(id)s') % {'id': id}
+      msg = _('Cannot retrieve Beeswax design id %(id)s.') % {'id': id}
       raise err
       raise err
 
 
     if owner is not None and design.owner != owner:
     if owner is not None and design.owner != owner:
-      msg = _('Design id %(id)s does not belong to user %(user)s') % {'id': id, 'user': owner}
+      msg = _('Design id %(id)s does not belong to user %(user)s.') % {'id': id, 'user': owner}
       LOG.error(msg)
       LOG.error(msg)
       raise PopupException(msg)
       raise PopupException(msg)
 
 
     if type is not None and design.type != type:
     if type is not None and design.type != type:
-      msg = _('Type mismatch for design id %(id)s (owner %(owner)s) - Expected %(expected_type)s got %(real_type)s') % \
+      msg = _('Type mismatch for design id %(id)s (owner %(owner)s) - Expected %(expected_type)s, got %(real_type)s.') % \
             {'id': id, 'owner': owner, 'expected_type': design.type, 'real_type': type}
             {'id': id, 'owner': owner, 'expected_type': design.type, 'real_type': type}
       LOG.error(msg)
       LOG.error(msg)
       raise PopupException(msg)
       raise PopupException(msg)

+ 3 - 3
apps/beeswax/src/beeswax/server/dbms.py

@@ -277,7 +277,7 @@ class Dbms:
         result_dir = request.fs.urlsplit(result_meta.table_dir)[2]
         result_dir = request.fs.urlsplit(result_meta.table_dir)[2]
         request.fs.rename_star(result_dir, table_loc)
         request.fs.rename_star(result_dir, table_loc)
         LOG.debug("Moved results from %s to %s" % (result_meta.table_dir, table_loc))
         LOG.debug("Moved results from %s to %s" % (result_meta.table_dir, table_loc))
-        request.info(request, _('Saved query results as new table %(table)s') % {'table': target_table})
+        request.info(request, _('Saved query results as new table %(table)s.') % {'table': target_table})
         query_history.save_state(QueryHistory.STATE.expired)
         query_history.save_state(QueryHistory.STATE.expired)
       except Exception, ex:
       except Exception, ex:
         query = hql_query('DROP TABLE `%s`' % target_table)
         query = hql_query('DROP TABLE `%s`' % target_table)
@@ -467,10 +467,10 @@ def expand_exception(exc, db, handle=None):
     elif hasattr(exc, 'get_rpc_handle') or hasattr(exc, 'log_context'):
     elif hasattr(exc, 'get_rpc_handle') or hasattr(exc, 'log_context'):
       log = db.get_log(exc)
       log = db.get_log(exc)
     else:
     else:
-      log = _("No server logs for this query")
+      log = _("No server logs for this query.")
   except Exception, e:
   except Exception, e:
     # Always show something, even if server has died on the job.
     # Always show something, even if server has died on the job.
-    log = _("Could not retrieve logs: %s" % e)
+    log = _("Could not retrieve logs: %s." % e)
 
 
   if not exc.message:
   if not exc.message:
     error_message = _("Unknown exception.")
     error_message = _("Unknown exception.")

+ 2 - 2
apps/beeswax/src/beeswax/templates/choose_delimiter.mako

@@ -58,7 +58,7 @@ ${ commonheader(_('Create table from file'), 'metastore', user) | n,unicode }
                             ${comps.field(delim_form["delimiter"], render_default=True)}
                             ${comps.field(delim_form["delimiter"], render_default=True)}
                             <input id="submit_preview" class="btn btn-info" type="submit" value="${_('Preview')}" name="submit_preview"/>
                             <input id="submit_preview" class="btn btn-info" type="submit" value="${_('Preview')}" name="submit_preview"/>
                             <span class="help-block">
                             <span class="help-block">
-                            ${_('Enter the column delimiter. Must be a single character. Use syntax like "\\001" or "\\t" for special characters.')}
+                            ${_('Enter the column delimiter which must be a single character. Use syntax like "\\001" or "\\t" for special characters.')}
                             </span>
                             </span>
                         </div>
                         </div>
                     </div>
                     </div>
@@ -111,7 +111,7 @@ ${ commonheader(_('Create table from file'), 'metastore', user) | n,unicode }
 
 
     $(".scrollable").width($(".form-actions").width());
     $(".scrollable").width($(".form-actions").width());
 
 
-    $("#id_delimiter_1").css("margin-left", "4px").attr("placeholder", "${_('Please type your delimiter here')}").hide();
+    $("#id_delimiter_1").css("margin-left", "4px").attr("placeholder", "${_('Type your delimiter here')}").hide();
     $("#id_delimiter_0").change(function () {
     $("#id_delimiter_0").change(function () {
       if ($(this).val() == "__other__") {
       if ($(this).val() == "__other__") {
         $("#id_delimiter_1").show();
         $("#id_delimiter_1").show();

+ 5 - 5
apps/beeswax/src/beeswax/templates/choose_file.mako

@@ -50,7 +50,7 @@ ${ commonheader(_('Create table from file'), 'metastore', user) | n,unicode }
                             ${comps.field(file_form["name"], placeholder=_('table_name'), show_errors=False)}
                             ${comps.field(file_form["name"], placeholder=_('table_name'), show_errors=False)}
                             <span  class="help-inline">${unicode(file_form["name"].errors) | n}</span>
                             <span  class="help-inline">${unicode(file_form["name"].errors) | n}</span>
                         <span class="help-block">
                         <span class="help-block">
-                            ${_('Name of the new table. Table names must be globally unique. Table names tend to correspond as well to the directory where the data will be stored.')}
+                            ${_('Name of the new table. Table names must be globally unique. Table names tend to correspond to the directory where the data will be stored.')}
                         </span>
                         </span>
                         </div>
                         </div>
                     </div>
                     </div>
@@ -64,7 +64,7 @@ ${ commonheader(_('Create table from file'), 'metastore', user) | n,unicode }
                             )}
                             )}
                             <span  class="help-inline">${unicode(file_form["comment"].errors) | n}</span>
                             <span  class="help-inline">${unicode(file_form["comment"].errors) | n}</span>
                         <span class="help-block">
                         <span class="help-block">
-                        ${_("Use a table comment to describe your table.  For example, you might note the data's provenance and any caveats users need to know.")}
+                        ${_("Use a table comment to describe the table.  For example, note the data's provenance and any caveats users need to know.")}
                         </span>
                         </span>
                         </div>
                         </div>
                     </div>
                     </div>
@@ -79,7 +79,7 @@ ${ commonheader(_('Create table from file'), 'metastore', user) | n,unicode }
                             )}
                             )}
                             <span  class="help-inline">${unicode(file_form["path"].errors) | n}</span>
                             <span  class="help-inline">${unicode(file_form["path"].errors) | n}</span>
                         <span class="help-block">
                         <span class="help-block">
-                        ${_('The HDFS path to the file that you would like to base this new table definition on. It can be compressed (gzip) or not.')}
+                        ${_('The HDFS path to the file on which to base this new table definition. It can be compressed (gzip) or not.')}
                         </span>
                         </span>
                         </div>
                         </div>
                     </div>
                     </div>
@@ -88,9 +88,9 @@ ${ commonheader(_('Create table from file'), 'metastore', user) | n,unicode }
                         <div class="controls">
                         <div class="controls">
                             ${comps.field(file_form["do_import"], render_default=True)}
                             ${comps.field(file_form["do_import"], render_default=True)}
                             <span class="help-block">
                             <span class="help-block">
-                        ${_('Check this box if you want to import the data in this file after creating the table definition. Leave it unchecked if you want to define an empty table.')}
+                        ${_('Check this box to import the data in this file after creating the table definition. Leave it unchecked to define an empty table.')}
                         <div id="fileWillBeMoved" class="alert">
                         <div id="fileWillBeMoved" class="alert">
-                            <strong>${_('Warning!')}</strong> ${_('The selected file is going to be moved during the import.')}
+                            <strong>${_('Warning:')}</strong> ${_('The selected file is going to be moved during the import.')}
                         </div>
                         </div>
                         </span>
                         </span>
                         </div>
                         </div>

+ 1 - 1
apps/beeswax/src/beeswax/templates/configuration.mako

@@ -29,7 +29,7 @@ ${layout.menubar(section='configuration')}
 	<div class="well">
 	<div class="well">
 		<form class="form-search" method="POST">
 		<form class="form-search" method="POST">
 		    <span class="pull-left">
 		    <span class="pull-left">
-                <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${_('Search for key, value, etc...')}">
+                <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${_('Search for key, value, etc.')}">
 		        <a href="#" id="clearFilterBtn" class="btn">${_('Clear')}</a>
 		        <a href="#" id="clearFilterBtn" class="btn">${_('Clear')}</a>
 		    </span>
 		    </span>
 		</form>
 		</form>

+ 3 - 3
apps/beeswax/src/beeswax/templates/create_database.mako

@@ -55,7 +55,7 @@ ${ commonheader(_("Create database"), 'metastore', user) | n,unicode }
                           )}
                           )}
                           <span  class="help-inline error-inline hide">${_('This field is required. Spaces are not allowed.')}</span>
                           <span  class="help-inline error-inline hide">${_('This field is required. Spaces are not allowed.')}</span>
                           <p class="help-block">
                           <p class="help-block">
-                              ${_('Name of the new database. Database names must be globally unique. Database names tend to correspond as well to the directory where the data will be stored.')}
+                              ${_('Name of the new database. Database names must be globally unique. Database names tend to correspond to the directory where the data will be stored.')}
                           </p>
                           </p>
                       </div>
                       </div>
                   </div>
                   </div>
@@ -67,7 +67,7 @@ ${ commonheader(_("Create database"), 'metastore', user) | n,unicode }
                             )
                             )
                           )}
                           )}
                           <p class="help-block">
                           <p class="help-block">
-                              ${_("Use a database comment to describe your database. For example, you might note the data's provenance and any caveats users need to know.")}
+                              ${_("Use a database comment to describe the database. For example, note the data's provenance and any caveats users need to know.")}
                           </p>
                           </p>
                       </div>
                       </div>
                   </div>
                   </div>
@@ -104,7 +104,7 @@ ${ commonheader(_("Create database"), 'metastore', user) | n,unicode }
                         )}
                         )}
                         <span  class="help-inline error-inline hide">${_('This field is required.')}</span>
                         <span  class="help-inline error-inline hide">${_('This field is required.')}</span>
                         <span class="help-block">
                         <span class="help-block">
-                        ${_("Enter the path (on HDFS) to your database's data location")}
+                        ${_("Enter the path (on HDFS) to your database's data location.")}
                         </span>
                         </span>
                     </div>
                     </div>
                 </div>
                 </div>

+ 5 - 5
apps/beeswax/src/beeswax/templates/create_table_manually.mako

@@ -60,7 +60,7 @@ ${ commonheader(_("Create table manually"), 'metastore', user) | n,unicode }
                   )}
                   )}
                   <span  class="help-inline error-inline hide">${_('This field is required. Spaces are not allowed.')}</span>
                   <span  class="help-inline error-inline hide">${_('This field is required. Spaces are not allowed.')}</span>
                   <p class="help-block">
                   <p class="help-block">
-                      ${_('Name of the new table. Table names must be globally unique. Table names tend to correspond as well to the directory where the data will be stored.')}
+                      ${_('Name of the new table. Table names must be globally unique. Table names tend to correspond to the directory where the data will be stored.')}
                   </p>
                   </p>
               </div>
               </div>
           </div>
           </div>
@@ -72,7 +72,7 @@ ${ commonheader(_("Create table manually"), 'metastore', user) | n,unicode }
                     )
                     )
                   )}
                   )}
                   <p class="help-block">
                   <p class="help-block">
-                      ${_("Use a table comment to describe your table.  For example, you might note the data's provenance and any caveats users need to know.")}
+                      ${_("Use a table comment to describe your table.  For example, note the data's provenance and any caveats users need to know.")}
                   </p>
                   </p>
               </div>
               </div>
           </div>
           </div>
@@ -82,7 +82,7 @@ ${ commonheader(_("Create table manually"), 'metastore', user) | n,unicode }
   <div id="step2" class="stepDetails hide">
   <div id="step2" class="stepDetails hide">
       <fieldset>
       <fieldset>
           <div class="alert alert-info"><h3>${_('Choose Your Record Format')}</h3>
           <div class="alert alert-info"><h3>${_('Choose Your Record Format')}</h3>
-              ${_("Individual records are broken up into columns either with delimiters (e.g., CSV or TSV) or using a specific serialization / deserialization (SerDe) implementation. (One common specialized SerDe is for parsing out columns with a regular expression.)")}
+              ${_("Individual records are broken up into columns either with delimiters (e.g., CSV or TSV) or using a specific serialization/deserialization (SerDe) implementation. (One common specialized SerDe is for parsing out columns with a regular expression.)")}
           </div>
           </div>
           <%
           <%
               selected = table_form["row_format"].data or table_form["row_format"].field.initial
               selected = table_form["row_format"].data or table_form["row_format"].field.initial
@@ -214,7 +214,7 @@ ${ commonheader(_("Create table manually"), 'metastore', user) | n,unicode }
                       )}
                       )}
                       <span  class="help-inline error-inline hide">${_('This field is required. Spaces are not allowed.')}</span>
                       <span  class="help-inline error-inline hide">${_('This field is required. Spaces are not allowed.')}</span>
                       <span class="help-block">
                       <span class="help-block">
-                          ${_('Java class used to read data')}
+                          ${_('Java class used to read data.')}
                       </span>
                       </span>
                   </div>
                   </div>
               </div>
               </div>
@@ -227,7 +227,7 @@ ${ commonheader(_("Create table manually"), 'metastore', user) | n,unicode }
                       )}
                       )}
                       <span  class="help-inline error-inline hide">${_('This field is required. Spaces are not allowed.')}</span>
                       <span  class="help-inline error-inline hide">${_('This field is required. Spaces are not allowed.')}</span>
                       <span class="help-block">
                       <span class="help-block">
-                          ${_('Java class used to write data')}
+                          ${_('Java class used to write data.')}
                       </span>
                       </span>
                   </div>
                   </div>
               </div>
               </div>

+ 3 - 3
apps/beeswax/src/beeswax/templates/execute.mako

@@ -213,7 +213,7 @@ ${layout.menubar(section='query')}
                           >
                           >
                             <label class="checkbox" rel="tooltip" data-original-title="${_("If checked, you will receive an email notification when the query completes.")}">
                             <label class="checkbox" rel="tooltip" data-original-title="${_("If checked, you will receive an email notification when the query completes.")}">
                                 <input type="checkbox" id="id_${form.query["email_notify"].html_name | n}" name="${form.query["email_notify"].html_name | n}" ${extract_field_data(form.query["email_notify"]) and "CHECKED" or ""}/>
                                 <input type="checkbox" id="id_${form.query["email_notify"].html_name | n}" name="${form.query["email_notify"].html_name | n}" ${extract_field_data(form.query["email_notify"]) and "CHECKED" or ""}/>
-                                ${_("Email me on completion")}
+                                ${_("Email me on completion.")}
                             </label>
                             </label>
                           </li>
                           </li>
                         % if app_name == 'impala':
                         % if app_name == 'impala':
@@ -238,7 +238,7 @@ ${layout.menubar(section='query')}
                                 <ul style="text-align: left;">
                                 <ul style="text-align: left;">
                                   <li>"invalidate metadata" ${ _("invalidates the entire catalog metadata. All table metadata will be reloaded on the next access.") }</li>
                                   <li>"invalidate metadata" ${ _("invalidates the entire catalog metadata. All table metadata will be reloaded on the next access.") }</li>
                                   <li>"invalidate metadata &lt;table&gt;" ${ _("invalidates the metadata, load on the next access") }</li>
                                   <li>"invalidate metadata &lt;table&gt;" ${ _("invalidates the metadata, load on the next access") }</li>
-                                  <li>"refresh &lt;table&gt;" ${ _("refreshes the metadata immediately. It's an incremental refresh. Much faster") }</li>
+                                  <li>"refresh &lt;table&gt;" ${ _("refreshes the metadata immediately. It is a faster, incremental refresh.") }</li>
                                 </ul>
                                 </ul>
                               </div>
                               </div>
                             </div>
                             </div>
@@ -467,7 +467,7 @@ ${layout.menubar(section='query')}
       $("#query-name").editable({
       $("#query-name").editable({
         validate: function (value) {
         validate: function (value) {
           if ($.trim(value) == '') {
           if ($.trim(value) == '') {
-            return "${ _('This field is required') }";
+            return "${ _('This field is required.') }";
           }
           }
         },
         },
         success: successfunction,
         success: successfunction,

+ 1 - 1
apps/beeswax/src/beeswax/templates/list_history.mako

@@ -106,7 +106,7 @@ ${ layout.menubar(section='history') }
 
 
         <%actionbar:render>
         <%actionbar:render>
           <%def name="search()">
           <%def name="search()">
-            <input id="filter" type="text" class="input-xxlarge search-query" placeholder="${_('Search for name, query, etc...')}" value="${ filter }">
+            <input id="filter" type="text" class="input-xxlarge search-query" placeholder="${_('Search for name, query, etc.')}" value="${ filter }">
           </%def>
           </%def>
         </%actionbar:render>
         </%actionbar:render>
 
 

+ 3 - 3
apps/beeswax/src/beeswax/templates/watch_results.mako

@@ -106,7 +106,7 @@ ${layout.menubar(section='query')}
               <form action="${ url(app_name + ':watch_query', query.id) }?context=${ query.design.get_query_context() }" method="POST">
               <form action="${ url(app_name + ':watch_query', query.id) }?context=${ query.design.get_query_context() }" method="POST">
                 <input type="submit" value="${ _("next") }"/ class="btn btn-primary">
                 <input type="submit" value="${ _("next") }"/ class="btn btn-primary">
               </form>
               </form>
-              ${_('for continuing the execution of the remaining statements.') }
+              ${_('to continue execution of the remaining statements.') }
             </div>
             </div>
           % endif
           % endif
 
 
@@ -140,7 +140,7 @@ ${layout.menubar(section='query')}
         <div class="active tab-pane" id="results">
         <div class="active tab-pane" id="results">
             % if error:
             % if error:
               <div class="alert alert-error">
               <div class="alert alert-error">
-                <h3>${_('Error!')}</h3>
+                <h3>${_('Error')}</h3>
                 <pre>${ error_message }</pre>
                 <pre>${ error_message }</pre>
                 % if expired and query_context:
                 % if expired and query_context:
                     <div class="well">
                     <div class="well">
@@ -238,7 +238,7 @@ ${layout.menubar(section='query')}
         <br/>
         <br/>
         <br/>
         <br/>
         <div class="alert alert-warn">
         <div class="alert alert-warn">
-          ${ _('In text with columns separated by ^A and rows separated by newlines. JSON for non primitive type columns.') }
+          ${ _('In text with columns separated by ^A and rows separated by newlines. JSON for non-primitive type columns.') }
         </div>
         </div>
       </span>
       </span>
       <div id="fileChooserModal" class="smallModal well hide">
       <div id="fileChooserModal" class="smallModal well hide">

+ 7 - 7
apps/beeswax/src/beeswax/views.py

@@ -728,14 +728,14 @@ def save_results(request, id):
           redirected = db.create_table_as_a_select(request, query_history, form.cleaned_data['target_table'], result_meta)
           redirected = db.create_table_as_a_select(request, query_history, form.cleaned_data['target_table'], result_meta)
       except Exception, ex:
       except Exception, ex:
         error_msg, log = expand_exception(ex, db)
         error_msg, log = expand_exception(ex, db)
-        raise PopupException(_('The result could not be saved: %s') % log, detail=ex)
+        raise PopupException(_('The result could not be saved: %s.') % log, detail=ex)
 
 
       return redirected
       return redirected
   else:
   else:
     form = beeswax.forms.SaveResultsForm()
     form = beeswax.forms.SaveResultsForm()
 
 
   if error_msg:
   if error_msg:
-    error_msg = _('Failed to save results from query: %(error)s') % {'error': error_msg}
+    error_msg = _('Failed to save results from query: %(error)s.') % {'error': error_msg}
 
 
   return render('save_results.mako', request, {
   return render('save_results.mako', request, {
     'action': reverse(get_app_name(request) + ':save_results', kwargs={'id': str(id)}),
     'action': reverse(get_app_name(request) + ':save_results', kwargs={'id': str(id)}),
@@ -834,7 +834,7 @@ def query_done_cb(request, server_id):
 
 
     design = query_history.design
     design = query_history.design
     user = query_history.owner
     user = query_history.owner
-    subject = _("Beeswax query completed")
+    subject = _("Beeswax query completed.")
 
 
     if design:
     if design:
       subject += ": %s" % (design.name,)
       subject += ": %s" % (design.name,)
@@ -842,7 +842,7 @@ def query_done_cb(request, server_id):
     link = "%s%s" % \
     link = "%s%s" % \
               (get_desktop_uri_prefix(),
               (get_desktop_uri_prefix(),
                reverse(get_app_name(request) + ':watch_query', kwargs={'id': query_history.id}))
                reverse(get_app_name(request) + ':watch_query', kwargs={'id': query_history.id}))
-    body = _("%(subject)s. You may see the results here: %(link)s\n\nQuery:\n%(query)s") % {
+    body = _("%(subject)s. See the results here: %(link)s\n\nQuery:\n%(query)s") % {
                'subject': subject, 'link': link, 'query': query_history.query
                'subject': subject, 'link': link, 'query': query_history.query
              }
              }
 
 
@@ -894,7 +894,7 @@ def authorized_get_design(request, design_id, owner_only=False, must_exist=False
 
 
   if not conf.SHARE_SAVED_QUERIES.get() and (not request.user.is_superuser or owner_only) \
   if not conf.SHARE_SAVED_QUERIES.get() and (not request.user.is_superuser or owner_only) \
       and design.owner != request.user:
       and design.owner != request.user:
-    raise PopupException(_('Cannot access design %(id)s') % {'id': design_id})
+    raise PopupException(_('Cannot access design %(id)s.') % {'id': design_id})
   else:
   else:
     return design
     return design
 
 
@@ -911,7 +911,7 @@ def authorized_get_history(request, query_history_id, owner_only=False, must_exi
 
 
   if not conf.SHARE_SAVED_QUERIES.get() and (not request.user.is_superuser or owner_only) \
   if not conf.SHARE_SAVED_QUERIES.get() and (not request.user.is_superuser or owner_only) \
       and query_history.owner != request.user:
       and query_history.owner != request.user:
-    raise PopupException(_('Cannot access QueryHistory %(id)s') % {'id': query_history_id})
+    raise PopupException(_('Cannot access QueryHistory %(id)s.') % {'id': query_history_id})
   else:
   else:
     return query_history
     return query_history
 
 
@@ -928,7 +928,7 @@ def safe_get_design(request, design_type, design_id=None):
     try:
     try:
       design = models.SavedQuery.get(design_id, request.user, design_type)
       design = models.SavedQuery.get(design_id, request.user, design_type)
     except models.SavedQuery.DoesNotExist:
     except models.SavedQuery.DoesNotExist:
-      messages.error(request, _('Design does not exist'))
+      messages.error(request, _('Design does not exist.'))
 
 
   if design is None:
   if design is None:
     design = models.SavedQuery(owner=request.user, type=design_type)
     design = models.SavedQuery(owner=request.user, type=design_type)

+ 2 - 2
apps/filebrowser/src/filebrowser/templates/listdir.mako

@@ -47,7 +47,7 @@ ${ commonheader(None, 'filebrowser', user) | n,unicode }
                 <span class="caret"></span>
                 <span class="caret"></span>
               </button>
               </button>
               <ul class="dropdown-menu" style="top: auto">
               <ul class="dropdown-menu" style="top: auto">
-                <li><a href="#" title="${_('Change owner / group')}" data-bind="visible: !inTrash(), click: changeOwner, enable: selectedFiles().length > 0"><i class="icon-user"></i> ${_('Change owner / group')}</a></li>
+                <li><a href="#" title="${_('Change owner/group')}" data-bind="visible: !inTrash(), click: changeOwner, enable: selectedFiles().length > 0"><i class="icon-user"></i> ${_('Change owner / group')}</a></li>
                 <li><a href="#" title="${_('Change permissions')}" data-bind="visible: !inTrash(), click: changePermissions, enable: selectedFiles().length > 0"><i class="icon-list-alt"></i> ${_('Change permissions')}</a></li>
                 <li><a href="#" title="${_('Change permissions')}" data-bind="visible: !inTrash(), click: changePermissions, enable: selectedFiles().length > 0"><i class="icon-list-alt"></i> ${_('Change permissions')}</a></li>
               </ul>
               </ul>
             </div>
             </div>
@@ -106,7 +106,7 @@ ${ commonheader(None, 'filebrowser', user) | n,unicode }
 
 
     <div class="scrollable">
     <div class="scrollable">
       <div class="alert alert-warn" data-bind="visible: inTrash">
       <div class="alert alert-warn" data-bind="visible: inTrash">
-        ${ _("You are in Hadoop trash. Your files will be under a checkpoint, or timestamp named, directory.") }
+        ${ _("This is Hadoop trash. Files will be under a checkpoint, or timestamp named, directory.") }
       </div>
       </div>
 
 
       % if breadcrumbs:
       % if breadcrumbs:

+ 1 - 1
apps/filebrowser/src/filebrowser/templates/listdir_components.mako

@@ -260,7 +260,7 @@ from django.utils.translation import ugettext as _
         <form id="chownForm" action="/filebrowser/chown" method="POST" enctype="multipart/form-data" class="form-stacked form-padding-fix">
         <form id="chownForm" action="/filebrowser/chown" method="POST" enctype="multipart/form-data" class="form-stacked form-padding-fix">
             <div class="modal-header">
             <div class="modal-header">
                 <a href="#" class="close" data-dismiss="modal">&times;</a>
                 <a href="#" class="close" data-dismiss="modal">&times;</a>
-                <h3>${_('Change Owner / Group')}</h3>
+                <h3>${_('Change Owner/Group')}</h3>
             </div>
             </div>
             <div class="modal-body change-owner-modal-body clearfix" >
             <div class="modal-body change-owner-modal-body clearfix" >
                 <div class="alert alert-message block-message info">${_('Note: Only the Hadoop superuser, "%(superuser)s" on this file system, may change the owner of a file.') % dict(superuser=superuser)}</div>
                 <div class="alert alert-message block-message info">${_('Note: Only the Hadoop superuser, "%(superuser)s" on this file system, may change the owner of a file.') % dict(superuser=superuser)}</div>

+ 1 - 1
apps/filebrowser/src/filebrowser/templates/saveas.mako

@@ -30,7 +30,7 @@
     % endif
     % endif
     <div class="saveAsPrompt_popup">
     <div class="saveAsPrompt_popup">
       <form method="post" action="${url('filebrowser.views.save_file')}">
       <form method="post" action="${url('filebrowser.views.save_file')}">
-          ${ _('Please enter the location where you would like to save the file.') }
+          ${ _('Enter the location where you would like to save the file.') }
           ${edit.render_field(form["path"], notitle=True)}
           ${edit.render_field(form["path"], notitle=True)}
           <div>${edit.render_field(form["contents"], hidden=True)}</div>
           <div>${edit.render_field(form["contents"], hidden=True)}</div>
           <div>${edit.render_field(form["encoding"], hidden=True)}</div>
           <div>${edit.render_field(form["encoding"], hidden=True)}</div>

+ 11 - 11
apps/filebrowser/src/filebrowser/views.py

@@ -117,9 +117,9 @@ def download(request, path):
     ?disposition={attachment, inline}
     ?disposition={attachment, inline}
     """
     """
     if not request.fs.exists(path):
     if not request.fs.exists(path):
-        raise Http404(_("File not found: %(path)s") % {'path': escape(path)})
+        raise Http404(_("File not found: %(path)s.") % {'path': escape(path)})
     if not request.fs.isfile(path):
     if not request.fs.isfile(path):
-        raise PopupException(_("'%(path)s' is not a file") % {'path': path})
+        raise PopupException(_("'%(path)s' is not a file.") % {'path': path})
 
 
     mimetype = mimetypes.guess_type(path)[0] or 'application/octet-stream'
     mimetype = mimetypes.guess_type(path)[0] or 'application/octet-stream'
     stats = request.fs.stats(path)
     stats = request.fs.stats(path)
@@ -161,7 +161,7 @@ def view(request, path):
     except (IOError, WebHdfsException), e:
     except (IOError, WebHdfsException), e:
         msg = _("Cannot access: %(path)s.") % {'path': escape(path)}
         msg = _("Cannot access: %(path)s.") % {'path': escape(path)}
         if request.user.is_superuser and not request.user == request.fs.superuser:
         if request.user.is_superuser and not request.user == request.fs.superuser:
-            msg += _(' Note: you are a Hue admin but not a HDFS superuser (which is "%(superuser)s").') % {'superuser': request.fs.superuser}
+            msg += _(' Note: You are a Hue admin but not a HDFS superuser (which is "%(superuser)s").') % {'superuser': request.fs.superuser}
         if request.is_ajax():
         if request.is_ajax():
           exception = {
           exception = {
             'error': msg
             'error': msg
@@ -207,7 +207,7 @@ def edit(request, path, form=None):
                 try:
                 try:
                     current_contents = unicode(f.read(), encoding)
                     current_contents = unicode(f.read(), encoding)
                 except UnicodeDecodeError:
                 except UnicodeDecodeError:
-                    raise PopupException(_("File is not encoded in %(encoding)s; cannot be edited: %(path)s") % {'encoding': encoding, 'path': path})
+                    raise PopupException(_("File is not encoded in %(encoding)s; cannot be edited: %(path)s.") % {'encoding': encoding, 'path': path})
             finally:
             finally:
                 f.close()
                 f.close()
         else:
         else:
@@ -616,7 +616,7 @@ def display(request, path):
     if length < 0:
     if length < 0:
         raise PopupException(_("Length may not be less than zero."))
         raise PopupException(_("Length may not be less than zero."))
     if length > MAX_CHUNK_SIZE_BYTES:
     if length > MAX_CHUNK_SIZE_BYTES:
-        raise PopupException(_("Cannot request chunks greater than %(bytes)d bytes") % {'bytes': MAX_CHUNK_SIZE_BYTES})
+        raise PopupException(_("Cannot request chunks greater than %(bytes)d bytes.") % {'bytes': MAX_CHUNK_SIZE_BYTES})
 
 
     # Do not decompress in binary mode.
     # Do not decompress in binary mode.
     if mode == 'binary':
     if mode == 'binary':
@@ -701,7 +701,7 @@ def read_contents(codec_type, path, fs, offset, length):
                     codec_type = 'avro'
                     codec_type = 'avro'
                 elif snappy_installed():
                 elif snappy_installed():
                     if stats.size > MAX_SNAPPY_DECOMPRESSION_SIZE.get():
                     if stats.size > MAX_SNAPPY_DECOMPRESSION_SIZE.get():
-                        raise PopupException(_('Failed to validate snappy compressed file. File size is greater than allowed max snappy decompression size of %d') % MAX_SNAPPY_DECOMPRESSION_SIZE.get())
+                        raise PopupException(_('Failed to validate snappy compressed file. File size is greater than allowed max snappy decompression size of %d.') % MAX_SNAPPY_DECOMPRESSION_SIZE.get())
 
 
                     if detect_snappy(contents + fhandle.read()):
                     if detect_snappy(contents + fhandle.read()):
                         codec_type = 'snappy_avro'
                         codec_type = 'snappy_avro'
@@ -737,10 +737,10 @@ def _decompress_snappy(compressed_content):
 
 
 def _read_snappy_avro(fhandle, path, offset, length, stats):
 def _read_snappy_avro(fhandle, path, offset, length, stats):
     if not snappy_installed():
     if not snappy_installed():
-        raise PopupException(_('Failed to decompress snappy compressed file. Snappy is not installed!'))
+        raise PopupException(_('Failed to decompress snappy compressed file. Snappy is not installed.'))
 
 
     if stats.size > MAX_SNAPPY_DECOMPRESSION_SIZE.get():
     if stats.size > MAX_SNAPPY_DECOMPRESSION_SIZE.get():
-        raise PopupException(_('Failed to decompress snappy compressed file. File size is greater than allowed max snappy decompression size of %d') % MAX_SNAPPY_DECOMPRESSION_SIZE.get())
+        raise PopupException(_('Failed to decompress snappy compressed file. File size is greater than allowed max snappy decompression size of %d.') % MAX_SNAPPY_DECOMPRESSION_SIZE.get())
 
 
     return _read_avro(StringIO(_decompress_snappy(fhandle.read())), path, offset, length, stats)
     return _read_avro(StringIO(_decompress_snappy(fhandle.read())), path, offset, length, stats)
 
 
@@ -1237,9 +1237,9 @@ def upload_archive(request):
         response['data'] = _('A POST request is required.')
         response['data'] = _('A POST request is required.')
 
 
     if response['status'] == 0:
     if response['status'] == 0:
-        request.info(_('%(destination)s upload succeeded') % {'destination': response['path']})
+        request.info(_('%(destination)s upload succeeded.') % {'destination': response['path']})
     else:
     else:
-        request.error(_('Upload failed: %(data)s') % {'data': response['data']})
+        request.error(_('Upload failed: %(data)s.') % {'data': response['data']})
 
 
     return HttpResponse(json.dumps(response), content_type="text/plain")
     return HttpResponse(json.dumps(response), content_type="text/plain")
 
 
@@ -1258,7 +1258,7 @@ def _upload_archive(request):
 
 
         # Always a dir
         # Always a dir
         if request.fs.isdir(form.cleaned_data['dest']) and posixpath.sep in uploaded_file.name:
         if request.fs.isdir(form.cleaned_data['dest']) and posixpath.sep in uploaded_file.name:
-            raise PopupException(_('Sorry, no "%(sep)s" in the filename %(name)s.' % {'sep': posixpath.sep, 'name': uploaded_file.name}))
+            raise PopupException(_('No "%(sep)s" allowed in the filename %(name)s.' % {'sep': posixpath.sep, 'name': uploaded_file.name}))
 
 
         dest = request.fs.join(form.cleaned_data['dest'], uploaded_file.name)
         dest = request.fs.join(form.cleaned_data['dest'], uploaded_file.name)
         try:
         try:

+ 2 - 2
apps/jobbrowser/src/jobbrowser/templates/job.mako

@@ -331,7 +331,7 @@ ${ commonheader(_('Job: %(jobId)s') % dict(jobId=job.jobId_short), "jobbrowser",
 <div id="killModal" class="modal hide fade">
 <div id="killModal" class="modal hide fade">
   <div class="modal-header">
   <div class="modal-header">
     <a href="#" class="close" data-dismiss="modal">&times;</a>
     <a href="#" class="close" data-dismiss="modal">&times;</a>
-    <h3>${_('Please Confirm')}</h3>
+    <h3>${_('Confirm Kill')}</h3>
   </div>
   </div>
   <div class="modal-body">
   <div class="modal-body">
     <p>${_('Are you sure you want to kill this job?')}</p>
     <p>${_('Are you sure you want to kill this job?')}</p>
@@ -423,7 +423,7 @@ $(document).ready(function () {
   $(document).ajaxError(function (event, jqxhr, settings, exception) {
   $(document).ajaxError(function (event, jqxhr, settings, exception) {
     if (jqxhr.status == 500) {
     if (jqxhr.status == 500) {
       window.clearInterval(_runningInterval);
       window.clearInterval(_runningInterval);
-      $.jHueNotify.error("${_('There was a problem communicating with the server. Please refresh the page.')}");
+      $.jHueNotify.error("${_('There was a problem communicating with the server. Refresh the page.')}");
     }
     }
   });
   });
 
 

+ 2 - 2
apps/jobbrowser/src/jobbrowser/templates/jobs.mako

@@ -80,7 +80,7 @@ ${ commonheader(None, "jobbrowser", user) | n,unicode }
 <div id="killModal" class="modal hide fade">
 <div id="killModal" class="modal hide fade">
   <div class="modal-header">
   <div class="modal-header">
     <a href="#" class="close" data-dismiss="modal">&times;</a>
     <a href="#" class="close" data-dismiss="modal">&times;</a>
-    <h3>${_('Please Confirm')}</h3>
+    <h3>${_('Confirm Kill')}</h3>
   </div>
   </div>
   <div class="modal-body">
   <div class="modal-body">
     <p>${_('Are you sure you want to kill this job?')}</p>
     <p>${_('Are you sure you want to kill this job?')}</p>
@@ -130,7 +130,7 @@ ${ commonheader(None, "jobbrowser", user) | n,unicode }
     $(document).ajaxError(function (event, jqxhr, settings, exception) {
     $(document).ajaxError(function (event, jqxhr, settings, exception) {
       if (jqxhr.status == 500) {
       if (jqxhr.status == 500) {
         window.clearInterval(_runningInterval);
         window.clearInterval(_runningInterval);
-        $.jHueNotify.error("${_('There was a problem communicating with the server. Please refresh the page.')}");
+        $.jHueNotify.error("${_('There was a problem communicating with the server. Refresh the page.')}");
       }
       }
     });
     });
 
 

+ 4 - 4
apps/jobbrowser/src/jobbrowser/views.py

@@ -58,7 +58,7 @@ def check_job_permission(view_func):
       raise PopupException(_('Could not find job %s. The job might not be running yet.') % jobid, detail=e)
       raise PopupException(_('Could not find job %s. The job might not be running yet.') % jobid, detail=e)
     if not conf.SHARE_JOBS.get() and not request.user.is_superuser \
     if not conf.SHARE_JOBS.get() and not request.user.is_superuser \
       and job.user != request.user.username:
       and job.user != request.user.username:
-      raise PopupException(_("You don't have the permissions to access job %(id)s.") % {'id': jobid})
+      raise PopupException(_("You don't have permission to access job %(id)s.") % {'id': jobid})
     kwargs['job'] = job
     kwargs['job'] = job
     return view_func(request, *args, **kwargs)
     return view_func(request, *args, **kwargs)
   return wraps(view_func)(decorate)
   return wraps(view_func)(decorate)
@@ -192,7 +192,7 @@ def kill_job(request, job):
     time.sleep(1)
     time.sleep(1)
     job = Job.from_id(jt=request.jt, jobid=job.jobId)
     job = Job.from_id(jt=request.jt, jobid=job.jobId)
 
 
-  raise Exception(_("Job did not appear as killed within 15 seconds"))
+  raise Exception(_("Job did not appear as killed within 15 seconds."))
 
 
 
 
 @check_job_permission
 @check_job_permission
@@ -212,7 +212,7 @@ def job_attempt_logs_json(request, job, attempt_index=0, name='syslog', offset=0
     attempt = job.job_attempts['jobAttempt'][attempt_index]
     attempt = job.job_attempts['jobAttempt'][attempt_index]
     log_link = attempt['logsLink']
     log_link = attempt['logsLink']
   except (KeyError, RestException), e:
   except (KeyError, RestException), e:
-    raise KeyError(_("Cannot find job attempt '%(id)s'") % {'id': job.jobId}, e)
+    raise KeyError(_("Cannot find job attempt '%(id)s'.") % {'id': job.jobId}, e)
 
 
   link = '/%s/' % name
   link = '/%s/' % name
   if offset and int(offset) >= 0:
   if offset and int(offset) >= 0:
@@ -250,7 +250,7 @@ def job_single_logs(request, job):
       task = recent_tasks[0]
       task = recent_tasks[0]
 
 
   if task is None:
   if task is None:
-    raise PopupException(_("No tasks found for job %(id)s") % {'id': job.jobId})
+    raise PopupException(_("No tasks found for job %(id)s.") % {'id': job.jobId})
 
 
   return single_task_attempt_logs(request, **{'job': job.jobId, 'taskid': task.taskId, 'attemptid': task.taskAttemptIds[-1]})
   return single_task_attempt_logs(request, **{'job': job.jobId, 'taskid': task.taskId, 'attemptid': task.taskAttemptIds[-1]})
 
 

+ 3 - 3
apps/jobsub/src/jobsub/templates/designs.mako

@@ -108,7 +108,7 @@ ${ commonheader(None, "jobsub", user, "60px") | n,unicode }
               <a href="#new-design/fs" class="new-node-link" title="${_('Create Fs design')}" rel="tooltip"><i class="icon-plus-sign"></i> Fs</a>
               <a href="#new-design/fs" class="new-node-link" title="${_('Create Fs design')}" rel="tooltip"><i class="icon-plus-sign"></i> Fs</a>
             </li>
             </li>
             <li>
             <li>
-              <a href="#new-design/ssh" class="new-node-link" title="${_('Create Ssh design')}" rel="tooltip"><i class="icon-plus-sign"></i> Ssh</a>
+              <a href="#new-design/ssh" class="new-node-link" title="${_('Create SSH design')}" rel="tooltip"><i class="icon-plus-sign"></i> Ssh</a>
             </li>
             </li>
             <li>
             <li>
               <a href="#new-design/shell" class="new-node-link" title="${_('Create Shell design')}" rel="tooltip"><i class="icon-plus-sign"></i> Shell</a>
               <a href="#new-design/shell" class="new-node-link" title="${_('Create Shell design')}" rel="tooltip"><i class="icon-plus-sign"></i> Shell</a>
@@ -194,7 +194,7 @@ ${ commonheader(None, "jobsub", user, "60px") | n,unicode }
   <form id="destroyWfForm" action="#" method="POST" style="margin:0">
   <form id="destroyWfForm" action="#" method="POST" style="margin:0">
     <div class="modal-header">
     <div class="modal-header">
       <a href="#" class="close" data-dismiss="modal">&times;</a>
       <a href="#" class="close" data-dismiss="modal">&times;</a>
-      <h3 id="destroyWfMessage">${_('Delete the selected designs?')}</h3>
+      <h3 id="destroyWfMessage">${_('Delete selected designs?')}</h3>
     </div>
     </div>
     <div class="modal-footer">
     <div class="modal-footer">
       <a href="#" class="btn" data-dismiss="modal">${_('No')}</a>
       <a href="#" class="btn" data-dismiss="modal">${_('No')}</a>
@@ -220,7 +220,7 @@ ${ commonheader(None, "jobsub", user, "60px") | n,unicode }
   <form id="restoreWfForm" action="#" method="POST" style="margin:0">
   <form id="restoreWfForm" action="#" method="POST" style="margin:0">
     <div class="modal-header">
     <div class="modal-header">
       <a href="#" class="close" data-dismiss="modal">&times;</a>
       <a href="#" class="close" data-dismiss="modal">&times;</a>
-      <h3 id="restoreWfMessage">${_('Restore the selected designs?')}</h3>
+      <h3 id="restoreWfMessage">${_('Restore selected designs?')}</h3>
     </div>
     </div>
     <div class="modal-footer">
     <div class="modal-footer">
       <a href="#" class="btn" data-dismiss="modal">${_('No')}</a>
       <a href="#" class="btn" data-dismiss="modal">${_('No')}</a>

+ 1 - 1
apps/jobsub/src/jobsub/views.py

@@ -254,7 +254,7 @@ def new_design(request, node_type):
 
 
 def clone_design(request, design_id):
 def clone_design(request, design_id):
   if request.method != 'POST':
   if request.method != 'POST':
-    raise StructuredException(code="METHOD_NOT_ALLOWED_ERROR", message=_('Must be POST request.'), error_code=405)
+    raise StructuredException(code="METHOD_NOT_ALLOWED_ERROR", message=_('Must be a POST request.'), error_code=405)
 
 
   workflow = _get_design(design_id)
   workflow = _get_design(design_id)
   clone = workflow.clone(request.fs, request.user)
   clone = workflow.clone(request.fs, request.user)

+ 1 - 1
apps/oozie/src/oozie/forms.py

@@ -287,7 +287,7 @@ class SubWorkflowForm(forms.ModelForm):
     try:
     try:
       return Workflow.objects.get(id=int(self.cleaned_data.get('sub_workflow')))
       return Workflow.objects.get(id=int(self.cleaned_data.get('sub_workflow')))
     except Exception, e:
     except Exception, e:
-      raise ValidationError(_('The sub-workflow could not be found: %s' % e))
+      raise ValidationError(_('The sub-workflow could not be found: %s.' % e))
 
 
 
 
 class GenericForm(forms.ModelForm):
 class GenericForm(forms.ModelForm):

+ 15 - 15
apps/oozie/src/oozie/models.py

@@ -88,14 +88,14 @@ class JobManager(models.Manager):
       if job.is_accessible(request.user):
       if job.is_accessible(request.user):
         return job
         return job
       else:
       else:
-        message = _("Permission denied. %(username)s don't have the permissions to access job %(id)s") % \
+        message = _("Permission denied. %(username)s does not have the permissions required to access job %(id)s") % \
             {'username': request.user.username, 'id': job.id}
             {'username': request.user.username, 'id': job.id}
         access_warn(request, message)
         access_warn(request, message)
         request.error(message)
         request.error(message)
         raise exception_class(message)
         raise exception_class(message)
 
 
     except Job.DoesNotExist:
     except Job.DoesNotExist:
-      raise exception_class(_('job %(id)s not exist') % {'id': job_id})
+      raise exception_class(_('job %(id)s does not exist') % {'id': job_id})
 
 
   def can_edit_or_exception(self, request, job, exception_class=PopupException):
   def can_edit_or_exception(self, request, job, exception_class=PopupException):
     if job.is_editable(request.user):
     if job.is_editable(request.user):
@@ -760,7 +760,7 @@ class Java(Action):
                                        'and they are passed to the main method in the same order.'))
                                        'and they are passed to the main method in the same order.'))
   java_opts = models.CharField(max_length=256, blank=True, verbose_name=_t('Java options'),
   java_opts = models.CharField(max_length=256, blank=True, verbose_name=_t('Java options'),
                                help_text=_t('Command-line parameters used to start the JVM that will execute '
                                help_text=_t('Command-line parameters used to start the JVM that will execute '
-                                            'the Java application. Using this element is equivalent to use the mapred.child.java.opts '
+                                            'the Java application. Using this element is equivalent to using the mapred.child.java.opts '
                                             'configuration property. E.g. -Dexample-property=hue'))
                                             'configuration property. E.g. -Dexample-property=hue'))
   job_properties = models.TextField(default='[]', verbose_name=_t('Hadoop job properties'),
   job_properties = models.TextField(default='[]', verbose_name=_t('Hadoop job properties'),
                                     help_text=_t('For the job configuration (e.g. mapred.job.queue.name=production)'))
                                     help_text=_t('For the job configuration (e.g. mapred.job.queue.name=production)'))
@@ -844,7 +844,7 @@ class Hive(Action):
                                     verbose_name=_t('Hadoop job properties'),
                                     verbose_name=_t('Hadoop job properties'),
                                     help_text=_t('For the job configuration (e.g. mapred.job.queue.name=production)'))
                                     help_text=_t('For the job configuration (e.g. mapred.job.queue.name=production)'))
   prepares = models.TextField(default="[]", verbose_name=_t('Prepares'),
   prepares = models.TextField(default="[]", verbose_name=_t('Prepares'),
-                              help_text=_t('List of absolute paths to delete then to create before starting the application. '
+                              help_text=_t('List of absolute paths to delete, then create, before starting the application. '
                                            'This should be used exclusively for directory cleanup.'))
                                            'This should be used exclusively for directory cleanup.'))
   job_xml = models.CharField(max_length=PATH_MAX, default='', blank=True, verbose_name=_t('Job XML'),
   job_xml = models.CharField(max_length=PATH_MAX, default='', blank=True, verbose_name=_t('Job XML'),
                              help_text=_t('Refer to a Hive hive-site.xml file bundled in the workflow deployment directory. '))
                              help_text=_t('Refer to a Hive hive-site.xml file bundled in the workflow deployment directory. '))
@@ -917,7 +917,7 @@ class Ssh(Action):
   command = models.CharField(max_length=256, verbose_name=_t('%(type)s command') % {'type': node_type.title()},
   command = models.CharField(max_length=256, verbose_name=_t('%(type)s command') % {'type': node_type.title()},
                              help_text=_t('The command that will be executed.'))
                              help_text=_t('The command that will be executed.'))
   params = models.TextField(default="[]", verbose_name=_t('Arguments'),
   params = models.TextField(default="[]", verbose_name=_t('Arguments'),
-                            help_text=_t('The arguments of the %(type)s command')  % {'type': node_type.title()})
+                            help_text=_t('The arguments of the %(type)s command.')  % {'type': node_type.title()})
   capture_output = models.BooleanField(default=False, verbose_name=_t('Capture output'),
   capture_output = models.BooleanField(default=False, verbose_name=_t('Capture output'),
                               help_text=_t('Capture output of the stdout of the %(program)s command execution. The %(program)s '
                               help_text=_t('Capture output of the stdout of the %(program)s command execution. The %(program)s '
                                            'command output must be in Java properties file format and it must not exceed 2KB. '
                                            'command output must be in Java properties file format and it must not exceed 2KB. '
@@ -933,7 +933,7 @@ class Shell(Action):
   node_type = 'shell'
   node_type = 'shell'
 
 
   command = models.CharField(max_length=256, blank=False, verbose_name=_t('%(type)s command') % {'type': node_type.title()},
   command = models.CharField(max_length=256, blank=False, verbose_name=_t('%(type)s command') % {'type': node_type.title()},
-                             help_text=_t('The path of the Shell command to execute'))
+                             help_text=_t('The path of the Shell command to execute.'))
   params = models.TextField(default="[]", verbose_name=_t('Arguments'),
   params = models.TextField(default="[]", verbose_name=_t('Arguments'),
                             help_text=_t('The arguments of Shell command can then be specified using one or more argument element.'))
                             help_text=_t('The arguments of Shell command can then be specified using one or more argument element.'))
   files = models.TextField(default="[]", verbose_name=_t('Files'),
   files = models.TextField(default="[]", verbose_name=_t('Files'),
@@ -1048,8 +1048,8 @@ class SubWorkflow(Action):
   PARAM_FIELDS = ('subworkflow', 'propagate_configuration', 'job_properties')
   PARAM_FIELDS = ('subworkflow', 'propagate_configuration', 'job_properties')
   node_type = 'subworkflow'
   node_type = 'subworkflow'
 
 
-  sub_workflow = models.ForeignKey(Workflow, db_index=True, verbose_name=_t('Sub workflow'),
-                            help_text=_t('The sub workflow application to include. You must own all the sub-workflows.'))
+  sub_workflow = models.ForeignKey(Workflow, db_index=True, verbose_name=_t('Sub-workflow'),
+                            help_text=_t('The sub-workflow application to include. You must own all the sub-workflows.'))
   propagate_configuration = models.BooleanField(default=True, verbose_name=_t('Propagate configuration'), blank=True,
   propagate_configuration = models.BooleanField(default=True, verbose_name=_t('Propagate configuration'), blank=True,
                             help_text=_t('If the workflow job configuration should be propagated to the child workflow.'))
                             help_text=_t('If the workflow job configuration should be propagated to the child workflow.'))
   job_properties = models.TextField(default='[]', verbose_name=_t('Hadoop job properties'),
   job_properties = models.TextField(default='[]', verbose_name=_t('Hadoop job properties'),
@@ -1065,7 +1065,7 @@ class Generic(Action):
 
 
   xml = models.TextField(default='', verbose_name=_t('XML of the custom action'),
   xml = models.TextField(default='', verbose_name=_t('XML of the custom action'),
                          help_text=_t('This will be inserted verbatim in the action %(action)s. '
                          help_text=_t('This will be inserted verbatim in the action %(action)s. '
-                                      'e.g. all the XML content like %(xml_action)s '
+                                      'E.g. all the XML content like %(xml_action)s '
                                       'will be inserted into the action and produce %(full_action)s') % {
                                       'will be inserted into the action and produce %(full_action)s') % {
                                       'action': '&lt;action name="email"&gt;...&lt;/action&gt;',
                                       'action': '&lt;action name="email"&gt;...&lt;/action&gt;',
                                       'xml_action': '&lt;email&gt;&lt;cc&gt;hue@hue.org&lt;/cc&gt;&lt;/email&gt;',
                                       'xml_action': '&lt;email&gt;&lt;cc&gt;hue@hue.org&lt;/cc&gt;&lt;/email&gt;',
@@ -1246,10 +1246,10 @@ class Coordinator(Job):
   workflow = models.ForeignKey(Workflow, null=True, verbose_name=_t('Workflow'),
   workflow = models.ForeignKey(Workflow, null=True, verbose_name=_t('Workflow'),
                                help_text=_t('The workflow to schedule repeatedly.'))
                                help_text=_t('The workflow to schedule repeatedly.'))
   timeout = models.SmallIntegerField(null=True, blank=True, verbose_name=_t('Timeout'),
   timeout = models.SmallIntegerField(null=True, blank=True, verbose_name=_t('Timeout'),
-                                     help_text=_t('How long in minutes the coordinator action will be in '
+                                     help_text=_t('Number of minutes the coordinator action will be in '
                                                   'WAITING or READY status before giving up on its execution.'))
                                                   'WAITING or READY status before giving up on its execution.'))
   concurrency = models.PositiveSmallIntegerField(null=True, blank=True, choices=FREQUENCY_NUMBERS, verbose_name=_t('Concurrency'),
   concurrency = models.PositiveSmallIntegerField(null=True, blank=True, choices=FREQUENCY_NUMBERS, verbose_name=_t('Concurrency'),
-                                 help_text=_t('How many coordinator actions are allowed to run concurrently (RUNNING status) '
+                                 help_text=_t('The number of coordinator actions that are allowed to run concurrently (RUNNING status) '
                                               'before the coordinator engine starts throttling them.'))
                                               'before the coordinator engine starts throttling them.'))
   execution = models.CharField(max_length=10, null=True, blank=True, verbose_name=_t('Execution'),
   execution = models.CharField(max_length=10, null=True, blank=True, verbose_name=_t('Execution'),
                                choices=(('FIFO', _t('FIFO (oldest first) default')),
                                choices=(('FIFO', _t('FIFO (oldest first) default')),
@@ -1261,7 +1261,7 @@ class Coordinator(Job):
                                               'input data, concurrency control or because manual re-runs of coordinator jobs.'))
                                               'input data, concurrency control or because manual re-runs of coordinator jobs.'))
   throttle = models.PositiveSmallIntegerField(null=True, blank=True, choices=FREQUENCY_NUMBERS, verbose_name=_t('Throttle'),
   throttle = models.PositiveSmallIntegerField(null=True, blank=True, choices=FREQUENCY_NUMBERS, verbose_name=_t('Throttle'),
                                  help_text=_t('The materialization or creation throttle value for its coordinator actions. '
                                  help_text=_t('The materialization or creation throttle value for its coordinator actions. '
-                                              'How many maximum coordinator actions are allowed to be in WAITING state concurrently.'))
+                                              'Number of maximum coordinator actions that are allowed to be in WAITING state concurrently.'))
   job_properties = models.TextField(default='[]', verbose_name=_t('Workflow properties'),
   job_properties = models.TextField(default='[]', verbose_name=_t('Workflow properties'),
                                     help_text=_t('Configuration properties to transmit to the workflow, e.g. limit=100, and EL functions, e.g. username=${coord:user()}'))
                                     help_text=_t('Configuration properties to transmit to the workflow, e.g. limit=100, and EL functions, e.g. username=${coord:user()}'))
 
 
@@ -1385,7 +1385,7 @@ class DatasetManager(models.Manager):
       if dataset.coordinator.is_accessible(request.user):
       if dataset.coordinator.is_accessible(request.user):
         return dataset
         return dataset
       else:
       else:
-        message = _("Permission denied. %(username)s don't have the permissions to access dataset %(id)s") % \
+        message = _("Permission denied. %(username)s does not have the permissions to access dataset %(id)s.") % \
             {'username': request.user.username, 'id': dataset.id}
             {'username': request.user.username, 'id': dataset.id}
         access_warn(request, message)
         access_warn(request, message)
         request.error(message)
         request.error(message)
@@ -1418,7 +1418,7 @@ class Dataset(models.Model):
   timezone = models.CharField(max_length=24, choices=TIMEZONES, default='America/Los_Angeles', verbose_name=_t('Timezone'),
   timezone = models.CharField(max_length=24, choices=TIMEZONES, default='America/Los_Angeles', verbose_name=_t('Timezone'),
                               help_text=_t('The timezone of the dataset.'))
                               help_text=_t('The timezone of the dataset.'))
   done_flag = models.CharField(max_length=64, blank=True, default='', verbose_name=_t('Done flag'),
   done_flag = models.CharField(max_length=64, blank=True, default='', verbose_name=_t('Done flag'),
-                               help_text=_t('The done file for the data set. If Done flag is not specified, then Oozie '
+                               help_text=_t('The done file for the data set. If the Done flag is not specified, then Oozie '
                                             'configures Hadoop to create a _SUCCESS file in the output directory. If Done '
                                             'configures Hadoop to create a _SUCCESS file in the output directory. If Done '
                                             'flag is set to empty, then Coordinator looks for the existence of the directory itself.'))
                                             'flag is set to empty, then Coordinator looks for the existence of the directory itself.'))
   coordinator = models.ForeignKey(Coordinator, verbose_name=_t('Coordinator'),
   coordinator = models.ForeignKey(Coordinator, verbose_name=_t('Coordinator'),
@@ -1428,7 +1428,7 @@ class Dataset(models.Model):
   advanced_start_instance  = models.CharField(max_length=128, default='0', verbose_name=_t('Start instance'),
   advanced_start_instance  = models.CharField(max_length=128, default='0', verbose_name=_t('Start instance'),
                                help_text=_t('Shift the frequency for gettting past/future start date or enter verbatim the Oozie start instance, e.g. ${coord:current(0)}'))
                                help_text=_t('Shift the frequency for gettting past/future start date or enter verbatim the Oozie start instance, e.g. ${coord:current(0)}'))
   advanced_end_instance  = models.CharField(max_length=128, blank=True, default='0', verbose_name=_t('End instance'),
   advanced_end_instance  = models.CharField(max_length=128, blank=True, default='0', verbose_name=_t('End instance'),
-                               help_text=_t('Optional: shift the frequency for gettting past/future end dates or enter verbatim the Oozie end instance'))
+                               help_text=_t('Optional: Shift the frequency for gettting past/future end dates or enter verbatim the Oozie end instance.'))
 
 
   objects = DatasetManager()
   objects = DatasetManager()
   unique_together = ('coordinator', 'name')
   unique_together = ('coordinator', 'name')

+ 1 - 1
apps/oozie/src/oozie/templates/editor/action_utils.mako

@@ -59,7 +59,7 @@
             </p>
             </p>
             % if node_type == 'ssh':
             % if node_type == 'ssh':
               <p class="alert alert-warn span5">
               <p class="alert alert-warn span5">
-                ${ _('The ssh server requires passwordless login') }.
+                ${ _('The SSH server requires passwordless login') }.
               </p>
               </p>
             % endif
             % endif
             % if node_type == 'java':
             % if node_type == 'java':

+ 9 - 9
apps/oozie/src/oozie/views/dashboard.py

@@ -88,7 +88,7 @@ def show_oozie_error(view_func):
       detail = ex._headers.get('oozie-error-message', ex)
       detail = ex._headers.get('oozie-error-message', ex)
       if 'urlopen error' in str(detail):
       if 'urlopen error' in str(detail):
         detail = '%s: %s' % (_('The Oozie server is not running'), detail)
         detail = '%s: %s' % (_('The Oozie server is not running'), detail)
-      raise PopupException(_('An error with Oozie occurred.'), detail=detail)
+      raise PopupException(_('An error occurred with Oozie.'), detail=detail)
   return wraps(view_func)(decorate)
   return wraps(view_func)(decorate)
 
 
 
 
@@ -348,7 +348,7 @@ def rerun_oozie_job(request, job_id, app_path):
 
 
       _rerun_workflow(request, job_id, args, mapping)
       _rerun_workflow(request, job_id, args, mapping)
 
 
-      request.info(_('Workflow re-running!'))
+      request.info(_('Workflow re-running.'))
       return redirect(reverse('oozie:list_oozie_workflow', kwargs={'job_id': job_id}))
       return redirect(reverse('oozie:list_oozie_workflow', kwargs={'job_id': job_id}))
     else:
     else:
       request.error(_('Invalid submission form: %s %s' % (rerun_form.errors, params_form.errors)))
       request.error(_('Invalid submission form: %s %s' % (rerun_form.errors, params_form.errors)))
@@ -372,7 +372,7 @@ def _rerun_workflow(request, oozie_id, run_args, mapping):
     job_id = submission.rerun(**run_args)
     job_id = submission.rerun(**run_args)
     return job_id
     return job_id
   except RestException, ex:
   except RestException, ex:
-    raise PopupException(_("Error re-running workflow %s") % (oozie_id,),
+    raise PopupException(_("Error re-running workflow %s.") % (oozie_id,),
                          detail=ex._headers.get('oozie-error-message', ex))
                          detail=ex._headers.get('oozie-error-message', ex))
 
 
 
 
@@ -401,7 +401,7 @@ def rerun_oozie_coordinator(request, job_id, app_path):
 
 
       _rerun_coordinator(request, job_id, args, params, properties)
       _rerun_coordinator(request, job_id, args, params, properties)
 
 
-      request.info(_('Coordinator re-running!'))
+      request.info(_('Coordinator re-running.'))
       return redirect(reverse('oozie:list_oozie_coordinator', kwargs={'job_id': job_id}))
       return redirect(reverse('oozie:list_oozie_coordinator', kwargs={'job_id': job_id}))
     else:
     else:
       request.error(_('Invalid submission form: %s' % (rerun_form.errors,)))
       request.error(_('Invalid submission form: %s' % (rerun_form.errors,)))
@@ -426,7 +426,7 @@ def _rerun_coordinator(request, oozie_id, args, params, properties):
     job_id = submission.rerun_coord(params=params, **args)
     job_id = submission.rerun_coord(params=params, **args)
     return job_id
     return job_id
   except RestException, ex:
   except RestException, ex:
-    raise PopupException(_("Error re-running coordinator %s") % (oozie_id,),
+    raise PopupException(_("Error re-running coordinator %s.") % (oozie_id,),
                          detail=ex._headers.get('oozie-error-message', ex))
                          detail=ex._headers.get('oozie-error-message', ex))
 
 
 
 
@@ -464,7 +464,7 @@ def rerun_oozie_bundle(request, job_id, app_path):
 
 
       _rerun_bundle(request, job_id, args, params, properties)
       _rerun_bundle(request, job_id, args, params, properties)
 
 
-      request.info(_('Bundle re-running!'))
+      request.info(_('Bundle re-running.'))
       return redirect(reverse('oozie:list_oozie_bundle', kwargs={'job_id': job_id}))
       return redirect(reverse('oozie:list_oozie_bundle', kwargs={'job_id': job_id}))
     else:
     else:
       request.error(_('Invalid submission form: %s' % (rerun_form.errors,)))
       request.error(_('Invalid submission form: %s' % (rerun_form.errors,)))
@@ -489,7 +489,7 @@ def _rerun_bundle(request, oozie_id, args, params, properties):
     job_id = submission.rerun_bundle(params=params, **args)
     job_id = submission.rerun_bundle(params=params, **args)
     return job_id
     return job_id
   except RestException, ex:
   except RestException, ex:
-    raise PopupException(_("Error re-running bundle %s") % (oozie_id,),
+    raise PopupException(_("Error re-running bundle %s.") % (oozie_id,),
                          detail=ex._headers.get('oozie-error-message', ex))
                          detail=ex._headers.get('oozie-error-message', ex))
 
 
 
 
@@ -687,7 +687,7 @@ def check_job_access_permission(request, job_id):
       or has_dashboard_jobs_access(request.user):
       or has_dashboard_jobs_access(request.user):
     return oozie_job
     return oozie_job
   else:
   else:
-    message = _("Permission denied. %(username)s don't have the permissions to access job %(id)s.") % \
+    message = _("Permission denied. %(username)s does not have the permissions to access job %(id)s.") % \
         {'username': request.user.username, 'id': oozie_job.id}
         {'username': request.user.username, 'id': oozie_job.id}
     access_warn(request, message)
     access_warn(request, message)
     raise PopupException(message)
     raise PopupException(message)
@@ -697,7 +697,7 @@ def check_job_edition_permission(oozie_job, user):
   if has_job_edition_permission(oozie_job, user):
   if has_job_edition_permission(oozie_job, user):
     return oozie_job
     return oozie_job
   else:
   else:
-    message = _("Permission denied. %(username)s don't have the permissions to modify job %(id)s.") % \
+    message = _("Permission denied. %(username)s does not have the permissions to modify job %(id)s.") % \
         {'username': user.username, 'id': oozie_job.id}
         {'username': user.username, 'id': oozie_job.id}
     raise PopupException(message)
     raise PopupException(message)
 
 

+ 4 - 4
apps/pig/src/pig/templates/app.mako

@@ -553,7 +553,7 @@ ${ commonheader(None, "pig", user, "100px") | n,unicode }
   </div>
   </div>
   <div class="modal-body">
   <div class="modal-body">
     <p>
     <p>
-      ${_('Please give a meaningful name to this script.')}<br/><br/>
+      ${_('Give a meaningful name to this script.')}<br/><br/>
       <label>
       <label>
         ${ _('Script name') } &nbsp;
         ${ _('Script name') } &nbsp;
         <input type="text" class="input-xlarge" data-bind="value: currentScript().name, valueUpdate:'afterkeydown'" />
         <input type="text" class="input-xlarge" data-bind="value: currentScript().name, valueUpdate:'afterkeydown'" />
@@ -589,9 +589,9 @@ ${ commonheader(None, "pig", user, "100px") | n,unicode }
 
 
 <script type="text/javascript" charset="utf-8">
 <script type="text/javascript" charset="utf-8">
   var LABELS = {
   var LABELS = {
-    KILL_ERROR: "${ _('The pig job could not be killed.') }",
-    TOOLTIP_PLAY: "${ _('Run this pig script') }",
-    TOOLTIP_STOP: "${ _('Stop the execution') }",
+    KILL_ERROR: "${ _('The Pig job could not be killed.') }",
+    TOOLTIP_PLAY: "${ _('Run this Pig script.') }",
+    TOOLTIP_STOP: "${ _('Stop execution.') }",
     SAVED: "${ _('Saved') }",
     SAVED: "${ _('Saved') }",
     NEW_SCRIPT_NAME: "${ _('Unsaved script') }",
     NEW_SCRIPT_NAME: "${ _('Unsaved script') }",
     NEW_SCRIPT_CONTENT: "ie. A = LOAD '/user/${ user }/data';",
     NEW_SCRIPT_CONTENT: "ie. A = LOAD '/user/${ user }/data';",

+ 1 - 1
apps/search/src/search/decorators.py

@@ -29,7 +29,7 @@ def allow_admin_only(view_func):
   def decorate(request, *args, **kwargs):
   def decorate(request, *args, **kwargs):
 
 
     if not request.user.is_superuser:
     if not request.user.is_superuser:
-      message = _("Permission denied. You are not an Administrator")
+      message = _("Permission denied. You are not an Administrator.")
       raise PopupException(message)
       raise PopupException(message)
 
 
     return view_func(request, *args, **kwargs)
     return view_func(request, *args, **kwargs)

+ 1 - 1
apps/search/src/search/forms.py

@@ -67,5 +67,5 @@ class CollectionForm(forms.ModelForm):
     searcher = SearchController()
     searcher = SearchController()
     name = self.cleaned_data['name']
     name = self.cleaned_data['name']
     if not searcher.is_collection(name) and not searcher.is_core(name):
     if not searcher.is_collection(name) and not searcher.is_core(name):
-      raise forms.ValidationError(_('No live Solr collection or core by the name %s') % name)
+      raise forms.ValidationError(_('No live Solr collection or core by the name %s.') % name)
     return name
     return name

+ 1 - 1
apps/search/src/search/templates/admin_collection_template.mako

@@ -144,7 +144,7 @@ ${ commonheader(_('Search'), "search", user, "40px") | n,unicode }
 
 
   <%def name="content()">
   <%def name="content()">
     <ul class="nav nav-tabs">
     <ul class="nav nav-tabs">
-      <li class="active"><a href="#visual" data-toggle="tab">${_('Visual editor')}</a></li>
+      <li class="active"><a href="#visual" data-toggle="tab">${_('Visual Editor')}</a></li>
       <li><a href="#preview" data-toggle="tab">${_('Preview')}</a></li>
       <li><a href="#preview" data-toggle="tab">${_('Preview')}</a></li>
       <li><a href="#source" data-toggle="tab">${_('Source')}</a></li>
       <li><a href="#source" data-toggle="tab">${_('Source')}</a></li>
       <li><a href="#extra" data-toggle="tab">${_('Advanced')}</a></li>
       <li><a href="#extra" data-toggle="tab">${_('Advanced')}</a></li>

+ 1 - 1
apps/search/src/search/templates/admin_collections.mako

@@ -49,7 +49,7 @@ ${ commonheader(_('Search'), "search", user, "40px") | n,unicode }
   <div class="row-fluid" data-bind="visible: collections().length == 0 && !isLoading()">
   <div class="row-fluid" data-bind="visible: collections().length == 0 && !isLoading()">
     <div class="span10 offset1 center">
     <div class="span10 offset1 center">
       <i class="icon-plus-sign waiting"></i>
       <i class="icon-plus-sign waiting"></i>
-      <h1 class="emptyMessage">${ _('There are currently no collections defined.') }<br/>${ _('Please click on Import to add one or more.') }</h1>
+      <h1 class="emptyMessage">${ _('There are currently no collections defined.') }<br/>${ _('Click on Import to add one or more.') }</h1>
     </div>
     </div>
   </div>
   </div>
   <div class="row-fluid" data-bind="visible: isLoading()">
   <div class="row-fluid" data-bind="visible: isLoading()">

+ 1 - 1
apps/search/src/search/templates/no_collections.mako

@@ -44,7 +44,7 @@ ${ commonheader(_('Search'), "search", user, "120px") | n,unicode }
     <div class="span10 offset1 center">
     <div class="span10 offset1 center">
 
 
       <i class="icon-search waiting"></i>
       <i class="icon-search waiting"></i>
-      <h1>${ _('Oh no! It seems there is nothing to search on...') }</h1>
+      <h1>${ _('It seems there is nothing to search on ...') }</h1>
 
 
     </div>
     </div>
   </div>
   </div>

+ 1 - 1
apps/search/src/search/views.py

@@ -206,7 +206,7 @@ def admin_collection_properties(request, collection_id):
       hue_collection.save()
       hue_collection.save()
       return redirect(reverse('search:admin_collection_properties', kwargs={'collection_id': hue_collection.id}))
       return redirect(reverse('search:admin_collection_properties', kwargs={'collection_id': hue_collection.id}))
     else:
     else:
-      request.error(_('Errors on the form: %s') % collection_form.errors)
+      request.error(_('Errors on the form: %s.') % collection_form.errors)
   else:
   else:
     collection_form = CollectionForm(instance=hue_collection)
     collection_form = CollectionForm(instance=hue_collection)
 
 

+ 2 - 2
apps/useradmin/src/useradmin/forms.py

@@ -128,13 +128,13 @@ class AddLdapUsersForm(forms.Form):
 
 
     if dn:
     if dn:
       if username_pattern is not None and len(username_pattern) > 64:
       if username_pattern is not None and len(username_pattern) > 64:
-        msg = _('Too long: 64 characters or fewer and not %s') % username_pattern
+        msg = _('Too long: 64 characters or fewer and not %s.') % username_pattern
         errors = self._errors.setdefault('username_pattern', ErrorList())
         errors = self._errors.setdefault('username_pattern', ErrorList())
         errors.append(msg)
         errors.append(msg)
         raise forms.ValidationError(msg)
         raise forms.ValidationError(msg)
     else:
     else:
       if username_pattern is not None and len(username_pattern) > 30:
       if username_pattern is not None and len(username_pattern) > 30:
-        msg = _('Too long: 30 characters or fewer and not %s') % username_pattern
+        msg = _('Too long: 30 characters or fewer and not %s.') % username_pattern
         errors = self._errors.setdefault('username_pattern', ErrorList())
         errors = self._errors.setdefault('username_pattern', ErrorList())
         errors.append(msg)
         errors.append(msg)
         raise forms.ValidationError(msg)
         raise forms.ValidationError(msg)

+ 1 - 1
desktop/core/src/desktop/templates/home.mako

@@ -39,7 +39,7 @@ ${ commonheader(_('Home'), "home", user) | n,unicode }
   <div class="row-fluid">
   <div class="row-fluid">
     <div class="span12">
     <div class="span12">
       <p>
       <p>
-        ${ _('Hue is a Web UI for Apache Hadoop. Please select an application below.') }
+        ${ _('Hue is a Web UI for Apache Hadoop. Select an application below.') }
       </p>
       </p>
     </div>
     </div>
   </div>
   </div>