diff --git a/lib/galaxy/managers/base.py b/lib/galaxy/managers/base.py
index 1a3c23ab9e3..fe8d04995e8 100644
--- a/lib/galaxy/managers/base.py
+++ b/lib/galaxy/managers/base.py
@@ -1024,7 +1024,7 @@ class ModelFilterParser(HasAModelManager):
"id": {"op": ("in")},
"encoded_id": {"column": "id", "op": ("in"), "val": self.parse_id_list},
# dates can be directly passed through the orm into a filter (no need to parse into datetime object)
- "extension": {"op": ("eq", "like", "in")},
+ "extension": {"op": ("eq", "like", "in"), "val": {"in": lambda v: v.split(",")}},
"create_time": {"op": ("le", "ge", "lt", "gt"), "val": self.parse_date},
"update_time": {"op": ("le", "ge", "lt", "gt"), "val": self.parse_date},
}
@@ -1119,7 +1119,7 @@ class ModelFilterParser(HasAModelManager):
"""
Attempt to parse a non-ORM filter function.
"""
- # fn_filter_list is a dict: fn_filter_list[ attr ] = { 'opname1' : opfn1, 'opname2' : opfn2, etc. }
+ # fn_filter_parsers is a dict: fn_filter_parsers[attr] = {"opname1": opfn1, "opname2": opfn2, etc. }
# attr, op is a nested dictionary pointing to the filter fn
attr_map = self.fn_filter_parsers.get(attr, None)
@@ -1139,13 +1139,13 @@ class ModelFilterParser(HasAModelManager):
return self.parsed_filter(filter_type="function", filter=lambda i: filter_fn(i, val))
# ---- ORM filters
- def _parse_orm_filter(self, attr, op, val):
+ def _parse_orm_filter(self, attr, op, val) -> Optional[ParsedFilter]:
"""
Attempt to parse a ORM-based filter.
Using SQLAlchemy, this would yield a sql.elements.BinaryExpression.
"""
- # orm_filter_list is a dict: orm_filter_list[ attr ] =
+ # orm_filter_parsers is a dict: orm_filter_parsers[attr] =
column_map = self.orm_filter_parsers.get(attr, None)
if not column_map:
# no column mapping (not allowlisted)
@@ -1168,16 +1168,20 @@ class ModelFilterParser(HasAModelManager):
allowed_ops = column_map["op"]
if op not in allowed_ops:
return None
- op = self._convert_op_string_to_fn(column, op)
- if not op:
+ converted_op = self._convert_op_string_to_fn(column, op)
+ if not converted_op:
return None
# parse the val from string using the 'val' parser if present (otherwise, leave as string)
- val_parser = column_map.get("val", None)
+ val_parser = column_map.get("val")
+ # val_parser can be a dictionary indexed by the operations, in case different functions
+ # need to be called depending on the operation
+ if isinstance(val_parser, dict):
+ val_parser = val_parser.get(op)
if val_parser:
val = val_parser(val)
- orm_filter = op(val)
+ orm_filter = converted_op(val)
return self.parsed_filter(filter_type="orm", filter=orm_filter)
#: these are the easier/shorter string equivalents to the python operator fn names that need '__' around them
@@ -1215,7 +1219,7 @@ class ModelFilterParser(HasAModelManager):
# TODO: These should go somewhere central - we've got ~6 parser modules/sections now
def parse_id_list(self, id_list_string, sep=","):
"""
- Split `id_list_string` at `sep`.
+ Split `id_list_string` at `sep` and decode as ids.
"""
# TODO: move id decoding out
id_list = [self.app.security.decode_id(id_) for id_ in id_list_string.split(sep)]
diff --git a/lib/galaxy/webapps/base/webapp.py b/lib/galaxy/webapps/base/webapp.py
index 67a2a06604d..2ac753025e5 100644
--- a/lib/galaxy/webapps/base/webapp.py
+++ b/lib/galaxy/webapps/base/webapp.py
@@ -19,8 +19,6 @@ from urllib.parse import urlparse
import mako.lookup
import mako.runtime
from apispec import APISpec
-from babel import Locale
-from babel.support import Translations
from sqlalchemy import (
and_,
true,
@@ -281,7 +279,6 @@ class GalaxyWebTransaction(base.DefaultWebTransaction, context.ProvidesHistoryCo
self.user_manager = app[UserManager]
self.session_manager = app[GalaxySessionManager]
base.DefaultWebTransaction.__init__(self, environ)
- self.setup_i18n()
self.expunge_all()
config = self.app.config
self.debug = asbool(config.get("debug", False))
@@ -369,22 +366,6 @@ class GalaxyWebTransaction(base.DefaultWebTransaction, context.ProvidesHistoryCo
def url_builder(self):
return url_builder
- def setup_i18n(self):
- locales = []
- if "HTTP_ACCEPT_LANGUAGE" in self.environ:
- # locales looks something like: ['en', 'en-us;q=0.7', 'ja;q=0.3']
- client_locales = self.environ["HTTP_ACCEPT_LANGUAGE"].split(",")
- for locale in client_locales:
- try:
- locales.append(Locale.parse(locale.split(";")[0].strip(), sep="-").language)
- except Exception as e:
- log.debug("Error parsing locale '%s'. %s: %s", locale, type(e), e)
- if not locales:
- # Default to English
- locales = "en"
- t = Translations.load(dirname="locale", locales=locales, domain="ginga")
- self.template_context.update(dict(_=t.ugettext, n_=t.ugettext, N_=t.ungettext))
-
def set_cors_allow(self, name=None, value=None):
acr = "Access-Control-Request-"
if name is None:
diff --git a/lib/galaxy_test/api/test_datasets.py b/lib/galaxy_test/api/test_datasets.py
index 9da98f0845e..b4ea953f42d 100644
--- a/lib/galaxy_test/api/test_datasets.py
+++ b/lib/galaxy_test/api/test_datasets.py
@@ -216,6 +216,39 @@ class DatasetsApiTestCase(ApiTestCase):
result = self._get("datasets", payload).json()
assert len(result) == 0
+ def test_search_by_extension(self):
+ self.dataset_populator.new_dataset(self.history_id, wait=True)
+ payload = {
+ "q": ["extension"],
+ "qv": ["txt"],
+ "history_id": self.history_id,
+ }
+ assert len(self._get("datasets", payload).json()) == 1
+ payload = {
+ "q": ["extension"],
+ "qv": ["bam"],
+ "history_id": self.history_id,
+ }
+ assert len(self._get("datasets", payload).json()) == 0
+ payload = {
+ "q": ["extension-in"],
+ "qv": ["bam,txt"],
+ "history_id": self.history_id,
+ }
+ assert len(self._get("datasets", payload).json()) == 1
+ payload = {
+ "q": ["extension-like"],
+ "qv": ["t%t"],
+ "history_id": self.history_id,
+ }
+ assert len(self._get("datasets", payload).json()) == 1
+ payload = {
+ "q": ["extension-like"],
+ "qv": ["b%m"],
+ "history_id": self.history_id,
+ }
+ assert len(self._get("datasets", payload).json()) == 0
+
def test_invalid_search(self):
payload = {
"limit": 10,
diff --git a/lib/tool_shed/webapp/templates/message.mako b/lib/tool_shed/webapp/templates/message.mako
index b72eae16c18..b2aca8d0199 100644
--- a/lib/tool_shed/webapp/templates/message.mako
+++ b/lib/tool_shed/webapp/templates/message.mako
@@ -63,5 +63,5 @@
if status not in ("danger", "info", "success", "warning"):
status = "info"
%>
- ${_(sanitize_html(msg))}
+ ${sanitize_html(msg)}
%def>
diff --git a/lib/tool_shed/webapp/templates/webapps/tool_shed/base_panels.mako b/lib/tool_shed/webapp/templates/webapps/tool_shed/base_panels.mako
index 8772d0858a3..4db5311dba0 100644
--- a/lib/tool_shed/webapp/templates/webapps/tool_shed/base_panels.mako
+++ b/lib/tool_shed/webapp/templates/webapps/tool_shed/base_panels.mako
@@ -139,24 +139,24 @@
<%
menu_options = []
menu_options.extend( [
- [_('About Tool Shed'), app.config.get( "wiki_url", "https://galaxyproject.org/toolshed" ), "_blank" ],
- [_('Support'), app.config.get( "support_url", "https://galaxyproject.org/support" ), "_blank" ],
- [_('Videos'), app.config.get( "screencasts_url", "https://vimeo.com/galaxyproject" ), "_blank" ],
- [_('How to Cite Tool Shed'), app.config.get( "citation_url", "https://galaxyproject.org/citing-galaxy" ), "_blank" ]
+ ['About Tool Shed', app.config.get( "wiki_url", "https://galaxyproject.org/toolshed" ), "_blank" ],
+ ['Support', app.config.get( "support_url", "https://galaxyproject.org/support" ), "_blank" ],
+ ['Videos', app.config.get( "screencasts_url", "https://vimeo.com/galaxyproject" ), "_blank" ],
+ ['How to Cite Tool Shed', app.config.get( "citation_url", "https://galaxyproject.org/citing-galaxy" ), "_blank" ]
] )
- tab( "help", _("Help"), None, menu_options=menu_options )
+ tab( "help", "Help", None, menu_options=menu_options )
%>
## User tabs.
<%
from markupsafe import escape
# Menu for user who is not logged in.
- menu_options = [ [ _("Login"), h.url_for( controller='/user', action='login' ), "galaxy_main" ] ]
+ menu_options = [ [ "Login", h.url_for( controller='/user', action='login' ), "galaxy_main" ] ]
if app.config.allow_user_creation:
- menu_options.append( [ _("Register"), h.url_for( controller='/user', action='create', cntrller='user' ), "galaxy_main" ] )
+ menu_options.append( [ "Register", h.url_for( controller='/user', action='create', cntrller='user' ), "galaxy_main" ] )
extra_class = "loggedout-only"
visible = ( trans.user == None )
- tab( "user", _("User"), None, visible=visible, menu_options=menu_options )
+ tab( "user", "User", None, visible=visible, menu_options=menu_options )
# Menu for user who is logged in.
if trans.user:
email = escape( trans.user.email )
@@ -165,14 +165,14 @@
menu_options = [ [ 'Logged in as %s' % email ] ]
if app.config.use_remote_user:
if app.config.remote_user_logout_href:
- menu_options.append( [ _('Logout'), app.config.remote_user_logout_href, "_top" ] )
+ menu_options.append( [ 'Logout', app.config.remote_user_logout_href, "_top" ] )
else:
- menu_options.append( [ _('Preferences'), h.url_for( controller='/user', action='index', cntrller='user' ), "galaxy_main" ] )
- menu_options.append( [ _('API Keys'), h.url_for( controller='/user', action='api_keys', cntrller='user' ), "galaxy_main" ] )
+ menu_options.append( [ 'Preferences', h.url_for( controller='/user', action='index', cntrller='user' ), "galaxy_main" ] )
+ menu_options.append( [ 'API Keys', h.url_for( controller='/user', action='api_keys', cntrller='user' ), "galaxy_main" ] )
logout_url = h.url_for( controller='/user', action='logout' )
menu_options.append( [ 'Logout', logout_url, "_top" ] )
if app.config.use_remote_user:
- menu_options.append( [ _('Public Name'), h.url_for( controller='/user', action='edit_username', cntrller='user' ), "galaxy_main" ] )
+ menu_options.append( [ 'Public Name', h.url_for( controller='/user', action='edit_username', cntrller='user' ), "galaxy_main" ] )
extra_class = "loggedin-only"
visible = ( trans.user != None )
diff --git a/lib/tool_shed/webapp/templates/webapps/tool_shed/user/index.mako b/lib/tool_shed/webapp/templates/webapps/tool_shed/user/index.mako
index 68888cb7110..1bf2d445207 100644
--- a/lib/tool_shed/webapp/templates/webapps/tool_shed/user/index.mako
+++ b/lib/tool_shed/webapp/templates/webapps/tool_shed/user/index.mako
@@ -1,21 +1,21 @@
<%inherit file="/base.mako"/>
%if trans.user:
- ${_('User preferences')}
+ User preferences
You are currently logged in as ${trans.user.email|h}.
%else:
%if not message:
- ${n_('You are currently not logged in.')}
+ You are currently not logged in.
%endif
%endif
diff --git a/locale/en/LC_MESSAGES/ginga.mo b/locale/en/LC_MESSAGES/ginga.mo
deleted file mode 100644
index 3ad6e6045a4..00000000000
Binary files a/locale/en/LC_MESSAGES/ginga.mo and /dev/null differ
diff --git a/locale/en/LC_MESSAGES/ginga.po b/locale/en/LC_MESSAGES/ginga.po
deleted file mode 100644
index e9506ff7134..00000000000
--- a/locale/en/LC_MESSAGES/ginga.po
+++ /dev/null
@@ -1,299 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-21 18:33+0900\n"
-"PO-Revision-Date: 2009-03-17 03:55-0400\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: en \n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.4\n"
-
-#: templates/history/options.mako:17
-msgid " a new empty history"
-msgstr ""
-
-#: templates/history/options.mako:22 templates/history/options.mako:24
-msgid " current history"
-msgstr ""
-
-#: templates/history/options.mako:14
-#, python-format
-msgid " current history (stored as \"%s\")"
-msgstr ""
-
-#: templates/history/options.mako:20
-msgid " from the current history"
-msgstr ""
-
-#: templates/history/options.mako:15
-msgid " previously stored histories"
-msgstr ""
-
-#: templates/history/options.mako:8
-msgid " to store or switch histories."
-msgstr ""
-
-#: templates/user/index.mako:9 templates/user/index.mako:11
-msgid "Account settings"
-msgstr ""
-
-#: templates/root/masthead.mako:39
-msgid "Account: "
-msgstr ""
-
-#: templates/admin_main.mako:16
-msgid "Admin password: "
-msgstr ""
-
-#: templates/root/history_common.mako:41
-msgid "An error occurred running this job: "
-msgstr ""
-
-#: templates/history/options.mako:24
-msgid "Are you sure you want to delete the current history?"
-msgstr ""
-
-#: templates/user/index.mako:16
-msgid "Change your password"
-msgstr ""
-
-#: templates/history/options.mako:20
-msgid "Construct workflow"
-msgstr ""
-
-#: templates/history/options.mako:17
-msgid "Create"
-msgstr ""
-
-#: templates/user/index.mako:24
-msgid "Create new account"
-msgstr ""
-
-#: templates/history/rename.mako:9
-msgid "Current Name"
-msgstr ""
-
-#: templates/history/options.mako:24
-msgid "Delete"
-msgstr ""
-
-#: templates/history/share.mako:23
-msgid "Email of User to share with:"
-msgstr ""
-
-#: templates/root/history_common.mako:76
-#, python-format
-msgid "Error: unknown dataset state \"%s\"."
-msgstr ""
-
-#: templates/admin_main.mako:2 templates/admin_main.mako:7
-msgid "Galaxy Administration"
-msgstr ""
-
-#: templates/root/history.mako:12
-msgid "Galaxy History"
-msgstr ""
-
-#: templates/root/tool_menu.mako:11
-msgid "Galaxy Tools"
-msgstr ""
-
-#: templates/root/index.mako:34
-msgid "History"
-msgstr ""
-
-#: templates/history/share.mako:8
-msgid "History Name:"
-msgstr ""
-
-#: templates/history/options.mako:4
-msgid "History Options"
-msgstr ""
-
-#: templates/root/history_common.mako:57 templates/root/masthead.mako:25
-msgid "Info: "
-msgstr ""
-
-#: templates/root/history_common.mako:38
-msgid "Job is currently running"
-msgstr ""
-
-#: templates/root/history_common.mako:36
-msgid "Job is waiting to run"
-msgstr ""
-
-#: templates/history/options.mako:15
-msgid "List"
-msgstr ""
-
-#: templates/root/masthead.mako:36
-#, python-format
-msgid "Logged in as %s: "
-msgstr ""
-
-#: templates/user/index.mako:23
-msgid "Login"
-msgstr ""
-
-#: templates/user/index.mako:18
-msgid "Logout"
-msgstr ""
-
-#: templates/root/tool_menu.mako:100
-msgid "Manage"
-msgstr ""
-
-#: templates/history/rename.mako:9
-msgid "New Name"
-msgstr ""
-
-#: templates/root/history_common.mako:45
-msgid "No data: "
-msgstr ""
-
-#: templates/history/share.mako:8
-msgid "Number of Datasets:"
-msgstr ""
-
-#: templates/root/index.mako:32
-msgid "Options"
-msgstr ""
-
-#: templates/admin_main.mako:27
-msgid "Reload"
-msgstr ""
-
-#: templates/admin_main.mako:18
-msgid "Reload tool: "
-msgstr ""
-
-#: templates/history/options.mako:14
-msgid "Rename"
-msgstr ""
-
-#: templates/history/rename.mako:2 templates/history/rename.mako:5
-msgid "Rename History"
-msgstr ""
-
-#: templates/history/options.mako:22
-msgid "Share"
-msgstr ""
-
-#: templates/history/share.mako:5
-msgid "Share Histories"
-msgstr ""
-
-#: templates/history/share.mako:8
-msgid "Share Link"
-msgstr ""
-
-#: templates/history/share.mako:2
-msgid "Share histories"
-msgstr ""
-
-#: templates/history/share.mako:14
-msgid "This history contains no data."
-msgstr ""
-
-#: templates/root/index.mako:5
-msgid "Tools"
-msgstr ""
-
-#: templates/user/index.mako:17
-msgid "Update your email address"
-msgstr ""
-
-#: templates/root/tool_menu.mako:95
-msgid "Workflow"
-msgstr ""
-
-#: templates/user/index.mako:14
-#, python-format
-msgid "You are currently logged in as %s."
-msgstr ""
-
-#: templates/user/index.mako:21
-msgid "You are currently not logged in."
-msgstr ""
-
-#: templates/root/history.mako:223
-msgid "You are currently viewing a deleted history!"
-msgstr ""
-
-#: templates/history/options.mako:8
-msgid "You must be "
-msgstr ""
-
-#: templates/root/history.mako:252
-msgid "Your history is empty. Click 'Get Data' on the left pane to start"
-msgstr ""
-
-#: templates/root/masthead.mako:28
-msgid "blog"
-msgstr ""
-
-#: templates/history/share.mako:20
-msgid "copy link to share"
-msgstr ""
-
-#: templates/root/masthead.mako:39
-msgid "create"
-msgstr ""
-
-#: templates/root/history_common.mako:50
-msgid "database: "
-msgstr ""
-
-#: templates/root/history_common.mako:49
-msgid "format: "
-msgstr ""
-
-#: templates/history/options.mako:8
-msgid "logged in"
-msgstr ""
-
-#: templates/root/masthead.mako:40
-msgid "login"
-msgstr ""
-
-#: templates/root/masthead.mako:37
-msgid "logout"
-msgstr ""
-
-#: templates/root/masthead.mako:36
-msgid "manage"
-msgstr ""
-
-#: templates/root/history.mako:218
-msgid "refresh"
-msgstr ""
-
-#: templates/root/masthead.mako:25
-msgid "report bugs"
-msgstr ""
-
-#: templates/root/history_common.mako:42
-msgid "report this error"
-msgstr ""
-
-#: templates/root/masthead.mako:27
-msgid "screencasts"
-msgstr ""
-
-#: templates/root/masthead.mako:26
-msgid "wiki"
-msgstr ""
-
-#: templates/root/tool_menu.mako:100
-msgid "workflows"
-msgstr ""
-
diff --git a/locale/en/LC_MESSAGES/tools.mo b/locale/en/LC_MESSAGES/tools.mo
deleted file mode 100644
index 55de14f711f..00000000000
Binary files a/locale/en/LC_MESSAGES/tools.mo and /dev/null differ
diff --git a/locale/en/LC_MESSAGES/tools.po b/locale/en/LC_MESSAGES/tools.po
deleted file mode 100644
index f7370221624..00000000000
--- a/locale/en/LC_MESSAGES/tools.po
+++ /dev/null
@@ -1,85 +0,0 @@
-# English translations for PROJECT.
-# Copyright (C) 2009 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR , 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2009-03-17 04:07-0400\n"
-"PO-Revision-Date: 2009-03-17 04:07-0400\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: en \n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.4\n"
-
-msgid "Get Data"
-msgstr ""
-
-msgid "Get ENCODE Data"
-msgstr ""
-
-msgid "ENCODE Tools"
-msgstr ""
-
-msgid "Lift-Over"
-msgstr ""
-
-msgid "Text Manipulation"
-msgstr ""
-
-msgid "Filter and Sort"
-msgstr ""
-
-msgid "Join, Subtract and Group"
-msgstr ""
-
-msgid "Convert Formats"
-msgstr ""
-
-msgid "Extract Features"
-msgstr ""
-
-msgid "Fetch Sequences"
-msgstr ""
-
-msgid "Fetch Alignments"
-msgstr ""
-
-msgid "Get Genomic Scores"
-msgstr ""
-
-msgid "Operate on Genomic Intervals"
-msgstr ""
-
-msgid "Statistics"
-msgstr ""
-
-msgid "Graph/Display Data"
-msgstr ""
-
-msgid "Regional Variation"
-msgstr ""
-
-msgid "Evolution: HyPhy"
-msgstr ""
-
-msgid "Taxonomy manipulation"
-msgstr ""
-
-msgid "Solexa tools"
-msgstr ""
-
-msgid "FASTA manipulation"
-msgstr ""
-
-msgid "Short Read QC and Manipulation"
-msgstr ""
-
-msgid "Short Read Mapping"
-msgstr ""
-
diff --git a/locale/ginga.pot b/locale/ginga.pot
deleted file mode 100644
index 1703143c416..00000000000
--- a/locale/ginga.pot
+++ /dev/null
@@ -1,296 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-21 18:33+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: templates/history/options.mako:17
-msgid " a new empty history"
-msgstr ""
-
-#: templates/history/options.mako:22 templates/history/options.mako:24
-msgid " current history"
-msgstr ""
-
-#: templates/history/options.mako:14
-#, python-format
-msgid " current history (stored as \"%s\")"
-msgstr ""
-
-#: templates/history/options.mako:20
-msgid " from the current history"
-msgstr ""
-
-#: templates/history/options.mako:15
-msgid " previously stored histories"
-msgstr ""
-
-#: templates/history/options.mako:8
-msgid " to store or switch histories."
-msgstr ""
-
-#: templates/user/index.mako:9 templates/user/index.mako:11
-msgid "Account settings"
-msgstr ""
-
-#: templates/root/masthead.mako:39
-msgid "Account: "
-msgstr ""
-
-#: templates/admin_main.mako:16
-msgid "Admin password: "
-msgstr ""
-
-#: templates/root/history_common.mako:41
-msgid "An error occurred running this job: "
-msgstr ""
-
-#: templates/history/options.mako:24
-msgid "Are you sure you want to delete the current history?"
-msgstr ""
-
-#: templates/user/index.mako:16
-msgid "Change your password"
-msgstr ""
-
-#: templates/history/options.mako:20
-msgid "Construct workflow"
-msgstr ""
-
-#: templates/history/options.mako:17
-msgid "Create"
-msgstr ""
-
-#: templates/user/index.mako:24
-msgid "Create new account"
-msgstr ""
-
-#: templates/history/rename.mako:9
-msgid "Current Name"
-msgstr ""
-
-#: templates/history/options.mako:24
-msgid "Delete"
-msgstr ""
-
-#: templates/history/share.mako:23
-msgid "Email of User to share with:"
-msgstr ""
-
-#: templates/root/history_common.mako:76
-#, python-format
-msgid "Error: unknown dataset state \"%s\"."
-msgstr ""
-
-#: templates/admin_main.mako:2 templates/admin_main.mako:7
-msgid "Galaxy Administration"
-msgstr ""
-
-#: templates/root/history.mako:12
-msgid "Galaxy History"
-msgstr ""
-
-#: templates/root/tool_menu.mako:11
-msgid "Galaxy Tools"
-msgstr ""
-
-#: templates/root/index.mako:34
-msgid "History"
-msgstr ""
-
-#: templates/history/share.mako:8
-msgid "History Name:"
-msgstr ""
-
-#: templates/history/options.mako:4
-msgid "History Options"
-msgstr ""
-
-#: templates/root/history_common.mako:57 templates/root/masthead.mako:25
-msgid "Info: "
-msgstr ""
-
-#: templates/root/history_common.mako:38
-msgid "Job is currently running"
-msgstr ""
-
-#: templates/root/history_common.mako:36
-msgid "Job is waiting to run"
-msgstr ""
-
-#: templates/history/options.mako:15
-msgid "List"
-msgstr ""
-
-#: templates/root/masthead.mako:36
-#, python-format
-msgid "Logged in as %s: "
-msgstr ""
-
-#: templates/user/index.mako:23
-msgid "Login"
-msgstr ""
-
-#: templates/user/index.mako:18
-msgid "Logout"
-msgstr ""
-
-#: templates/root/tool_menu.mako:100
-msgid "Manage"
-msgstr ""
-
-#: templates/history/rename.mako:9
-msgid "New Name"
-msgstr ""
-
-#: templates/root/history_common.mako:45
-msgid "No data: "
-msgstr ""
-
-#: templates/history/share.mako:8
-msgid "Number of Datasets:"
-msgstr ""
-
-#: templates/root/index.mako:32
-msgid "Options"
-msgstr ""
-
-#: templates/admin_main.mako:27
-msgid "Reload"
-msgstr ""
-
-#: templates/admin_main.mako:18
-msgid "Reload tool: "
-msgstr ""
-
-#: templates/history/options.mako:14
-msgid "Rename"
-msgstr ""
-
-#: templates/history/rename.mako:2 templates/history/rename.mako:5
-msgid "Rename History"
-msgstr ""
-
-#: templates/history/options.mako:22
-msgid "Share"
-msgstr ""
-
-#: templates/history/share.mako:5
-msgid "Share Histories"
-msgstr ""
-
-#: templates/history/share.mako:8
-msgid "Share Link"
-msgstr ""
-
-#: templates/history/share.mako:2
-msgid "Share histories"
-msgstr ""
-
-#: templates/history/share.mako:14
-msgid "This history contains no data."
-msgstr ""
-
-#: templates/root/index.mako:5
-msgid "Tools"
-msgstr ""
-
-#: templates/user/index.mako:17
-msgid "Update your email address"
-msgstr ""
-
-#: templates/root/tool_menu.mako:95
-msgid "Workflow"
-msgstr ""
-
-#: templates/user/index.mako:14
-#, python-format
-msgid "You are currently logged in as %s."
-msgstr ""
-
-#: templates/user/index.mako:21
-msgid "You are currently not logged in."
-msgstr ""
-
-#: templates/root/history.mako:223
-msgid "You are currently viewing a deleted history!"
-msgstr ""
-
-#: templates/history/options.mako:8
-msgid "You must be "
-msgstr ""
-
-#: templates/root/history.mako:252
-msgid "Your history is empty. Click 'Get Data' on the left pane to start"
-msgstr ""
-
-#: templates/root/masthead.mako:28
-msgid "blog"
-msgstr ""
-
-#: templates/history/share.mako:20
-msgid "copy link to share"
-msgstr ""
-
-#: templates/root/masthead.mako:39
-msgid "create"
-msgstr ""
-
-#: templates/root/history_common.mako:50
-msgid "database: "
-msgstr ""
-
-#: templates/root/history_common.mako:49
-msgid "format: "
-msgstr ""
-
-#: templates/history/options.mako:8
-msgid "logged in"
-msgstr ""
-
-#: templates/root/masthead.mako:40
-msgid "login"
-msgstr ""
-
-#: templates/root/masthead.mako:37
-msgid "logout"
-msgstr ""
-
-#: templates/root/masthead.mako:36
-msgid "manage"
-msgstr ""
-
-#: templates/root/history.mako:218
-msgid "refresh"
-msgstr ""
-
-#: templates/root/masthead.mako:25
-msgid "report bugs"
-msgstr ""
-
-#: templates/root/history_common.mako:42
-msgid "report this error"
-msgstr ""
-
-#: templates/root/masthead.mako:27
-msgid "screencasts"
-msgstr ""
-
-#: templates/root/masthead.mako:26
-msgid "wiki"
-msgstr ""
-
-#: templates/root/tool_menu.mako:100
-msgid "workflows"
-msgstr ""
diff --git a/locale/ja/LC_MESSAGES/ginga.mo b/locale/ja/LC_MESSAGES/ginga.mo
deleted file mode 100644
index 22e28078248..00000000000
Binary files a/locale/ja/LC_MESSAGES/ginga.mo and /dev/null differ
diff --git a/locale/ja/LC_MESSAGES/ginga.po b/locale/ja/LC_MESSAGES/ginga.po
deleted file mode 100644
index 8037ede7135..00000000000
--- a/locale/ja/LC_MESSAGES/ginga.po
+++ /dev/null
@@ -1,518 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: ginga 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-15 13:58+0900\n"
-"PO-Revision-Date: 2008-09-21 19:13+0900\n"
-"Last-Translator: Mitsuteru Nakao \n"
-"Language-Team: Japanese\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#:
-msgid "iso-8859-1"
-msgstr "utf-8"
-
-#:
-msgid "lang=\"en\""
-msgstr "lang=\"ja\""
-
-
-#: templates/base_panels.mako:5
-msgid "Galaxy"
-msgstr "Galaxy"
-
-#: templates/history/options.mako:24
-msgid "Are you sure you want to delete the current history?"
-msgstr "現在のヒストリーを消すことに同意しますか?"
-
-#: templates/root/history.mako:38
-msgid "collapse all"
-msgstr "すべてをおりたたむ"
-
-#: templates/root/index.mako:5
-msgid "Tools"
-msgstr "ツール"
-
-
-
-#: tools/**.xml
-msgid "Get Data"
-msgstr "データ取得"
-
-msgid "Get ENCODE Data"
-msgstr "ENCODEデータ取得"
-
-msgid "ENCODE Tools"
-msgstr "ENCODEツール"
-
-msgid "Lift-Over"
-msgstr ""
-
-msgid "Text Manipulation"
-msgstr "テキスト操作"
-
-msgid "Filter and Sort"
-msgstr "フィルターとソート"
-
-msgid "Join, Subtract and Group"
-msgstr "結合、差分、集合演算"
-
-msgid "Convert Formats"
-msgstr "フォーマット変換"
-
-msgid "Extract Features"
-msgstr "Features抽出"
-
-msgid "Fetch Sequences"
-msgstr "配列の取得"
-
-msgid "Fetch Alignments"
-msgstr "アラインメントの取得"
-
-msgid "Get Genomic Scores"
-msgstr "ゲノムスコア取得"
-
-msgid "Operate on Genomic Intervals"
-msgstr "ゲノム間隔での操作"
-
-msgid "Statistics"
-msgstr "統計量"
-
-msgid "Graph/Display Data"
-msgstr "グラフ/データ表示"
-
-msgid "Regional Variation"
-msgstr "領域的多型"
-
-msgid "Evolution: HyPhy"
-msgstr "進化: HyPhy"
-
-msgid "Taxonomy manipulation"
-msgstr "系統学的操作"
-
-msgid "Solexa tools"
-msgstr "Solexaツールス"
-
-msgid "FASTA manipulation"
-msgstr "FASTA操作"
-
-msgid "Short Read QC and Manipulation"
-msgstr "Short Read QCと操作"
-
-msgid "Short Read Mapping"
-msgstr "Short Readマッピング"
-
-
-
-
-
-#: templates/admin_main.mako:3 templates/admin_main.mako:8
-msgid "Galaxy Administration"
-msgstr "Galaxy 管理"
-
-#: templates/admin_main.mako:17
-msgid "Admin password: "
-msgstr "管理者パスワード: "
-
-#: templates/admin_main.mako:19
-msgid "Reload tool: "
-msgstr ""
-
-#: templates/admin_main.mako:35
-msgid "Reload"
-msgstr "再読込する"
-
-#: templates/dataset/edit_attributes.mako:2
-msgid "History Item Attributes"
-msgstr "ヒストリーアイテム変数"
-
-#: templates/dataset/edit_attributes.mako:19
-msgid "Edit Attributes"
-msgstr "変数を編集する"
-
-#: templates/dataset/edit_attributes.mako:64
-msgid ""
-"This will inspect the dataset and attempt to correct the above column values "
-"if they are not accurate."
-msgstr "これはデータセットを調査して上記のカラムの値を修正することを試みます。"
-
-#: templates/dataset/edit_attributes.mako:68
-msgid ""
-"Required metadata values are missing. Some of these values may not be "
-"editable by the user. Selecting \"Auto-detect\" will attempt to fix these "
-"values."
-msgstr "必要なメタデータの値が不明です。それらのいくつかの値はユーザによって編集可能にはなっていません。「自動判定」を選択するとそれらの値をただしくできるかもしれません。"
-
-#: templates/dataset/edit_attributes.mako:78
-msgid "Convert to new format"
-msgstr "新しいフォーマットに変換する"
-
-#: templates/dataset/edit_attributes.mako:84
-msgid "Convert to"
-msgstr "変換する"
-
-#: templates/dataset/edit_attributes.mako:95
-msgid ""
-"This will create a new dataset with the contents of this dataset converted "
-"to a new format."
-msgstr "新しいフォーマットに変換したデータセットを新規作成します。"
-
-#: templates/dataset/edit_attributes.mako:111
-msgid "Change data type"
-msgstr "データタイプを変更する"
-
-#: templates/dataset/edit_attributes.mako:117
-msgid "New Type"
-msgstr "新しいタイプ"
-
-#: templates/dataset/edit_attributes.mako:124
-msgid ""
-"This will change the datatype of the existing dataset but not modify "
-"its contents. Use this if Galaxy has incorrectly guessed the type of your "
-"dataset."
-msgstr "これは既存のデータセットのデータタイプを変更します。しかしデータセットの中身は変更しません。データセットのタイプの誤判定があったときに使用します。"
-
-#: templates/dataset/edit_attributes.mako:137
-msgid "Copy History Item"
-msgstr "ヒストリーアイテムをコピーする"
-
-#: templates/history/list.mako:3
-msgid "Your saved histories"
-msgstr "保存したヒストリー"
-
-#: templates/history/list.mako:19
-msgid "Stored Histories"
-msgstr "格納してあるヒストリー"
-
-#: templates/history/list.mako:21 templates/root/history.mako:239
-msgid "hide deleted"
-msgstr "削除したヒストリーを隠す"
-
-#: templates/history/list.mako:23
-msgid "show deleted"
-msgstr "削除したヒストリーを表示する"
-
-#: templates/history/list.mako:27
-msgid "Name"
-msgstr "名前"
-
-#: templates/history/list.mako:27
-msgid "Size"
-msgstr "サイズ"
-
-#: templates/history/list.mako:27
-msgid "Last modified"
-msgstr "最終更新日"
-
-#: templates/history/list.mako:27
-msgid "Actions"
-msgstr "操作"
-
-#: templates/history/list.mako:45
-msgid "rename"
-msgstr "名称変更する"
-
-#: templates/history/list.mako:46
-msgid "switch to"
-msgstr "変更する"
-
-#: templates/history/list.mako:47
-msgid "delete"
-msgstr "削除する"
-
-#: templates/history/list.mako:49
-msgid "undelete"
-msgstr "削除から戻す"
-
-#: templates/history/list.mako:55
-msgid "Action"
-msgstr "操作"
-
-#: templates/history/list.mako:56 templates/history/options.mako:21
-msgid "Share"
-msgstr "共有"
-
-#: templates/history/list.mako:56 templates/history/options.mako:15
-msgid "Rename"
-msgstr "名称変更する"
-
-#: templates/history/list.mako:56 templates/history/options.mako:24
-msgid "Delete"
-msgstr "削除する"
-
-#: templates/history/list.mako:58
-msgid "Undelete"
-msgstr "削除から戻す"
-
-#: templates/history/list.mako:65
-msgid "You have no stored histories"
-msgstr "保管してあるヒストリーはありません"
-
-#: templates/history/options.mako:5
-msgid "History Options"
-msgstr "ヒストリーオプション"
-
-#: templates/history/options.mako:9
-msgid "You must be "
-msgstr "あなたは"
-
-#: templates/history/options.mako:9
-msgid "logged in"
-msgstr "ログイン"
-
-#: templates/history/options.mako:9
-msgid " to store or switch histories."
-msgstr "しないとヒストリーの保管や変更ができません。"
-
-#: templates/history/options.mako:15
-#, python-format
-msgid " current history (stored as \"%s\")"
-msgstr " 現在のヒストリー(\"%s\" として保管されています)"
-
-#: templates/history/options.mako:16
-msgid "List"
-msgstr "リストする"
-
-#: templates/history/options.mako:16
-msgid " previously stored histories"
-msgstr " 以前に保管したヒストリー"
-
-#: templates/history/options.mako:18
-msgid "Create"
-msgstr "作成する"
-
-#: templates/history/options.mako:18
-msgid " a new empty history"
-msgstr " 新規ヒストリー"
-
-#: templates/history/options.mako:20
-msgid "Construct workflow"
-msgstr "ワークフローを構築する"
-
-#: templates/history/options.mako:20
-msgid " from the current history"
-msgstr " 現在のヒストリーから"
-
-#: templates/history/options.mako:21 templates/history/options.mako:24
-msgid " current history"
-msgstr " 現在のヒストリー"
-
-#: templates/history/options.mako:23
-msgid "Show deleted"
-msgstr "削除したヒストリーを表示する"
-
-#: templates/history/options.mako:23
-msgid " datasets in history"
-msgstr " ヒストリーのデータセット"
-
-#: templates/history/rename.mako:3 templates/history/rename.mako:6
-msgid "Rename History"
-msgstr "ヒストリーの名称変更をする"
-
-
-msgid "Rename Histories"
-msgstr "名称変更する"
-
-msgid "Perform Action"
-msgstr "操作を実行する"
-
-msgid "Submit"
-msgstr "登録する"
-
-
-
-#: templates/history/rename.mako:10
-msgid "Current Name"
-msgstr "現在の名称"
-
-#: templates/history/rename.mako:10
-msgid "New Name"
-msgstr "新しい名称"
-
-#: templates/history/share.mako:3
-msgid "Share histories"
-msgstr "ヒストリーを共有する"
-
-#: templates/history/share.mako:6
-msgid "Share Histories"
-msgstr "ヒストリーを共有する"
-
-#: templates/history/share.mako:9
-msgid "History Name:"
-msgstr "ヒストリー名"
-
-#: templates/history/share.mako:9
-msgid "Number of Datasets:"
-msgstr "データセット数"
-
-#: templates/history/share.mako:9
-msgid "Share Link"
-msgstr "共有リンク"
-
-#: templates/history/share.mako:15
-msgid "This history contains no data."
-msgstr "このヒストリーにはデータがありません。"
-
-#: templates/history/share.mako:21
-msgid "copy link to share"
-msgstr "共有リンクをコピーする"
-
-#: templates/history/share.mako:24
-msgid "Email of User to share with:"
-msgstr "共有したいユーザのEメール:"
-#msgstr "つぎのヒストリーを共有するユーザのEメールアドレス:"
-
-#: templates/root/history.mako:7
-msgid "Galaxy History"
-msgstr "Galaxy ヒストリー"
-
-#: templates/root/history.mako:237
-msgid "refresh"
-msgstr "リフレッシュ"
-
-#: templates/root/history.mako:245
-msgid "You are currently viewing a deleted history!"
-msgstr "消去したヒストリーをみています。"
-
-#: templates/root/history.mako:289
-msgid "Your history is empty. Click 'Get Data' on the left pane to start"
-msgstr "ヒストリーは空です。解析をはじめるには、左パネルの 'データ取得' をクリック"
-
-#: templates/root/history_common.mako:41
-msgid "Job is waiting to run"
-msgstr "ジョブは実行待ちです"
-
-#: templates/root/history_common.mako:43
-msgid "Job is currently running"
-msgstr "ジョブは実行中です"
-
-#: templates/root/history_common.mako:46
-msgid "An error occurred running this job: "
-msgstr "このジョブの実行中に発生したエラー: "
-
-#: templates/root/history_common.mako:47
-msgid "report this error"
-msgstr "このエラーを報告する"
-
-#: templates/root/history_common.mako:54
-msgid "No data: "
-msgstr "データ無し: "
-
-#: templates/root/history_common.mako:58
-msgid "format: "
-msgstr "フォーマット: "
-
-#: templates/root/history_common.mako:59
-msgid "database: "
-msgstr "データベース: "
-
-#: templates/root/history_common.mako:66 templates/root/masthead.mako:20
-msgid "Info: "
-msgstr "情報: "
-
-#: templates/root/history_common.mako:85
-#, python-format
-msgid "Error: unknown dataset state \"%s\"."
-msgstr "エラー: 不明なデータ状態 \"%s\"。"
-
-#: templates/root/index.mako:32
-msgid "Options"
-msgstr "オプション"
-
-#: templates/root/index.mako:34
-msgid "History"
-msgstr "ヒストリー"
-
-#: templates/root/masthead.mako:20
-msgid "report bugs"
-msgstr "バグを報告する"
-
-#: templates/root/masthead.mako:21
-msgid "wiki"
-msgstr "wiki"
-
-#: templates/root/masthead.mako:22
-msgid "screencasts"
-msgstr "スクリーンキャスト"
-
-#: templates/root/masthead.mako:23
-msgid "blog"
-msgstr "ブログ"
-
-#: templates/root/masthead.mako:31
-#, python-format
-msgid "Logged in as %s: "
-msgstr "%s としてログイン中: "
-
-#: templates/root/masthead.mako:31
-msgid "manage"
-msgstr "管理"
-
-#: templates/root/masthead.mako:32
-msgid "logout"
-msgstr "ログアウト"
-
-#: templates/root/masthead.mako:34
-msgid "Account: "
-msgstr "アカウント: "
-
-#: templates/root/masthead.mako:34
-msgid "create"
-msgstr "作成"
-
-#: templates/root/masthead.mako:35
-msgid "login"
-msgstr "ログイン"
-
-#: templates/root/tool_menu.mako:52
-msgid "Galaxy Tools"
-msgstr "Galaxy ツール群"
-
-#: templates/root/tool_menu.mako:129
-msgid "Workflow"
-msgstr "ワークフロー"
-
-#: templates/root/tool_menu.mako:134
-msgid "Manage"
-msgstr "管理"
-
-#: templates/root/tool_menu.mako:134
-msgid "workflows"
-msgstr "ワークフロー"
-
-#: templates/user/index.mako:2 templates/user/index.mako:4
-msgid "Account settings"
-msgstr "アカウント設定"
-
-#: templates/user/index.mako:7
-#, python-format
-msgid "You are currently logged in as %s."
-msgstr "%s としてログイン中。"
-
-#: templates/user/index.mako:9
-msgid "Change your password"
-msgstr "パスワード変更"
-
-#: templates/user/index.mako:10
-msgid "Update your email address"
-msgstr "メールアドレス変更"
-
-#: templates/user/index.mako:11
-msgid "Logout"
-msgstr "ログアウト"
-
-#: templates/user/index.mako:16
-msgid "Login"
-msgstr "ログイン"
-
-#: templates/user/index.mako:17
-msgid "Create new account"
-msgstr "新規アカウントを作成する"
diff --git a/locale/ja/LC_MESSAGES/tools.mo b/locale/ja/LC_MESSAGES/tools.mo
deleted file mode 100644
index f6769d52c1a..00000000000
Binary files a/locale/ja/LC_MESSAGES/tools.mo and /dev/null differ
diff --git a/locale/ja/LC_MESSAGES/tools.po b/locale/ja/LC_MESSAGES/tools.po
deleted file mode 100644
index 9e3960d48d5..00000000000
--- a/locale/ja/LC_MESSAGES/tools.po
+++ /dev/null
@@ -1,85 +0,0 @@
-# Japanese translations for PROJECT.
-# Copyright (C) 2009 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR , 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2009-03-17 04:06-0400\n"
-"PO-Revision-Date: 2009-03-17 04:06-0400\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: ja \n"
-"Plural-Forms: nplurals=1; plural=0\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.4\n"
-
-msgid "Get Data"
-msgstr ""
-
-msgid "Get ENCODE Data"
-msgstr ""
-
-msgid "ENCODE Tools"
-msgstr ""
-
-msgid "Lift-Over"
-msgstr ""
-
-msgid "Text Manipulation"
-msgstr ""
-
-msgid "Filter and Sort"
-msgstr ""
-
-msgid "Join, Subtract and Group"
-msgstr ""
-
-msgid "Convert Formats"
-msgstr ""
-
-msgid "Extract Features"
-msgstr ""
-
-msgid "Fetch Sequences"
-msgstr ""
-
-msgid "Fetch Alignments"
-msgstr ""
-
-msgid "Get Genomic Scores"
-msgstr ""
-
-msgid "Operate on Genomic Intervals"
-msgstr ""
-
-msgid "Statistics"
-msgstr ""
-
-msgid "Graph/Display Data"
-msgstr ""
-
-msgid "Regional Variation"
-msgstr ""
-
-msgid "Evolution: HyPhy"
-msgstr ""
-
-msgid "Taxonomy manipulation"
-msgstr ""
-
-msgid "Solexa tools"
-msgstr ""
-
-msgid "FASTA manipulation"
-msgstr ""
-
-msgid "Short Read QC and Manipulation"
-msgstr ""
-
-msgid "Short Read Mapping"
-msgstr ""
-
diff --git a/locale/tools.pot b/locale/tools.pot
deleted file mode 100644
index 480f5571aac..00000000000
--- a/locale/tools.pot
+++ /dev/null
@@ -1,66 +0,0 @@
-#: tools/**.xml
-msgid "Get Data"
-msgstr ""
-
-msgid "Get ENCODE Data"
-msgstr ""
-
-msgid "ENCODE Tools"
-msgstr ""
-
-msgid "Lift-Over"
-msgstr ""
-
-msgid "Text Manipulation"
-msgstr ""
-
-msgid "Filter and Sort"
-msgstr ""
-
-msgid "Join, Subtract and Group"
-msgstr ""
-
-msgid "Convert Formats"
-msgstr ""
-
-msgid "Extract Features"
-msgstr ""
-
-msgid "Fetch Sequences"
-msgstr ""
-
-msgid "Fetch Alignments"
-msgstr ""
-
-msgid "Get Genomic Scores"
-msgstr ""
-
-msgid "Operate on Genomic Intervals"
-msgstr ""
-
-msgid "Statistics"
-msgstr ""
-
-msgid "Graph/Display Data"
-msgstr ""
-
-msgid "Regional Variation"
-msgstr ""
-
-msgid "Evolution: HyPhy"
-msgstr ""
-
-msgid "Taxonomy manipulation"
-msgstr ""
-
-msgid "Solexa tools"
-msgstr ""
-
-msgid "FASTA manipulation"
-msgstr ""
-
-msgid "Short Read QC and Manipulation"
-msgstr ""
-
-msgid "Short Read Mapping"
-msgstr ""
diff --git a/locale/zh/LC_MESSAGES/ginga.mo b/locale/zh/LC_MESSAGES/ginga.mo
deleted file mode 100644
index 313becab331..00000000000
Binary files a/locale/zh/LC_MESSAGES/ginga.mo and /dev/null differ
diff --git a/locale/zh/LC_MESSAGES/ginga.po b/locale/zh/LC_MESSAGES/ginga.po
deleted file mode 100644
index 7f13341e093..00000000000
--- a/locale/zh/LC_MESSAGES/ginga.po
+++ /dev/null
@@ -1,603 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: yinhe 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-15 13:58+0800\n"
-"PO-Revision-Date: 2011-11-04 19:13+0900\n"
-"Last-Translator: Hanfei Sun Juan Wang \n"
-"Language-Team: Chinese\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#:
-msgid "iso-8859-1"
-msgstr "utf-8"
-
-#:
-msgid "lang=\"en\""
-msgstr "lang=\"zh\""
-
-
-#: templates/base_panels.mako:5
-msgid "Galaxy"
-msgstr "Galaxy"
-
-#: templates/history/options.mako:24
-msgid "Are you sure you want to delete the current history?"
-msgstr "确认要删除当前的历史记录吗?"
-
-#: templates/root/history.mako:38
-msgid "collapse all"
-msgstr "全部收缩"
-
-#: templates/root/index.mako:5
-msgid "Tools"
-msgstr "工具"
-
-
-#: tools/**.xml
-msgid "Get Data"
-msgstr "获取数据"
-
-msgid "Get ENCODE Data"
-msgstr "获取ENCODE数据"
-
-msgid "ENCODE Tools"
-msgstr "ENCODE工具"
-
-msgid "Lift-Over"
-msgstr "版本转换"
-
-msgid "Text Manipulation"
-msgstr "文本操作"
-
-msgid "Filter and Sort"
-msgstr "过滤和排序"
-
-msgid "Join, Subtract and Group"
-msgstr "结合,差集与分组"
-
-msgid "Convert Formats"
-msgstr "格式转换"
-
-msgid "Extract Features"
-msgstr "特征提取"
-
-msgid "Fetch Sequences"
-msgstr "获取序列"
-
-msgid "Fetch Alignments"
-msgstr "获取比对上的序列"
-
-msgid "Get Genomic Scores"
-msgstr "获得基因组分数"
-
-msgid "Operate on Genomic Intervals"
-msgstr "基因组区间操作"
-
-msgid "Statistics"
-msgstr "统计量"
-
-msgid "Graph/Display Data"
-msgstr "图形/数据"
-
-msgid "Regional Variation"
-msgstr "区域多态性"
-
-msgid "Evolution: HyPhy"
-msgstr "进化: HyPhy"
-
-msgid "Taxonomy manipulation"
-msgstr "分类处理"
-
-msgid "Solexa tools"
-msgstr "Solexa工具"
-
-msgid "FASTA manipulation"
-msgstr "FASTA处理"
-
-msgid "Short Read QC and Manipulation"
-msgstr "短片段数据质量控制及处理"
-
-msgid "Short Read Mapping"
-msgstr "短片段回贴"
-
-
-#: templates/admin_main.mako:3 templates/admin_main.mako:8
-msgid "Galaxy Administration"
-msgstr "Galaxy 管理"
-
-#: templates/admin_main.mako:17
-msgid "Admin password: "
-msgstr "管理员密码: "
-
-#: templates/admin_main.mako:19
-msgid "Reload tool: "
-msgstr "重新载入工具"
-
-#: templates/admin_main.mako:35
-msgid "Reload"
-msgstr "重新载入"
-
-#: templates/dataset/edit_attributes.mako:2
-msgid "History Item Attributes"
-msgstr "历史项目属性"
-
-#: templates/dataset/edit_attributes.mako:19
-msgid "Edit attributes"
-msgstr "编辑属性"
-
-#: templates/dataset/edit_attributes.mako:64
-msgid ""
-"This will inspect the dataset and attempt to correct the above column values "
-"if they are not accurate."
-msgstr "数据集检查,若有错误,更正上述栏中的值。"
-
-#: templates/dataset/edit_attributes.mako:68
-msgid ""
-"Required metadata values are missing. Some of these values may not be "
-"editable by the user. Selecting \"Auto-detect\" will attempt to fix these "
-"values."
-msgstr "缺少所需的metadata的值。用户可能无法对这些值进行编辑。选择“自动检测”来尝试修正这些值。"
-
-#: templates/dataset/edit_attributes.mako:78
-msgid "Convert to new format"
-msgstr "转换为新格式"
-
-#: templates/dataset/edit_attributes.mako:84
-msgid "Convert to"
-msgstr "转换为"
-
-#: templates/dataset/edit_attributes.mako:95
-msgid ""
-"This will create a new dataset with the contents of this dataset converted "
-"to a new format."
-msgstr "这将产生一个转换格式后的新数据集,"
-
-#: templates/dataset/edit_attributes.mako:111
-msgid "Change data type"
-msgstr "改变数据类型"
-
-#: templates/dataset/edit_attributes.mako:117
-msgid "New Type"
-msgstr "新类型"
-
-#: templates/dataset/edit_attributes.mako:124
-msgid ""
-"This will change the datatype of the existing dataset but not modify "
-"its contents. Use this if Galaxy has incorrectly guessed the type of your "
-"dataset."
-msgstr "这将改变已有数据集的数据类型,但不改变其内容。当Galaxy不能正确判断你的数据类型时,设置该参数。"
-
-#: templates/dataset/edit_attributes.mako:137
-msgid "Copy History Item"
-msgstr "复制历史记录项"
-
-#: templates/history/list.mako:3
-msgid "Saved Histories"
-msgstr "已保存的历史"
-
-
-#: templates/history/list.mako:21 templates/root/history.mako:239
-msgid "hide deleted"
-msgstr "隐藏已删除的数据"
-
-#: templates/history/list.mako:23
-msgid "show deleted"
-msgstr "显示已删除的数据"
-
-#: templates/history/list.mako:27
-msgid "Name"
-msgstr "名称"
-
-#: templates/history/list.mako:27
-msgid "Size"
-msgstr "大小"
-
-#: templates/history/list.mako:27
-msgid "Last modified"
-msgstr "最后修改时间"
-
-#: templates/history/list.mako:27
-msgid "Actions"
-msgstr "操作"
-
-#: templates/history/list.mako:45
-msgid "rename"
-msgstr "重命名"
-
-#: templates/history/list.mako:46
-msgid "switch to"
-msgstr "切换到"
-
-#: templates/history/list.mako:47
-msgid "delete"
-msgstr "删除"
-
-#: templates/history/list.mako:49
-msgid "undelete"
-msgstr "还原"
-
-#: templates/history/list.mako:55
-msgid "Action"
-msgstr "操作"
-
-#: templates/history/list.mako:56 templates/history/options.mako:21
-msgid "Share"
-msgstr "共享"
-
-#: templates/history/list.mako:56 templates/history/options.mako:15
-msgid "Rename"
-msgstr "重命名"
-
-#: templates/history/list.mako:56 templates/history/options.mako:24
-msgid "Delete"
-msgstr "删除"
-
-#: templates/history/list.mako:58
-msgid "Undelete"
-msgstr "还原"
-
-#: templates/history/list.mako:65
-msgid "You have no stored histories"
-msgstr "没有存储的历史记录"
-
-#: templates/history/options.mako:5
-msgid "History Options"
-msgstr "历史记录选项"
-
-#: templates/history/options.mako:9
-msgid "You must be "
-msgstr "你必须成为"
-
-#: templates/history/options.mako:9
-msgid "logged in"
-msgstr "登录"
-
-#: templates/history/options.mako:9
-msgid " to store or switch histories."
-msgstr "以存储或切换历史记录"
-
-#: templates/history/options.mako:15
-#, python-format
-msgid " current history (stored as \"%s\")"
-msgstr " 当前历史(以\"%s\"形式存储)"
-
-#: templates/history/options.mako:16
-msgid "List"
-msgstr "列表"
-
-#: templates/history/options.mako:16
-msgid " previously stored histories"
-msgstr " 以前存储的历史记录"
-
-#: templates/history/options.mako:18
-msgid "Create"
-msgstr "创建"
-
-#: templates/history/options.mako:18
-msgid " a new empty history"
-msgstr " 一个新的空白历史记录"
-
-#: templates/history/options.mako:20
-msgid "Construct workflow"
-msgstr "构建工作流程"
-
-#: templates/history/options.mako:20
-msgid " from the current history"
-msgstr " 来源于当前历史"
-
-#: templates/history/options.mako:21 templates/history/options.mako:24
-msgid " current history"
-msgstr " 当前历史"
-
-#: templates/history/options.mako:23
-msgid "Show deleted"
-msgstr "显示已删除"
-
-#: templates/history/options.mako:23
-msgid " datasets in history"
-msgstr " 历史中的数据集"
-
-#: templates/history/rename.mako:3 templates/history/rename.mako:6
-msgid "Rename History"
-msgstr "重命名历史"
-
-
-msgid "Rename Histories"
-msgstr "重命名历史记录"
-
-msgid "Perform Action"
-msgstr "运行操作"
-
-msgid "Submit"
-msgstr "提交"
-
-
-
-#: templates/history/rename.mako:10
-msgid "Current Name"
-msgstr "当前名称"
-
-#: templates/history/rename.mako:10
-msgid "New Name"
-msgstr "新名称"
-
-#: templates/history/share.mako:3
-msgid "Share histories"
-msgstr "共享历史记录"
-
-#: templates/history/share.mako:6
-msgid "Share Histories"
-msgstr "共享历史记录"
-
-#: templates/history/share.mako:9
-msgid "History Name:"
-msgstr "历史名称"
-
-#: templates/history/share.mako:9
-msgid "Number of Datasets:"
-msgstr "数据集数量"
-
-#: templates/history/share.mako:9
-msgid "Share Link"
-msgstr "共享链接"
-
-#: templates/history/share.mako:15
-msgid "This history contains no data."
-msgstr "这项历史中没有数据"
-
-#: templates/history/share.mako:21
-msgid "copy link to share"
-msgstr "复制链接以共享"
-
-#: templates/history/share.mako:24
-msgid "Email of User to share with:"
-msgstr "发送到这些Email地址进行分享"
-
-#: templates/root/history.mako:7
-msgid "Galaxy History"
-msgstr "Galaxy 历史"
-
-#: templates/root/history.mako:237
-msgid "refresh"
-msgstr "刷新"
-
-#: templates/root/history.mako:245
-msgid "You are currently viewing a deleted history!"
-msgstr "正在查看已删除的历史"
-
-#: templates/root/history.mako:289
-msgid "Your history is empty. Click 'Get Data' on the left pane to start"
-msgstr "历史已空,请单击左边窗格中‘获取数据’"
-
-#: templates/root/history_common.mako:41
-msgid "Job is waiting to run"
-msgstr "等待运行的进程"
-
-#: templates/root/history_common.mako:43
-msgid "Job is currently running"
-msgstr "正在运行的进程"
-
-#: templates/root/history_common.mako:46
-msgid "An error occurred running this job: "
-msgstr "进程运行时出错 "
-
-#: templates/root/history_common.mako:47
-msgid "report this error"
-msgstr "报告错误"
-
-#: templates/root/history_common.mako:54
-msgid "No data: "
-msgstr "没有数据: "
-
-#: templates/root/history_common.mako:58
-msgid "format: "
-msgstr "格式: "
-
-#: templates/root/history_common.mako:59
-msgid "database: "
-msgstr "数据库: "
-
-#: templates/root/history_common.mako:66 templates/root/masthead.mako:20
-msgid "Info: "
-msgstr "信息: "
-
-#: templates/root/history_common.mako:85
-#, python-format
-msgid "Error: unknown dataset state \"%s\"."
-msgstr "错误:未知的数据集状态 \"%s\"。"
-
-
-msgid "Options"
-msgstr "选项"
-
-msgid "History"
-msgstr "历史"
-
-#: templates/root/masthead.mako:20
-msgid "report bugs"
-msgstr "错误报告"
-
-#: templates/root/masthead.mako:21
-msgid "wiki"
-msgstr "wiki"
-
-#: templates/root/masthead.mako:22
-msgid "screencasts"
-msgstr "演示视频"
-
-
-#: templates/root/masthead.mako:23
-msgid "blog"
-msgstr "博客"
-
-#: templates/root/masthead.mako:31
-#, python-format
-msgid "Logged in as %s: "
-msgstr "以%s的身份登录: "
-
-#: templates/root/masthead.mako:31
-msgid "manage"
-msgstr "管理"
-
-#: templates/root/masthead.mako:32
-msgid "logout"
-msgstr "注销"
-
-#: templates/root/masthead.mako:34
-msgid "Account: "
-msgstr "帐户: "
-
-#: templates/root/masthead.mako:34
-msgid "create"
-msgstr "创建"
-
-#: templates/root/masthead.mako:35
-msgid "login"
-msgstr "登录"
-
-#: templates/root/tool_menu.mako:52
-msgid "Galaxy Tools"
-msgstr "Galaxy 工具"
-
-#: templates/root/tool_menu.mako:129
-msgid "Workflow"
-msgstr "工作流程"
-
-#: templates/root/tool_menu.mako:134
-msgid "Manage"
-msgstr "管理"
-
-#: templates/root/tool_menu.mako:134
-msgid "workflows"
-msgstr "工作流程"
-
-#: templates/user/index.mako:2 templates/user/index.mako:4
-msgid "Account settings"
-msgstr "帐户设置"
-
-#: templates/user/index.mako:7
-#, python-format
-msgid "You are currently logged in as %s."
-msgstr "当前以%s的身份登录"
-
-#: templates/user/index.mako:9
-msgid "Change your password"
-msgstr "修改密码"
-
-#: templates/user/index.mako:10
-msgid "Update your email address"
-msgstr "更新电子邮件地址"
-
-#: templates/user/index.mako:11
-msgid "Logout"
-msgstr "注销"
-
-#: templates/user/index.mako:16
-msgid "Login"
-msgstr "登录"
-
-#: templates/user/index.mako:17
-msgid "Create new account"
-msgstr "创建新帐户"
-
-msgid "Show Tool Search"
-msgstr "显示工具搜索"
-
-msgid "Analyze Data"
-msgstr "分析数据"
-
-msgid "analysis"
-msgstr "分析"
-
-msgid "History Lists"
-msgstr "历史记录清单"
-
-msgid "Histories Shared with Me"
-msgstr "共享的数据"
-
-msgid "Current History"
-msgstr "当前历史记录"
-
-msgid "Create New"
-msgstr "创建"
-
-msgid "Clone"
-msgstr "复制"
-
-msgid "Share or Publish"
-msgstr "共享或发布"
-
-msgid "Extract Workflow"
-msgstr "提取工作流程"
-
-msgid "Dataset Security"
-msgstr "数据安全性"
-
-
-msgid "Show Deleted Datasets"
-msgstr "显示已删除的数据"
-
-msgid "Show Hidden Datasets"
-msgstr "显示隐藏的数据"
-
-msgid "Show Structure"
-msgstr "显示结构"
-
-msgid "Export to File"
-msgstr "导出为文件"
-
-msgid "Other Actions"
-msgstr "其他"
-
-msgid "Import from File"
-msgstr "导入文件"
-
-msgid "Shared Data"
-msgstr "数据共享"
-
-msgid "Data Libraries"
-msgstr "数据仓库"
-
-msgid "Published Histories"
-msgstr "已发布的历史记录"
-
-msgid "Published Workflows"
-msgstr "已发布的工作流程"
-
-msgid "Published Pages"
-msgstr "已发布的页面"
-
-msgid "Help"
-msgstr "帮助"
-
-msgid "Email comments, bug reports, or suggestions"
-msgstr "发邮件进行意见反馈或错误报告"
-
-
-msgid "User"
-msgstr "用户"
-
-
-msgid "Register"
-msgstr "注册"
-
-msgid "Support"
-msgstr "技术支持"
-
-msgid "Galaxy Wiki"
-msgstr "Galaxy百科"
-
-msgid "Video tutorials (screencasts)"
-msgstr "视频教程(动画演示)"
-
-msgid "How to Cite Galaxy"
-msgstr "如何引用Galaxy"
diff --git a/locale/zh/LC_MESSAGES/tools.mo b/locale/zh/LC_MESSAGES/tools.mo
deleted file mode 100644
index 41ed000d840..00000000000
Binary files a/locale/zh/LC_MESSAGES/tools.mo and /dev/null differ
diff --git a/locale/zh/LC_MESSAGES/tools.po b/locale/zh/LC_MESSAGES/tools.po
deleted file mode 100644
index 17466fe187a..00000000000
--- a/locale/zh/LC_MESSAGES/tools.po
+++ /dev/null
@@ -1,84 +0,0 @@
-# Japanese translations for PROJECT.
-# Copyright (C) 2009 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR , 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2009-03-17 04:06-0400\n"
-"PO-Revision-Date: 2009-03-17 04:06-0400\n"
-"Last-Translator: Hanfei Sun \n"
-"Language-Team: zh \n"
-"Plural-Forms: nplurals=1; plural=0\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.4\n"
-
-msgid "Get Data"
-msgstr "获取数据"
-
-msgid "Get ENCODE Data"
-msgstr ""
-
-msgid "ENCODE Tools"
-msgstr ""
-
-msgid "Lift-Over"
-msgstr ""
-
-msgid "Text Manipulation"
-msgstr ""
-
-msgid "Filter and Sort"
-msgstr ""
-
-msgid "Join, Subtract and Group"
-msgstr ""
-
-msgid "Convert Formats"
-msgstr ""
-
-msgid "Extract Features"
-msgstr ""
-
-msgid "Fetch Sequences"
-msgstr ""
-
-msgid "Fetch Alignments"
-msgstr ""
-
-msgid "Get Genomic Scores"
-msgstr ""
-
-msgid "Operate on Genomic Intervals"
-msgstr ""
-
-msgid "Statistics"
-msgstr ""
-
-msgid "Graph/Display Data"
-msgstr ""
-
-msgid "Regional Variation"
-msgstr ""
-
-msgid "Evolution: HyPhy"
-msgstr ""
-
-msgid "Taxonomy manipulation"
-msgstr ""
-
-msgid "Solexa tools"
-msgstr ""
-
-msgid "FASTA manipulation"
-msgstr ""
-
-msgid "Short Read QC and Manipulation"
-msgstr ""
-
-msgid "Short Read Mapping"
-msgstr ""
diff --git a/templates/message.mako b/templates/message.mako
index b72eae16c18..b2aca8d0199 100644
--- a/templates/message.mako
+++ b/templates/message.mako
@@ -63,5 +63,5 @@
if status not in ("danger", "info", "success", "warning"):
status = "info"
%>
- ${_(sanitize_html(msg))}
+ ${sanitize_html(msg)}
%def>
diff --git a/templates/webapps/galaxy/history/as_xml.mako b/templates/webapps/galaxy/history/as_xml.mako
index b174615bd1d..70446422945 100644
--- a/templates/webapps/galaxy/history/as_xml.mako
+++ b/templates/webapps/galaxy/history/as_xml.mako
@@ -3,13 +3,13 @@
%if show_deleted:
%for data in history.activatable_datasets:
- ${_(data.blurb)}
+ ${data.blurb}
%endfor
%else:
%for data in history.active_datasets:
- ${_(data.blurb)}
+ ${data.blurb}
%endfor
%endif
diff --git a/templates/webapps/galaxy/history/display.mako b/templates/webapps/galaxy/history/display.mako
index 7f73900574e..31acc072cb5 100644
--- a/templates/webapps/galaxy/history/display.mako
+++ b/templates/webapps/galaxy/history/display.mako
@@ -25,7 +25,7 @@
Import
%else:
-
+
Switch
diff --git a/templates/webapps/galaxy/history/view_multiple.mako b/templates/webapps/galaxy/history/view_multiple.mako
index b4ba37defb1..34b5e560d10 100644
--- a/templates/webapps/galaxy/history/view_multiple.mako
+++ b/templates/webapps/galaxy/history/view_multiple.mako
@@ -2,7 +2,7 @@
<%namespace file="/galaxy_client_app.mako" name="galaxy_client"/>
<%def name="title()">
- ${_( 'Histories' )}
+ Histories
%def>
<%def name="center_panel()">%def>
diff --git a/templates/webapps/galaxy/workflow/build_from_current_history.mako b/templates/webapps/galaxy/workflow/build_from_current_history.mako
index 03d1731d4c8..b27679c133b 100644
--- a/templates/webapps/galaxy/workflow/build_from_current_history.mako
+++ b/templates/webapps/galaxy/workflow/build_from_current_history.mako
@@ -66,7 +66,7 @@
-
+
%endif
@@ -89,11 +89,11 @@ into a workflow will be shown in gray.