Browse Source

[metastore] Rename catalog app to metastore app

Romain Rigaux 12 years ago
parent
commit
09a34b96db
40 changed files with 963 additions and 963 deletions
  1. 2 2
      apps/Makefile
  2. 1 1
      apps/beeswax/src/beeswax/create_database.py
  3. 2 2
      apps/beeswax/src/beeswax/create_table.py
  4. 1 1
      apps/beeswax/src/beeswax/templates/util.mako
  5. 5 5
      apps/beeswax/src/beeswax/tests.py
  6. 2 2
      apps/beeswax/src/beeswax/views.py
  7. 0 2
      apps/catalog/babel.cfg
  8. 0 272
      apps/catalog/src/catalog/locale/en_US.pot
  9. 0 0
      apps/metastore/.gitignore
  10. 1 1
      apps/metastore/Makefile
  11. 2 0
      apps/metastore/babel.cfg
  12. 0 0
      apps/metastore/hueversion.py
  13. 2 2
      apps/metastore/setup.py
  14. 0 0
      apps/metastore/src/metastore/__init__.py
  15. 0 0
      apps/metastore/src/metastore/forms.py
  16. 73 73
      apps/metastore/src/metastore/locale/de/LC_MESSAGES/django.po
  17. 272 0
      apps/metastore/src/metastore/locale/en_US.pot
  18. 73 73
      apps/metastore/src/metastore/locale/es/LC_MESSAGES/django.po
  19. 73 73
      apps/metastore/src/metastore/locale/fr/LC_MESSAGES/django.po
  20. 73 73
      apps/metastore/src/metastore/locale/ja/LC_MESSAGES/django.po
  21. 73 73
      apps/metastore/src/metastore/locale/ko/LC_MESSAGES/django.po
  22. 73 73
      apps/metastore/src/metastore/locale/pt/LC_MESSAGES/django.po
  23. 73 73
      apps/metastore/src/metastore/locale/pt_BR/LC_MESSAGES/django.po
  24. 73 73
      apps/metastore/src/metastore/locale/zh_CN/LC_MESSAGES/django.po
  25. 0 0
      apps/metastore/src/metastore/models.py
  26. 2 2
      apps/metastore/src/metastore/settings.py
  27. 1 1
      apps/metastore/src/metastore/templates/components.mako
  28. 0 0
      apps/metastore/src/metastore/templates/confirm.html
  29. 6 6
      apps/metastore/src/metastore/templates/databases.mako
  30. 3 3
      apps/metastore/src/metastore/templates/describe_partitions.mako
  31. 6 6
      apps/metastore/src/metastore/templates/describe_table.mako
  32. 1 1
      apps/metastore/src/metastore/templates/popups/load_data.mako
  33. 8 8
      apps/metastore/src/metastore/templates/tables.mako
  34. 0 0
      apps/metastore/src/metastore/templates/util.mako
  35. 20 20
      apps/metastore/src/metastore/tests.py
  36. 1 1
      apps/metastore/src/metastore/urls.py
  37. 11 11
      apps/metastore/src/metastore/views.py
  38. 0 0
      apps/metastore/static/art/table-browser-24-1.png
  39. 0 0
      apps/metastore/static/css/metastore.css
  40. 30 30
      apps/metastore/static/help/index.html

+ 2 - 2
apps/Makefile

@@ -32,7 +32,7 @@ default: env-install
 
 APPS := about \
   beeswax \
-  catalog \
+  metastore \
   filebrowser \
   help \
   jobbrowser \
@@ -105,7 +105,7 @@ ext-clean: $(EXT_CLEAN_TARGETS)
 ################################################
 I18N_APPS := about \
   beeswax \
-  catalog \
+  metastore \
   filebrowser \
   jobbrowser \
   jobsub \

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

@@ -48,7 +48,7 @@ def create_database(request):
       # Mako outputs bytestring in utf8
       proposed_query = proposed_query.decode('utf-8')
       query = hql_query(proposed_query)
-      return execute_directly(request, query, on_success_url=reverse('catalog:databases'))
+      return execute_directly(request, query, on_success_url=reverse('metastore:databases'))
   else:
     form = CreateDatabaseForm()
 

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

@@ -268,7 +268,7 @@ def _submit_create_and_load(request, create_hql, table_name, path, do_load, data
     on_success_params['path'] = path
     on_success_url = reverse(app_name + ':load_after_create', kwargs={'database': database})
   else:
-    on_success_url = reverse('catalog:describe_table', kwargs={'database': database, 'table': table_name})
+    on_success_url = reverse('metastore:describe_table', kwargs={'database': database, 'table': table_name})
 
   query = hql_query(create_hql, database=database)
   return execute_directly(request, query,
@@ -463,6 +463,6 @@ def load_after_create(request, database):
   hql = "LOAD DATA INPATH '%s' INTO TABLE `%s.%s`" % (path, database, tablename)
   query = hql_query(hql)
   app_name = get_app_name(request)
-  on_success_url = reverse('catalog:describe_table', kwargs={'database': database, 'table': tablename})
+  on_success_url = reverse('metastore:describe_table', kwargs={'database': database, 'table': tablename})
 
   return execute_directly(request, query, on_success_url=on_success_url)

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

@@ -59,7 +59,7 @@ from django.utils.translation import ugettext as _
   % if query_context:
     % if query_context[0] == 'table':
       <% tablename, database = query_context[1].split(':') %>
-      <a href="${ url('catalog:describe_table', database, tablename) }">${tablename}</a>
+      <a href="${ url('metastore:describe_table', database, tablename) }">${tablename}</a>
     % elif query_context[0] == 'design':
       <% design = query_context[1] %>
       % if design.is_auto:

+ 5 - 5
apps/beeswax/src/beeswax/tests.py

@@ -811,7 +811,7 @@ for x in sys.stdin:
     self.client.post('/beeswax/install_examples')
 
     # New tables exists
-    resp = self.client.get('/catalog/tables/')
+    resp = self.client.get('/metastore/tables/')
     assert_true('sample_08' in resp.content)
     assert_true('sample_07' in resp.content)
 
@@ -879,7 +879,7 @@ for x in sys.stdin:
           STORED AS TextFile LOCATION "/tmp/foo"
     """, resp.context['query'].query)
 
-    assert_true('on_success_url=%2Fcatalog%2Ftable%2Fdefault%2Fmy_table' in resp.context['fwd_params'], resp.context['fwd_params'])
+    assert_true('on_success_url=%2Fmetastore%2Ftable%2Fdefault%2Fmy_table' in resp.context['fwd_params'], resp.context['fwd_params'])
 
   def test_create_table_timestamp(self):
     # Check form
@@ -893,14 +893,14 @@ for x in sys.stdin:
     self._make_custom_data_file(filename, [0, 0, 0])
     self._make_table('timestamp_invalid_data', 'CREATE TABLE timestamp_invalid_data (timestamp1 TIMESTAMP)', filename)
 
-    response = self.client.get("/catalog/table/default/timestamp_invalid_data")
+    response = self.client.get("/metastore/table/default/timestamp_invalid_data")
     assert_true('Error!' in response.content, response.content)
 
     # Good format
     self._make_custom_data_file(filename, ['2012-01-01 10:11:30', '2012-01-01 10:11:31'])
     self._make_table('timestamp_valid_data', 'CREATE TABLE timestamp_valid_data (timestamp1 TIMESTAMP)', filename)
 
-    response = self.client.get("/catalog/table/default/timestamp_valid_data")
+    response = self.client.get("/metastore/table/default/timestamp_valid_data")
     assert_true('2012-01-01 10:11:30' in response.content, response.content)
 
   def test_partitioned_create_table(self):
@@ -1081,7 +1081,7 @@ for x in sys.stdin:
     resp = wait_for_query_to_finish(self.client, resp, max=180.0)
 
     # Check data is in the table (by describing it)
-    resp = self.client.get('/catalog/table/default/test_create_import')
+    resp = self.client.get('/metastore/table/default/test_create_import')
     cols = resp.context['table'].cols
     assert_equal(len(cols), 3)
     assert_equal([ col.name for col in cols ], [ 'col_a', 'col_b', 'col_c' ])

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

@@ -765,7 +765,7 @@ def _save_results_ctas(request, query_history, target_table, result_meta):
     hql = 'CREATE TABLE `%s` AS SELECT * FROM %s' % (target_table, result_meta.in_tablename)
     query = hql_query(hql)
     # Display the CTAS running. Could take a long time.
-    return execute_directly(request, query, query_server, on_success_url=reverse('catalog:index'))
+    return execute_directly(request, query, query_server, on_success_url=reverse('metastore:index'))
 
   # Case 2: The results are in some temporary location
   # 1. Create table
@@ -813,7 +813,7 @@ def _save_results_ctas(request, query_history, target_table, result_meta):
     raise ex
 
   # Show tables upon success
-  return format_preserving_redirect(request, reverse('catalog:index'))
+  return format_preserving_redirect(request, reverse('metastore:index'))
 
 
 def confirm_query(request, query, on_success_url=None):

+ 0 - 2
apps/catalog/babel.cfg

@@ -1,2 +0,0 @@
-[python: src/catalog/**.py]
-[mako: src/catalog/templates/**.mako]

+ 0 - 272
apps/catalog/src/catalog/locale/en_US.pot

@@ -1,272 +0,0 @@
-# Translations template for Hue.
-# Copyright (C) 2013 Cloudera, Inc
-# This file is distributed under the same license as the Hue project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: Hue VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-03-20 17:39-0700\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
-
-#: src/catalog/forms.py:48 src/catalog/templates/describe_partitions.mako:33
-msgid "Path"
-msgstr ""
-
-#: src/catalog/forms.py:49
-msgid "Overwrite?"
-msgstr ""
-
-#: src/catalog/forms.py:62
-#, python-format
-msgid "%(column_name)s (partition key with type %(column_type)s)"
-msgstr ""
-
-#: src/catalog/views.py:109
-#, python-format
-msgid "Failed to remove %(tables)s.  Error: %(error)s"
-msgstr ""
-
-#: src/catalog/views.py:110
-msgid "Beeswax Error"
-msgstr ""
-
-#: src/catalog/views.py:112
-msgid "Do you really want to delete the table(s)?"
-msgstr ""
-
-#: src/catalog/views.py:126
-msgid "Can read table"
-msgstr ""
-
-#: src/catalog/views.py:147
-msgid "Can't load the data: "
-msgstr ""
-
-#: src/catalog/views.py:168
-#, python-format
-msgid "Table '%(table)s' is not partitioned."
-msgstr ""
-
-#: src/catalog/templates/components.mako:198
-msgid "Beginning of List"
-msgstr ""
-
-#: src/catalog/templates/components.mako:199
-msgid "Previous Page"
-msgstr ""
-
-#: src/catalog/templates/components.mako:200
-msgid "Next page"
-msgstr ""
-
-#: src/catalog/templates/components.mako:200
-msgid "Next Page"
-msgstr ""
-
-#: src/catalog/templates/components.mako:201
-msgid "End of List"
-msgstr ""
-
-#: src/catalog/templates/components.mako:203
-#, python-format
-msgid ""
-"Showing %(start)s to %(end)s of %(count)s items, page %(page)s of "
-"%(pages)s"
-msgstr ""
-
-#: src/catalog/templates/describe_partitions.mako:22
-#, python-format
-msgid "Table Partitions: %(tableName)s"
-msgstr ""
-
-#: src/catalog/templates/describe_partitions.mako:25
-msgid "Partitions"
-msgstr ""
-
-#: src/catalog/templates/describe_partitions.mako:51
-msgid "Table has no partitions."
-msgstr ""
-
-#: src/catalog/templates/describe_table.mako:25
-#: src/catalog/templates/tables.mako:51
-msgid "View"
-msgstr ""
-
-#: src/catalog/templates/describe_table.mako:27
-msgid "Table"
-msgstr ""
-
-#: src/catalog/templates/describe_table.mako:29
-#, python-format
-msgid "%s Metadata: %s"
-msgstr ""
-
-#: src/catalog/templates/describe_table.mako:35
-msgid "Name"
-msgstr ""
-
-#: src/catalog/templates/describe_table.mako:36
-msgid "Type"
-msgstr ""
-
-#: src/catalog/templates/describe_table.mako:37
-msgid "Comment"
-msgstr ""
-
-#: src/catalog/templates/describe_table.mako:54
-msgid "Table Metadata:"
-msgstr ""
-
-#: src/catalog/templates/describe_table.mako:59
-#: src/catalog/templates/tables.mako:39
-msgid "Actions"
-msgstr ""
-
-#: src/catalog/templates/describe_table.mako:60
-msgid "Import Data"
-msgstr ""
-
-#: src/catalog/templates/describe_table.mako:61
-#: src/catalog/templates/tables.mako:52
-msgid "Browse Data"
-msgstr ""
-
-#: src/catalog/templates/describe_table.mako:62
-#: src/catalog/templates/tables.mako:53
-msgid "Drop"
-msgstr ""
-
-#: src/catalog/templates/describe_table.mako:63
-msgid "View File Location"
-msgstr ""
-
-#: src/catalog/templates/describe_table.mako:73
-msgid "Columns"
-msgstr ""
-
-#: src/catalog/templates/describe_table.mako:75
-msgid "Partition Columns"
-msgstr ""
-
-#: src/catalog/templates/describe_table.mako:78
-msgid "Sample"
-msgstr ""
-
-#: src/catalog/templates/describe_table.mako:90
-msgid "Show Partitions"
-msgstr ""
-
-#: src/catalog/templates/describe_table.mako:98
-msgid "Error!"
-msgstr ""
-
-#: src/catalog/templates/describe_table.mako:135
-msgid "Drop Table"
-msgstr ""
-
-#: src/catalog/templates/describe_table.mako:142
-#: src/catalog/templates/tables.mako:96 src/catalog/templates/tables.mako:109
-#: src/catalog/templates/popups/load_data.mako:60
-msgid "Cancel"
-msgstr ""
-
-#: src/catalog/templates/describe_table.mako:143
-msgid "Yes, drop this table"
-msgstr ""
-
-#: src/catalog/templates/describe_table.mako:172
-#: src/catalog/templates/describe_table.mako:195
-#: src/catalog/templates/tables.mako:141
-msgid "No data available"
-msgstr ""
-
-#: src/catalog/templates/describe_table.mako:173
-#: src/catalog/templates/describe_table.mako:196
-#: src/catalog/templates/tables.mako:142
-msgid "No matching records"
-msgstr ""
-
-#: src/catalog/templates/layout.mako:34 src/catalog/templates/tables.mako:23
-#: src/catalog/templates/tables.mako:26
-msgid "Tables"
-msgstr ""
-
-#: src/catalog/templates/tables.mako:32
-msgid "database"
-msgstr ""
-
-#: src/catalog/templates/tables.mako:41 src/catalog/templates/tables.mako:88
-msgid "Install samples"
-msgstr ""
-
-#: src/catalog/templates/tables.mako:43
-msgid "Create a new table from a file"
-msgstr ""
-
-#: src/catalog/templates/tables.mako:44
-msgid "Create a new table manually"
-msgstr ""
-
-#: src/catalog/templates/tables.mako:51 src/catalog/templates/tables.mako:52
-msgid "Browse the selected table"
-msgstr ""
-
-#: src/catalog/templates/tables.mako:53
-msgid "Delete the selected tables"
-msgstr ""
-
-#: src/catalog/templates/tables.mako:60
-msgid "Table Name"
-msgstr ""
-
-#: src/catalog/templates/tables.mako:97
-msgid "Yes, install samples"
-msgstr ""
-
-#: src/catalog/templates/tables.mako:106
-msgid "Confirm action"
-msgstr ""
-
-#: src/catalog/templates/tables.mako:110
-msgid "Yes"
-msgstr ""
-
-#: src/catalog/templates/tables.mako:171
-msgid "There was an error processing your request:"
-msgstr ""
-
-#: src/catalog/templates/util.mako:66
-msgid "Unsaved Query"
-msgstr ""
-
-#: src/catalog/templates/util.mako:71
-msgid "Query Results"
-msgstr ""
-
-#: src/catalog/templates/popups/load_data.mako:25
-msgid "Import data"
-msgstr ""
-
-#: src/catalog/templates/popups/load_data.mako:50
-msgid "Overwrite existing data"
-msgstr ""
-
-#: src/catalog/templates/popups/load_data.mako:55
-msgid ""
-"Note that loading data will move data from its location into the table's "
-"storage location."
-msgstr ""
-
-#: src/catalog/templates/popups/load_data.mako:61
-msgid "Submit"
-msgstr ""
-

+ 0 - 0
apps/catalog/.gitignore → apps/metastore/.gitignore


+ 1 - 1
apps/catalog/Makefile → apps/metastore/Makefile

@@ -20,5 +20,5 @@ ifeq ($(ROOT),)
   $(error "Error: Expect the environment variable $$ROOT to point to the Desktop installation")
 endif
 
-APP_NAME = catalog
+APP_NAME = metastore
 include $(ROOT)/Makefile.sdk

+ 2 - 0
apps/metastore/babel.cfg

@@ -0,0 +1,2 @@
+[python: src/metastore/**.py]
+[mako: src/metastore/templates/**.mako]

+ 0 - 0
apps/catalog/hueversion.py → apps/metastore/hueversion.py


+ 2 - 2
apps/catalog/setup.py → apps/metastore/setup.py

@@ -17,7 +17,7 @@ from setuptools import setup, find_packages
 from hueversion import VERSION
 
 setup(
-      name = "catalog",
+      name = "metastore",
       version = VERSION,
       author = "Hue",
       url = 'http://github.com/cloudera/hue',
@@ -25,5 +25,5 @@ setup(
       packages = find_packages('src'),
       package_dir = {'': 'src'},
       install_requires = ['setuptools', 'desktop'],
-      entry_points = { 'desktop.sdk.application': 'catalog=catalog' },
+      entry_points = { 'desktop.sdk.application': 'metastore=metastore' },
 )

+ 0 - 0
apps/catalog/src/catalog/__init__.py → apps/metastore/src/metastore/__init__.py


+ 0 - 0
apps/catalog/src/catalog/forms.py → apps/metastore/src/metastore/forms.py


+ 73 - 73
apps/catalog/src/catalog/locale/de/LC_MESSAGES/django.po → apps/metastore/src/metastore/locale/de/LC_MESSAGES/django.po

@@ -17,251 +17,251 @@ msgstr ""
 "Content-Transfer-Encoding: 8 Bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: src/catalog/forms.py:48 src/catalog/templates/describe_partitions.mako:36
+#: src/metastore/forms.py:48 src/metastore/templates/describe_partitions.mako:36
 msgid "Path"
 msgstr "Pfad"
 
-#: src/catalog/forms.py:49
+#: src/metastore/forms.py:49
 msgid "Overwrite?"
 msgstr "Überschreiben?"
 
-#: src/catalog/forms.py:62
+#: src/metastore/forms.py:62
 #, python-format
 msgid "%(column_name)s (partition key with type %(column_type)s)"
 msgstr "%(column_name)s (Partitionsschlüssel mit Typ %(column_type)s)"
 
-#: src/catalog/views.py:72
+#: src/metastore/views.py:72
 #, fuzzy, python-format
 msgid "Failed to remove %(databases)s.  Error: %(error)s"
 msgstr "%(databases)s konnte nicht entfernt werden. Fehler: %(error)s"
 
-#: src/catalog/views.py:73 src/catalog/views.py:161
+#: src/metastore/views.py:73 src/metastore/views.py:161
 msgid "Beeswax Error"
 msgstr "Beeswax-Fehler"
 
-#: src/catalog/views.py:75
+#: src/metastore/views.py:75
 msgid "Do you really want to delete the database(s)?"
 msgstr "Möchten Sie die Datenbank(en) wirklich löschen?"
 
-#: src/catalog/views.py:160
+#: src/metastore/views.py:160
 #, fuzzy, python-format
 msgid "Failed to remove %(tables)s.  Error: %(error)s"
 msgstr "%(tables)s konnte nicht entfernt werden. Fehler: %(error)s"
 
-#: src/catalog/views.py:163
+#: src/metastore/views.py:163
 msgid "Do you really want to delete the table(s)?"
 msgstr "Möchten Sie die Tabelle(n) wirklich löschen?"
 
-#: src/catalog/views.py:177
+#: src/metastore/views.py:177
 msgid "Can read table"
 msgstr "Tabelle kann gelesen werden"
 
-#: src/catalog/views.py:198
+#: src/metastore/views.py:198
 msgid "Can't load the data: "
 msgstr "Daten können nicht geladen werden: "
 
-#: src/catalog/views.py:219
+#: src/metastore/views.py:219
 #, python-format
 msgid "Table '%(table)s' is not partitioned."
 msgstr "Tabelle '%(table)s' ist nicht partitioniert."
 
-#: src/catalog/templates/components.mako:27
-#: src/catalog/templates/databases.mako:24
-#: src/catalog/templates/databases.mako:27
+#: src/metastore/templates/components.mako:27
+#: src/metastore/templates/databases.mako:24
+#: src/metastore/templates/databases.mako:27
 msgid "Databases"
 msgstr "Datenbanken"
 
-#: src/catalog/templates/databases.mako:33
+#: src/metastore/templates/databases.mako:33
 msgid "Create a new database"
 msgstr "Eine neue Datenbank erstellen"
 
-#: src/catalog/templates/databases.mako:40
+#: src/metastore/templates/databases.mako:40
 msgid "Drop the selected databases"
 msgstr "Ausgewählte Datenbanken ablegen"
 
-#: src/catalog/templates/databases.mako:40
-#: src/catalog/templates/describe_table.mako:65
-#: src/catalog/templates/tables.mako:51
+#: src/metastore/templates/databases.mako:40
+#: src/metastore/templates/describe_table.mako:65
+#: src/metastore/templates/tables.mako:51
 msgid "Drop"
 msgstr "Ablegen"
 
-#: src/catalog/templates/databases.mako:47
+#: src/metastore/templates/databases.mako:47
 msgid "Database Name"
 msgstr "Datenbankname"
 
-#: src/catalog/templates/databases.mako:74 src/catalog/templates/tables.mako:86
+#: src/metastore/templates/databases.mako:74 src/metastore/templates/tables.mako:86
 msgid "Confirm action"
 msgstr "Aktion bestätigen"
 
-#: src/catalog/templates/databases.mako:77
-#: src/catalog/templates/describe_table.mako:145
-#: src/catalog/templates/tables.mako:89
-#: src/catalog/templates/popups/load_data.mako:60
+#: src/metastore/templates/databases.mako:77
+#: src/metastore/templates/describe_table.mako:145
+#: src/metastore/templates/tables.mako:89
+#: src/metastore/templates/popups/load_data.mako:60
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/catalog/templates/databases.mako:78 src/catalog/templates/tables.mako:90
+#: src/metastore/templates/databases.mako:78 src/metastore/templates/tables.mako:90
 msgid "Yes"
 msgstr "Ja"
 
-#: src/catalog/templates/databases.mako:111
-#: src/catalog/templates/describe_table.mako:177
-#: src/catalog/templates/describe_table.mako:200
-#: src/catalog/templates/tables.mako:123
+#: src/metastore/templates/databases.mako:111
+#: src/metastore/templates/describe_table.mako:177
+#: src/metastore/templates/describe_table.mako:200
+#: src/metastore/templates/tables.mako:123
 msgid "No data available"
 msgstr "Keine Daten verfügbar"
 
-#: src/catalog/templates/databases.mako:112
-#: src/catalog/templates/describe_table.mako:178
-#: src/catalog/templates/describe_table.mako:201
-#: src/catalog/templates/tables.mako:124
+#: src/metastore/templates/databases.mako:112
+#: src/metastore/templates/describe_table.mako:178
+#: src/metastore/templates/describe_table.mako:201
+#: src/metastore/templates/tables.mako:124
 msgid "No matching records"
 msgstr "Keine übereinstimmenden Datensätze"
 
-#: src/catalog/templates/describe_partitions.mako:24
+#: src/metastore/templates/describe_partitions.mako:24
 #, python-format
 msgid "Table Partitions: %(tableName)s"
 msgstr "Tabellenpartitionen: %(tableName)s"
 
-#: src/catalog/templates/describe_partitions.mako:27
+#: src/metastore/templates/describe_partitions.mako:27
 msgid "Partitions"
 msgstr "Partitionen"
 
-#: src/catalog/templates/describe_partitions.mako:54
+#: src/metastore/templates/describe_partitions.mako:54
 msgid "Table has no partitions."
 msgstr "Tabelle weist keine Partitionen auf."
 
-#: src/catalog/templates/describe_table.mako:26
-#: src/catalog/templates/tables.mako:49
+#: src/metastore/templates/describe_table.mako:26
+#: src/metastore/templates/tables.mako:49
 msgid "View"
 msgstr "Ansicht"
 
-#: src/catalog/templates/describe_table.mako:28
-#: src/catalog/templates/describe_table.mako:55
+#: src/metastore/templates/describe_table.mako:28
+#: src/metastore/templates/describe_table.mako:55
 msgid "Table"
 msgstr "Tabelle"
 
-#: src/catalog/templates/describe_table.mako:30
+#: src/metastore/templates/describe_table.mako:30
 #, python-format
 msgid "%s : %s"
 msgstr "%s : %s"
 
-#: src/catalog/templates/describe_table.mako:36
+#: src/metastore/templates/describe_table.mako:36
 msgid "Name"
 msgstr "Name"
 
-#: src/catalog/templates/describe_table.mako:37
+#: src/metastore/templates/describe_table.mako:37
 msgid "Type"
 msgstr "Typ"
 
-#: src/catalog/templates/describe_table.mako:38
+#: src/metastore/templates/describe_table.mako:38
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/catalog/templates/describe_table.mako:62
-#: src/catalog/templates/tables.mako:40
+#: src/metastore/templates/describe_table.mako:62
+#: src/metastore/templates/tables.mako:40
 msgid "Actions"
 msgstr "Aktionen"
 
-#: src/catalog/templates/describe_table.mako:63
+#: src/metastore/templates/describe_table.mako:63
 msgid "Import Data"
 msgstr "Daten importieren"
 
-#: src/catalog/templates/describe_table.mako:64
-#: src/catalog/templates/tables.mako:50
+#: src/metastore/templates/describe_table.mako:64
+#: src/metastore/templates/tables.mako:50
 msgid "Browse Data"
 msgstr "Daten durchsuchen"
 
-#: src/catalog/templates/describe_table.mako:66
+#: src/metastore/templates/describe_table.mako:66
 msgid "View File Location"
 msgstr "Speicherort der Datei anzeigen"
 
-#: src/catalog/templates/describe_table.mako:72
+#: src/metastore/templates/describe_table.mako:72
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: src/catalog/templates/describe_table.mako:76
+#: src/metastore/templates/describe_table.mako:76
 msgid "Columns"
 msgstr "Spalten"
 
-#: src/catalog/templates/describe_table.mako:78
+#: src/metastore/templates/describe_table.mako:78
 msgid "Partition Columns"
 msgstr "Partitionsspalten"
 
-#: src/catalog/templates/describe_table.mako:81
+#: src/metastore/templates/describe_table.mako:81
 msgid "Sample"
 msgstr "Beispiel"
 
-#: src/catalog/templates/describe_table.mako:93
+#: src/metastore/templates/describe_table.mako:93
 msgid "Show Partitions"
 msgstr "Partitionen anzeigen"
 
-#: src/catalog/templates/describe_table.mako:101
+#: src/metastore/templates/describe_table.mako:101
 msgid "Error!"
 msgstr "Fehler!"
 
-#: src/catalog/templates/describe_table.mako:138
+#: src/metastore/templates/describe_table.mako:138
 msgid "Drop Table"
 msgstr "Tabelle ablegen"
 
-#: src/catalog/templates/describe_table.mako:146
+#: src/metastore/templates/describe_table.mako:146
 msgid "Yes, drop this table"
 msgstr "Ja, diese Tabelle ablegen"
 
-#: src/catalog/templates/tables.mako:23
+#: src/metastore/templates/tables.mako:23
 msgid "Tables"
 msgstr "Tabellen"
 
-#: src/catalog/templates/tables.mako:26
+#: src/metastore/templates/tables.mako:26
 #, fuzzy, python-format
 msgid "Database %s"
 msgstr "Datenbank %s"
 
-#: src/catalog/templates/tables.mako:33
+#: src/metastore/templates/tables.mako:33
 msgid "database"
 msgstr "Datenbank"
 
-#: src/catalog/templates/tables.mako:41
+#: src/metastore/templates/tables.mako:41
 msgid "Create a new table from a file"
 msgstr "Eine neue Tabelle aus einer Datei erstellen"
 
-#: src/catalog/templates/tables.mako:42
+#: src/metastore/templates/tables.mako:42
 msgid "Create a new table manually"
 msgstr "Eine neue Tabelle manuell erstellen"
 
-#: src/catalog/templates/tables.mako:49 src/catalog/templates/tables.mako:50
+#: src/metastore/templates/tables.mako:49 src/metastore/templates/tables.mako:50
 msgid "Browse the selected table"
 msgstr "Ausgewählte Tabelle durchsuchen"
 
-#: src/catalog/templates/tables.mako:51
+#: src/metastore/templates/tables.mako:51
 msgid "Delete the selected tables"
 msgstr "Ausgewählte Tabellen löschen"
 
-#: src/catalog/templates/tables.mako:58
+#: src/metastore/templates/tables.mako:58
 msgid "Table Name"
 msgstr "Tabellenname"
 
-#: src/catalog/templates/util.mako:66
+#: src/metastore/templates/util.mako:66
 msgid "Unsaved Query"
 msgstr "Nicht gespeicherte Abfrage"
 
-#: src/catalog/templates/util.mako:71
+#: src/metastore/templates/util.mako:71
 msgid "Query Results"
 msgstr "Abfrageergebnisse"
 
-#: src/catalog/templates/popups/load_data.mako:25
+#: src/metastore/templates/popups/load_data.mako:25
 msgid "Import data"
 msgstr "Daten importieren"
 
-#: src/catalog/templates/popups/load_data.mako:50
+#: src/metastore/templates/popups/load_data.mako:50
 msgid "Overwrite existing data"
 msgstr "Bestehende Daten überschreiben"
 
-#: src/catalog/templates/popups/load_data.mako:55
+#: src/metastore/templates/popups/load_data.mako:55
 msgid "Note that loading data will move data from its location into the table's storage location."
 msgstr "Beachten Sie, dass durch Laden Daten von deren Speicherort zum Speicherort der Tabelle verschoben werden."
 
-#: src/catalog/templates/popups/load_data.mako:61
+#: src/metastore/templates/popups/load_data.mako:61
 msgid "Submit"
 msgstr "Übermitteln"
 

+ 272 - 0
apps/metastore/src/metastore/locale/en_US.pot

@@ -0,0 +1,272 @@
+# Translations template for Hue.
+# Copyright (C) 2013 Cloudera, Inc
+# This file is distributed under the same license as the Hue project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Hue VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2013-03-20 17:39-0700\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
+#: src/metastore/forms.py:48 src/metastore/templates/describe_partitions.mako:33
+msgid "Path"
+msgstr ""
+
+#: src/metastore/forms.py:49
+msgid "Overwrite?"
+msgstr ""
+
+#: src/metastore/forms.py:62
+#, python-format
+msgid "%(column_name)s (partition key with type %(column_type)s)"
+msgstr ""
+
+#: src/metastore/views.py:109
+#, python-format
+msgid "Failed to remove %(tables)s.  Error: %(error)s"
+msgstr ""
+
+#: src/metastore/views.py:110
+msgid "Beeswax Error"
+msgstr ""
+
+#: src/metastore/views.py:112
+msgid "Do you really want to delete the table(s)?"
+msgstr ""
+
+#: src/metastore/views.py:126
+msgid "Can read table"
+msgstr ""
+
+#: src/metastore/views.py:147
+msgid "Can't load the data: "
+msgstr ""
+
+#: src/metastore/views.py:168
+#, python-format
+msgid "Table '%(table)s' is not partitioned."
+msgstr ""
+
+#: src/metastore/templates/components.mako:198
+msgid "Beginning of List"
+msgstr ""
+
+#: src/metastore/templates/components.mako:199
+msgid "Previous Page"
+msgstr ""
+
+#: src/metastore/templates/components.mako:200
+msgid "Next page"
+msgstr ""
+
+#: src/metastore/templates/components.mako:200
+msgid "Next Page"
+msgstr ""
+
+#: src/metastore/templates/components.mako:201
+msgid "End of List"
+msgstr ""
+
+#: src/metastore/templates/components.mako:203
+#, python-format
+msgid ""
+"Showing %(start)s to %(end)s of %(count)s items, page %(page)s of "
+"%(pages)s"
+msgstr ""
+
+#: src/metastore/templates/describe_partitions.mako:22
+#, python-format
+msgid "Table Partitions: %(tableName)s"
+msgstr ""
+
+#: src/metastore/templates/describe_partitions.mako:25
+msgid "Partitions"
+msgstr ""
+
+#: src/metastore/templates/describe_partitions.mako:51
+msgid "Table has no partitions."
+msgstr ""
+
+#: src/metastore/templates/describe_table.mako:25
+#: src/metastore/templates/tables.mako:51
+msgid "View"
+msgstr ""
+
+#: src/metastore/templates/describe_table.mako:27
+msgid "Table"
+msgstr ""
+
+#: src/metastore/templates/describe_table.mako:29
+#, python-format
+msgid "%s Metadata: %s"
+msgstr ""
+
+#: src/metastore/templates/describe_table.mako:35
+msgid "Name"
+msgstr ""
+
+#: src/metastore/templates/describe_table.mako:36
+msgid "Type"
+msgstr ""
+
+#: src/metastore/templates/describe_table.mako:37
+msgid "Comment"
+msgstr ""
+
+#: src/metastore/templates/describe_table.mako:54
+msgid "Table Metadata:"
+msgstr ""
+
+#: src/metastore/templates/describe_table.mako:59
+#: src/metastore/templates/tables.mako:39
+msgid "Actions"
+msgstr ""
+
+#: src/metastore/templates/describe_table.mako:60
+msgid "Import Data"
+msgstr ""
+
+#: src/metastore/templates/describe_table.mako:61
+#: src/metastore/templates/tables.mako:52
+msgid "Browse Data"
+msgstr ""
+
+#: src/metastore/templates/describe_table.mako:62
+#: src/metastore/templates/tables.mako:53
+msgid "Drop"
+msgstr ""
+
+#: src/metastore/templates/describe_table.mako:63
+msgid "View File Location"
+msgstr ""
+
+#: src/metastore/templates/describe_table.mako:73
+msgid "Columns"
+msgstr ""
+
+#: src/metastore/templates/describe_table.mako:75
+msgid "Partition Columns"
+msgstr ""
+
+#: src/metastore/templates/describe_table.mako:78
+msgid "Sample"
+msgstr ""
+
+#: src/metastore/templates/describe_table.mako:90
+msgid "Show Partitions"
+msgstr ""
+
+#: src/metastore/templates/describe_table.mako:98
+msgid "Error!"
+msgstr ""
+
+#: src/metastore/templates/describe_table.mako:135
+msgid "Drop Table"
+msgstr ""
+
+#: src/metastore/templates/describe_table.mako:142
+#: src/metastore/templates/tables.mako:96 src/metastore/templates/tables.mako:109
+#: src/metastore/templates/popups/load_data.mako:60
+msgid "Cancel"
+msgstr ""
+
+#: src/metastore/templates/describe_table.mako:143
+msgid "Yes, drop this table"
+msgstr ""
+
+#: src/metastore/templates/describe_table.mako:172
+#: src/metastore/templates/describe_table.mako:195
+#: src/metastore/templates/tables.mako:141
+msgid "No data available"
+msgstr ""
+
+#: src/metastore/templates/describe_table.mako:173
+#: src/metastore/templates/describe_table.mako:196
+#: src/metastore/templates/tables.mako:142
+msgid "No matching records"
+msgstr ""
+
+#: src/metastore/templates/layout.mako:34 src/metastore/templates/tables.mako:23
+#: src/metastore/templates/tables.mako:26
+msgid "Tables"
+msgstr ""
+
+#: src/metastore/templates/tables.mako:32
+msgid "database"
+msgstr ""
+
+#: src/metastore/templates/tables.mako:41 src/metastore/templates/tables.mako:88
+msgid "Install samples"
+msgstr ""
+
+#: src/metastore/templates/tables.mako:43
+msgid "Create a new table from a file"
+msgstr ""
+
+#: src/metastore/templates/tables.mako:44
+msgid "Create a new table manually"
+msgstr ""
+
+#: src/metastore/templates/tables.mako:51 src/metastore/templates/tables.mako:52
+msgid "Browse the selected table"
+msgstr ""
+
+#: src/metastore/templates/tables.mako:53
+msgid "Delete the selected tables"
+msgstr ""
+
+#: src/metastore/templates/tables.mako:60
+msgid "Table Name"
+msgstr ""
+
+#: src/metastore/templates/tables.mako:97
+msgid "Yes, install samples"
+msgstr ""
+
+#: src/metastore/templates/tables.mako:106
+msgid "Confirm action"
+msgstr ""
+
+#: src/metastore/templates/tables.mako:110
+msgid "Yes"
+msgstr ""
+
+#: src/metastore/templates/tables.mako:171
+msgid "There was an error processing your request:"
+msgstr ""
+
+#: src/metastore/templates/util.mako:66
+msgid "Unsaved Query"
+msgstr ""
+
+#: src/metastore/templates/util.mako:71
+msgid "Query Results"
+msgstr ""
+
+#: src/metastore/templates/popups/load_data.mako:25
+msgid "Import data"
+msgstr ""
+
+#: src/metastore/templates/popups/load_data.mako:50
+msgid "Overwrite existing data"
+msgstr ""
+
+#: src/metastore/templates/popups/load_data.mako:55
+msgid ""
+"Note that loading data will move data from its location into the table's "
+"storage location."
+msgstr ""
+
+#: src/metastore/templates/popups/load_data.mako:61
+msgid "Submit"
+msgstr ""
+

+ 73 - 73
apps/catalog/src/catalog/locale/es/LC_MESSAGES/django.po → apps/metastore/src/metastore/locale/es/LC_MESSAGES/django.po

@@ -17,251 +17,251 @@ msgstr ""
 "Content-Transfer-Encoding: 8 bits\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: src/catalog/forms.py:48 src/catalog/templates/describe_partitions.mako:36
+#: src/metastore/forms.py:48 src/metastore/templates/describe_partitions.mako:36
 msgid "Path"
 msgstr "Ruta"
 
-#: src/catalog/forms.py:49
+#: src/metastore/forms.py:49
 msgid "Overwrite?"
 msgstr "¿Sobrescribir?"
 
-#: src/catalog/forms.py:62
+#: src/metastore/forms.py:62
 #, python-format
 msgid "%(column_name)s (partition key with type %(column_type)s)"
 msgstr "%(column_name)s [clave de partición con el tipo %(column_type)s]"
 
-#: src/catalog/views.py:72
+#: src/metastore/views.py:72
 #, fuzzy, python-format
 msgid "Failed to remove %(databases)s.  Error: %(error)s"
 msgstr "Error al quitar %(databases)s. Error: %(error)s"
 
-#: src/catalog/views.py:73 src/catalog/views.py:161
+#: src/metastore/views.py:73 src/metastore/views.py:161
 msgid "Beeswax Error"
 msgstr "Error de Beeswax"
 
-#: src/catalog/views.py:75
+#: src/metastore/views.py:75
 msgid "Do you really want to delete the database(s)?"
 msgstr "¿Está seguro de que desea eliminar las bases de datos?"
 
-#: src/catalog/views.py:160
+#: src/metastore/views.py:160
 #, fuzzy, python-format
 msgid "Failed to remove %(tables)s.  Error: %(error)s"
 msgstr "Error al quitar %(tables)s. Error: %(error)s"
 
-#: src/catalog/views.py:163
+#: src/metastore/views.py:163
 msgid "Do you really want to delete the table(s)?"
 msgstr "¿Está seguro de que desea eliminar la tabla?"
 
-#: src/catalog/views.py:177
+#: src/metastore/views.py:177
 msgid "Can read table"
 msgstr "Tabla de lectura"
 
-#: src/catalog/views.py:198
+#: src/metastore/views.py:198
 msgid "Can't load the data: "
 msgstr "No se pueden cargar los datos: "
 
-#: src/catalog/views.py:219
+#: src/metastore/views.py:219
 #, python-format
 msgid "Table '%(table)s' is not partitioned."
 msgstr "La tabla '%(table)s' no está particionada."
 
-#: src/catalog/templates/components.mako:27
-#: src/catalog/templates/databases.mako:24
-#: src/catalog/templates/databases.mako:27
+#: src/metastore/templates/components.mako:27
+#: src/metastore/templates/databases.mako:24
+#: src/metastore/templates/databases.mako:27
 msgid "Databases"
 msgstr "Bases de datos"
 
-#: src/catalog/templates/databases.mako:33
+#: src/metastore/templates/databases.mako:33
 msgid "Create a new database"
 msgstr "Crear una nueva base de datos"
 
-#: src/catalog/templates/databases.mako:40
+#: src/metastore/templates/databases.mako:40
 msgid "Drop the selected databases"
 msgstr "Descartar las bases de datos seleccionadas"
 
-#: src/catalog/templates/databases.mako:40
-#: src/catalog/templates/describe_table.mako:65
-#: src/catalog/templates/tables.mako:51
+#: src/metastore/templates/databases.mako:40
+#: src/metastore/templates/describe_table.mako:65
+#: src/metastore/templates/tables.mako:51
 msgid "Drop"
 msgstr "Descartar"
 
-#: src/catalog/templates/databases.mako:47
+#: src/metastore/templates/databases.mako:47
 msgid "Database Name"
 msgstr "Nombre de base de datos"
 
-#: src/catalog/templates/databases.mako:74 src/catalog/templates/tables.mako:86
+#: src/metastore/templates/databases.mako:74 src/metastore/templates/tables.mako:86
 msgid "Confirm action"
 msgstr "Confirmar acción"
 
-#: src/catalog/templates/databases.mako:77
-#: src/catalog/templates/describe_table.mako:145
-#: src/catalog/templates/tables.mako:89
-#: src/catalog/templates/popups/load_data.mako:60
+#: src/metastore/templates/databases.mako:77
+#: src/metastore/templates/describe_table.mako:145
+#: src/metastore/templates/tables.mako:89
+#: src/metastore/templates/popups/load_data.mako:60
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/catalog/templates/databases.mako:78 src/catalog/templates/tables.mako:90
+#: src/metastore/templates/databases.mako:78 src/metastore/templates/tables.mako:90
 msgid "Yes"
 msgstr "Sí"
 
-#: src/catalog/templates/databases.mako:111
-#: src/catalog/templates/describe_table.mako:177
-#: src/catalog/templates/describe_table.mako:200
-#: src/catalog/templates/tables.mako:123
+#: src/metastore/templates/databases.mako:111
+#: src/metastore/templates/describe_table.mako:177
+#: src/metastore/templates/describe_table.mako:200
+#: src/metastore/templates/tables.mako:123
 msgid "No data available"
 msgstr "No hay datos disponibles"
 
-#: src/catalog/templates/databases.mako:112
-#: src/catalog/templates/describe_table.mako:178
-#: src/catalog/templates/describe_table.mako:201
-#: src/catalog/templates/tables.mako:124
+#: src/metastore/templates/databases.mako:112
+#: src/metastore/templates/describe_table.mako:178
+#: src/metastore/templates/describe_table.mako:201
+#: src/metastore/templates/tables.mako:124
 msgid "No matching records"
 msgstr "No hay registros coincidentes"
 
-#: src/catalog/templates/describe_partitions.mako:24
+#: src/metastore/templates/describe_partitions.mako:24
 #, python-format
 msgid "Table Partitions: %(tableName)s"
 msgstr "Particiones de tabla: %(tableName)s"
 
-#: src/catalog/templates/describe_partitions.mako:27
+#: src/metastore/templates/describe_partitions.mako:27
 msgid "Partitions"
 msgstr "Particiones"
 
-#: src/catalog/templates/describe_partitions.mako:54
+#: src/metastore/templates/describe_partitions.mako:54
 msgid "Table has no partitions."
 msgstr "Tabla sin particiones"
 
-#: src/catalog/templates/describe_table.mako:26
-#: src/catalog/templates/tables.mako:49
+#: src/metastore/templates/describe_table.mako:26
+#: src/metastore/templates/tables.mako:49
 msgid "View"
 msgstr "Vista"
 
-#: src/catalog/templates/describe_table.mako:28
-#: src/catalog/templates/describe_table.mako:55
+#: src/metastore/templates/describe_table.mako:28
+#: src/metastore/templates/describe_table.mako:55
 msgid "Table"
 msgstr "Tabla"
 
-#: src/catalog/templates/describe_table.mako:30
+#: src/metastore/templates/describe_table.mako:30
 #, python-format
 msgid "%s : %s"
 msgstr "%s : %s"
 
-#: src/catalog/templates/describe_table.mako:36
+#: src/metastore/templates/describe_table.mako:36
 msgid "Name"
 msgstr "Nombre"
 
-#: src/catalog/templates/describe_table.mako:37
+#: src/metastore/templates/describe_table.mako:37
 msgid "Type"
 msgstr "Tipo"
 
-#: src/catalog/templates/describe_table.mako:38
+#: src/metastore/templates/describe_table.mako:38
 msgid "Comment"
 msgstr "Comentario"
 
-#: src/catalog/templates/describe_table.mako:62
-#: src/catalog/templates/tables.mako:40
+#: src/metastore/templates/describe_table.mako:62
+#: src/metastore/templates/tables.mako:40
 msgid "Actions"
 msgstr "Acciones"
 
-#: src/catalog/templates/describe_table.mako:63
+#: src/metastore/templates/describe_table.mako:63
 msgid "Import Data"
 msgstr "Importar datos"
 
-#: src/catalog/templates/describe_table.mako:64
-#: src/catalog/templates/tables.mako:50
+#: src/metastore/templates/describe_table.mako:64
+#: src/metastore/templates/tables.mako:50
 msgid "Browse Data"
 msgstr "Explorar datos"
 
-#: src/catalog/templates/describe_table.mako:66
+#: src/metastore/templates/describe_table.mako:66
 msgid "View File Location"
 msgstr "Ver ubicación de archivo"
 
-#: src/catalog/templates/describe_table.mako:72
+#: src/metastore/templates/describe_table.mako:72
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: src/catalog/templates/describe_table.mako:76
+#: src/metastore/templates/describe_table.mako:76
 msgid "Columns"
 msgstr "Columnas"
 
-#: src/catalog/templates/describe_table.mako:78
+#: src/metastore/templates/describe_table.mako:78
 msgid "Partition Columns"
 msgstr "Columnas de partición"
 
-#: src/catalog/templates/describe_table.mako:81
+#: src/metastore/templates/describe_table.mako:81
 msgid "Sample"
 msgstr "Ejemplo"
 
-#: src/catalog/templates/describe_table.mako:93
+#: src/metastore/templates/describe_table.mako:93
 msgid "Show Partitions"
 msgstr "Mostrar particiones"
 
-#: src/catalog/templates/describe_table.mako:101
+#: src/metastore/templates/describe_table.mako:101
 msgid "Error!"
 msgstr "Error."
 
-#: src/catalog/templates/describe_table.mako:138
+#: src/metastore/templates/describe_table.mako:138
 msgid "Drop Table"
 msgstr "Descartar tabla"
 
-#: src/catalog/templates/describe_table.mako:146
+#: src/metastore/templates/describe_table.mako:146
 msgid "Yes, drop this table"
 msgstr "Sí, descartar esta tabla"
 
-#: src/catalog/templates/tables.mako:23
+#: src/metastore/templates/tables.mako:23
 msgid "Tables"
 msgstr "Tablas"
 
-#: src/catalog/templates/tables.mako:26
+#: src/metastore/templates/tables.mako:26
 #, fuzzy, python-format
 msgid "Database %s"
 msgstr "Base de datos %s"
 
-#: src/catalog/templates/tables.mako:33
+#: src/metastore/templates/tables.mako:33
 msgid "database"
 msgstr "base de datos"
 
-#: src/catalog/templates/tables.mako:41
+#: src/metastore/templates/tables.mako:41
 msgid "Create a new table from a file"
 msgstr "Crear una nueva tabla a partir de un archivo"
 
-#: src/catalog/templates/tables.mako:42
+#: src/metastore/templates/tables.mako:42
 msgid "Create a new table manually"
 msgstr "Crear una nueva tabla manualmente"
 
-#: src/catalog/templates/tables.mako:49 src/catalog/templates/tables.mako:50
+#: src/metastore/templates/tables.mako:49 src/metastore/templates/tables.mako:50
 msgid "Browse the selected table"
 msgstr "Explorar la tabla seleccionada"
 
-#: src/catalog/templates/tables.mako:51
+#: src/metastore/templates/tables.mako:51
 msgid "Delete the selected tables"
 msgstr "Eliminar las tablas seleccionadas"
 
-#: src/catalog/templates/tables.mako:58
+#: src/metastore/templates/tables.mako:58
 msgid "Table Name"
 msgstr "Nombre de tabla"
 
-#: src/catalog/templates/util.mako:66
+#: src/metastore/templates/util.mako:66
 msgid "Unsaved Query"
 msgstr "Consulta sin guardar"
 
-#: src/catalog/templates/util.mako:71
+#: src/metastore/templates/util.mako:71
 msgid "Query Results"
 msgstr "Resultados de la consulta"
 
-#: src/catalog/templates/popups/load_data.mako:25
+#: src/metastore/templates/popups/load_data.mako:25
 msgid "Import data"
 msgstr "Importar datos"
 
-#: src/catalog/templates/popups/load_data.mako:50
+#: src/metastore/templates/popups/load_data.mako:50
 msgid "Overwrite existing data"
 msgstr "Sobrescribir datos existentes"
 
-#: src/catalog/templates/popups/load_data.mako:55
+#: src/metastore/templates/popups/load_data.mako:55
 msgid "Note that loading data will move data from its location into the table's storage location."
 msgstr "Tenga en cuenta que, al cargar los datos, estos se trasladarán de su ubicación a la ubicación de almacenamiento de la tabla."
 
-#: src/catalog/templates/popups/load_data.mako:61
+#: src/metastore/templates/popups/load_data.mako:61
 msgid "Submit"
 msgstr "Enviar"
 

+ 73 - 73
apps/catalog/src/catalog/locale/fr/LC_MESSAGES/django.po → apps/metastore/src/metastore/locale/fr/LC_MESSAGES/django.po

@@ -17,251 +17,251 @@ msgstr ""
 "Content-Transfer-Encoding: 8bits\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: src/catalog/forms.py:48 src/catalog/templates/describe_partitions.mako:36
+#: src/metastore/forms.py:48 src/metastore/templates/describe_partitions.mako:36
 msgid "Path"
 msgstr "Chemin d'accès"
 
-#: src/catalog/forms.py:49
+#: src/metastore/forms.py:49
 msgid "Overwrite?"
 msgstr "Remplacer ?"
 
-#: src/catalog/forms.py:62
+#: src/metastore/forms.py:62
 #, python-format
 msgid "%(column_name)s (partition key with type %(column_type)s)"
 msgstr "%(column_name)s (clé de partition avec type %(column_type)s)"
 
-#: src/catalog/views.py:72
+#: src/metastore/views.py:72
 #, fuzzy, python-format
 msgid "Failed to remove %(databases)s.  Error: %(error)s"
 msgstr "Echec de la suppression de %(databases)s.  Erreur : %(error)s"
 
-#: src/catalog/views.py:73 src/catalog/views.py:161
+#: src/metastore/views.py:73 src/metastore/views.py:161
 msgid "Beeswax Error"
 msgstr "Erreur Beeswax"
 
-#: src/catalog/views.py:75
+#: src/metastore/views.py:75
 msgid "Do you really want to delete the database(s)?"
 msgstr "Voulez-vous vraiment supprimer la ou les base(s) de données ?"
 
-#: src/catalog/views.py:160
+#: src/metastore/views.py:160
 #, fuzzy, python-format
 msgid "Failed to remove %(tables)s.  Error: %(error)s"
 msgstr "Echec de la suppression de %(tables)s.  Erreur : %(error)s"
 
-#: src/catalog/views.py:163
+#: src/metastore/views.py:163
 msgid "Do you really want to delete the table(s)?"
 msgstr "Voulez-vous vraiment supprimer la ou les table(s) ?"
 
-#: src/catalog/views.py:177
+#: src/metastore/views.py:177
 msgid "Can read table"
 msgstr "Impossible de lire la table"
 
-#: src/catalog/views.py:198
+#: src/metastore/views.py:198
 msgid "Can't load the data: "
 msgstr "Impossible de charger les données : "
 
-#: src/catalog/views.py:219
+#: src/metastore/views.py:219
 #, python-format
 msgid "Table '%(table)s' is not partitioned."
 msgstr "La table \"%(table)s\" n'est pas partitionnée."
 
-#: src/catalog/templates/components.mako:27
-#: src/catalog/templates/databases.mako:24
-#: src/catalog/templates/databases.mako:27
+#: src/metastore/templates/components.mako:27
+#: src/metastore/templates/databases.mako:24
+#: src/metastore/templates/databases.mako:27
 msgid "Databases"
 msgstr "Bases de données"
 
-#: src/catalog/templates/databases.mako:33
+#: src/metastore/templates/databases.mako:33
 msgid "Create a new database"
 msgstr "Créer une base de données"
 
-#: src/catalog/templates/databases.mako:40
+#: src/metastore/templates/databases.mako:40
 msgid "Drop the selected databases"
 msgstr "Déposer les bases de données sélectionnées"
 
-#: src/catalog/templates/databases.mako:40
-#: src/catalog/templates/describe_table.mako:65
-#: src/catalog/templates/tables.mako:51
+#: src/metastore/templates/databases.mako:40
+#: src/metastore/templates/describe_table.mako:65
+#: src/metastore/templates/tables.mako:51
 msgid "Drop"
 msgstr "Déposer"
 
-#: src/catalog/templates/databases.mako:47
+#: src/metastore/templates/databases.mako:47
 msgid "Database Name"
 msgstr "Nom de la base de données"
 
-#: src/catalog/templates/databases.mako:74 src/catalog/templates/tables.mako:86
+#: src/metastore/templates/databases.mako:74 src/metastore/templates/tables.mako:86
 msgid "Confirm action"
 msgstr "Confirmer l'action"
 
-#: src/catalog/templates/databases.mako:77
-#: src/catalog/templates/describe_table.mako:145
-#: src/catalog/templates/tables.mako:89
-#: src/catalog/templates/popups/load_data.mako:60
+#: src/metastore/templates/databases.mako:77
+#: src/metastore/templates/describe_table.mako:145
+#: src/metastore/templates/tables.mako:89
+#: src/metastore/templates/popups/load_data.mako:60
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/catalog/templates/databases.mako:78 src/catalog/templates/tables.mako:90
+#: src/metastore/templates/databases.mako:78 src/metastore/templates/tables.mako:90
 msgid "Yes"
 msgstr "Oui"
 
-#: src/catalog/templates/databases.mako:111
-#: src/catalog/templates/describe_table.mako:177
-#: src/catalog/templates/describe_table.mako:200
-#: src/catalog/templates/tables.mako:123
+#: src/metastore/templates/databases.mako:111
+#: src/metastore/templates/describe_table.mako:177
+#: src/metastore/templates/describe_table.mako:200
+#: src/metastore/templates/tables.mako:123
 msgid "No data available"
 msgstr "Aucune donnée disponible"
 
-#: src/catalog/templates/databases.mako:112
-#: src/catalog/templates/describe_table.mako:178
-#: src/catalog/templates/describe_table.mako:201
-#: src/catalog/templates/tables.mako:124
+#: src/metastore/templates/databases.mako:112
+#: src/metastore/templates/describe_table.mako:178
+#: src/metastore/templates/describe_table.mako:201
+#: src/metastore/templates/tables.mako:124
 msgid "No matching records"
 msgstr "Aucun enregistrement correspondant"
 
-#: src/catalog/templates/describe_partitions.mako:24
+#: src/metastore/templates/describe_partitions.mako:24
 #, python-format
 msgid "Table Partitions: %(tableName)s"
 msgstr "Partitions de table : %(tableName)s"
 
-#: src/catalog/templates/describe_partitions.mako:27
+#: src/metastore/templates/describe_partitions.mako:27
 msgid "Partitions"
 msgstr "Partitions"
 
-#: src/catalog/templates/describe_partitions.mako:54
+#: src/metastore/templates/describe_partitions.mako:54
 msgid "Table has no partitions."
 msgstr "La table ne contient aucune partition."
 
-#: src/catalog/templates/describe_table.mako:26
-#: src/catalog/templates/tables.mako:49
+#: src/metastore/templates/describe_table.mako:26
+#: src/metastore/templates/tables.mako:49
 msgid "View"
 msgstr "Afficher"
 
-#: src/catalog/templates/describe_table.mako:28
-#: src/catalog/templates/describe_table.mako:55
+#: src/metastore/templates/describe_table.mako:28
+#: src/metastore/templates/describe_table.mako:55
 msgid "Table"
 msgstr "Table"
 
-#: src/catalog/templates/describe_table.mako:30
+#: src/metastore/templates/describe_table.mako:30
 #, python-format
 msgid "%s : %s"
 msgstr "%s : %s"
 
-#: src/catalog/templates/describe_table.mako:36
+#: src/metastore/templates/describe_table.mako:36
 msgid "Name"
 msgstr "Nom"
 
-#: src/catalog/templates/describe_table.mako:37
+#: src/metastore/templates/describe_table.mako:37
 msgid "Type"
 msgstr "Type"
 
-#: src/catalog/templates/describe_table.mako:38
+#: src/metastore/templates/describe_table.mako:38
 msgid "Comment"
 msgstr "Commentaire"
 
-#: src/catalog/templates/describe_table.mako:62
-#: src/catalog/templates/tables.mako:40
+#: src/metastore/templates/describe_table.mako:62
+#: src/metastore/templates/tables.mako:40
 msgid "Actions"
 msgstr "Actions"
 
-#: src/catalog/templates/describe_table.mako:63
+#: src/metastore/templates/describe_table.mako:63
 msgid "Import Data"
 msgstr "Importer des données"
 
-#: src/catalog/templates/describe_table.mako:64
-#: src/catalog/templates/tables.mako:50
+#: src/metastore/templates/describe_table.mako:64
+#: src/metastore/templates/tables.mako:50
 msgid "Browse Data"
 msgstr "Parcourir les données"
 
-#: src/catalog/templates/describe_table.mako:66
+#: src/metastore/templates/describe_table.mako:66
 msgid "View File Location"
 msgstr "Afficher l'emplacement du fichier"
 
-#: src/catalog/templates/describe_table.mako:72
+#: src/metastore/templates/describe_table.mako:72
 msgid "Comment:"
 msgstr "Commentaire :"
 
-#: src/catalog/templates/describe_table.mako:76
+#: src/metastore/templates/describe_table.mako:76
 msgid "Columns"
 msgstr "Colonnes"
 
-#: src/catalog/templates/describe_table.mako:78
+#: src/metastore/templates/describe_table.mako:78
 msgid "Partition Columns"
 msgstr "Colonnes de partition"
 
-#: src/catalog/templates/describe_table.mako:81
+#: src/metastore/templates/describe_table.mako:81
 msgid "Sample"
 msgstr "Exemple"
 
-#: src/catalog/templates/describe_table.mako:93
+#: src/metastore/templates/describe_table.mako:93
 msgid "Show Partitions"
 msgstr "Afficher les partitions"
 
-#: src/catalog/templates/describe_table.mako:101
+#: src/metastore/templates/describe_table.mako:101
 msgid "Error!"
 msgstr "Erreur !"
 
-#: src/catalog/templates/describe_table.mako:138
+#: src/metastore/templates/describe_table.mako:138
 msgid "Drop Table"
 msgstr "Déposer la table"
 
-#: src/catalog/templates/describe_table.mako:146
+#: src/metastore/templates/describe_table.mako:146
 msgid "Yes, drop this table"
 msgstr "Oui, déposer cette table"
 
-#: src/catalog/templates/tables.mako:23
+#: src/metastore/templates/tables.mako:23
 msgid "Tables"
 msgstr "Tables"
 
-#: src/catalog/templates/tables.mako:26
+#: src/metastore/templates/tables.mako:26
 #, fuzzy, python-format
 msgid "Database %s"
 msgstr "Base de données %s"
 
-#: src/catalog/templates/tables.mako:33
+#: src/metastore/templates/tables.mako:33
 msgid "database"
 msgstr "base de données"
 
-#: src/catalog/templates/tables.mako:41
+#: src/metastore/templates/tables.mako:41
 msgid "Create a new table from a file"
 msgstr "Créer une table à partir d'un fichier"
 
-#: src/catalog/templates/tables.mako:42
+#: src/metastore/templates/tables.mako:42
 msgid "Create a new table manually"
 msgstr "Créer une table manuellement"
 
-#: src/catalog/templates/tables.mako:49 src/catalog/templates/tables.mako:50
+#: src/metastore/templates/tables.mako:49 src/metastore/templates/tables.mako:50
 msgid "Browse the selected table"
 msgstr "Parcourir la table sélectionnée"
 
-#: src/catalog/templates/tables.mako:51
+#: src/metastore/templates/tables.mako:51
 msgid "Delete the selected tables"
 msgstr "Supprimer les tables sélectionnées"
 
-#: src/catalog/templates/tables.mako:58
+#: src/metastore/templates/tables.mako:58
 msgid "Table Name"
 msgstr "Nom de la table"
 
-#: src/catalog/templates/util.mako:66
+#: src/metastore/templates/util.mako:66
 msgid "Unsaved Query"
 msgstr "Requête non enregistrée"
 
-#: src/catalog/templates/util.mako:71
+#: src/metastore/templates/util.mako:71
 msgid "Query Results"
 msgstr "Résultats de la requête"
 
-#: src/catalog/templates/popups/load_data.mako:25
+#: src/metastore/templates/popups/load_data.mako:25
 msgid "Import data"
 msgstr "Importer des données"
 
-#: src/catalog/templates/popups/load_data.mako:50
+#: src/metastore/templates/popups/load_data.mako:50
 msgid "Overwrite existing data"
 msgstr "Remplacer les données existantes"
 
-#: src/catalog/templates/popups/load_data.mako:55
+#: src/metastore/templates/popups/load_data.mako:55
 msgid "Note that loading data will move data from its location into the table's storage location."
 msgstr "Notez que le chargement de données déplacera des données de leur emplacement vers l'emplacement de stockage de la table."
 
-#: src/catalog/templates/popups/load_data.mako:61
+#: src/metastore/templates/popups/load_data.mako:61
 msgid "Submit"
 msgstr "Envoyer"
 

+ 73 - 73
apps/catalog/src/catalog/locale/ja/LC_MESSAGES/django.po → apps/metastore/src/metastore/locale/ja/LC_MESSAGES/django.po

@@ -17,251 +17,251 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: src/catalog/forms.py:48 src/catalog/templates/describe_partitions.mako:36
+#: src/metastore/forms.py:48 src/metastore/templates/describe_partitions.mako:36
 msgid "Path"
 msgstr "パス"
 
-#: src/catalog/forms.py:49
+#: src/metastore/forms.py:49
 msgid "Overwrite?"
 msgstr "上書きしますか?"
 
-#: src/catalog/forms.py:62
+#: src/metastore/forms.py:62
 #, python-format
 msgid "%(column_name)s (partition key with type %(column_type)s)"
 msgstr "%(column_name)s(%(column_type)s タイプのパーティションキー)"
 
-#: src/catalog/views.py:72
+#: src/metastore/views.py:72
 #, fuzzy, python-format
 msgid "Failed to remove %(databases)s.  Error: %(error)s"
 msgstr "%(databases)s を削除できませんでした。エラー:%(error)s"
 
-#: src/catalog/views.py:73 src/catalog/views.py:161
+#: src/metastore/views.py:73 src/metastore/views.py:161
 msgid "Beeswax Error"
 msgstr "Beeswax のエラー"
 
-#: src/catalog/views.py:75
+#: src/metastore/views.py:75
 msgid "Do you really want to delete the database(s)?"
 msgstr "データベースを削除してもよろしいですか?"
 
-#: src/catalog/views.py:160
+#: src/metastore/views.py:160
 #, fuzzy, python-format
 msgid "Failed to remove %(tables)s.  Error: %(error)s"
 msgstr "%(tables)s を削除できませんでした。エラー:%(error)s"
 
-#: src/catalog/views.py:163
+#: src/metastore/views.py:163
 msgid "Do you really want to delete the table(s)?"
 msgstr "テーブルを削除してもよろしいですか?"
 
-#: src/catalog/views.py:177
+#: src/metastore/views.py:177
 msgid "Can read table"
 msgstr "テーブルは読み取り可能"
 
-#: src/catalog/views.py:198
+#: src/metastore/views.py:198
 msgid "Can't load the data: "
 msgstr "データを読み込むことができません: "
 
-#: src/catalog/views.py:219
+#: src/metastore/views.py:219
 #, python-format
 msgid "Table '%(table)s' is not partitioned."
 msgstr "テーブル '%(table)s' はパーティション化されていません。"
 
-#: src/catalog/templates/components.mako:27
-#: src/catalog/templates/databases.mako:24
-#: src/catalog/templates/databases.mako:27
+#: src/metastore/templates/components.mako:27
+#: src/metastore/templates/databases.mako:24
+#: src/metastore/templates/databases.mako:27
 msgid "Databases"
 msgstr "データベース"
 
-#: src/catalog/templates/databases.mako:33
+#: src/metastore/templates/databases.mako:33
 msgid "Create a new database"
 msgstr "新しいデータベースを作成"
 
-#: src/catalog/templates/databases.mako:40
+#: src/metastore/templates/databases.mako:40
 msgid "Drop the selected databases"
 msgstr "選択したデータベースをドロップ"
 
-#: src/catalog/templates/databases.mako:40
-#: src/catalog/templates/describe_table.mako:65
-#: src/catalog/templates/tables.mako:51
+#: src/metastore/templates/databases.mako:40
+#: src/metastore/templates/describe_table.mako:65
+#: src/metastore/templates/tables.mako:51
 msgid "Drop"
 msgstr "ドロップ"
 
-#: src/catalog/templates/databases.mako:47
+#: src/metastore/templates/databases.mako:47
 msgid "Database Name"
 msgstr "データベース名"
 
-#: src/catalog/templates/databases.mako:74 src/catalog/templates/tables.mako:86
+#: src/metastore/templates/databases.mako:74 src/metastore/templates/tables.mako:86
 msgid "Confirm action"
 msgstr "アクションを確認"
 
-#: src/catalog/templates/databases.mako:77
-#: src/catalog/templates/describe_table.mako:145
-#: src/catalog/templates/tables.mako:89
-#: src/catalog/templates/popups/load_data.mako:60
+#: src/metastore/templates/databases.mako:77
+#: src/metastore/templates/describe_table.mako:145
+#: src/metastore/templates/tables.mako:89
+#: src/metastore/templates/popups/load_data.mako:60
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: src/catalog/templates/databases.mako:78 src/catalog/templates/tables.mako:90
+#: src/metastore/templates/databases.mako:78 src/metastore/templates/tables.mako:90
 msgid "Yes"
 msgstr "はい"
 
-#: src/catalog/templates/databases.mako:111
-#: src/catalog/templates/describe_table.mako:177
-#: src/catalog/templates/describe_table.mako:200
-#: src/catalog/templates/tables.mako:123
+#: src/metastore/templates/databases.mako:111
+#: src/metastore/templates/describe_table.mako:177
+#: src/metastore/templates/describe_table.mako:200
+#: src/metastore/templates/tables.mako:123
 msgid "No data available"
 msgstr "利用可能なデータがありません"
 
-#: src/catalog/templates/databases.mako:112
-#: src/catalog/templates/describe_table.mako:178
-#: src/catalog/templates/describe_table.mako:201
-#: src/catalog/templates/tables.mako:124
+#: src/metastore/templates/databases.mako:112
+#: src/metastore/templates/describe_table.mako:178
+#: src/metastore/templates/describe_table.mako:201
+#: src/metastore/templates/tables.mako:124
 msgid "No matching records"
 msgstr "一致するレコードがありません"
 
-#: src/catalog/templates/describe_partitions.mako:24
+#: src/metastore/templates/describe_partitions.mako:24
 #, python-format
 msgid "Table Partitions: %(tableName)s"
 msgstr "テーブルパーティション:%(tableName)s"
 
-#: src/catalog/templates/describe_partitions.mako:27
+#: src/metastore/templates/describe_partitions.mako:27
 msgid "Partitions"
 msgstr "パーティション"
 
-#: src/catalog/templates/describe_partitions.mako:54
+#: src/metastore/templates/describe_partitions.mako:54
 msgid "Table has no partitions."
 msgstr "テーブルにパーティションがありません。"
 
-#: src/catalog/templates/describe_table.mako:26
-#: src/catalog/templates/tables.mako:49
+#: src/metastore/templates/describe_table.mako:26
+#: src/metastore/templates/tables.mako:49
 msgid "View"
 msgstr "表示"
 
-#: src/catalog/templates/describe_table.mako:28
-#: src/catalog/templates/describe_table.mako:55
+#: src/metastore/templates/describe_table.mako:28
+#: src/metastore/templates/describe_table.mako:55
 msgid "Table"
 msgstr "テーブル"
 
-#: src/catalog/templates/describe_table.mako:30
+#: src/metastore/templates/describe_table.mako:30
 #, python-format
 msgid "%s : %s"
 msgstr "%s : %s"
 
-#: src/catalog/templates/describe_table.mako:36
+#: src/metastore/templates/describe_table.mako:36
 msgid "Name"
 msgstr "名前"
 
-#: src/catalog/templates/describe_table.mako:37
+#: src/metastore/templates/describe_table.mako:37
 msgid "Type"
 msgstr "タイプ"
 
-#: src/catalog/templates/describe_table.mako:38
+#: src/metastore/templates/describe_table.mako:38
 msgid "Comment"
 msgstr "コメント"
 
-#: src/catalog/templates/describe_table.mako:62
-#: src/catalog/templates/tables.mako:40
+#: src/metastore/templates/describe_table.mako:62
+#: src/metastore/templates/tables.mako:40
 msgid "Actions"
 msgstr "アクション"
 
-#: src/catalog/templates/describe_table.mako:63
+#: src/metastore/templates/describe_table.mako:63
 msgid "Import Data"
 msgstr "データをインポート"
 
-#: src/catalog/templates/describe_table.mako:64
-#: src/catalog/templates/tables.mako:50
+#: src/metastore/templates/describe_table.mako:64
+#: src/metastore/templates/tables.mako:50
 msgid "Browse Data"
 msgstr "データを参照"
 
-#: src/catalog/templates/describe_table.mako:66
+#: src/metastore/templates/describe_table.mako:66
 msgid "View File Location"
 msgstr "ファイルの場所を表示"
 
-#: src/catalog/templates/describe_table.mako:72
+#: src/metastore/templates/describe_table.mako:72
 msgid "Comment:"
 msgstr "コメント:"
 
-#: src/catalog/templates/describe_table.mako:76
+#: src/metastore/templates/describe_table.mako:76
 msgid "Columns"
 msgstr "列"
 
-#: src/catalog/templates/describe_table.mako:78
+#: src/metastore/templates/describe_table.mako:78
 msgid "Partition Columns"
 msgstr "パーティション列"
 
-#: src/catalog/templates/describe_table.mako:81
+#: src/metastore/templates/describe_table.mako:81
 msgid "Sample"
 msgstr "サンプル"
 
-#: src/catalog/templates/describe_table.mako:93
+#: src/metastore/templates/describe_table.mako:93
 msgid "Show Partitions"
 msgstr "パーティションを表示"
 
-#: src/catalog/templates/describe_table.mako:101
+#: src/metastore/templates/describe_table.mako:101
 msgid "Error!"
 msgstr "エラーが発生しました。"
 
-#: src/catalog/templates/describe_table.mako:138
+#: src/metastore/templates/describe_table.mako:138
 msgid "Drop Table"
 msgstr "テーブルをドロップ"
 
-#: src/catalog/templates/describe_table.mako:146
+#: src/metastore/templates/describe_table.mako:146
 msgid "Yes, drop this table"
 msgstr "はい、このテーブルをドロップします"
 
-#: src/catalog/templates/tables.mako:23
+#: src/metastore/templates/tables.mako:23
 msgid "Tables"
 msgstr "テーブル"
 
-#: src/catalog/templates/tables.mako:26
+#: src/metastore/templates/tables.mako:26
 #, fuzzy, python-format
 msgid "Database %s"
 msgstr "データベース %s"
 
-#: src/catalog/templates/tables.mako:33
+#: src/metastore/templates/tables.mako:33
 msgid "database"
 msgstr "データベース"
 
-#: src/catalog/templates/tables.mako:41
+#: src/metastore/templates/tables.mako:41
 msgid "Create a new table from a file"
 msgstr "ファイルから新しいテーブルを作成"
 
-#: src/catalog/templates/tables.mako:42
+#: src/metastore/templates/tables.mako:42
 msgid "Create a new table manually"
 msgstr "手動で新しいテーブルを作成"
 
-#: src/catalog/templates/tables.mako:49 src/catalog/templates/tables.mako:50
+#: src/metastore/templates/tables.mako:49 src/metastore/templates/tables.mako:50
 msgid "Browse the selected table"
 msgstr "選択したテーブルを参照"
 
-#: src/catalog/templates/tables.mako:51
+#: src/metastore/templates/tables.mako:51
 msgid "Delete the selected tables"
 msgstr "選択したテーブルを削除"
 
-#: src/catalog/templates/tables.mako:58
+#: src/metastore/templates/tables.mako:58
 msgid "Table Name"
 msgstr "テーブル名"
 
-#: src/catalog/templates/util.mako:66
+#: src/metastore/templates/util.mako:66
 msgid "Unsaved Query"
 msgstr "未保存のクエリ"
 
-#: src/catalog/templates/util.mako:71
+#: src/metastore/templates/util.mako:71
 msgid "Query Results"
 msgstr "クエリの結果"
 
-#: src/catalog/templates/popups/load_data.mako:25
+#: src/metastore/templates/popups/load_data.mako:25
 msgid "Import data"
 msgstr "データをインポート"
 
-#: src/catalog/templates/popups/load_data.mako:50
+#: src/metastore/templates/popups/load_data.mako:50
 msgid "Overwrite existing data"
 msgstr "既存のデータを上書き"
 
-#: src/catalog/templates/popups/load_data.mako:55
+#: src/metastore/templates/popups/load_data.mako:55
 msgid "Note that loading data will move data from its location into the table's storage location."
 msgstr "データを読み込むと、データの場所からテーブルの保存場所にデータが移動されます。"
 
-#: src/catalog/templates/popups/load_data.mako:61
+#: src/metastore/templates/popups/load_data.mako:61
 msgid "Submit"
 msgstr "サブミット"
 

+ 73 - 73
apps/catalog/src/catalog/locale/ko/LC_MESSAGES/django.po → apps/metastore/src/metastore/locale/ko/LC_MESSAGES/django.po

@@ -17,251 +17,251 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: src/catalog/forms.py:48 src/catalog/templates/describe_partitions.mako:36
+#: src/metastore/forms.py:48 src/metastore/templates/describe_partitions.mako:36
 msgid "Path"
 msgstr "경로"
 
-#: src/catalog/forms.py:49
+#: src/metastore/forms.py:49
 msgid "Overwrite?"
 msgstr "덮어쓰시겠습니까?"
 
-#: src/catalog/forms.py:62
+#: src/metastore/forms.py:62
 #, python-format
 msgid "%(column_name)s (partition key with type %(column_type)s)"
 msgstr "%(column_name)s(유형 %(column_type)s이(가) 포함된 파티션 키)"
 
-#: src/catalog/views.py:72
+#: src/metastore/views.py:72
 #, fuzzy, python-format
 msgid "Failed to remove %(databases)s.  Error: %(error)s"
 msgstr "%(databases)s을(를) 제거하지 못했습니다. 오류: %(error)s"
 
-#: src/catalog/views.py:73 src/catalog/views.py:161
+#: src/metastore/views.py:73 src/metastore/views.py:161
 msgid "Beeswax Error"
 msgstr "Beeswax 오류"
 
-#: src/catalog/views.py:75
+#: src/metastore/views.py:75
 msgid "Do you really want to delete the database(s)?"
 msgstr "데이터베이스를 삭제하시겠습니까?"
 
-#: src/catalog/views.py:160
+#: src/metastore/views.py:160
 #, fuzzy, python-format
 msgid "Failed to remove %(tables)s.  Error: %(error)s"
 msgstr "%(tables)s을(를) 제거하지 못했습니다. 오류: %(error)s"
 
-#: src/catalog/views.py:163
+#: src/metastore/views.py:163
 msgid "Do you really want to delete the table(s)?"
 msgstr "테이블을 삭제하시겠습니까?"
 
-#: src/catalog/views.py:177
+#: src/metastore/views.py:177
 msgid "Can read table"
 msgstr "테이블을 읽을 수 없음"
 
-#: src/catalog/views.py:198
+#: src/metastore/views.py:198
 msgid "Can't load the data: "
 msgstr "데이터를 로드할 수 없음: "
 
-#: src/catalog/views.py:219
+#: src/metastore/views.py:219
 #, python-format
 msgid "Table '%(table)s' is not partitioned."
 msgstr "테이블 '%(table)s'이(가) 분할되지 않았습니다."
 
-#: src/catalog/templates/components.mako:27
-#: src/catalog/templates/databases.mako:24
-#: src/catalog/templates/databases.mako:27
+#: src/metastore/templates/components.mako:27
+#: src/metastore/templates/databases.mako:24
+#: src/metastore/templates/databases.mako:27
 msgid "Databases"
 msgstr "데이터베이스"
 
-#: src/catalog/templates/databases.mako:33
+#: src/metastore/templates/databases.mako:33
 msgid "Create a new database"
 msgstr "새 데이터베이스 생성"
 
-#: src/catalog/templates/databases.mako:40
+#: src/metastore/templates/databases.mako:40
 msgid "Drop the selected databases"
 msgstr "선택한 데이터베이스 삭제"
 
-#: src/catalog/templates/databases.mako:40
-#: src/catalog/templates/describe_table.mako:65
-#: src/catalog/templates/tables.mako:51
+#: src/metastore/templates/databases.mako:40
+#: src/metastore/templates/describe_table.mako:65
+#: src/metastore/templates/tables.mako:51
 msgid "Drop"
 msgstr "삭제"
 
-#: src/catalog/templates/databases.mako:47
+#: src/metastore/templates/databases.mako:47
 msgid "Database Name"
 msgstr "데이터베이스 이름"
 
-#: src/catalog/templates/databases.mako:74 src/catalog/templates/tables.mako:86
+#: src/metastore/templates/databases.mako:74 src/metastore/templates/tables.mako:86
 msgid "Confirm action"
 msgstr "작업 확인"
 
-#: src/catalog/templates/databases.mako:77
-#: src/catalog/templates/describe_table.mako:145
-#: src/catalog/templates/tables.mako:89
-#: src/catalog/templates/popups/load_data.mako:60
+#: src/metastore/templates/databases.mako:77
+#: src/metastore/templates/describe_table.mako:145
+#: src/metastore/templates/tables.mako:89
+#: src/metastore/templates/popups/load_data.mako:60
 msgid "Cancel"
 msgstr "취소"
 
-#: src/catalog/templates/databases.mako:78 src/catalog/templates/tables.mako:90
+#: src/metastore/templates/databases.mako:78 src/metastore/templates/tables.mako:90
 msgid "Yes"
 msgstr "예"
 
-#: src/catalog/templates/databases.mako:111
-#: src/catalog/templates/describe_table.mako:177
-#: src/catalog/templates/describe_table.mako:200
-#: src/catalog/templates/tables.mako:123
+#: src/metastore/templates/databases.mako:111
+#: src/metastore/templates/describe_table.mako:177
+#: src/metastore/templates/describe_table.mako:200
+#: src/metastore/templates/tables.mako:123
 msgid "No data available"
 msgstr "데이터를 이용할 수 없음"
 
-#: src/catalog/templates/databases.mako:112
-#: src/catalog/templates/describe_table.mako:178
-#: src/catalog/templates/describe_table.mako:201
-#: src/catalog/templates/tables.mako:124
+#: src/metastore/templates/databases.mako:112
+#: src/metastore/templates/describe_table.mako:178
+#: src/metastore/templates/describe_table.mako:201
+#: src/metastore/templates/tables.mako:124
 msgid "No matching records"
 msgstr "일치하는 레코드가 없음"
 
-#: src/catalog/templates/describe_partitions.mako:24
+#: src/metastore/templates/describe_partitions.mako:24
 #, python-format
 msgid "Table Partitions: %(tableName)s"
 msgstr "테이블 파티션: %(tableName)s"
 
-#: src/catalog/templates/describe_partitions.mako:27
+#: src/metastore/templates/describe_partitions.mako:27
 msgid "Partitions"
 msgstr "파티션"
 
-#: src/catalog/templates/describe_partitions.mako:54
+#: src/metastore/templates/describe_partitions.mako:54
 msgid "Table has no partitions."
 msgstr "테이블에 파티션이 없습니다."
 
-#: src/catalog/templates/describe_table.mako:26
-#: src/catalog/templates/tables.mako:49
+#: src/metastore/templates/describe_table.mako:26
+#: src/metastore/templates/tables.mako:49
 msgid "View"
 msgstr "보기"
 
-#: src/catalog/templates/describe_table.mako:28
-#: src/catalog/templates/describe_table.mako:55
+#: src/metastore/templates/describe_table.mako:28
+#: src/metastore/templates/describe_table.mako:55
 msgid "Table"
 msgstr "테이블"
 
-#: src/catalog/templates/describe_table.mako:30
+#: src/metastore/templates/describe_table.mako:30
 #, python-format
 msgid "%s : %s"
 msgstr "%s : %s"
 
-#: src/catalog/templates/describe_table.mako:36
+#: src/metastore/templates/describe_table.mako:36
 msgid "Name"
 msgstr "이름"
 
-#: src/catalog/templates/describe_table.mako:37
+#: src/metastore/templates/describe_table.mako:37
 msgid "Type"
 msgstr "유형"
 
-#: src/catalog/templates/describe_table.mako:38
+#: src/metastore/templates/describe_table.mako:38
 msgid "Comment"
 msgstr "설명"
 
-#: src/catalog/templates/describe_table.mako:62
-#: src/catalog/templates/tables.mako:40
+#: src/metastore/templates/describe_table.mako:62
+#: src/metastore/templates/tables.mako:40
 msgid "Actions"
 msgstr "작업"
 
-#: src/catalog/templates/describe_table.mako:63
+#: src/metastore/templates/describe_table.mako:63
 msgid "Import Data"
 msgstr "데이터 가져오기"
 
-#: src/catalog/templates/describe_table.mako:64
-#: src/catalog/templates/tables.mako:50
+#: src/metastore/templates/describe_table.mako:64
+#: src/metastore/templates/tables.mako:50
 msgid "Browse Data"
 msgstr "데이터 찾아보기"
 
-#: src/catalog/templates/describe_table.mako:66
+#: src/metastore/templates/describe_table.mako:66
 msgid "View File Location"
 msgstr "파일 위치 보기"
 
-#: src/catalog/templates/describe_table.mako:72
+#: src/metastore/templates/describe_table.mako:72
 msgid "Comment:"
 msgstr "설명:"
 
-#: src/catalog/templates/describe_table.mako:76
+#: src/metastore/templates/describe_table.mako:76
 msgid "Columns"
 msgstr "열"
 
-#: src/catalog/templates/describe_table.mako:78
+#: src/metastore/templates/describe_table.mako:78
 msgid "Partition Columns"
 msgstr "파티션 열"
 
-#: src/catalog/templates/describe_table.mako:81
+#: src/metastore/templates/describe_table.mako:81
 msgid "Sample"
 msgstr "샘플"
 
-#: src/catalog/templates/describe_table.mako:93
+#: src/metastore/templates/describe_table.mako:93
 msgid "Show Partitions"
 msgstr "파티션 표시"
 
-#: src/catalog/templates/describe_table.mako:101
+#: src/metastore/templates/describe_table.mako:101
 msgid "Error!"
 msgstr "오류!"
 
-#: src/catalog/templates/describe_table.mako:138
+#: src/metastore/templates/describe_table.mako:138
 msgid "Drop Table"
 msgstr "테이블 삭제"
 
-#: src/catalog/templates/describe_table.mako:146
+#: src/metastore/templates/describe_table.mako:146
 msgid "Yes, drop this table"
 msgstr "예, 이 테이블 삭제"
 
-#: src/catalog/templates/tables.mako:23
+#: src/metastore/templates/tables.mako:23
 msgid "Tables"
 msgstr "테이블"
 
-#: src/catalog/templates/tables.mako:26
+#: src/metastore/templates/tables.mako:26
 #, fuzzy, python-format
 msgid "Database %s"
 msgstr "데이터베이스 %s"
 
-#: src/catalog/templates/tables.mako:33
+#: src/metastore/templates/tables.mako:33
 msgid "database"
 msgstr "데이터베이스"
 
-#: src/catalog/templates/tables.mako:41
+#: src/metastore/templates/tables.mako:41
 msgid "Create a new table from a file"
 msgstr "파일에서 새 테이블을 생성합니다."
 
-#: src/catalog/templates/tables.mako:42
+#: src/metastore/templates/tables.mako:42
 msgid "Create a new table manually"
 msgstr "새 테이블을 직접 생성합니다."
 
-#: src/catalog/templates/tables.mako:49 src/catalog/templates/tables.mako:50
+#: src/metastore/templates/tables.mako:49 src/metastore/templates/tables.mako:50
 msgid "Browse the selected table"
 msgstr "선택한 테이블 찾아보기"
 
-#: src/catalog/templates/tables.mako:51
+#: src/metastore/templates/tables.mako:51
 msgid "Delete the selected tables"
 msgstr "선택한 테이블 삭제"
 
-#: src/catalog/templates/tables.mako:58
+#: src/metastore/templates/tables.mako:58
 msgid "Table Name"
 msgstr "테이블 이름"
 
-#: src/catalog/templates/util.mako:66
+#: src/metastore/templates/util.mako:66
 msgid "Unsaved Query"
 msgstr "저장 안 된 쿼리"
 
-#: src/catalog/templates/util.mako:71
+#: src/metastore/templates/util.mako:71
 msgid "Query Results"
 msgstr "쿼리 결과"
 
-#: src/catalog/templates/popups/load_data.mako:25
+#: src/metastore/templates/popups/load_data.mako:25
 msgid "Import data"
 msgstr "데이터 가져오기"
 
-#: src/catalog/templates/popups/load_data.mako:50
+#: src/metastore/templates/popups/load_data.mako:50
 msgid "Overwrite existing data"
 msgstr "기존 데이터 덮어쓰기"
 
-#: src/catalog/templates/popups/load_data.mako:55
+#: src/metastore/templates/popups/load_data.mako:55
 msgid "Note that loading data will move data from its location into the table's storage location."
 msgstr "데이터를 로드하면 해당 위치에서 테이블의 스토리지 위치로 데이터가 이동됩니다."
 
-#: src/catalog/templates/popups/load_data.mako:61
+#: src/metastore/templates/popups/load_data.mako:61
 msgid "Submit"
 msgstr "제출"
 

+ 73 - 73
apps/catalog/src/catalog/locale/pt/LC_MESSAGES/django.po → apps/metastore/src/metastore/locale/pt/LC_MESSAGES/django.po

@@ -17,251 +17,251 @@ msgstr ""
 "Content-Transfer-Encoding: 8 bits\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: src/catalog/forms.py:48 src/catalog/templates/describe_partitions.mako:36
+#: src/metastore/forms.py:48 src/metastore/templates/describe_partitions.mako:36
 msgid "Path"
 msgstr "Caminho"
 
-#: src/catalog/forms.py:49
+#: src/metastore/forms.py:49
 msgid "Overwrite?"
 msgstr "Substituir?"
 
-#: src/catalog/forms.py:62
+#: src/metastore/forms.py:62
 #, python-format
 msgid "%(column_name)s (partition key with type %(column_type)s)"
 msgstr "%(column_name)s (partição principal com o tipo %(column_type)s)"
 
-#: src/catalog/views.py:72
+#: src/metastore/views.py:72
 #, fuzzy, python-format
 msgid "Failed to remove %(databases)s.  Error: %(error)s"
 msgstr "Falha ao remover %(databases)s.  Erro: %(error)s"
 
-#: src/catalog/views.py:73 src/catalog/views.py:161
+#: src/metastore/views.py:73 src/metastore/views.py:161
 msgid "Beeswax Error"
 msgstr "Erro do Beeswax"
 
-#: src/catalog/views.py:75
+#: src/metastore/views.py:75
 msgid "Do you really want to delete the database(s)?"
 msgstr "Tem a certeza de que pretende eliminar a(s) base(s) de dados(s)?"
 
-#: src/catalog/views.py:160
+#: src/metastore/views.py:160
 #, fuzzy, python-format
 msgid "Failed to remove %(tables)s.  Error: %(error)s"
 msgstr "Falha ao remover %(tables)s.  Erro: %(error)s"
 
-#: src/catalog/views.py:163
+#: src/metastore/views.py:163
 msgid "Do you really want to delete the table(s)?"
 msgstr "Tem a certeza de que pretende eliminar a(s) tabela(s)?"
 
-#: src/catalog/views.py:177
+#: src/metastore/views.py:177
 msgid "Can read table"
 msgstr "Não é possível ler a tabela"
 
-#: src/catalog/views.py:198
+#: src/metastore/views.py:198
 msgid "Can't load the data: "
 msgstr "Não é possível carregar os dados: "
 
-#: src/catalog/views.py:219
+#: src/metastore/views.py:219
 #, python-format
 msgid "Table '%(table)s' is not partitioned."
 msgstr "A tabela '%(table)s' não está particionada."
 
-#: src/catalog/templates/components.mako:27
-#: src/catalog/templates/databases.mako:24
-#: src/catalog/templates/databases.mako:27
+#: src/metastore/templates/components.mako:27
+#: src/metastore/templates/databases.mako:24
+#: src/metastore/templates/databases.mako:27
 msgid "Databases"
 msgstr "Bases de dados"
 
-#: src/catalog/templates/databases.mako:33
+#: src/metastore/templates/databases.mako:33
 msgid "Create a new database"
 msgstr "Criar uma nova base de dados"
 
-#: src/catalog/templates/databases.mako:40
+#: src/metastore/templates/databases.mako:40
 msgid "Drop the selected databases"
 msgstr "Rejeitar as bases de dados seleccionadas"
 
-#: src/catalog/templates/databases.mako:40
-#: src/catalog/templates/describe_table.mako:65
-#: src/catalog/templates/tables.mako:51
+#: src/metastore/templates/databases.mako:40
+#: src/metastore/templates/describe_table.mako:65
+#: src/metastore/templates/tables.mako:51
 msgid "Drop"
 msgstr "Rejeitar"
 
-#: src/catalog/templates/databases.mako:47
+#: src/metastore/templates/databases.mako:47
 msgid "Database Name"
 msgstr "Nome da base de dados"
 
-#: src/catalog/templates/databases.mako:74 src/catalog/templates/tables.mako:86
+#: src/metastore/templates/databases.mako:74 src/metastore/templates/tables.mako:86
 msgid "Confirm action"
 msgstr "Confirmar acção"
 
-#: src/catalog/templates/databases.mako:77
-#: src/catalog/templates/describe_table.mako:145
-#: src/catalog/templates/tables.mako:89
-#: src/catalog/templates/popups/load_data.mako:60
+#: src/metastore/templates/databases.mako:77
+#: src/metastore/templates/describe_table.mako:145
+#: src/metastore/templates/tables.mako:89
+#: src/metastore/templates/popups/load_data.mako:60
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/catalog/templates/databases.mako:78 src/catalog/templates/tables.mako:90
+#: src/metastore/templates/databases.mako:78 src/metastore/templates/tables.mako:90
 msgid "Yes"
 msgstr "Sim"
 
-#: src/catalog/templates/databases.mako:111
-#: src/catalog/templates/describe_table.mako:177
-#: src/catalog/templates/describe_table.mako:200
-#: src/catalog/templates/tables.mako:123
+#: src/metastore/templates/databases.mako:111
+#: src/metastore/templates/describe_table.mako:177
+#: src/metastore/templates/describe_table.mako:200
+#: src/metastore/templates/tables.mako:123
 msgid "No data available"
 msgstr "Não existem dados disponíveis"
 
-#: src/catalog/templates/databases.mako:112
-#: src/catalog/templates/describe_table.mako:178
-#: src/catalog/templates/describe_table.mako:201
-#: src/catalog/templates/tables.mako:124
+#: src/metastore/templates/databases.mako:112
+#: src/metastore/templates/describe_table.mako:178
+#: src/metastore/templates/describe_table.mako:201
+#: src/metastore/templates/tables.mako:124
 msgid "No matching records"
 msgstr "Não existem registos correspondentes"
 
-#: src/catalog/templates/describe_partitions.mako:24
+#: src/metastore/templates/describe_partitions.mako:24
 #, python-format
 msgid "Table Partitions: %(tableName)s"
 msgstr "Partições da tabela: %(tableName)s"
 
-#: src/catalog/templates/describe_partitions.mako:27
+#: src/metastore/templates/describe_partitions.mako:27
 msgid "Partitions"
 msgstr "Partições"
 
-#: src/catalog/templates/describe_partitions.mako:54
+#: src/metastore/templates/describe_partitions.mako:54
 msgid "Table has no partitions."
 msgstr "A tabela não tem partições."
 
-#: src/catalog/templates/describe_table.mako:26
-#: src/catalog/templates/tables.mako:49
+#: src/metastore/templates/describe_table.mako:26
+#: src/metastore/templates/tables.mako:49
 msgid "View"
 msgstr "Ver"
 
-#: src/catalog/templates/describe_table.mako:28
-#: src/catalog/templates/describe_table.mako:55
+#: src/metastore/templates/describe_table.mako:28
+#: src/metastore/templates/describe_table.mako:55
 msgid "Table"
 msgstr "Tabela"
 
-#: src/catalog/templates/describe_table.mako:30
+#: src/metastore/templates/describe_table.mako:30
 #, python-format
 msgid "%s : %s"
 msgstr "%s : %s"
 
-#: src/catalog/templates/describe_table.mako:36
+#: src/metastore/templates/describe_table.mako:36
 msgid "Name"
 msgstr "Nome"
 
-#: src/catalog/templates/describe_table.mako:37
+#: src/metastore/templates/describe_table.mako:37
 msgid "Type"
 msgstr "Tipo"
 
-#: src/catalog/templates/describe_table.mako:38
+#: src/metastore/templates/describe_table.mako:38
 msgid "Comment"
 msgstr "Comentário"
 
-#: src/catalog/templates/describe_table.mako:62
-#: src/catalog/templates/tables.mako:40
+#: src/metastore/templates/describe_table.mako:62
+#: src/metastore/templates/tables.mako:40
 msgid "Actions"
 msgstr "Ações"
 
-#: src/catalog/templates/describe_table.mako:63
+#: src/metastore/templates/describe_table.mako:63
 msgid "Import Data"
 msgstr "Importar dados"
 
-#: src/catalog/templates/describe_table.mako:64
-#: src/catalog/templates/tables.mako:50
+#: src/metastore/templates/describe_table.mako:64
+#: src/metastore/templates/tables.mako:50
 msgid "Browse Data"
 msgstr "Procurar dados"
 
-#: src/catalog/templates/describe_table.mako:66
+#: src/metastore/templates/describe_table.mako:66
 msgid "View File Location"
 msgstr "Ver localização do ficheiro"
 
-#: src/catalog/templates/describe_table.mako:72
+#: src/metastore/templates/describe_table.mako:72
 msgid "Comment:"
 msgstr "Comentário:"
 
-#: src/catalog/templates/describe_table.mako:76
+#: src/metastore/templates/describe_table.mako:76
 msgid "Columns"
 msgstr "Colunas"
 
-#: src/catalog/templates/describe_table.mako:78
+#: src/metastore/templates/describe_table.mako:78
 msgid "Partition Columns"
 msgstr "Colunas da partição"
 
-#: src/catalog/templates/describe_table.mako:81
+#: src/metastore/templates/describe_table.mako:81
 msgid "Sample"
 msgstr "Amostra"
 
-#: src/catalog/templates/describe_table.mako:93
+#: src/metastore/templates/describe_table.mako:93
 msgid "Show Partitions"
 msgstr "Mostrar partições"
 
-#: src/catalog/templates/describe_table.mako:101
+#: src/metastore/templates/describe_table.mako:101
 msgid "Error!"
 msgstr "Erro!"
 
-#: src/catalog/templates/describe_table.mako:138
+#: src/metastore/templates/describe_table.mako:138
 msgid "Drop Table"
 msgstr "Rejeitar tabela"
 
-#: src/catalog/templates/describe_table.mako:146
+#: src/metastore/templates/describe_table.mako:146
 msgid "Yes, drop this table"
 msgstr "Sim, rejeitar esta tabela"
 
-#: src/catalog/templates/tables.mako:23
+#: src/metastore/templates/tables.mako:23
 msgid "Tables"
 msgstr "Tabelas"
 
-#: src/catalog/templates/tables.mako:26
+#: src/metastore/templates/tables.mako:26
 #, fuzzy, python-format
 msgid "Database %s"
 msgstr "Base de dados %s"
 
-#: src/catalog/templates/tables.mako:33
+#: src/metastore/templates/tables.mako:33
 msgid "database"
 msgstr "base de dados"
 
-#: src/catalog/templates/tables.mako:41
+#: src/metastore/templates/tables.mako:41
 msgid "Create a new table from a file"
 msgstr "Criar nova tabela de um ficheiro"
 
-#: src/catalog/templates/tables.mako:42
+#: src/metastore/templates/tables.mako:42
 msgid "Create a new table manually"
 msgstr "Criar uma nova tabela manualmente"
 
-#: src/catalog/templates/tables.mako:49 src/catalog/templates/tables.mako:50
+#: src/metastore/templates/tables.mako:49 src/metastore/templates/tables.mako:50
 msgid "Browse the selected table"
 msgstr "Procurar na tabela seleccionada"
 
-#: src/catalog/templates/tables.mako:51
+#: src/metastore/templates/tables.mako:51
 msgid "Delete the selected tables"
 msgstr "Eliminar as tabelas seleccionadas"
 
-#: src/catalog/templates/tables.mako:58
+#: src/metastore/templates/tables.mako:58
 msgid "Table Name"
 msgstr "Nome da tabela"
 
-#: src/catalog/templates/util.mako:66
+#: src/metastore/templates/util.mako:66
 msgid "Unsaved Query"
 msgstr "Consulta não guardada"
 
-#: src/catalog/templates/util.mako:71
+#: src/metastore/templates/util.mako:71
 msgid "Query Results"
 msgstr "Resultados da consulta"
 
-#: src/catalog/templates/popups/load_data.mako:25
+#: src/metastore/templates/popups/load_data.mako:25
 msgid "Import data"
 msgstr "Importar dados"
 
-#: src/catalog/templates/popups/load_data.mako:50
+#: src/metastore/templates/popups/load_data.mako:50
 msgid "Overwrite existing data"
 msgstr "Substituir os dados existentes"
 
-#: src/catalog/templates/popups/load_data.mako:55
+#: src/metastore/templates/popups/load_data.mako:55
 msgid "Note that loading data will move data from its location into the table's storage location."
 msgstr "Tenha em atenção que carregar dados irá mover os dados desta localização para o local de armazenamento da tabela."
 
-#: src/catalog/templates/popups/load_data.mako:61
+#: src/metastore/templates/popups/load_data.mako:61
 msgid "Submit"
 msgstr "Enviar"
 

+ 73 - 73
apps/catalog/src/catalog/locale/pt_BR/LC_MESSAGES/django.po → apps/metastore/src/metastore/locale/pt_BR/LC_MESSAGES/django.po

@@ -17,251 +17,251 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: src/catalog/forms.py:48 src/catalog/templates/describe_partitions.mako:36
+#: src/metastore/forms.py:48 src/metastore/templates/describe_partitions.mako:36
 msgid "Path"
 msgstr "Caminho"
 
-#: src/catalog/forms.py:49
+#: src/metastore/forms.py:49
 msgid "Overwrite?"
 msgstr "Sobrescrever?"
 
-#: src/catalog/forms.py:62
+#: src/metastore/forms.py:62
 #, python-format
 msgid "%(column_name)s (partition key with type %(column_type)s)"
 msgstr "%(column_name)s (partição principal com o tipo %(column_type)s)"
 
-#: src/catalog/views.py:72
+#: src/metastore/views.py:72
 #, fuzzy, python-format
 msgid "Failed to remove %(databases)s.  Error: %(error)s"
 msgstr "Falha ao remover %(databases)s.  Erro: %(error)s"
 
-#: src/catalog/views.py:73 src/catalog/views.py:161
+#: src/metastore/views.py:73 src/metastore/views.py:161
 msgid "Beeswax Error"
 msgstr "Erro do Beeswax"
 
-#: src/catalog/views.py:75
+#: src/metastore/views.py:75
 msgid "Do you really want to delete the database(s)?"
 msgstr "Tem certeza de que deseja realmente excluir os bancos de dados?"
 
-#: src/catalog/views.py:160
+#: src/metastore/views.py:160
 #, fuzzy, python-format
 msgid "Failed to remove %(tables)s.  Error: %(error)s"
 msgstr "Falha ao remover %(tables)s.  Erro: %(error)s"
 
-#: src/catalog/views.py:163
+#: src/metastore/views.py:163
 msgid "Do you really want to delete the table(s)?"
 msgstr "Tem certeza de que deseja realmente excluir as tabelas?"
 
-#: src/catalog/views.py:177
+#: src/metastore/views.py:177
 msgid "Can read table"
 msgstr "É possível ler tabela"
 
-#: src/catalog/views.py:198
+#: src/metastore/views.py:198
 msgid "Can't load the data: "
 msgstr "Não é possível carregar os dados: "
 
-#: src/catalog/views.py:219
+#: src/metastore/views.py:219
 #, python-format
 msgid "Table '%(table)s' is not partitioned."
 msgstr "A tabela '%(table)s' não está particionada."
 
-#: src/catalog/templates/components.mako:27
-#: src/catalog/templates/databases.mako:24
-#: src/catalog/templates/databases.mako:27
+#: src/metastore/templates/components.mako:27
+#: src/metastore/templates/databases.mako:24
+#: src/metastore/templates/databases.mako:27
 msgid "Databases"
 msgstr "Bancos de dados"
 
-#: src/catalog/templates/databases.mako:33
+#: src/metastore/templates/databases.mako:33
 msgid "Create a new database"
 msgstr "Criar um novo banco de dados"
 
-#: src/catalog/templates/databases.mako:40
+#: src/metastore/templates/databases.mako:40
 msgid "Drop the selected databases"
 msgstr "Descartar os bancos de dados selecionados"
 
-#: src/catalog/templates/databases.mako:40
-#: src/catalog/templates/describe_table.mako:65
-#: src/catalog/templates/tables.mako:51
+#: src/metastore/templates/databases.mako:40
+#: src/metastore/templates/describe_table.mako:65
+#: src/metastore/templates/tables.mako:51
 msgid "Drop"
 msgstr "Drop"
 
-#: src/catalog/templates/databases.mako:47
+#: src/metastore/templates/databases.mako:47
 msgid "Database Name"
 msgstr "Nome do banco de dados"
 
-#: src/catalog/templates/databases.mako:74 src/catalog/templates/tables.mako:86
+#: src/metastore/templates/databases.mako:74 src/metastore/templates/tables.mako:86
 msgid "Confirm action"
 msgstr "Confirmar ação"
 
-#: src/catalog/templates/databases.mako:77
-#: src/catalog/templates/describe_table.mako:145
-#: src/catalog/templates/tables.mako:89
-#: src/catalog/templates/popups/load_data.mako:60
+#: src/metastore/templates/databases.mako:77
+#: src/metastore/templates/describe_table.mako:145
+#: src/metastore/templates/tables.mako:89
+#: src/metastore/templates/popups/load_data.mako:60
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/catalog/templates/databases.mako:78 src/catalog/templates/tables.mako:90
+#: src/metastore/templates/databases.mako:78 src/metastore/templates/tables.mako:90
 msgid "Yes"
 msgstr "Sim"
 
-#: src/catalog/templates/databases.mako:111
-#: src/catalog/templates/describe_table.mako:177
-#: src/catalog/templates/describe_table.mako:200
-#: src/catalog/templates/tables.mako:123
+#: src/metastore/templates/databases.mako:111
+#: src/metastore/templates/describe_table.mako:177
+#: src/metastore/templates/describe_table.mako:200
+#: src/metastore/templates/tables.mako:123
 msgid "No data available"
 msgstr "Nenhum dado disponível"
 
-#: src/catalog/templates/databases.mako:112
-#: src/catalog/templates/describe_table.mako:178
-#: src/catalog/templates/describe_table.mako:201
-#: src/catalog/templates/tables.mako:124
+#: src/metastore/templates/databases.mako:112
+#: src/metastore/templates/describe_table.mako:178
+#: src/metastore/templates/describe_table.mako:201
+#: src/metastore/templates/tables.mako:124
 msgid "No matching records"
 msgstr "Nenhum registro correspondente"
 
-#: src/catalog/templates/describe_partitions.mako:24
+#: src/metastore/templates/describe_partitions.mako:24
 #, python-format
 msgid "Table Partitions: %(tableName)s"
 msgstr "Partições de tabela: %(tableName)s"
 
-#: src/catalog/templates/describe_partitions.mako:27
+#: src/metastore/templates/describe_partitions.mako:27
 msgid "Partitions"
 msgstr "Partições"
 
-#: src/catalog/templates/describe_partitions.mako:54
+#: src/metastore/templates/describe_partitions.mako:54
 msgid "Table has no partitions."
 msgstr "A tabela não tem nenhuma partição."
 
-#: src/catalog/templates/describe_table.mako:26
-#: src/catalog/templates/tables.mako:49
+#: src/metastore/templates/describe_table.mako:26
+#: src/metastore/templates/tables.mako:49
 msgid "View"
 msgstr "Exibir"
 
-#: src/catalog/templates/describe_table.mako:28
-#: src/catalog/templates/describe_table.mako:55
+#: src/metastore/templates/describe_table.mako:28
+#: src/metastore/templates/describe_table.mako:55
 msgid "Table"
 msgstr "Tabela"
 
-#: src/catalog/templates/describe_table.mako:30
+#: src/metastore/templates/describe_table.mako:30
 #, python-format
 msgid "%s : %s"
 msgstr "%s : %s"
 
-#: src/catalog/templates/describe_table.mako:36
+#: src/metastore/templates/describe_table.mako:36
 msgid "Name"
 msgstr "Nome"
 
-#: src/catalog/templates/describe_table.mako:37
+#: src/metastore/templates/describe_table.mako:37
 msgid "Type"
 msgstr "Tipo"
 
-#: src/catalog/templates/describe_table.mako:38
+#: src/metastore/templates/describe_table.mako:38
 msgid "Comment"
 msgstr "Comentário"
 
-#: src/catalog/templates/describe_table.mako:62
-#: src/catalog/templates/tables.mako:40
+#: src/metastore/templates/describe_table.mako:62
+#: src/metastore/templates/tables.mako:40
 msgid "Actions"
 msgstr "Ações"
 
-#: src/catalog/templates/describe_table.mako:63
+#: src/metastore/templates/describe_table.mako:63
 msgid "Import Data"
 msgstr "Importar dados"
 
-#: src/catalog/templates/describe_table.mako:64
-#: src/catalog/templates/tables.mako:50
+#: src/metastore/templates/describe_table.mako:64
+#: src/metastore/templates/tables.mako:50
 msgid "Browse Data"
 msgstr "Procurar dados"
 
-#: src/catalog/templates/describe_table.mako:66
+#: src/metastore/templates/describe_table.mako:66
 msgid "View File Location"
 msgstr "Visualizar local do arquivo"
 
-#: src/catalog/templates/describe_table.mako:72
+#: src/metastore/templates/describe_table.mako:72
 msgid "Comment:"
 msgstr "Comentário:"
 
-#: src/catalog/templates/describe_table.mako:76
+#: src/metastore/templates/describe_table.mako:76
 msgid "Columns"
 msgstr "Colunas"
 
-#: src/catalog/templates/describe_table.mako:78
+#: src/metastore/templates/describe_table.mako:78
 msgid "Partition Columns"
 msgstr "Colunas de partição"
 
-#: src/catalog/templates/describe_table.mako:81
+#: src/metastore/templates/describe_table.mako:81
 msgid "Sample"
 msgstr "Amostra"
 
-#: src/catalog/templates/describe_table.mako:93
+#: src/metastore/templates/describe_table.mako:93
 msgid "Show Partitions"
 msgstr "Exibir partições"
 
-#: src/catalog/templates/describe_table.mako:101
+#: src/metastore/templates/describe_table.mako:101
 msgid "Error!"
 msgstr "Erro!"
 
-#: src/catalog/templates/describe_table.mako:138
+#: src/metastore/templates/describe_table.mako:138
 msgid "Drop Table"
 msgstr "Soltar tabela"
 
-#: src/catalog/templates/describe_table.mako:146
+#: src/metastore/templates/describe_table.mako:146
 msgid "Yes, drop this table"
 msgstr "Sim, descartar essa tabela"
 
-#: src/catalog/templates/tables.mako:23
+#: src/metastore/templates/tables.mako:23
 msgid "Tables"
 msgstr "Tabelas"
 
-#: src/catalog/templates/tables.mako:26
+#: src/metastore/templates/tables.mako:26
 #, fuzzy, python-format
 msgid "Database %s"
 msgstr "Banco de dados %s"
 
-#: src/catalog/templates/tables.mako:33
+#: src/metastore/templates/tables.mako:33
 msgid "database"
 msgstr "banco de dados"
 
-#: src/catalog/templates/tables.mako:41
+#: src/metastore/templates/tables.mako:41
 msgid "Create a new table from a file"
 msgstr "Criar nova tabela de um arquivo"
 
-#: src/catalog/templates/tables.mako:42
+#: src/metastore/templates/tables.mako:42
 msgid "Create a new table manually"
 msgstr "Criar uma nova tabela manualmente"
 
-#: src/catalog/templates/tables.mako:49 src/catalog/templates/tables.mako:50
+#: src/metastore/templates/tables.mako:49 src/metastore/templates/tables.mako:50
 msgid "Browse the selected table"
 msgstr "Pesquisar a tabela selecionada"
 
-#: src/catalog/templates/tables.mako:51
+#: src/metastore/templates/tables.mako:51
 msgid "Delete the selected tables"
 msgstr "Excluir as tabelas selecionadas"
 
-#: src/catalog/templates/tables.mako:58
+#: src/metastore/templates/tables.mako:58
 msgid "Table Name"
 msgstr "Nome da tabela"
 
-#: src/catalog/templates/util.mako:66
+#: src/metastore/templates/util.mako:66
 msgid "Unsaved Query"
 msgstr "Consulta não salva"
 
-#: src/catalog/templates/util.mako:71
+#: src/metastore/templates/util.mako:71
 msgid "Query Results"
 msgstr "Resultados da consulta"
 
-#: src/catalog/templates/popups/load_data.mako:25
+#: src/metastore/templates/popups/load_data.mako:25
 msgid "Import data"
 msgstr "Importar dados"
 
-#: src/catalog/templates/popups/load_data.mako:50
+#: src/metastore/templates/popups/load_data.mako:50
 msgid "Overwrite existing data"
 msgstr "Sobrescrever os dados existentes"
 
-#: src/catalog/templates/popups/load_data.mako:55
+#: src/metastore/templates/popups/load_data.mako:55
 msgid "Note that loading data will move data from its location into the table's storage location."
 msgstr "Observe que o carregamento dos dados moverá os dados de seu local para o local de armazenamento na tabela."
 
-#: src/catalog/templates/popups/load_data.mako:61
+#: src/metastore/templates/popups/load_data.mako:61
 msgid "Submit"
 msgstr "Enviar"
 

+ 73 - 73
apps/catalog/src/catalog/locale/zh_CN/LC_MESSAGES/django.po → apps/metastore/src/metastore/locale/zh_CN/LC_MESSAGES/django.po

@@ -17,251 +17,251 @@ msgstr ""
 "Content-Transfer-Encoding: 8 位\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: src/catalog/forms.py:48 src/catalog/templates/describe_partitions.mako:36
+#: src/metastore/forms.py:48 src/metastore/templates/describe_partitions.mako:36
 msgid "Path"
 msgstr "路径"
 
-#: src/catalog/forms.py:49
+#: src/metastore/forms.py:49
 msgid "Overwrite?"
 msgstr "是否覆盖?"
 
-#: src/catalog/forms.py:62
+#: src/metastore/forms.py:62
 #, python-format
 msgid "%(column_name)s (partition key with type %(column_type)s)"
 msgstr "%(column_name)s(类型为 %(column_type)s 的分区键)"
 
-#: src/catalog/views.py:72
+#: src/metastore/views.py:72
 #, fuzzy, python-format
 msgid "Failed to remove %(databases)s.  Error: %(error)s"
 msgstr "无法删除 %(databases)s。错误:%(error)s"
 
-#: src/catalog/views.py:73 src/catalog/views.py:161
+#: src/metastore/views.py:73 src/metastore/views.py:161
 msgid "Beeswax Error"
 msgstr "Beeswax 错误"
 
-#: src/catalog/views.py:75
+#: src/metastore/views.py:75
 msgid "Do you really want to delete the database(s)?"
 msgstr "是否确实要删除数据库?"
 
-#: src/catalog/views.py:160
+#: src/metastore/views.py:160
 #, fuzzy, python-format
 msgid "Failed to remove %(tables)s.  Error: %(error)s"
 msgstr "无法删除 %(tables)s。错误:%(error)s"
 
-#: src/catalog/views.py:163
+#: src/metastore/views.py:163
 msgid "Do you really want to delete the table(s)?"
 msgstr "是否确实要删除表?"
 
-#: src/catalog/views.py:177
+#: src/metastore/views.py:177
 msgid "Can read table"
 msgstr "可读取表"
 
-#: src/catalog/views.py:198
+#: src/metastore/views.py:198
 msgid "Can't load the data: "
 msgstr "无法加载数据: "
 
-#: src/catalog/views.py:219
+#: src/metastore/views.py:219
 #, python-format
 msgid "Table '%(table)s' is not partitioned."
 msgstr "表 '%(table)s' 未分区。"
 
-#: src/catalog/templates/components.mako:27
-#: src/catalog/templates/databases.mako:24
-#: src/catalog/templates/databases.mako:27
+#: src/metastore/templates/components.mako:27
+#: src/metastore/templates/databases.mako:24
+#: src/metastore/templates/databases.mako:27
 msgid "Databases"
 msgstr "数据库"
 
-#: src/catalog/templates/databases.mako:33
+#: src/metastore/templates/databases.mako:33
 msgid "Create a new database"
 msgstr "创建新数据库"
 
-#: src/catalog/templates/databases.mako:40
+#: src/metastore/templates/databases.mako:40
 msgid "Drop the selected databases"
 msgstr "删除所选数据库"
 
-#: src/catalog/templates/databases.mako:40
-#: src/catalog/templates/describe_table.mako:65
-#: src/catalog/templates/tables.mako:51
+#: src/metastore/templates/databases.mako:40
+#: src/metastore/templates/describe_table.mako:65
+#: src/metastore/templates/tables.mako:51
 msgid "Drop"
 msgstr "丢弃"
 
-#: src/catalog/templates/databases.mako:47
+#: src/metastore/templates/databases.mako:47
 msgid "Database Name"
 msgstr "数据库名称"
 
-#: src/catalog/templates/databases.mako:74 src/catalog/templates/tables.mako:86
+#: src/metastore/templates/databases.mako:74 src/metastore/templates/tables.mako:86
 msgid "Confirm action"
 msgstr "确认操作"
 
-#: src/catalog/templates/databases.mako:77
-#: src/catalog/templates/describe_table.mako:145
-#: src/catalog/templates/tables.mako:89
-#: src/catalog/templates/popups/load_data.mako:60
+#: src/metastore/templates/databases.mako:77
+#: src/metastore/templates/describe_table.mako:145
+#: src/metastore/templates/tables.mako:89
+#: src/metastore/templates/popups/load_data.mako:60
 msgid "Cancel"
 msgstr "取消"
 
-#: src/catalog/templates/databases.mako:78 src/catalog/templates/tables.mako:90
+#: src/metastore/templates/databases.mako:78 src/metastore/templates/tables.mako:90
 msgid "Yes"
 msgstr "是"
 
-#: src/catalog/templates/databases.mako:111
-#: src/catalog/templates/describe_table.mako:177
-#: src/catalog/templates/describe_table.mako:200
-#: src/catalog/templates/tables.mako:123
+#: src/metastore/templates/databases.mako:111
+#: src/metastore/templates/describe_table.mako:177
+#: src/metastore/templates/describe_table.mako:200
+#: src/metastore/templates/tables.mako:123
 msgid "No data available"
 msgstr "没有可用数据"
 
-#: src/catalog/templates/databases.mako:112
-#: src/catalog/templates/describe_table.mako:178
-#: src/catalog/templates/describe_table.mako:201
-#: src/catalog/templates/tables.mako:124
+#: src/metastore/templates/databases.mako:112
+#: src/metastore/templates/describe_table.mako:178
+#: src/metastore/templates/describe_table.mako:201
+#: src/metastore/templates/tables.mako:124
 msgid "No matching records"
 msgstr "没有匹配记录"
 
-#: src/catalog/templates/describe_partitions.mako:24
+#: src/metastore/templates/describe_partitions.mako:24
 #, python-format
 msgid "Table Partitions: %(tableName)s"
 msgstr "表分区:%(tableName)s"
 
-#: src/catalog/templates/describe_partitions.mako:27
+#: src/metastore/templates/describe_partitions.mako:27
 msgid "Partitions"
 msgstr "分区"
 
-#: src/catalog/templates/describe_partitions.mako:54
+#: src/metastore/templates/describe_partitions.mako:54
 msgid "Table has no partitions."
 msgstr "表没有分区。"
 
-#: src/catalog/templates/describe_table.mako:26
-#: src/catalog/templates/tables.mako:49
+#: src/metastore/templates/describe_table.mako:26
+#: src/metastore/templates/tables.mako:49
 msgid "View"
 msgstr "查看"
 
-#: src/catalog/templates/describe_table.mako:28
-#: src/catalog/templates/describe_table.mako:55
+#: src/metastore/templates/describe_table.mako:28
+#: src/metastore/templates/describe_table.mako:55
 msgid "Table"
 msgstr "表"
 
-#: src/catalog/templates/describe_table.mako:30
+#: src/metastore/templates/describe_table.mako:30
 #, python-format
 msgid "%s : %s"
 msgstr "%s : %s"
 
-#: src/catalog/templates/describe_table.mako:36
+#: src/metastore/templates/describe_table.mako:36
 msgid "Name"
 msgstr "名称"
 
-#: src/catalog/templates/describe_table.mako:37
+#: src/metastore/templates/describe_table.mako:37
 msgid "Type"
 msgstr "类型"
 
-#: src/catalog/templates/describe_table.mako:38
+#: src/metastore/templates/describe_table.mako:38
 msgid "Comment"
 msgstr "备注"
 
-#: src/catalog/templates/describe_table.mako:62
-#: src/catalog/templates/tables.mako:40
+#: src/metastore/templates/describe_table.mako:62
+#: src/metastore/templates/tables.mako:40
 msgid "Actions"
 msgstr "操作"
 
-#: src/catalog/templates/describe_table.mako:63
+#: src/metastore/templates/describe_table.mako:63
 msgid "Import Data"
 msgstr "导入数据"
 
-#: src/catalog/templates/describe_table.mako:64
-#: src/catalog/templates/tables.mako:50
+#: src/metastore/templates/describe_table.mako:64
+#: src/metastore/templates/tables.mako:50
 msgid "Browse Data"
 msgstr "浏览数据"
 
-#: src/catalog/templates/describe_table.mako:66
+#: src/metastore/templates/describe_table.mako:66
 msgid "View File Location"
 msgstr "查看文件位置"
 
-#: src/catalog/templates/describe_table.mako:72
+#: src/metastore/templates/describe_table.mako:72
 msgid "Comment:"
 msgstr "备注:"
 
-#: src/catalog/templates/describe_table.mako:76
+#: src/metastore/templates/describe_table.mako:76
 msgid "Columns"
 msgstr "列"
 
-#: src/catalog/templates/describe_table.mako:78
+#: src/metastore/templates/describe_table.mako:78
 msgid "Partition Columns"
 msgstr "分区列"
 
-#: src/catalog/templates/describe_table.mako:81
+#: src/metastore/templates/describe_table.mako:81
 msgid "Sample"
 msgstr "样本"
 
-#: src/catalog/templates/describe_table.mako:93
+#: src/metastore/templates/describe_table.mako:93
 msgid "Show Partitions"
 msgstr "显示分区"
 
-#: src/catalog/templates/describe_table.mako:101
+#: src/metastore/templates/describe_table.mako:101
 msgid "Error!"
 msgstr "错误!"
 
-#: src/catalog/templates/describe_table.mako:138
+#: src/metastore/templates/describe_table.mako:138
 msgid "Drop Table"
 msgstr "删除表"
 
-#: src/catalog/templates/describe_table.mako:146
+#: src/metastore/templates/describe_table.mako:146
 msgid "Yes, drop this table"
 msgstr "是,删除此表"
 
-#: src/catalog/templates/tables.mako:23
+#: src/metastore/templates/tables.mako:23
 msgid "Tables"
 msgstr "表"
 
-#: src/catalog/templates/tables.mako:26
+#: src/metastore/templates/tables.mako:26
 #, fuzzy, python-format
 msgid "Database %s"
 msgstr "数据库 %s"
 
-#: src/catalog/templates/tables.mako:33
+#: src/metastore/templates/tables.mako:33
 msgid "database"
 msgstr "数据库"
 
-#: src/catalog/templates/tables.mako:41
+#: src/metastore/templates/tables.mako:41
 msgid "Create a new table from a file"
 msgstr "从文件中创建一个新表"
 
-#: src/catalog/templates/tables.mako:42
+#: src/metastore/templates/tables.mako:42
 msgid "Create a new table manually"
 msgstr "手动创建一个新表"
 
-#: src/catalog/templates/tables.mako:49 src/catalog/templates/tables.mako:50
+#: src/metastore/templates/tables.mako:49 src/metastore/templates/tables.mako:50
 msgid "Browse the selected table"
 msgstr "浏览所选表"
 
-#: src/catalog/templates/tables.mako:51
+#: src/metastore/templates/tables.mako:51
 msgid "Delete the selected tables"
 msgstr "删除所选表"
 
-#: src/catalog/templates/tables.mako:58
+#: src/metastore/templates/tables.mako:58
 msgid "Table Name"
 msgstr "表名"
 
-#: src/catalog/templates/util.mako:66
+#: src/metastore/templates/util.mako:66
 msgid "Unsaved Query"
 msgstr "未保存的查询"
 
-#: src/catalog/templates/util.mako:71
+#: src/metastore/templates/util.mako:71
 msgid "Query Results"
 msgstr "查询结果"
 
-#: src/catalog/templates/popups/load_data.mako:25
+#: src/metastore/templates/popups/load_data.mako:25
 msgid "Import data"
 msgstr "导入数据"
 
-#: src/catalog/templates/popups/load_data.mako:50
+#: src/metastore/templates/popups/load_data.mako:50
 msgid "Overwrite existing data"
 msgstr "覆盖现有数据"
 
-#: src/catalog/templates/popups/load_data.mako:55
+#: src/metastore/templates/popups/load_data.mako:55
 msgid "Note that loading data will move data from its location into the table's storage location."
 msgstr "请注意,数据加载过程会将数据从其位置移至表的存储位置。"
 
-#: src/catalog/templates/popups/load_data.mako:61
+#: src/metastore/templates/popups/load_data.mako:61
 msgid "Submit"
 msgstr "提交"
 

+ 0 - 0
apps/catalog/src/catalog/models.py → apps/metastore/src/metastore/models.py


+ 2 - 2
apps/catalog/src/catalog/settings.py → apps/metastore/src/metastore/settings.py

@@ -15,10 +15,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-DJANGO_APPS = ['catalog']
+DJANGO_APPS = ['metastore']
 NICE_NAME = "Metastore Manager"
 REQUIRES_HADOOP = True
-ICON = "/catalog/static/art/table-browser-24-1.png"
+ICON = "/metastore/static/art/table-browser-24-1.png"
 MENU_INDEX = 20
 
 IS_URL_NAMESPACED = True

+ 1 - 1
apps/catalog/src/catalog/templates/components.mako → apps/metastore/src/metastore/templates/components.mako

@@ -21,7 +21,7 @@
 <%def name="breadcrumbs(breadcrumbs)">
   <ul class="nav nav-pills hueBreadcrumbBar" id="breadcrumbs">
     <li>
-      <a href="${url('catalog:databases')}"><i class="icon-sitemap"></i> ${_('Databases')}</a>
+      <a href="${url('metastore:databases')}"><i class="icon-sitemap"></i> ${_('Databases')}</a>
     </li>
     <li>
       <ul class="hueBreadcrumb">

+ 0 - 0
apps/catalog/src/catalog/templates/confirm.html → apps/metastore/src/metastore/templates/confirm.html


+ 6 - 6
apps/catalog/src/catalog/templates/databases.mako → apps/metastore/src/metastore/templates/databases.mako

@@ -20,7 +20,7 @@ from django.utils.translation import ugettext as _
 <%namespace name="actionbar" file="actionbar.mako" />
 <%namespace name="components" file="components.mako" />
 
-${ commonheader(_('Databases'), 'catalog', user) | n,unicode }
+${ commonheader(_('Databases'), 'metastore', user) | n,unicode }
 
 <div class="container-fluid" id="databases">
     <h1>${_('Databases')}</h1>
@@ -52,12 +52,12 @@ ${ commonheader(_('Databases'), 'catalog', user) | n,unicode }
                   <tr>
                     <td data-row-selector-exclude="true" width="1%">
                       <div class="hueCheckbox databaseCheck"
-                           data-view-url="${ url('catalog:show_tables', database=database) }"
+                           data-view-url="${ url('metastore:show_tables', database=database) }"
                            data-drop-name="${ database }"
                            data-row-selector-exclude="true"></div>
                     </td>
                     <td>
-                      <a href="${ url('catalog:show_tables', database=database) }" data-row-selector="true">${ database }</a>
+                      <a href="${ url('metastore:show_tables', database=database) }" data-row-selector="true">${ database }</a>
                     </td>
                   </tr>
                 % endfor
@@ -68,7 +68,7 @@ ${ commonheader(_('Databases'), 'catalog', user) | n,unicode }
 </div>
 
 <div id="dropDatabase" class="modal hide fade">
-  <form id="dropDatabaseForm" action="${ url('catalog:drop_database') }" method="POST">
+  <form id="dropDatabaseForm" action="${ url('metastore:drop_database') }" method="POST">
     <div class="modal-header">
       <a href="#" class="close" data-dismiss="modal">&times;</a>
       <h3 id="dropDatabaseMessage">${_('Confirm action')}</h3>
@@ -83,7 +83,7 @@ ${ commonheader(_('Databases'), 'catalog', user) | n,unicode }
   </form>
 </div>
 
-<link rel="stylesheet" href="/catalog/static/css/catalog.css" type="text/css">
+<link rel="stylesheet" href="/metastore/static/css/metastore.css" type="text/css">
 
 <script src="/static/ext/js/jquery/plugins/jquery.cookie.js"></script>
 <script src="/static/ext/js/knockout-2.1.0.js" type="text/javascript" charset="utf-8"></script>
@@ -151,7 +151,7 @@ ${ commonheader(_('Databases'), 'catalog', user) | n,unicode }
     }
 
     $("#dropBtn").click(function () {
-      $.getJSON("${ url('catalog:drop_database') }", function(data) {
+      $.getJSON("${ url('metastore:drop_database') }", function(data) {
         $("#dropDatabaseMessage").text(data.title);
       });
       viewModel.chosenDatabases.removeAll();

+ 3 - 3
apps/catalog/src/catalog/templates/describe_partitions.mako → apps/metastore/src/metastore/templates/describe_partitions.mako

@@ -32,7 +32,7 @@ ${ commonheader(_('Table Partitions: %(tableName)s') % dict(tableName=table.name
       <div class="well sidebar-nav">
         <ul class="nav nav-list">
           <li class="nav-header">${_('Actions')}</li>
-          <li><a href="${ url('catalog:describe_table', database=database, table=table.name) }">${_('Show Table')}</a></li>
+          <li><a href="${ url('metastore:describe_table', database=database, table=table.name) }">${_('Show Table')}</a></li>
           <li style="height: 30px"></li>
         </ul>
       </div>
@@ -49,7 +49,7 @@ ${ commonheader(_('Table Partitions: %(tableName)s') % dict(tableName=table.name
           % for partition_id, partition in enumerate(partitions):
             <tr>
             % for idx, key in enumerate(partition.values):
-                <td><a href="${ url('catalog:read_partition', database=database, table=table.name, partition_id=partition_id) }" data-row-selector="true">${key}</a></td>
+                <td><a href="${ url('metastore:read_partition', database=database, table=table.name, partition_id=partition_id) }" data-row-selector="true">${key}</a></td>
             % endfor
             <% location = location_to_url(partition.sd.location) %>
             % if url:
@@ -71,7 +71,7 @@ ${ commonheader(_('Table Partitions: %(tableName)s') % dict(tableName=table.name
   </div>
 </div>
 
-<link rel="stylesheet" href="/catalog/static/css/catalog.css" type="text/css">
+<link rel="stylesheet" href="/metastore/static/css/metastore.css" type="text/css">
 
 <script type="text/javascript" charset="utf-8">
   $(document).ready(function () {

+ 6 - 6
apps/catalog/src/catalog/templates/describe_table.mako → apps/metastore/src/metastore/templates/describe_table.mako

@@ -61,11 +61,11 @@ ${ commonheader(_("%s : %s") % (view_or_table_noun, table.name), app_name, user)
                 <ul class="nav nav-list">
                     <li class="nav-header">${_('Actions')}</li>
                     <li><a href="#" id="import-data-btn">${_('Import Data')}</a></li>
-                    <li><a href="${ url('catalog:read_table', database=database, table=table.name) }">${_('Browse Data')}</a></li>
+                    <li><a href="${ url('metastore:read_table', database=database, table=table.name) }">${_('Browse Data')}</a></li>
                     <li><a href="#dropTable" data-toggle="modal">${_('Drop')} ${view_or_table_noun}</a></li>
                     <li><a href="${ table.hdfs_link }" rel="${ table.path_location }">${_('View File Location')}</a></li>
                     % if table.partition_keys:
-                      <li><a href="${ url('catalog:describe_partitions', database=database, table=table.name) }">${_('Show Partitions')} (${ len(partitions) })</a></li>
+                      <li><a href="${ url('metastore:describe_partitions', database=database, table=table.name) }">${_('Show Partitions')} (${ len(partitions) })</a></li>
                     % endif
                 </ul>
             </div>
@@ -134,7 +134,7 @@ ${ commonheader(_("%s : %s") % (view_or_table_noun, table.name), app_name, user)
 
 
 <div id="dropTable" class="modal hide fade">
-    <form id="dropTableForm" method="POST" action="${ url('catalog:drop_table', database=database) }">
+    <form id="dropTableForm" method="POST" action="${ url('metastore:drop_table', database=database) }">
     <div class="modal-header">
         <a href="#" class="close" data-dismiss="modal">&times;</a>
         <h3>${_('Drop Table')}</h3>
@@ -166,7 +166,7 @@ ${ commonheader(_("%s : %s") % (view_or_table_noun, table.name), app_name, user)
    }
 </style>
 
-<link rel="stylesheet" href="/catalog/static/css/catalog.css" type="text/css">
+<link rel="stylesheet" href="/metastore/static/css/metastore.css" type="text/css">
 
 <script type="text/javascript" charset="utf-8">
    $(document).ready(function () {
@@ -181,7 +181,7 @@ ${ commonheader(_("%s : %s") % (view_or_table_noun, table.name), app_name, user)
        }
      });
 
-     $.getJSON("${ url('catalog:drop_table', database=database) }", function(data) {
+     $.getJSON("${ url('metastore:drop_table', database=database) }", function(data) {
        $("#dropTableMessage").text(data.title);
      });
 
@@ -206,7 +206,7 @@ ${ commonheader(_("%s : %s") % (view_or_table_noun, table.name), app_name, user)
      })
 
     $("#import-data-btn").click(function () {
-      $.get("${ url('catalog:load_table', database=database, table=table.name) }", function (response) {
+      $.get("${ url('metastore:load_table', database=database, table=table.name) }", function (response) {
           $("#import-data-modal").html(response['data']);
           $("#import-data-modal").modal("show");
         }

+ 1 - 1
apps/catalog/src/catalog/templates/popups/load_data.mako → apps/metastore/src/metastore/templates/popups/load_data.mako

@@ -108,7 +108,7 @@ from django.utils.translation import ugettext as _
      });
 
    $("#load-data-submit-btn").click(function(e){
-     $.post("${ url('catalog:load_table', database=database, table=table.name) }",
+     $.post("${ url('metastore:load_table', database=database, table=table.name) }",
        $("#load-data-form").serialize(),
         function (response) {
           if (response['status'] != 0) {

+ 8 - 8
apps/catalog/src/catalog/templates/tables.mako → apps/metastore/src/metastore/templates/tables.mako

@@ -20,7 +20,7 @@ from django.utils.translation import ugettext as _
 <%namespace name="actionbar" file="actionbar.mako" />
 <%namespace name="components" file="components.mako" />
 
-${ commonheader(_('Tables'), 'catalog', user) | n,unicode }
+${ commonheader(_('Tables'), 'metastore', user) | n,unicode }
 
 <div class="container-fluid" id="tables">
     <h1>${_('Database %s') % database}</h1>
@@ -32,7 +32,7 @@ ${ commonheader(_('Tables'), 'catalog', user) | n,unicode }
                     <span>
                     <li class="nav-header">${_('database')}</li>
                     <li>
-                       <form action="${ url('catalog:show_tables') }" id="db_form" method="POST">
+                       <form action="${ url('metastore:show_tables') }" id="db_form" method="POST">
                          ${ db_form | n,unicode }
                        </form>
                     </li>
@@ -63,13 +63,13 @@ ${ commonheader(_('Tables'), 'catalog', user) | n,unicode }
                   <tr>
                     <td data-row-selector-exclude="true" width="1%">
                       <div class="hueCheckbox tableCheck"
-                           data-view-url="${ url('catalog:describe_table', database=database, table=table) }"
-                           data-browse-url="${ url('catalog:read_table', database=database, table=table) }"
+                           data-view-url="${ url('metastore:describe_table', database=database, table=table) }"
+                           data-browse-url="${ url('metastore:read_table', database=database, table=table) }"
                            data-drop-name="${ table }"
                            data-row-selector-exclude="true"></div>
                     </td>
                     <td>
-                      <a href="${ url('catalog:describe_table', database=database, table=table) }" data-row-selector="true">${ table }</a>
+                      <a href="${ url('metastore:describe_table', database=database, table=table) }" data-row-selector="true">${ table }</a>
                     </td>
                   </tr>
                 % endfor
@@ -80,7 +80,7 @@ ${ commonheader(_('Tables'), 'catalog', user) | n,unicode }
 </div>
 
 <div id="dropTable" class="modal hide fade">
-  <form id="dropTableForm" action="${ url('catalog:drop_table', database=database) }" method="POST">
+  <form id="dropTableForm" action="${ url('metastore:drop_table', database=database) }" method="POST">
     <div class="modal-header">
       <a href="#" class="close" data-dismiss="modal">&times;</a>
       <h3 id="dropTableMessage">${_('Confirm action')}</h3>
@@ -95,7 +95,7 @@ ${ commonheader(_('Tables'), 'catalog', user) | n,unicode }
   </form>
 </div>
 
-<link rel="stylesheet" href="/catalog/static/css/catalog.css" type="text/css">
+<link rel="stylesheet" href="/metastore/static/css/metastore.css" type="text/css">
 
 <script src="/static/ext/js/jquery/plugins/jquery.cookie.js"></script>
 <script src="/static/ext/js/knockout-2.1.0.js" type="text/javascript" charset="utf-8"></script>
@@ -180,7 +180,7 @@ ${ commonheader(_('Tables'), 'catalog', user) | n,unicode }
     }
 
     $("#dropBtn").click(function () {
-      $.getJSON("${ url('catalog:drop_table', database=database) }", function(data) {
+      $.getJSON("${ url('metastore:drop_table', database=database) }", function(data) {
         $("#dropTableMessage").text(data.title);
       });
       viewModel.chosenTables.removeAll();

+ 0 - 0
apps/catalog/src/catalog/templates/util.mako → apps/metastore/src/metastore/templates/util.mako


+ 20 - 20
apps/catalog/src/catalog/tests.py → apps/metastore/src/metastore/tests.py

@@ -56,7 +56,7 @@ def _make_query(client, query, submission_type="Execute",
   return res
 
 
-class TestCatalogWithHadoop(BeeswaxSampleProvider):
+class TestMetastoreWithHadoop(BeeswaxSampleProvider):
   requires_hadoop = True
 
   def setUp(self):
@@ -65,29 +65,29 @@ class TestCatalogWithHadoop(BeeswaxSampleProvider):
 
   def test_basic_flow(self):
     # Default database should exist
-    response = self.client.get("/catalog/databases")
+    response = self.client.get("/metastore/databases")
     assert_true("default" in response.context["databases"])
 
     # Table should have been created
-    response = self.client.get("/catalog/tables/")
+    response = self.client.get("/metastore/tables/")
     assert_true("test" in response.context["tables"])
 
     # Switch databases
-    response = self.client.get("/catalog/tables/default")
+    response = self.client.get("/metastore/tables/default")
     assert_true("test" in response.context["tables"])
 
-    response = self.client.get("/catalog/tables/not_there")
+    response = self.client.get("/metastore/tables/not_there")
     assert_false("test" in response.context["tables"])
 
     # And have detail
-    response = self.client.get("/catalog/table/default/test")
+    response = self.client.get("/metastore/table/default/test")
     assert_true("foo" in response.content)
 
     # Remember the number of history items. Use a generic fragment 'test' to pass verification.
     history_cnt = verify_history(self.client, fragment='test')
 
     # Show table data.
-    response = self.client.get("/catalog/table/default/test/read", follow=True)
+    response = self.client.get("/metastore/table/default/test/read", follow=True)
     response = wait_for_query_to_finish(self.client, response, max=30.0)
     # Note that it may not return all rows at once. But we expect at least 10.
     assert_true(len(response.context['results']) > 10)
@@ -101,7 +101,7 @@ class TestCatalogWithHadoop(BeeswaxSampleProvider):
     assert_equal(str(response.context['query_context'][1]), 'test:default')
 
   def test_describe_view(self):
-    resp = self.client.get('/catalog/table/default/myview')
+    resp = self.client.get('/metastore/table/default/myview')
     assert_equal(None, resp.context['sample'])
     assert_true(resp.context['table'].is_view)
     assert_true("View" in resp.content)
@@ -111,10 +111,10 @@ class TestCatalogWithHadoop(BeeswaxSampleProvider):
     assert_true("myview" in resp.content)
 
   def test_describe_partitions(self):
-    response = self.client.get("/catalog/table/default/test_partitions")
+    response = self.client.get("/metastore/table/default/test_partitions")
     assert_true("Show Partitions (1)" in response.content)
 
-    response = self.client.get("/catalog/table/default/test_partitions/partitions", follow=True)
+    response = self.client.get("/metastore/table/default/test_partitions/partitions", follow=True)
     assert_true("baz_one" in response.content)
     assert_true("boom_two" in response.content)
     # Breadcrumbs
@@ -123,14 +123,14 @@ class TestCatalogWithHadoop(BeeswaxSampleProvider):
     assert_true("partitions" in response.content)
 
     # Not partitioned
-    response = self.client.get("/catalog/table/default/test/partitions", follow=True)
+    response = self.client.get("/metastore/table/default/test/partitions", follow=True)
     assert_true("is not partitioned." in response.content)
 
   def test_browse_partitions_with_limit(self):
     # Limit to 90
     finish = BROWSE_PARTITIONED_TABLE_LIMIT.set_for_testing("90")
     try:
-      response = self.client.get("/catalog/table/default/test_partitions")
+      response = self.client.get("/metastore/table/default/test_partitions")
       assert_true("0x%x" % 89 in response.content, response.content)
       assert_false("0x%x" % 90 in response.content, response.content)
     finally:
@@ -146,9 +146,9 @@ class TestCatalogWithHadoop(BeeswaxSampleProvider):
     resp = wait_for_query_to_finish(self.client, resp, max=30.0)
 
     # Drop them
-    resp = self.client.get('/catalog/tables/drop/default', follow=True)
+    resp = self.client.get('/metastore/tables/drop/default', follow=True)
     assert_true('want to delete' in resp.content, resp.content)
-    resp = self.client.post('/catalog/tables/drop/default', {u'table_selection': [u'test_drop_1', u'test_drop_2', u'test_drop_3']})
+    resp = self.client.post('/metastore/tables/drop/default', {u'table_selection': [u'test_drop_1', u'test_drop_2', u'test_drop_3']})
     assert_equal(resp.status_code, 302)
 
 
@@ -162,9 +162,9 @@ class TestCatalogWithHadoop(BeeswaxSampleProvider):
     resp = wait_for_query_to_finish(self.client, resp, max=30.0)
 
     # Drop them
-    resp = self.client.get('/catalog/databases/drop', follow=True)
+    resp = self.client.get('/metastore/databases/drop', follow=True)
     assert_true('want to delete' in resp.content, resp.content)
-    resp = self.client.post('/catalog/databases/drop', {u'database_selection': [u'test_drop_1', u'test_drop_2', u'test_drop_3']})
+    resp = self.client.post('/metastore/databases/drop', {u'database_selection': [u'test_drop_1', u'test_drop_2', u'test_drop_3']})
     assert_equal(resp.status_code, 302)
 
 
@@ -175,21 +175,21 @@ class TestCatalogWithHadoop(BeeswaxSampleProvider):
     about whether a table is partitioned.
     """
     # Check that view works
-    resp = self.client.get("/catalog/table/default/test/load", follow=True)
+    resp = self.client.get("/metastore/table/default/test/load", follow=True)
     assert_true('Path' in resp.content)
 
     # Try the submission
-    self.client.post("/catalog/table/default/test/load", dict(path="/tmp/foo", overwrite=True), follow=True)
+    self.client.post("/metastore/table/default/test/load", dict(path="/tmp/foo", overwrite=True), follow=True)
     query = QueryHistory.objects.latest('id')
 
     assert_equal_mod_whitespace("LOAD DATA INPATH '/tmp/foo' OVERWRITE INTO TABLE `default.test`", query.query)
 
-    resp = self.client.post("/catalog/table/default/test/load", dict(path="/tmp/foo", overwrite=False), follow=True)
+    resp = self.client.post("/metastore/table/default/test/load", dict(path="/tmp/foo", overwrite=False), follow=True)
     query = QueryHistory.objects.latest('id')
     assert_equal_mod_whitespace("LOAD DATA INPATH '/tmp/foo' INTO TABLE `default.test`", query.query)
 
     # Try it with partitions
-    resp = self.client.post("/catalog/table/default/test_partitions/load", dict(path="/tmp/foo", partition_0="alpha", partition_1="beta"), follow=True)
+    resp = self.client.post("/metastore/table/default/test_partitions/load", dict(path="/tmp/foo", partition_0="alpha", partition_1="beta"), follow=True)
     query = QueryHistory.objects.latest('id')
     assert_equal_mod_whitespace("LOAD DATA INPATH '/tmp/foo' INTO TABLE `default.test_partitions` PARTITION (baz='alpha', boom='beta')",
         query.query)

+ 1 - 1
apps/catalog/src/catalog/urls.py → apps/metastore/src/metastore/urls.py

@@ -17,7 +17,7 @@
 
 from django.conf.urls.defaults import patterns, url
 
-urlpatterns = patterns('catalog.views',
+urlpatterns = patterns('metastore.views',
   url(r'^$', 'index', name='index'),
 
   url(r'^databases/?$', 'databases', name='databases'),

+ 11 - 11
apps/catalog/src/catalog/views.py → apps/metastore/src/metastore/views.py

@@ -32,14 +32,14 @@ from desktop.lib.exceptions_renderable import PopupException
 from beeswax.models import SavedQuery, MetaInstall
 from beeswax.server import dbms
 
-from catalog.forms import LoadDataForm, DbForm
+from metastore.forms import LoadDataForm, DbForm
 
 LOG = logging.getLogger(__name__)
 SAVE_RESULTS_CTAS_TIMEOUT = 300         # seconds
 
 
 def index(request):
-  return redirect(reverse('catalog:show_tables'))
+  return redirect(reverse('metastore:show_tables'))
 
 
 """
@@ -67,7 +67,7 @@ def drop_database(request):
       # Can't be simpler without an important refactoring
       design = SavedQuery.create_empty(app_name='beeswax', owner=request.user)
       query_history = db.drop_databases(databases, design)
-      url = reverse('beeswax:watch_query', args=[query_history.id]) + '?on_success_url=' + reverse('catalog:databases')
+      url = reverse('beeswax:watch_query', args=[query_history.id]) + '?on_success_url=' + reverse('metastore:databases')
       return redirect(url)
     except Exception, ex:
       error_message, log = dbms.expand_exception(ex, db)
@@ -103,7 +103,7 @@ def show_tables(request, database=None):
     'breadcrumbs': [
       {
         'name': database,
-        'url': reverse('catalog:show_tables', kwargs={'database': database})
+        'url': reverse('metastore:show_tables', kwargs={'database': database})
       }
     ],
     'tables': tables,
@@ -133,10 +133,10 @@ def describe_table(request, database, table):
   return render("describe_table.mako", request, {
     'breadcrumbs': [{
         'name': database,
-        'url': reverse('catalog:show_tables', kwargs={'database': database})
+        'url': reverse('metastore:show_tables', kwargs={'database': database})
       }, {
         'name': str(table.name),
-        'url': reverse('catalog:describe_table', kwargs={'database': database, 'table': table.name})
+        'url': reverse('metastore:describe_table', kwargs={'database': database, 'table': table.name})
       },
     ],
     'table': table,
@@ -157,7 +157,7 @@ def drop_table(request, database):
       # Can't be simpler without an important refactoring
       design = SavedQuery.create_empty(app_name='beeswax', owner=request.user)
       query_history = db.drop_tables(database, tables_objects, design)
-      url = reverse('beeswax:watch_query', args=[query_history.id]) + '?on_success_url=' + reverse('catalog:show_tables')
+      url = reverse('beeswax:watch_query', args=[query_history.id]) + '?on_success_url=' + reverse('metastore:show_tables')
       return redirect(url)
     except Exception, ex:
       error_message, log = dbms.expand_exception(ex, db)
@@ -200,7 +200,7 @@ def load_table(request, database, table):
     load_form = LoadDataForm(table, request.POST)
 
     if load_form.is_valid():
-      on_success_url = reverse('catalog:describe_table', kwargs={'database': database, 'table': table.name})
+      on_success_url = reverse('metastore:describe_table', kwargs={'database': database, 'table': table.name})
       try:
         design = SavedQuery.create_empty(app_name='beeswax', owner=request.user)
         query_history = db.load_data(database, table, load_form, design)
@@ -238,15 +238,15 @@ def describe_partitions(request, database, table):
       {'breadcrumbs': [
         {
           'name': database,
-          'url': reverse('catalog:show_tables', kwargs={'database': database})
+          'url': reverse('metastore:show_tables', kwargs={'database': database})
         },
         {
           'name': table,
-          'url': reverse('catalog:describe_table', kwargs={'database': database, 'table': table})
+          'url': reverse('metastore:describe_table', kwargs={'database': database, 'table': table})
         },
         {
           'name': 'partitions',
-          'url': reverse('catalog:describe_partitions', kwargs={'database': database, 'table': table})
+          'url': reverse('metastore:describe_partitions', kwargs={'database': database, 'table': table})
         },
       ],
       'database': database, 'table': table_obj, 'partitions': partitions, 'request': request})

+ 0 - 0
apps/catalog/static/art/table-browser-24-1.png → apps/metastore/static/art/table-browser-24-1.png


+ 0 - 0
apps/catalog/static/css/catalog.css → apps/metastore/static/css/metastore.css


+ 30 - 30
apps/catalog/static/help/index.html → apps/metastore/static/help/index.html

@@ -1,9 +1,9 @@
-<h1><a name="Catalog-IntroducingCatalog"></a>Introducing Table Browser</h1>
+<h1><a name="Metastore-IntroducingMetastore"></a>Introducing Table Browser</h1>
 
 <p>The Table Browser application enables you to browse tables and partitions of a Hive database. For information about Hive, see <a href="http://archive.cloudera.com/cdh4/cdh/4/hive/">Hive Documentation</a>. You can create Hive tables, view Hive tables, and load data into Hive tables.</p>
 
 
-<h2><a name="Catalog-Contents"></a>Contents</h2>
+<h2><a name="Metastore-Contents"></a>Contents</h2>
 
 <style type='text/css'>/*<![CDATA[*/
 div.rbtoc1359395567394 {margin-left: 1.5em;padding: 0px;}
@@ -12,41 +12,41 @@ div.rbtoc1359395567394 li {margin-left: 0px;padding-left: 0px;}
 
 /*]]>*/</style><div class='rbtoc1359395567394'>
 <ul>
-    <li><a href='#Catalog-IntroducingCatalog'>Introducing Table Browser</a></li>
-    <li><a href='#Catalog-CatalogandHiveInstallationandConfiguration'>Table Browser and Hive Installation and Configuration</a></li>
-    <li><a href='#Catalog-StartingCatalog'>Starting Table Browser</a></li>
+    <li><a href='#Metastore-IntroducingMetastore'>Introducing Table Browser</a></li>
+    <li><a href='#Metastore-MetastoreandHiveInstallationandConfiguration'>Table Browser and Hive Installation and Configuration</a></li>
+    <li><a href='#Metastore-StartingMetastore'>Starting Table Browser</a></li>
 <ul>
 <ul>
-    <li><a href='#Catalog-InstallingtheSampleTables'>Installing the Sample Tables</a></li>
-    <li><a href='#Catalog-ImportingYourOwnData'>Importing Your Own Data</a></li>
+    <li><a href='#Metastore-InstallingtheSampleTables'>Installing the Sample Tables</a></li>
+    <li><a href='#Metastore-ImportingYourOwnData'>Importing Your Own Data</a></li>
 </ul>
 </ul>
-    <li><a href='#Catalog-WorkingwithTables'>Working with Tables</a></li>
+    <li><a href='#Metastore-WorkingwithTables'>Working with Tables</a></li>
 <ul>
 <ul>
-    <li><a href='#Catalog-SelectingtheDatabase'>Selecting the Database</a></li>
-    <li><a href='#Catalog-CreatingTables'>Creating Tables</a></li>
-    <li><a href='#Catalog-BrowsingTables'>Browsing Tables</a></li>
-    <li><a href='#Catalog-ImportingDataintoTables'>Importing Data into Tables</a></li>
-    <li><a href='#Catalog-DroppingTables'>Dropping Tables</a></li>
-    <li><a href='#Catalog-ViewingaTable%27sLocation'>Viewing a Table's Location</a></li>
+    <li><a href='#Metastore-SelectingtheDatabase'>Selecting the Database</a></li>
+    <li><a href='#Metastore-CreatingTables'>Creating Tables</a></li>
+    <li><a href='#Metastore-BrowsingTables'>Browsing Tables</a></li>
+    <li><a href='#Metastore-ImportingDataintoTables'>Importing Data into Tables</a></li>
+    <li><a href='#Metastore-DroppingTables'>Dropping Tables</a></li>
+    <li><a href='#Metastore-ViewingaTable%27sLocation'>Viewing a Table's Location</a></li>
 </ul>
 </ul>
 </ul></div>
 <p><br class="atl-forced-newline" /></p>
 
-<h1><a name="Catalog-CatalogandHiveInstallationandConfiguration"></a>Table Browser and Hive Installation and Configuration</h1>
+<h1><a name="Metastore-MetastoreandHiveInstallationandConfiguration"></a>Table Browser and Hive Installation and Configuration</h1>
 
 <p>Table Browser is installed and configured as part of Hue. For information about installing and configuring Hue, see <a href="https://ccp.cloudera.com/display/CDH4DOC/Hue+Installation">Hue Installation</a>.</p>
 
 <p>Table Browser depends on the Beeswax application being installed and available.</p>
 
 
-<h1><a name="Catalog-StartingCatalog"></a>Starting Table Browser</h1>
+<h1><a name="Metastore-StartingMetastore"></a>Starting Table Browser</h1>
 
-<p>To start the Table Browser application, click the <b>Table Browser</b> icon (<span class="image-wrap" style=""><img src="/catalog/static/art/table-browser-24-1.png" width="30" style="border: 0px solid black"/></span>) in the navigation bar at the top of the Hue browser page.</p>
+<p>To start the Table Browser application, click the <b>Table Browser</b> icon (<span class="image-wrap" style=""><img src="/metastore/static/art/table-browser-24-1.png" width="30" style="border: 0px solid black"/></span>) in the navigation bar at the top of the Hue browser page.</p>
 
-<h3><a name="Catalog-InstallingtheSampleTables"></a>Installing the Sample Tables</h3>
+<h3><a name="Metastore-InstallingtheSampleTables"></a>Installing the Sample Tables</h3>
 
 <p>You can install two sample tables to use as examples.</p>
 
@@ -58,13 +58,13 @@ div.rbtoc1359395567394 li {margin-left: 0px;padding-left: 0px;}
 
 <p>Once you have installed the sample data, you will no longer see the <b>Install samples</b> link.</p>
 
-<h3><a name="Catalog-ImportingYourOwnData"></a>Importing Your Own Data</h3>
+<h3><a name="Metastore-ImportingYourOwnData"></a>Importing Your Own Data</h3>
 
-<p>If you want to import your own data instead of installing the sample tables, following the procedure in <a href="#Catalog-CreatingTables">Creating Tables</a>.</p>
+<p>If you want to import your own data instead of installing the sample tables, following the procedure in <a href="#Metastore-CreatingTables">Creating Tables</a>.</p>
 
-<p><a name="Catalog-CreatingTables"></a></p>
+<p><a name="Metastore-CreatingTables"></a></p>
 
-<h3><a name="Catalog-CreatingTables"></a>Creating Tables</h3>
+<h3><a name="Metastore-CreatingTables"></a>Creating Tables</h3>
 
 <p>Although you can create tables by executing the appropriate HQL DDL query commands, it is easier to create a table using the Table Browser table creation wizard.</p>
 
@@ -129,9 +129,9 @@ The Table Metadata window displays.</li>
 </ol>
 
 
-<p><a name="Catalog-BrowsingTables"></a></p>
+<p><a name="Metastore-BrowsingTables"></a></p>
 
-<h3><a name="Catalog-BrowsingTables"></a>Browsing Tables</h3>
+<h3><a name="Metastore-BrowsingTables"></a>Browsing Tables</h3>
 
 <p><b>To browse the data in a table:</b></p>
 
@@ -153,9 +153,9 @@ The table's metadata displays opened to the <b>Columns</b> tab. You can view the
 </ol>
 
 
-<p><a name="Catalog-ImportingDataintoTables"></a></p>
+<p><a name="Metastore-ImportingDataintoTables"></a></p>
 
-<h3><a name="Catalog-ImportingDataintoTables"></a>Importing Data into Tables</h3>
+<h3><a name="Metastore-ImportingDataintoTables"></a>Importing Data into Tables</h3>
 
 <p>When importing data, you can choose to append or overwrite the table's data with data from a file.</p>
 
@@ -181,9 +181,9 @@ The Table Metadata window displays.
 </ol>
 
 
-<p><a name="Catalog-DroppingTables"></a></p>
+<p><a name="Metastore-DroppingTables"></a></p>
 
-<h3><a name="Catalog-DroppingTables"></a>Dropping Tables</h3>
+<h3><a name="Metastore-DroppingTables"></a>Dropping Tables</h3>
 
 <p><b>To drop a table:</b></p>
 
@@ -201,9 +201,9 @@ The Table Metadata window displays.
 </ol>
 
 
-<p><a name="Catalog-ViewingaTable%27sLocation"></a></p>
+<p><a name="Metastore-ViewingaTable%27sLocation"></a></p>
 
-<h3><a name="Catalog-ViewingaTable%27sLocation"></a>Viewing a Table's Location</h3>
+<h3><a name="Metastore-ViewingaTable%27sLocation"></a>Viewing a Table's Location</h3>
 
 <p><b>To view a table's location:</b></p>